[cpp-sp COMMIT] in /branches/REL_2: Shibboleth.sln configs/Makefile.am configs/shibd-redhat.in configs/shibd-suse.in ...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Mar  1 20:59:35 2012
New Revision: 3588

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3588&view=rev
Log:
https://issues.shibboleth.net/jira/browse/SSPCPP-411

Modified:
    branches/REL_2/Shibboleth.sln
    branches/REL_2/configs/Makefile.am
    branches/REL_2/configs/shibd-redhat.in
    branches/REL_2/configs/shibd-suse.in
    branches/REL_2/shibboleth.spec.in
    branches/REL_2/shibsp/Makefile.am
    branches/REL_2/shibsp/base.h
    branches/REL_2/shibsp/handler/impl/DiscoveryFeed.cpp
    branches/REL_2/shibsp/paths.h.in

Modified: branches/REL_2/Shibboleth.sln
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/Shibboleth.sln?rev=3588&r1=3587&r2=3588&view=diff
==============================================================================
--- branches/REL_2/Shibboleth.sln (original)
+++ branches/REL_2/Shibboleth.sln Thu Mar  1 20:59:35 2012
@@ -59,6 +59,7 @@
 		configs\shibboleth2.xml = configs\shibboleth2.xml
 		configs\shibd-debian.in = configs\shibd-debian.in
 		configs\shibd-osx.plist.in = configs\shibd-osx.plist.in
+		configs\shibd-redhat.in = configs\shibd-redhat.in
 		configs\shibd-suse.in = configs\shibd-suse.in
 		configs\shibd.logger.in = configs\shibd.logger.in
 		configs\sslError.html = configs\sslError.html
@@ -78,6 +79,7 @@
 		doxygen.cfg = doxygen.cfg
 		m4\doxygen.m4 = m4\doxygen.m4
 		Makefile.am = Makefile.am
+		shibboleth.spec.in = shibboleth.spec.in
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Doc", "Doc", "{6ED5E3E7-1B0E-43FB-A8D1-77A0FCAE9AC8}"

Modified: branches/REL_2/configs/Makefile.am
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/Makefile.am?rev=3588&r1=3587&r2=3588&view=diff
==============================================================================
--- branches/REL_2/configs/Makefile.am (original)
+++ branches/REL_2/configs/Makefile.am Thu Mar  1 20:59:35 2012
@@ -8,6 +8,7 @@
 pkgxmldir = $(datadir)/xml/@PACKAGE@
 pkgwebdir = $(datadir)/@PACKAGE@
 pkgrundir = $(localstatedir)/run/@PACKAGE@
+pkgcachedir = $(localstatedir)/cache/@PACKAGE@
 pkgsysconfdir = $(sysconfdir)/@PACKAGE@
 pkgsysconf_DATA = \
 	shibd-redhat \
@@ -103,6 +104,7 @@
 	$(mkinstalldirs) $(DESTDIR)$(pkglogdir)
 	$(mkinstalldirs) $(DESTDIR)$(shirelogdir)
 	$(mkinstalldirs) $(DESTDIR)$(pkgrundir)
+    $(mkinstalldirs) $(DESTDIR)$(pkgcachedir)
 	$(mkinstalldirs) $(DESTDIR)$(pkgxmldir)
 	$(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)
 	for f in $(BUILTCONFIGFILES); do \

Modified: branches/REL_2/configs/shibd-redhat.in
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/shibd-redhat.in?rev=3588&r1=3587&r2=3588&view=diff
==============================================================================
--- branches/REL_2/configs/shibd-redhat.in (original)
+++ branches/REL_2/configs/shibd-redhat.in Thu Mar  1 20:59:35 2012
@@ -32,6 +32,9 @@
 		fi
 	fi
 
+	# Make sure package run directory exists.
+	[ -d @-PKGRUNDIR-@ ] || mkdir @-PKGRUNDIR-@
+
 	export SHIBD_PID=$pidfile
 	touch $pidfile
 	chown $SHIBD_USER:$SHIBD_USER $pidfile
@@ -39,7 +42,7 @@
 		/sbin/restorecon $pidfile
 	fi
 	# Handle transition from root to non-root packages.
-	chown $SHIBD_USER:$SHIBD_USER @-PKGRUNDIR-@/* 2>/dev/null || :
+	chown -R $SHIBD_USER:$SHIBD_USER @-PKGRUNDIR-@ 2>/dev/null || :
 	daemon --user $SHIBD_USER $shibd -p $pidfile -f -w 30
 
 	RETVAL=$?

Modified: branches/REL_2/configs/shibd-suse.in
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/shibd-suse.in?rev=3588&r1=3587&r2=3588&view=diff
==============================================================================
--- branches/REL_2/configs/shibd-suse.in (original)
+++ branches/REL_2/configs/shibd-suse.in Thu Mar  1 20:59:35 2012
@@ -51,8 +51,11 @@
  
 case "$1" in
     start)
+        # Make sure package run directory exists.
+        [ -d @-PKGRUNDIR-@ ] || mkdir @-PKGRUNDIR-@
+
         # Handle transition from root to non-root packages.
-        chown $SHIBD_USER:$SHIBD_USER @-PKGRUNDIR-@/* 2>/dev/null || :
+        chown -R $SHIBD_USER:$SHIBD_USER @-PKGRUNDIR-@ 2>/dev/null || :
 		
         echo -n "Starting $DESC ($NAME)"
         ## Start daemon with startproc(8). If this fails

Modified: branches/REL_2/shibboleth.spec.in
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibboleth.spec.in?rev=3588&r1=3587&r2=3588&view=diff
==============================================================================
--- branches/REL_2/shibboleth.spec.in (original)
+++ branches/REL_2/shibboleth.spec.in Thu Mar  1 20:59:35 2012
@@ -300,6 +300,7 @@
 %exclude %{_libdir}/%{name}/*.la
 %attr(0750,%{runuser},%{runuser}) %dir %{_localstatedir}/log/%{name}
 %attr(0755,%{runuser},%{runuser}) %dir %{_localstatedir}/run/%{name}
+%attr(0755,%{runuser},%{runuser}) %dir %{_localstatedir}/cache/%{name}
 %dir %{_datadir}/xml/%{name}
 %{_datadir}/xml/%{name}/*
 %dir %{_datadir}/%{name}
@@ -331,7 +332,7 @@
 %doc %{pkgdocdir}/api
 
 %changelog
-* Fri Feb 10 2012  Scott Cantor  <cantor.2 at osu.edu>  - 2.5-1
+* Thu Mar 1 2012  Scott Cantor  <cantor.2 at osu.edu>  - 2.5-1

[... 147 lines stripped ...]