summaryrefslogtreecommitdiffstats
path: root/debian/patches/from-master/build-Use-LDAP_DEPRECATED-to-detect-ldap-library.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-18 21:20:10 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-18 21:20:10 +0000
commitfd0384ecc069ed8816a89aa89fa7ce992a890c6f (patch)
tree15818bace0c591615de3c85eef7b6bb6c9a54c9d /debian/patches/from-master/build-Use-LDAP_DEPRECATED-to-detect-ldap-library.patch
parentAdding debian version 2.2.40-2. (diff)
downloadgnupg2-fd0384ecc069ed8816a89aa89fa7ce992a890c6f.tar.xz
gnupg2-fd0384ecc069ed8816a89aa89fa7ce992a890c6f.zip
Adding debian version 2.2.40-3.debian/2.2.40-3
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/from-master/build-Use-LDAP_DEPRECATED-to-detect-ldap-library.patch')
-rw-r--r--debian/patches/from-master/build-Use-LDAP_DEPRECATED-to-detect-ldap-library.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/debian/patches/from-master/build-Use-LDAP_DEPRECATED-to-detect-ldap-library.patch b/debian/patches/from-master/build-Use-LDAP_DEPRECATED-to-detect-ldap-library.patch
new file mode 100644
index 0000000..81a1877
--- /dev/null
+++ b/debian/patches/from-master/build-Use-LDAP_DEPRECATED-to-detect-ldap-library.patch
@@ -0,0 +1,34 @@
+From: NIIBE Yutaka <gniibe@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@fsij.org>
+(cherry picked from commit ddc6f7d194918791ac9dff0e5af4b80933189afd)
+---
+ m4/ldap.m4 | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/m4/ldap.m4 b/m4/ldap.m4
+index 954f88a..f65eed5 100644
+--- a/m4/ldap.m4
++++ b/m4/ldap.m4
+@@ -44,6 +44,7 @@ if test x$_ldap_with != xno ; then
+ #include <winsock2.h>
+ #include <winldap.h>
+ #else
++#define LDAP_DEPRECATED 1
+ #include <ldap.h>
+ #endif
+ ],[ldap_open("foobar",1234);],
+@@ -53,6 +54,7 @@ if test x$_ldap_with != xno ; then
+ 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])