[Pkg-gnupg-commit] [gnupg2] 98/102: dropping upstream patches already applied
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Fri Jun 17 00:15:06 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch experimental
in repository gnupg2.
commit e12653a9c5ba3114e106588b1787bcc276ce81e5
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Thu Jun 16 18:18:08 2016 -0400
dropping upstream patches already applied
---
...warning.patch => 0001-avoid-beta-warning.patch} | 2 +-
...002-Avoid-simple-memory-dumps-via-ptrace.patch} | 14 ++++-----
...st-a-save-after-cmd-check-fixed-something.patch | 30 ------------------
...-buglet-in-the-check_all_keysigs-function.patch | 36 ----------------------
...-gpgv-document-weak-digest-in-help-output.patch | 23 --------------
debian/patches/series | 7 ++---
6 files changed, 10 insertions(+), 102 deletions(-)
diff --git a/debian/patches/0002-avoid-beta-warning.patch b/debian/patches/0001-avoid-beta-warning.patch
similarity index 97%
rename from debian/patches/0002-avoid-beta-warning.patch
rename to debian/patches/0001-avoid-beta-warning.patch
index ef835ef..049e365 100644
--- a/debian/patches/0002-avoid-beta-warning.patch
+++ b/debian/patches/0001-avoid-beta-warning.patch
@@ -19,7 +19,7 @@ See discussion at:
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/autogen.sh b/autogen.sh
-index 7d843bd..75fc3ea 100755
+index 10cc203..debb220 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -214,7 +214,7 @@ if [ "$myhost" = "find-version" ]; then
diff --git a/debian/patches/0003-Avoid-simple-memory-dumps-via-ptrace.patch b/debian/patches/0002-Avoid-simple-memory-dumps-via-ptrace.patch
similarity index 89%
rename from debian/patches/0003-Avoid-simple-memory-dumps-via-ptrace.patch
rename to debian/patches/0002-Avoid-simple-memory-dumps-via-ptrace.patch
index fdd84a7..e76052d 100644
--- a/debian/patches/0003-Avoid-simple-memory-dumps-via-ptrace.patch
+++ b/debian/patches/0002-Avoid-simple-memory-dumps-via-ptrace.patch
@@ -21,7 +21,7 @@ Upstream bug: https://bugs.gnupg.org/gnupg/issue1211
2 files changed, 9 insertions(+)
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
-index a950530..efefc48 100644
+index 90b0eaf..d7f1684 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -48,6 +48,9 @@
@@ -34,23 +34,23 @@ index a950530..efefc48 100644
#define GNUPG_COMMON_NEED_AFLOCAL
#include "agent.h"
-@@ -750,6 +753,11 @@ main (int argc, char **argv )
- struct assuan_malloc_hooks malloc_hooks;
+@@ -742,6 +745,11 @@ main (int argc, char **argv )
early_system_init ();
-+
+
+#if defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE)
+ /* Disable ptrace on Linux without sgid bit */
+ prctl(PR_SET_DUMPABLE, 0);
+#endif
-
++
/* Before we do anything else we save the list of currently open
file descriptors and the signal mask. This info is required to
+ do the exec call properly. */
diff --git a/configure.ac b/configure.ac
-index 6aeca17..be944fb 100644
+index 1b8a6fc..8914948 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1373,6 +1373,7 @@ AC_CHECK_FUNCS([strerror strlwr tcgetattr mmap canonicalize_file_name])
+@@ -1377,6 +1377,7 @@ AC_CHECK_FUNCS([strerror strlwr tcgetattr mmap canonicalize_file_name])
AC_CHECK_FUNCS([strcasecmp strncasecmp ctermid times gmtime_r strtoull])
AC_CHECK_FUNCS([setenv unsetenv fcntl ftruncate inet_ntop])
AC_CHECK_FUNCS([canonicalize_file_name])
diff --git a/debian/patches/0003-gpg-Request-a-save-after-cmd-check-fixed-something.patch b/debian/patches/0003-gpg-Request-a-save-after-cmd-check-fixed-something.patch
deleted file mode 100644
index 31411a6..0000000
--- a/debian/patches/0003-gpg-Request-a-save-after-cmd-check-fixed-something.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Werner Koch <wk at gnupg.org>
-Date: Mon, 9 May 2016 20:57:20 +0200
-Subject: gpg: Request a "save" after cmd "check" fixed something.
-
-* g10/keyedit.c (keyedit_menu) <cmdCHECK>: Set modified.
---
-
-Reported-by: Guilhem Moulin <guilhem at fripost.org>
-GnuPG-bug-id: 2236
-Signed-off-by: Werner Koch <wk at gnupg.org>
----
- g10/keyedit.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/g10/keyedit.c b/g10/keyedit.c
-index 5461864..7ddf342 100644
---- a/g10/keyedit.c
-+++ b/g10/keyedit.c
-@@ -2206,8 +2206,9 @@ keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr,
- break;
-
- case cmdCHECK:
-- check_all_keysigs (keyblock, count_selected_uids (keyblock),
-- !strcmp (arg_string, "selfsig"));
-+ if (check_all_keysigs (keyblock, count_selected_uids (keyblock),
-+ !strcmp (arg_string, "selfsig")))
-+ modified = 1;
- break;
-
- case cmdSIGN:
diff --git a/debian/patches/0004-gpg-Fix-buglet-in-the-check_all_keysigs-function.patch b/debian/patches/0004-gpg-Fix-buglet-in-the-check_all_keysigs-function.patch
deleted file mode 100644
index 511987f..0000000
--- a/debian/patches/0004-gpg-Fix-buglet-in-the-check_all_keysigs-function.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Werner Koch <wk at gnupg.org>
-Date: Mon, 9 May 2016 21:07:40 +0200
-Subject: gpg: Fix buglet in the check_all_keysigs function.
-
-* g10/keyedit.c (sig_comparison): Actually compare the pubkey
-algorithms.
---
-
-This fixes two bugs: The first was a typo which led to us comparing A
-with A. The second problem was the use of an assert at a place where
-this can't be asserted: Two signature may have different algorithms;
-they won't verify but after all it is about corrupted signatures.
-
-Reported-by: Guilhem Moulin <guilhem at fripost.org>
-GnuPG-bug-id: 2236
-Signed-off-by: Werner Koch <wk at gnupg.org>
----
- g10/keyedit.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/g10/keyedit.c b/g10/keyedit.c
-index 7ddf342..200a1ab 100644
---- a/g10/keyedit.c
-+++ b/g10/keyedit.c
-@@ -350,8 +350,9 @@ sig_comparison (const void *av, const void *bv)
- return 1;
-
- ndataa = pubkey_get_nsig (a->pubkey_algo);
-- ndatab = pubkey_get_nsig (a->pubkey_algo);
-- log_assert (ndataa == ndatab);
-+ ndatab = pubkey_get_nsig (b->pubkey_algo);
-+ if (ndataa != ndatab)
-+ return (ndataa < ndatab)? -1 : 1;
-
- for (i = 0; i < ndataa; i ++)
- {
diff --git a/debian/patches/0005-gpgv-document-weak-digest-in-help-output.patch b/debian/patches/0005-gpgv-document-weak-digest-in-help-output.patch
deleted file mode 100644
index d049d07..0000000
--- a/debian/patches/0005-gpgv-document-weak-digest-in-help-output.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
-Date: Tue, 10 May 2016 22:51:21 -0400
-Subject: gpgv: document --weak-digest in --help output
-
-* g10/gpgv.c (opts): add docstring for --weak-digest option.
----
- g10/gpgv.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/g10/gpgv.c b/g10/gpgv.c
-index 2a53e69..6269342 100644
---- a/g10/gpgv.c
-+++ b/g10/gpgv.c
-@@ -79,7 +79,8 @@ static ARGPARSE_OPTS opts[] = {
- N_("|FD|write status info to this FD")),
- ARGPARSE_s_i (oLoggerFD, "logger-fd", "@"),
- ARGPARSE_s_s (oHomedir, "homedir", "@"),
-- ARGPARSE_s_s (oWeakDigest, "weak-digest", "@"),
-+ ARGPARSE_s_s (oWeakDigest, "weak-digest",
-+ N_("|ALGO|do not accept signatures made with algorithm ALGO")),
-
- ARGPARSE_end ()
- };
diff --git a/debian/patches/series b/debian/patches/series
index 52b5f0a..160913f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
-0002-avoid-beta-warning.patch
-0003-Avoid-simple-memory-dumps-via-ptrace.patch
-0003-gpg-Request-a-save-after-cmd-check-fixed-something.patch
-0004-gpg-Fix-buglet-in-the-check_all_keysigs-function.patch
-0005-gpgv-document-weak-digest-in-help-output.patch
+0001-avoid-beta-warning.patch
+0002-Avoid-simple-memory-dumps-via-ptrace.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git
More information about the Pkg-gnupg-commit
mailing list