From owner-svn-ports-all@FreeBSD.ORG Sun Jul 13 22:31:18 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AF37773E; Sun, 13 Jul 2014 22:31:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9C9BB2EFF; Sun, 13 Jul 2014 22:31:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6DMVIBf038128; Sun, 13 Jul 2014 22:31:18 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6DMVIW5038124; Sun, 13 Jul 2014 22:31:18 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201407132231.s6DMVIW5038124@svn.freebsd.org> From: Olli Hauer Date: Sun, 13 Jul 2014 22:31:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361716 - in head/www/mod_auth_cas: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jul 2014 22:31:18 -0000 Author: ohauer Date: Sun Jul 13 22:31:17 2014 New Revision: 361716 URL: http://svnweb.freebsd.org/changeset/ports/361716 QAT: https://qat.redports.org/buildarchive/r361716/ Log: - add fix from https://github.com/Jasig/mod_auth_cas/pull/13 - switch to github - bump PORTREVISION PR: 191792 Submitted by: dgeo Added: head/www/mod_auth_cas/files/ head/www/mod_auth_cas/files/patch-mod_auth_cas.c (contents, props changed) Modified: head/www/mod_auth_cas/Makefile head/www/mod_auth_cas/distinfo Modified: head/www/mod_auth_cas/Makefile ============================================================================== --- head/www/mod_auth_cas/Makefile Sun Jul 13 22:24:18 2014 (r361715) +++ head/www/mod_auth_cas/Makefile Sun Jul 13 22:31:17 2014 (r361716) @@ -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 Modified: head/www/mod_auth_cas/distinfo ============================================================================== --- head/www/mod_auth_cas/distinfo Sun Jul 13 22:24:18 2014 (r361715) +++ head/www/mod_auth_cas/distinfo Sun Jul 13 22:31:17 2014 (r361716) @@ -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 Added: head/www/mod_auth_cas/files/patch-mod_auth_cas.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/mod_auth_cas/files/patch-mod_auth_cas.c Sun Jul 13 22:31:17 2014 (r361716) @@ -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 */