Update Shibboleth to 3.0.2

Also update the toolchain to latest versions. This includes a security fix for
apache-xml-security-c.

Releaseinfo:    https://wiki.shibboleth.net/confluence/display/SP3/ReleaseNotes
Security:       5786185a-9a43-11e8-b34b-6cc21735f730
Security:       https://shibboleth.net/community/advisories/secadv_20180803.txt

6 files changed, 33 insertions, 78 deletions

diff --git a/security/apache-xml-security-c/Makefile b/security/apache-xml-security-c/Makefile
index a9b0878a0800..6af87d04cc13 100644
--- a/security/apache-xml-security-c/Makefile
+++ b/security/apache-xml-security-c/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xml-security-c
-PORTVERSION=	1.7.3
-PORTREVISION=	1
+PORTVERSION=	2.0.1
 CATEGORIES=	security
 MASTER_SITES=	APACHE/santuario/c-library
 PKGNAMEPREFIX=	apache-
@@ -13,13 +12,13 @@ COMMENT=	Apache XML security libraries - C++ version
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS+=	libxerces-c.so.3:textproc/xerces-c3
+LIB_DEPENDS+=	libxerces-c.so:textproc/xerces-c3
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-xerces=${LOCALBASE}
-USES=		cpe gmake libtool tar:bzip2 ssl
+CONFIGURE_ARGS=	--disable-dependency-tracking --without-xalan --with-openssl=${OPENSSLBASE}
+USES=		cpe gmake libtool tar:bzip2 ssl pkgconfig autoreconf
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
+CONFIGURE_ENV+=	openssl_LIBS="-L${OPENSSLLIB} -lcrypto" openssl_CFLAGS=-I${OPENSSLBASE}
 
 CPE_PRODUCT=	xml_security_for_c\+\+
 CPE_VENDOR=	apache
diff --git a/security/apache-xml-security-c/distinfo b/security/apache-xml-security-c/distinfo
index 268b789eafd9..bca157a5e3a1 100644
--- a/security/apache-xml-security-c/distinfo
+++ b/security/apache-xml-security-c/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1473589138
-SHA256 (xml-security-c-1.7.3.tar.bz2) = 09a1165c2cfcd468dbc170935db10861107dfa22e02754092473c0f555ef6819
-SIZE (xml-security-c-1.7.3.tar.bz2) = 673977
+TIMESTAMP = 1533580535
+SHA256 (xml-security-c-2.0.1.tar.bz2) = e7e9ccb8fd9d67eb1b981b191c724112f0b45f5b601f5fcc64708ebd6906e791
+SIZE (xml-security-c-2.0.1.tar.bz2) = 659112
diff --git a/security/apache-xml-security-c/files/patch-configure.ac b/security/apache-xml-security-c/files/patch-configure.ac
new file mode 100644
index 000000000000..21321d8e652e
--- /dev/null
+++ b/security/apache-xml-security-c/files/patch-configure.ac
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2018-08-01 13:02:42 UTC
++++ configure.ac
+@@ -176,7 +176,7 @@ AC_ARG_WITH([openssl],
+     [with_openssl=check])
+ 
+ AS_IF([test x"$with_openssl" != xno],
+-    [AX_PKG_CHECK_MODULES([openssl],,[libcrypto],
++    [AX_PKG_CHECK_MODULES([openssl],,[],
+         [with_openssl=found
+          AC_DEFINE([XSEC_HAVE_OPENSSL],[1],[Define if OpenSSL is in use])
+ 
diff --git a/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLCryptoSymmetricKey.hpp b/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLCryptoSymmetricKey.hpp
deleted file mode 100644
index 4f6c93c307a2..000000000000
--- a/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLCryptoSymmetricKey.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-------------------------------------------------------------------------
-r1806743 | scantor | 2017-08-31 01:23:01 +0200 (Thu, 31 Aug 2017) | 1 line
-
-Fix NULL warnings
-
-Index: xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp
-===================================================================
---- xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp	(revision 1806742)
-+++ xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp	(revision 1806743)
-@@ -151,7 +151,7 @@
-                              SymmetricKeyMode mode = MODE_CBC,
-                              const unsigned char * iv = NULL,
-                              const unsigned char* tag = NULL,
--                             unsigned int taglen = NULL);
-+                             unsigned int taglen = 0);
- 
-     /**
-      * \brief Continue an decrypt operation using this key.
-Index: xsec/enc/XSECCryptoSymmetricKey.hpp
-===================================================================
---- xsec/enc/XSECCryptoSymmetricKey.hpp	(revision 1806742)
-+++ xsec/enc/XSECCryptoSymmetricKey.hpp	(revision 1806743)
-@@ -185,7 +185,7 @@
- 							 SymmetricKeyMode mode = MODE_CBC,
- 							 const unsigned char* iv = NULL,
-                              const unsigned char* tag = NULL,
--                             unsigned int taglen = NULL) = 0;
-+                             unsigned int taglen = 0) = 0;
- 
- 	/**
- 	 * \brief Continue a decrypt operation using this key.
-
-------------------------------------------------------------------------
diff --git a/security/apache-xml-security-c/files/patch-xsec_tools_checksig_InteropResolver.cpp b/security/apache-xml-security-c/files/patch-xsec_tools_checksig_InteropResolver.cpp
deleted file mode 100644
index 82f7f3dc336f..000000000000
--- a/security/apache-xml-security-c/files/patch-xsec_tools_checksig_InteropResolver.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-------------------------------------------------------------------------
-r1807005 | scantor | 2017-09-01 22:42:20 +0200 (Fri, 01 Sep 2017) | 1 line
-
-Cleanup, reverse double negatives in Xalan code paths
-
-Index: xsec/tools/checksig/InteropResolver.cpp
-===================================================================
---- xsec/tools/checksig/InteropResolver.cpp	(revision 1807004)
-+++ xsec/tools/checksig/InteropResolver.cpp	(revision 1807005)
-@@ -648,7 +648,7 @@
- 
- 	}
- 
--	return false;
-+	return NULL;
- 
- }
- 
-
-------------------------------------------------------------------------
diff --git a/security/apache-xml-security-c/pkg-plist b/security/apache-xml-security-c/pkg-plist
index aa6bab871eec..563a6f9cda35 100644
--- a/security/apache-xml-security-c/pkg-plist
+++ b/security/apache-xml-security-c/pkg-plist
@@ -1,11 +1,11 @@
-bin/c14n
-bin/checksig
-bin/cipher
-bin/siginf
-bin/templatesign
-bin/txfmout
-bin/xklient
-bin/xtest
+bin/xsec-c14n
+bin/xsec-checksig
+bin/xsec-cipher
+bin/xsec-siginf
+bin/xsec-templatesign
+bin/xsec-txfmout
+bin/xsec-xklient
+bin/xsec-xtest
 include/xsec/canon/XSECC14n20010315.hpp
 include/xsec/canon/XSECCanon.hpp
 include/xsec/canon/XSECXMLNSStack.hpp
@@ -54,6 +54,7 @@ include/xsec/enc/OpenSSL/OpenSSLCryptoKeyRSA.hpp
 include/xsec/enc/OpenSSL/OpenSSLCryptoProvider.hpp
 include/xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp
 include/xsec/enc/OpenSSL/OpenSSLCryptoX509.hpp
+include/xsec/enc/OpenSSL/OpenSSLSupport.hpp
 include/xsec/enc/XSCrypt/XSCryptCryptoBase64.hpp
 include/xsec/enc/XSECCryptoBase64.hpp
 include/xsec/enc/XSECCryptoException.hpp
@@ -85,22 +86,20 @@ include/xsec/transformers/TXFMBase.hpp
 include/xsec/transformers/TXFMBase64.hpp
 include/xsec/transformers/TXFMC14n.hpp
 include/xsec/transformers/TXFMChain.hpp
+include/xsec/transformers/TXFMChar.hpp
 include/xsec/transformers/TXFMCipher.hpp
 include/xsec/transformers/TXFMConcatChains.hpp
 include/xsec/transformers/TXFMDocObject.hpp
 include/xsec/transformers/TXFMEnvelope.hpp
-include/xsec/transformers/TXFMMD5.hpp
+include/xsec/transformers/TXFMHash.hpp
 include/xsec/transformers/TXFMOutputFile.hpp
 include/xsec/transformers/TXFMParser.hpp
 include/xsec/transformers/TXFMSB.hpp
-include/xsec/transformers/TXFMSHA1.hpp
 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
 include/xsec/utils/XSECPlatformUtils.hpp
 include/xsec/utils/XSECSOAPRequestor.hpp
@@ -109,8 +108,6 @@ include/xsec/utils/XSECSafeBuffer.hpp
 include/xsec/utils/XSECSafeBufferFormatter.hpp
 include/xsec/utils/XSECTXFMInputSource.hpp
 include/xsec/utils/XSECXPathNodeList.hpp
-include/xsec/utils/unixutils/XSECBinHTTPURIInputStream.hpp
-include/xsec/utils/unixutils/XSECURIResolverGenericUnix.hpp
 include/xsec/xenc/XENCCipher.hpp
 include/xsec/xenc/XENCCipherData.hpp
 include/xsec/xenc/XENCCipherReference.hpp
@@ -160,5 +157,6 @@ include/xsec/xkms/XKMSValidateResult.hpp
 include/xsec/xkms/XKMSValidityInterval.hpp
 lib/libxml-security-c.a
 lib/libxml-security-c.so
-lib/libxml-security-c.so.17
-lib/libxml-security-c.so.17.0.3
+lib/libxml-security-c.so.20
+lib/libxml-security-c.so.20.0.1
+libdata/pkgconfig/xml-security-c.pc