From fb50fbdb0d2728a890048f131a0a7e6dec4e2c17 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Oct 30 2015 14:16:42 +0000 Subject: update to latest upstream 1.0.9.1 --- diff --git a/.gitignore b/.gitignore index 723af93..27147af 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ mod_auth_cas-1.0.8.1.tar.gz +/v1.0.9.1.tar.gz diff --git a/auth_cas.conf b/auth_cas.conf index c8980b8..1ff68ca 100644 --- a/auth_cas.conf +++ b/auth_cas.conf @@ -2,5 +2,8 @@ # mod_auth_cas is an Apache 2.0/2.2 compliant module that supports the # CASv1 and CASv2 protocols # + + LoadModule ssl_module modules/mod_ssl.so + LoadModule auth_cas_module modules/mod_auth_cas.so diff --git a/mod_auth_cas-1.0.8.1-fixbuild.patch b/mod_auth_cas-1.0.8.1-fixbuild.patch deleted file mode 100644 index 6fa5544..0000000 --- a/mod_auth_cas-1.0.8.1-fixbuild.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- mod_auth_cas-1.0.8.1/Makefile.in.fixbuild -+++ mod_auth_cas-1.0.8.1/Makefile.in -@@ -1,7 +1,7 @@ --APXS_LIBEXECDIR:=$(shell /usr/bin/apxs2 -q LIBEXECDIR) -+APXS_LIBEXECDIR:=$(shell @APXS@ -q LIBEXECDIR) - - all: -- @APXS@ -c src/mod_auth_cas.c -+ @APXS@ -c src/mod_auth_cas.c -lssl -lcrypto - - install: - if test ! -d ${DESTDIR}${APXS_LIBEXECDIR}; then mkdir -p ${DESTDIR}${APXS_LIBEXECDIR}; fi diff --git a/mod_auth_cas.spec b/mod_auth_cas.spec index 3ecb910..ccb9c9f 100644 --- a/mod_auth_cas.spec +++ b/mod_auth_cas.spec @@ -7,28 +7,23 @@ Name: mod_auth_cas -Version: 1.0.8.1 -Release: 12%{?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 License: GPLv3+ with exceptions 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 - -# 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 +Source0: https://github.com/Jasig/%{name}/archive/v%{version}.tar.gz Source1: auth_cas.conf -Patch0: mod_auth_cas-1.0.8.1-fixbuild.patch +#Patch0: mod_auth_cas-1.0.8.1-fixbuild.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: openssl-devel BuildRequires: httpd-devel BuildRequires: m4, readline-devel, autoconf, automake +BuildRequires: libcurl-devel Requires: httpd @@ -39,15 +34,13 @@ and CASv2 protocols %prep %setup -q -%patch0 -p1 -b .fixbuild +#%patch0 -p1 -b .fixbuild %build autoreconf -vif #BZ926155 - support aarch64 %configure --with-apxs=%{_httpd_apxs} make %{?_smp_mflags} - - %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} LIBEXECDIR=%{_httpd_moddir} @@ -70,6 +63,9 @@ rm -rf %{buildroot} %config(noreplace) %{_httpd_modconfdir}/*.conf %changelog +* Fri Oct 30 2015 Adam Miller - 1.0.9.1-1 +- Update to latest upstream. + * Wed Jun 17 2015 Fedora Release Engineering - 1.0.8.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild @@ -82,7 +78,7 @@ rm -rf %{buildroot} * Sat Aug 03 2013 Fedora Release Engineering - 1.0.8.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild -* Thu Mar 02 2013 Adam Miller - 1.0.8.1-8 +* Thu Mar 07 2013 Adam Miller - 1.0.8.1-8 - BZ926155 - support aarch64 * Thu Feb 14 2013 Fedora Release Engineering - 1.0.8.1-7 diff --git a/sources b/sources index 99117d3..8c1381e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -41e2c8268c1f8c84a98ca76133e1d870 mod_auth_cas-1.0.8.1.tar.gz +7a5fb258218efd7c54b4f48996138821 v1.0.9.1.tar.gz