Index: head/security/shibboleth2-sp/Makefile =================================================================== --- head/security/shibboleth2-sp/Makefile (revision 433168) +++ head/security/shibboleth2-sp/Makefile (revision 433169) @@ -1,59 +1,90 @@ # Created by: Janos Mohacsi # $FreeBSD$ PORTNAME= shibboleth-sp PORTVERSION= 2.6.0 PORTREVISION= 2 CATEGORIES= security www MASTER_SITES= http://shibboleth.net/downloads/service-provider/${PORTVERSION}/ MAINTAINER= girgen@FreeBSD.org COMMENT= C++ Shibboleth Service Provider (Internet2) for Apache +LICENSE= APACHE20 + BUILD_DEPENDS= boost-libs>=0:devel/boost-libs -LIB_DEPENDS= libsaml.so:security/opensaml2 libodbc.so:databases/unixODBC \ +LIB_DEPENDS= libsaml.so:security/opensaml2 \ libxmltooling-lite.so:devel/xmltooling \ liblog4shib.so:devel/log4shib \ libxerces-c-3.1.so:textproc/xerces-c3 \ libxml-security-c.so:security/apache-xml-security-c -USES= gmake tar:bzip2 +USES= gmake tar:bzip2 ssl GNU_CONFIGURE= yes MAKE_ENV= NOKEYGEN=YES USE_LDCONFIG= yes USE_RC_SUBR= shibboleth-sp USERS= shibd GROUPS= shibd -USE_APACHE= 22+ -USE_OPENSSL= yes - INSTALL_TARGET= install-strip -.include +OPTIONS_GROUP= CONNECT SESSION +OPTIONS_GROUP_CONNECT=FASTCGI APACHE +CONNECT_DESC= Webserver modules -.if ${APACHE_VERSION} == 22 -CONFIGURE_ARGS= --enable-apache-22 --with-apxs22=${APXS} -PLIST_SUB+= WITH_APACHE_22="" -PLIST_SUB+= WITH_APACHE_24="@comment " -.else -CONFIGURE_ARGS= --enable-apache-24 --with-apxs24=${APXS} -PLIST_SUB+= WITH_APACHE_22="@comment " -PLIST_SUB+= WITH_APACHE_24="" -.endif +OPTIONS_GROUP_SESSION=ODBC MEMCACHED +SESSION_DESC= Optional session storage +OPTIONS_DEFAULT=ODBC APACHE + +# Descriptions +ODBC_DESC= ODBC database backend - store sessions in a database +MEMCACHED_DESC= Store sessions in memcached +FASTCGI_DESC= FastCGI protocol support, e.g. for NGINX +APACHE_DESC= Build Apache module + +ODBC_CONFIGURE_ENABLE= odbc +ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC + +FASTCGI_CONFIGURE_WITH= fastcgi=${LOCALBASE} +FASTCGI_LIB_DEPENDS= libfcgi++.so:www/fcgi + +MEMCACHED_CONFIGURE_WITH= memcached=${LOCALBASE} +MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached + +OPTIONS_SUB= yes + SUB_LIST+= SH=${SH} WWWGRP=${WWWGRP} PLIST_SUB+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} SUB_LIST+= SHIBD_USER=${USERS} SUB_LIST+= SHIBD_GROUP=${GROUPS} PLIST_SUB+= SHIBD_USER=${USERS} PLIST_SUB+= SHIBD_GROUP=${GROUPS} CONFIGURE_ARGS+= --localstatedir=/var --with-log4shib=${LOCALBASE} -CONFIGURE_ARGS+= --enable-odbc CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} --with-xmltooling=${LOCALBASE} CONFIGURE_ARGS+= --disable-doxygen-doc + +.include + +.if ${PORT_OPTIONS:MAPACHE} +USE_APACHE= 22+ +.if "${APACHE_VERSION}" == 22 +CONFIGURE_ARGS+=--disable-apache-24 --enable-apache-22 --with-apxs22=${APXS} +PLIST_SUB+= WITH_APACHE_22="" +PLIST_SUB+= WITH_APACHE_24="@comment " +.else +CONFIGURE_ARGS+=--disable-apache-22 --enable-apache-24 --with-apxs24=${APXS} +PLIST_SUB+= WITH_APACHE_22="@comment " +PLIST_SUB+= WITH_APACHE_24="" +.endif +.else +CONFIGURE_ARGS+=--disable-apache-24 --disable-apache-22 +PLIST_SUB+= WITH_APACHE_22="@comment " +PLIST_SUB+= WITH_APACHE_24="@comment " +.endif .include Index: head/security/shibboleth2-sp/pkg-plist =================================================================== --- head/security/shibboleth2-sp/pkg-plist (revision 433168) +++ head/security/shibboleth2-sp/pkg-plist (revision 433169) @@ -1,130 +1,133 @@ bin/mdquery bin/resolvertest etc/shibboleth/metagen.sh @sample etc/shibboleth/native.logger.dist etc/shibboleth/native.logger @sample etc/shibboleth/shibd.logger.dist etc/shibboleth/shibd.logger @sample etc/shibboleth/shibboleth2.xml.dist etc/shibboleth/shibboleth2.xml @sample etc/shibboleth/attribute-map.xml.dist etc/shibboleth/attribute-map.xml @sample etc/shibboleth/attribute-policy.xml.dist etc/shibboleth/attribute-policy.xml @sample etc/shibboleth/example-metadata.xml.dist etc/shibboleth/example-metadata.xml @sample etc/shibboleth/console.logger.dist etc/shibboleth/console.logger @sample etc/shibboleth/syslog.logger.dist etc/shibboleth/syslog.logger @sample etc/shibboleth/accessError.html.dist etc/shibboleth/accessError.html @sample etc/shibboleth/sessionError.html.dist etc/shibboleth/sessionError.html @sample etc/shibboleth/metadataError.html.dist etc/shibboleth/metadataError.html @sample etc/shibboleth/bindingTemplate.html.dist etc/shibboleth/bindingTemplate.html @sample etc/shibboleth/discoveryTemplate.html.dist etc/shibboleth/discoveryTemplate.html @sample etc/shibboleth/localLogout.html.dist etc/shibboleth/localLogout.html @sample etc/shibboleth/globalLogout.html.dist etc/shibboleth/globalLogout.html @sample etc/shibboleth/sslError.html.dist etc/shibboleth/sslError.html @sample etc/shibboleth/example-shibboleth2.xml.dist etc/shibboleth/example-shibboleth2.xml @sample etc/shibboleth/protocols.xml.dist etc/shibboleth/protocols.xml @sample etc/shibboleth/security-policy.xml.dist etc/shibboleth/security-policy.xml etc/shibboleth/shibd-amazon etc/shibboleth/shibd-redhat etc/shibboleth/shibd-debian etc/shibboleth/shibd-suse @comment etc/shibboleth/shibd-systemd etc/shibboleth/shibd-osx.plist etc/shibboleth/apache.config etc/shibboleth/apache2.config @sample etc/shibboleth/attrChecker.html.dist etc/shibboleth/attrChecker.html etc/shibboleth/apache22.config etc/shibboleth/apache24.config etc/shibboleth/keygen.sh @sample etc/shibboleth/postTemplate.html.dist etc/shibboleth/postTemplate.html @sample etc/shibboleth/partialLogout.html.dist etc/shibboleth/partialLogout.html 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/BinaryAttribute.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/config_pub.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/SecuredHandler.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/IPRange.h include/shibsp/util/PropertySet.h include/shibsp/util/SPConstants.h include/shibsp/util/TemplateParameters.h include/shibsp/version.h lib/libshibsp.so.7 lib/libshibsp.so lib/shibboleth/adfs.so lib/shibboleth/adfs-lite.so -lib/shibboleth/odbc-store.so +%%MEMCACHED%%lib/shibboleth/memcache-store.so +%%ODBC%%lib/shibboleth/odbc-store.so lib/shibboleth/plugins-lite.so lib/shibboleth/plugins.so %%WITH_APACHE_22%%lib/shibboleth/mod_shib_22.so %%WITH_APACHE_24%%lib/shibboleth/mod_shib_24.so +%%FASTCGI%%lib/shibboleth/shibauthorizer +%%FASTCGI%%lib/shibboleth/shibresponder lib/libshibsp-lite.so.7 lib/libshibsp-lite.so sbin/shibd 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 share/xml/shibboleth/WS-Trust.xsd share/doc/shibboleth/CREDITS.txt share/doc/shibboleth/FASTCGI.LICENSE share/doc/shibboleth/LICENSE.txt share/doc/shibboleth/LOG4CPP.LICENSE share/doc/shibboleth/NOTICE.txt share/doc/shibboleth/OPENSSL.LICENSE share/doc/shibboleth/README.txt share/doc/shibboleth/RELEASE.txt share/doc/shibboleth/main.css @dir /var/log/shibboleth-www @dir(%%SHIBD_USER%%,%%SHIBD_GROUP%%,755) /var/log/shibboleth @dir(%%SHIBD_USER%%,%%SHIBD_GROUP%%,755) /var/cache/shibboleth @dir(%%SHIBD_USER%%,%%WWWGRP%%,750) /var/run/shibboleth