Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (0f4e2e421b771a0de2c95efde823f870d4fe0367)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (0f4e2e421b771a0de2c95efde823f870d4fe0367)
  • Date: Tue, 20 Dec 2022 16:39:59 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

crypto/gnupg-2.4/DETAILS | 4 -
crypto/gnupg-2.4/HISTORY | 4 +
crypto/gnupg-2.4/PRE_BUILD | 34
----------------
crypto/gnupg-2.4/patches/0001-Fix-dirmngr-no-LDAP.patch | 32
---------------
crypto/libksba/DETAILS | 2
crypto/libksba/HISTORY | 3 +
6 files changed, 10 insertions(+), 69 deletions(-)

New commits:
commit 0f4e2e421b771a0de2c95efde823f870d4fe0367
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libksba: => 1.6.3

commit 634f3762b7a5c217c498efc8131664178b4209cc
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

gnupg-2.4: => 2.4.0

diff --git a/crypto/gnupg-2.4/DETAILS b/crypto/gnupg-2.4/DETAILS
index fc72112..ac99ffd 100755
--- a/crypto/gnupg-2.4/DETAILS
+++ b/crypto/gnupg-2.4/DETAILS
@@ -1,6 +1,6 @@
SPELL=gnupg-2.4
- VERSION=2.3.8
-
SOURCE_HASH=sha512:6df8b1c53f0112c358f9f9eac732dd4ca13bcec24fc55a7d4a606587da988c5b7bb4c61be52b8b7769f1536dd2043087e6eb5cf224991cb0b2ed38ad00717ee2
+ VERSION=2.4.0
+
SOURCE_HASH=sha512:094d631130d4dfe4421cc5e715eaec1888d0b4b764f1be9287be86cbc34430313211739d5481b34e9b59021d05cdbae8a87a1007031cc4dc6213045984a8559a
SECURITY_PATCH=3
SOURCE=gnupg-$VERSION.tar.bz2
SOURCE_URL[0]=https://gnupg.org/ftp/gcrypt/gnupg/$SOURCE
diff --git a/crypto/gnupg-2.4/HISTORY b/crypto/gnupg-2.4/HISTORY
index 16b791d..c26a015 100644
--- a/crypto/gnupg-2.4/HISTORY
+++ b/crypto/gnupg-2.4/HISTORY
@@ -1,3 +1,7 @@
+2022-12-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.4.0
+ * PRE_BUILD, patches/0001-Fix-dirmngr-no-LDAP.patch:: deleted
+
2022-11-26 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: readline is optional

diff --git a/crypto/gnupg-2.4/PRE_BUILD b/crypto/gnupg-2.4/PRE_BUILD
deleted file mode 100755
index a079a9f..0000000
--- a/crypto/gnupg-2.4/PRE_BUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Manual verification using sha512sum as we cannot be sure that gpg is
-# available. The code is mostly copied from sorcery's libunpack
-sha512_verify() {
- local FILENAME="$( guess_filename "$SOURCE_CACHE/$1" )"
- local HASHSUM="$( echo "$2" | cut -d: -f2 )"
-
- local HASH="$(sha512sum "$FILENAME" | cut -d' ' -f1)"
- local rc=$?
-
- if [[ "$HASH" != "$HASHSUM" ]] || [[ $rc != 0 ]]
- then
- error_message "${PROBLEM_COLOR}$ALGORITHM check failed!" &&
- error_message "$HASH (computed) != $HASHSUM (expected)!$DEFAULT_COLOR" &&
- hash_user_query 1 "$SPELL" spell || return 1
- else
- is_allowed_hash "$ALGORITHM" "$HLEVEL"
- rc=$?
- hash_user_query $rc "$SPELL" spell || return 1
- fi
- return 0
-}
-
-mk_source_dir "$SOURCE_DIRECTORY" &&
-cd "$BUILD_DIRECTORY" &&
-sha512_verify "$SOURCE" "$SOURCE_HASH" &&
-
-# cheating and using internal function uncompress_unpack instead of
unpack_file
-# so as not to trigger the gpg based verification, which we already did
-# ourselves before
-uncompress_unpack "$SOURCE" &&
-
-cd "${SOURCE_DIRECTORY}" &&
-
-apply_patch_dir patches
diff --git a/crypto/gnupg-2.4/patches/0001-Fix-dirmngr-no-LDAP.patch
b/crypto/gnupg-2.4/patches/0001-Fix-dirmngr-no-LDAP.patch
deleted file mode 100644
index 350571c..0000000
--- a/crypto/gnupg-2.4/patches/0001-Fix-dirmngr-no-LDAP.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7011286ce6e1fb56c2989fdafbd11b931c489faa Mon Sep 17 00:00:00 2001
-From: NIIBE Yutaka <gniibe AT 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 AT 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
diff --git a/crypto/libksba/DETAILS b/crypto/libksba/DETAILS
index 6bc32cc..e5f9da3 100755
--- a/crypto/libksba/DETAILS
+++ b/crypto/libksba/DETAILS
@@ -1,5 +1,5 @@
SPELL=libksba
- VERSION=1.6.2
+ VERSION=1.6.3
SECURITY_PATCH=3

SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/crypto/libksba/HISTORY b/crypto/libksba/HISTORY
index d412634..3a5b192 100644
--- a/crypto/libksba/HISTORY
+++ b/crypto/libksba/HISTORY
@@ -1,3 +1,6 @@
+2022-12-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.6.3
+
2022-10-17 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: SECURITY_PATCH++, (CVE-2022-3515)




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (0f4e2e421b771a0de2c95efde823f870d4fe0367), Treeve Jelbert, 12/20/2022

Archive powered by MHonArc 2.6.24.

Top of Page