diff options
| -rw-r--r-- | security/p11-kit/Makefile | 4 | ||||
| -rw-r--r-- | security/p11-kit/distinfo | 15 | ||||
| -rw-r--r-- | security/p11-kit/patches/patch-Makefile.in | 6 | ||||
| -rw-r--r-- | security/p11-kit/patches/patch-common_debug.c | 16 | ||||
| -rw-r--r-- | security/p11-kit/patches/patch-common_message.c | 16 | ||||
| -rw-r--r-- | security/p11-kit/patches/patch-p11-kit_test-server.sh | 25 |
6 files changed, 11 insertions, 71 deletions
diff --git a/security/p11-kit/Makefile b/security/p11-kit/Makefile index 65022a3ebec..eb0209ad948 100644 --- a/security/p11-kit/Makefile +++ b/security/p11-kit/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2018/04/18 00:46:25 schmonz Exp $ +# $NetBSD: Makefile,v 1.8 2018/07/06 15:33:39 prlw1 Exp $ -DISTNAME= p11-kit-0.23.10 +DISTNAME= p11-kit-0.23.12 CATEGORIES= security #MASTER_SITES= http://p11-glue.freedesktop.org/releases/ MASTER_SITES+= ${MASTER_SITE_GITHUB:=p11-glue/} diff --git a/security/p11-kit/distinfo b/security/p11-kit/distinfo index aab0ff49b16..d77d0f1ece2 100644 --- a/security/p11-kit/distinfo +++ b/security/p11-kit/distinfo @@ -1,10 +1,7 @@ -$NetBSD: distinfo,v 1.4 2018/04/17 13:26:15 wiz Exp $ +$NetBSD: distinfo,v 1.5 2018/07/06 15:33:39 prlw1 Exp $ -SHA1 (p11-kit-0.23.10.tar.gz) = 88cdf4e7c50e3da02f1e69173d731410f6123efe -RMD160 (p11-kit-0.23.10.tar.gz) = 5c87af0f7a088b58789859f42a95b9e2d038c5bb -SHA512 (p11-kit-0.23.10.tar.gz) = 42a004613f951e4e18c10cd204bcba348267cc7b3ae0d9f26d69012b086af446947660575d5751539b8d4dd77fa9b684054ad5ac978119e0a2e94fcdf9842178 -Size (p11-kit-0.23.10.tar.gz) = 1121419 bytes -SHA1 (patch-Makefile.in) = 8257299a8c1dc0b93e6ff919749823cbe83bc38c -SHA1 (patch-common_debug.c) = d711b2dabff5a64cb0b524cfbda67043311b9cf6 -SHA1 (patch-common_message.c) = 8e098702b38c86ad8564510fb47bd97e1f62d4ab -SHA1 (patch-p11-kit_test-server.sh) = 32768acd75723228adcaa5ead9139a9899918366 +SHA1 (p11-kit-0.23.12.tar.gz) = 9334d3b1890c7fe0f765460a69da70c796254373 +RMD160 (p11-kit-0.23.12.tar.gz) = 37220162e0a041bf388fcaaf621189ad0a8d0121 +SHA512 (p11-kit-0.23.12.tar.gz) = ae43b1f6ba5400cf5ae7b64b8c93aa47e5c7ee927196828600fd88beb6fdf6bcb6a63bc822d356757255638f9fbf10896e0604e32a1332a9a833836fa0468726 +Size (p11-kit-0.23.12.tar.gz) = 1257028 bytes +SHA1 (patch-Makefile.in) = c7f26205c09537593a49dea33c05e1fd29e9dbc3 diff --git a/security/p11-kit/patches/patch-Makefile.in b/security/p11-kit/patches/patch-Makefile.in index 71854766330..c08d60dc0b5 100644 --- a/security/p11-kit/patches/patch-Makefile.in +++ b/security/p11-kit/patches/patch-Makefile.in @@ -1,10 +1,10 @@ -$NetBSD: patch-Makefile.in,v 1.2 2018/04/17 13:26:15 wiz Exp $ +$NetBSD: patch-Makefile.in,v 1.3 2018/07/06 15:33:39 prlw1 Exp $ Install examples into pkgsrc example directory. ---- Makefile.in.orig 2018-02-27 15:35:35.000000000 +0000 +--- Makefile.in.orig 2018-05-30 14:18:17.000000000 +0000 +++ Makefile.in -@@ -1636,7 +1636,7 @@ libp11_kit_testable_la_LIBADD = $(COMMON +@@ -1691,7 +1691,7 @@ libp11_kit_pkcs11_gnu_la_CFLAGS = -DCRYP @OS_WIN32_FALSE@p11_kit_client_la_LIBADD = $(libp11_kit_la_LIBADD) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = p11-kit/p11-kit-1.pc diff --git a/security/p11-kit/patches/patch-common_debug.c b/security/p11-kit/patches/patch-common_debug.c deleted file mode 100644 index 9d21572bd22..00000000000 --- a/security/p11-kit/patches/patch-common_debug.c +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-common_debug.c,v 1.1 2018/04/17 13:26:15 wiz Exp $ - -NetBSD does not have uselocale() -https://github.com/p11-glue/p11-kit/issues/143 - ---- common/debug.c.orig 2018-01-31 12:47:38.000000000 +0000 -+++ common/debug.c -@@ -162,7 +162,7 @@ p11_debug_message_err (int flag, - va_end (args); - - snprintf (strerr, sizeof (strerr), "Unknown error %d", errnum); --#ifdef HAVE_STRERROR_L -+#if defined(HAVE_STRERROR_L) && !defined(__NetBSD__) - loc = uselocale ((locale_t) 0); - if (loc != NULL) - strncpy (strerr, strerror_l (errnum, loc), sizeof (strerr)); diff --git a/security/p11-kit/patches/patch-common_message.c b/security/p11-kit/patches/patch-common_message.c deleted file mode 100644 index 576a42ae042..00000000000 --- a/security/p11-kit/patches/patch-common_message.c +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-common_message.c,v 1.1 2018/04/17 13:26:15 wiz Exp $ - -NetBSD does not have uselocale() -https://github.com/p11-glue/p11-kit/issues/143 - ---- common/message.c.orig 2018-01-31 12:47:38.000000000 +0000 -+++ common/message.c -@@ -118,7 +118,7 @@ p11_message_err (int errnum, - buffer[length] = 0; - - snprintf (strerr, sizeof (strerr), "Unknown error %d", errnum); --#ifdef HAVE_STRERROR_L -+#if defined(HAVE_STRERROR_L) && !defined(__NetBSD__) - loc = uselocale ((locale_t) 0); - if (loc != NULL) - strncpy (strerr, strerror_l (errnum, loc), sizeof (strerr)); diff --git a/security/p11-kit/patches/patch-p11-kit_test-server.sh b/security/p11-kit/patches/patch-p11-kit_test-server.sh deleted file mode 100644 index 2acd5174654..00000000000 --- a/security/p11-kit/patches/patch-p11-kit_test-server.sh +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-p11-kit_test-server.sh,v 1.1 2018/04/17 13:26:15 wiz Exp $ - -Fix unportable test(1) operator. - ---- p11-kit/test-server.sh.orig 2018-01-31 12:47:38.000000000 +0000 -+++ p11-kit/test-server.sh -@@ -24,8 +24,8 @@ fi - - . ./start.env - --test "${P11_KIT_SERVER_ADDRESS+set}" == set || exit 1 --test "${P11_KIT_SERVER_PID+set}" == set || exit 1 -+test "${P11_KIT_SERVER_ADDRESS+set}" = set || exit 1 -+test "${P11_KIT_SERVER_PID+set}" = set || exit 1 - - "$abs_top_builddir"/p11-kit-server -s -k > stop.env 2> stop.err - if test $? -ne 0; then -@@ -35,5 +35,5 @@ fi - - . ./stop.env - --test "${P11_KIT_SERVER_ADDRESS-unset}" == unset || exit 1 --test "${P11_KIT_SERVER_PID-unset}" == unset || exit 1 -+test "${P11_KIT_SERVER_ADDRESS-unset}" = unset || exit 1 -+test "${P11_KIT_SERVER_PID-unset}" = unset || exit 1 |