From 010300555b88971b1cf93d9697935d1dd9647e33 Mon Sep 17 00:00:00 2001 From: Olli Hauer Date: Sun, 13 Jul 2014 22:31:17 +0000 Subject: [PATCH] - add fix from https://github.com/Jasig/mod_auth_cas/pull/13 - switch to github - bump PORTREVISION PR: 191792 Submitted by: dgeo --- www/mod_auth_cas/Makefile | 18 +++++++----------- www/mod_auth_cas/distinfo | 6 ++---- www/mod_auth_cas/files/patch-mod_auth_cas.c | 14 ++++++++++++++ 3 files changed, 23 insertions(+), 15 deletions(-) create mode 100644 www/mod_auth_cas/files/patch-mod_auth_cas.c diff --git a/www/mod_auth_cas/Makefile b/www/mod_auth_cas/Makefile index 1b38da07750a..98723a97f386 100644 --- a/www/mod_auth_cas/Makefile +++ b/www/mod_auth_cas/Makefile @@ -3,13 +3,8 @@ PORTNAME= mod_auth_cas PORTVERSION= 1.0.9.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www -MASTER_SITES= https://source.jasig.org/cas-clients/mod_auth_cas/tags/mod_auth_cas-${PORTVERSION}/src/ -# SVN tags only, *sigh* -DISTFILES= mod_auth_cas.c mod_auth_cas.h -DIST_SUBDIR= apache2/mod_auth_cas/${PORTVERSION} -EXTRACT_ONLY= MAINTAINER= apache@FreeBSD.org COMMENT= Apache 2.x module that supports the CASv1 and CASv2 protocols @@ -18,7 +13,12 @@ LICENSE= APACHE20 LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl -NO_WRKSUBDIR= yes +USE_GITHUB= yes +GH_ACCOUNT= Jasig +GH_TAGNAME= v${PORTVERSION} +GH_COMMIT= e12f9d1 + +WRKSRC_SUBDIR= src USE_APACHE= 22+ AP_FAST_BUILD= yes @@ -26,8 +26,4 @@ AP_GENPLIST= yes AP_LIB= ${LOCALBASE}/lib AP_EXTRAS= -l ssl -l curl -post-extract: - ${CP} ${DISTDIR}/${DIST_SUBDIR}/mod_auth_cas.c ${WRKSRC}/mod_auth_cas.c - ${CP} ${DISTDIR}/${DIST_SUBDIR}/mod_auth_cas.h ${WRKSRC}/mod_auth_cas.h - .include diff --git a/www/mod_auth_cas/distinfo b/www/mod_auth_cas/distinfo index 27e030b914bc..0ed1d06211cd 100644 --- a/www/mod_auth_cas/distinfo +++ b/www/mod_auth_cas/distinfo @@ -1,4 +1,2 @@ -SHA256 (apache2/mod_auth_cas/1.0.9.1/mod_auth_cas.c) = ddff1d54d2824842b6abacc882c6105a9d006964b7e3b367c1e77c8e5b0a92c1 -SIZE (apache2/mod_auth_cas/1.0.9.1/mod_auth_cas.c) = 81903 -SHA256 (apache2/mod_auth_cas/1.0.9.1/mod_auth_cas.h) = 99518b262b1bc28c1d7d51e9e2cc8510b9c733b29b6d7af99fed145dcdc1af96 -SIZE (apache2/mod_auth_cas/1.0.9.1/mod_auth_cas.h) = 7630 +SHA256 (mod_auth_cas-1.0.9.1.tar.gz) = db1d473628bf699c438450afcee4912f4f44db8a2c676f8f6de7f20bdba8de91 +SIZE (mod_auth_cas-1.0.9.1.tar.gz) = 73178 diff --git a/www/mod_auth_cas/files/patch-mod_auth_cas.c b/www/mod_auth_cas/files/patch-mod_auth_cas.c new file mode 100644 index 000000000000..ed95bdba3f6a --- /dev/null +++ b/www/mod_auth_cas/files/patch-mod_auth_cas.c @@ -0,0 +1,14 @@ +--- ./mod_auth_cas.c.orig 2014-07-13 23:56:46.000000000 +0200 ++++ ./mod_auth_cas.c 2014-07-13 23:58:26.000000000 +0200 +@@ -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 */