mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-04 11:23:46 +00:00
Code Issues Releases Activity

Make the patch cleaner and always apply it.

Browse Source 
Sponsored by:	Absolight
This commit is contained in:
Mathieu Arnold 2014-08-25 15:02:11 +00:00
parent ebff11b95d
commit c05d77e2a5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=366084
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
www/mod_auth_xradius/Makefile
View File

@ -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>

16
www/mod_auth_xradius/files/ap24-patch-src__xradius_cache.c → www/mod_auth_xradius/files/patch-src__xradius_cache.c
View File

@ -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