diff mbox series

[v2,1/1] package/gnupg2: bump to version 2.4.0

Message ID 20230106111141.325627-1-ju.o@free.fr
State Accepted
Headers show
Series [v2,1/1] package/gnupg2: bump to version 2.4.0 | expand

Commit Message

Julien Olivain Jan. 6, 2023, 11:11 a.m. UTC 
See announce:
https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000477.html

This commit also drop a patch which is now included in the new version.
See:
https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=7011286ce6e1fb56c2989fdafbd11b931c489faa

Signed-off-by: Julien Olivain <ju.o@free.fr>
---
Changes v1 -> v2:
- Removed GNUPG2_CONF_ENV, as the better fix is:
https://git.buildroot.org/buildroot/commit/?id=3a22b009992883ad57553ffb3f194303f90ad1a4
---
Tested on top of branch master at commit 3a22b00 with commands:

    make check-package
    ...
    0 warnings generated

Also tested with patch:
https://patchwork.ozlabs.org/project/buildroot/patch/20230104222007.43604-1-ju.o@free.fr/

    support/testing/run-tests \
        -d dl -o output_folder \
        tests.package.test_gnupg2.TestGnupg2
    ...
    OK
---
 package/gnupg2/0001-ks_ldap_free_state.patch | 21 --------------------
 package/gnupg2/gnupg2.hash                   | 10 +++++-----
 package/gnupg2/gnupg2.mk                     |  2 +-
 3 files changed, 6 insertions(+), 27 deletions(-)
 delete mode 100644 package/gnupg2/0001-ks_ldap_free_state.patch

Comments

Thomas Petazzoni Feb. 10, 2023, 10:16 p.m. UTC | #1 
On Fri,  6 Jan 2023 12:11:41 +0100
Julien Olivain <ju.o@free.fr> wrote:

> See announce:
> https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000477.html
> 
> This commit also drop a patch which is now included in the new version.
> See:
> https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=7011286ce6e1fb56c2989fdafbd11b931c489faa
> 
> Signed-off-by: Julien Olivain <ju.o@free.fr>
> ---
> Changes v1 -> v2:
> - Removed GNUPG2_CONF_ENV, as the better fix is:
> https://git.buildroot.org/buildroot/commit/?id=3a22b009992883ad57553ffb3f194303f90ad1a4
> ---
> Tested on top of branch master at commit 3a22b00 with commands:

Applied to master, thanks.

Thomas
diff mbox series

Patch

diff --git a/package/gnupg2/0001-ks_ldap_free_state.patch b/package/gnupg2/0001-ks_ldap_free_state.patch
deleted file mode 100644
index fa55d27c04..0000000000
--- a/package/gnupg2/0001-ks_ldap_free_state.patch
+++ /dev/null
@@ -1,21 +0,0 @@ 
-
-Fix undefined reference to `ks_ldap_free_state' if OpenLDAP is not
-installed
-
-Backported from: 7011286ce6e1fb56c2989fdafbd11b931c489faa
-
-Signed-off-by: Michael Fischer <mf@go-sys.de>
-
---- 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);
diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash
index f9c071ad45..c642862fe2 100644
--- a/package/gnupg2/gnupg2.hash
+++ b/package/gnupg2/gnupg2.hash
@@ -1,7 +1,7 @@ 
-# From  https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000476.html
-sha1  1f31b7b4c9c9adad97f94ea3acf1aa64c0424bcc  gnupg-2.3.8.tar.bz2
+# From  https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000477.html
+sha1  63dde155a8df0d5e1987efa5fc17438beca83ac1  gnupg-2.4.0.tar.bz2
 # Calculated based on the hash above and signature
-# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.3.8.tar.bz2.sig
-# using key 6DAA6E64A76D2840571B4902528897B826403ADA and AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD
-sha256  540b7a40e57da261fb10ef521a282e0021532a80fd023e75fb71757e8a4969ed  gnupg-2.3.8.tar.bz2
+# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.0.tar.bz2.sig
+# using key 6DAA6E64A76D2840571B4902528897B826403ADA
+sha256  1d79158dd01d992431dd2e3facb89fdac97127f89784ea2cb610c600fb0c1483  gnupg-2.4.0.tar.bz2
 sha256  bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357  COPYING
diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk
index 9dc29ca99e..5935ce6939 100644
--- a/package/gnupg2/gnupg2.mk
+++ b/package/gnupg2/gnupg2.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-GNUPG2_VERSION = 2.3.8
+GNUPG2_VERSION = 2.4.0
 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2
 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg
 GNUPG2_LICENSE = GPL-3.0+