[cpp-sp COMMIT] in /branches/REL_2: configs/Makefile.am configs/shibd-amazon.in shibboleth.spec.in

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jan 19 19:27:14 2015
New Revision: 3893

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

Added:
    branches/REL_2/configs/shibd-amazon.in
Modified:
    branches/REL_2/configs/Makefile.am
    branches/REL_2/shibboleth.spec.in

Modified: branches/REL_2/configs/Makefile.am
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/Makefile.am?rev=3893&r1=3892&r2=3893&view=diff
==============================================================================
--- branches/REL_2/configs/Makefile.am (original)
+++ branches/REL_2/configs/Makefile.am Mon Jan 19 19:27:14 2015
@@ -12,6 +12,7 @@
 pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@
 pkgsysconf_DATA = \
 	shibd-redhat \
+    shibd-amazon \
 	shibd-suse \
 	shibd-debian \
 	shibd-osx.plist \
@@ -87,6 +88,9 @@
 shibd-redhat: ${srcdir}/shibd-redhat.in Makefile ${top_builddir}/config.status
 	$(MAKE) do-build-file FILE=$@
 
+shibd-amazon: ${srcdir}/shibd-amazon.in Makefile ${top_builddir}/config.status
+	$(MAKE) do-build-file FILE=$@
+
 shibd-suse: ${srcdir}/shibd-suse.in Makefile ${top_builddir}/config.status
 	$(MAKE) do-build-file FILE=$@
 
@@ -138,6 +142,7 @@
 	apache22.config \
 	apache24.config \
 	shibd-redhat \
+    shibd-amazon \
 	shibd-suse \
 	shibd-debian \
 	shibd-osx.plist \
@@ -152,6 +157,7 @@
 	apache22.config.in \
 	apache24.config.in \
 	shibd-redhat.in \
+    shibd-amazon.in \
 	shibd-suse.in \
 	shibd-debian.in \
 	shibd-osx.plist.in \

Modified: branches/REL_2/shibboleth.spec.in
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibboleth.spec.in?rev=3893&r1=3892&r2=3893&view=diff
==============================================================================
--- branches/REL_2/shibboleth.spec.in (original)
+++ branches/REL_2/shibboleth.spec.in Mon Jan 19 19:27:14 2015
@@ -10,7 +10,7 @@
 BuildRoot:	%{_tmppath}/%{name}-sp-%{version}-root
 Obsoletes:	shibboleth-sp = 2.5.0
 Requires:	openssl
-%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
+%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 || 0%{?amzn} >= 1
 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
@@ -30,7 +30,7 @@
 BuildRequires:	libsaml-devel >= 2.5.0
 %{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 1.0.4}
-%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
+%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 || 0%{?amzn} >= 1
 Requires:	libcurl-openssl%{?_isa} >= 7.21.7
 BuildRequires:	chrpath
 %endif
@@ -46,8 +46,8 @@
 BuildRequires:	libmemcached-devel
 %endif
 %{?_with_memcached:BuildRequires: libmemcached-devel}
-%if "%{_vendor}" == "redhat"
-%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
+%if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon"
+%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 || 0%{?amzn} >= 1
 %{!?_without_builtinapache:BuildRequires: httpd-devel%{?_isa}}
 %else
 %{!?_without_builtinapache:BuildRequires: httpd-devel}
@@ -156,7 +156,7 @@
 
 # Establish location of sysconfig file, if any.
 SYSCONFIG_SHIBD="no"
-%if "%{_vendor}" == "redhat"
+%if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon"
 	%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 	echo "%config(noreplace) %{_sysconfdir}/sysconfig/shibd" >> rpm.filelist
 	SYSCONFIG_SHIBD="$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/shibd"
@@ -174,7 +174,7 @@
 # User account for shibd
 SHIBD_USER=%{runuser}
 EOF
-	%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
+	%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 || 0%{?amzn} >= 1
 		cat >> $SYSCONFIG_SHIBD <<EOF
 
 # Override OS-supplied libcurl
@@ -187,7 +187,7 @@
 	%endif
 fi
 
-%if "%{_vendor}" == "redhat" || "%{_vendor}" == "suse"
+%if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon" || "%{_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}/shibboleth/shibd-%{_vendor} $RPM_BUILD_ROOT%{_initrddir}/shibd
@@ -225,7 +225,7 @@
 # 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 || :
 
-%if "%{_vendor}" == "redhat"
+%if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon"
 	if [ "$1" -gt "1" ] ; then
 		# On Red Hat with shib.conf installed, clean up old Alias commands
 		# by pointing them at new version-independent /usr/share/share tree.
@@ -258,7 +258,7 @@
 
 %preun
 # On final removal, stop shibd and remove service, restart Apache if running.
-%if "%{_vendor}" == "redhat"
+%if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon"
 	if [ "$1" -eq 0 ] ; then
 		/sbin/service shibd stop >/dev/null 2>&1
 		/sbin/chkconfig --del shibd
@@ -277,7 +277,7 @@
 %ifnos solaris2.8 solaris2.9 solaris2.10 solaris2.11
 /sbin/ldconfig
 %endif
-%if "%{_vendor}" == "redhat"
+%if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon"

[... 32 lines stripped ...]