Attachment 177853 Details for Bug 214707 – svn diff www/mod_auth_cas

[patch] svn diff www/mod_auth_cas

mod_auth_cas-1.1.diff (text/plain), 6.09 KB, created by geoffroy desvernay on 2016-12-10 16:46:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: geoffroy desvernay

Created: 2016-12-10 16:46:24 UTC

Size: 6.09 KB

patch

obsolete

>Index: www/mod_auth_cas/Makefile
>===================================================================
>--- www/mod_auth_cas/Makefile	(revision 428277)
>+++ www/mod_auth_cas/Makefile	(working copy)
>@@ -2,10 +2,10 @@
> # $FreeBSD$
> 
> PORTNAME=	mod_auth_cas
>-PORTVERSION=	1.0.9.1
>+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
>@@ -13,16 +13,37 @@
> LICENSE=	APACHE20
> 
> LIB_DEPENDS=	libcurl.so:ftp/curl
>+LIB_DEPENDS+=	libpcre.so:devel/pcre
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	Jasig
>+USES=		ssl
> 
>-WRKSRC_SUBDIR=	src
>+HAS_CONFIGURE=	yes
>+USE_GCC=	yes
> 
> USE_APACHE=	22+
>-AP_FAST_BUILD=	yes
>-AP_GENPLIST=	yes
> AP_LIB=		${LOCALBASE}/lib
>-AP_EXTRAS=	-l ssl -l curl
>+AP_EXTRAS=	-lpcre -lssl -lcrypto
> 
>-.include <bsd.port.mk>
>+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>
>Index: www/mod_auth_cas/distinfo
>===================================================================
>--- www/mod_auth_cas/distinfo	(revision 428277)
>+++ www/mod_auth_cas/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (Jasig-mod_auth_cas-v1.0.9.1_GH0.tar.gz) = dbafc0bc51366d34fe7f02d8150a9ae70949da0bae3f19b581bbc0f5b0302d64
>-SIZE (Jasig-mod_auth_cas-v1.0.9.1_GH0.tar.gz) = 73147
>+TIMESTAMP = 1464815458
>+SHA256 (Jasig-mod_auth_cas-v1.1_GH0.tar.gz) = e70decc7a887c63df46a848497acdbd8fa4776d0c8a8c1de2c0d71b1b07e3dd0
>+SIZE (Jasig-mod_auth_cas-v1.1_GH0.tar.gz) = 409316
>Index: www/mod_auth_cas/files/250_mod_auth_cas.conf.sample.in
>===================================================================
>--- www/mod_auth_cas/files/250_mod_auth_cas.conf.sample.in	(nonexistent)
>+++ www/mod_auth_cas/files/250_mod_auth_cas.conf.sample.in	(working copy)
>@@ -0,0 +1,28 @@
>+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>
>+
>
>Property changes on: www/mod_auth_cas/files/250_mod_auth_cas.conf.sample.in
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/mod_auth_cas/files/patch-mod_auth_cas.c
>===================================================================
>--- www/mod_auth_cas/files/patch-mod_auth_cas.c	(revision 428277)
>+++ www/mod_auth_cas/files/patch-mod_auth_cas.c	(nonexistent)
>@@ -1,14 +0,0 @@
>---- ./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 */
>
>Property changes on: www/mod_auth_cas/files/patch-mod_auth_cas.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: www/mod_auth_cas/files/patch-src_mod__auth__cas.c
>===================================================================
>--- www/mod_auth_cas/files/patch-src_mod__auth__cas.c	(nonexistent)
>+++ www/mod_auth_cas/files/patch-src_mod__auth__cas.c	(working copy)
>@@ -0,0 +1,12 @@
>+--- 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>
>
>Property changes on: www/mod_auth_cas/files/patch-src_mod__auth__cas.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/mod_auth_cas/pkg-message
>===================================================================
>--- www/mod_auth_cas/pkg-message	(revision 428277)
>+++ www/mod_auth_cas/pkg-message	(working copy)
>@@ -28,5 +28,5 @@
>  </Location>
> 
>  For more informations see:
>- https://wiki.jasig.org/display/CASC/mod_auth_cas
>+ https://github.com/Jasig/mod_auth_cas
> ======================================================================

Flags:

dgeo: maintainer-approval?

Actions: View | Diff

Attachments on bug 214707: 177853