svn commit: r366084 - in head/www/mod_auth_xradius: . files

[Mathieu Arnold]

Author: mat
Date: Mon Aug 25 15:02:11 2014
New Revision: 366084
URL: http://svnweb.freebsd.org/changeset/ports/366084
QAT: https://qat.redports.org/buildarchive/r366084/

Log:
  Make the patch cleaner and always apply it.
  
  Sponsored by:	Absolight

Added:
  head/www/mod_auth_xradius/files/patch-src__xradius_cache.c
     - copied, changed from r366083, head/www/mod_auth_xradius/files/ap24-patch-src__xradius_cache.c
Deleted:
  head/www/mod_auth_xradius/files/ap24-patch-src__xradius_cache.c
Modified:
  head/www/mod_auth_xradius/Makefile

Modified: head/www/mod_auth_xradius/Makefile
==============================================================================
--- head/www/mod_auth_xradius/Makefile	Mon Aug 25 14:58:23 2014	(r366083)
+++ head/www/mod_auth_xradius/Makefile	Mon Aug 25 15:02:11 2014	(r366084)
@@ -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>

Copied and modified: head/www/mod_auth_xradius/files/patch-src__xradius_cache.c (from r366083, head/www/mod_auth_xradius/files/ap24-patch-src__xradius_cache.c)
==============================================================================
--- head/www/mod_auth_xradius/files/ap24-patch-src__xradius_cache.c	Mon Aug 25 14:58:23 2014	(r366083, copy source)
+++ head/www/mod_auth_xradius/files/patch-src__xradius_cache.c	Mon Aug 25 15:02:11 2014	(r366084)
@@ -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
+