diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 21:19:17 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 21:19:17 +0000 |
| commit | 3abc4573c82c94a80d5bbe909f797143dbf9adf1 (patch) | |
| tree | 5d36e7bb3e106fe13a12a8c0838d8e66bcfff0dd /debian/patches | |
| parent | Releasing progress-linux version 2.2.40-1.1~progress7.99u1. (diff) | |
| download | gnupg2-3abc4573c82c94a80d5bbe909f797143dbf9adf1.tar.xz gnupg2-3abc4573c82c94a80d5bbe909f797143dbf9adf1.zip | |
Merging debian version 2.2.40-2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | debian/patches/ldap-implicit.diff | 25 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 26 insertions, 0 deletions
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 cafba80..e3fc96d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -24,6 +24,7 @@ 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 |