[shibboleth-sp2] 16/29: Set LD_LIBRARY_PATH for overridden libcurl on RHEL6.

[Ferenc Wágner]

This is an automated email from the git hooks/post-receive script.

wferi-guest pushed a commit to annotated tag 2.4.3
in repository shibboleth-sp2.

commit 6d04a91206a6af69220cf877ebd0014926ef8c20
Author: Scott Cantor <cantor.2 at osu.edu>
Date:   Sun Jun 26 20:25:17 2011 +0000

    Set LD_LIBRARY_PATH for overridden libcurl on RHEL6.
---
 configs/shibd-redhat.in |  7 ++++---
 shibboleth.spec.in      | 13 +++++++++++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/configs/shibd-redhat.in b/configs/shibd-redhat.in
index 04dc659..d3c0205 100644
--- a/configs/shibd-redhat.in
+++ b/configs/shibd-redhat.in
@@ -34,10 +34,11 @@ start() {
 			fi
 		fi
 	fi
- 
+
+#_RHEL6_	export LD_LIBRARY_PATH=/opt/shibboleth/lib:$LD_LIBRARY_PATH
 	export SHIBD_PID=$pidfile
- 	touch $pidfile
- 	chown $SHIBD_USER:$SHIBD_USER $pidfile
+	touch $pidfile
+	chown $SHIBD_USER:$SHIBD_USER $pidfile
 	if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
 		/sbin/restorecon $pidfile
 	fi
diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index 2ea0101..ee7e902 100644
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -8,7 +8,7 @@ License:	Apache 2.0
 URL:		http://shibboleth.internet2.edu/
 Source:     %{name}-sp-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-PreReq:     openssl, xmltooling-schemas, opensaml-schemas
+Requires:   openssl, xmltooling-schemas, opensaml-schemas
 %if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130
 PreReq:         %{insserv_prereq}
 BuildRequires:  libXerces-c-devel >= 2.8.0
@@ -20,6 +20,9 @@ BuildRequires:  libxmltooling-devel >= 1.4
 BuildRequires:  libsaml-devel >= 2.4
 %{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: liblog4shib-devel}
+%if 0%{?rhel} >= 6
+Requires: libcurl-openssl >= 7.21.7
+%else
 BuildRequires:  gcc-c++, zlib-devel
 %{!?_without_doxygen:BuildRequires: doxygen}
 %{!?_without_odbc:BuildRequires:unixODBC-devel}
@@ -82,6 +85,10 @@ This package includes files needed for development with Shibboleth.
 	%{__sed} -i "s/\/var\/log\/httpd/\/var\/log\/apache2/g" \
 		$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/native.logger
 %endif
+%if 0%{?rhel} >= 6
+	%{__sed} -i "s/#_RHEL6_//g" \
+		$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/shibd-redhat
+%endif
 
 # Plug the SP into the built-in Apache on a recognized system.
 touch rpm.filelist
@@ -232,8 +239,10 @@ cd /
 %doc %{pkgdocdir}/api
 
 %changelog
-* Fri Jun 10 2011  Scott Cantor  <cantor.2 at osu.edu>  - 2.4.3-1
+* Sun Jun 26 2011  Scott Cantor  <cantor.2 at osu.edu>  - 2.4.3-1
 - Log files shouldn't be world readable.
+- Explicit requirement for libcurl-openssl on RHEL6
+- Uncomment LD_LIBRARY_PATH in init script for RHEL6 
 
 * Fri Dec 25 2009  Scott Cantor  <cantor.2 at osu.edu>  - 2.4-1
 - Update dependencies.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git