[pkg-gnupg-maint] Bug#957293: gnupg1: diff for NMU version 1.4.23-1.1 (was: Bug#957293: gnupg1: ftbfs with GCC-10)

[Christoph Biedl]

Control: forwarded 957293 https://dev.gnupg.org/T5215
Control: tags 957293 + patch

Dear maintainer,

to resolve this issue, I've prepared an NMU for gnupg1 (versioned as
1.4.23-1.1), upload to DELAYED/2 will follow in a moment. Please feel free to
tell me if I should delay it longer.

Regards,

    Christoph

diff -Nru gnupg1-1.4.23/debian/changelog gnupg1-1.4.23/debian/changelog
--- gnupg1-1.4.23/debian/changelog	2018-06-12 00:21:07.000000000 +0200
+++ gnupg1-1.4.23/debian/changelog	2021-01-04 13:22:03.000000000 +0100
@@ -1,3 +1,10 @@
+gnupg1 (1.4.23-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix build with gcc-10. Closes: #957293
+
+ -- Christoph Biedl <debian.axhn at manchmal.in-ulm.de>  Mon, 04 Jan 2021 13:22:03 +0100
+
 gnupg1 (1.4.23-1) unstable; urgency=medium
 
   * new upstream release
diff -Nru gnupg1-1.4.23/debian/patches/0006-fix-for-gcc10.patch gnupg1-1.4.23/debian/patches/0006-fix-for-gcc10.patch
--- gnupg1-1.4.23/debian/patches/0006-fix-for-gcc10.patch	1970-01-01 01:00:00.000000000 +0100
+++ gnupg1-1.4.23/debian/patches/0006-fix-for-gcc10.patch	2021-01-04 13:21:18.000000000 +0100
@@ -0,0 +1,61 @@
+Subject: Fix build with gcc-10
+Author: Christoph Biedl <debian.axhn at manchmal.in-ulm.de>
+Date: 2021-01-04
+Bug: https://dev.gnupg.org/T5215
+Bug-Debian: https://bugs.debian.org/957293
+
+--- a/g10/options.h
++++ b/g10/options.h
+@@ -29,6 +29,8 @@
+ /* Norcraft can't cope with common symbols */
+ #if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE)
+ #define EXTERN_UNLESS_MAIN_MODULE extern
++#elif defined (__GNUC__) && __GNUC__ >= 10
++#define EXTERN_UNLESS_MAIN_MODULE __attribute__((__common__))
+ #else
+ #define EXTERN_UNLESS_MAIN_MODULE
+ #endif
+--- a/include/cipher.h
++++ b/include/cipher.h
+@@ -117,6 +117,8 @@
+ #ifndef EXTERN_UNLESS_MAIN_MODULE
+ #if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE)
+ #define EXTERN_UNLESS_MAIN_MODULE extern
++#elif defined (__GNUC__) && __GNUC__ >= 10
++#define EXTERN_UNLESS_MAIN_MODULE __attribute__((__common__))
+ #else
+ #define EXTERN_UNLESS_MAIN_MODULE
+ #endif
+--- a/include/iobuf.h
++++ b/include/iobuf.h
+@@ -72,6 +72,8 @@
+ #ifndef EXTERN_UNLESS_MAIN_MODULE
+ #if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE)
+ #define EXTERN_UNLESS_MAIN_MODULE extern
++#elif defined (__GNUC__) && __GNUC__ >= 10
++#define EXTERN_UNLESS_MAIN_MODULE __attribute__((__common__))
+ #else
+ #define EXTERN_UNLESS_MAIN_MODULE 
+ #endif
+--- a/include/memory.h
++++ b/include/memory.h
+@@ -93,6 +93,8 @@
+ #ifndef EXTERN_UNLESS_MAIN_MODULE
+ #if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE)
+ #define EXTERN_UNLESS_MAIN_MODULE extern
++#elif defined (__GNUC__) && __GNUC__ >= 10
++#define EXTERN_UNLESS_MAIN_MODULE __attribute__((__common__))
+ #else
+ #define EXTERN_UNLESS_MAIN_MODULE 
+ #endif
+--- a/include/mpi.h
++++ b/include/mpi.h
+@@ -38,6 +38,8 @@
+ #ifndef EXTERN_UNLESS_MAIN_MODULE
+ #if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE)
+ #define EXTERN_UNLESS_MAIN_MODULE extern
++#elif defined (__GNUC__) && __GNUC__ >= 10
++#define EXTERN_UNLESS_MAIN_MODULE __attribute__((__common__))
+ #else
+ #define EXTERN_UNLESS_MAIN_MODULE 
+ #endif
diff -Nru gnupg1-1.4.23/debian/patches/series gnupg1-1.4.23/debian/patches/series
--- gnupg1-1.4.23/debian/patches/series	2018-06-12 00:20:27.000000000 +0200
+++ gnupg1-1.4.23/debian/patches/series	2021-01-04 13:22:03.000000000 +0100
@@ -2,3 +2,4 @@
 0003-change-package-name-to-gnupg1.patch
 0004-doc-Enable-SOURCE_DATE_EPOCH-for-reproducibility.patch
 0005-gpg-Change-default-digest-algorithm-to-SHA256.patch
+0006-fix-for-gcc10.patch
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/pkg-gnupg-maint/attachments/20210104/02a2e305/attachment.sig>