Attachment #177853 for bug #214707

View | Details | Raw Unified | Return to bug 214707
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	mod_auth_cas
PORTVERSION=	1.1
DISTVERSIONPREFIX=	v
PORTREVISION=	3
CATEGORIES=	www
PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}

MAINTAINER=	apache@FreeBSD.org
COMMENT=	Apache 2.x module that supports the CASv1 and CASv2 protocols

LICENSE=	APACHE20

LIB_DEPENDS=	libcurl.so:ftp/curl
LIB_DEPENDS+=	libpcre.so:devel/pcre

USE_GITHUB=	yes
GH_ACCOUNT=	Jasig
USES=		ssl

HAS_CONFIGURE=	yes
USE_GCC=	yes

USE_APACHE=	22+
AP_FAST_BUILD=	yes
AP_GENPLIST=	yes
AP_LIB=		${LOCALBASE}/lib
AP_EXTRAS=	-lpcre -lssl -lcrypto

PLIST_FILES=	@sample\ %%APACHEETCDIR%%/modules.d/%%APMOD_FILE%% \
		%%APACHEMODDIR%%/mod_auth_cas.so

PORTDOCS=	README

SUB_FILES=	${APMOD_FILE}
APMOD_FILE=	250_${PORTNAME}.conf.sample
PLIST_SUB+=	APMOD_FILE=${APMOD_FILE}

.include <bsd.port.pre.mk>

do-install:
	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} ${STAGEDIR}${DOCSDIR}
	${APXS} -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} \
		-i -n ${MODULENAME} ${WRKSRC}/src/${MODULENAME}.la
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so
	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
	${INSTALL_DATA} ${WRKDIR}/${APMOD_FILE} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)www/mod_auth_cas/distinfo (-2 / +3 lines)
1	SHA256 (Jasig-mod_auth_cas-v1.0.9.1_GH0.tar.gz) = dbafc0bc51366d34fe7f02d8150a9ae70949da0bae3f19b581bbc0f5b0302d64	1	TIMESTAMP = 1464815458
2	SIZE (Jasig-mod_auth_cas-v1.0.9.1_GH0.tar.gz) = 73147	2	SHA256 (Jasig-mod_auth_cas-v1.1_GH0.tar.gz) = e70decc7a887c63df46a848497acdbd8fa4776d0c8a8c1de2c0d71b1b07e3dd0
		3	SIZE (Jasig-mod_auth_cas-v1.1_GH0.tar.gz) = 409316




LoadModule auth_cas_module    %%APACHEMODDIR%%/mod_auth_cas.so
<IfModule auth_cas_module>
  #CASVersion 2
  #CASDebug Off
  #CASValidateServer On
  #CASValidateDepth 9
  #CASAllowWildcardCert Off
  #CASAllowWildcardCert On
  #CASCertificatePath /usr/local/etc/ssl/cert.pem
  CASLoginURL https://CAS_SERVER/cas/login
  CASValidateURL https://CAS_SERVER/cas/serviceValidate
  # CASCookiePath /dev/null
  #CASCookiePath /var/tmp/
  #CASTimeout 7200
  #CASIdleTimeout 3600
  #CASCacheCleanInterval 1800 # 30 min
  #CASCookieDomain NULL
  #CASCookieHttpOnly Off

  ## per directory (or htaccess):
  #AuthType CAS
  #CASCookie MOD_AUTH_CAS # over http
  #CASSecureCookie MOD_AUTH_CAS_S # over https

  # add HTTP header (for use of REMOTE_USER by backend)
  #CASAuthNHeader None
</IfModule>





--- ./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 */




--- src/mod_auth_cas.c.orig	2016-12-10 12:15:10 UTC
+++ src/mod_auth_cas.c
@@ -22,7 +22,9 @@
  *
  */
 
+#ifdef HAVE_ERROR_H
 #include <error.h>
+#endif
 #include <string.h>
 #include <sys/file.h>
 #include <sys/types.h>

Lines 28-32 Link Here

(-)www/mod_auth_cas/pkg-message (-1 / +1 lines)
28	</Location>	28	</Location>
29		29
30	For more informations see:	30	For more informations see:
31	https://wiki.jasig.org/display/CASC/mod_auth_cas	31	https://github.com/Jasig/mod_auth_cas
32	======================================================================	32	======================================================================

Return to bug 214707

Lines 2-11 Link Here

(-)www/mod_auth_cas/Makefile (-7 / +28 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mod_auth_cas	4	PORTNAME= mod_auth_cas
5	PORTVERSION= 1.0.9.1	5	PORTVERSION= 1.1
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	PORTREVISION= 3
8	CATEGORIES= www	7	CATEGORIES= www
		8	PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX}
9		9
10	MAINTAINER= apache@FreeBSD.org	10	MAINTAINER= apache@FreeBSD.org
11	COMMENT= Apache 2.x module that supports the CASv1 and CASv2 protocols	11	COMMENT= Apache 2.x module that supports the CASv1 and CASv2 protocols
Lines 13-28 Link Here
13	LICENSE= APACHE20	13	LICENSE= APACHE20
14		14
15	LIB_DEPENDS= libcurl.so:ftp/curl	15	LIB_DEPENDS= libcurl.so:ftp/curl
		16	LIB_DEPENDS+= libpcre.so:devel/pcre
16		17
17	USE_GITHUB= yes	18	USE_GITHUB= yes
18	GH_ACCOUNT= Jasig	19	GH_ACCOUNT= Jasig
		20	USES= ssl
19		21
20	WRKSRC_SUBDIR= src	22	HAS_CONFIGURE= yes
		23	USE_GCC= yes
21		24
22	USE_APACHE= 22+	25	USE_APACHE= 22+
23	AP_FAST_BUILD= yes
24	AP_GENPLIST= yes
25	AP_LIB= ${LOCALBASE}/lib	26	AP_LIB= ${LOCALBASE}/lib
26	AP_EXTRAS= -l ssl -l curl	27	AP_EXTRAS= -lpcre -lssl -lcrypto
27		28
28	.include <bsd.port.mk>	29	PLIST_FILES= @sample\ %%APACHEETCDIR%%/modules.d/%%APMOD_FILE%% \
		30	%%APACHEMODDIR%%/mod_auth_cas.so
		31
		32	PORTDOCS= README
		33
		34	SUB_FILES= ${APMOD_FILE}
		35	APMOD_FILE= 250_${PORTNAME}.conf.sample
		36	PLIST_SUB+= APMOD_FILE=${APMOD_FILE}
		37
		38	.include <bsd.port.pre.mk>
		39
		40	do-install:
		41	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} ${STAGEDIR}${DOCSDIR}
		42	${APXS} -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} \
		43	-i -n ${MODULENAME} ${WRKSRC}/src/${MODULENAME}.la
		44	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so
		45	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
		46	${INSTALL_DATA} ${WRKDIR}/${APMOD_FILE} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
		47	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
		48
		49	.include <bsd.port.post.mk>

Line 0 Link Here

(-)www/mod_auth_cas/files/250_mod_auth_cas.conf.sample.in (+28 lines)
	1	LoadModule auth_cas_module %%APACHEMODDIR%%/mod_auth_cas.so
	2	<IfModule auth_cas_module>
	3	#CASVersion 2
	4	#CASDebug Off
	5	#CASValidateServer On
	6	#CASValidateDepth 9
	7	#CASAllowWildcardCert Off
	8	#CASAllowWildcardCert On
	9	#CASCertificatePath /usr/local/etc/ssl/cert.pem
	10	CASLoginURL https://CAS_SERVER/cas/login
	11	CASValidateURL https://CAS_SERVER/cas/serviceValidate
	12	# CASCookiePath /dev/null
	13	#CASCookiePath /var/tmp/
	14	#CASTimeout 7200
	15	#CASIdleTimeout 3600
	16	#CASCacheCleanInterval 1800 # 30 min
	17	#CASCookieDomain NULL
	18	#CASCookieHttpOnly Off
	19
	20	## per directory (or htaccess):
	21	#AuthType CAS
	22	#CASCookie MOD_AUTH_CAS # over http
	23	#CASSecureCookie MOD_AUTH_CAS_S # over https
	24
	25	# add HTTP header (for use of REMOTE_USER by backend)
	26	#CASAuthNHeader None
	27	</IfModule>
	28

Lines 1-14 Link Here

(-)www/mod_auth_cas/files/patch-mod_auth_cas.c (-14 lines)
1	--- ./mod_auth_cas.c.orig 2014-07-13 23:56:46.000000000 +0200
2	+++ ./mod_auth_cas.c 2014-07-13 23:58:26.000000000 +0200
3	@@ -2024,9 +2024,9 @@
4	CRYPTO_set_id_callback(cas_ssl_id_callback);
5	}
6	#else
7	- if(CRYPTO_get_locking_callback() == NULL && CRYPTO_THREADID_get_id_callback() == NULL) {
8	+ if(CRYPTO_get_locking_callback() == NULL && CRYPTO_THREADID_get_callback() == NULL) {
9	CRYPTO_set_locking_callback(cas_ssl_locking_callback);
10	- CRYPTO_THREADID_set_id_callback(cas_ssl_id_callback);
11	+ CRYPTO_THREADID_set_callback(cas_ssl_id_callback);
12	}
13	#endif /* OPENSSL_NO_THREADID */
14	#endif /* defined(OPENSSL_THREADS) && APR_HAS_THREADS */

Line 0 Link Here

(-)www/mod_auth_cas/files/patch-src_mod__auth__cas.c (+12 lines)
	1	--- src/mod_auth_cas.c.orig 2016-12-10 12:15:10 UTC
	2	+++ src/mod_auth_cas.c
	3	@@ -22,7 +22,9 @@
	4	*
	5	*/
	6
	7	+#ifdef HAVE_ERROR_H
	8	#include <error.h>
	9	+#endif
	10	#include <string.h>
	11	#include <sys/file.h>
	12	#include <sys/types.h>