diff options
Diffstat (limited to 'extra/gnupg2')
| -rwxr-xr-x | extra/gnupg2/build | 10 | ||||
| -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, 6 deletions
diff --git a/extra/gnupg2/build b/extra/gnupg2/build index da3d3351..5ad311a1 100755 --- a/extra/gnupg2/build +++ b/extra/gnupg2/build @@ -1,13 +1,17 @@ #!/bin/sh -e export LDFLAGS="$LDFLAGS -static" -export LIBGNUTLS_CFLAGS="$(pkgconf --static --cflags gnutls)" -export LIBGNUTLS_LIBS="$(pkgconf --static --libs gnutls)" + +if cpt l gnutls; then + LIBGNUTLS_CFLAGS="$(pkgconf --static --cflags gnutls)" + LIBGNUTLS_LIBS="$(pkgconf --static --libs gnutls)" + export LIBGNUTLS_CFLAGS LIBGNUTLS_LIBS +fi ./configure \ --prefix=/usr \ --sbindir=/usr/bin \ - # --disable-gnutls + --disable-scdaemon make make DESTDIR="$1" install diff --git a/extra/gnupg2/checksums b/extra/gnupg2/checksums index 09fa0457..9479ffc1 100644 --- a/extra/gnupg2/checksums +++ b/extra/gnupg2/checksums @@ -1,2 +1,3 @@ %BLAKE3 -d931b30ce103de50d2ac94f7854dd156554f9940eda39b7cef7a5ecf211e12da gnupg-2.4.1.tar.bz2 +9420bb90ecbfb651f0840b042634c4742a5858802b901c6fdd18971ddb8e5f5a gnupg-2.5.0.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 93688d99..be62a7c4 100644 --- a/extra/gnupg2/sources +++ b/extra/gnupg2/sources @@ -1 +1,2 @@ -https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.1.tar.bz2 +https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.5.0.tar.bz2 +patches/fix-ldap.patch diff --git a/extra/gnupg2/version b/extra/gnupg2/version index 4fcdc2b3..bc7f0700 100644 --- a/extra/gnupg2/version +++ b/extra/gnupg2/version @@ -1 +1 @@ -2.4.1 1 +2.5.0 1 |