[mod_auth_cas/el6] update for BZ#1010067

[Adam Miller]

commit f5f387667e6924ac66be218fb4e1f0d90affa189
Author: Adam Miller <admiller at redhat.com>
Date:   Thu Sep 19 17:12:17 2013 -0500

    update for BZ#1010067

 .gitignore          |    1 +
 SSL-CA-chains.patch |   14 ++++++++++++++
 mod_auth_cas.spec   |   26 ++++++++++++++++----------
 sources             |    2 +-
 4 files changed, 32 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 723af93..8230958 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 mod_auth_cas-1.0.8.1.tar.gz
+/mod_auth_cas-1.0.9.1.tar.gz
diff --git a/SSL-CA-chains.patch b/SSL-CA-chains.patch
new file mode 100644
index 0000000..87db062
--- /dev/null
+++ b/SSL-CA-chains.patch
@@ -0,0 +1,14 @@
+--- src/mod_auth_cas.c-bak	2011-04-20 08:53:00.635624042 -0700
++++ src/mod_auth_cas.c	2011-04-20 08:56:47.744748886 -0700
+@@ -2024,9 +2024,9 @@
+ 			CRYPTO_set_id_callback(cas_ssl_id_callback);
+ 		}
+ #else
+-		if(CRYPTO_get_locking_callback() == NULL && CRYPTO_THREADID_get_id_callback() == NULL) {
++		if(CRYPTO_get_locking_callback() == NULL && CRYPTO_THREADID_get_callback() == NULL) {
+ 			CRYPTO_set_locking_callback(cas_ssl_locking_callback);
+-			CRYPTO_THREADID_set_id_callback(cas_ssl_id_callback);
++			CRYPTO_THREADID_set_callback(cas_ssl_id_callback);
+ 		}
+ #endif /* OPENSSL_NO_THREADID */
+ #endif /* defined(OPENSSL_THREADS) && APR_HAS_THREADS */
diff --git a/mod_auth_cas.spec b/mod_auth_cas.spec
index c55712c..8dc14be 100644
--- a/mod_auth_cas.spec
+++ b/mod_auth_cas.spec
@@ -1,6 +1,6 @@
 Name:           mod_auth_cas
-Version:        1.0.8.1
-Release:        3%{?dist}
+Version:        1.0.9.1
+Release:        1%{?dist}
 Summary:        Apache 2.0/2.2 compliant module that supports the CASv1 and CASv2 protocols
 
 Group:          System Environment/Daemons
@@ -9,16 +9,21 @@ URL:            http://www.ja-sig.org/wiki/display/CASC/mod_auth_cas
 # The source for this package was pulled from the upstream's vcs. Their 
 # releases are stored in SVN instead of exported to a tar.gz, I used the 
 # following commands to do so:
-#  svn export https://source.jasig.org/cas-clients/mod_auth_cas/tags/mod_auth_cas-1.0.8.1 mod_auth_cas-1.0.8.1
+#  svn export https://source.jasig.org/cas-clients/mod_auth_cas/tags/mod_auth_cas-1.0.9.1 mod_auth_cas-1.0.9.1
 
-#  tar -czvf mod_auth_cas-1.0.8.1.tar.gz mod_auth_cas-1.0.8.1/
-Source0:        mod_auth_cas-1.0.8.1.tar.gz
+#  tar -czvf mod_auth_cas-1.0.9.1.tar.gz mod_auth_cas-1.0.9.1/
+Source0:        mod_auth_cas-1.0.9.1.tar.gz
 Source1:        auth_cas.conf
 
+# From https://confluence.ucdavis.edu/confluence/display/IETP/CAS+SSL+Certificate+Fixes
+# https://confluence.ucdavis.edu/confluence/download/attachments/33685830/mod_auth_cas.c.diff?version=1&modificationDate=1328301602000
+Patch0:		    SSL-CA-chains.patch
+
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  openssl-devel
 BuildRequires:  httpd-devel
+BuildRequires:  libcurl-devel
 
 Requires:       httpd
 
@@ -28,18 +33,16 @@ and CASv2 protocols
 
 %prep
 %setup -q
-
+%patch0 
 
 %build
 %configure --with-apxs=%{_sbindir}/apxs
 make %{?_smp_mflags}
 
 
-
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}/%{_libdir}/httpd/modules/
-
+make install DESTDIR=%{buildroot}
 mkdir -p %{buildroot}/%{_sysconfdir}/httpd/conf.d
 install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/auth_cas.conf
 
@@ -51,10 +54,13 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc README
-%{_libdir}/httpd/modules/*.so
+%{_libdir}/httpd/modules/mod_auth_cas.so
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 
 %changelog
+* Thu Sep 19 2013 Scott Williams <vwbusguy at fedoraproject.org> - 1.0.9.1-1
+- Upgraded to 1.0.9.1 with patch for SSL CA Chains
+
 * Tue Oct 18 2011 Adam Miller <maxamillion at fedoraproject.org> - 1.0.8.1-3
 - Fixed auth_cas.conf as per BZ# 708550 (Thanks to Jimmy Ngo) for the patch
 
diff --git a/sources b/sources
index 99117d3..a61f9dc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-41e2c8268c1f8c84a98ca76133e1d870  mod_auth_cas-1.0.8.1.tar.gz
+4ee6924191785f67d074e7e553dc4c29  mod_auth_cas-1.0.9.1.tar.gz