Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Clere (038c982ec966ff92e17d7690280b0dfff01a1365)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Clere <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Clere (038c982ec966ff92e17d7690280b0dfff01a1365)
  • Date: Wed, 18 Jan 2023 18:37:45 +0000

GIT changes to master grimoire by Clere <connerclere AT gmail.com>:

crypto/p11-kit/BUILD | 5 +++++
crypto/p11-kit/DEPENDS | 30 +++++++++++++++++++++++++-----
crypto/p11-kit/HISTORY | 6 ++++++
3 files changed, 36 insertions(+), 5 deletions(-)

New commits:
commit 038c982ec966ff92e17d7690280b0dfff01a1365
Author: Clere <connerclere AT gmail.com>
Commit: Clere <connerclere AT gmail.com>

p11-kit: add in trust modules path

diff --git a/crypto/p11-kit/BUILD b/crypto/p11-kit/BUILD
new file mode 100755
index 0000000..af495b6
--- /dev/null
+++ b/crypto/p11-kit/BUILD
@@ -0,0 +1,5 @@
+if [[ $OPTS = *trust_module=enabled* ]]; then
+ TRUST=(trust_paths="${INSTALL_ROOT}/etc/ssl/certs/ca-certificates.crt") &&
+ OPTS="${TRUST[@]} $OPTS"
+fi &&
+meson_build
diff --git a/crypto/p11-kit/DEPENDS b/crypto/p11-kit/DEPENDS
index 169b863..bbdb3ab 100755
--- a/crypto/p11-kit/DEPENDS
+++ b/crypto/p11-kit/DEPENDS
@@ -1,6 +1,26 @@
. "$GRIMOIRE"/MESON_DEPENDS &&
-depends python3 &&
-optional_depends libxslt 'man=true' 'man=false' 'Build manpages' &&
-#depends GETTEXT &&
-#depends libtasn1 &&
-optional_depends libffi 'libffi=enabled' 'libffi=disabled' 'Use libffi for
building closures'
+depends PKG-CONFIG &&
+
+optional_depends ca-certificates \
+ 'trust_module=enabled' \
+ 'trust_module=disabled' \
+ 'Build trust module? (also requires libtasn1)' &&
+
+if is_depends_enabled $SPELL ca-certificates; then
+ depends libtasn1
+fi &&
+
+optional_depends libffi \
+ 'libffi=enabled' \
+ 'libffi=disabled' \
+ 'Use libffi for building closures?' &&
+
+optional_depends systemd \
+ 'systemd=enabled' \
+ 'systemd=disabled' \
+ 'Enable systemd support?' &&
+
+optional_depends libxslt \
+ 'man=true' \
+ 'man=false' \
+ 'Build man pages?'
diff --git a/crypto/p11-kit/HISTORY b/crypto/p11-kit/HISTORY
index f076086..f7e9dfb 100644
--- a/crypto/p11-kit/HISTORY
+++ b/crypto/p11-kit/HISTORY
@@ -1,3 +1,9 @@
+2023-01-18 Conner Clere <xenanthropy AT sourcemage.org>
+ * BUILD: added, plug in path to trust modules
+ * DEPENDS: deps added: systemd (optional), ca-certificates
+ and libtasn1 (optional), PKG-CONFIG;
+ removed deps: python3
+
2022-04-18 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: switched to MESON_DEPENDS




  • [SM-Commit] GIT changes to master grimoire by Clere (038c982ec966ff92e17d7690280b0dfff01a1365), Clere, 01/18/2023

Archive powered by MHonArc 2.6.24.

Top of Page