- fix building with apache 2.4

- rel 5

diff --git a/apache-mod_auth_xradius.spec b/apache-mod_auth_xradius.spec
index bc5215b86c516314745e057edf48fc335759830d..a2b9efd47592d68810764c43f2f6b3bb219563e3 100644 (file)
--- a/apache-mod_auth_xradius.spec
+++ b/apache-mod_auth_xradius.spec
@@ -1,15 +1,16 @@
 #
 %define                mod_name        auth_xradius
-%define        apxs            %{_sbindir}/apxs
+%define                apxs            %{_sbindir}/apxs
 Summary:       Apache module:
 Name:          apache-mod_%{mod_name}
 Version:       0.4.6
-Release:       4
+Release:       5
 License:       GPL
 Group:         Networking/Daemons/HTTP
 Source0:       http://www.outoforder.cc/downloads/mod_auth_xradius/mod_auth_xradius-%{version}.tar.bz2
 # Source0-md5: eeecc96f15dec9fe0a9c78c0b022903d
 Source1:       %{name}.conf
+Patch0:                mod_auth_xradius-unixd.patch
 URL:           http://www.outoforder.cc/projects/apache/mod_auth_xradius/
 BuildRequires: %{apxs}
 BuildRequires: apache-devel >= 2.2
@@ -34,6 +35,7 @@ mod_auth_xradius provides high performance authentication against RFC
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
+%patch0 -p1
 
 %build
 %configure

diff --git a/mod_auth_xradius-unixd.patch b/mod_auth_xradius-unixd.patch
new file mode 100644 (file)
index 0000000..8b675e8
--- /dev/null
+++ b/mod_auth_xradius-unixd.patch
@@ -0,0 +1,15 @@
+diff -Naur mod_auth_xradius-0.4.6.old/src/xradius_cache.c mod_auth_xradius-0.4.6/src/xradius_cache.c
+--- mod_auth_xradius-0.4.6.old/src/xradius_cache.c     2005-04-27 01:49:25.000000000 -0500
++++ mod_auth_xradius-0.4.6/src/xradius_cache.c 2012-05-15 11:52:34.464238207 -0500
+@@ -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