sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (6e86b215c7d72ae419255cf1c9ad6a56dc526e50)
- From: Ismael Luceno <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (6e86b215c7d72ae419255cf1c9ad6a56dc526e50)
- Date: Mon, 15 Jul 2024 18:22:29 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:
crypto/gnupg-2.5/DEPENDS |
15 ++--
crypto/gnupg-2.5/HISTORY |
5 +
crypto/gnupg-2.5/PRE_BUILD |
3
crypto/gnupg-2.5/patches/0001-scd-Add-unistd.h-for-read-2-write-2.patch |
34 ++++++++++
4 files changed, 51 insertions(+), 6 deletions(-)
New commits:
commit 6e86b215c7d72ae419255cf1c9ad6a56dc526e50
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
gnupg-2.5: Fix build against musl
commit 67db8be6435f30e41fdce8d7fa49ecc535941228
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
gnupg-2.5: Updated to versioned dependencies
diff --git a/crypto/gnupg-2.5/DEPENDS b/crypto/gnupg-2.5/DEPENDS
index 6225495..034cc10 100755
--- a/crypto/gnupg-2.5/DEPENDS
+++ b/crypto/gnupg-2.5/DEPENDS
@@ -1,9 +1,12 @@
-depends npth &&
-depends libgpg-error &&
-depends libgcrypt &&
-depends libassuan &&
-depends libksba &&
-depends PKG-CONFIG &&
+. "$GRIMOIRE"/VDEPENDS &&
+vdepends <<! &&
+ PKG-CONFIG
+ libassuan >= 3.0.0
+ libgcrypt >= 1.11.0
+ libgpg-error >= 1.50
+ libksba >= 1.6.3
+ npth >= 1.2
+!
optional_depends openldap '--enable-ldap' '--disable-ldap' 'for LDAP
keyserver interface' &&
optional_depends ccid '--disable-ccid-driver' '' 'system card reader' &&
diff --git a/crypto/gnupg-2.5/HISTORY b/crypto/gnupg-2.5/HISTORY
index 8f7eebc..acdceb1 100644
--- a/crypto/gnupg-2.5/HISTORY
+++ b/crypto/gnupg-2.5/HISTORY
@@ -1,3 +1,8 @@
+2024-07-15 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: updated to versioned dependencies
+ * PRE_BUILD, patches/0001-scd-Add-unistd.h-for-read-2-write-2.patch:
+ fixed build against musl
+
2024-07-06 Pavel Vinogradov <public AT sourcemage.org>
* CONFLICTS, DEPENDS, DETAILS, PROVIDES, TRIGGERS: spell created,
version 2.5.0
diff --git a/crypto/gnupg-2.5/PRE_BUILD b/crypto/gnupg-2.5/PRE_BUILD
new file mode 100755
index 0000000..c230ad1
--- /dev/null
+++ b/crypto/gnupg-2.5/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git
a/crypto/gnupg-2.5/patches/0001-scd-Add-unistd.h-for-read-2-write-2.patch
b/crypto/gnupg-2.5/patches/0001-scd-Add-unistd.h-for-read-2-write-2.patch
new file mode 100644
index 0000000..3181f42
--- /dev/null
+++ b/crypto/gnupg-2.5/patches/0001-scd-Add-unistd.h-for-read-2-write-2.patch
@@ -0,0 +1,34 @@
+From 1d5cfa9b7fd22e1c46eeed5fa9fed2af6f81d34f Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka <gniibe AT fsij.org>
+Date: Tue, 9 Jul 2024 10:48:02 +0900
+Subject: [PATCH] scd: Add <unistd.h> for read(2) / write(2) .
+
+* scd/app.c: Include <unistd.h>.
+
+--
+
+Reported-by: David Bohman
+GnuPG-bug-id: 7193
+Signed-off-by: NIIBE Yutaka <gniibe AT fsij.org>
+Upstream-Status: Backport [commit 1d5cfa9b7fd22e1c46eeed5fa9fed2af6f81d34f]
+Origin: Upstream
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ scd/app.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/scd/app.c b/scd/app.c
+index aac6e0e9b1c6..625f9b914263 100644
+--- a/scd/app.c
++++ b/scd/app.c
+@@ -22,6 +22,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <unistd.h>
+ #include <npth.h>
+
+ #include "scdaemon.h"
+--
+2.44.0
+
- [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (6e86b215c7d72ae419255cf1c9ad6a56dc526e50), Ismael Luceno, 07/15/2024
Archive powered by MHonArc 2.6.24.