diff options
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rw-r--r-- | debian/control | 6 | ||||
| -rw-r--r-- | debian/patches/from-master/build-Use-LDAP_DEPRECATED-to-detect-ldap-library.patch | 34 | ||||
| -rw-r--r-- | debian/patches/ldap-implicit.diff | 25 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
5 files changed, 49 insertions, 30 deletions
diff --git a/debian/changelog b/debian/changelog index 9283944..f45124d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +gnupg2 (2.2.40-3) unstable; urgency=medium + + * Team upload. + * Replace ldap-implicit.diff with + from-master/build-Use-LDAP_DEPRECATED-to-detect-ldap-library.patch. + * Comment b-d on ghostscript, imagemagick and transfig to ease t64 + transition. + + -- Andreas Metzler <ametzler@debian.org> Sun, 17 Mar 2024 07:35:14 +0100 + gnupg2 (2.2.40-2~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-backports, remaining changes: @@ -17,7 +27,7 @@ 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 + Closes: #1066137 -- Andreas Metzler <ametzler@debian.org> Wed, 13 Mar 2024 18:27:10 +0100 diff --git a/debian/control b/debian/control index 2a0cfe9..f52f635 100644 --- a/debian/control +++ b/debian/control @@ -15,9 +15,9 @@ Build-Depends: debhelper-compat (= 13), file, gettext, - ghostscript, +# ghostscript, gpgrt-tools, - imagemagick, +# imagemagick, libassuan-dev (>= 2.5.0), libbz2-dev, libcurl4-gnutls-dev, @@ -33,7 +33,7 @@ Build-Depends: openssh-client <!nocheck>, pkg-config, texinfo, - transfig, +# transfig, zlib1g-dev | libz-dev, Build-Depends-Indep: binutils-multiarch [!amd64 !i386], 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]) diff --git a/debian/patches/ldap-implicit.diff b/debian/patches/ldap-implicit.diff deleted file mode 100644 index 688a764..0000000 --- a/debian/patches/ldap-implicit.diff +++ /dev/null @@ -1,25 +0,0 @@ -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 e3fc96d..d068059 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -20,11 +20,11 @@ Make-gpg-zip-use-tar-from-PATH.patch gpg-drop-import-clean-from-default-keyserver-import-optio.patch from-master/common-Use-gnupg_spawn_process_fd-to-invoke-gpg-agent-dir.patch from-master/common-Fix-the-previous-commit.patch +from-master/build-Use-LDAP_DEPRECATED-to-detect-ldap-library.patch 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 progress-linux/0001-gpgsm-default-to-4096-bit-keys.patch progress-linux/0002-gpg-default-to-4096-bit-keys.patch progress-linux/0003-gpg-default-key-to-ed25519.patch |