guix_mirror_bot pushed a commit to branch gnome-team
in repository guix.
commit 4d20c326ca1b0c7bd8d8b9facb3acdd19fbcf1c8
Author: Maxim Cournoyer <maxim.courno...@gmail.com>
AuthorDate: Mon Dec 23 22:17:39 2024 +0900
gnu: p11-kit: Update to 0.25.5, extend trust paths.
* gnu/packages/tls.scm (p11-kit): Update to 0.25.5.
[source]: Drop hurd patch.
[arguments]: Delete #:phases.
<#:configure-flags>: Add more trust paths, for better compatibility with
foreign distributions.
[native-inputs]: Add python-minimal. Remove autoconf, automake,
gettext-minimal and libtool when targeting the Hurd.
Change-Id: I3d52b681c580ddcf10646411b07f7f86541ba163
---
gnu/local.mk | 1 -
gnu/packages/patches/p11-kit-hurd.patch | 46 -------------------------------
gnu/packages/tls.scm | 48 +++++++++++----------------------
3 files changed, 16 insertions(+), 79 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index a25d0c015e..27844e1a20 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2085,7 +2085,6 @@ dist_patch_DATA =
\
%D%/packages/patches/sqlite-hurd.patch \
%D%/packages/patches/strace-readlink-tests.patch \
%D%/packages/patches/sunxi-tools-remove-sys-io.patch \
- %D%/packages/patches/p11-kit-hurd.patch \
%D%/packages/patches/patch-hurd-path-max.patch \
%D%/packages/patches/perl-5.14-autosplit-default-time.patch \
%D%/packages/patches/perl-5.14-module-pluggable-search.patch \
diff --git a/gnu/packages/patches/p11-kit-hurd.patch
b/gnu/packages/patches/p11-kit-hurd.patch
deleted file mode 100644
index 01699882c4..0000000000
--- a/gnu/packages/patches/p11-kit-hurd.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Taken from: https://groups.google.com/g/linux.debian.bugs.dist/c/mX4GpUJih4k.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -132,6 +132,16 @@ if test "$os_unix" = "yes"; then
- AC_CHECK_FUNCS([getpeereid])
- AC_CHECK_FUNCS([getpeerucred])
- AC_CHECK_FUNCS([issetugid])
-+ case "$host_os" in
-+ kfreebsd*-gnu | gnu*)
-+ have_getpeereid=no
-+ AC_CHECK_LIB(bsd, getpeereid, have_getpeereid=yes)
-+ if test "x$have_getpeereid" = "xyes"; then
-+ AC_DEFINE([HAVE_GETPEEREID], [1], [have getpeereid])
-+ AC_SEARCH_LIBS([getpeereid], [bsd])
-+ fi
-+ ;;
-+ esac
-
- AC_CACHE_CHECK([for thread-local storage class],
- [ac_cv_tls_keyword],
-
---- a/common/unix-peer.c
-+++ b/common/unix-peer.c
-@@ -47,6 +47,11 @@
- # include <ucred.h>
- #endif
-
-+#ifdef HAVE_GETPEEREID
-+/* Declare getpeereid from /usr/include/bsd/unistd.h */
-+extern int getpeereid(int s, uid_t *euid, gid_t *egid);
-+#endif
-+
- /* Returns the unix domain socket peer information.
- * Returns zero on success.
- */
-@@ -73,7 +78,8 @@ p11_get_upeer_id (int cfd, uid_t *uid, u
- *pid = cr.pid;
-
- #elif defined(HAVE_GETPEEREID)
-- /* *BSD/MacOSX */
-+ /* *BSD/MacOSX/kFreeBSD/Hurd */
-+
- uid_t euid;
- gid_t egid;
-
\ No newline at end of file
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index e3e7f8c287..020b009d7e 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -59,11 +59,13 @@
#:use-module (gnu packages compression)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
+ #:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages build-tools)
#:use-module (gnu packages check)
#:use-module (gnu packages curl)
#:use-module (gnu packages dns)
+ #:use-module (gnu packages docbook)
#:use-module (gnu packages gawk)
#:use-module (gnu packages gettext)
#:use-module (gnu packages guile)
@@ -87,7 +89,7 @@
#:use-module (gnu packages texinfo)
#:use-module (gnu packages time)
#:use-module (gnu packages version-control)
- #:use-module (gnu packages base)
+ #:use-module (gnu packages xml)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-34)
#:use-module (srfi srfi-35))
@@ -147,51 +149,33 @@ in intelligent transportation networks.")
(define-public p11-kit
(package
(name "p11-kit")
- (version "0.24.1")
+ (version "0.25.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/p11-glue/p11-kit/releases/";
"download/" version "/p11-kit-" version ".tar.xz"))
(sha256
- (base32 "1y5fm9gwhkh902r26p90qf1g2h1ziqrk4hgf9i9sxm2wzlz7ignq"))))
+ (base32 "1rcq2578aq3ag288qnvdmj4a2wbihncndbr6iw0vxcfda1jail04"))))
(build-system gnu-build-system)
(native-inputs
- (append (list pkg-config)
- (if (target-hurd?)
- (list autoconf automake gettext-minimal libtool)
- '())))
+ (list pkg-config
+ python-minimal)) ;to generate some headers
(inputs
(append (list libffi libtasn1)
(if (target-hurd?)
(list libbsd)
'())))
(arguments
- (list #:configure-flags
- ;; Use the default certificates so that users such as flatpak
- ;; find them. See <https://issues.guix.gnu.org/49957>.
- #~'("--with-trust-paths=/etc/ssl/certs/ca-certificates.crt")
- #:phases #~(modify-phases %standard-phases
- #$@(if (target-hurd?)
- #~((add-after 'unpack 'apply-hurd-patch
- (lambda* (#:key inputs #:allow-other-keys)
- (define patch
- #$(local-file
- (search-patch
"p11-kit-hurd.patch")))
- (invoke "patch" "-p1" "--batch" "-i"
- patch)))
- (replace 'bootstrap
- (lambda _
- (invoke "autoreconf" "-fiv"))))
- #~())
- (add-before 'check 'prepare-tests
- (lambda _
- ;; "test-runtime" expects XDG_RUNTIME_DIR to be
set up
- ;; and looks for .cache and other directories
(only).
- ;; For simplicity just drop it since it is
irrelevant
- ;; in the build container.
- (substitute* "Makefile"
- (("test-runtime\\$\\(EXEEXT\\)") "")))))))
+ (list
+ #:configure-flags
+ #~(list (string-append
+ "--with-trust-paths="
+ (string-join
+ '("/etc/ssl/certs/ca-certificates.crt" ;guix, debian, gentoo,
etc.
+ "/etc/pki/tls/certs/ca-bundle.crt" ;fedora, centos
+ "/var/lib/ca-certificates/ca-bundle.pem") ;opensuse
+ ":")))))
(home-page "https://p11-glue.github.io/p11-glue/p11-kit.html";)
(synopsis "PKCS#11 library")
(description
