From owner-svn-ports-all@FreeBSD.ORG Tue Apr 28 13:36:56 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CCA9BA8A; Tue, 28 Apr 2015 13:36:56 +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 A0DE91EC0; Tue, 28 Apr 2015 13:36:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3SDau9U085192; Tue, 28 Apr 2015 13:36:56 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3SDaufw085190; Tue, 28 Apr 2015 13:36:56 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201504281336.t3SDaufw085190@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 28 Apr 2015 13:36:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384899 - in head/www/mod_auth_xradius: . 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.20 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: Tue, 28 Apr 2015 13:36:56 -0000 Author: feld Date: Tue Apr 28 13:36:55 2015 New Revision: 384899 URL: https://svnweb.freebsd.org/changeset/ports/384899 Log: Include high availability patch to give us feature parity with Linux distros which include this patch in their packages for many years now. PR: 198498 Added: head/www/mod_auth_xradius/files/patch-src_mod__auth__xradius.c (contents, props changed) Modified: head/www/mod_auth_xradius/Makefile Modified: head/www/mod_auth_xradius/Makefile ============================================================================== --- head/www/mod_auth_xradius/Makefile Tue Apr 28 13:26:43 2015 (r384898) +++ head/www/mod_auth_xradius/Makefile Tue Apr 28 13:36:55 2015 (r384899) @@ -3,7 +3,7 @@ PORTNAME= mod_auth_xradius PORTVERSION= 0.4.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://www.outoforder.cc/downloads/mod_auth_xradius/ PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} Added: head/www/mod_auth_xradius/files/patch-src_mod__auth__xradius.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/mod_auth_xradius/files/patch-src_mod__auth__xradius.c Tue Apr 28 13:36:55 2015 (r384899) @@ -0,0 +1,30 @@ +--- src/mod_auth_xradius.c.orig 2005-04-28 07:58:25 UTC ++++ src/mod_auth_xradius.c +@@ -125,15 +125,15 @@ static int xrad_run_auth_check(request_r + 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 @@ static const char *xrad_conf_add_server( + /* 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);