Adding debian version 2.2.40-2.debian/2.2.40-2

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 35 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 204f008..4efa517 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gnupg2 (2.2.40-2) unstable; urgency=medium
+
+  * Team upload.
+  * ldap-implicit.diff: Fix FTBFS with -Werror=implicit-function-declaration
+    due to using ldap deprecated interfaces in autoconf tests.
+    Closes: #1066137 
+
+ -- Andreas Metzler <ametzler@debian.org>  Wed, 13 Mar 2024 18:27:10 +0100
+
 gnupg2 (2.2.40-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/patches/ldap-implicit.diff b/debian/patches/ldap-implicit.diff
new file mode 100644
index 0000000..688a764
--- /dev/null
+++ b/debian/patches/ldap-implicit.diff
@@ -0,0 +1,25 @@
+From: Andreas Metzler <ametzler@debian.org>
+Date: Wed, 13 Mar 2024 10:11:45 +0100
+Subject: Fix FTBFS with -Werror=implicit-function-declaration
+
+Bug-Debian: https://bugs.debian.org/1066137
+Origin: vendor
+Forwarded: no
+Last-Update: 2024-03-13
+---
+ m4/ldap.m4 | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/m4/ldap.m4 b/m4/ldap.m4
+index 954f88a..6c86e8a 100644
+--- a/m4/ldap.m4
++++ b/m4/ldap.m4
+@@ -44,6 +44,8 @@ if test x$_ldap_with != xno ; then
+ #include <winsock2.h>
+ #include <winldap.h>
+ #else
++/* For OpenLDAP, to enable the API that we're using. */
++# define LDAP_DEPRECATED 1
+ #include <ldap.h>
+ #endif
+ ],[ldap_open("foobar",1234);],
diff --git a/debian/patches/series b/debian/patches/series
index edeee22..bb464a9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,3 +24,4 @@ from-upstream/gpg-Report-an-error-for-receiving-key-from-agent.patch
 from-upstream/gpg-Move-NETLIBS-after-GPG_ERROR_LIBS.patch
 from-upstream/dirmngr-Fix-build-with-no-LDAP-support.patch
 from-upstream/gpg-Move-NETLIBS-after-GPG_ERROR_LIBS-another.patch
+ldap-implicit.diff