security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

Update autogen.sh from upstream to version 2025-03-10

Browse Source 
--
This commit is contained in:
Werner Koch 2025-03-10 15:03:05 +01:00
parent d6ee7adebe
commit e5555a40e6
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
autogen.sh
View File

@ -15,7 +15,7 @@
# configure it for the respective package. It is maintained as part of # configure it for the respective package. It is maintained as part of
# GnuPG and source copied by other packages. # GnuPG and source copied by other packages.
# #
# Version: 2025-02-21 # Version: 2025-03-10
configure_ac="configure.ac" configure_ac="configure.ac"
@ -256,24 +256,23 @@ if [ "$myhost" = "find-version" ]; then
matchstr3="$package-$major-base" matchstr3="$package-$major-base"
vers="$major.$minor.$micro" vers="$major.$minor.$micro"
fi fi
matchexcl="--exclude $package-*beta*"
beta=no beta=no
if [ -e .git ]; then if [ -e .git ]; then
ingit=yes ingit=yes
tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null) tmp=$(git describe --match "${matchstr1}" $matchexcl --long 2>/dev/null)
if [ -n "$tmp" ]; then if [ -n "$tmp" ]; then
tmp=$(echo "$tmp" | sed s/^"$package"// \ tmp=$(echo "$tmp" | sed s/^"$package"// \
| awk -F- '$3!=0 && $3 !~ /^beta/ {print"-beta"$3}') | awk -F- '$3!=0 && $3 !~ /^beta/ {print"-beta"$3}')
fi else
if [ -z "$tmp" ]; then
# (due tof "-base" in the tag we need to take the 4th field) # (due tof "-base" in the tag we need to take the 4th field)
tmp=$(git describe --match "${matchstr2}" --long 2>/dev/null) tmp=$(git describe --match "${matchstr2}" $matchexcl --long 2>/dev/null)
if [ -n "$tmp" ]; then if [ -n "$tmp" ]; then
tmp=$(echo "$tmp" | sed s/^"$package"// \ tmp=$(echo "$tmp" | sed s/^"$package"// \
| awk -F- '$4!=0 && $4 !~ /^beta/ {print"-beta"$4}') | awk -F- '$4!=0 && $4 !~ /^beta/ {print"-beta"$4}')
fi elif [ -n "${matchstr3}" ]; then
if [ -z "$tmp" -a -n "${matchstr3}" ]; then tmp=$(git describe --match "${matchstr3}" $matchexcl --long 2>/dev/null)
tmp=$(git describe --match "${matchstr3}" --long 2>/dev/null)
if [ -n "$tmp" ]; then if [ -n "$tmp" ]; then
tmp=$(echo "$tmp" | sed s/^"$package"// \ tmp=$(echo "$tmp" | sed s/^"$package"// \
| awk -F- '$4!=0 && $4 !~ /^beta/ {print"-beta"$4}') | awk -F- '$4!=0 && $4 !~ /^beta/ {print"-beta"$4}')