Support apache 2.4 (#532800)

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

diff --git a/www-apache/mod_auth_tkt/ChangeLog b/www-apache/mod_auth_tkt/ChangeLog
index 645e5c2b4af0d11261a8fa1b2f3c9ed89b298865..80e1b6ad6f8d0c00cedda4649831053e31e670b8 100644 (file)
--- a/www-apache/mod_auth_tkt/ChangeLog
+++ b/www-apache/mod_auth_tkt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apache/mod_auth_tkt
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_tkt/ChangeLog,v 1.6 2012/11/27 19:06:34 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_tkt/ChangeLog,v 1.7 2015/05/09 08:05:54 pacho Exp $
+
+*mod_auth_tkt-2.1.0-r1 (09 May 2015)
+
+  09 May 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/mod_auth_tkt-2.1.0-apache-2.4.patch, +mod_auth_tkt-2.1.0-r1.ebuild,
+  -mod_auth_tkt-2.1.0.ebuild:
+  Support apache 2.4 (#532800)
 
   27 Nov 2012; Pacho Ramos <pacho@gentoo.org> -mod_auth_tkt-2.0.0_rc2.ebuild,
   metadata.xml:

diff --git a/www-apache/mod_auth_tkt/Manifest b/www-apache/mod_auth_tkt/Manifest
index b36d116a29e7809838340698f0fc97ec9aeaf09e..212334ceabcd1ac3c9759c0b865e571ffa971a13 100644 (file)
--- a/www-apache/mod_auth_tkt/Manifest
+++ b/www-apache/mod_auth_tkt/Manifest
@@ -2,14 +2,15 @@
 Hash: SHA256
 
 AUX 10_mod_auth_tkt.conf 852 SHA256 1419906b22cf22a876e2cbf2f35e9da5c258da2bc35bf730978bc9f94f432f62 SHA512 f3a5b209f89421780f4ac0f40662670403da41dfcebf46846d61fc4c7ef2359aaf44e12fcedb9f548e30abf7eab8c7c8b2fb2e425fc7c2d5c9e0e2db5de64958 WHIRLPOOL 7320fa04f3754ea7d2fc400fbde9203b59d4f195f46201087db28b7a0d684c797d2f287258035c881065d256cf6b136fbad8ccf80ec20d9035b8e66d40eea1fd
-DIST mod_auth_tkt-2.1.0.tar.gz 100731 SHA256 ba456531656be5682f0a6a632a6eccb98c2459753c59b80b843e1d19cc7f8724
-EBUILD mod_auth_tkt-2.1.0.ebuild 1118 SHA256 27692674882f557f327ad7c31650988269a569f63d7ad09c115399739ad85e2c SHA512 237e2214a3a5e34c84c4a8a86f5b2b902306be6b49a6fe55ad82bc152ac60541f6cd38f2f206e95f97048b6bf9419bf297876b9d0dbaff5c9772dd596ec2244e WHIRLPOOL 2ff3a6531f9cb571d7a1d76c71ff17e94d590ba95e9b74840f8ceda5b9550429d067868828ef31b866b514b46b747cbe9953481f41fe69665d3f0a9a1cc29236
-MISC ChangeLog 1098 SHA256 58271bd641e0bcea1ecc76d63679077a0e7139c803e8c7194a57e978f76d902c SHA512 94da225511207f46818090f4e5149845cf6f71a95dcd1cae594834be9bd38992101da79448a85c9b0ec898b92eadabf250b14e2f7a1702c877d4d4f8f4b205f2 WHIRLPOOL 6431fd2c2bd98c240d691fb6a4315d4282e9f844fbe617e3c424f133b164678966f8b53a8ae176fc7877ad0a68c454cccfdb473e2258912864e820bad7fef56c
+AUX mod_auth_tkt-2.1.0-apache-2.4.patch 1466 SHA256 628fe759ec214bcea75975b79cf0a924aed4bf21ec1fa21b773a2aa2d9c931e9 SHA512 c687c49ed11f3a7cfb87e9652b71e49be5e92ff81f0b873646df3cae9ce086482b16292bca74d5daa5a600f906ba8466cc4f8165b223e1f4e9ff42d6cd2c5041 WHIRLPOOL 31192e5fc664627386eeb6ee607f3a3ef7a52d1a101844d93caa4b84f8179e8b404513e735ce584326cd8ba2d2017cbbaea8673a129fd48c94c894bf46b89840
+DIST mod_auth_tkt-2.1.0.tar.gz 100731 SHA256 ba456531656be5682f0a6a632a6eccb98c2459753c59b80b843e1d19cc7f8724 SHA512 e99ed60dbe2deebd654c4c849b20f7aa929ab476b9142e3da1aad8468b4922f4c36d30086396bb15676a3dc3e4ad9ac97e3524d1c70c6f18cea4c436174463b0 WHIRLPOOL f8fde3b318a1cd236e07baa23c39e6d5f6873c6097a54df438bc114383049c67b6db73789eab23fa8b8d8dee738424c8d832f9f286010d33a5e8b07565292f7c
+EBUILD mod_auth_tkt-2.1.0-r1.ebuild 1172 SHA256 a380d7ea1179bcf79bc6d4e2d8640a99dc8d60416bf20aa931b1570bdbf7d1f7 SHA512 7c78a928312fdf9b2e32c31486d0d63273a84cd3eeff048cd2237c55aa50557b521466aca070df24c114fb58e28385a08eeb50aceeff6c63f94465b8c2d2f8a4 WHIRLPOOL 7286d18da6795bd49da968f8690e5bf1a9e9060f6e9c398c9861507a57ef54d179e68daf75dd4d41b07bdcc615853d0fbbb5733363f17466a1ef8cc6b37996ec
+MISC ChangeLog 1321 SHA256 f2e27bed6599787f717ecba2e9fa60fe67c78722506e36ba112416547c710726 SHA512 98a90ecf2b35ec4162cc6afe8c5a1ff3e5e3db1e26a535d6f94189ca57011cd5077df4aee3534979dba4c6935d71297470ca3ee11a1e4d40f4a95247a721aecf WHIRLPOOL 9ceb5f59c3a96781fb3b61cf7287ebd922b67cc22284125d22c7632ff0e46d7ae83d6d911c645c3d5dbeeac8e957337ee63de7f580b3979eee693eea8fa1986b
 MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlC1DzsACgkQCaWpQKGI+9TSqwCeJ8xajUeq9oa/HTcMX74CO5Mj
-mXoAmwWnzg7nbgBqIMLPQBaWEUYoGoPP
-=1AdR
+iEYEAREIAAYFAlVNv+MACgkQCaWpQKGI+9ToNACfRR5lE0R1pwtXCzlBxXj8ct9a
+7nYAn3qGDN9MGD70kVXtlstkD6Gpv23U
+=G1XL
 -----END PGP SIGNATURE-----

diff --git a/www-apache/mod_auth_tkt/files/mod_auth_tkt-2.1.0-apache-2.4.patch b/www-apache/mod_auth_tkt/files/mod_auth_tkt-2.1.0-apache-2.4.patch
new file mode 100644 (file)
index 0000000..af7cc24
--- /dev/null
+++ b/www-apache/mod_auth_tkt/files/mod_auth_tkt-2.1.0-apache-2.4.patch
@@ -0,0 +1,40 @@
+Description: Build fix for apache 2.4
+ Fix for API changes in apache 2.4.
+Author: Ivo De Decker <ivo.dedecker@ugent.be>
+Forwarded: http://sourceforge.net/mailarchive/forum.php?thread_name=20120518111425.GA9186%40ugent.be&forum_name=modauthtkt-users
+Last-Update: 2012-05-17
+
+--- libapache2-mod-auth-tkt-2.1.0.orig/src/mod_auth_tkt.c
++++ libapache2-mod-auth-tkt-2.1.0/src/mod_auth_tkt.c
+@@ -6,6 +6,7 @@
+ #include "http_config.h"
+ #include "http_log.h"
+ #include "http_core.h"
++#include "http_request.h"
+ #include "http_protocol.h"
+ #include "util_md5.h"
+ #include "sha2.h"
+@@ -798,7 +799,11 @@ ticket_digest(request_rec *r, auth_tkt *
+   unsigned char *buf2 = apr_palloc(r->pool, sconf->digest_sz + strlen(secret));
+   int len = 0;
+   char *digest = NULL;
++#if AP_MODULE_MAGIC_AT_LEAST(20111130,0) 
++  char *remote_ip = conf->ignore_ip > 0 ? "0.0.0.0" : r->connection->client_ip;
++#else
+   char *remote_ip = conf->ignore_ip > 0 ? "0.0.0.0" : r->connection->remote_ip;
++#endif
+   unsigned long ip;
+   struct in_addr ia;
+   char *d;
+@@ -1575,7 +1580,11 @@ static void
+ auth_tkt_register_hooks (apr_pool_t *p)
+ {
+   ap_hook_post_config(auth_tkt_version, NULL, NULL, APR_HOOK_MIDDLE);
++#if AP_MODULE_MAGIC_AT_LEAST(20080403,1) 
++  ap_hook_check_authn(auth_tkt_check, NULL, NULL, APR_HOOK_FIRST, AP_AUTH_INTERNAL_PER_CONF);
++#else
+   ap_hook_check_user_id(auth_tkt_check, NULL, NULL, APR_HOOK_FIRST);
++#endif
+ }
+ 
+ /* Declare and populate the main module data structure */

diff --git a/www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0.ebuild b/www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0-r1.ebuild
similarity index 75%
rename from www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0.ebuild
rename to www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0-r1.ebuild
index 477c6dada1c93d3c3c982362be28c2abb79a99c7..e75d420b538fc5ea34ce722f5a6aaa5d2408748c 100644 (file)
--- a/www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0.ebuild
+++ b/www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0-r1.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0.ebuild,v 1.1 2009/09/17 07:45:27 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0-r1.ebuild,v 1.1 2015/05/09 08:05:54 pacho Exp $
 
-# test suite is completely broken
-RESTRICT="test"
-
-inherit apache-module
+EAPI=5
+inherit apache-module eutils
 
 DESCRIPTION="Apache module for cookie based authentication"
 HOMEPAGE="http://www.openfusion.com.au/labs/mod_auth_tkt/"
@@ -24,11 +22,21 @@ APACHE2_MOD_DEFINE="AUTH_TKT"
 
 DOCFILES="README"
 
-need_apache2_2
+# test suite is completely broken
+RESTRICT="test"
+
+need_apache2
+
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-apache-2.4.patch
+}
+
+src_configure() {
+       ./configure --apachever=2.2 --apxs=${APXS}
+}
 
 src_compile() {
-       ./configure --apachever=2.2 --apxs=${APXS} || die "econf failed"
-       emake || die "emake failed"
+       emake
 }
 
 src_install() {