commit 989dad4ffc68109341af3b8ae2ae00bc9ae181bb Author: Tim Biermann <tbier@posteo.de> Date: Tue Dec 20 14:49:25 2022 +0000 gnupg: 2.3.8 -> 2.4.0 diff --git a/gnupg/.signature b/gnupg/.signature index 988fb64ae..9430bdd23 100644 --- a/gnupg/.signature +++ b/gnupg/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/f2XziWG3aravBfVcjZiWONfSsbDGai8avcwPQgqP1/5Qt7ziVdx/vTbB7WSi5O4wDru/tCM7ApwYMgTR9gTOAs= -SHA256 (Pkgfile) = 47fab567bf35de49bfc2430ec7c69eff181c5cc78515a8d9c191b8f277f75095 +RWSE3ohX2g5d/VeetaCl3ReZdMj2aD9zfQ7554RznDW4cms4p6DszND6pLlqvRsObn1HLU9ehCTuCzKTWs6nRFJi9WBOJjIfCQk= +SHA256 (Pkgfile) = 82bdf0c1cd9120f7d4af9c7b1a67591c33e621ef2c2411a3ce7e43530b1e6f43 SHA256 (.footprint) = c2951faf9544a9cc3546a88e7b78e2f4c0e10ae923e17c11a6d9069ede5c3c21 -SHA256 (gnupg-2.3.8.tar.bz2) = 540b7a40e57da261fb10ef521a282e0021532a80fd023e75fb71757e8a4969ed -SHA256 (gnupg-2.2.40-fix-no-ldap-build.patch) = 5e0f21798dca90209b688b08db2015c6920e0d973a66a231314fdcff0691bf55 +SHA256 (gnupg-2.4.0.tar.bz2) = 1d79158dd01d992431dd2e3facb89fdac97127f89784ea2cb610c600fb0c1483 diff --git a/gnupg/Pkgfile b/gnupg/Pkgfile index 71422cf7d..83fa31cca 100644 --- a/gnupg/Pkgfile +++ b/gnupg/Pkgfile @@ -5,15 +5,13 @@ # Optional: openldap name=gnupg -version=2.3.8 +version=2.4.0 release=1 -source=(https://gnupg.org/ftp/gcrypt/$name/$name-$version.tar.bz2 - gnupg-2.2.40-fix-no-ldap-build.patch) +source=(https://gnupg.org/ftp/gcrypt/$name/$name-$version.tar.bz2) build () { cd $name-$version - patch -Np1 -i $SRC/gnupg-2.2.40-fix-no-ldap-build.patch prt-get isinst openldap || PKGMK_GNUPG+=' --disable-ldap' ./configure $PKGMK_GNUPG \ diff --git a/gnupg/gnupg-2.2.40-fix-no-ldap-build.patch b/gnupg/gnupg-2.2.40-fix-no-ldap-build.patch deleted file mode 100644 index 3ab9c0cba..000000000 --- a/gnupg/gnupg-2.2.40-fix-no-ldap-build.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=7011286c... - -From 7011286ce6e1fb56c2989fdafbd11b931c489faa Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka <gniibe@fsij.org> -Date: Fri, 14 Oct 2022 09:58:41 +0900 -Subject: [PATCH] dirmngr: Fix build with no LDAP support. - -* dirmngr/server.c [USE_LDAP] (start_command_handler): Conditionalize. - --- - -GnuPG-bug-id: 6239 -Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> ---- - dirmngr/server.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/dirmngr/server.c b/dirmngr/server.c -index 04ebfd317..98f354300 100644 ---- a/dirmngr/server.c -+++ b/dirmngr/server.c -@@ -3137,8 +3137,10 @@ start_command_handler (assuan_fd_t fd, unsigned int session_id) - ctrl->refcount); - else - { -+#if USE_LDAP - ks_ldap_free_state (ctrl->ks_get_state); - ctrl->ks_get_state = NULL; -+#endif - release_ctrl_ocsp_certs (ctrl); - xfree (ctrl->server_local); - dirmngr_deinit_default_ctrl (ctrl); --- -2.11.0 - -