-
Notifications
You must be signed in to change notification settings - Fork 59
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1566 from hadfl/gnupg
gnupg: fix running autoreconf
- Loading branch information
Showing
5 changed files
with
67 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
Patch from: | ||
https://sources.debian.org/patches/gnupg2/2.4.5-3/debian-packaging/avoid-beta-warning.patch/ | ||
|
||
Not suitable for upstream | ||
|
||
From: Debian GnuPG Maintainers <[email protected]> | ||
Date: Tue, 14 Apr 2015 10:02:31 -0400 | ||
Subject: avoid-beta-warning | ||
|
||
avoid self-describing as a beta | ||
|
||
Using autoreconf against the source as distributed in tarball form | ||
invariably results in a package that thinks it's a "beta" package, | ||
which produces the "THIS IS A DEVELOPMENT VERSION" warning string. | ||
|
||
since we use dh_autoreconf, i need this patch to avoid producing | ||
builds that announce themselves as DEVELOPMENT VERSIONs. | ||
|
||
See discussion at: | ||
|
||
http://lists.gnupg.org/pipermail/gnupg-devel/2014-November/029065.html | ||
diff -wpruN --no-dereference '--exclude=*.orig' a~/autogen.sh a/autogen.sh | ||
--- a~/autogen.sh 1970-01-01 00:00:00 | ||
+++ a/autogen.sh 1970-01-01 00:00:00 | ||
@@ -221,7 +221,7 @@ if [ "$myhost" = "find-version" ]; then | ||
esac | ||
|
||
beta=no | ||
- if [ -e .git ]; then | ||
+ if false; then | ||
ingit=yes | ||
tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null) | ||
tmp=$(echo "$tmp" | sed s/^"$package"//) | ||
@@ -237,8 +237,8 @@ if [ "$myhost" = "find-version" ]; then | ||
rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null))) | ||
else | ||
ingit=no | ||
- beta=yes | ||
- tmp="-unknown" | ||
+ beta=no | ||
+ tmp="" | ||
rev="0000000" | ||
rvd="0" | ||
fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,13 @@ | ||
unfortunately we need to patch configure instead of acinclude.m4 | ||
as running autoconf will lead to gnupg being flagged as dev release | ||
|
||
./gpg --version | ||
gpg (GnuPG) 2.4.7-unknown | ||
libgcrypt 1.11.0 | ||
NOTE: THIS IS A DEVELOPMENT VERSION! | ||
It is only intended for test purposes and should NOT be | ||
used in a production environment or with production keys! | ||
|
||
diff -wpruN --no-dereference '--exclude=*.orig' a~/configure a/configure | ||
--- a~/configure 1970-01-01 00:00:00 | ||
+++ a/configure 1970-01-01 00:00:00 | ||
@@ -14096,7 +14096,8 @@ rm -f core conftest.err conftest.$ac_obj | ||
else | ||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
/* end confdefs.h. */ | ||
-main () { | ||
+#include <stdlib.h> | ||
+int main (void) { | ||
diff -wpruN --no-dereference '--exclude=*.orig' a~/acinclude.m4 a/acinclude.m4 | ||
--- a~/acinclude.m4 1970-01-01 00:00:00 | ||
+++ a/acinclude.m4 1970-01-01 00:00:00 | ||
@@ -84,7 +84,8 @@ AC_DEFUN([GNUPG_CHECK_ENDIAN], | ||
not big endian | ||
#endif]])], gnupg_cv_c_endian=big, gnupg_cv_c_endian=little)]) | ||
if test "$gnupg_cv_c_endian" = unknown; then | ||
- AC_RUN_IFELSE([AC_LANG_SOURCE([[main () { | ||
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdlib.h> | ||
+ int main (void) { | ||
/* Are we little or big endian? From Harbison&Steele. */ | ||
union | ||
{ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
002-avoid-beta-warning.patch | ||
thread_cputime.patch | ||
no-html-doc.patch | ||
gcc14.patch |