Sync with 1.3

[shibboleth/sp.git] / shibboleth.spec.in

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index caf9eac..7cb964b 100644 (file)
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -1,7 +1,7 @@
 Name:          shibboleth
 Summary:       Open source system to enable inter-institutional resource sharing
 Version:       @-VERSION-@
-Release:       4
+Release:       6
 #Copyright:    University Corporation for Advanced Internet Development, Inc.
 Group:         System Environment/Libraries
 License:       Apache style
@@ -88,19 +88,36 @@ make check
 /sbin/ldconfig
 
 # Plug the shibboleth SP into Apache2 on a Red Hat system.
-[ -d %{_sysconfdir}/httpd/conf.d ] || exit 0
-[ -f %{_sysconfdir}/httpd/conf.d/shib.conf ] && exit 0
-cp -p %{_sysconfdir}/shibboleth/apache2.config \
-    %{_sysconfdir}/httpd/conf.d/shib.conf
+if [ -d %{_sysconfdir}/httpd/conf.d ] ; then 
+       if [ ! -f %{_sysconfdir}/httpd/conf.d/shib.conf ] ; then
+               sed "s/\/usr\/doc\/shibboleth/\/usr\/share\/doc\/shibboleth-@-VERSION-@/g" \
+                       %{_sysconfdir}/shibboleth/apache2.config \
+                       > %{_sysconfdir}/httpd/conf.d/shib.conf
+       fi
+fi
+
+# Install the shibd init.d scripts and service
+if [ -d %{_sysconfdir}/init.d ] ; then
+       if [ ! -f %{_sysconfdir}/init.d/shibd ] ; then
+               cp -p %{_sysconfdir}/shibboleth/shibd %{_sysconfdir}/init.d/shibd
+               chmod 755 %{_sysconfdir}/init.d/shibd
+               chkconfig --add shibd
+       fi
+fi
 
 %postun
 /sbin/ldconfig
 
 # delete the shibboleth apache configuration if we're being removed
-[ "$0" = 0 ] || exit 0
+[ "$1" = 0 ] || exit 0
 [ -f %{_sysconfdir}/httpd/conf.d/shib.conf ] && \
     rm -f %{_sysconfdir}/httpd/conf.d/shib.conf
 
+# clear init.d state
+chkconfig --del shibd
+[ -f %{_sysconfdir}/init.d/shibd ] && \
+    rm -f %{_sysconfdir}/init.d/shibd
+
 %triggerin selinux-policy-targeted -- %{name}
 restorecon %{_sbindir}/shibd
 
@@ -132,6 +149,7 @@ restorecon %{_sbindir}/shibd
 %config %{_sysconfdir}/shibboleth/sp-example.key
 %{_sysconfdir}/shibboleth/*.dist
 %{_sysconfdir}/shibboleth/apache*.config
+%{_sysconfdir}/shibboleth/shibd
 
 %exclude %{_bindir}/posttest
 %exclude %{_bindir}/test-client
@@ -149,6 +167,15 @@ restorecon %{_sbindir}/shibd
 %{_sysconfdir}/selinux/targeted/src/policy/domains/program/*.te
 
 %changelog
+* Fri Sep 23 2005 Scott Cantor  <cantor.2@osu.edu>  - 1.3-6
+- Minor patches and default config changes
+- pidfile patch
+- Fix shib.conf creation
+- Integrated init.d script
+
+* Thu Sep 1 2005  Scott Cantor  <cantor.2@osu.edu>  - 1.3-5
+- Applied fix for secadv 20050901 plus rollup of NSAPI fixes
+
 * Sun Apr 24 2005  Scott Cantor  <cantor.2@osu.edu>  - 1.3-1
 - Updated test programs and location of schemas.
 - move siterefresh to to sbindir