Import the latest shibboleth-sp from pkgsrc-wip.

9 files changed, 406 insertions, 0 deletions

diff --git a/www/shibboleth-sp/DESCR b/www/shibboleth-sp/DESCR
new file mode 100644
index 00000000000..6bd2c8a139b
--- /dev/null
+++ b/www/shibboleth-sp/DESCR
@@ -0,0 +1,4 @@
+The Shibboleth System is a standards based, open source software package for
+web single sign-on across or within organizational boundaries. It allows sites
+to make informed authorization decisions for individual access of protected
+online resources in a privacy-preserving manner.
diff --git a/www/shibboleth-sp/INSTALL b/www/shibboleth-sp/INSTALL
new file mode 100644
index 00000000000..6addb0eb633
--- /dev/null
+++ b/www/shibboleth-sp/INSTALL
@@ -0,0 +1,9 @@
+#!/bin/sh
+#
+# $NetBSD: INSTALL,v 1.1.1.1 2011/03/15 13:15:37 pettai Exp $
+
+case ${STAGE} in
+POST-INSTALL)
+        ${SH} ${DESTDIR}${PREFIX}/sbin/shib-keygen
+        ;;
+esac
diff --git a/www/shibboleth-sp/MESSAGE b/www/shibboleth-sp/MESSAGE
new file mode 100644
index 00000000000..3d3ca0b5842
--- /dev/null
+++ b/www/shibboleth-sp/MESSAGE
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1.1.1 2011/03/15 13:15:37 pettai Exp $
+
+For latest information about configurating the Shibboleth2 SP, See:
+https://spaces.internet2.edu/display/SHIB2/Home
+
+===========================================================================
diff --git a/www/shibboleth-sp/Makefile b/www/shibboleth-sp/Makefile
new file mode 100644
index 00000000000..ec3ced22e52
--- /dev/null
+++ b/www/shibboleth-sp/Makefile
@@ -0,0 +1,111 @@
+# $NetBSD: Makefile,v 1.1.1.1 2011/03/15 13:15:37 pettai Exp $
+#
+
+DISTNAME=	shibboleth-sp-${PKGVERSION}
+PKGVERSION=	2.4.2
+CATEGORIES=	www
+MASTER_SITES=	http://shibboleth.internet2.edu/downloads/shibboleth/cppsp/latest/
+
+MAINTAINER=	pettai@NetBSD.org
+HOMEPAGE=	http://shibboleth.internet2.edu/
+COMMENT=	Shibboleth2 Service Provider
+LICENSE=	apache-2.0
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+BUILD_DEFS+=	VARBASE
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--with-xmltooling=${PREFIX:Q}
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+
+WRKSRC=		${WRKDIR}/shibboleth-2.4.2
+EGDIR=		${PREFIX}/share/examples/shibboleth
+SHIB_CONFDIR=	${PKG_SYSCONFDIR}/shibboleth
+
+USE_LIBTOOL=	yes
+USE_LANGUAGES=	c c++
+
+RCD_SCRIPTS=	shibd
+
+APACHE_MODULE=	YES
+
+SUBST_CLASSES+=		paths
+SUBST_FILES.paths=	${WRKSRC}/configs/Makefile.in
+SUBST_FILES.paths+=	${WRKSRC}/configs/keygen.sh
+SUBST_STAGE.paths=	post-patch
+SUBST_SED.paths=	-e 's,@EGDIR@,${EGDIR},'
+SUBST_SED.paths+=	-e 's,@SHIB_CONFDIR@,${SHIB_CONFDIR},'
+
+
+CONF_FILES=	${EGDIR}/console.logger \
+			${SHIB_CONFDIR}/console.logger
+CONF_FILES+=	${EGDIR}/native.logger \
+			${SHIB_CONFDIR}/native.logger
+CONF_FILES+=	${EGDIR}/shibd.logger \
+			${SHIB_CONFDIR}/shibd.logger
+CONF_FILES+=	${EGDIR}/syslog.logger \
+			${SHIB_CONFDIR}/syslog.logger
+CONF_FILES+=	${EGDIR}/shibboleth2.xml \
+			${SHIB_CONFDIR}/shibboleth2.xml
+CONF_FILES+=	${EGDIR}/attribute-map.xml \
+			${SHIB_CONFDIR}/attribute-map.xml
+CONF_FILES+=	${EGDIR}/attribute-policy.xml \
+			${PKG_SYSCONFDIR}/attribute-policy.xml
+CONF_FILES+=	${EGDIR}/protocols.xml \
+			${SHIB_CONFDIR}/protocols.xml
+CONF_FILES+=	${EGDIR}/security-policy.xml \
+			${SHIB_CONFDIR}/security-policy.xml
+CONF_FILES+=	${EGDIR}/accessError.html \
+			${SHIB_CONFDIR}/accessError.html
+CONF_FILES+=	${EGDIR}/sessionError.html \
+			${SHIB_CONFDIR}/sessionError.html
+CONF_FILES+=	${EGDIR}/metadataError.html \
+			${SHIB_CONFDIR}/metadataError.html
+CONF_FILES+=	${EGDIR}/bindingTemplate.html \
+			${SHIB_CONFDIR}/bindingTemplate.html
+CONF_FILES+=	${EGDIR}/discoveryTemplate.html \
+			${SHIB_CONFDIR}/discoveryTemplate.html
+CONF_FILES+=	${EGDIR}/postTemplate.html \
+			${SHIB_CONFDIR}/postTemplate.html
+CONF_FILES+=	${EGDIR}/localLogout.html \
+			${SHIB_CONFDIR}/localLogout.html
+CONF_FILES+=	${EGDIR}/globalLogout.html \
+			${SHIB_CONFDIR}/globalLogout.html
+CONF_FILES+=	${EGDIR}/partialLogout.html \
+			${SHIB_CONFDIR}/partialLogout.html
+CONF_FILES+=	${EGDIR}/sslError.html \
+			${SHIB_CONFDIR}/sslError.html
+
+INSTALLATION_DIRS+=	${PREFIX}/bin ${PREFIX}/sbin
+INSTALLATION_DIRS+=	${PREFIX}/include/shibsp/attribute/resolver
+INSTALLATION_DIRS+=	${PREFIX}/include/shibsp/binding
+INSTALLATION_DIRS+=	${PREFIX}/include/shibsp/handler
+INSTALLATION_DIRS+=	${PREFIX}/include/shibsp/lite
+INSTALLATION_DIRS+=     ${PREFIX}/include/shibsp/metadata
+INSTALLATION_DIRS+=	${PREFIX}/include/shibsp/remoting
+INSTALLATION_DIRS+=	${PREFIX}/include/shibsp/security
+INSTALLATION_DIRS+=	${PREFIX}/include/shibsp/util
+INSTALLATION_DIRS+=	${PREFIX}/share/doc/shibboleth-${PKGVERSION}
+INSTALLATION_DIRS+=     ${PREFIX}/share/doc/shibboleth-${PKGVERSION}/api
+INSTALLATION_DIRS+=     ${PREFIX}/share/xml/shibboleth
+INSTALLATION_DIRS+=     ${PREFIX}/lib/shibboleth
+INSTALLATION_DIRS+=	${EGDIR} ${SHIB_CONFDIR}
+
+OWN_DIRS+=		${VARBASE}/log/shibboleth
+
+post-install:
+	${INSTALL} ${WRKSRC}/configs/keygen.sh \
+		${DESTDIR}${PREFIX}/sbin/shib-keygen
+	${INSTALL} ${WRKSRC}/configs/metagen.sh \
+		${DESTDIR}${PREFIX}/bin/shib-metagen
+
+.include "../../security/openssl/buildlink3.mk"
+.include "../../devel/log4shib/buildlink3.mk"
+.include "../../textproc/xerces-c/buildlink3.mk"
+.include "../../security/xml-security-c/buildlink3.mk"
+.include "../../textproc/xmltooling/buildlink3.mk"
+.include "../../security/opensaml/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+.include "../../mk/apache.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/shibboleth-sp/PLIST b/www/shibboleth-sp/PLIST
new file mode 100644
index 00000000000..c7f4ca310c8
--- /dev/null
+++ b/www/shibboleth-sp/PLIST
@@ -0,0 +1,142 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2011/03/15 13:15:37 pettai Exp $
+bin/mdquery
+bin/resolvertest
+bin/shib-metagen
+include/shibsp/AbstractSPRequest.h
+include/shibsp/AccessControl.h
+include/shibsp/Application.h
+include/shibsp/GSSRequest.h
+include/shibsp/RequestMapper.h
+include/shibsp/SPConfig.h
+include/shibsp/SPRequest.h
+include/shibsp/ServiceProvider.h
+include/shibsp/SessionCache.h
+include/shibsp/SessionCacheEx.h
+include/shibsp/TransactionLog.h
+include/shibsp/attribute/Attribute.h
+include/shibsp/attribute/AttributeDecoder.h
+include/shibsp/attribute/ExtensibleAttribute.h
+include/shibsp/attribute/NameIDAttribute.h
+include/shibsp/attribute/ScopedAttribute.h
+include/shibsp/attribute/SimpleAttribute.h
+include/shibsp/attribute/XMLAttribute.h
+include/shibsp/attribute/filtering/AttributeFilter.h
+include/shibsp/attribute/filtering/BasicFilteringContext.h
+include/shibsp/attribute/filtering/FilterPolicyContext.h
+include/shibsp/attribute/filtering/FilteringContext.h
+include/shibsp/attribute/filtering/MatchFunctor.h
+include/shibsp/attribute/resolver/AttributeExtractor.h
+include/shibsp/attribute/resolver/AttributeResolver.h
+include/shibsp/attribute/resolver/ResolutionContext.h
+include/shibsp/base.h
+include/shibsp/binding/ArtifactResolver.h
+include/shibsp/binding/ProtocolProvider.h
+include/shibsp/binding/SOAPClient.h
+include/shibsp/exceptions.h
+include/shibsp/handler/AbstractHandler.h
+include/shibsp/handler/AssertionConsumerService.h
+include/shibsp/handler/Handler.h
+include/shibsp/handler/LogoutHandler.h
+include/shibsp/handler/LogoutInitiator.h
+include/shibsp/handler/RemotedHandler.h
+include/shibsp/handler/SessionInitiator.h
+include/shibsp/lite/CommonDomainCookie.h
+include/shibsp/lite/SAMLConstants.h
+include/shibsp/metadata/MetadataExt.h
+include/shibsp/metadata/MetadataProviderCriteria.h
+include/shibsp/paths.h
+include/shibsp/remoting/ListenerService.h
+include/shibsp/remoting/ddf.h
+include/shibsp/security/PKIXTrustEngine.h
+include/shibsp/security/SecurityPolicy.h
+include/shibsp/security/SecurityPolicyProvider.h
+include/shibsp/util/CGIParser.h
+include/shibsp/util/DOMPropertySet.h
+include/shibsp/util/PropertySet.h
+include/shibsp/util/SPConstants.h
+include/shibsp/util/TemplateParameters.h
+include/shibsp/version.h
+lib/libshibsp-lite.a
+lib/libshibsp-lite.so
+lib/libshibsp-lite.so.5
+lib/libshibsp-lite.so.5.0.2
+lib/libshibsp.a
+lib/libshibsp.so
+lib/libshibsp.so.5
+lib/libshibsp.so.5.0.2
+lib/shibboleth/adfs-lite.la
+lib/shibboleth/adfs.la
+lib/shibboleth/mod_shib_22.la
+sbin/shib-keygen
+sbin/shibd
+share/doc/shibboleth-${PKGVERSION}/CREDITS.txt
+share/doc/shibboleth-${PKGVERSION}/FASTCGI.LICENSE
+share/doc/shibboleth-${PKGVERSION}/LICENSE.txt
+share/doc/shibboleth-${PKGVERSION}/LOG4CPP.LICENSE
+share/doc/shibboleth-${PKGVERSION}/NOTICE.txt
+share/doc/shibboleth-${PKGVERSION}/OPENSSL.LICENSE
+share/doc/shibboleth-${PKGVERSION}/README.txt
+share/doc/shibboleth-${PKGVERSION}/RELEASE.txt
+share/doc/shibboleth-${PKGVERSION}/logo.jpg
+share/doc/shibboleth-${PKGVERSION}/main.css
+share/examples/rc.d/shibd
+share/examples/shibboleth/accessError.html
+share/examples/shibboleth/accessError.html.dist
+share/examples/shibboleth/apache.config
+share/examples/shibboleth/apache2.config
+share/examples/shibboleth/apache22.config
+share/examples/shibboleth/attribute-map.xml
+share/examples/shibboleth/attribute-map.xml.dist
+share/examples/shibboleth/attribute-policy.xml
+share/examples/shibboleth/attribute-policy.xml.dist
+share/examples/shibboleth/bindingTemplate.html
+share/examples/shibboleth/bindingTemplate.html.dist
+share/examples/shibboleth/console.logger
+share/examples/shibboleth/console.logger.dist
+share/examples/shibboleth/discoveryTemplate.html
+share/examples/shibboleth/discoveryTemplate.html.dist
+share/examples/shibboleth/example-metadata.xml
+share/examples/shibboleth/example-metadata.xml.dist
+share/examples/shibboleth/example-shibboleth2.xml
+share/examples/shibboleth/example-shibboleth2.xml.dist
+share/examples/shibboleth/globalLogout.html
+share/examples/shibboleth/globalLogout.html.dist
+share/examples/shibboleth/localLogout.html
+share/examples/shibboleth/localLogout.html.dist
+share/examples/shibboleth/metadataError.html
+share/examples/shibboleth/metadataError.html.dist
+share/examples/shibboleth/native.logger
+share/examples/shibboleth/native.logger.dist
+share/examples/shibboleth/partialLogout.html
+share/examples/shibboleth/partialLogout.html.dist
+share/examples/shibboleth/postTemplate.html
+share/examples/shibboleth/postTemplate.html.dist
+share/examples/shibboleth/protocols.xml
+share/examples/shibboleth/protocols.xml.dist
+share/examples/shibboleth/security-policy.xml
+share/examples/shibboleth/security-policy.xml.dist
+share/examples/shibboleth/sessionError.html
+share/examples/shibboleth/sessionError.html.dist
+share/examples/shibboleth/shibboleth2.xml
+share/examples/shibboleth/shibboleth2.xml.dist
+share/examples/shibboleth/shibd-osx.plist
+share/examples/shibboleth/shibd.logger
+share/examples/shibboleth/shibd.logger.dist
+share/examples/shibboleth/sslError.html
+share/examples/shibboleth/sslError.html.dist
+share/examples/shibboleth/syslog.logger
+share/examples/shibboleth/syslog.logger.dist
+share/examples/shibboleth/upgrade.xsl
+share/xml/shibboleth/WS-Trust.xsd
+share/xml/shibboleth/catalog.xml
+share/xml/shibboleth/shibboleth-2.0-afp-mf-basic.xsd
+share/xml/shibboleth/shibboleth-2.0-afp-mf-saml.xsd
+share/xml/shibboleth/shibboleth-2.0-afp.xsd
+share/xml/shibboleth/shibboleth-2.0-attribute-map.xsd
+share/xml/shibboleth/shibboleth-2.0-native-sp-config.xsd
+share/xml/shibboleth/shibboleth-2.0-native-sp-protocols.xsd
+share/xml/shibboleth/shibboleth-2.0-sp-notify.xsd
+share/xml/shibboleth/shibboleth-metadata-1.0.xsd
+share/xml/shibboleth/shibboleth.xsd
+@pkgdir share/doc/shibboleth-${PKGVERSION}/api
+@pkgdir etc/shibboleth
diff --git a/www/shibboleth-sp/distinfo b/www/shibboleth-sp/distinfo
new file mode 100644
index 00000000000..178f2c3cf70
--- /dev/null
+++ b/www/shibboleth-sp/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1.1.1 2011/03/15 13:15:37 pettai Exp $
+
+SHA1 (shibboleth-sp-2.4.2.tar.gz) = a93e64a6a6b46d79f177395aecbd67985247f5c4
+RMD160 (shibboleth-sp-2.4.2.tar.gz) = 16e2ead5e8279d900bcfba6961ce813c3e9a29c9
+Size (shibboleth-sp-2.4.2.tar.gz) = 854404 bytes
+SHA1 (patch-aa) = 904faee5523244854bb792b41719ec76adfe8558
+SHA1 (patch-ab) = f667e876e1ebd84e706433156eed2cd60e905372
diff --git a/www/shibboleth-sp/files/shibd.sh b/www/shibboleth-sp/files/shibd.sh
new file mode 100644
index 00000000000..fb615d2666c
--- /dev/null
+++ b/www/shibboleth-sp/files/shibd.sh
@@ -0,0 +1,24 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: shibd.sh,v 1.1.1.1 2011/03/15 13:15:37 pettai Exp $
+#
+# PROVIDE: shibd
+# REQUIRE: DAEMON
+
+if [ -f /etc/rc.subr ]; then
+        . /etc/rc.subr
+fi
+
+name="shibd"
+rcvar=$name
+command="@PREFIX@/sbin/shibd"
+pidfile="/var/run/shibboleth/shibd.pid"
+command_args=""
+
+if [ -f /etc/rc.subr ]; then
+        load_rc_config $name
+        run_rc_command "$1"
+else
+        echo -n " ${name}"
+        ${command} ${shibd_flags} ${command_args}
+fi
diff --git a/www/shibboleth-sp/patches/patch-aa b/www/shibboleth-sp/patches/patch-aa
new file mode 100644
index 00000000000..377e9ebecd4
--- /dev/null
+++ b/www/shibboleth-sp/patches/patch-aa
@@ -0,0 +1,87 @@
+$NetBSD: patch-aa,v 1.1.1.1 2011/03/15 13:15:37 pettai Exp $
+
+Remove uneccesary config, handle it from pkgsrc instead
+
+--- configs/Makefile.in.orig	2011-02-18 04:44:04.000000000 +0000
++++ configs/Makefile.in
+@@ -260,16 +260,12 @@ pkgxmldir = $(datadir)/xml/@PACKAGE@
+ pkgrundir = $(localstatedir)/run/@PACKAGE@
+ pkgsysconfdir = $(sysconfdir)/@PACKAGE@
+ pkgsysconf_DATA = \
+-	shibd-redhat \
+-	shibd-suse \
+-	shibd-debian \
+ 	shibd-osx.plist \
+ 	apache.config \
+ 	apache2.config \
+ 	apache22.config \
+-	keygen.sh \
+-	metagen.sh \
+ 	upgrade.xsl
++EGDIR = @EGDIR@
+ 
+ 
+ # The config files are installed "special".  Unlike the entries in
+@@ -373,15 +369,15 @@ clean-libtool:
+ 	-rm -rf .libs _libs
+ install-pkgsysconfDATA: $(pkgsysconf_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(pkgsysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgsysconfdir)"
+-	@list='$(pkgsysconf_DATA)'; test -n "$(pkgsysconfdir)" || list=; \
++	test -z "$(EGDIR)" || $(MKDIR_P) "$(DESTDIR)$(EGDIR)"
++	@list='$(pkgsysconf_DATA)'; test -n "$(EGDIR)" || list=; \
+ 	for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  echo "$$d$$p"; \
+ 	done | $(am__base_list) | \
+ 	while read files; do \
+-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgsysconfdir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgsysconfdir)" || exit $$?; \
++	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(EGDIR)'"; \
++	  $(INSTALL_DATA) $$files "$(DESTDIR)$(EGDIR)" || exit $$?; \
+ 	done
+ 
+ uninstall-pkgsysconfDATA:
+@@ -432,7 +428,7 @@ check-am: all-am
+ check: check-am
+ all-am: Makefile $(DATA)
+ installdirs:
+-	for dir in "$(DESTDIR)$(pkgsysconfdir)"; do \
++	for dir in "$(DESTDIR)$(EGDIR)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+@@ -483,7 +479,6 @@ info-am:
+ 
+ install-data-am: install-data-local install-pkgsysconfDATA
+ 	@$(NORMAL_INSTALL)
+-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ install-dvi: install-dvi-am
+ 
+ install-dvi-am:
+@@ -596,18 +591,18 @@ install-data-local:	all-data-local
+ 	$(mkinstalldirs) $(DESTDIR)$(shirelogdir)
+ 	$(mkinstalldirs) $(DESTDIR)$(pkgrundir)
+ 	$(mkinstalldirs) $(DESTDIR)$(pkgxmldir)
+-	$(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)
++	$(mkinstalldirs) $(DESTDIR)$(EGDIR)
+ 	for f in $(BUILTCONFIGFILES); do \
+-		if test ! -f $(DESTDIR)${pkgsysconfdir}/$$f; then \
+-			$(INSTALL_DATA) $$f $(DESTDIR)${pkgsysconfdir}; \
++		if test ! -f $(DESTDIR)${EGDIR}/$$f; then \
++			$(INSTALL_DATA) $$f $(DESTDIR)${EGDIR}; \
+ 		fi; \
+-		$(INSTALL_DATA) $$f $(DESTDIR)${pkgsysconfdir}/$$f.dist; \
++		$(INSTALL_DATA) $$f $(DESTDIR)${EGDIR}/$$f.dist; \
+         done
+ 	for f in $(CONFIGFILES); do \
+-		if test ! -f $(DESTDIR)${pkgsysconfdir}/$$f; then \
+-			$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)${pkgsysconfdir}; \
++		if test ! -f $(DESTDIR)${EGDIR}/$$f; then \
++			$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)${EGDIR}; \
+ 		fi; \
+-		$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)${pkgsysconfdir}/$$f.dist; \
++		$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)${EGDIR}/$$f.dist; \
+         done
+ 
+ install-data-hook:
diff --git a/www/shibboleth-sp/patches/patch-ab b/www/shibboleth-sp/patches/patch-ab
new file mode 100644
index 00000000000..cf54d034419
--- /dev/null
+++ b/www/shibboleth-sp/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1.1.1 2011/03/15 13:15:37 pettai Exp $
+
+Automatically generate the keys in the pkgsrc config dir
+
+--- configs/keygen.sh.orig	2011-03-15 10:21:13.000000000 +0000
++++ configs/keygen.sh
+@@ -1,5 +1,8 @@
+ #! /bin/sh
+ 
++# Dump the generated keys in @SHIB_CONFDIR@ by default
++cd @SHIB_CONFDIR@
++
+ while getopts h:u:g:o:e:y:bf c
+      do
+          case $c in