package/gnupg2: bump version to 2.3.8
PATCH 1/1 package/gnupg2: bump version to 2.3.8
Add a patch to fix undefined reference to `ks_ldap_free_state'
--- 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
package/gnupg2/0001-ks_ldap_free_state.patch new file +22 -0
@@ -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 <[email protected]> + +--- 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);
package/gnupg2/gnupg2.hash +5 -5
@@ -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
package/gnupg2/gnupg2.mk +1 -1
@@ -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+
Signature · 6 lines
2.20.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Hi Michael,
Quoted 16 lines · Michael Fischer
Add a patch to fix undefined reference to `ks_ldap_free_state'
Signed-off-by Michael Fischer <[email protected]>--- 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.patchpackage/gnupg2/0001-ks_ldap_free_state.patch new file +0
-0
package/gnupg2/0001-ks_ldap_free_state.patch line 6
Quoted 6 lines
package/gnupg2/0001-ks_ldap_free_state.patch new file +6
-0@@ -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 <[email protected]>
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
Quoted 46 lines
package/gnupg2/0001-ks_ldap_free_state.patch new file +16
-0+ +--- 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);package/gnupg2/gnupg2.hash +5
-5@@ -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 COPYINGpackage/gnupg2/gnupg2.mk +1
-1@@ -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+
Signature · 7 lines
~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- [email protected] - tel: +972.52.368.4656, http://www.tkos.co.il -
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildrootPATCH v2 1/1 package/gnupg2: bump version to 2.3.8
Add patch 0001 to fix undefined reference to `ks_ldap_free_state' backported from commit 7011286ce6e1fb56c2989fdafbd11b931c489faa
--- package/gnupg2/0001-ks_ldap_free_state.patch | 21 ++++++++++++++++++++ package/gnupg2/gnupg2.hash | 10 +++++----- package/gnupg2/gnupg2.mk | 2 +- 3 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 package/gnupg2/0001-ks_ldap_free_state.patch
package/gnupg2/0001-ks_ldap_free_state.patch new file +21 -0
@@ -0,0 +1,21 @@ + +Fix undefined reference to `ks_ldap_free_state' if OpenLDAP is not +installed + +Backported from: 7011286ce6e1fb56c2989fdafbd11b931c489faa + +Signed-off-by: Michael Fischer <[email protected]> + +--- 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);
package/gnupg2/gnupg2.hash +5 -5
@@ -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
package/gnupg2/gnupg2.mk +1 -1
@@ -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+
Signature · 6 lines
2.20.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Michael" == Michael Fischer <[email protected]> writes:
Add patch 0001 to fix undefined reference to `ks_ldap_free_state' backported from commit
7011286ce6e1fb56c2989fdafbd11b931c489faaSigned-off-by Michael Fischer <[email protected]>
Committed after adding a link to https://dev.gnupg.org/T6106 to make it clear that this only contains fixes, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Michael" == Michael Fischer <[email protected]> writes:
Add patch 0001 to fix undefined reference to `ks_ldap_free_state' backported from commit
7011286ce6e1fb56c2989fdafbd11b931c489faaSigned-off-by Michael Fischer <[email protected]>
Committed to 2022.08.x and 2022.02.x, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot