aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorwxs <wxs@FreeBSD.org>2010-01-26 10:35:37 +0800
committerwxs <wxs@FreeBSD.org>2010-01-26 10:35:37 +0800
commitd8c494522ecfa5ee0d3832bc3ba39d8363db7f7f (patch)
tree8848207c753bda8799db5192fe46dd3e5979a4f5 /security
parenta0bc41dead9bda57288389c78085c65b066d37be (diff)
downloadfreebsd-ports-gnome-d8c494522ecfa5ee0d3832bc3ba39d8363db7f7f.tar.gz
freebsd-ports-gnome-d8c494522ecfa5ee0d3832bc3ba39d8363db7f7f.tar.zst
freebsd-ports-gnome-d8c494522ecfa5ee0d3832bc3ba39d8363db7f7f.zip
- Update to 2.3.1.
PR: ports/136034 Submitted by: Steve Wills <steve@mouf.net> Approved by: janos.mohacsi@bsd.hu (maintainer timeout)
Diffstat (limited to 'security')
-rw-r--r--security/shibboleth2-sp/Makefile43
-rw-r--r--security/shibboleth2-sp/distinfo6
-rw-r--r--security/shibboleth2-sp/files/patch-configure.ac11
-rw-r--r--security/shibboleth2-sp/files/patch-shib-target_shib-handlers.cpp16
-rw-r--r--security/shibboleth2-sp/files/patch-shibsp_remoting_impl_TCPListener.cpp13
-rw-r--r--security/shibboleth2-sp/pkg-descr2
-rw-r--r--security/shibboleth2-sp/pkg-plist186
7 files changed, 172 insertions, 105 deletions
diff --git a/security/shibboleth2-sp/Makefile b/security/shibboleth2-sp/Makefile
index 8ba441551a7a..1ead5859fc14 100644
--- a/security/shibboleth2-sp/Makefile
+++ b/security/shibboleth2-sp/Makefile
@@ -1,48 +1,55 @@
-# New ports collection makefile for: security/shibboleth-sp
-# Date created: 2007-07-17
+# New ports collection makefile for: security/shibboleth2-sp
+# Date created: 17 Sept2008
# Whom: Janos Mohacsi <janos.mohacsi@bsd.hu>
#
# $FreeBSD$
#
PORTNAME= shibboleth-sp
-PORTVERSION= 1.3f
+PORTVERSION= 2.3.1
CATEGORIES= security www
-MASTER_SITES= http://shibboleth.internet2.edu/downloads/
+MASTER_SITES= http://shibboleth.internet2.edu/downloads/shibboleth/cppsp/${PORTVERSION}/
MAINTAINER= janos.mohacsi@bsd.hu
COMMENT= C++ Shibboleth Service Provider (Internet2) for Apache
-LIB_DEPENDS= saml.5:${PORTSDIR}/security/opensaml
+LIB_DEPENDS= saml.6:${PORTSDIR}/security/opensaml2
-OPTIONS= APACHE22 "Use Apache version 2.2 instead of version 2.0" on
+OPTIONS= APACHE22 "Use Apache version 2.2 instead of version 2.0" on
+MAKE_JOBS_SAFE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_RC_SUBR= shibboleth-sp
-WRKSRC= ${WRKDIR}/shibboleth-1.3
+USE_AUTOTOOLS= autoconf:262 automake:110:env libtool:22:env
+WRKSRC= ${WRKDIR}/shibboleth-${PORTVERSION}
+
+LATEST_LINK= shibboleth2-sp
.include <bsd.port.pre.mk>
.if defined(WITH_APACHE22)
USE_APACHE= 22
CONFIGURE_ARGS= --enable-apache-22 --with-apxs22=${APXS}
+PLIST_SUB+= WITH_APACHE_22=""
+PLIST_SUB+= WITH_APACHE_20="@comment "
.else
USE_APACHE= 20
-CONFIGURE_ARGS= --enable-apache-20 --with-apxs2=${APXS}
+CONFIGURE_ARGS= --enable-apache-20 --with-apxs2=${APXS} --with-apr=${PREFIX}/lib/apache2/apr-config --with-apu=${PREFIX}/lib/apache2/apu-config
+PLIST_SUB+= WITH_APACHE_22="@comment "
+PLIST_SUB+= WITH_APACHE_20=""
.endif
-CONFIGURE_ARGS+= --localstatedir=/var
+CONFIGURE_ARGS+= --localstatedir=/var --with-log4shib=${LOCALBASE}
+CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} --with-xmltooling=${LOCALBASE}
+CONFIGURE_ARGS+= --disable-doxygen-doc
-post-patch:
+pre-configure:
@${REINPLACE_CMD} -e 's|/run|/run/shibboleth|' ${WRKSRC}/configs/Makefile.in
- @${REINPLACE_CMD} -e 's|/doc/|/share/doc/|' ${WRKSRC}/doc/Makefile.in
-
-.if ${OSVERSION} >= 700042
-BROKEN= Does not compile with GCC 4.2
-.endif
-.if ${ARCH} == "amd64" || ${ARCH} == "sparc64"
-BROKEN= Does not compile; author is investigating
-.endif
+ @${REINPLACE_CMD} -e 's|/doc/@PACKAGE@-@PACKAGE_VERSION@|/doc/@PACKAGE@|' \
+ ${WRKSRC}/configs/Makefile.am ${WRKSRC}/configs/Makefile.in \
+ ${WRKSRC}/doc/Makefile.am ${WRKSRC}/doc/Makefile.in
+ ${RM} ${WRKSRC}/aclocal.m4
+ @cd ${WRKSRC} && ${AUTORECONF} -fvi
.include <bsd.port.post.mk>
diff --git a/security/shibboleth2-sp/distinfo b/security/shibboleth2-sp/distinfo
index ee5be32b33ab..50667b9b8b97 100644
--- a/security/shibboleth2-sp/distinfo
+++ b/security/shibboleth2-sp/distinfo
@@ -1,3 +1,3 @@
-MD5 (shibboleth-sp-1.3f.tar.gz) = cd28dedcbb9fe56e32e287506bf4fed6
-SHA256 (shibboleth-sp-1.3f.tar.gz) = e72a8935c0df038233cabb24a1aada2790b5bc76b5cf4f8108b3a9d9e4fa7e7a
-SIZE (shibboleth-sp-1.3f.tar.gz) = 846077
+MD5 (shibboleth-sp-2.3.1.tar.gz) = a292f1cc0aab3cfe3ecec0e9b2b30a10
+SHA256 (shibboleth-sp-2.3.1.tar.gz) = d1d0a3de0a9c383d1210fde7a7e60e464096950337512cab667f924322a122e2
+SIZE (shibboleth-sp-2.3.1.tar.gz) = 806177
diff --git a/security/shibboleth2-sp/files/patch-configure.ac b/security/shibboleth2-sp/files/patch-configure.ac
new file mode 100644
index 000000000000..90e629c972da
--- /dev/null
+++ b/security/shibboleth2-sp/files/patch-configure.ac
@@ -0,0 +1,11 @@
+--- configure.ac.orig 2009-12-01 19:07:37.000000000 +0200
++++ configure.ac 2010-01-06 19:23:05.000000000 +0200
+@@ -717,7 +717,7 @@
+ AC_MSG_CHECKING(for user-specified apu-config name/location)
+ if test "$withval" != "no" ; then
+ if test "$withval" != "yes"; then
+- APR_CONFIG=$withval
++ APU_CONFIG=$withval
+ AC_MSG_RESULT("$withval")
+ fi
+ fi
diff --git a/security/shibboleth2-sp/files/patch-shib-target_shib-handlers.cpp b/security/shibboleth2-sp/files/patch-shib-target_shib-handlers.cpp
deleted file mode 100644
index 70aeb1660820..000000000000
--- a/security/shibboleth2-sp/files/patch-shib-target_shib-handlers.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- shib-target/shib-handlers.cpp.orig
-+++ shib-target/shib-handlers.cpp
-@@ -544,8 +544,8 @@
- for (; *s; s++) {
- if (strchr(badchars,*s) || *s<=0x20 || *s>=0x7F) {
- ret+='%';
-- ret+=hexchar(*s >> 4);
-- ret+=hexchar(*s & 0x0F);
-+ ret+=hexchar((unsigned char)*s >> 4);
-+ ret+=hexchar((unsigned char)*s & 0x0F);
- }
- else
- ret+=*s;
diff --git a/security/shibboleth2-sp/files/patch-shibsp_remoting_impl_TCPListener.cpp b/security/shibboleth2-sp/files/patch-shibsp_remoting_impl_TCPListener.cpp
new file mode 100644
index 000000000000..96f763c8b9bb
--- /dev/null
+++ b/security/shibboleth2-sp/files/patch-shibsp_remoting_impl_TCPListener.cpp
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- shibsp/remoting/impl/TCPListener.cpp.orig
++++ shibsp/remoting/impl/TCPListener.cpp
+@@ -38,6 +38,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <errno.h>
++#include <netinet/in.h>
+
+ using namespace shibsp;
+ using namespace xmltooling;
diff --git a/security/shibboleth2-sp/pkg-descr b/security/shibboleth2-sp/pkg-descr
index 5790a0232bf3..69a5d4d6ec80 100644
--- a/security/shibboleth2-sp/pkg-descr
+++ b/security/shibboleth2-sp/pkg-descr
@@ -4,7 +4,7 @@ boundaries. It allows sites to make informed authorization decisions
for individual access of protected online resources in a
privacy-preserving manner.
-This software is a C++ implementation of the Service Provider
+This software is a C++ implementation of the Service Provider version 2
component of the Shibboleth can be used in Apache Web servers. The
service provider manages secured resources. User access to resources
is based on assertions received by the service provider (SP) from
diff --git a/security/shibboleth2-sp/pkg-plist b/security/shibboleth2-sp/pkg-plist
index 8d26fe7b482e..3f85c33ad563 100644
--- a/security/shibboleth2-sp/pkg-plist
+++ b/security/shibboleth2-sp/pkg-plist
@@ -1,93 +1,134 @@
-@comment $FreeBSD$
-bin/test-client
-bin/shibtest
-bin/posttest
-etc/shibboleth/shibboleth.xml
-etc/shibboleth/shibboleth.xml.dist
+bin/mdquery
+bin/resolvertest
+etc/shibboleth/metagen.sh
etc/shibboleth/native.logger
etc/shibboleth/native.logger.dist
etc/shibboleth/shibd.logger
etc/shibboleth/shibd.logger.dist
-etc/shibboleth/AAP.xml
-etc/shibboleth/AAP.xml.dist
-etc/shibboleth/IQ-metadata.xml
-etc/shibboleth/IQ-metadata.xml.dist
+etc/shibboleth/shibboleth2.xml
+etc/shibboleth/shibboleth2.xml.dist
+etc/shibboleth/attribute-map.xml
+etc/shibboleth/attribute-map.xml.dist
+etc/shibboleth/attribute-policy.xml
+etc/shibboleth/attribute-policy.xml.dist
etc/shibboleth/example-metadata.xml
etc/shibboleth/example-metadata.xml.dist
-etc/shibboleth/shibboleth.logger
-etc/shibboleth/shibboleth.logger.dist
+etc/shibboleth/console.logger
+etc/shibboleth/console.logger.dist
+etc/shibboleth/syslog.logger
+etc/shibboleth/syslog.logger.dist
etc/shibboleth/accessError.html
etc/shibboleth/accessError.html.dist
-etc/shibboleth/rmError.html
-etc/shibboleth/sslError.html
-etc/shibboleth/rmError.html.dist
etc/shibboleth/sessionError.html
etc/shibboleth/sessionError.html.dist
etc/shibboleth/metadataError.html
etc/shibboleth/metadataError.html.dist
+etc/shibboleth/bindingTemplate.html
+etc/shibboleth/bindingTemplate.html.dist
+etc/shibboleth/discoveryTemplate.html
+etc/shibboleth/discoveryTemplate.html.dist
+etc/shibboleth/localLogout.html
+etc/shibboleth/localLogout.html.dist
+etc/shibboleth/globalLogout.html
+etc/shibboleth/globalLogout.html.dist
+etc/shibboleth/sslError.html
etc/shibboleth/sslError.html.dist
-etc/shibboleth/sp-example.key
-etc/shibboleth/sp-example.key.dist
-etc/shibboleth/sp-example.crt
-etc/shibboleth/sp-example.crt.dist
-etc/shibboleth/shibd
+etc/shibboleth/shibd-redhat
+etc/shibboleth/shibd-debian
+etc/shibboleth/shibd-suse
+etc/shibboleth/shibd-osx.plist
etc/shibboleth/apache.config
etc/shibboleth/apache2.config
etc/shibboleth/apache22.config
-etc/shibboleth/inqueue.pem
-include/shib/shib.h
-include/shib/shib-threads.h
-include/shib/hresult.h
-include/shib-target/shib-target.h
-include/shib-target/shibrpc.h
-include/shib-target/shib-paths.h
-include/shib-target/hresult.h
-lib/liboncrpc.so.2
-lib/liboncrpc.so
-lib/libshib.so.6
-lib/libshib.so
-lib/libshib-target.so.5
-lib/libshib-target.so
-libexec/xmlproviders.so
-libexec/xmlproviders.la
-libexec/adfs.so
-libexec/adfs.la
-libexec/mod_shib_22.so
-libexec/mod_shib_22.la
+etc/shibboleth/keygen.sh
+etc/shibboleth/upgrade.xsl
+etc/shibboleth/sp-key.pem
+etc/shibboleth/sp-cert.pem
+etc/shibboleth/postTemplate.html
+etc/shibboleth/postTemplate.html.dist
+etc/shibboleth/partialLogout.html
+etc/shibboleth/partialLogout.html.dist
+include/shibsp/attribute/filtering/AttributeFilter.h
+include/shibsp/attribute/filtering/BasicFilteringContext.h
+include/shibsp/attribute/filtering/FilteringContext.h
+include/shibsp/attribute/filtering/FilterPolicyContext.h
+include/shibsp/attribute/filtering/MatchFunctor.h
+include/shibsp/attribute/ExtensibleAttribute.h
+include/shibsp/attribute/Attribute.h
+include/shibsp/attribute/AttributeDecoder.h
+include/shibsp/attribute/NameIDAttribute.h
+include/shibsp/attribute/ScopedAttribute.h
+include/shibsp/attribute/SimpleAttribute.h
+include/shibsp/attribute/XMLAttribute.h
+include/shibsp/attribute/resolver/AttributeExtractor.h
+include/shibsp/attribute/resolver/AttributeResolver.h
+include/shibsp/attribute/resolver/ResolutionContext.h
+include/shibsp/binding/ArtifactResolver.h
+include/shibsp/binding/SOAPClient.h
+include/shibsp/handler/AbstractHandler.h
+include/shibsp/handler/AssertionConsumerService.h
+include/shibsp/handler/Handler.h
+include/shibsp/handler/LogoutHandler.h
+include/shibsp/handler/RemotedHandler.h
+include/shibsp/handler/SessionInitiator.h
+include/shibsp/AbstractSPRequest.h
+include/shibsp/AccessControl.h
+include/shibsp/Application.h
+include/shibsp/base.h
+include/shibsp/exceptions.h
+include/shibsp/paths.h
+include/shibsp/RequestMapper.h
+include/shibsp/ServiceProvider.h
+include/shibsp/SessionCache.h
+include/shibsp/SessionCacheEx.h
+include/shibsp/SPConfig.h
+include/shibsp/SPRequest.h
+include/shibsp/TransactionLog.h
+include/shibsp/version.h
+include/shibsp/lite/CommonDomainCookie.h
+include/shibsp/lite/SAMLConstants.h
+include/shibsp/metadata/MetadataExt.h
+include/shibsp/metadata/MetadataProviderCriteria.h
+include/shibsp/remoting/ddf.h
+include/shibsp/remoting/ListenerService.h
+include/shibsp/security/PKIXTrustEngine.h
+include/shibsp/security/SecurityPolicy.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
+lib/libshibsp.so.4
+lib/libshibsp.so
+lib/shibboleth/adfs.so
+lib/shibboleth/adfs.la
+lib/shibboleth/adfs-lite.so
+lib/shibboleth/adfs-lite.la
+%%WITH_APACHE_22%%lib/shibboleth/mod_shib_22.so
+%%WITH_APACHE_22%%lib/shibboleth/mod_shib_22.la
+%%WITH_APACHE_20%%lib/shibboleth/mod_shib_20.so
+%%WITH_APACHE_20%%lib/shibboleth/mod_shib_20.la
+lib/libshibsp-lite.so.4
+lib/libshibsp-lite.so
sbin/shibd
-sbin/siterefresh
-share/xml/shibboleth/credentials.xsd
-share/xml/shibboleth/cs-sstc-schema-assertion-01.xsd
-share/xml/shibboleth/cs-sstc-schema-protocol-01.xsd
-share/xml/shibboleth/cs-sstc-schema-assertion-1.1.xsd
-share/xml/shibboleth/cs-sstc-schema-protocol-1.1.xsd
-share/xml/shibboleth/soap-envelope.xsd
-share/xml/shibboleth/xmldsig-core-schema.xsd
-share/xml/shibboleth/xenc-schema.xsd
-share/xml/shibboleth/xml.xsd
+share/xml/shibboleth/catalog.xml
share/xml/shibboleth/shibboleth.xsd
-share/xml/shibboleth/shibboleth-trust-1.0.xsd
share/xml/shibboleth/shibboleth-metadata-1.0.xsd
-share/xml/shibboleth/shibboleth-targetconfig-1.0.xsd
-share/xml/shibboleth/saml-schema-assertion-2.0.xsd
+share/xml/shibboleth/shibboleth-2.0-native-sp-config.xsd
+share/xml/shibboleth/shibboleth-2.0-afp.xsd
+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-attribute-map.xsd
+share/xml/shibboleth/shibboleth-2.0-sp-notify.xsd
share/xml/shibboleth/WS-Trust.xsd
-share/xml/shibboleth/saml-schema-metadata-2.0.xsd
-share/xml/shibboleth/metadata_v12_to_v11.xsl
-share/xml/shibboleth/metadata_v12_to_v13.xsl
-share/xml/shibboleth/metadata_v13_to_v12.xsl
-share/xml/shibboleth/trust_v12_to_v11.xsl
-share/xml/shibboleth/trust_v13_to_v12.xsl
share/doc/shibboleth/CREDITS.txt
-share/doc/shibboleth/INSTALL.txt
-share/doc/shibboleth/INSTALL-WIN32.txt
share/doc/shibboleth/LICENSE.txt
-share/doc/shibboleth/NEWS.txt
share/doc/shibboleth/NOTICE.txt
share/doc/shibboleth/README.txt
+share/doc/shibboleth/RELEASE.txt
+share/doc/shibboleth/FASTCGI.LICENSE
share/doc/shibboleth/OPENSSL.LICENSE
share/doc/shibboleth/LOG4CPP.LICENSE
-share/doc/shibboleth/CURL.LICENSE
-share/doc/shibboleth/mysql-4.0.12.diff
share/doc/shibboleth/main.css
share/doc/shibboleth/logo.jpg
@exec mkdir -p %D/data
@@ -95,9 +136,20 @@ share/doc/shibboleth/logo.jpg
@exec mkdir -p /var/run/shibboleth
@exec chmod -R ug=rwx,o= /var/run/shibboleth
@unexec rm -rf /var/run/shibboleth 2>&1 >/dev/null || true
+@dirrmtry share/doc/shibboleth/api
+@dirrmtry share/doc/shibboleth
+@dirrmtry lib/shibboleth
@dirrmtry share/xml/shibboleth
-@dirrmtry include/shib-target
-@dirrmtry include/shib
+@dirrmtry include/shibsp/util
+@dirrmtry include/shibsp/security
+@dirrmtry include/shibsp/remoting
+@dirrmtry include/shibsp/metadata
+@dirrmtry include/shibsp/lite
+@dirrmtry include/shibsp/handler
+@dirrmtry include/shibsp/binding
+@dirrmtry include/shibsp/attribute/resolver
+@dirrmtry include/shibsp/attribute/filtering
+@dirrmtry include/shibsp/attribute
+@dirrmtry include/shibsp
@dirrmtry etc/shibboleth
-@dirrm share/doc/shibboleth
@dirrmtry data