Changes 2.12.8: * libgnutls: PKCS-11 back-end was replaced by p11-kit * libgnutls: gcrypt: replaced occurences of gcry_sexp_nth_mpi (..., 0) with gcry_sexp_nth_mpi (..., GCRYMPI_FMT_USG) to fix errors with 1.5.0. * libgnutls: Verify that a certificate liste specified using gnutls_certificate_set_x509_key*(), is sorted according to TLS specification * libgnutls: Added GNUTLS_X509_CRT_LIST_FAIL_IF_UNSORTED flag for gnutls_x509_crt_list_import. It checks whether the list to be imported is properly sorted. * libgnutls: writev_emu: stop on the first incomplete write. * libgnutls: Fix zlib handling in gnutls.pc. * certtool: bug fixes in certificate request generation. * API and ABI modifications: GNUTLS_X509_CRT_LIST_FAIL_IF_UNSORTED: New element in gnutls_certificate_import_flagsdiff -r1.101 -r1.102 pkgsrc/security/gnutls/Makefile
(adam)
@@ -1,44 +1,44 @@ | @@ -1,44 +1,44 @@ | |||
1 | # $NetBSD: Makefile,v 1.101 2011/07/11 16:10:29 drochner Exp $ | 1 | # $NetBSD: Makefile,v 1.102 2011/08/11 11:03:35 adam Exp $ | |
2 | 2 | |||
3 | DISTNAME= gnutls-2.12.7 | 3 | DISTNAME= gnutls-2.12.8 | |
4 | CATEGORIES= security devel | 4 | CATEGORIES= security devel | |
5 | MASTER_SITES= ftp://ftp.gnutls.org/pub/gnutls/ \ | 5 | MASTER_SITES= ftp://ftp.gnutls.org/pub/gnutls/ \ | |
6 | ftp://ftp.gnupg.org/gcrypt/gnutls/ \ | 6 | ftp://ftp.gnupg.org/gcrypt/gnutls/ \ | |
7 | ${MASTER_SITE_GNU:=gnutls/} | 7 | ${MASTER_SITE_GNU:=gnutls/} | |
8 | EXTRACT_SUFX= .tar.bz2 | 8 | EXTRACT_SUFX= .tar.bz2 | |
9 | 9 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 10 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= http://www.gnutls.org/ | 11 | HOMEPAGE= http://www.gnutls.org/ | |
12 | COMMENT= GNU Transport Layer Security library | 12 | COMMENT= GNU Transport Layer Security library | |
13 | LICENSE= gnu-gpl-v3 AND gnu-lgpl-v2.1 | 13 | LICENSE= gnu-gpl-v3 AND gnu-lgpl-v2.1 | |
14 | 14 | |||
15 | PKG_INSTALLATION_TYPES= overwrite pkgviews | 15 | PKG_INSTALLATION_TYPES= overwrite pkgviews | |
16 | PKG_DESTDIR_SUPPORT= user-destdir | 16 | PKG_DESTDIR_SUPPORT= user-destdir | |
17 | 17 | |||
18 | USE_LANGUAGES= c c++ | 18 | USE_LANGUAGES= c c++ | |
19 | USE_LIBTOOL= yes | 19 | USE_LIBTOOL= yes | |
20 | USE_PKGLOCALEDIR= yes | 20 | USE_PKGLOCALEDIR= yes | |
21 | USE_TOOLS+= gmake | 21 | USE_TOOLS+= gmake perl | |
22 | GNU_CONFIGURE= yes | 22 | GNU_CONFIGURE= yes | |
23 | CONFIGURE_ARGS+= --without-p11-kit | |||
24 | # this library duplicates (and conflicts with) openssl | |||
25 | CONFIGURE_ARGS+= --disable-openssl-compatibility | |||
26 | ||||
23 | TEST_TARGET= check | 27 | TEST_TARGET= check | |
24 | INFO_FILES= yes | 28 | INFO_FILES= yes | |
25 | 29 | |||
26 | USE_TOOLS+= perl | |||
27 | REPLACE_PERL+= doc/scripts/gdoc doc/scripts/sort2.pl | 30 | REPLACE_PERL+= doc/scripts/gdoc doc/scripts/sort2.pl | |
28 | 31 | |||
29 | # this library duplicates (and conflicts with) openssl | |||
30 | CONFIGURE_ARGS+= --disable-openssl-compatibility | |||
31 | ||||
32 | PKGCONFIG_OVERRIDE= lib/gnutls.pc.in | 32 | PKGCONFIG_OVERRIDE= lib/gnutls.pc.in | |
33 | PKGCONFIG_OVERRIDE+= libextra/gnutls-extra.pc.in | 33 | PKGCONFIG_OVERRIDE+= libextra/gnutls-extra.pc.in | |
34 | 34 | |||
35 | MAKE_ENV+= RM=${RM:Q} | 35 | MAKE_ENV+= RM=${RM:Q} | |
36 | MAKE_ENV+= TZ=UTC | 36 | MAKE_ENV+= TZ=UTC | |
37 | 37 | |||
38 | DOCDIR= ${PREFIX}/share/doc/gnutls | 38 | DOCDIR= ${PREFIX}/share/doc/gnutls | |
39 | EGDIR= ${PREFIX}/share/examples/gnutls | 39 | EGDIR= ${PREFIX}/share/examples/gnutls | |
40 | 40 | |||
41 | .include "../../mk/bsd.prefs.mk" | 41 | .include "../../mk/bsd.prefs.mk" | |
42 | 42 | |||
43 | INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} include/gnutls | 43 | INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} include/gnutls | |
44 | 44 |
@@ -1,19 +1,18 @@ | @@ -1,19 +1,18 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.40 2011/07/11 16:10:29 drochner Exp $ | 1 | @comment $NetBSD: PLIST,v 1.41 2011/08/11 11:03:35 adam Exp $ | |
2 | bin/certtool | 2 | bin/certtool | |
3 | bin/gnutls-cli | 3 | bin/gnutls-cli | |
4 | bin/gnutls-cli-debug | 4 | bin/gnutls-cli-debug | |
5 | bin/gnutls-serv | 5 | bin/gnutls-serv | |
6 | bin/p11tool | |||
7 | bin/psktool | 6 | bin/psktool | |
8 | bin/srptool | 7 | bin/srptool | |
9 | include/gnutls/abstract.h | 8 | include/gnutls/abstract.h | |
10 | include/gnutls/compat.h | 9 | include/gnutls/compat.h | |
11 | include/gnutls/crypto.h | 10 | include/gnutls/crypto.h | |
12 | include/gnutls/extra.h | 11 | include/gnutls/extra.h | |
13 | include/gnutls/gnutls.h | 12 | include/gnutls/gnutls.h | |
14 | include/gnutls/gnutlsxx.h | 13 | include/gnutls/gnutlsxx.h | |
15 | include/gnutls/openpgp.h | 14 | include/gnutls/openpgp.h | |
16 | include/gnutls/pkcs11.h | 15 | include/gnutls/pkcs11.h | |
17 | include/gnutls/pkcs12.h | 16 | include/gnutls/pkcs12.h | |
18 | include/gnutls/x509.h | 17 | include/gnutls/x509.h | |
19 | info/gnutls-certificate-user-use-case.png | 18 | info/gnutls-certificate-user-use-case.png |
@@ -1,11 +1,11 @@ | @@ -1,11 +1,11 @@ | |||
1 | $NetBSD: distinfo,v 1.74 2011/07/11 16:10:29 drochner Exp $ | 1 | $NetBSD: distinfo,v 1.75 2011/08/11 11:03:35 adam Exp $ | |
2 | 2 | |||
3 | SHA1 (gnutls-2.12.7.tar.bz2) = 41943d8f8648072a8e6a40cb213c91acf0451937 | 3 | SHA1 (gnutls-2.12.8.tar.bz2) = b250d3ddf3fafe69916f248d7ba909ae92022a35 | |
4 | RMD160 (gnutls-2.12.7.tar.bz2) = dd1043938087add3ce5e48e6253b5c5cc8140468 | 4 | RMD160 (gnutls-2.12.8.tar.bz2) = 0fc7abac111629fa3f3794ca2d5b1b72972dde00 | |
5 | Size (gnutls-2.12.7.tar.bz2) = 7153031 bytes | 5 | Size (gnutls-2.12.8.tar.bz2) = 7153363 bytes | |
6 | SHA1 (patch-ab) = 49de2419935972f958acacdffec32388986f1ea0 | 6 | SHA1 (patch-ab) = 49de2419935972f958acacdffec32388986f1ea0 | |
7 | SHA1 (patch-ae) = cadc476a6a120390c3c2792b52dd02d27a3884e6 | 7 | SHA1 (patch-ae) = cadc476a6a120390c3c2792b52dd02d27a3884e6 | |
8 | SHA1 (patch-af) = 321c3488dd383a09dd95f6a15f50b9f54f6aa5fc | 8 | SHA1 (patch-af) = 321c3488dd383a09dd95f6a15f50b9f54f6aa5fc | |
9 | SHA1 (patch-ai) = 2c5c181ec6de9622cac66c2d5fe2cc8f3f89fbe8 | 9 | SHA1 (patch-ai) = 2c5c181ec6de9622cac66c2d5fe2cc8f3f89fbe8 | |
10 | SHA1 (patch-lib_configure) = a3a64d0aed1929d3b4edf91d48f213da23269027 | 10 | SHA1 (patch-lib_configure) = 26b1f6c0cf6dd8af27fb1d27513c0d007f7b0da6 | |
11 | SHA1 (patch-lib_nettle_egd.c) = b7e9769e8c620519c43ca7b7481a558e9d389c68 | 11 | SHA1 (patch-lib_nettle_egd.c) = b7e9769e8c620519c43ca7b7481a558e9d389c68 |
@@ -1,20 +1,20 @@ | @@ -1,20 +1,20 @@ | |||
1 | $NetBSD: patch-lib_configure,v 1.1 2011/04/27 16:56:43 tnn Exp $ | 1 | $NetBSD: patch-lib_configure,v 1.2 2011/08/11 11:03:35 adam Exp $ | |
2 | 2 | |||
3 | --- lib/configure.orig 2011-04-22 11:40:04.000000000 +0000 | 3 | --- lib/configure.orig 2011-08-08 21:01:09.000000000 +0000 | |
4 | +++ lib/configure | 4 | +++ lib/configure | |
5 | @@ -17201,6 +17201,7 @@ else | 5 | @@ -17361,6 +17361,7 @@ else | |
6 | $as_echo "no" >&6; } | 6 | ZLIB_HAS_PKGCONFIG=n | |
7 | fi | 7 | fi | |
8 | 8 | |||
9 | +if false; then # there is no zlib.pc in pkgsrc | 9 | +if false; then # there is no zlib.pc in pkgsrc | |
10 | if test x$ac_zlib != xno; then | 10 | if test x$ac_zlib != xno; then | |
11 | if test x$GNUTLS_REQUIRES_PRIVATE = x; then | 11 | if test "$ZLIB_HAS_PKGCONFIG" = "y" ; then | |
12 | GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib" | 12 | if test x$GNUTLS_REQUIRES_PRIVATE = x; then | |
13 | @@ -17208,6 +17209,7 @@ if test x$ac_zlib != xno; then | 13 | @@ -17372,6 +17373,7 @@ if test x$ac_zlib != xno; then | |
14 | GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE , zlib" | 14 | GNUTLS_ZLIB_LIBS_PRIVATE="$LTLIBZ" | |
15 | fi | 15 | fi | |
16 | fi | 16 | fi | |
17 | +fi | 17 | +fi | |
18 | 18 | |||
19 | 19 | |||
20 | 20 |