Support server fallback if the primary does not respond, patch by Austin Kauffman with some improvements from InterWorking Labs. Explicitly depend on the Apache server, closes bug #514260 by Patrick "bonsaikitten" Lauer.

Package-Manager: portage-2.2.13/cvs/Linux x86_64
Manifest-Sign-Key: 0xB5058F9A

4 files changed, 74 insertions, 5 deletions

diff --git a/www-apache/mod_auth_xradius/ChangeLog b/www-apache/mod_auth_xradius/ChangeLog
index 52d0ff28c20f..8adae1dcbbf7 100644
--- a/www-apache/mod_auth_xradius/ChangeLog
+++ b/www-apache/mod_auth_xradius/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apache/mod_auth_xradius
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_xradius/ChangeLog,v 1.2 2014/08/10 20:14:33 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_xradius/ChangeLog,v 1.3 2014/09/24 13:13:30 chainsaw Exp $
+
+*mod_auth_xradius-0.4.6-r1 (24 Sep 2014)
+
+  24 Sep 2014; Tony Vroon <chainsaw@gentoo.org>
+  +mod_auth_xradius-0.4.6-r1.ebuild, +files/0.4.6-fallback-support.diff:
+  Support server fallback if the primary does not respond, patch by Austin
+  Kauffman with some improvements from InterWorking Labs. Explicitly depend on
+  the Apache server, closes bug #514260 by Patrick "bonsaikitten" Lauer.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
   mod_auth_xradius-0.4.6.ebuild:
diff --git a/www-apache/mod_auth_xradius/Manifest b/www-apache/mod_auth_xradius/Manifest
index b80524e9ca51..8f0e99fa2d12 100644
--- a/www-apache/mod_auth_xradius/Manifest
+++ b/www-apache/mod_auth_xradius/Manifest
@@ -2,15 +2,17 @@
 Hash: SHA256
 
 AUX 0.4.6-apache24-api-changes.diff 539 SHA256 696cc6a553d5d46a8e5e190e847e5b16bbb514d191ca739b610f4ccc100f531b SHA512 c5392d82592eb01e2f46126baad5f3e35e4fc25d37c9520e34836e60ebb4cf6be7bc0be831efd5ed50fd5c7d538928e48c94524970c5649b51e3ff5ee366bac1 WHIRLPOOL be1d794bc1c87d7fb151f5eaf79893aa0a2fdf8d4df4bd5b858b9a4bcca15c7c01caa172c9276f32251cbfe1b102701e46d6eeecb04f8189f4d6feaa3b6e3da5
+AUX 0.4.6-fallback-support.diff 1596 SHA256 0f4bd2a60cca9e974ebb2a9c566107bd64e2347de31d8779c73fefcaa8406f05 SHA512 2b30f0df918626f927173b5563d9a91f2c215013052d34a81d3dae601ef64dff7b1dcec55b7251b8c30093b1830b6bb06578ac866cc77202f796f4061e82fa33 WHIRLPOOL 5b6fad60fef5fab60dde912aab71a0f33333a74df211b794f7e04de82bd0d61a56042d05e1b813b241f9e1a438613cad52fe9384a06457418400611d1f3d4132
 AUX 0.4.6-obsolete-autotools-syntax.diff 435 SHA256 8d3a6e6d38e68b7ce1d7faa086eee39f366c5abfa12faf87768d7131d4b74272 SHA512 00de4870d9ee16ee9554aa0cd46ff9cdabbe0666131d29bc18dd2e7706f94265ee9c525d17409c3bbda4de32ffbe994286822ec8efb20887813a3076d9abb0c9 WHIRLPOOL f908cbe4bbc58c98143f85fe67585e4234beb2bae7c4801b7f69c8b3d71f447aa8347b49aece4ef8f0c70aad40b24ab56f4f56b3f83152aa786d58ec1b425c6b
 DIST mod_auth_xradius-0.4.6.tar.bz2 180591 SHA256 ab45f9986e37ca38ef6b8ae765e2baa647529c848c0d21b49abf60cc1e9fbf0b SHA512 7edb26f988f9842825bec1b04f5127816bd53f76d2284d79d87afef2b5d6e9fa8cb8156c3f5543aeb9b013f65295fa70098ade603f00ce6e90b3b0c3e8c41b6a WHIRLPOOL 305cb5d53ee3fe9db7473761a0b4e179ab042e61f88710f7373c8edcb4bde07a6d3cb67f25444ef4bc2e341b6d775fbf59a139532feb18c4f0a0d9488efc7c54
+EBUILD mod_auth_xradius-0.4.6-r1.ebuild 829 SHA256 b53396a8b9030963160179edce25da9540c89d11f8399414eb5b958eb815917a SHA512 a95c07b2705ad6456aa0191052d02f347fd2f81b95b6fe4758c4c2f9a48944d643b5872e753a4e818b912a5abef795fbf49efa58fe0e118a23e22311d30cd087 WHIRLPOOL f8bc236e04100ef54c18830874dee0e07bd47c19602ace6e817efb31acb7c1942feed96d6413cacf77b2b3bbf65dc32bcb74a48f6436d7058008207634511add
 EBUILD mod_auth_xradius-0.4.6.ebuild 746 SHA256 86cf6d9995074663cadc4dce293faf87d56d8b960ac7250e3f49841fb93107e5 SHA512 70838c64742f38d6576d5d542577c2c897b59d151daad9b7c562a9b15feafdcf1da3d88fdf242a7b873312793d7cd87d529fcd7710c9dc2f79615250dc8bdfd8 WHIRLPOOL 21e79f708fb2c0e9b2960feacdce4583294058aaf7a9517902a5fa6bf0a6316d822c4371fc165d6d3da1a608fecc858b225dab19c981df980d884f058d348056
-MISC ChangeLog 653 SHA256 d3332bdad66123776683b82179d53430ed1623223d86c0d8a223a7b480cb3d2c SHA512 e3bc6da241c1f06c22d36129ce89433f020427026e144b628594edb9b7c42c38e91b9a6895840be260fe9f287521ad701ea2097d22e3c6f14181a0c89effe537 WHIRLPOOL 3d6d3964cb421048b249ec64c1b1e0ecca53aadf6baa938268e3318efe615311c07771f00ffa96e154b008f509adcd678081597cbf76717397c208b5fdd6b47b
+MISC ChangeLog 1046 SHA256 b52aabd2f9595c21a893369fb79149607b2aff7307419f7988d09f2e849ae5ae SHA512 5aa0e1f066594d6f3e0f381a99b550b7750a11b7992ceed0341a1faa1d910436cbe3e81a94c4856bf647959c917061867ca97f41ea3d3f10902bfa62a64a592e WHIRLPOOL 9d12dfb11fae0c4b7b3983a6032d61a1744ae55a7f242a28946947c37a463083bc43d19afcdc91544cb1278ba575e3c9cafcb0fbd9def476830e0c0d3847680c
 MISC metadata.xml 237 SHA256 88d9092fd208599a8b524cca9633d9330223e45c34a44e54b2de05edb4738ac7 SHA512 11773ab2b5adaa81f3c8f73413d2f257ea1d1624df689154ee2697412ff14ea8f9851b805c4a474b486abb0a066cfc929f91eb852a208b9536885d467df36af1 WHIRLPOOL 324b778d3103d615af41fd6d1d978beeeeb08f4823a3c81fd453464b4df2ed59b56a481ddd65b4eb740dc75b4dc69133e761199abe6d27333b1fce97d5b5a1be
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn0qoACgkQcaHudmEf86rOVwCdG9ueeBNiS/vO/rsAuekJ7soG
-+sAAnR6LlHxzv/LJla0sWm8EZj9vyMGj
-=3LRo
+iEYEAREIAAYFAlQiw4gACgkQp5vW4rUFj5qyWQCffhM5h/rpfc/0ZHLhOwA+VltC
+ksYAn3g90V60HXC95+NZbK0zV8FtcLm1
+=WMVI
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_auth_xradius/files/0.4.6-fallback-support.diff b/www-apache/mod_auth_xradius/files/0.4.6-fallback-support.diff
new file mode 100644
index 000000000000..da43dc4b2776
--- /dev/null
+++ b/www-apache/mod_auth_xradius/files/0.4.6-fallback-support.diff
@@ -0,0 +1,31 @@
+diff -uNr mod_auth_xradius-0.4.6.ORIG/src/mod_auth_xradius.c mod_auth_xradius-0.4.6/src/mod_auth_xradius.c
+--- mod_auth_xradius-0.4.6.ORIG/src/mod_auth_xradius.c	2014-09-24 13:41:22.990073508 +0100
++++ mod_auth_xradius-0.4.6/src/mod_auth_xradius.c	2014-09-24 13:50:17.204100114 +0100
+@@ -125,15 +125,15 @@
+     rctx = xrad_auth_open();
+ 
+     /* Loop through the array of RADIUS Servers, adding them to the rctx object */
+-    sr = (xrad_server_info *) dc->servers->elts;
+     for (i = 0; i < dc->servers->nelts; ++i) {        
+-        rc = xrad_add_server(rctx, sr[i].hostname, sr[i].port, sr[i].secret,
++        sr = &(((xrad_server_info*)dc->servers->elts)[i]);
++        rc = xrad_add_server(rctx, sr->hostname, sr->port, sr->secret,
+                              dc->timeout, dc->maxtries);
+         
+         if (rc != 0) {
+             ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                           "xradius: Failed to add server '%s:%d': (%d) %s",
+-                          sr[i].hostname, sr[i].port, rc, xrad_strerror(rctx));
++                          sr->hostname, sr->port, rc, xrad_strerror(rctx));
+             goto run_cleanup;
+         }        
+     }
+@@ -294,7 +294,7 @@
+     /* To properly use the Pools, this array is allocated from the here, instead of
+         inside the directory configuration creation function. */
+     if (dc->servers == NULL) {
+-        dc->servers = apr_array_make(parms->pool, 4, sizeof(xrad_server_info*));
++        dc->servers = apr_array_make(parms->pool, 4, sizeof(xrad_server_info));
+     }
+     
+     sr = apr_array_push(dc->servers);
diff --git a/www-apache/mod_auth_xradius/mod_auth_xradius-0.4.6-r1.ebuild b/www-apache/mod_auth_xradius/mod_auth_xradius-0.4.6-r1.ebuild
new file mode 100644
index 000000000000..22887e74a71f
--- /dev/null
+++ b/www-apache/mod_auth_xradius/mod_auth_xradius-0.4.6-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_xradius/mod_auth_xradius-0.4.6-r1.ebuild,v 1.1 2014/09/24 13:13:30 chainsaw Exp $
+
+EAPI="5"
+
+inherit autotools eutils
+
+DESCRIPTION="Radius authentication for Apache"
+HOMEPAGE="http://www.outoforder.cc/projects/apache/mod_auth_xradius/"
+SRC_URI="http://www.outoforder.cc/downloads/${PN}/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+DEPEND="www-servers/apache"
+DOCFILES="README"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-obsolete-autotools-syntax.diff"
+	epatch "${FILESDIR}/${PV}-fallback-support.diff"
+	if has_version ">=www-servers/apache-2.4"; then
+		epatch "${FILESDIR}/${PV}-apache24-api-changes.diff"
+	fi
+	AT_M4DIR="m4" eautoreconf
+}