- updated to 2.2.6auto/th/freeradius-server-2.2.6-1

- updated am,format-security patches
- added oracle patch (support Oracle 12 too)
- remaining pl
- sql modules renamed to -module-sql-* scheme
- package redis+rediswho and oracle modules (the latter on bcond, with instantclient support)
- restricted permissions of raddb files potentially containing credentials

4 files changed, 518 insertions, 250 deletions

diff --git a/am.patch b/am.patch
index 063e352..1870b65 100644
--- a/am.patch
+++ b/am.patch
@@ -9,3 +9,39 @@
  
  
  ## ------------------ ##
+--- freeradius-server-2.2.6/src/modules/rlm_ldap/configure.in.orig	2014-11-18 20:56:52.000000000 +0100
++++ freeradius-server-2.2.6/src/modules/rlm_ldap/configure.in	2015-03-22 09:55:46.702919736 +0100
+@@ -49,9 +49,6 @@
+ 	  esac ]
+ 	)
+ 
+-	dnl extra argument: --enable-shared --disable-shared
+-	AC_ENABLE_SHARED
+-
+ 	dnl OpenLDAP doesn't provide an autoconf test for their libldap,
+ 	dnl and we can't reasonably check for all the dependancies for
+ 	dnl every version and every set of options.
+--- freeradius-server-2.2.6/configure.in.orig	2014-11-18 20:56:52.000000000 +0100
++++ freeradius-server-2.2.6/configure.in	2015-03-22 10:07:01.436224750 +0100
+@@ -121,17 +121,10 @@
+ dnl use system-wide libtool, if it exists
+ AC_ARG_WITH(system-libtool,
+ [  --with-system-libtool   Use the libtool installed in your system (default=use our own)],
+-[ AC_PATH_PROG(LIBTOOL, libtool,,$PATH:/usr/local/bin) AC_LIBTOOL_DLOPEN
+- AC_PROG_LIBTOOL],
+-[
+-  LIBTOOL="`pwd`/libtool"
+-  AC_SUBST(LIBTOOL)
+-  dnl ensure that we're looking for dlopen
+-  AC_LIBTOOL_DLOPEN
+-
+-  dnl Figure out how to build shared libraries
+-  AC_PROG_LIBTOOL
+-])
++[ AC_PATH_PROG(LIBTOOL, libtool,,$PATH:/usr/local/bin)
++ ])
++AC_PROG_LIBTOOL
++AC_LIBTOOL_DLOPEN
+ 
+ 
+ dnl Put this in later, when all distributed modules use autoconf.
diff --git a/format-security.patch b/format-security.patch
index 981c135..db4ef1c 100644
--- a/format-security.patch
+++ b/format-security.patch
@@ -20,3 +20,23 @@
  			exit(0);
  			break;
  		case 'x':
+--- freeradius-server-2.2.6/src/modules/rlm_sql/drivers/rlm_sql_oracle/sql_oracle.c.orig	2014-11-18 20:56:52.000000000 +0100
++++ freeradius-server-2.2.6/src/modules/rlm_sql/drivers/rlm_sql_oracle/sql_oracle.c	2015-03-22 07:30:08.669953101 +0100
+@@ -242,7 +242,7 @@
+ 	rlm_sql_oracle_sock *oracle_sock = sqlsocket->conn;
+ 
+ 	if (config->sqltrace)
+-		DEBUG(querystr);
++		DEBUG("%s", querystr);
+ 	if (oracle_sock->conn == NULL) {
+ 		radlog(L_ERR, "rlm_sql_oracle: Socket not connected");
+ 		return SQL_DOWN;
+@@ -300,7 +300,7 @@
+ 	rlm_sql_oracle_sock *oracle_sock = sqlsocket->conn;
+ 
+ 	if (config->sqltrace)
+-		DEBUG(querystr);
++		DEBUG("%s", querystr);
+ 	if (oracle_sock->conn == NULL) {
+ 		radlog(L_ERR, "rlm_sql_oracle: Socket not connected");
+ 		return SQL_DOWN;
diff --git a/freeradius-server-oracle.patch b/freeradius-server-oracle.patch
new file mode 100644
index 0000000..b952180
--- /dev/null
+++ b/freeradius-server-oracle.patch
@@ -0,0 +1,11 @@
+--- freeradius-server-2.2.6/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.in.orig	2014-11-18 20:56:52.000000000 +0100
++++ freeradius-server-2.2.6/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.in	2015-03-21 21:42:12.521433499 +0100
+@@ -86,7 +86,7 @@
+ 		if test "x$oracle_lib_dir" != "x" ; then
+ 			ORACLE_LIBDIR_SWITCH="-L${oracle_lib_dir} "
+ 		fi
+-		for oracle_version in 10 11 9 ""; do
++		for oracle_version in 12 10 11 9 ""; do
+ 			LIBS="$old_LIBS $ORACLE_LIBDIR_SWITCH -lclntsh -lnnz${oracle_version}"
+ 			AC_TRY_LINK([#include <oci.h>
+ 		
diff --git a/freeradius-server.spec b/freeradius-server.spec
index 13f9231..dbff3b9 100644
--- a/freeradius-server.spec
+++ b/freeradius-server.spec
@@ -1,27 +1,27 @@
 #
-# TODO:
-#   - build and package Redis module, requires hiredis library to be packaged
-#     first (https://github.com/antirez/hiredis)
-#
 # Conditional build:
-%bcond_without	ldap		# without rlm_ldap extension module
-%bcond_without	firebird	# without rlm_sql_firebird extension module
-%bcond_without	eap_ikev2	# without rlm_eap_ikev2 extension module
-%bcond_without	kerberos5	# without rlm_krb5 extension module
-%bcond_without	ruby		# without rlm_ruby extension module
-%bcond_with		failed_calls_acc # with failed calls accounting support
+%bcond_without	ldap			# rlm_ldap extension module
+%bcond_without	firebird		# rlm_sql_firebird extension module
+%bcond_without	eap_ikev2		# rlm_eap_ikev2 extension module
+%bcond_without	kerberos5		# rlm_krb5 extension module
+%bcond_with	krb5			# use MIT Kerberos instead of heimdal
+%bcond_with	oci			# Oracle SQL extension module
+%bcond_without	instantclient		# build Oracle SQL extension module against oracle-instantclient package
+%bcond_without	redis			# rlm_redis and rlm_rediswho extension modules
+%bcond_without	ruby			# rlm_ruby extension module
+%bcond_with	failed_calls_acc	# with failed calls accounting support
 #
 %include	/usr/lib/rpm/macros.perl
 #
 Summary:	High-performance and highly configurable RADIUS server
 Summary(pl.UTF-8):	Szybki i wysoce konfigurowalny serwer RADIUS
 Name:		freeradius-server
-Version:	2.2.5
-Release:	4
+Version:	2.2.6
+Release:	1
 License:	GPL
 Group:		Networking/Daemons/Radius
 Source0:	ftp://ftp.freeradius.org/pub/radius/%{name}-%{version}.tar.bz2
-# Source0-md5:	40535bace507d7a3134c3d858f3cbc5a
+# Source0-md5:	e9a6f9bbee9706b008b924061ab3f915
 Source1:	%{name}.logrotate
 Source2:	%{name}.init
 Source3:	%{name}.pam
@@ -37,23 +37,33 @@ Patch6:		failed_calls_accounting.patch
 Patch7:		http://eduroam.pl/Dokumentacja/cui-fr-2.2.0.patch
 Patch8:		format-security.patch
 Patch9:		am.patch
+Patch10:	%{name}-oracle.patch
 URL:		http://www.freeradius.org/
 %{?with_firebird:BuildRequires:	Firebird-devel}
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
 BuildRequires:	cyrus-sasl-devel
 BuildRequires:	gdbm-devel
-%{?with_kerberos5:BuildRequires:	heimdal-devel}
+%if %{with kerberos5} && %{without krb5}
+BuildRequires:	heimdal-devel
+%endif
+%{?with_redis:BuildRequires:	hiredis-devel}
+%if %{with kerberos5} && %{with krb5}
+BuildRequires:	krb5-devel
+%endif
 %{?with_eap_ikev2:BuildRequires:	libeap-ikev2-devel}
+BuildRequires:	libltdl-devel
+BuildRequires:	libpcap-devel
 BuildRequires:	libtool
 BuildRequires:	mysql-devel
-BuildRequires:	net-snmp-utils
+%{?with_oci:%{?with_instantclient:BuildRequires:	oracle-instantclient-devel >= 9}}
 %{?with_ldap:BuildRequires:	openldap-devel}
-BuildRequires:	openssl-devel
+BuildRequires:	openssl-devel >= 0.9.7
 BuildRequires:	pam-devel
 BuildRequires:	perl-devel
 BuildRequires:	postgresql-devel
-BuildRequires:	python-devel
+BuildRequires:	python-devel >= 2.3
+BuildRequires:	readline-devel
 BuildRequires:	rpm-perlprov
 BuildRequires:	rpmbuild(macros) >= 1.268
 %{?with_ruby:BuildRequires:	ruby-devel >= 1.8}
@@ -78,7 +88,7 @@ Obsoletes:	freeradius < 2.0
 Conflicts:	logrotate < 3.8.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		mibdir			%{_datadir}/mibs
+%define		mibdir		%{_datadir}/mibs
 %define		filterout_ld	-Wl,--as-needed
 
 %description
@@ -94,137 +104,226 @@ Livingston 2.0 RADIUS server ale ma o wiele więcej funkcji i posiada
 większe możliwości konfigurowania.
 
 %package module-krb5
-Summary:	Kerberos module for %{name}
+Summary:	Kerberos module for FreeRADIUS server
+Summary(pl.UTF-8):	Moduł Kerberos do serwera FreeRADIUS
 Group:		Networking/Daemons/Radius
 Requires:	%{name} = %{version}-%{release}
 
 %description module-krb5
-Kerberos module for %{name}.
+Kerberos module for FreeRADIUS server.
+
+%description module-krb5 -l pl.UTF-8
+Moduł Kerberos do serwera FreeRADIUS.
 
 %package module-ldap
-Summary:	LDAP module for %{name}
+Summary:	LDAP module for FreeRADIUS server
+Summary(pl.UTF-8):	Moduł LDAP do serwera FreeRADIUS
 Group:		Networking/Daemons/Radius
 Requires:	%{name} = %{version}-%{release}
 
 %description module-ldap
-LDAP module for %{name}.
-
-%package module-mysql
-Summary:	Mysql module for %{name}
-Group:		Networking/Daemons/Radius
-Requires:	%{name} = %{version}-%{release}
+LDAP module for FreeRADIUS server.
 
-%description module-mysql
-Mysql module for %{name}.
+%description module-ldap -l pl.UTF-8
+Moduł LDAP do serwera FreeRADIUS.
 
 %package module-otp
-Summary:	OTP module for %{name}
+Summary:	OTP module for FreeRADIUS server
+Summary(pl.UTF-8):	Moduł OTP do serwera FreeRADIUS
 Group:		Networking/Daemons/Radius
 Requires:	%{name} = %{version}-%{release}
 
 %description module-otp
-OTP module for %{name}.
+OTP module for FreeRADIUS server.
+
+%description module-otp -l pl.UTF-8
+Moduł OTP do serwera FreeRADIUS.
 
 %package module-pam
-Summary:	PAM module for %{name}
+Summary:	PAM module for FreeRADIUS server
+Summary(pl.UTF-8):	Moduł PAM do serwera FreeRADIUS
 Group:		Networking/Daemons/Radius
 Requires:	%{name} = %{version}-%{release}
 
 %description module-pam
-PAM module for %{name}.
+PAM module for FreeRADIUS server.
+
+%description module-pam -l pl.UTF-8
+Moduł PAM do serwera FreeRADIUS.
 
 %package module-perl
-Summary:	Perl module for %{name}
+Summary:	Perl module for FreeRADIUS server
+Summary(pl.UTF-8):	Moduł Perl do serwera FreeRADIUS
 Group:		Networking/Daemons/Radius
 Requires:	%{name} = %{version}-%{release}
 
 %description module-perl
-Perl module for %{name}.
+Perl module for FreeRADIUS server.
+
+%description module-perl -l pl.UTF-8
+Moduł Perl do serwera FreeRADIUS.
 
-%package module-postgresql
-Summary:	PostgreSQL module for %{name}
+%package module-python
+Summary:	Python module for FreeRADIUS server
+Summary(pl.UTF-8):	Moduł Python do serwera FreeRADIUS
 Group:		Networking/Daemons/Radius
 Requires:	%{name} = %{version}-%{release}
 
-%description module-postgresql
-PostgreSQL module for %{name}.
+%description module-python
+Python module for FreeRADIUS server.
 
-%package module-python
-Summary:	Python module for %{name}
+%description module-python -l pl.UTF-8
+Moduł Python do serwera FreeRADIUS.
+
+%package module-redis
+Summary:	Redis and RedisWho modules for FreeRADIUS server
+Summary(pl.UTF-8):	Moduł Redis i RedisWho do serwera FreeRADIUS
 Group:		Networking/Daemons/Radius
 Requires:	%{name} = %{version}-%{release}
 
-%description module-python
-Python module for %{name}.
+%description module-redis
+Redis and RedisWho modules for FreeRADIUS server.
+
+%description module-redis -l pl.UTF-8
+Moduł Redis i RedisWho do serwera FreeRADIUS.
 
 %package module-ruby
-Summary:	Ruby module for %{name}
+Summary:	Ruby module for FreeRADIUS server
+Summary(pl.UTF-8):	Moduł Ruby do serwera FreeRADIUS
 Group:		Networking/Daemons/Radius
 Requires:	%{name} = %{version}-%{release}
 
 %description module-ruby
-Ruby module for %{name}.
+Ruby module for FreeRADIUS server.
+
+%description module-ruby -l pl.UTF-8
+Moduł Ruby do serwera FreeRADIUS.
 
-%package module-sqlite
-Summary:	Sqlite module for %{name}
+%package module-sql-firebird
+Summary:	Firebird driver for FreeRADIUS server SQL module
+Summary(pl.UTF-8):	Sterownik Firebird dla modułu SQL serwera FreeRADIUS
 Group:		Networking/Daemons/Radius
 Requires:	%{name} = %{version}-%{release}
+Obsoletes:	freeradius-server-module-sql_firebird
 
-%description module-sqlite
-Sqlite module for %{name}.
+%description module-sql-firebird
+Firebird driver for FreeRADIUS server SQL module.
 
-%package module-sql_firebird
-Summary:	SQL Firebird module for %{name}
+%description module-sql-firebird -l pl.UTF-8
+Sterownik Firebird dla modułu SQL serwera FreeRADIUS.
+
+%package module-sql-mysql
+Summary:	MySQL driver for FreeRADIUS server SQL module
+Summary(pl.UTF-8):	Sterownik MySQL dla modułu SQL serwera FreeRADIUS
 Group:		Networking/Daemons/Radius
 Requires:	%{name} = %{version}-%{release}
+Obsoletes:	freeradius-server-module-mysql
 
-%description module-sql_firebird
-SQL Firebird module for %{name}.
+%description module-sql-mysql
+MySQL driver for FreeRADIUS server SQL module.
 
-%package module-unix
-Summary:	Unix module for %{name}
+%description module-sql-mysql -l pl.UTF-8
+Sterownik MySQL dla modułu SQL serwera FreeRADIUS.
+
+%package module-sql-oracle
+Summary:	Oracle driver for FreeRADIUS server SQL module
+Summary(pl.UTF-8):	Sterownik Oracle dla modułu SQL serwera FreeRADIUS
 Group:		Networking/Daemons/Radius
 Requires:	%{name} = %{version}-%{release}
 
-%description module-unix
-Unix module for %{name}.
+%description module-sql-oracle
+Oracle driver for FreeRADIUS server SQL module.
+
+%description module-sql-oracle -l pl.UTF-8
+Sterownik Oracle dla modułu SQL serwera FreeRADIUS.
 
-%package module-unixodbc
-Summary:	UnixODBC module for %{name}
+%package module-sql-postgresql
+Summary:	PostgreSQL driver for FreeRADIUS server SQL module
+Summary(pl.UTF-8):	Sterownik PostgreSQL dla modułu SQL serwera FreeRADIUS
 Group:		Networking/Daemons/Radius
 Requires:	%{name} = %{version}-%{release}
+Obsoletes:	freeradius-server-module-postgresql
 
-%description module-unixodbc
-UnixODBC module for %{name}.
+%description module-sql-postgresql
+PostgreSQL driver for FreeRADIUS server SQL module.
 
-%package -n mibs-%{name}
-Summary:	MIB database for %{name}
-Summary(pl.UTF-8):	Baza danych MIB dla %{name}
-Group:		Applications/System
-Requires:	mibs-dirs
-Suggests:	libsmi
-Obsoletes:	freeradius-server-mibs
+%description module-sql-postgresql -l pl.UTF-8
+Sterownik PostgreSQL dla modułu SQL serwera FreeRADIUS.
 
-%description -n mibs-%{name}
-MIB database for %{name}.
+%package module-sql-sqlite
+Summary:	SQLite driver for FreeRADIUS server SQL module
+Summary(pl.UTF-8):	Sterownik SQLite dla modułu SQL serwera FreeRADIUS
+Group:		Networking/Daemons/Radius
+Requires:	%{name} = %{version}-%{release}
+Obsoletes:	freeradius-server-module-sqlite
 
-%description -n mibs-%{name} -l pl.UTF-8
-Baza danych MIB dla %{name}.
+%description module-sql-sqlite
+SQLite driver for FreeRADIUS server SQL module.
+
+%description module-sql-sqlite -l pl.UTF-8
+Sterownik SQLite dla modułu SQL serwera FreeRADIUS.
+
+%package module-sql-unixodbc
+Summary:	UnixODBC driver for FreeRADIUS server SQL module
+Summary(pl.UTF-8):	Sterownik UnixODBC dla modułu SQL serwera FreeRADIUS
+Group:		Networking/Daemons/Radius
+Requires:	%{name} = %{version}-%{release}
+Obsoletes:	freeradius-server-module-unixodbc
+
+%description module-sql-unixodbc
+UnixODBC driver for FreeRADIUS server SQL module.
+
+%description module-sql-unixodbc -l pl.UTF-8
+Sterownik UnixODBC dla modułu SQL serwera FreeRADIUS.
+
+%package module-unix
+Summary:	Unix module for FreeRADIUS server
+Summary(pl.UTF-8):	Moduł Unix do serwera FreeRADIUS
+Group:		Networking/Daemons/Radius
+Requires:	%{name} = %{version}-%{release}
+
+%description module-unix
+Unix module for FreeRADIUS server.
+
+%description module-unix -l pl.UTF-8
+Moduł Unix do serwera FreeRADIUS.
 
 %package libs
-Summary:	Freeradius libraries
+Summary:	FreeRADIUS server libraries
+Summary(pl.UTF-8):	Biblioteki serwera FreeRADIUS
 Group:		Libraries
 
 %description libs
-Freeradius libraries.
+FreeRADIUS server libraries.
+
+%description libs -l pl.UTF-8
+Biblioteki serwera FreeRADIUS.
 
 %package devel
-Summary:	Header files and devel library
+Summary:	Header files for FreeRADIUS server libraries
+Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek serwera FreeRADIUS
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 
 %description devel
-Header files and libraries.
+Header files for FreeRADIUS server libraries.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe bibliotek serwera FreeRADIUS.
+
+%package -n mibs-%{name}
+Summary:	MIB database for FreeRADIUS server
+Summary(pl.UTF-8):	Baza danych MIB dla serwera FreeRADIUS
+Group:		Applications/System
+Requires:	mibs-dirs
+Suggests:	libsmi
+Obsoletes:	freeradius-server-mibs
+
+%description -n mibs-%{name}
+MIB database for FreeRADIUS server.
+
+%description -n mibs-%{name} -l pl.UTF-8
+Baza danych MIB dla serwera FreeRADIUS.
 
 %prep
 %setup -q
@@ -238,47 +337,61 @@ Header files and libraries.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+
+%{__rm} aclocal.m4 libtool.m4
 
 %build
 # Keep it for future when ac/am regeneration will be ok
+TOPDIR="$(pwd)"
 find -name 'configure.[ia][nc]' -type f | while read FILE; do
 	cd $(dirname "$FILE")
-	%{__libtoolize}
-	%{__aclocal} -I $OLDPWD
+	grep -q 'A[CM]_PROG_LIBTOOL' configure.[ia][nc] && %{__libtoolize}
+	%{__aclocal} -I "$TOPDIR"
 	%{__autoconf}
 	[ -f config.h.in ] && %{__autoheader}
 	cd -
 done
 
+# NOTE:
+# system-libtool conflicts with --disable-static
+# rlm_opendirectory is Mac OS specific
+# rlm_sql_db2 requires proprietary library (IBM DB2 SDK)
+# rlm_sql_iodbc disabled because libiodbc-devel conflicts with unixODBC-devel
 %configure \
+	SNMPGET=/usr/bin/snmpget \
+	SNMPWALK=/usr/bin/snmpwalk \
+	ac_cv_lib_nsl_inet_ntoa=no \
+	ac_cv_lib_resolv_inet_aton=no \
+	--disable-static \
+	%{!?with_krb5:--enable-heimdal-krb5} \
 	--enable-strict-dependencies \
 	--with-experimental-modules \
 	--with-logdir=%{_var}/log/freeradius \
+	%{?with_instantclient:--with-oracle-include-dir=/usr/include/oracle/client} \
 	--with-system-libltdl \
-	--with-system-libtool \
 	--with-udpfromto \
+	%{!?with_eap_ikev2:--without-rlm_eap_ikev2} \
 	--without-rlm_eap_tnc \
-	--without-rlm_redis \
-	--without-rlm_rediswho \
+	%{!?with_kerberos5:--without-rlm_krb5} \
+	%{!?with_ldap:--without-rlm_ldap} \
 	--without-rlm_opendirectory \
+	%{!?with_redis:--without-rlm_redis} \
+	%{!?with_redis:--without-rlm_rediswho} \
+	%{!?with_ruby:--without-rlm_ruby} \
 	--without-rlm_sql_db2 \
-	--without-rlm_sql_iodbc \
-	--without-rlm_sql_oracle \
 	%{!?with_firebird:--without-rlm_sql_firebird} \
-	%{!?with_ldap:--without-rlm_ldap} \
-	%{!?with_eap_ikev2:--without-rlm_eap_ikev2} \
-	%{?with_kerberos5:--enable-heimdal-krb5} \
-	%{!?with_kerberos5:--without-rlm_krb5} \
-	%{!?with_ruby:--without-rlm_ruby}
+	--without-rlm_sql_iodbc \
+	%{!?with_oci:--without-rlm_sql_oracle}
 
-%{make} -j1
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,pam.d} \
 	$RPM_BUILD_ROOT%{_var}/log/{,archive}/freeradius/radacct \
 	$RPM_BUILD_ROOT%{mibdir} \
-	$RPM_BUILD_ROOT/usr/lib/tmpfiles.d \
+	$RPM_BUILD_ROOT/usr/lib/tmpfiles.d
 
 %{__make} -j1 install \
 	R=$RPM_BUILD_ROOT
@@ -292,12 +405,10 @@ install %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
 install mibs/FREERADIUS-*.txt $RPM_BUILD_ROOT%{mibdir}
 
 # Cleanups:
-rm -rf $RPM_BUILD_ROOT%{_docdir}/freeradius \
-	$RPM_BUILD_ROOT%{_libdir}/*.{a,la} \
-	$RPM_BUILD_ROOT%{_libdir}/freeradius/*.a \
-	$RPM_BUILD_ROOT%{_sbindir}/rc.* \
-	$RPM_BUILD_ROOT%{_sysconfdir}/*.pl \
-	$RPM_BUILD_ROOT%{_sysconfdir}/raddb/sql/oracle
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la \
+	$RPM_BUILD_ROOT%{_sbindir}/rc.*
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/freeradius \
+	%{!?with_oci:$RPM_BUILD_ROOT%{_sysconfdir}/raddb/sql/oracle}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -342,19 +453,189 @@ fi
 
 %module_scripts module-krb5
 %module_scripts module-ldap
-%module_scripts module-mysql
 %module_scripts module-otp
 %module_scripts module-pam
 %module_scripts module-perl
-%module_scripts module-postgresql
 %module_scripts module-python
+%module_scripts module-redis
 %module_scripts module-ruby
-%module_scripts module-sqlite
-%module_scripts module-sql_firebird
+%module_scripts module-sql-firebird
+%module_scripts module-sql-mysql
+%module_scripts module-sql-oracle
+%module_scripts module-sql-postgresql
+%module_scripts module-sql-sqlite
+%module_scripts module-sql-unixodbc
 %module_scripts module-unix
-%module_scripts module-unixodbc
 
 %files
+%defattr(644,root,root,755)
+%doc COPYRIGHT CREDITS README.rst doc/* scripts
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/freeradius-server
+%attr(754,root,root) /etc/rc.d/init.d/freeradius-server
+%attr(755,root,root) %{_bindir}/rad_counter
+%attr(755,root,root) %{_bindir}/radclient
+%attr(755,root,root) %{_bindir}/radconf2xml
+%attr(755,root,root) %{_bindir}/radcrypt
+%attr(755,root,root) %{_bindir}/radeapclient
+%attr(755,root,root) %{_bindir}/radlast
+%attr(755,root,root) %{_bindir}/radsniff
+%attr(755,root,root) %{_bindir}/radsqlrelay
+%attr(755,root,root) %{_bindir}/radtest
+%attr(755,root,root) %{_bindir}/radwho
+%attr(755,root,root) %{_bindir}/radzap
+%attr(755,root,root) %{_bindir}/rlm_dbm_cat
+%attr(755,root,root) %{_bindir}/rlm_dbm_parser
+%attr(755,root,root) %{_bindir}/rlm_ippool_tool
+%attr(755,root,root) %{_bindir}/smbencrypt
+%attr(755,root,root) %{_sbindir}/checkrad
+%attr(755,root,root) %{_sbindir}/raddebug
+%attr(755,root,root) %{_sbindir}/radiusd
+%attr(755,root,root) %{_sbindir}/radmin
+%attr(755,root,root) %{_sbindir}/radwatch
+%dir %{_libdir}/freeradius
+%attr(755,root,root) %{_libdir}/freeradius/rlm_acctlog*.so
+%{_libdir}/freeradius/rlm_acctlog*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_acct_unique*.so
+%{_libdir}/freeradius/rlm_acct_unique*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_always*.so
+%{_libdir}/freeradius/rlm_always*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_attr_filter*.so
+%{_libdir}/freeradius/rlm_attr_filter*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_attr_rewrite*.so
+%{_libdir}/freeradius/rlm_attr_rewrite*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_cache*.so
+%{_libdir}/freeradius/rlm_cache*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_caching*.so
+%{_libdir}/freeradius/rlm_caching*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_chap*.so
+%{_libdir}/freeradius/rlm_chap*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_checkval*.so
+%{_libdir}/freeradius/rlm_checkval*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_copy_packet*.so
+%{_libdir}/freeradius/rlm_copy_packet*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_counter*.so
+%{_libdir}/freeradius/rlm_counter*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_cram*.so
+%{_libdir}/freeradius/rlm_cram*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_dbm*.so
+%{_libdir}/freeradius/rlm_dbm*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_detail*.so
+%{_libdir}/freeradius/rlm_detail*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_digest*.so
+%{_libdir}/freeradius/rlm_digest*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_dynamic_clients*.so
+%{_libdir}/freeradius/rlm_dynamic_clients*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_eap*.so
+%{_libdir}/freeradius/rlm_eap*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_example*.so
+%{_libdir}/freeradius/rlm_example*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_exec*.so
+%{_libdir}/freeradius/rlm_exec*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_expiration*.so
+%{_libdir}/freeradius/rlm_expiration*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_expr*.so
+%{_libdir}/freeradius/rlm_expr*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_fastusers*.so
+%{_libdir}/freeradius/rlm_fastusers*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_files*.so
+%{_libdir}/freeradius/rlm_files*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_ippool*.so
+%{_libdir}/freeradius/rlm_ippool*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_jradius*.so
+%{_libdir}/freeradius/rlm_jradius*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_linelog*.so
+%{_libdir}/freeradius/rlm_linelog*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_logintime*.so
+%{_libdir}/freeradius/rlm_logintime*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_mschap*.so
+%{_libdir}/freeradius/rlm_mschap*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_pap*.so
+%{_libdir}/freeradius/rlm_pap*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_passwd*.so
+%{_libdir}/freeradius/rlm_passwd*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_policy*.so
+%{_libdir}/freeradius/rlm_policy*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_preprocess*.so
+%{_libdir}/freeradius/rlm_preprocess*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_protocol_filter*.so
+%{_libdir}/freeradius/rlm_protocol_filter*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_radutmp*.so
+%{_libdir}/freeradius/rlm_radutmp*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_realm*.so
+%{_libdir}/freeradius/rlm_realm*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_replicate*.so
+%{_libdir}/freeradius/rlm_replicate*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_sim_files*.so
+%{_libdir}/freeradius/rlm_sim_files*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_smsotp*.so
+%{_libdir}/freeradius/rlm_smsotp*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_soh*.so
+%{_libdir}/freeradius/rlm_soh*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_sql-%{version}.so
+%attr(755,root,root) %{_libdir}/freeradius/rlm_sql.so
+%{_libdir}/freeradius/rlm_sql-%{version}.la
+%{_libdir}/freeradius/rlm_sql.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_sqlcounter*.so
+%{_libdir}/freeradius/rlm_sqlcounter*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_sqlhpwippool*.so
+%{_libdir}/freeradius/rlm_sqlhpwippool*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_sqlippool*.so
+%{_libdir}/freeradius/rlm_sqlippool*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_sql_log*.so
+%{_libdir}/freeradius/rlm_sql_log*.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_wimax*.so
+%{_libdir}/freeradius/rlm_wimax*.la
+%{_datadir}/freeradius
+%{_mandir}/man1/radclient.1*
+%{_mandir}/man1/radeapclient.1*
+%{_mandir}/man1/radlast.1*
+%{_mandir}/man1/radtest.1*
+%{_mandir}/man1/radwho.1*
+%{_mandir}/man1/radzap.1*
+%{_mandir}/man1/smbencrypt.1*
+%{_mandir}/man5/acct_users.5*
+%{_mandir}/man5/checkrad.5*
+%{_mandir}/man5/clients.conf.5*
+%{_mandir}/man5/dictionary.5*
+%{_mandir}/man5/radiusd.conf.5*
+%{_mandir}/man5/radrelay.conf.5*
+%{_mandir}/man5/rlm_acct_unique.5*
+%{_mandir}/man5/rlm_always.5*
+%{_mandir}/man5/rlm_attr_filter.5*
+%{_mandir}/man5/rlm_attr_rewrite.5*
+%{_mandir}/man5/rlm_chap.5*
+%{_mandir}/man5/rlm_counter.5*
+%{_mandir}/man5/rlm_detail.5*
+%{_mandir}/man5/rlm_digest.5*
+%{_mandir}/man5/rlm_expr.5*
+%{_mandir}/man5/rlm_files.5*
+%{_mandir}/man5/rlm_mschap.5*
+%{_mandir}/man5/rlm_pap.5*
+%{_mandir}/man5/rlm_passwd.5*
+%{_mandir}/man5/rlm_policy.5*
+%{_mandir}/man5/rlm_realm.5*
+%{_mandir}/man5/rlm_sql.5*
+%{_mandir}/man5/rlm_sql_log.5*
+%{_mandir}/man5/unlang.5*
+%{_mandir}/man5/users.5*
+%{_mandir}/man8/radconf2xml.8*
+%{_mandir}/man8/radcrypt.8*
+%{_mandir}/man8/raddebug.8*
+%{_mandir}/man8/radiusd.8*
+%{_mandir}/man8/radmin.8*
+%{_mandir}/man8/radrelay.8*
+%{_mandir}/man8/radsniff.8*
+%{_mandir}/man8/radsqlrelay.8*
+%{_mandir}/man8/radwatch.8*
+%{_mandir}/man8/rlm_dbm_cat.8*
+%{_mandir}/man8/rlm_dbm_parser.8*
+%{_mandir}/man8/rlm_ippool_tool.8*
+%attr(771,root,radius) %dir %{_var}/log/freeradius
+%attr(771,root,radius) %dir %{_var}/log/freeradius/radacct
+%attr(771,root,radius) %dir %{_var}/log/archive/freeradius
+%attr(771,root,radius) %dir %{_var}/log/archive/freeradius/radacct
+%attr(775,root,radius) %dir /var/run/freeradius
+/usr/lib/tmpfiles.d/%{name}.conf
 %defattr(640,root,radius,750)
 %dir %{_sysconfdir}/raddb
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/acct_users
@@ -367,6 +648,7 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/huntgroups
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/policy.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/policy.txt
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/panic.gdb
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/preproxy_users
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/proxy.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/radiusd.conf
@@ -435,213 +717,132 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/sql/mssql/*
 %dir %{_sysconfdir}/raddb/sql/ndb
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/sql/ndb/*
-%defattr(644,root,root,755)
-%doc doc/* scripts raddb
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/*
-%attr(754,root,root) /etc/rc.d/init.d/%{name}
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_sbindir}/*
-%dir %{_libdir}/freeradius
-%attr(755,root,root) %{_libdir}/freeradius/rlm_acctlog*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_acctlog*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_acct_unique*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_acct_unique*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_always*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_always*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_attr_filter*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_attr_filter*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_attr_rewrite*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_attr_rewrite*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_cache*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_cache*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_caching*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_caching*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_chap*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_chap*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_checkval*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_checkval*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_copy_packet*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_copy_packet*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_counter*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_counter*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_cram*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_cram*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_dbm*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_dbm*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_detail*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_detail*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_digest*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_digest*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_dynamic_clients*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_dynamic_clients*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_eap*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_eap*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_example*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_example*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_exec*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_exec*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_expiration*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_expiration*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_expr*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_expr*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_fastusers*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_fastusers*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_files*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_files*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_ippool*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_ippool*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_jradius*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_jradius*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_linelog*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_linelog*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_logintime*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_logintime*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_mschap*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_mschap*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_pap*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_pap*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_passwd*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_passwd*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_policy*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_policy*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_preprocess*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_preprocess*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_protocol_filter*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_protocol_filter*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_radutmp*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_radutmp*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_realm*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_realm*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_replicate*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_replicate*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_sim_files*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_sim_files*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_smsotp*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_smsotp*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_soh*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_soh*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_sql-*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_sql.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_sql-*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_sql.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_sqlcounter*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_sqlcounter*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_sqlhpwippool*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_sqlhpwippool*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_sqlippool*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_sqlippool*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_sql_log*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_sql_log*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_wimax*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_wimax*.la
-%{_datadir}/freeradius
-%{_mandir}/man?/*
-%attr(771,root,radius) %dir %{_var}/log/freeradius
-%attr(771,root,radius) %dir %{_var}/log/freeradius/radacct
-%attr(771,root,radius) %dir %{_var}/log/archive/freeradius
-%attr(771,root,radius) %dir %{_var}/log/archive/freeradius/radacct
-%attr(775,root,radius) %dir /var/run/freeradius
-/usr/lib/tmpfiles.d/%{name}.conf
 
 %if %{with kerberos5}
 %files module-krb5
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/modules/krb5
 %attr(755,root,root) %{_libdir}/freeradius/rlm_krb5*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_krb5*.la
+%{_libdir}/freeradius/rlm_krb5*.la
 %endif
 
 %if %{with ldap}
 %files module-ldap
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/ldap.attrmap
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/modules/ldap
+%attr(640,root,radius) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/modules/ldap
 %attr(755,root,root) %{_libdir}/freeradius/rlm_ldap*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_ldap*.la
+%{_libdir}/freeradius/rlm_ldap*.la
 %endif
 
-%files module-mysql
-%defattr(644,root,root,755)
-%dir %{_sysconfdir}/raddb/sql/mysql
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/sql/mysql/*
-%attr(755,root,root) %{_libdir}/freeradius/rlm_sql_mysql*.la
-%attr(755,root,root) %{_libdir}/freeradius/rlm_sql_mysql*.so
-
 %files module-otp
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/modules/otp
 %attr(755,root,root) %{_libdir}/freeradius/rlm_otp*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_otp*.la
+%{_libdir}/freeradius/rlm_otp*.la
 
 %files module-pam
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/modules/pam
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/radius
 %attr(755,root,root) %{_libdir}/freeradius/rlm_pam*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_pam*.la
+%{_libdir}/freeradius/rlm_pam*.la
 
 %files module-perl
 %defattr(644,root,root,755)
 %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/example.pl
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/modules/perl
 %attr(755,root,root) %{_libdir}/freeradius/rlm_perl*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_perl*.la
-
-%files module-postgresql
-%defattr(644,root,root,755)
-%dir %{_sysconfdir}/raddb/sql/postgresql
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/sql/postgresql/*
-%attr(755,root,root) %{_libdir}/freeradius/rlm_sql_postgresql*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_sql_postgresql*.la
+%{_libdir}/freeradius/rlm_perl*.la
 
 %files module-python
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/freeradius/rlm_python*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_python*.la
+%{_libdir}/freeradius/rlm_python*.la
+
+%if %{with redis}
+%files module-redis
+%defattr(644,root,root,755)
+%attr(640,root,radius) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/modules/redis
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/modules/rediswho
+%attr(755,root,root) %{_libdir}/freeradius/rlm_redis-%{version}.so
+%attr(755,root,root) %{_libdir}/freeradius/rlm_redis.so
+%{_libdir}/freeradius/rlm_redis-%{version}.la
+%{_libdir}/freeradius/rlm_redis.la
+%attr(755,root,root) %{_libdir}/freeradius/rlm_rediswho-%{version}.so
+%attr(755,root,root) %{_libdir}/freeradius/rlm_rediswho.so
+%{_libdir}/freeradius/rlm_rediswho-%{version}.la
+%{_libdir}/freeradius/rlm_rediswho.la
+%endif
 
 %if %{with ruby}
 %files module-ruby
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/freeradius/rlm_ruby*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_ruby*.la
+%{_libdir}/freeradius/rlm_ruby*.la
 %endif
 
-%files module-sqlite
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/freeradius/rlm_sql_sqlite*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_sql_sqlite*.la
-
 %if %{with firebird}
-%files module-sql_firebird
+%files module-sql-firebird
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/freeradius/rlm_sql_firebird*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_sql_firebird*.la
+%{_libdir}/freeradius/rlm_sql_firebird*.la
 %endif
 
-%files module-unix
+%files module-sql-mysql
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/modules/unix
-%attr(755,root,root) %{_libdir}/freeradius/rlm_unix*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_unix*.la
+%dir %{_sysconfdir}/raddb/sql/mysql
+%attr(640,root,radius) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/sql/mysql/*
+%attr(755,root,root) %{_libdir}/freeradius/rlm_sql_mysql*.so
+%{_libdir}/freeradius/rlm_sql_mysql*.la
+
+%if %{with oci}
+%files module-sql-oracle
+%defattr(644,root,root,755)
+%dir %{_sysconfdir}/raddb/sql/oracle
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/sql/oracle/*
+%attr(755,root,root) %{_libdir}/freeradius/rlm_sql_oracle*.so
+%{_libdir}/freeradius/rlm_sql_oracle*.la
+%endif
 
-%files module-unixodbc
+%files module-sql-postgresql
+%defattr(644,root,root,755)
+%dir %{_sysconfdir}/raddb/sql/postgresql
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/sql/postgresql/*
+%attr(755,root,root) %{_libdir}/freeradius/rlm_sql_postgresql*.so
+%{_libdir}/freeradius/rlm_sql_postgresql*.la
+
+%files module-sql-sqlite
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/freeradius/rlm_sql_sqlite*.so
+%{_libdir}/freeradius/rlm_sql_sqlite*.la
+
+%files module-sql-unixodbc
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/freeradius/rlm_sql_unixodbc*.so
-%attr(755,root,root) %{_libdir}/freeradius/rlm_sql_unixodbc*.la
+%{_libdir}/freeradius/rlm_sql_unixodbc*.la
+
+%files module-unix
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/modules/unix
+%attr(755,root,root) %{_libdir}/freeradius/rlm_unix*.so
+%{_libdir}/freeradius/rlm_unix*.la
+%{_mandir}/man5/rlm_unix.5*
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libfreeradius-eap-?.?.?.so
+%attr(755,root,root) %{_libdir}/libfreeradius-eap-%{version}.so
 %attr(755,root,root) %{_libdir}/libfreeradius-radius-??????.so
 %dir %{_libdir}/freeradius
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libfreeradius-eap.so
+%attr(755,root,root) %{_libdir}/libfreeradius-radius.so
 %{_includedir}/freeradius
-%{_libdir}/libfreeradius-eap.so
-%{_libdir}/libfreeradius-radius.so
 
 %files -n mibs-%{name}
 %defattr(644,root,root,755)
-%doc mibs/*.chart
-%{mibdir}/*.*
+%doc mibs/RADIUS-*.chart
+%{mibdir}/FREERADIUS-PRODUCT-RADIUSD-MIB.txt
+%{mibdir}/FREERADIUS-SMI.txt