aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormat <mat@FreeBSD.org>2014-08-12 23:06:39 +0800
committermat <mat@FreeBSD.org>2014-08-12 23:06:39 +0800
commit0c9a6d666d913918b1bd6f70d3dd0215a85da643 (patch)
treeae2a2d0ec6db4b134a3a54eb1e332743df75ff46
parent2ac0088898030cf0b6fc302f9557fb1983771a96 (diff)
downloadfreebsd-ports-gnome-0c9a6d666d913918b1bd6f70d3dd0215a85da643.tar.gz
freebsd-ports-gnome-0c9a6d666d913918b1bd6f70d3dd0215a85da643.tar.zst
freebsd-ports-gnome-0c9a6d666d913918b1bd6f70d3dd0215a85da643.zip
Fix build with apache 2.4.
Sponsored by: Absolight
-rw-r--r--www/mod_auth_xradius/Makefile10
-rw-r--r--www/mod_auth_xradius/files/ap24-patch-src__xradius_cache.c14
2 files changed, 22 insertions, 2 deletions
diff --git a/www/mod_auth_xradius/Makefile b/www/mod_auth_xradius/Makefile
index c41cafec1766..732cf360918a 100644
--- a/www/mod_auth_xradius/Makefile
+++ b/www/mod_auth_xradius/Makefile
@@ -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>
diff --git a/www/mod_auth_xradius/files/ap24-patch-src__xradius_cache.c b/www/mod_auth_xradius/files/ap24-patch-src__xradius_cache.c
new file mode 100644
index 000000000000..31adbb885764
--- /dev/null
+++ b/www/mod_auth_xradius/files/ap24-patch-src__xradius_cache.c
@@ -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