X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=shibboleth.spec.in;h=26c3b20c085e33bb643845fc117c47fe0ee20c1d;hb=715f1dfc59780e378958cd0aa5eecba2e783453e;hp=3961c7a96c86cc80eaa16ca7d78791231f1c661b;hpb=061797fb2456a6c24411d7447d0afb519b30be5b;p=shibboleth%2Fcpp-sp.git diff --git a/shibboleth.spec.in b/shibboleth.spec.in index 3961c7a..26c3b20 100644 --- a/shibboleth.spec.in +++ b/shibboleth.spec.in @@ -1,16 +1,20 @@ -Name: shibboleth-sp +Name: shibboleth Version: @PACKAGE_VERSION@ Release: 1 Summary: Open source system for attribute-based Web SSO Group: Productivity/Networking/Security -Vendor: Internet2 +Vendor: Shibboleth Consortium License: Apache 2.0 -URL: http://shibboleth.internet2.edu/ -Source: %{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-root -Obsoletes: @PACKAGE_NAME@ < %{version}-%{release} +URL: http://shibboleth.net/ +Source: %{name}-sp-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-sp-%{version}-root +Obsoletes: shibboleth-sp = 2.5.0 Requires: openssl -PreReq: xmltooling-schemas, opensaml-schemas +%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 +PreReq: xmltooling-schemas%{?_isa} >= 1.5.0, opensaml-schemas%{?_isa} >= 2.5.0 +%else +PreReq: xmltooling-schemas >= 1.5.0, opensaml-schemas >= 2.5.0 +%endif %if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130 PreReq: %{insserv_prereq} %{fillup_prereq} BuildRequires: libXerces-c-devel >= 2.8.0 @@ -18,15 +22,16 @@ BuildRequires: libXerces-c-devel >= 2.8.0 BuildRequires: libxerces-c-devel >= 2.8.0 %endif BuildRequires: libxml-security-c-devel >= 1.4.0 -BuildRequires: libxmltooling-devel >= 1.5 -BuildRequires: libsaml-devel >= 2.5 +BuildRequires: libxmltooling-devel >= 1.5.0 +BuildRequires: libsaml-devel >= 2.5.0 %{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0} -%{!?_with_log4cpp:BuildRequires: liblog4shib-devel} +%{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 1.0.4} %if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 -Requires: libcurl-openssl >= 7.21.7 +Requires: libcurl-openssl%{?_isa} >= 7.21.7 BuildRequires: chrpath %endif BuildRequires: gcc-c++, zlib-devel, boost-devel >= 1.32.0 +%{!?_without_gssapi:BuildRequires: krb5-devel} %{!?_without_doxygen:BuildRequires: doxygen} %{!?_without_odbc:BuildRequires:unixODBC-devel} %{?_with_fastcgi:BuildRequires: fcgi-devel} @@ -35,7 +40,11 @@ BuildRequires: libmemcached-devel %endif %{?_with_memcached:BuildRequires: libmemcached-devel} %if "%{_vendor}" == "redhat" +%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 +%{!?_without_builtinapache:BuildRequires: httpd-devel%{?_isa}} +%else %{!?_without_builtinapache:BuildRequires: httpd-devel} +%endif BuildRequires: redhat-rpm-config Requires(pre): shadow-utils Requires(post): chkconfig @@ -48,9 +57,9 @@ Requires(pre): pwdutils %define runuser shibd %if "%{_vendor}" == "suse" -%define pkgdocdir %{_docdir}/%{name} +%define pkgdocdir %{_docdir}/shibboleth %else -%define pkgdocdir %{_docdir}/%{name}-%{version} +%define pkgdocdir %{_docdir}/shibboleth-%{version} %endif %description @@ -65,16 +74,17 @@ daemon, default plugins, and Apache module(s). Summary: Shibboleth Development Headers Group: Development/Libraries/C and C++ Requires: %{name} = %{version}-%{release} +Obsoletes: shibboleth-sp-devel = 2.5.0 %if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130 Requires: libXerces-c-devel >= 2.8.0 %else Requires: libxerces-c-devel >= 2.8.0 %endif Requires: libxml-security-c-devel >= 1.4.0 -Requires: libxmltooling-devel >= 1.5 -Requires: libsaml-devel >= 2.5 +Requires: libxmltooling-devel >= 1.5.0 +Requires: libsaml-devel >= 2.5.0 %{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0} -%{!?_with_log4cpp:Requires: liblog4shib-devel} +%{!?_with_log4cpp:Requires: liblog4shib-devel >= 1.0.4} %description devel Shibboleth is a Web Single Sign-On implementations based on OpenSAML @@ -84,13 +94,13 @@ exchange of rich attributes subject to privacy controls. This package includes files needed for development with Shibboleth. %prep -%setup -q +%setup -n %{name}-sp-%{version} %build %if 0%{?centos_version} >= 600 - %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_memcached:--with-memcached} %{?shib_options} + %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{!?_without_memcached:--with-memcached} %{?shib_options} %else - %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{?_with_memcached} %{?shib_options} + %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{?_with_memcached} %{?shib_options} %endif %{__make} pkgdocdir=%{pkgdocdir} @@ -99,22 +109,22 @@ This package includes files needed for development with Shibboleth. %if "%{_vendor}" == "suse" %{__sed} -i "s/\/var\/log\/httpd/\/var\/log\/apache2/g" \ - $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/native.logger + $RPM_BUILD_ROOT%{_sysconfdir}/shibboleth/native.logger %endif # Plug the SP into the built-in Apache on a recognized system. touch rpm.filelist APACHE_CONFIG="no" -if [ -f $RPM_BUILD_ROOT%{_libdir}/%{name}/mod_shib_13.so ] ; then +if [ -f $RPM_BUILD_ROOT%{_libdir}/shibboleth/mod_shib_13.so ] ; then APACHE_CONFIG="apache.config" fi -if [ -f $RPM_BUILD_ROOT%{_libdir}/%{name}/mod_shib_20.so ] ; then +if [ -f $RPM_BUILD_ROOT%{_libdir}/shibboleth/mod_shib_20.so ] ; then APACHE_CONFIG="apache2.config" fi -if [ -f $RPM_BUILD_ROOT%{_libdir}/%{name}/mod_shib_22.so ] ; then +if [ -f $RPM_BUILD_ROOT%{_libdir}/shibboleth/mod_shib_22.so ] ; then APACHE_CONFIG="apache22.config" fi -if [ -f $RPM_BUILD_ROOT%{_libdir}/%{name}/mod_shib_24.so ] ; then +if [ -f $RPM_BUILD_ROOT%{_libdir}/shibboleth/mod_shib_24.so ] ; then APACHE_CONFIG="apache24.config" fi %{?_without_builtinapache:APACHE_CONFIG="no"} @@ -128,7 +138,7 @@ if [ "$APACHE_CONFIG" != "no" ] ; then fi if [ "$APACHE_CONFD" != "no" ] ; then %{__mkdir} -p $RPM_BUILD_ROOT$APACHE_CONFD - %{__cp} -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/$APACHE_CONFIG $RPM_BUILD_ROOT$APACHE_CONFD/shib.conf + %{__cp} -p $RPM_BUILD_ROOT%{_sysconfdir}/shibboleth/$APACHE_CONFIG $RPM_BUILD_ROOT$APACHE_CONFD/shib.conf echo "%config(noreplace) $APACHE_CONFD/shib.conf" >> rpm.filelist fi fi @@ -169,7 +179,7 @@ fi %if "%{_vendor}" == "redhat" || "%{_vendor}" == "suse" # %{_initddir} not yet in RHEL5, use deprecated %{_initrddir} install -d -m 0755 $RPM_BUILD_ROOT%{_initrddir} - install -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/shibd-%{_vendor} $RPM_BUILD_ROOT%{_initrddir}/shibd + install -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/shibboleth/shibd-%{_vendor} $RPM_BUILD_ROOT%{_initrddir}/shibd %if "%{_vendor}" == "suse" install -d -m 0755 $RPM_BUILD_ROOT/%{_sbindir} %{__ln_s} -f %{_initrddir}/shibd $RPM_BUILD_ROOT%{_sbindir}/rcshibd @@ -185,16 +195,16 @@ fi %pre getent group %{runuser} >/dev/null || groupadd -r %{runuser} getent passwd %{runuser} >/dev/null || useradd -r -g %{runuser} \ - -d %{_localstatedir}/run/%{name} -s /sbin/nologin -c "Shibboleth SP daemon" %{runuser} + -d %{_localstatedir}/run/shibboleth -s /sbin/nologin -c "Shibboleth SP daemon" %{runuser} exit 0 %post -%ifnos solaris2.8 solaris2.9 solaris2.10 +%ifnos solaris2.8 solaris2.9 solaris2.10 solaris2.11 /sbin/ldconfig %endif # Key generation or ownership fix -cd %{_sysconfdir}/%{name} +cd %{_sysconfdir}/shibboleth if [ -f sp-key.pem ] ; then %{__chown} %{runuser}:%{runuser} sp-key.pem sp-cert.pem 2>/dev/null || : else @@ -202,7 +212,7 @@ else fi # Fix ownership of log files (even on new installs, if they're left from an older one). -%{__chown} %{runuser}:%{runuser} %{_localstatedir}/log/%{name}/* 2>/dev/null || : +%{__chown} %{runuser}:%{runuser} %{_localstatedir}/log/shibboleth/* 2>/dev/null || : %if "%{_vendor}" == "redhat" if [ "$1" -gt "1" ] ; then @@ -226,15 +236,6 @@ fi # This adds the proper /etc/rc*.d links for the script /sbin/chkconfig --add shibd - - # On upgrade, restart components if they're already running. - # This gets repeated now down in %postun, and the next release - # should remove this copy. If we yank it now, we'll break upgrades. - if [ "$1" -gt "1" ] ; then - /etc/init.d/shibd status 1>/dev/null && /etc/init.d/shibd restart 1>/dev/null - %{!?_without_builtinapache:/etc/init.d/httpd status 1>/dev/null && /etc/init.d/httpd restart 1>/dev/null} - exit 0 - fi %endif %if "%{_vendor}" == "suse" # This adds the proper /etc/rc*.d links for the script @@ -262,7 +263,7 @@ fi exit 0 %postun -%ifnos solaris2.8 solaris2.9 solaris2.10 +%ifnos solaris2.8 solaris2.9 solaris2.10 solaris2.11 /sbin/ldconfig %endif %if "%{_vendor}" == "redhat" @@ -284,8 +285,8 @@ exit 0 # ugly hack if init script got removed during %postun by upgraded (buggy/2.1) package %if "%{_vendor}" == "redhat" if [ ! -f %{_initrddir}/shibd ] ; then - if [ -f %{_sysconfdir}/%{name}/shibd-%{_vendor} ] ; then - %{__cp} -p %{_sysconfdir}/%{name}/shibd-%{_vendor} %{_initrddir}/shibd + if [ -f %{_sysconfdir}/shibboleth/shibd-%{_vendor} ] ; then + %{__cp} -p %{_sysconfdir}/shibboleth/shibd-%{_vendor} %{_initrddir}/shibd %{__chmod} 755 %{_initrddir}/shibd /sbin/chkconfig --add shibd fi @@ -299,32 +300,31 @@ fi %{_bindir}/resolvertest %{_libdir}/libshibsp.so.* %{_libdir}/libshibsp-lite.so.* -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/* -%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} -%{_datadir}/%{name}/* -%dir %{_sysconfdir}/%{name} -%config(noreplace) %{_sysconfdir}/%{name}/*.xml -%config(noreplace) %{_sysconfdir}/%{name}/*.html -%config(noreplace) %{_sysconfdir}/%{name}/*.logger +%dir %{_libdir}/shibboleth +%{_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 +%dir %{_datadir}/xml/shibboleth +%{_datadir}/xml/shibboleth/* +%dir %{_datadir}/shibboleth +%{_datadir}/shibboleth/* +%dir %{_sysconfdir}/shibboleth +%config(noreplace) %{_sysconfdir}/shibboleth/*.xml +%config(noreplace) %{_sysconfdir}/shibboleth/*.html +%config(noreplace) %{_sysconfdir}/shibboleth/*.logger %if "%{_vendor}" == "redhat" || "%{_vendor}" == "suse" %config %{_initrddir}/shibd %endif %if "%{_vendor}" == "suse" %{_sbindir}/rcshibd %endif -%{_sysconfdir}/%{name}/*.dist -%{_sysconfdir}/%{name}/apache*.config -%{_sysconfdir}/%{name}/shibd-* -%attr(0755,root,root) %{_sysconfdir}/%{name}/keygen.sh -%attr(0755,root,root) %{_sysconfdir}/%{name}/metagen.sh -%{_sysconfdir}/%{name}/*.xsl +%{_sysconfdir}/shibboleth/*.dist +%{_sysconfdir}/shibboleth/apache*.config +%{_sysconfdir}/shibboleth/shibd-* +%attr(0755,root,root) %{_sysconfdir}/shibboleth/keygen.sh +%attr(0755,root,root) %{_sysconfdir}/shibboleth/metagen.sh +%{_sysconfdir}/shibboleth/*.xsl %doc %{pkgdocdir} %exclude %{pkgdocdir}/api @@ -336,7 +336,18 @@ fi %doc %{pkgdocdir}/api %changelog -* Thu Mar 1 2012 Scott Cantor - 2.5-1 +* Sat Jun 8 2013 Scott Cantor - 2.5.2-1 +- Add --with-gssapi using MIT K5 by default + +* Tue Sep 25 2012 Scott Cantor - 2.5.1-1 +- Merge back various changes used in released packages +- Prep for 2.5.1 by pulling extra restart out + +* Tue Aug 7 2012 Scott Cantor - 2.5.0-2 +- Changed package name back to shibboleth because of upgrade bugs +- Put back extra restart for this release only. + +* Thu Mar 1 2012 Scott Cantor - 2.5.0-1 - Move logo and stylesheet to version-independent tree - Make shib.conf noreplace - Post-fixup of Alias commands in older shib.conf