From owner-svn-ports-all@FreeBSD.ORG  Tue Aug 12 15:06:40 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 97999541
 for <svn-ports-all@freebsd.org>; Tue, 12 Aug 2014 15:06:40 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 668722C60
 for <svn-ports-all@freebsd.org>; Tue, 12 Aug 2014 15:06:40 +0000 (UTC)
Received: from mat (uid 986) (envelope-from mat@FreeBSD.org) id 69ae
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Tue, 12 Aug 2014 15:06:39 +0000
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Tue, 12 Aug 2014 15:06:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r364710 - 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
Message-Id: <53ea2d80.69ae.4ebc7187@svn.freebsd.org>
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Aug 2014 15:06:40 -0000

Author: mat
Date: Tue Aug 12 15:06:39 2014
New Revision: 364710
URL: http://svnweb.freebsd.org/changeset/ports/364710
QAT: https://qat.redports.org/buildarchive/r364710/

Log:
  Fix build with apache 2.4.
  
  Sponsored by:	Absolight

Added:
  head/www/mod_auth_xradius/files/
  head/www/mod_auth_xradius/files/ap24-patch-src__xradius_cache.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 Aug 12 15:05:00 2014	(r364709)
+++ head/www/mod_auth_xradius/Makefile	Tue Aug 12 15:06:39 2014	(r364710)
@@ -12,10 +12,16 @@ MAINTAINER=	mwlucas@FreeBSD.org
 COMMENT=	Enables RADIUS authentication
 
 
-USE_APACHE=	22
+USE_APACHE=	22+
 USES=	tar:bzip2
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	${APACHEMODDIR}/mod_auth_xradius.so
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${APACHE_VERSION} > 22
+EXTRA_PATCHES=	${PATCHDIR}/ap24-patch-src__xradius_cache.c
+.endif
+
+.include <bsd.port.post.mk>

Added: head/www/mod_auth_xradius/files/ap24-patch-src__xradius_cache.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/mod_auth_xradius/files/ap24-patch-src__xradius_cache.c	Tue Aug 12 15:06:39 2014	(r364710)
@@ -0,0 +1,14 @@
+--- ./src/xradius_cache.c.orig	2005-04-27 08:49:25.000000000 +0200
++++ ./src/xradius_cache.c	2014-08-12 11:56:22.000000000 +0200
+@@ -143,9 +143,9 @@
+     /* Running as Root */
+     if (geteuid() == 0)  {
+         /* Allow the configured Apache use to read/write to the DBM */
+-        chown(path1, unixd_config.user_id, -1);
++        chown(path1, ap_unixd_config.user_id, -1);
+         if (path2 != NULL) { 
+-            chown(path2, unixd_config.user_id, -1);
++            chown(path2, ap_unixd_config.user_id, -1);
+         }
+     }
+ #endif