Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 8 May 2014 01:35:13 +0000 (UTC)
From:      Palle Girgensohn <girgen@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r353234 - in head/security/shibboleth2-sp: . files
Message-ID:  <201405080135.s481ZDLi004815@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: girgen
Date: Thu May  8 01:35:13 2014
New Revision: 353234
URL: http://svnweb.freebsd.org/changeset/ports/353234
QAT: https://qat.redports.org/buildarchive/r353234/

Log:
  Update Shibboleth to 2.5.3, a bug fix release.
  
  Change the cache directory back to the built-in default, /var/cache, and
  force mode 755 on that directory. (see r258664 in head why this is a good thing).
  
  Add odbc support as suggested in ports/189410.

Deleted:
  head/security/shibboleth2-sp/files/patch-shibsp_base.h
  head/security/shibboleth2-sp/files/patch-shibsp_makefiles
Modified:
  head/security/shibboleth2-sp/Makefile
  head/security/shibboleth2-sp/distinfo
  head/security/shibboleth2-sp/files/patch-makefiles-docdir
  head/security/shibboleth2-sp/files/patch-shibboleth-spec
  head/security/shibboleth2-sp/files/shibboleth-sp.in
  head/security/shibboleth2-sp/pkg-plist

Modified: head/security/shibboleth2-sp/Makefile
==============================================================================
--- head/security/shibboleth2-sp/Makefile	Thu May  8 01:00:43 2014	(r353233)
+++ head/security/shibboleth2-sp/Makefile	Thu May  8 01:35:13 2014	(r353234)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	shibboleth-sp
-PORTVERSION=	2.5.2
-PORTREVISION=	1
+PORTVERSION=	2.5.3
 CATEGORIES=	security www
 MASTER_SITES=	http://shibboleth.net/downloads/service-provider/${PORTVERSION}/
 
@@ -11,9 +10,9 @@ MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	C++ Shibboleth Service Provider (Internet2) for Apache
 
 BUILD_DEPENDS=	boost-libs>=0:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	saml.8:${PORTSDIR}/security/opensaml2
+LIB_DEPENDS=	libsaml.so.8:${PORTSDIR}/security/opensaml2 libodbc.so:${PORTSDIR}/databases/unixODBC
 
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 MAKE_ENV=	NOKEYGEN=YES
 USE_LDCONFIG=	yes
@@ -27,7 +26,6 @@ GROUPS=		shibd
 USE_APACHE=	22-24
 USE_OPENSSL=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${APACHE_VERSION} == 22
@@ -49,13 +47,8 @@ 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
 
-post-install:
-	${CHOWN} -R ${USERS}:${GROUPS} /var/db/shibboleth ;\
-	${CHOWN} -R ${USERS}:${GROUPS} /var/log/shibboleth ;\
-       	${CHOWN} -R ${USERS}:${WWWGRP} /var/run/shibboleth ;\
-       	${CHMOD} -R u=rwx,g=rx,o= /var/run/shibboleth
-
 .include <bsd.port.post.mk>

Modified: head/security/shibboleth2-sp/distinfo
==============================================================================
--- head/security/shibboleth2-sp/distinfo	Thu May  8 01:00:43 2014	(r353233)
+++ head/security/shibboleth2-sp/distinfo	Thu May  8 01:35:13 2014	(r353234)
@@ -1,2 +1,2 @@
-SHA256 (shibboleth-sp-2.5.2.tar.gz) = 1d5c42ea6a6cf5f1ed39101af52a2df2cf7e5e6c086e1081bdf1275f970ba1d5
-SIZE (shibboleth-sp-2.5.2.tar.gz) = 949163
+SHA256 (shibboleth-sp-2.5.3.tar.gz) = 82acd1d5989560cafb93860e6bf11fc61aaf78adb439435dea7381d94d677918
+SIZE (shibboleth-sp-2.5.3.tar.gz) = 949273

Modified: head/security/shibboleth2-sp/files/patch-makefiles-docdir
==============================================================================
--- head/security/shibboleth2-sp/files/patch-makefiles-docdir	Thu May  8 01:00:43 2014	(r353233)
+++ head/security/shibboleth2-sp/files/patch-makefiles-docdir	Thu May  8 01:35:13 2014	(r353234)
@@ -32,8 +32,7 @@
 -pkgwebdir = $(datadir)/@PACKAGE_NAME@
 +pkgwebdir = $(datadir)/doc/@PACKAGE_NAME@
  pkgrundir = $(localstatedir)/run/@PACKAGE_NAME@
--pkgcachedir = $(localstatedir)/cache/@PACKAGE_NAME@
-+pkgcachedir = $(localstatedir)/db/@PACKAGE_NAME@
+ pkgcachedir = $(localstatedir)/cache/@PACKAGE_NAME@
  pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@
  pkgsysconf_DATA = \
  	shibd-redhat \
@@ -46,8 +45,7 @@
 -pkgwebdir = $(datadir)/@PACKAGE_NAME@
 +pkgwebdir = $(datadir)/doc/@PACKAGE_NAME@
  pkgrundir = $(localstatedir)/run/@PACKAGE_NAME@
--pkgcachedir = $(localstatedir)/cache/@PACKAGE_NAME@
-+pkgcachedir = $(localstatedir)/db/@PACKAGE_NAME@
+ pkgcachedir = $(localstatedir)/cache/@PACKAGE_NAME@
  pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@
  pkgsysconf_DATA = \
  	shibd-redhat \

Modified: head/security/shibboleth2-sp/files/patch-shibboleth-spec
==============================================================================
--- head/security/shibboleth2-sp/files/patch-shibboleth-spec	Thu May  8 01:00:43 2014	(r353233)
+++ head/security/shibboleth2-sp/files/patch-shibboleth-spec	Thu May  8 01:35:13 2014	(r353234)
@@ -24,12 +24,3 @@
  # Fix ownership of log files (even on new installs, if they're left from an older one).
  %{__chown} %{runuser}:%{runuser} %{_localstatedir}/log/shibboleth/* 2>/dev/null || :
  
-@@ -304,7 +296,7 @@
- %{_libdir}/shibboleth/*
- %attr(0750,%{runuser},%{runuser}) %dir %{_localstatedir}/log/shibboleth
- %attr(0755,%{runuser},%{runuser}) %dir %{_localstatedir}/run/shibboleth
--%attr(0755,%{runuser},%{runuser}) %dir %{_localstatedir}/cache/shibboleth
-+%attr(0755,%{runuser},%{runuser}) %dir %{_localstatedir}/db/shibboleth
- %dir %{_datadir}/xml/shibboleth
- %{_datadir}/xml/shibboleth/*
- %dir %{_datadir}/shibboleth

Modified: head/security/shibboleth2-sp/files/shibboleth-sp.in
==============================================================================
--- head/security/shibboleth2-sp/files/shibboleth-sp.in	Thu May  8 01:00:43 2014	(r353233)
+++ head/security/shibboleth2-sp/files/shibboleth-sp.in	Thu May  8 01:35:13 2014	(r353234)
@@ -23,6 +23,7 @@ keygen_cmd="shibboleth_sp_keygen"
 
 shibboleth_sp_user=%%SHIBD_USER%%
 shibboleth_sp_group=%%SHIBD_GROUP%%
+www_group=%%WWWGROUP%%
 
 load_rc_config $name
 
@@ -36,11 +37,15 @@ shibboleth_sp_configtest() {
 		run_rc_command keygen
 	else
 		# update from 2.4.x, chown %%SHIBD_USER%% the key and cert
-	       	for f in ${confdir}/${key} ${confdir}/${cert}; do
-			set X `stat ${f}`
-			test $6 != ${shibboleth_sp_user} && chown ${shibboleth_sp_user}:${shibboleth_sp_group} ${f}
-		done
+	       	chown ${shibboleth_sp_user}:${shibboleth_sp_group} ${confdir}/${key} ${confdir}/${cert}
+		chmod 400 ${confdir}/${key}
+		chmod 444 ${confdir}/${cert}
 	fi
+	# In FreeBSD 10 (r258664), /var/cache mode is corrected to 755. make sure we have that mode.
+	chmod 755 /var/cache
+	install -d -o ${shibboleth_sp_user} -g ${shibboleth_sp_group} /var/log/shibboleth
+	install -d -o ${shibboleth_sp_user} -g ${shibboleth_sp_group} /var/cache/shibboleth
+	install -d -o ${shibboleth_sp_user} -g ${www_group} -m 750 /var/run/shibboleth
 	${command} ${shibboleth_sp_flags} -u ${shibboleth_sp_user} -g ${shibboleth_sp_group} -t
 }
 

Modified: head/security/shibboleth2-sp/pkg-plist
==============================================================================
--- head/security/shibboleth2-sp/pkg-plist	Thu May  8 01:00:43 2014	(r353233)
+++ head/security/shibboleth2-sp/pkg-plist	Thu May  8 01:35:13 2014	(r353234)
@@ -139,6 +139,7 @@ lib/libshibsp.so.6
 lib/libshibsp.so
 lib/shibboleth/adfs.so
 lib/shibboleth/adfs-lite.so
+lib/shibboleth/odbc-store.so
 lib/shibboleth/plugins-lite.so
 lib/shibboleth/plugins.so
 %%WITH_APACHE_22%%lib/shibboleth/mod_shib_22.so
@@ -166,15 +167,6 @@ share/doc/shibboleth/OPENSSL.LICENSE
 share/doc/shibboleth/README.txt
 share/doc/shibboleth/RELEASE.txt
 share/doc/shibboleth/main.css
-@exec mkdir -p /var/db/shibboleth
-@exec chown -R %%SHIBD_USER%%:%%SHIBD_GROUP%% /var/db/shibboleth
-@exec mkdir -p /var/log/shibboleth
-@exec chown -R %%SHIBD_USER%%:%%SHIBD_GROUP%% /var/log/shibboleth
-@exec mkdir -p /var/run/shibboleth
-@exec chown -R %%SHIBD_USER%%:%%WWWGRP%%  /var/run/shibboleth
-@exec chmod -R u=rwx,g=rx,o= /var/run/shibboleth
-@dirrmtry /var/db/shibboleth
-@dirrmtry /var/run/shibboleth
 @dirrmtry share/doc/shibboleth/api
 @dirrmtry share/doc/shibboleth
 @dirrmtry lib/shibboleth
@@ -191,3 +183,13 @@ share/doc/shibboleth/main.css
 @dirrmtry include/shibsp/attribute
 @dirrmtry include/shibsp
 @dirrmtry etc/shibboleth
+@exec install -d -o %%SHIBD_USER%% -g %%SHIBD_GROUP%% -m 755 /var/log/shibboleth
+@exec install -d -o %%SHIBD_USER%% -g %%SHIBD_GROUP%% -m 755 /var/cache/shibboleth
+@exec install -d -o %%SHIBD_USER%% -g %%WWWGRP%% -m 750 /var/run/shibboleth
+@user %%SHIBD_USER%%
+@group %%SHIBD_GROUP%%
+@dirrmtry /var/log/shibboleth
+@dirrmtry /var/cache/shibboleth
+@mode 750
+@group %%WWWGRP%%
+@dirrmtry /var/run/shibboleth



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405080135.s481ZDLi004815>