redhat: rlm_cache && rlm_wimax are now "stable"

Adjust spec and patch to accomodate commit aee30b9

diff --git a/redhat/freeradius-rlm_wimax.patch b/redhat/freeradius-rlm_wimax.patch
deleted file mode 100644 (file)
index eb3ef5f..0000000
--- a/redhat/freeradius-rlm_wimax.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/src/modules/stable b/src/modules/stable
-index 39d4516..dd9aa40 100644
---- a/src/modules/stable
-+++ b/src/modules/stable
-@@ -41,3 +41,4 @@ rlm_unix
- rlm_policy
- rlm_dynamic_clients
- rlm_replicate
-+rlm_wimax

diff --git a/redhat/freeradius.spec b/redhat/freeradius.spec
index 929450208b52b0c68091dec4ee6f11dcf80aafef..1cfa3f68fd7b5d96352e37c69e64930155d7f5f9 100644 (file)
--- a/redhat/freeradius.spec
+++ b/redhat/freeradius.spec
@@ -19,7 +19,6 @@ Patch5: freeradius-radeapclient-ipv6.patch
 Patch6: freeradius-postgres-sql.patch
 #Patch7: freeradius-perl.patch
 Patch8: freeradius-dhcp_sqlippool.patch
-Patch9: freeradius-rlm_wimax.patch
 
 Obsoletes: freeradius-devel
 Obsoletes: freeradius-libs
@@ -157,7 +156,6 @@ This plugin provides the unixODBC support for the FreeRADIUS server project.
 %patch6 -p1
 #%patch7 -p1 -b perl
 %patch8 -p1
-%patch9 -p1 -b .rlm_wimax
 
 # Some source files mistakenly have execute permissions set
 find $RPM_BUILD_DIR/freeradius-server-%{version} \( -name '*.c' -o -name '*.h' \) -a -perm /0111 -exec chmod a-x {} +
@@ -340,6 +338,7 @@ exit 0
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/always
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/attr_filter
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/attr_rewrite
+%attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/cache
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/chap
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/checkval
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/counter
@@ -448,6 +447,8 @@ exit 0
 %{_libdir}/freeradius/rlm_attr_filter-%{version}.so
 %{_libdir}/freeradius/rlm_attr_rewrite.so
 %{_libdir}/freeradius/rlm_attr_rewrite-%{version}.so
+%{_libdir}/freeradius/rlm_cache.so
+%{_libdir}/freeradius/rlm_cache-%{version}.so
 %{_libdir}/freeradius/rlm_chap.so
 %{_libdir}/freeradius/rlm_chap-%{version}.so
 %{_libdir}/freeradius/rlm_checkval.so