Support apache 2.4 (#532842)

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

4 files changed, 169 insertions, 16 deletions

diff --git a/www-apache/mod_mono/ChangeLog b/www-apache/mod_mono/ChangeLog
index 9d9947497eb1..1686c102d318 100644
--- a/www-apache/mod_mono/ChangeLog
+++ b/www-apache/mod_mono/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_mono
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/ChangeLog,v 1.82 2014/08/10 20:17:04 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/ChangeLog,v 1.83 2015/06/07 19:15:21 pacho Exp $
+
+  07 Jun 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/mod_mono-2.10-apache-2.4.patch, mod_mono-2.10.ebuild:
+  Support apache 2.4 (#532842)
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> mod_mono-2.10.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/www-apache/mod_mono/Manifest b/www-apache/mod_mono/Manifest
index d285d9168988..fd254daea6cb 100644
--- a/www-apache/mod_mono/Manifest
+++ b/www-apache/mod_mono/Manifest
@@ -2,14 +2,15 @@
 Hash: SHA256
 
 AUX 2.2/70_mod_mono.conf 2889 SHA256 1ab3424a4d9365e21ef55e5bda0af3efedb2bfb71b039b022eb54f6dacadb0f1 SHA512 6e35d73331b7f10f4dbc4c13461b4d7d83bacef2973bdd5c15ba6ca39f6cef00f3543e77f98c0f3f2d60187afb44aca98d448479c555eaa1d3c87f4b572180f6 WHIRLPOOL 3cb0a9ee021ff3beeacdda98b72832eba0c7f51e581f9ce93e586dbc2cd1445800f1993ffc29ba90eedecbe66e0c7332b27a7ea19b780c56fb26d871ba4d5f19
+AUX mod_mono-2.10-apache-2.4.patch 3814 SHA256 def5dc1d06e0e43e6a2fef605557232cdb97db527f389f4568def03f5a4f94f7 SHA512 473553c612e8e4ffb4c656f98948047ce42033c9af0fe352494d167b96ed1f9a1cf4198d5844d568f090b045a2541277e2ebf6a54fcd8cba1b62d86a40e546c1 WHIRLPOOL ffb44eca16293e7b5db8071377fb5816304e3f492ad00bd4337bc8a916d5f3454e234958a54d70f5f802ebcee4fbb3f6254ed0faa02d3b8bb4602abb24dc21e6
 DIST mod_mono-2.10.tar.bz2 259321 SHA256 a8ba3a8785f2deb13b4c0b1dedb4aa9405077309c9c42d99694cedfcc0f9e3f7 SHA512 b0cb9e8125f2ae124c6c2de259afa04ccb194fb45f7b3968f5cce85df25a8d505a49313429b2ce7fef51d02586ce1af8a7e1e47d2750b4dc478600ba86ea77de WHIRLPOOL 87db32cfe8590c454bde57a9dd4a79c6b22a4b84cadb3ae2e467fd2aa6491dbd8313b5cb5982410c430401aa1668e789979924f3fd1fbe585723b8b2331f353a
-EBUILD mod_mono-2.10.ebuild 1692 SHA256 28a16f0fedee90d2760c34b65c5307f68ad66e9c7a9ad1bcf4ff037c54aaab52 SHA512 58b0bf10dfae82afdf08567936583dfeceea148f411e76045020b7f17beb3af2842e23d906cf86b199a94d15e685dc67a9f3728574f036b5ab635447d128e76b WHIRLPOOL 984eeedccdfc0d0577fc9364e8fdf1a8565ac73b93cf8911b3cb268410faf8c7cd4a997116b19b825f96ed120d8b6a86be66d338a545c1d98574c596c5c9e60b
-MISC ChangeLog 14911 SHA256 19807bf381f5d6695155192417f91d3ae72c7e6832b48332d29e0e74900fb87d SHA512 ef8575f352bf952314caf76395727d7e660e4ec9e8a7e7e20c1eba5b96fffc33cd2a9fe0ed17b239629e845dc7f1bd40a3719e262a47926a16d92ac24622c51a WHIRLPOOL c70950d0164fba7e05359b5c28f737a2e41e6152fc2c52452f913aedfcb0105ab2a16002c83ab7e26b64e71587979b29e07e732296416347ca66644f7a27a75e
+EBUILD mod_mono-2.10.ebuild 1728 SHA256 0d02c390a057065a852ea1cdd0e3d83dcf046f86a311679d564388fa09cea85a SHA512 f0ab91df4223aa841aa19d764252ecef3f6f3e8ae60c05ef91f4d80ed1922c93d6ba2b17a5a2607a45bfe8e7400a7c513e727c5ee17fcf56e7f7a1c8761d7e52 WHIRLPOOL 7b8403f35e8e124497424cace0c2716ea0b2afb7714cda17b704664fa10ff80835381dae230aed0beb430fccd316d017b8ec7730a54183f86a08bd2c56ba3a09
+MISC ChangeLog 15051 SHA256 13cefc0ec7d7897b28f5a31a13d352d7b8d802eb5b07124ac3615c5bafd05a82 SHA512 c07aea4a19a22da232b2bde855415013b172369a981271b8a0962a583df3e9d59765615b6ee68cc330cbde5d299dfa963efa0535d5d54f8ef102602a1fdd9e23 WHIRLPOOL 6caa4adec164db48422d307e16064055424a61197d2da1c528de50d2b24784ef017db238da464b9d2da3efe4c4f02d628e761176d24f41872a4cedf1af5c5b88
 MISC metadata.xml 413 SHA256 023c381a976e28aedb0858121bf26a0bb03e85b4d662c9be0f2d8e35b592d9d5 SHA512 e95fb009fbe00bfce8a0244ebef87813213e652dd04cad28a7fcaa709367b7a1d3ee6aa64923806e202c507734051f08610550930cf421e7e0739d3047500c7d WHIRLPOOL ff79beb5f57eccbba7132072279d3391a47ef1e6fa730b43368bfb5c12e9815cb8bc83a1bc9b32b3470308b4d9229d671571ab9b9efcb8a1350dcd255210bb78
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn00EACgkQcaHudmEf86pr1ACcCTPw4rNjkEc/gRbVOaFSKYP1
-s7YAn2/TpHssqMt2AOsmHMkkhNllD4QQ
-=dSSg
+iEYEAREIAAYFAlV0mEoACgkQCaWpQKGI+9RqsQCfbNvQybGp4Qs9M3Ss4rgb2tJ7
+AhQAoIFBSdEU+mPvUsCiL+8xAUq48h8Y
+=+3W8
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_mono/files/mod_mono-2.10-apache-2.4.patch b/www-apache/mod_mono/files/mod_mono-2.10-apache-2.4.patch
new file mode 100644
index 000000000000..86694bfabcc0
--- /dev/null
+++ b/www-apache/mod_mono/files/mod_mono-2.10-apache-2.4.patch
@@ -0,0 +1,146 @@
+Sólo en mod_mono-2.10.new/: attachment.cgi?id=402888
+diff -ur mod_mono-2.10/configure.in mod_mono-2.10.new/configure.in
+--- mod_mono-2.10/configure.in	2011-01-13 23:32:35.000000000 +0100
++++ mod_mono-2.10.new/configure.in	2015-06-07 21:09:26.417127319 +0200
+@@ -336,6 +336,16 @@
+ ], [
+ ])
+ 
++AC_TRY_RUN([
++	#include <ap_release.h>
++	int main ()
++	{
++		return (AP_SERVER_MAJORVERSION_NUMBER == 2 && AP_SERVER_MINORVERSION_NUMBER == 4) ? 0 : 1;
++	}
++], [
++	APACHE_VER=2.4
++], [
++])
+ fi
+ 
+ if test ! "$APACHE_VER" = "1.3" -a ! "$APACHE_VER" = "retry" ; then
+@@ -385,6 +395,10 @@
+ 	AC_DEFINE([APACHE22],,[Compiling for Apache >= 2.2 ])
+ fi
+ 
++if test "$APACHE_VER" = "2.4" ; then
++	AC_DEFINE([APACHE24],,[Compiling for Apache >= 2.4 ])
++fi
++
+ # check for --with-mono-default-config-dir
+ DFLT_MONO_CONFIG_DIR=`$APXS -q SYSCONFDIR`/mod-mono-applications
+ AC_ARG_WITH(mono-default-config-dir,
+diff -ur mod_mono-2.10/src/mod_mono.c mod_mono-2.10.new/src/mod_mono.c
+--- mod_mono-2.10/src/mod_mono.c	2011-01-13 23:32:35.000000000 +0100
++++ mod_mono-2.10.new/src/mod_mono.c	2015-06-07 21:09:26.421127351 +0200
+@@ -386,7 +386,11 @@
+ apache_get_userid ()
+ {
+ #ifdef HAVE_UNIXD
+-	return unixd_config.user_id;
++#if defined(APACHE24)
++  return ap_unixd_config.user_id;
++#else
++  return unixd_config.user_id;
++#endif
+ #else
+ 	return ap_user_id;
+ #endif
+@@ -396,7 +400,11 @@
+ apache_get_groupid ()
+ {
+ #ifdef HAVE_UNIXD
+-	return unixd_config.group_id;
++#if defined(APACHE24)
++	return ap_unixd_config.user_id;
++#else
++  return unixd_config.user_id;
++#endif
+ #else
+ 	return ap_group_id;
+ #endif
+@@ -406,7 +414,11 @@
+ apache_get_username ()
+ {
+ #ifdef HAVE_UNIXD
++#if defined(APACHE24)
++	return ap_unixd_config.user_name;
++#else 
+ 	return unixd_config.user_name;
++#endif
+ #else
+ 	return ap_user_name;
+ #endif
+@@ -485,8 +497,12 @@
+ 
+ #if defined (AP_NEED_SET_MUTEX_PERMS) && defined (HAVE_UNIXD)
+ 		DEBUG_PRINT (1, "Setting mutex permissions for %s", xsp->dashboard_lock_file);
++#if defined(APACHE24)
++		rv = ap_unixd_set_global_mutex_perms (xsp->dashboard_mutex);
++#else 
+ 		rv = unixd_set_global_mutex_perms (xsp->dashboard_mutex);
+-		if (rv != APR_SUCCESS) {
++#endif
++    if (rv != APR_SUCCESS) {
+ 			ap_log_error (APLOG_MARK, APLOG_CRIT, STATCODE_AND_SERVER (rv),
+ 				      "Failed to set mutex permissions for %s",
+ 				      xsp->dashboard_lock_file);
+@@ -850,10 +866,14 @@
+ #if defined(APACHE22)
+ 	return c->remote_addr->port;
+ #else
++#if defined(APACHE24)
++  return c->client_addr->port;
++#else 
+ 	apr_port_t port;
+ 	apr_sockaddr_port_get (&port, c->remote_addr);
+ 	return port;
+ #endif
++#endif
+ 
+ }
+ 
+@@ -863,10 +883,14 @@
+ #if defined(APACHE22)
+ 	return r->connection->local_addr->port;
+ #else
++#if defined(APACHE24)
++	return r->connection->local_addr->port;
++#else
+ 	apr_port_t port;
+ 	apr_sockaddr_port_get (&port, r->connection->local_addr);
+ 	return port;
+ #endif
++#endif
+ }
+ 
+ static const char *
+@@ -1977,9 +2001,12 @@
+ 	size += info.local_ip_len + sizeof (int32_t);
+ 
+ 	size += sizeof (int32_t);
+-
+-	info.remote_ip_len = strlen (r->connection->remote_ip);
+-	size += info.remote_ip_len + sizeof (int32_t);
++#if defined(APACHE24)
++  info.remote_ip_len = strlen (r->connection->client_ip);
++#else 
++  info.remote_ip_len = strlen (r->connection->remote_ip);
++#endif
++  size += info.remote_ip_len + sizeof (int32_t);
+ 
+ 	size += sizeof (int32_t);
+ 
+@@ -2026,7 +2053,11 @@
+ 	i = LE_FROM_INT (i);
+ 	memcpy (ptr, &i, sizeof (i));
+ 	ptr += sizeof (int32_t);
++#if defined(APACHE24)
++	ptr += write_string_to_buffer (ptr, 0, r->connection->client_ip, info.remote_ip_len);
++#else 
+ 	ptr += write_string_to_buffer (ptr, 0, r->connection->remote_ip, info.remote_ip_len);
++#endif
+ 	i = connection_get_remote_port (r->connection);
+ 	i = LE_FROM_INT (i);
+ 	memcpy (ptr, &i, sizeof (i));
+Sólo en mod_mono-2.10.new/src: mod_mono.c.orig
diff --git a/www-apache/mod_mono/mod_mono-2.10.ebuild b/www-apache/mod_mono/mod_mono-2.10.ebuild
index 537a197f3ee4..f68680cba34c 100644
--- a/www-apache/mod_mono/mod_mono-2.10.ebuild
+++ b/www-apache/mod_mono/mod_mono-2.10.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2014 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_mono/mod_mono-2.10.ebuild,v 1.6 2014/08/10 20:17:04 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/mod_mono-2.10.ebuild,v 1.7 2015/06/07 19:15:21 pacho Exp $
 
-EAPI=2
+EAPI=5
 
-# DRAGONS: Watch the order of these.
-
-inherit apache-module multilib eutils go-mono mono
+# Watch the order of these!
+inherit autotools apache-module multilib eutils go-mono mono
 
 KEYWORDS="amd64 ppc x86"
 
@@ -24,11 +23,15 @@ APACHE2_MOD_DEFINE="MONO"
 
 DOCFILES="AUTHORS ChangeLog COPYING INSTALL NEWS README"
 
-need_apache2_2
+need_apache2
 
 src_prepare() {
 	sed -e "s:@LIBDIR@:$(get_libdir):" "${FILESDIR}/${APACHE2_MOD_CONF}.conf" \
 		> "${WORKDIR}/${APACHE2_MOD_CONF##*/}.conf" || die
+
+	epatch "${FILESDIR}"/${PN}-2.10-apache-2.4.patch
+
+	eautoreconf
 	go-mono_src_prepare
 }
 
@@ -38,8 +41,7 @@ src_configure() {
 		$(use_enable debug) \
 		--with-apxs="${APXS}" \
 		--with-apr-config="/usr/bin/apr-1-config" \
-		--with-apu-config="/usr/bin/apu-1-config" \
-		|| die "econf failed"
+		--with-apu-config="/usr/bin/apu-1-config"
 }
 src_compile() {
 	go-mono_src_compile