[packages/gnupg] - GCC 10 and LDAP build fixes from Debian

[hawk]

commit b00d435462309c81b8055334d9c19c44f7dcad43
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Wed Aug 13 10:49:30 2025 +0200

    - GCC 10 and LDAP build fixes from Debian

 gcc10.patch | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 gnupg.spec  | 11 ++++++++---
 ldap.patch  | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 107 insertions(+), 3 deletions(-)
---
diff --git a/gnupg.spec b/gnupg.spec
index 693593a..06bbf66 100644
--- a/gnupg.spec
+++ b/gnupg.spec
@@ -13,15 +13,17 @@ Summary(uk.UTF-8):	GNU Privacy Guard - вільна заміна PGP
 Summary(zh_CN.UTF-8):	GPL的PGP加密程序
 Name:		gnupg
 Version:	1.4.23
-Release:	3
+Release:	4
 License:	GPL v3+
 Group:		Applications/File
-Source0:	ftp://ftp.gnupg.org/gcrypt/gnupg/%{name}-%{version}.tar.bz2
+Source0:	https://www.gnupg.org/ftp/gcrypt/gnupg/%{name}-%{version}.tar.bz2
 # Source0-md5:	b1df02c73572f27bc859ac05ff2259ab
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-pl.po-update.patch
 Patch2:		%{name}-fix.patch
-URL:		http://www.gnupg.org/
+Patch3:		gcc10.patch
+Patch4:		ldap.patch
+URL:		https://www.gnupg.org/
 BuildRequires:	automake >= 1:1.9.3
 BuildRequires:	bzip2-devel
 BuildRequires:	curl-devel
@@ -178,11 +180,14 @@ kluczy.
 %patch -P0 -p1
 %patch -P1 -p1
 %patch -P2 -p1
+%patch -P3 -p1
+%patch -P4 -p1
 
 %{__rm} po/stamp-po
 
 %build
 cp -f /usr/share/automake/config.sub scripts
+%{__autoconf}
 %configure \
 	--enable-ldap%{!?with_ldap:=no} \
 	--enable-mailto \
diff --git a/gcc10.patch b/gcc10.patch
new file mode 100644
index 0000000..04d0053
--- /dev/null
+++ b/gcc10.patch
@@ -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 --git a/ldap.patch b/ldap.patch
new file mode 100644
index 0000000..c10cac1
--- /dev/null
+++ b/ldap.patch
@@ -0,0 +1,38 @@
+From ddc6f7d194918791ac9dff0e5af4b80933189afd Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka <gniibe at fsij.org>
+Date: Thu, 15 Sep 2022 11:21:28 +0900
+Subject: [PATCH] build: Use LDAP_DEPRECATED to detect ldap library.
+
+* m4/ldap.m4: Define LDAP_DEPRECATED when test.
+
+--
+
+Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
+---
+ m4/ldap.m4 | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/m4/ldap.m4
++++ b/m4/ldap.m4
+@@ -42,19 +42,21 @@ if test x$_ldap_with != xno ; then
+     AC_TRY_LINK([
+ #ifdef _WIN32
+ #include <winsock2.h>
+ #include <winldap.h>
+ #else
++#define LDAP_DEPRECATED 1
+ #include <ldap.h>
+ #endif
+ ],[ldap_open("foobar",1234);],
+                 [gnupg_cv_func_ldap_init=yes],[gnupg_cv_func_ldap_init=no])
+     AC_MSG_RESULT([$gnupg_cv_func_ldap_init])
+ 
+     if test $gnupg_cv_func_ldap_init = no; then
+       AC_MSG_CHECKING([whether I can make LDAP be sane with lber.h])
+       AC_TRY_LINK([#include <lber.h>
++#define LDAP_DEPRECATED 1
+ #include <ldap.h>],[ldap_open("foobar",1234);],
+          [gnupg_cv_func_ldaplber_init=yes],[gnupg_cv_func_ldaplber_init=no])
+       AC_MSG_RESULT([$gnupg_cv_func_ldaplber_init])
+     fi
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gnupg.git/commitdiff/b00d435462309c81b8055334d9c19c44f7dcad43