Changes 1.6.0:

* Fix: wrong namespace in encryption DigestMethod
* Fix: RetrievalMethod handler
* Fix: support for >1 CRL per KeyInfo
* Fix: buffer initialization issue
* Fix: vector index bug
* Fix: stylesheet append bug
* Fix: header guard in XPath transform header
* Fix: string release crash
* Fix: improper c14n of XSLT
* Fix: setters for Reference Type/Id
* Fix: skip comments in X509Certificate elements
* Fix: more header guards
* Fix: NSS verification of RSA broken
* Expose algorithm URI on Signature and Reference objects
* White/blacklisting of otherwise registered algorithms
* Add selected XML Signature 1.1 KeyInfo extensions
* Add elliptic curve keys and signatures via ECDSA
* Support debugging of Reference/SignedInfo data
* Clean up tests for SHA2 algorithms in OpenSSL
* Updated autoconf script, added NSS support, removed pre-automake material
* Add methods for Reference removal to DSIGSignature/DSIGSignedInfo classes

6 files changed, 37 insertions, 47 deletions

diff --git a/security/xml-security-c/Makefile b/security/xml-security-c/Makefile
index dd25aa23277..2b0ff3a935d 100644
--- a/security/xml-security-c/Makefile
+++ b/security/xml-security-c/Makefile
@@ -1,27 +1,23 @@
-# $NetBSD: Makefile,v 1.6 2010/12/17 07:36:12 obache Exp $
+# $NetBSD: Makefile,v 1.7 2011/02/23 09:02:07 adam Exp $
 
-DISTNAME=		xml-security-c-1.5.1
-PKGREVISION=		3
-CATEGORIES=		security devel
-MASTER_SITES=		http://santuario.apache.org/dist/c-library/
+DISTNAME=	xml-security-c-1.6.0
+CATEGORIES=	security devel
+MASTER_SITES=	http://santuario.apache.org/dist/c-library/
 
-MAINTAINER=		hasso@NetBSD.org
-HOMEPAGE=		http://santuario.apache.org/c/index.html
-COMMENT=		XML Digital Signature specification implementation
-LICENSE=		apache-2.0
+MAINTAINER=	hasso@NetBSD.org
+HOMEPAGE=	http://santuario.apache.org/
+COMMENT=	XML Digital Signature specification implementation
+LICENSE=	apache-2.0
 
-PKG_DESTDIR_SUPPORT=    user-destdir
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		yes
+USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
-
-BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.7
-
 CONFIGURE_ENV+=		XERCESCROOT="${BUILDLINK_PREFIX.xerces-c}"
 
+BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.7
 .include "../../security/openssl/buildlink3.mk"
-.include "../../textproc/xalan-c/buildlink3.mk"
 .include "../../textproc/xerces-c/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/xml-security-c/PLIST b/security/xml-security-c/PLIST
index a03050697c1..cdea7d05f63 100644
--- a/security/xml-security-c/PLIST
+++ b/security/xml-security-c/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/07/24 20:33:16 hasso Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/02/23 09:02:07 adam Exp $
 bin/c14n
 bin/checksig
 bin/cipher
@@ -13,6 +13,7 @@ include/xsec/canon/XSECXMLNSStack.hpp
 include/xsec/dsig/DSIGAlgorithmHandlerDefault.hpp
 include/xsec/dsig/DSIGConstants.hpp
 include/xsec/dsig/DSIGKeyInfo.hpp
+include/xsec/dsig/DSIGKeyInfoDEREncoded.hpp
 include/xsec/dsig/DSIGKeyInfoExt.hpp
 include/xsec/dsig/DSIGKeyInfoList.hpp
 include/xsec/dsig/DSIGKeyInfoMgmtData.hpp
@@ -48,6 +49,7 @@ include/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp
 include/xsec/enc/OpenSSL/OpenSSLCryptoHash.hpp
 include/xsec/enc/OpenSSL/OpenSSLCryptoHashHMAC.hpp
 include/xsec/enc/OpenSSL/OpenSSLCryptoKeyDSA.hpp
+include/xsec/enc/OpenSSL/OpenSSLCryptoKeyEC.hpp
 include/xsec/enc/OpenSSL/OpenSSLCryptoKeyHMAC.hpp
 include/xsec/enc/OpenSSL/OpenSSLCryptoKeyRSA.hpp
 include/xsec/enc/OpenSSL/OpenSSLCryptoProvider.hpp
@@ -59,6 +61,7 @@ include/xsec/enc/XSECCryptoException.hpp
 include/xsec/enc/XSECCryptoHash.hpp
 include/xsec/enc/XSECCryptoKey.hpp
 include/xsec/enc/XSECCryptoKeyDSA.hpp
+include/xsec/enc/XSECCryptoKeyEC.hpp
 include/xsec/enc/XSECCryptoKeyHMAC.hpp
 include/xsec/enc/XSECCryptoKeyRSA.hpp
 include/xsec/enc/XSECCryptoProvider.hpp
@@ -77,6 +80,7 @@ include/xsec/framework/XSECException.hpp
 include/xsec/framework/XSECProvider.hpp
 include/xsec/framework/XSECURIResolver.hpp
 include/xsec/framework/XSECURIResolverXerces.hpp
+include/xsec/framework/XSECVersion.hpp
 include/xsec/framework/XSECW32Config.hpp
 include/xsec/transformers/TXFMBase.hpp
 include/xsec/transformers/TXFMBase64.hpp
@@ -95,6 +99,7 @@ include/xsec/transformers/TXFMURL.hpp
 include/xsec/transformers/TXFMXPath.hpp
 include/xsec/transformers/TXFMXPathFilter.hpp
 include/xsec/transformers/TXFMXSL.hpp
+include/xsec/utils/XSECAutoPtr.hpp
 include/xsec/utils/XSECBinTXFMInputStream.hpp
 include/xsec/utils/XSECDOMUtils.hpp
 include/xsec/utils/XSECNameSpaceExpander.hpp
diff --git a/security/xml-security-c/buildlink3.mk b/security/xml-security-c/buildlink3.mk
index d11dead8079..dffdfc02bc0 100644
--- a/security/xml-security-c/buildlink3.mk
+++ b/security/xml-security-c/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2010/12/17 07:36:12 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2011/02/23 09:02:07 adam Exp $
 
 BUILDLINK_TREE+=	xml-security-c
 
@@ -10,7 +10,6 @@ BUILDLINK_ABI_DEPENDS.xml-security-c+=	xml-security-c>=1.5.1nb3
 BUILDLINK_PKGSRCDIR.xml-security-c?=	../../security/xml-security-c
 
 .include "../../security/openssl/buildlink3.mk"
-.include "../../textproc/xalan-c/buildlink3.mk"
 .include "../../textproc/xerces-c/buildlink3.mk"
 .endif # XML_SECURITY_C_BUILDLINK3_MK
 
diff --git a/security/xml-security-c/distinfo b/security/xml-security-c/distinfo
index 20f1aa22e89..ca727525076 100644
--- a/security/xml-security-c/distinfo
+++ b/security/xml-security-c/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2009/07/24 20:33:16 hasso Exp $
+$NetBSD: distinfo,v 1.3 2011/02/23 09:02:07 adam Exp $
 
-SHA1 (xml-security-c-1.5.1.tar.gz) = e51d3dca7f32cfcc2090d4d20cf8a1d032d95d79
-RMD160 (xml-security-c-1.5.1.tar.gz) = eadeb25398d6a0fa6cd22d531470bc1dea1632d3
-Size (xml-security-c-1.5.1.tar.gz) = 957928 bytes
-SHA1 (patch-aa) = 71f089b555f755eedfecf174d418487de5c5b589
+SHA1 (xml-security-c-1.6.0.tar.gz) = df5f18bee1017b70da36e208dbe50e8e580c3eb4
+RMD160 (xml-security-c-1.6.0.tar.gz) = cbc460ab41c6e15cb37e15ea066d0cb23cdc9c6d
+Size (xml-security-c-1.6.0.tar.gz) = 865131 bytes
+SHA1 (patch-xsec_Makefile.in) = f610c63b888f8f744a5de5b47975eb7dc4aee55b
diff --git a/security/xml-security-c/patches/patch-aa b/security/xml-security-c/patches/patch-aa
deleted file mode 100644
index 771ad4b0792..00000000000
--- a/security/xml-security-c/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/05/10 12:23:36 hasso Exp $
-
---- configure.orig	2009-05-08 15:30:32 +0300
-+++ configure	2009-05-08 15:32:13 +0300
-@@ -21751,6 +21751,19 @@ case "${host}" in
- 
- 						;;
- 
-+  *-*-dragonfly*)   platform=DRAGONFLY
-+    shlibsuffix=.so
-+    lib_name="lib${PACKAGE_TARNAME}.so.${package_lib_version}"
-+    lib_major_name="lib${PACKAGE_TARNAME}.so.${package_version_major}"
-+    lib_short_name="lib${PACKAGE_TARNAME}.so"
-+
-+    # Should use -D_REENTRANT - but not yet OK
-+    PLATFORM_OPTIONS="${PLATFORM_OPTIONS} -DFREEBSD"
-+    SHARED_OPTIONS="-DFREEBSD -shared -pthread"
-+    LINK_OPTIONS="-DFREEBSD -pthread"
-+
-+						;;
-+
-   *-*-linux*)     platform=LINUX ;
-     shlibsuffix=.so
-     lib_name="lib${PACKAGE_TARNAME}.so.${package_lib_version}"
diff --git a/security/xml-security-c/patches/patch-xsec_Makefile.in b/security/xml-security-c/patches/patch-xsec_Makefile.in
new file mode 100644
index 00000000000..6a78e0d8710
--- /dev/null
+++ b/security/xml-security-c/patches/patch-xsec_Makefile.in
@@ -0,0 +1,14 @@
+$NetBSD: patch-xsec_Makefile.in,v 1.1 2011/02/23 09:02:08 adam Exp $
+
+Keep .la files installed.
+
+--- xsec/Makefile.in.orig	2011-02-22 11:02:33.000000000 +0000
++++ xsec/Makefile.in
+@@ -3108,7 +3108,6 @@ uninstall-am: uninstall-binPROGRAMS unin
+ 
+ 
+ install-exec-hook:
+-	for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.