diff options
Diffstat (limited to 'extra/gnupg2')
| -rwxr-xr-x | extra/gnupg2/build | 9 | ||||
| -rw-r--r-- | extra/gnupg2/checksums | 3 | ||||
| -rw-r--r-- | extra/gnupg2/patches/fix-ldap.patch | 12 | ||||
| -rw-r--r-- | extra/gnupg2/sources | 3 | ||||
| -rw-r--r-- | extra/gnupg2/version | 2 |
5 files changed, 24 insertions, 5 deletions
diff --git a/extra/gnupg2/build b/extra/gnupg2/build index 68be98c6..e112d126 100755 --- a/extra/gnupg2/build +++ b/extra/gnupg2/build @@ -1,9 +1,14 @@ #!/bin/sh -e export LDFLAGS="$LDFLAGS -static" -export PKG_CONFIG=pkgconf\ --static -cpt l -q gnutls && export LIBGNUTLS_LIBS="-lgnutls -latomic -lnettle -lhogweed -lnettle" +if cpt l gnutls; then + LIBGNUTLS_CFLAGS="$(pkgconf --static --cflags gnutls)" + LIBGNUTLS_LIBS="$(pkgconf --static --libs gnutls)" + export LIBGNUTLS_CFLAGS LIBGNUTLS_LIBS +fi + +patch -p1 < fix-ldap.patch ./configure \ --prefix=/usr \ diff --git a/extra/gnupg2/checksums b/extra/gnupg2/checksums index 4adda7fb..23355b5b 100644 --- a/extra/gnupg2/checksums +++ b/extra/gnupg2/checksums @@ -1,2 +1,3 @@ %BLAKE3 -799910e8f9f73e9b71fcd2154cbb4925e42e70d3162f96b3f15eaa065ead774f gnupg-2.3.7.tar.bz2 +e5e8f56b21da5c7fd791b494d193a80d2e072060663c41884b35e50cd8b8e610 gnupg-2.4.3.tar.bz2 +c8b97b99d49e3790e30c53875077a40c5a5d64b4b837464625c64946e0f1ce3d fix-ldap.patch diff --git a/extra/gnupg2/patches/fix-ldap.patch b/extra/gnupg2/patches/fix-ldap.patch new file mode 100644 index 00000000..9359484d --- /dev/null +++ b/extra/gnupg2/patches/fix-ldap.patch @@ -0,0 +1,12 @@ +--- a/dirmngr/server.c Fri Jun 30 10:53:58 2023 ++++ b/dirmngr/server.c Thu Jul 6 11:56:44 2023 +@@ -2776,7 +2776,9 @@ + + if (opt_help) + { ++#if USE_LDAP + ks_ldap_help_variables (ctrl); ++#endif /*USE_LDAP*/ + err = 0; + goto leave; + } diff --git a/extra/gnupg2/sources b/extra/gnupg2/sources index 9b1ce350..bdeeb736 100644 --- a/extra/gnupg2/sources +++ b/extra/gnupg2/sources @@ -1 +1,2 @@ -https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.3.7.tar.bz2 +https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.3.tar.bz2 +patches/fix-ldap.patch diff --git a/extra/gnupg2/version b/extra/gnupg2/version index fc94c06b..a066d610 100644 --- a/extra/gnupg2/version +++ b/extra/gnupg2/version @@ -1 +1 @@ -2.3.7 1 +2.4.3 1 |