mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-25 00:51:21 +00:00
Code Issues Releases Activity

Update Shibboleth to 2.5.3, a bug fix release.

Browse Source 
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.
This commit is contained in:
Palle Girgensohn 2014-05-08 01:35:13 +00:00
parent e729feba66
commit 5bd4dd26ff
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=353234
8 changed files with 28 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
security/shibboleth2-sp/Makefile
View File

@ -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>

4
security/shibboleth2-sp/distinfo
View File

@ -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

6
security/shibboleth2-sp/files/patch-makefiles-docdir
View File

@ -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 \

9
security/shibboleth2-sp/files/patch-shibboleth-spec
View File

@ -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

11
security/shibboleth2-sp/files/patch-shibsp_base.h
View File

@ -1,11 +0,0 @@
--- shibsp/base.h.orig 2013-07-29 14:46:37.905428862 +0200
+++ shibsp/base.h 2013-07-29 14:46:44.286416221 +0200
@@ -127,7 +127,7 @@
#define SHIBSP_RUNDIR "var/run"
/** Cache directory for installation (used to resolve relative paths). */
-#define SHIBSP_CACHEDIR "var/cache"
+#define SHIBSP_CACHEDIR "var/db"
/** XML directory for installation (used to resolve relative paths). */
#define SHIBSP_XMLDIR "share/xml"

22
security/shibboleth2-sp/files/patch-shibsp_makefiles
View File

@ -1,22 +0,0 @@
--- shibsp/Makefile.am.orig 2013-07-29 16:01:08.000000000 +0200
+++ shibsp/Makefile.am 2013-07-29 16:01:19.000000000 +0200
@@ -244,7 +244,7 @@
pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@
logdir = ${localstatedir}/log
rundir = $(localstatedir)/run
-cachedir = $(localstatedir)/cache
+cachedir = $(localstatedir)/db
xmldir = $(datadir)/xml
paths.h: ${srcdir}/paths.h.in Makefile ${top_builddir}/config.status
--- shibsp/Makefile.in.orig 2013-07-29 16:01:08.000000000 +0200
+++ shibsp/Makefile.in 2013-07-29 16:01:29.000000000 +0200
@@ -682,7 +682,7 @@
pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@
logdir = ${localstatedir}/log
rundir = $(localstatedir)/run
-cachedir = $(localstatedir)/cache
+cachedir = $(localstatedir)/db
xmldir = $(datadir)/xml
EXTRA_DIST = \
shibsp.vcxproj \

13
security/shibboleth2-sp/files/shibboleth-sp.in
View File

@ -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
}

20
security/shibboleth2-sp/pkg-plist
View File

@ -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