[1/1] package/gnupg2: bump version to 2.3.8

Message ID	20221115160715.10975-1-mf@go-sys.de
State	Changes Requested
Headers	show Return-Path: <buildroot-bounces@buildroot.org> From: Michael Fischer <mf@go-sys.de> To: <buildroot@busybox.net> Date: Tue, 15 Nov 2022 17:07:15 +0100 Message-ID: <20221115160715.10975-1-mf@go-sys.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/gnupg2: bump version to 2.3.8 Precedence: list Cc: Michael Fischer <mf@go-sys.de> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" <buildroot-bounces@buildroot.org>
Series	[1/1] package/gnupg2: bump version to 2.3.8 \| expand [1/1] package/gnupg2: bump version to 2.3.8

Message ID

20221115160715.10975-1-mf@go-sys.de

State

Changes Requested

Headers

From: Michael Fischer <mf@go-sys.de>
To: <buildroot@busybox.net>
Date: Tue, 15 Nov 2022 17:07:15 +0100
Message-ID: <20221115160715.10975-1-mf@go-sys.de>
MIME-Version: 1.0
X-CrossPremisesHeadersFilteredBySendConnector: exchange.go-sys.local
X-OrganizationHeadersPreserved: exchange.go-sys.local
X-Df-Sender: c21hcnRob3N0QGdvLXN5cy5kZQ==
Subject: [Buildroot] [PATCH 1/1] package/gnupg2: bump version to 2.3.8
X-BeenThere: buildroot@buildroot.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Discussion and development of buildroot <buildroot.buildroot.org>
List-Unsubscribe: <https://lists.buildroot.org/mailman/options/buildroot>,
 <mailto:buildroot-request@buildroot.org?subject=unsubscribe>
List-Archive: <http://lists.buildroot.org/pipermail/buildroot/>
List-Post: <mailto:buildroot@buildroot.org>
List-Help: <mailto:buildroot-request@buildroot.org?subject=help>
List-Subscribe: <https://lists.buildroot.org/mailman/listinfo/buildroot>,
 <mailto:buildroot-request@buildroot.org?subject=subscribe>
Cc: Michael Fischer <mf@go-sys.de>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: buildroot-bounces@buildroot.org
Sender: "buildroot" <buildroot-bounces@buildroot.org>

Series

[1/1] package/gnupg2: bump version to 2.3.8 | expand

Commit Message

Michael Fischer Nov. 15, 2022, 4:07 p.m. UTC

Add a patch to fix undefined reference to `ks_ldap_free_state'

Signed-off-by: Michael Fischer <mf@go-sys.de>
---
 package/gnupg2/0001-ks_ldap_free_state.patch | 22 ++++++++++++++++++++
 package/gnupg2/gnupg2.hash                   | 10 ++++-----
 package/gnupg2/gnupg2.mk                     |  2 +-
 3 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 package/gnupg2/0001-ks_ldap_free_state.patch

Comments

Baruch Siach Nov. 15, 2022, 4:16 p.m. UTC | #1

Hi Michael,

On Tue, Nov 15 2022, Michael Fischer wrote:
> Add a patch to fix undefined reference to `ks_ldap_free_state'
>
> Signed-off-by: Michael Fischer <mf@go-sys.de>
> ---
>  package/gnupg2/0001-ks_ldap_free_state.patch | 22 ++++++++++++++++++++
>  package/gnupg2/gnupg2.hash                   | 10 ++++-----
>  package/gnupg2/gnupg2.mk                     |  2 +-
>  3 files changed, 28 insertions(+), 6 deletions(-)
>  create mode 100644 package/gnupg2/0001-ks_ldap_free_state.patch
>
> diff --git a/package/gnupg2/0001-ks_ldap_free_state.patch b/package/gnupg2/0001-ks_ldap_free_state.patch
> new file mode 100644
> index 0000000000..03d27e94d5
> --- /dev/null
> +++ b/package/gnupg2/0001-ks_ldap_free_state.patch
> @@ -0,0 +1,22 @@
> +Fix undefined reference to `ks_ldap_free_state' if OpenLDAP is
> +not installed
> +
> +https://www.linuxfromscratch.org/blfs/view/svn/postlfs/gnupg.html
> +
> +Signed-off-by: Michael Fischer <mf@go-sys.de>

I think it would be better to just backport upstream commit 7011286ce6e1
("dirmngr: Fix build with no LDAP support.").

Make sure to add your sign-off, and a reference to upstream commit.

baruch

> +
> +--- a/dirmngr/server.c	2022-10-07 15:23:50.000000000 +0200
> ++++ b/dirmngr/server.c	2022-11-15 16:34:08.390674457 +0100
> +@@ -3137,8 +3137,12 @@ start_command_handler (assuan_fd_t fd, u
> +                ctrl->refcount);
> +   else
> +     {
> ++#if USE_LDAP
> ++#if USE_LDAP
> +       ks_ldap_free_state (ctrl->ks_get_state);
> +       ctrl->ks_get_state = NULL;
> ++#endif
> ++#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 ec2654be7b..f9c071ad45 100644
> --- a/package/gnupg2/gnupg2.hash
> +++ b/package/gnupg2/gnupg2.hash
> @@ -1,7 +1,7 @@
> -# From https://lists.gnupg.org/pipermail/gnupg-announce/2022q3/000474.html
> -sha1  9255a70a984bfbfa5312a9a52a1cf47cb0d1fc84  gnupg-2.3.7.tar.bz2
> +# From  https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000476.html
> +sha1  1f31b7b4c9c9adad97f94ea3acf1aa64c0424bcc  gnupg-2.3.8.tar.bz2
>  # Calculated based on the hash above and signature
> -# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.3.7.tar.bz2.sig
> -# using key 02F38DFF731FF97CB039A1DA549E695E905BA208
> -sha256  ee163a5fb9ec99ffc1b18e65faef8d086800c5713d15a672ab57d3799da83669  gnupg-2.3.7.tar.bz2
> +# 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
>  sha256  bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357  COPYING
> diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk
> index 7d8424c136..9dc29ca99e 100644
> --- a/package/gnupg2/gnupg2.mk
> +++ b/package/gnupg2/gnupg2.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -GNUPG2_VERSION = 2.3.7
> +GNUPG2_VERSION = 2.3.8
>  GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2
>  GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg
>  GNUPG2_LICENSE = GPL-3.0+

diff --git a/package/gnupg2/0001-ks_ldap_free_state.patch b/package/gnupg2/0001-ks_ldap_free_state.patch
new file mode 100644
index 0000000000..03d27e94d5
--- /dev/null
+++ b/package/gnupg2/0001-ks_ldap_free_state.patch
@@ -0,0 +1,22 @@ 
+Fix undefined reference to `ks_ldap_free_state' if OpenLDAP is
+not installed
+
+https://www.linuxfromscratch.org/blfs/view/svn/postlfs/gnupg.html
+
+Signed-off-by: Michael Fischer <mf@go-sys.de>
+
+--- a/dirmngr/server.c	2022-10-07 15:23:50.000000000 +0200
++++ b/dirmngr/server.c	2022-11-15 16:34:08.390674457 +0100
+@@ -3137,8 +3137,12 @@ start_command_handler (assuan_fd_t fd, u
+                ctrl->refcount);
+   else
+     {
++#if USE_LDAP
++#if USE_LDAP
+       ks_ldap_free_state (ctrl->ks_get_state);
+       ctrl->ks_get_state = NULL;
++#endif
++#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 ec2654be7b..f9c071ad45 100644
--- a/package/gnupg2/gnupg2.hash
+++ b/package/gnupg2/gnupg2.hash
@@ -1,7 +1,7 @@ 
-# From https://lists.gnupg.org/pipermail/gnupg-announce/2022q3/000474.html
-sha1  9255a70a984bfbfa5312a9a52a1cf47cb0d1fc84  gnupg-2.3.7.tar.bz2
+# From  https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000476.html
+sha1  1f31b7b4c9c9adad97f94ea3acf1aa64c0424bcc  gnupg-2.3.8.tar.bz2
 # Calculated based on the hash above and signature
-# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.3.7.tar.bz2.sig
-# using key 02F38DFF731FF97CB039A1DA549E695E905BA208
-sha256  ee163a5fb9ec99ffc1b18e65faef8d086800c5713d15a672ab57d3799da83669  gnupg-2.3.7.tar.bz2
+# 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
 sha256  bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357  COPYING
diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk
index 7d8424c136..9dc29ca99e 100644
--- a/package/gnupg2/gnupg2.mk
+++ b/package/gnupg2/gnupg2.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-GNUPG2_VERSION = 2.3.7
+GNUPG2_VERSION = 2.3.8
 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2
 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg
 GNUPG2_LICENSE = GPL-3.0+

[1/1] package/gnupg2: bump version to 2.3.8

Commit Message

Comments

Patch