- Update to 2.1

PR:		127400
Submitted by:	Janos Mohacsi <janos.mohacsi@bsd.hu>

5 files changed, 126 insertions, 53 deletions

diff --git a/security/opensaml2/Makefile b/security/opensaml2/Makefile
index d812315d5685..1addc1cb83ba 100644
--- a/security/opensaml2/Makefile
+++ b/security/opensaml2/Makefile
@@ -1,31 +1,36 @@
-# New ports collection makefile for:	opensaml
-# Date created:				06 Febuary 2007
-# Whom:					Tony Maher
+# New ports collection makefile for:	opensaml2
+# Date created:				15 September 2008
+# Whom:					Janos Mohacsi
 #
 # $FreeBSD$
 #
 
-PORTNAME=	opensaml
-DISTVERSION=	1.1.1
+PORTNAME=	opensaml2
+DISTVERSION=	2.1
 CATEGORIES=	security
 MASTER_SITES=	http://shibboleth.internet2.edu/downloads/opensaml/cpp/${DISTVERSION}/
+DISTNAME=	opensaml-${DISTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Open source implentation of SAML
+MAINTAINER=	janos.mohacsi@bsd.hu
+COMMENT=	Open source implentation of SAML2
 
 LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl \
-		log4cpp.4:${PORTSDIR}/devel/log4cpp \
-		xerces-c.27:${PORTSDIR}/textproc/xerces-c2 \
-		xml-security-c.13:${PORTSDIR}/security/apache-xml-security-c
+		log4shib.1:${PORTSDIR}/devel/log4shib \
+		xerces-c.28:${PORTSDIR}/textproc/xerces-c2-devel \
+		xmltooling.2:${PORTSDIR}/devel/xmltooling
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool:15
+CONFIGURE_ARGS+=--with-log4shib=${LOCALBASE} --with-openssl=${OPENSSLBASE} \
+		--with-xmltooling=${LOCALBASE}
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,^pkgdocdir.*=.*,pkgdocdir = ${DOCSDIR},' \
 		${WRKSRC}/doc/Makefile.in
+	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
+	    ${WRKSRC}/configure
+
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e '/^SUBDIRS/s,doc ,,' ${WRKSRC}/Makefile.in
 .endif
diff --git a/security/opensaml2/distinfo b/security/opensaml2/distinfo
index b58588e77419..c41755063687 100644
--- a/security/opensaml2/distinfo
+++ b/security/opensaml2/distinfo
@@ -1,3 +1,3 @@
-MD5 (opensaml-1.1.1.tar.gz) = ee41f4e9df56dcbf11cfbd331ccb3c33
-SHA256 (opensaml-1.1.1.tar.gz) = 207af6ad74bfd7ca7ec345c36e1c6507428807b111f0f90661e669b014a047f1
-SIZE (opensaml-1.1.1.tar.gz) = 438888
+MD5 (opensaml-2.1.tar.gz) = a212c7ceb5e60ddfa0cf5f3c8a09f03f
+SHA256 (opensaml-2.1.tar.gz) = 9c05b34a9f600f639f41e6d33cf34eac696f56e93907398e8cda902dd464f91d
+SIZE (opensaml-2.1.tar.gz) = 710801
diff --git a/security/opensaml2/files/patch-configure b/security/opensaml2/files/patch-configure
deleted file mode 100644
index fa5759b79306..000000000000
--- a/security/opensaml2/files/patch-configure
+++ /dev/null
@@ -1,17 +0,0 @@
---- configure.orig	2008-05-22 19:38:26.000000000 +1000
-+++ configure	2008-05-22 19:39:17.000000000 +1000
-@@ -20575,8 +20575,12 @@
- fi;
-     SSLLIBS="$SSLLIBS -lssl -lcrypto"
- else
--    SSLLIBS="`$PKG_CONFIG --libs openssl`"
--    SSLFLAGS="`$PKG_CONFIG --cflags openssl`"
-+	if `$PKG_CONFIG --libs openssl >> /dev/null 2>&1`; then
-+    	SSLLIBS="`$PKG_CONFIG --libs openssl`"
-+    	SSLFLAGS="`$PKG_CONFIG --cflags openssl`"
-+	else
-+		SSLLIBS="$SSLLIBS -lssl -lcrypto"
-+	fi
- fi
- echo "$as_me:$LINENO: checking for OpenSSL libraries" >&5
- echo $ECHO_N "checking for OpenSSL libraries... $ECHO_C" >&6
diff --git a/security/opensaml2/pkg-descr b/security/opensaml2/pkg-descr
index 4eaf5c2ec905..2533ac033abe 100644
--- a/security/opensaml2/pkg-descr
+++ b/security/opensaml2/pkg-descr
@@ -1,4 +1,4 @@
-OpenSAML is an implementation of SAML 1.0 and 1.1 providing java and C++
-APIs.  This is the C++ version.
+OpenSAML 2, a re-rewrite of OpenSAML 1, supports SAML 1.0, 1.1, 2.0 but is 
+not backwards compatible with OpenSAML 1.
 
 WWW: https://spaces.internet2.edu/display/OpenSAML/Home
diff --git a/security/opensaml2/pkg-plist b/security/opensaml2/pkg-plist
index 6dab0a60ed9a..0d9ad320643b 100644
--- a/security/opensaml2/pkg-plist
+++ b/security/opensaml2/pkg-plist
@@ -1,28 +1,113 @@
-bin/signtest
-include/saml/SAMLDateTime.h
-include/saml/config_pub.h
-include/saml/hresult.h
-include/saml/saml.h
+bin/samlsign
+include/saml/encryption/EncryptedKeyResolver.h
+include/saml/Assertion.h
+include/saml/base.h
+include/saml/exceptions.h
 include/saml/version.h
-lib/libsaml.a
+include/saml/RootObject.h
+include/saml/SAMLConfig.h
+include/saml/saml1/binding/SAMLArtifactType0001.h
+include/saml/saml1/binding/SAMLArtifactType0002.h
+include/saml/saml1/binding/SAML1MessageDecoder.h
+include/saml/saml1/binding/SAML1SOAPClient.h
+include/saml/saml1/core/Assertions.h
+include/saml/saml1/core/Protocols.h
+include/saml/saml1/profile/AssertionValidator.h
+include/saml/saml1/profile/BrowserSSOProfileValidator.h
+include/saml/saml2/binding/SAML2Artifact.h
+include/saml/saml2/binding/SAML2ArtifactType0004.h
+include/saml/saml2/binding/SAML2MessageDecoder.h
+include/saml/saml2/binding/SAML2Redirect.h
+include/saml/saml2/binding/SAML2SOAPClient.h
+include/saml/saml2/core/Assertions.h
+include/saml/saml2/core/Protocols.h
+include/saml/saml2/metadata/AbstractMetadataProvider.h
+include/saml/saml2/metadata/ChainingMetadataProvider.h
+include/saml/saml2/metadata/DynamicMetadataProvider.h
+include/saml/saml2/metadata/EndpointManager.h
+include/saml/saml2/metadata/Metadata.h
+include/saml/saml2/metadata/MetadataCredentialContext.h
+include/saml/saml2/metadata/MetadataCredentialCriteria.h
+include/saml/saml2/metadata/MetadataFilter.h
+include/saml/saml2/metadata/MetadataProvider.h
+include/saml/saml2/metadata/ObservableMetadataProvider.h
+include/saml/saml2/profile/AssertionValidator.h
+include/saml/saml2/profile/BrowserSSOProfileValidator.h
+include/saml/binding/ArtifactMap.h
+include/saml/binding/MessageDecoder.h
+include/saml/binding/MessageEncoder.h
+include/saml/binding/SAMLArtifact.h
+include/saml/binding/SecurityPolicy.h
+include/saml/binding/SecurityPolicyRule.h
+include/saml/binding/SOAPClient.h
+include/saml/signature/ContentReference.h
+include/saml/signature/SignableObject.h
+include/saml/signature/SignatureProfileValidator.h
+include/saml/util/CommonDomainCookie.h
+include/saml/util/SAMLConstants.h
+lib/libsaml.so.3
 lib/libsaml.so
-lib/libsaml.so.5
-%%PORTDOCS%%%%DOCSDIR%%/CURL.LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL-WIN32.txt
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
-%%PORTDOCS%%%%DOCSDIR%%/LOG4CPP.LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/NEWS.txt
 %%PORTDOCS%%%%DOCSDIR%%/NOTICE.txt
-%%PORTDOCS%%%%DOCSDIR%%/OPENSSL.LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/LOG4CPP.LICENSE
+share/xml/opensaml/saml20-catalog.xml
+share/xml/opensaml/saml10-catalog.xml
+share/xml/opensaml/saml11-catalog.xml
 share/xml/opensaml/cs-sstc-schema-assertion-01.xsd
-share/xml/opensaml/cs-sstc-schema-assertion-1.1.xsd
 share/xml/opensaml/cs-sstc-schema-protocol-01.xsd
+share/xml/opensaml/cs-sstc-schema-assertion-1.1.xsd
 share/xml/opensaml/cs-sstc-schema-protocol-1.1.xsd
-share/xml/opensaml/soap-envelope.xsd
-share/xml/opensaml/xml.xsd
-share/xml/opensaml/xmldsig-core-schema.xsd
-@dirrm include/saml
-@dirrm share/xml/opensaml
+share/xml/opensaml/saml-schema-assertion-2.0.xsd
+share/xml/opensaml/saml-schema-authn-context-2.0.xsd
+share/xml/opensaml/saml-schema-authn-context-auth-telephony-2.0.xsd
+share/xml/opensaml/saml-schema-authn-context-ip-2.0.xsd
+share/xml/opensaml/saml-schema-authn-context-pgp-2.0.xsd
+share/xml/opensaml/saml-schema-authn-context-ippword-2.0.xsd
+share/xml/opensaml/saml-schema-authn-context-kerberos-2.0.xsd
+share/xml/opensaml/saml-schema-authn-context-mobileonefactor-reg-2.0.xsd
+share/xml/opensaml/saml-schema-authn-context-mobileonefactor-unreg-2.0.xsd
+share/xml/opensaml/saml-schema-authn-context-mobiletwofactor-reg-2.0.xsd
+share/xml/opensaml/saml-schema-authn-context-mobiletwofactor-unreg-2.0.xsd
+share/xml/opensaml/saml-schema-authn-context-nomad-telephony-2.0.xsd
+share/xml/opensaml/saml-schema-authn-context-personal-telephony-2.0.xsd
+share/xml/opensaml/saml-schema-authn-context-ppt-2.0.xsd
+share/xml/opensaml/saml-schema-authn-context-pword-2.0.xsd
+share/xml/opensaml/saml-schema-authn-context-session-2.0.xsd
+share/xml/opensaml/saml-schema-authn-context-smartcard-2.0.xsd
+share/xml/opensaml/saml-schema-authn-context-smartcardpki-2.0.xsd
+share/xml/opensaml/saml-schema-authn-context-softwarepki-2.0.xsd
+share/xml/opensaml/saml-schema-authn-context-spki-2.0.xsd
+share/xml/opensaml/saml-schema-authn-context-srp-2.0.xsd
+share/xml/opensaml/saml-schema-authn-context-sslcert-2.0.xsd
+share/xml/opensaml/saml-schema-authn-context-telephony-2.0.xsd
+share/xml/opensaml/saml-schema-authn-context-timesync-2.0.xsd
+share/xml/opensaml/saml-schema-authn-context-types-2.0.xsd
+share/xml/opensaml/saml-schema-authn-context-x509-2.0.xsd
+share/xml/opensaml/saml-schema-authn-context-xmldsig-2.0.xsd
+share/xml/opensaml/saml-schema-dce-2.0.xsd
+share/xml/opensaml/saml-schema-ecp-2.0.xsd
+share/xml/opensaml/saml-schema-metadata-2.0.xsd
+share/xml/opensaml/saml-schema-protocol-2.0.xsd
+share/xml/opensaml/saml-schema-x500-2.0.xsd
+share/xml/opensaml/saml-schema-xacml-2.0.xsd
+share/xml/opensaml/sstc-saml1x-metadata.xsd
+share/xml/opensaml/sstc-saml-metadata-ext-query.xsd
+share/xml/opensaml/sstc-saml-protocol-ext-thirdparty.xsd
+@dirrmtry share/xml/opensaml
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/doc/opensaml
+@dirrmtry include/saml/util
+@dirrmtry include/saml/signature
+@dirrmtry include/saml/saml2/profile
+@dirrmtry include/saml/saml2/metadata
+@dirrmtry include/saml/saml2/core
+@dirrmtry include/saml/saml2/binding
+@dirrmtry include/saml/saml2
+@dirrmtry include/saml/saml1/profile
+@dirrmtry include/saml/saml1/core
+@dirrmtry include/saml/saml1/binding
+@dirrmtry include/saml/saml1
+@dirrmtry include/saml/encryption
+@dirrmtry include/saml/binding
+@dirrmtry include/saml