svn commit: r433169 - head/security/shibboleth2-sp

[Palle Girgensohn]

Author: girgen
Date: Thu Feb  2 16:34:10 2017
New Revision: 433169
URL: https://svnweb.freebsd.org/changeset/ports/433169

Log:
  Add options for fastcgi and memcached and make odbc and apache optional.
  
  Fastcgi allows simple use with NGINX. Memcached is similar to ODBC, in that it
  offers another option for more persistent session storage than in-memory.

Modified:
  head/security/shibboleth2-sp/Makefile
  head/security/shibboleth2-sp/pkg-plist

Modified: head/security/shibboleth2-sp/Makefile
==============================================================================
--- head/security/shibboleth2-sp/Makefile	Thu Feb  2 16:14:55 2017	(r433168)
+++ head/security/shibboleth2-sp/Makefile	Thu Feb  2 16:34:10 2017	(r433169)
@@ -10,14 +10,16 @@ MASTER_SITES=	http://shibboleth.net/down
 MAINTAINER=	girgen at 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
@@ -26,22 +28,33 @@ USE_RC_SUBR=	shibboleth-sp
 USERS=		shibd
 GROUPS=		shibd
 
-USE_APACHE=	22+
-USE_OPENSSL=	yes
-
 INSTALL_TARGET=	install-strip
 
-.include <bsd.port.pre.mk>
+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}
@@ -52,8 +65,26 @@ 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 <bsd.port.pre.mk>
+
+.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 <bsd.port.post.mk>

Modified: head/security/shibboleth2-sp/pkg-plist
==============================================================================
--- head/security/shibboleth2-sp/pkg-plist	Thu Feb  2 16:14:55 2017	(r433168)
+++ head/security/shibboleth2-sp/pkg-plist	Thu Feb  2 16:34:10 2017	(r433169)
@@ -96,11 +96,14 @@ 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