Date: Sun, 5 Nov 2017 12:36:16 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r453543 - in head: . www/mod_auth_cas www/mod_auth_cas/files Message-ID: <201711051236.vA5CaGms057046@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Sun Nov 5 12:36:16 2017 New Revision: 453543 URL: https://svnweb.freebsd.org/changeset/ports/453543 Log: www/mod_auth_cas: Update to 1.1 - Update to 1.1 - Add modules.d configuration file - Builds OK with clang - Fix configure detection of libpcre PR: 214707 Submitted by: Geoffroy Desvernay <dgeo@centrale-marseille.fr> With hat: apache Added: head/www/mod_auth_cas/files/250_mod_auth_cas.conf.sample.in (contents, props changed) head/www/mod_auth_cas/files/patch-src_mod__auth__cas.c - copied, changed from r453542, head/www/mod_auth_cas/files/patch-mod_auth_cas.c Deleted: head/www/mod_auth_cas/files/patch-mod_auth_cas.c Modified: head/UPDATING head/www/mod_auth_cas/Makefile head/www/mod_auth_cas/distinfo head/www/mod_auth_cas/pkg-message Modified: head/UPDATING ============================================================================== --- head/UPDATING Sun Nov 5 12:31:23 2017 (r453542) +++ head/UPDATING Sun Nov 5 12:36:16 2017 (r453543) @@ -5,8 +5,17 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20171105 + AFFECTS: users of www/mod_auth_cas + AUTHOR: brnrd@FreeBSD.org + + The configuration of mod_auth_cas has changed since the previous + version. Visit the https://github.com/apereo/mod_auth_cas page for + an overview of all configuration parameters + 20171105: AFFECTS: users of www/mod_rpaf2 + AUTHOR: brnrd@FreeBSD.org The configuration of mod_rpaf2 has been heavily modified since version 0.6. Have a look at https://github.com/gnif/mod_rpaf/tree/v0.8.4 to Modified: head/www/mod_auth_cas/Makefile ============================================================================== --- head/www/mod_auth_cas/Makefile Sun Nov 5 12:31:23 2017 (r453542) +++ head/www/mod_auth_cas/Makefile Sun Nov 5 12:36:16 2017 (r453543) @@ -2,27 +2,49 @@ # $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 LICENSE= APACHE20 -LIB_DEPENDS= libcurl.so:ftp/curl +LIB_DEPENDS= libcurl.so:ftp/curl \ + libpcre.so:devel/pcre USE_GITHUB= yes GH_ACCOUNT= Jasig +USES= ssl -WRKSRC_SUBDIR= src +HAS_CONFIGURE= yes +# configure requires LDFLAGS to find libpcre +LDFLAGS+= -L${AP_LIB} 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> Modified: head/www/mod_auth_cas/distinfo ============================================================================== --- head/www/mod_auth_cas/distinfo Sun Nov 5 12:31:23 2017 (r453542) +++ head/www/mod_auth_cas/distinfo Sun Nov 5 12:36:16 2017 (r453543) @@ -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 Added: head/www/mod_auth_cas/files/250_mod_auth_cas.conf.sample.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/mod_auth_cas/files/250_mod_auth_cas.conf.sample.in Sun Nov 5 12:36:16 2017 (r453543) @@ -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> + Copied and modified: head/www/mod_auth_cas/files/patch-src_mod__auth__cas.c (from r453542, head/www/mod_auth_cas/files/patch-mod_auth_cas.c) ============================================================================== --- head/www/mod_auth_cas/files/patch-mod_auth_cas.c Sun Nov 5 12:31:23 2017 (r453542, copy source) +++ head/www/mod_auth_cas/files/patch-src_mod__auth__cas.c Sun Nov 5 12:36:16 2017 (r453543) @@ -1,14 +1,12 @@ ---- ./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> Modified: head/www/mod_auth_cas/pkg-message ============================================================================== --- head/www/mod_auth_cas/pkg-message Sun Nov 5 12:31:23 2017 (r453542) +++ head/www/mod_auth_cas/pkg-message Sun Nov 5 12:36:16 2017 (r453543) @@ -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 ======================================================================
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711051236.vA5CaGms057046>