[Pkg-gnupg-commit] [gnupg] 01/01: make gpg signature verification work under GCC 5 (Closes: #800641)

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg.

commit 287a7b98e25202166e287ea6d28d3dfe11073973
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Thu Oct 22 09:29:13 2015 -0400

    make gpg signature verification work under GCC 5 (Closes: #800641)
    
    * make gpg signature verification work under GCC 5 and fix es l10n of
      public key types
---
 debian/changelog                                   |  4 ++-
 .../0008-gpg-Silence-a-compiler-warning.patch      | 34 ++++++++++++++++++++++
 .../patches/0009-po-Fix-Spanish-translation.patch  | 21 +++++++++++++
 debian/patches/series                              |  2 ++
 4 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8c11271..2cc3166 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
-gnupg (1.4.19-6) UNRELEASED; urgency=medium
+gnupg (1.4.19-6) unstable; urgency=medium
 
   * dropping gnupg-udeb
   * require rebuild of l10n files
+  * make gpg signature verification work under GCC 5 (Closes: #800641)
+  * fix es l10n of public key types
 
  -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>  Sat, 22 Aug 2015 14:21:48 +0200
 
diff --git a/debian/patches/0008-gpg-Silence-a-compiler-warning.patch b/debian/patches/0008-gpg-Silence-a-compiler-warning.patch
new file mode 100644
index 0000000..a46831f
--- /dev/null
+++ b/debian/patches/0008-gpg-Silence-a-compiler-warning.patch
@@ -0,0 +1,34 @@
+From: Werner Koch <wk at gnupg.org>
+Date: Thu, 18 Sep 2014 15:08:51 +0200
+Subject: gpg: Silence a compiler warning.
+
+* g10/parse-packet.c (enum_sig_subpkt): Replace hack.
+
+--
+
+GCC 5 failure reported by Kevin Locke <kevin at kevinlocke.name>
+
+(backport from master commit 6a0c3fa19cfcdd590b96691e8a8ffb48fb5e0ec4)
+---
+ g10/parse-packet.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/g10/parse-packet.c b/g10/parse-packet.c
+index 8d4450c..beee77e 100644
+--- a/g10/parse-packet.c
++++ b/g10/parse-packet.c
+@@ -1183,10 +1183,10 @@ enum_sig_subpkt( const subpktarea_t *pktbuf, sigsubpkttype_t reqtype,
+       critical=&critical_dummy;
+ 
+     if( !pktbuf || reqseq == -1 ) {
+-	/* return some value different from NULL to indicate that
+-	 * there is no critical bit we do not understand.  The caller
+-	 * will never use the value.  Yes I know, it is an ugly hack */
+-	return reqtype == SIGSUBPKT_TEST_CRITICAL? (const byte*)&pktbuf : NULL;
++	static char dummy[] = "x";
++	/* Return a value different from NULL to indicate that
++	 * there is no critical bit we do not understand.  */
++	return reqtype == SIGSUBPKT_TEST_CRITICAL ? dummy : NULL;
+     }
+     buffer = pktbuf->data;
+     buflen = pktbuf->len;
diff --git a/debian/patches/0009-po-Fix-Spanish-translation.patch b/debian/patches/0009-po-Fix-Spanish-translation.patch
new file mode 100644
index 0000000..784375a
--- /dev/null
+++ b/debian/patches/0009-po-Fix-Spanish-translation.patch
@@ -0,0 +1,21 @@
+From: NIIBE Yutaka <gniibe at fsij.org>
+Date: Tue, 8 Sep 2015 09:14:20 +0900
+Subject: po: Fix Spanish translation
+
+---
+ po/es.po | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/po/es.po b/po/es.po
+index 4409501..0d8bfe1 100644
+--- a/po/es.po
++++ b/po/es.po
+@@ -4002,7 +4002,7 @@ msgstr "Seleccione el tipo de clave deseado:\n"
+ #: g10/keygen.c:1491
+ #, c-format
+ msgid "   (%d) RSA and RSA (default)\n"
+-msgstr "   (%d) DSA y ElGamal (por defecto)\n"
++msgstr "   (%d) RSA y RSA (por defecto)\n"
+ 
+ #: g10/keygen.c:1493
+ #, c-format
diff --git a/debian/patches/series b/debian/patches/series
index 09d4187..4756566 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,5 @@
 0005-g10-Improve-handling-of-no-corresponding-public-key.patch
 0006-g10-detects-public-key-encryption-packet-error-prope.patch
 0007-Pass-DBUS_SESSION_BUS_ADDRESS-for-gnome3.patch
+0008-gpg-Silence-a-compiler-warning.patch
+0009-po-Fix-Spanish-translation.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg.git