[pkgsrc/trunk]: pkgsrc/security/p11-kit p11-kit: update to 0.24.1.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/security/p11-kit p11-kit: update to 0.24.1.
From: wiz <wiz%pkgsrc.org@localhost>
Date: Sun, 23 Jan 2022 23:41:48 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/11f52f6b0980
branches:  trunk
changeset: 372362:11f52f6b0980
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Jan 23 22:17:51 2022 +0000

description:
p11-kit: update to 0.24.1.

0.24.1 (stable)
 * rpc: Support protocol version negotiation [PR#371, PR#385]
 * proxy: Support copying attribute array recursively [PR#368]
 * Link libp11-kit so that it cannot unload [PR#383]
 * Translation improvements [PR#381]
 * Build fixes [PR#372, PR#373, PR#375, PR#377, PR#384, PR#407]

diffstat:

 security/p11-kit/Makefile                  |  11 ++++-
 security/p11-kit/distinfo                  |  10 ++---
 security/p11-kit/patches/patch-Makefile.in |  52 --------------------------
 security/p11-kit/patches/patch-configure   |  58 ------------------------------
 4 files changed, 12 insertions(+), 119 deletions(-)

diffs (160 lines):

diff -r e657b94f2454 -r 11f52f6b0980 security/p11-kit/Makefile
--- a/security/p11-kit/Makefile Sun Jan 23 22:11:44 2022 +0000
+++ b/security/p11-kit/Makefile Sun Jan 23 22:17:51 2022 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2021/12/08 16:02:34 adam Exp $
+# $NetBSD: Makefile,v 1.25 2022/01/23 22:17:51 wiz Exp $
 
-DISTNAME=      p11-kit-0.24.0
-PKGREVISION=   4
+DISTNAME=      p11-kit-0.24.1
 CATEGORIES=    security
 #MASTER_SITES= http://p11-glue.freedesktop.org/releases/
 MASTER_SITES+= ${MASTER_SITE_GITHUB:=p11-glue/}
@@ -43,6 +42,12 @@
 CONF_FILES+=           share/examples/p11-kit/pkcs11.conf.example \
                        ${PKG_SYSCONFDIR}/pkcs11.conf
 
+INSTALLATION_DIRS+=    share/examples/p11-kit
+
+post-install:
+       mv ${DESTDIR}${PREFIX}/etc/pkcs11/pkcs11.conf.example \
+               ${DESTDIR}${PREFIX}/share/examples/p11-kit
+
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../security/libtasn1/buildlink3.mk"
diff -r e657b94f2454 -r 11f52f6b0980 security/p11-kit/distinfo
--- a/security/p11-kit/distinfo Sun Jan 23 22:11:44 2022 +0000
+++ b/security/p11-kit/distinfo Sun Jan 23 22:17:51 2022 +0000
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.19 2021/10/26 11:17:23 nia Exp $
+$NetBSD: distinfo,v 1.20 2022/01/23 22:17:51 wiz Exp $
 
-BLAKE2s (p11-kit-0.24.0.tar.xz) = 40da821307f1551c90d136136e64e963daf841123542913775d45cbab090f75c
-SHA512 (p11-kit-0.24.0.tar.xz) = 48369d6fdae79b8c5a255c821fbdb982f0c649cce07c0d92f0ff0c16322fea8919faa94067cae2efede2da3646c0e69a71a3e399b769dc2327f247bcb113eb3c
-Size (p11-kit-0.24.0.tar.xz) = 834392 bytes
-SHA1 (patch-Makefile.in) = 3732824f96aca011d18239f3cd19b15ba250402b
+BLAKE2s (p11-kit-0.24.1.tar.xz) = fbc34ebd565c0133155616829922901f3bcb89beffc1f654351184131bfb2fd4
+SHA512 (p11-kit-0.24.1.tar.xz) = 8cf170c714bb9e0cf3df93e8ec55b8e3c55cabf2c6a27f177ac6de8b8028985df2ca0216d3215d6828dc2ae3095c4e1a4febe8cb26b88ec321defc66bb011e81
+Size (p11-kit-0.24.1.tar.xz) = 838304 bytes
 SHA1 (patch-common_compat.c) = bdcb10cebe5e7755c81f88ef033b9dfecd7a1aad
-SHA1 (patch-configure) = 1ff50e077420a59f648867210abcf114223f8231
diff -r e657b94f2454 -r 11f52f6b0980 security/p11-kit/patches/patch-Makefile.in
--- a/security/p11-kit/patches/patch-Makefile.in        Sun Jan 23 22:11:44 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.6 2021/08/24 15:07:28 manu Exp $
-
-Install examples into pkgsrc example directory.
-Avoid non-portable use of readlink(1) in Makefile.
-Since libp11-kit installs pthread_atfork() callback, make sure
-it cannot be unloaded. Upstream https://github.com/p11-glue/p11-kit/pull/383
-
---- Makefile.in.orig   2021-08-24 16:41:00.329897753 +0200
-+++ Makefile.in        2021-08-24 16:41:49.846525265 +0200
-@@ -1619,8 +1619,9 @@
- INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
- LCOV = @LCOV@
- LD = @LD@
- LDFLAGS = @LDFLAGS@
-+LDFLAGS_Z_NODELETE = @LDFLAGS_Z_NODELETE@
- LIBFFI_CFLAGS = @LIBFFI_CFLAGS@
- LIBFFI_LIBS = @LIBFFI_LIBS@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
-@@ -1906,9 +1907,9 @@
-       $(LTLIBINTL) \
-       $(NULL)
- 
- libp11_kit_la_CFLAGS = $(COMMON_CFLAGS)
--libp11_kit_la_LDFLAGS = -no-undefined -version-info \
-+libp11_kit_la_LDFLAGS = $(LDFLAGS_Z_NODELETE) -no-undefined -version-info \
-       $(P11KIT_LT_RELEASE) $(am__append_3) $(am__append_4)
- libp11_kit_la_SOURCES = \
-       p11-kit/proxy.c p11-kit/proxy.h p11-kit/proxy-init.c \
-       p11-kit/rpc-server.c \
-@@ -1971,9 +1971,9 @@
- 
- @OS_WIN32_FALSE@p11_kit_client_la_LIBADD = $(libp11_kit_la_LIBADD)
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = p11-kit/p11-kit-1.pc
--exampledir = $(p11_system_config)
-+exampledir = $(prefix)/share/examples/p11-kit
- example_DATA = p11-kit/pkcs11.conf.example
- p11_kit_p11_kit_SOURCES = \
-       p11-kit/lists.c \
-       p11-kit/p11-kit.c \
-@@ -6258,9 +6258,9 @@
- # Proxy module is actually same as library, so install a link
- @OS_WIN32_FALSE@install-exec-hook:
- @OS_WIN32_FALSE@      for i in so dylib; do \
- @OS_WIN32_FALSE@              test -f $(DESTDIR)$(libdir)/libp11-kit.$$i && \
--@OS_WIN32_FALSE@                      $(LN_S) -f `readlink $(DESTDIR)$(libdir)/libp11-kit.$$i` $(DESTDIR)$(libdir)/p11-kit-proxy.$$i || true; \
-+@OS_WIN32_FALSE@                      $(LN_S) -f `ls -ld $(DESTDIR)$(libdir)/libp11-kit.$$i | sed 's@.* -> @@'` $(DESTDIR)$(libdir)/p11-kit-proxy.$$i || true; \
- @OS_WIN32_FALSE@      done
- @OS_WIN32_FALSE@      $(MKDIR_P) $(DESTDIR)$(p11_package_config_modules)
- 
- @OS_WIN32_FALSE@uninstall-local:
diff -r e657b94f2454 -r 11f52f6b0980 security/p11-kit/patches/patch-configure
--- a/security/p11-kit/patches/patch-configure  Sun Jan 23 22:11:44 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2021/08/24 15:07:28 manu Exp $
-
-Since libp11-kit installs pthread_atfork() callback, make sure
-it cannot be unloaded.
-
-Submitted upstream https://github.com/p11-glue/p11-kit/pull/383
-
---- configure.orig     2021-08-24 16:33:08.796020438 +0200
-+++ configure  2021-08-24 16:39:51.633852995 +0200
-@@ -711,8 +711,9 @@
- USE_NLS
- PKG_CONFIG_LIBDIR
- PKG_CONFIG_PATH
- PKG_CONFIG
-+LDFLAGS_Z_NODELETE
- HAVE_LD_VERSION_SCRIPT_FALSE
- HAVE_LD_VERSION_SCRIPT_TRUE
- LT_SYS_LIBRARY_PATH
- OTOOL64
-@@ -12747,8 +12748,38 @@
-   HAVE_LD_VERSION_SCRIPT_TRUE='#'
-   HAVE_LD_VERSION_SCRIPT_FALSE=
- fi
- 
-+# --------------------------------------------------------------------
-+# Check for -z nodelete link flag
-+
-+SAVE_LDFLAGS="$LDFLAGS"
-+LDFLAGS="$LDFLAGS -Wl,-z -Wl,nodelete"
-+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether linker understands -z nodelete" >&5
-+printf %s "checking whether linker understands -z nodelete... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main (void)
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"
-+then :
-+  LDFLAGS_Z_NODELETE="-Wl,-z -Wl,nodelete"; has_option=yes
-+else $as_nop
-+  LDFLAGS_Z_NODELETE=""; has_option=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.beam \
-+    conftest$ac_exeext conftest.$ac_ext
-+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5
-+printf "%s\n" "$has_option" >&6; }
-+LDFLAGS="$SAVE_LDFLAGS"
-+
- 
- 
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated math/imath to 3.1.4
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated security/p11-kit to 0.24.1
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated math/imath to 3.1.4
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated security/p11-kit to 0.24.1
Indexes:
Home | Main Index | Thread Index | Old Index