Apply patch to be compatible with apache-2.4 (#506610 by Fabian Henze)

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

4 files changed, 95 insertions, 8 deletions

diff --git a/www-apache/mod_bw/ChangeLog b/www-apache/mod_bw/ChangeLog
index 20c1344ff906..996b2f76fb02 100644
--- a/www-apache/mod_bw/ChangeLog
+++ b/www-apache/mod_bw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/mod_bw
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_bw/ChangeLog,v 1.13 2012/11/27 19:10:15 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_bw/ChangeLog,v 1.14 2014/06/09 11:59:51 pacho Exp $
+
+*mod_bw-0.9.2-r1 (09 Jun 2014)
+
+  09 Jun 2014; Pacho Ramos <pacho@gentoo.org>
+  +files/mod_bw-0.9.2-apache24.patch, +mod_bw-0.9.2-r1.ebuild:
+  Apply patch to be compatible with apache-2.4 (#506610 by Fabian Henze)
 
   27 Nov 2012; Pacho Ramos <pacho@gentoo.org> -mod_bw-0.8.ebuild,
   -mod_bw-0.9.1.ebuild, metadata.xml:
diff --git a/www-apache/mod_bw/Manifest b/www-apache/mod_bw/Manifest
index 394f9301575d..e12a87d01f40 100644
--- a/www-apache/mod_bw/Manifest
+++ b/www-apache/mod_bw/Manifest
@@ -2,14 +2,16 @@
 Hash: SHA256
 
 AUX 11_mod_bw.conf 422 SHA256 00d512a4bc8b97610795957f5cbcaeb5dcf27c9d2602ee10f81c90bcfe275746 SHA512 8bbe8c7a2b83a6fe4dfa5849b447193b400de4bea9c3d70c4d4aac0d315eb16a3c48c9c75424a6d01c553c94a2fe500d7e01b8406201dbc34ed459961a2f8a7c WHIRLPOOL a02e3efdb3379e3c0ec3f7636b533298dab1e1d7dc4f2f93a264dc17b7db496727a5e067dce50ddd69d0a638add26a4191a1baad567d3ffec3b838f647e4c45c
-DIST mod_bw-0.92.tgz 23816 SHA256 658eb3f63e2181ac0b6fc3ea33f0eaf637d6ef832c7df3a0e3f3d0cd2376cd7f
+AUX mod_bw-0.9.2-apache24.patch 1637 SHA256 44d01f9bea2e793084054d22aace8df325dfda96336bf29920509be2b91412fa SHA512 93e16714477c8e35a5780db1480aa4ff733ee3e38e8ce43f80a7d4ac63052a98ea003716e37b37ca6fbe5efeb2621576c7efbbbfc835590852fd904a1babfda1 WHIRLPOOL dce7a9484b987ba8b740cb36edabca5066b3461789fb335edc358c8bab88df46a85c2558cc0c3ea8ba8b48ce02c12e11af65eb34b77ffb6db12a358252bcae2a
+DIST mod_bw-0.92.tgz 23816 SHA256 658eb3f63e2181ac0b6fc3ea33f0eaf637d6ef832c7df3a0e3f3d0cd2376cd7f SHA512 caa5c0eccb12498ca59428e0ac6b06e6a6c86c1126693071b5df20f32cc5a5673197b2e53e58c9edb0f0f8efd8d1c276cfdc9962cb90b219baf1bd0785ea2443 WHIRLPOOL 639bd389f9124973b5592865c6ecbc5402f0bf28876abf55f19fe5e2e43eaf61f00c615b52b6c2b62dbbfc0195efdf2967b0ce646e27368ad983ef3fa62ce546
+EBUILD mod_bw-0.9.2-r1.ebuild 653 SHA256 33722bc9685da704b1a667dce524f56f8f4f657b4fd09ef4dece9e6b81ee4d22 SHA512 fc902731f6a88a8415f2aeed70ec8b67264a1606c9a1f107312f98ed8c3729f276ab2ea4cd0e870dc3d5c7a4bd0cb5894d37085f677576bf6a57a2664f25144a WHIRLPOOL 49cc3eab9716839c66f7010402209eb0283f68488617e07311c39c0a526ef5c6a6943b13bedf04ab5e748f8002a24affc68bfff16a07a0f6fd1a9953da0a43ce
 EBUILD mod_bw-0.9.2.ebuild 579 SHA256 7271535faf3b52991bc89dc818ed527a242f7b436e05bbdd5ab15fdea181c4cc SHA512 bafd135d2b59dc0d6038ee4ee5688351bdc35187f026f3e47eab8471f49437c6443aaa853d01140b2fb047f6f5ae6fb0ae625eac14421dd8aa6504f6156d962d WHIRLPOOL 63ee328ca2a8be11ef13672c5a51cab39b012f2ee54cd1f8f55f312828e8545dfd87ee4d9de45fa0991c5c4e0174f9551ed372b02e6b335dfecbb52b8534769d
-MISC ChangeLog 3049 SHA256 04a08805c16dd44e762c46d684a74e17e568289ee6ac81e5985db4c84639f19d SHA512 5f585ff6afd5ecc18709a248a750744b9aabf3f2edde3c3950271889eed8d4948f0827ed3990416340eb79e73335656073f16c10ee21edadb88ad15ec6511fae WHIRLPOOL e5abd01b987074595fc94ac58850ebd955e840752fa2dab78a6a19bac4fe68bdbd229a73f3eb8e67fc4be045d9ee1149f02f61474500de9ac7b224c02fe688c7
+MISC ChangeLog 3264 SHA256 3c899a285fd0a5e30d75718f1eb8ba21297ebbd9be6a483c521cd2e867cff2a1 SHA512 9bcf52f0caa28e06787dd14702d00a56c6e83bf97f0866bc749a5172916b76aa393de4d6ea499c2dc510ad41c23e5c9e701894375f7adfb7151c17782002a94f WHIRLPOOL f1b10aa04acabb3fb84f821c62e719e1e1f6b75b756f422ff45f0f9fd8a141c6c149f23ba189fed2b83663ac45b43162e2fc03d1874c5cfd7e7d5d1592a9edbc
 MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlC1EBkACgkQCaWpQKGI+9Rr9QCeP0o0wg8OKVbyLeH3adO8lSty
-adAAnRchH4MB8oDhyTTtuJvdVF/gyYnb
-=ytcT
+iEYEAREIAAYFAlOVobgACgkQCaWpQKGI+9TgVwCeIYoOeejkCzOlsC4AEcJ0c7TI
+1pwAni6eWowalvKtE2JQxYnEr9aya1Qm
+=BN1P
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_bw/files/mod_bw-0.9.2-apache24.patch b/www-apache/mod_bw/files/mod_bw-0.9.2-apache24.patch
new file mode 100644
index 000000000000..27af0dbc1c6f
--- /dev/null
+++ b/www-apache/mod_bw/files/mod_bw-0.9.2-apache24.patch
@@ -0,0 +1,49 @@
+--- a/mod_bw.c	2010-07-20 18:14:30.000000000 +0200
++++ b/mod_bw.c	2014-03-31 14:36:27.064883758 +0200
+@@ -105,6 +105,10 @@ Changelog :
+     #define apr_atomic_set32 apr_atomic_set
+ #endif
+ 
++#define APACHE_VERSION_AT_LEAST(major,minor)                              \
++(((major) < AP_SERVER_MAJORVERSION_NUMBER)                                \
++ || ((major) == AP_SERVER_MAJORVERSION_NUMBER && (minor) <= AP_SERVER_MINORVERSION_NUMBER))
++
+ /* Enum types of "from address" */
+ enum from_type {
+     T_ALL,
+@@ -564,7 +568,11 @@ static long get_bw_rate(request_rec * r,
+             return e[i].rate;
+ 
+         case T_IP:
++#if APACHE_VERSION_AT_LEAST(2,4)
++            if (apr_ipsubnet_test(e[i].x.ip, r->useragent_addr)) {
++#else
+             if (apr_ipsubnet_test(e[i].x.ip, r->connection->remote_addr)) {
++#endif
+                 return e[i].rate;
+             }
+             break;
+@@ -655,7 +663,11 @@ static int get_maxconn(request_rec * r,
+             return e[i].max;
+ 
+         case T_IP:
++#if APACHE_VERSION_AT_LEAST(2,4)
++            if (apr_ipsubnet_test(e[i].x.ip, r->useragent_addr)) {
++#else
+             if (apr_ipsubnet_test(e[i].x.ip, r->connection->remote_addr)) {
++#endif
+                 return e[i].max;
+             }
+             break;
+@@ -706,7 +718,11 @@ static int get_sid(request_rec * r, apr_
+             return e[i].sid;
+ 
+         case T_IP:
++#if APACHE_VERSION_AT_LEAST(2,4)
++            if (apr_ipsubnet_test(e[i].x.ip, r->useragent_addr)) {
++#else
+             if (apr_ipsubnet_test(e[i].x.ip, r->connection->remote_addr)) {
++#endif
+                 return e[i].sid;
+             }
+             break;
diff --git a/www-apache/mod_bw/mod_bw-0.9.2-r1.ebuild b/www-apache/mod_bw/mod_bw-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..562a4b309b37
--- /dev/null
+++ b/www-apache/mod_bw/mod_bw-0.9.2-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_bw/mod_bw-0.9.2-r1.ebuild,v 1.1 2014/06/09 11:59:50 pacho Exp $
+
+EAPI=5
+inherit apache-module eutils
+
+DESCRIPTION="Bandwidth Management Module for Apache2."
+HOMEPAGE="http://www.ivn.cl/apache/"
+
+SRC_URI="http://ivn.cl/files/source/${P/9./9}.tgz"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="sys-devel/libtool"
+RDEPEND=""
+
+APACHE2_MOD_CONF="11_${PN}"
+APACHE2_MOD_DEFINE="BW"
+
+need_apache2
+
+S="${WORKDIR}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-apache24.patch"
+}