Update to 1.2.17, for security reasons.

* Preparations for 1.2.17 release
* Fixed security issue with libxslt (CVE-2011-1425, reported by Nicolas Gregoire)
* Fixed pkcs12 file loading (based on patch from Andre de Souza Pinto)
* Fixed comments (based on patch from Wolfgang Woehl)
* Fixed extra quotes in configure (bug #631258)
* Fixed configure issue with empty --with-libxml/libxsl and config scripts in /bin directory
* Fixed gcrypt init/shutdown (patch from Roumen)

6 files changed, 9 insertions, 50 deletions

diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile
index f31436f19ab..f70a1196769 100644
--- a/security/xmlsec1/Makefile
+++ b/security/xmlsec1/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.21 2010/10/04 12:32:16 obache Exp $
+# $NetBSD: Makefile,v 1.22 2011/04/01 12:27:45 wiz Exp $
 #
 
-DISTNAME=		xmlsec1-1.2.16
-PKGREVISION=		1
+DISTNAME=		xmlsec1-1.2.17
 CATEGORIES=		security
 MASTER_SITES=		http://www.aleksey.com/xmlsec/download/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.aleksey.com/xmlsec/
 COMMENT=		XML signature and encryption library
+LICENSE=		mit AND mpl-1.1 # plus advertising clause
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/security/xmlsec1/PLIST b/security/xmlsec1/PLIST
index 2a842168a22..67959c38f32 100644
--- a/security/xmlsec1/PLIST
+++ b/security/xmlsec1/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2010/06/06 12:36:11 obache Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/04/01 12:27:45 wiz Exp $
 bin/xmlsec1
 bin/xmlsec1-config
 include/xmlsec1/xmlsec/app.h
@@ -29,6 +29,7 @@ include/xmlsec1/xmlsec/openssl/x509.h
 include/xmlsec1/xmlsec/parser.h
 include/xmlsec1/xmlsec/private.h
 include/xmlsec1/xmlsec/private/xkms.h
+include/xmlsec1/xmlsec/private/xslt.h
 include/xmlsec1/xmlsec/soap.h
 include/xmlsec1/xmlsec/strings.h
 include/xmlsec1/xmlsec/templates.h
diff --git a/security/xmlsec1/distinfo b/security/xmlsec1/distinfo
index e5d0361d991..2c304fe75a7 100644
--- a/security/xmlsec1/distinfo
+++ b/security/xmlsec1/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.10 2010/12/25 11:35:06 obache Exp $
+$NetBSD: distinfo,v 1.11 2011/04/01 12:27:45 wiz Exp $
 
-SHA1 (xmlsec1-1.2.16.tar.gz) = ecd220b4498bbe212188fffd0aded92910d4bbd9
-RMD160 (xmlsec1-1.2.16.tar.gz) = 15064b3c3ec84c87b271013cb3fa165972f0e2c4
-Size (xmlsec1-1.2.16.tar.gz) = 1803092 bytes
+SHA1 (xmlsec1-1.2.17.tar.gz) = 724cefc8ee691a6a85fa2b031a66de70ac25cc66
+RMD160 (xmlsec1-1.2.17.tar.gz) = 3eafce828747d8988c40362ccd9b7058350a5bf5
+Size (xmlsec1-1.2.17.tar.gz) = 1731324 bytes
 SHA1 (patch-ab) = 2fb1ee3c9ab02775817340185ab3e3b261253590
 SHA1 (patch-ac) = 6d9d1180468b20b91ae3120c72e0a54e32fb7e91
-SHA1 (patch-ae) = df381960d33810f5501bd904bd4cef2bb7bf30fd
-SHA1 (patch-af) = 2b83843cbc09ae4dfdc21143fb733159ee0c79d1
-SHA1 (patch-ag) = 31aa963be3c46486cea72a98d260fb9a5d5c47ac
diff --git a/security/xmlsec1/patches/patch-ae b/security/xmlsec1/patches/patch-ae
deleted file mode 100644
index bf6b3ce3802..00000000000
--- a/security/xmlsec1/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2010/10/04 12:46:26 obache Exp $
-
-remove redundant escape slash.
-
---- xmlsec-gnutls.pc.in.orig	2010-05-25 21:52:46.000000000 +0000
-+++ xmlsec-gnutls.pc.in
-@@ -7,5 +7,5 @@ Name: xmlsec1-gnutls
- Version: @VERSION@
- Description: XML Security Library implements XML Signature and XML Encryption standards
- Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ libxslt >= @LIBXSLT_MIN_VERSION@
--Cflags: -DXMLSEC_CRYPTO=\\\"gnutls\\\" @XMLSEC_GNUTLS_CFLAGS@
-+Cflags: -DXMLSEC_CRYPTO=\"gnutls\" @XMLSEC_GNUTLS_CFLAGS@
- Libs: @XMLSEC_GNUTLS_LIBS@
diff --git a/security/xmlsec1/patches/patch-af b/security/xmlsec1/patches/patch-af
deleted file mode 100644
index e73ef04981d..00000000000
--- a/security/xmlsec1/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.2 2010/10/04 12:46:26 obache Exp $
-
-remove redundant escape slash.
-
---- xmlsec-openssl.pc.in.orig	2010-05-25 21:52:46.000000000 +0000
-+++ xmlsec-openssl.pc.in
-@@ -7,5 +7,5 @@ Name: xmlsec1-openssl
- Version: @VERSION@
- Description: XML Security Library implements XML Signature and XML Encryption standards
- Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ libxslt >= @LIBXSLT_MIN_VERSION@ 
--Cflags: -DXMLSEC_CRYPTO=\\\"openssl\\\" @XMLSEC_OPENSSL_CFLAGS@
-+Cflags: -DXMLSEC_CRYPTO=\"openssl\" @XMLSEC_OPENSSL_CFLAGS@
- Libs: @XMLSEC_OPENSSL_LIBS@
diff --git a/security/xmlsec1/patches/patch-ag b/security/xmlsec1/patches/patch-ag
deleted file mode 100644
index b688954000e..00000000000
--- a/security/xmlsec1/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2010/10/04 12:46:26 obache Exp $
-
-remove redundant escape slash.
-
---- xmlsec.pc.in.orig	2010-05-25 21:52:46.000000000 +0000
-+++ xmlsec.pc.in
-@@ -7,5 +7,5 @@ Name: xmlsec1
- Version: @VERSION@
- Description: XML Security Library implements XML Signature and XML Encryption standards
- Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ libxslt >= @LIBXSLT_MIN_VERSION@ 
--Cflags: -DXMLSEC_CRYPTO=\\\"@XMLSEC_CRYPTO@\\\" -DXMLSEC_CRYPTO_DYNAMIC_LOADING=1 @XMLSEC_CORE_CFLAGS@
-+Cflags: -DXMLSEC_CRYPTO=\"@XMLSEC_CRYPTO@\" -DXMLSEC_CRYPTO_DYNAMIC_LOADING=1 @XMLSEC_CORE_CFLAGS@
- Libs: -L${libdir} @XMLSEC_CORE_LIBS@