aboutsummaryrefslogtreecommitdiff
path: root/www/mod_auth_xradius
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2014-08-25 15:02:11 +0000
committerMathieu Arnold <mat@FreeBSD.org>2014-08-25 15:02:11 +0000
commitc05d77e2a5de77c718577a1b33e5e451afb8a39e (patch)
treeebd694078cbf690041916aa1f7a68a767dbcd067 /www/mod_auth_xradius
parentebff11b95d7aa88f309cbc65219e1cf5e7abe8b8 (diff)
downloadports-c05d77e2a5de77c718577a1b33e5e451afb8a39e.tar.gz
ports-c05d77e2a5de77c718577a1b33e5e451afb8a39e.zip
Notes
Diffstat (limited to 'www/mod_auth_xradius')
-rw-r--r--www/mod_auth_xradius/Makefile8
-rw-r--r--www/mod_auth_xradius/files/patch-src__xradius_cache.c (renamed from www/mod_auth_xradius/files/ap24-patch-src__xradius_cache.c)16
2 files changed, 12 insertions, 12 deletions
diff --git a/www/mod_auth_xradius/Makefile b/www/mod_auth_xradius/Makefile
index 732cf360918a..17ac281e691f 100644
--- a/www/mod_auth_xradius/Makefile
+++ b/www/mod_auth_xradius/Makefile
@@ -18,10 +18,4 @@ GNU_CONFIGURE= yes
PLIST_FILES= ${APACHEMODDIR}/mod_auth_xradius.so
-.include <bsd.port.pre.mk>
-
-.if ${APACHE_VERSION} > 22
-EXTRA_PATCHES= ${PATCHDIR}/ap24-patch-src__xradius_cache.c
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mod_auth_xradius/files/ap24-patch-src__xradius_cache.c b/www/mod_auth_xradius/files/patch-src__xradius_cache.c
index 31adbb885764..6a2093b6f558 100644
--- a/www/mod_auth_xradius/files/ap24-patch-src__xradius_cache.c
+++ b/www/mod_auth_xradius/files/patch-src__xradius_cache.c
@@ -1,14 +1,20 @@
--- ./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 @@
++++ ./src/xradius_cache.c 2014-08-25 17:00:48.000000000 +0200
+@@ -143,10 +143,17 @@
/* Running as Root */
if (geteuid() == 0) {
/* Allow the configured Apache use to read/write to the DBM */
-- chown(path1, unixd_config.user_id, -1);
++#if MODULE_MAGIC_NUMBER_MAJOR >= 20111130
+ chown(path1, ap_unixd_config.user_id, -1);
- if (path2 != NULL) {
-- chown(path2, unixd_config.user_id, -1);
++ if (path2 != NULL) {
+ chown(path2, ap_unixd_config.user_id, -1);
++ }
++#else
+ chown(path1, unixd_config.user_id, -1);
+ if (path2 != NULL) {
+ chown(path2, unixd_config.user_id, -1);
}
++#endif
}
#endif
+