Adding upstream version 3.2.5+dfsg.upstream/3.2.5+dfsgupstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 19 insertions, 13 deletions

diff --git a/redhat/freeradius.spec b/redhat/freeradius.spec
index 3cb211f..69dd646 100644
--- a/redhat/freeradius.spec
+++ b/redhat/freeradius.spec
@@ -7,6 +7,7 @@
 %{!?_with_rlm_eap_tnc: %global _without_rlm_eap_tnc --without-rlm_eap_tnc}
 %{!?_with_rlm_yubikey: %global _without_rlm_yubikey --without-rlm_yubikey}
 %{?_without_ldap: %global _without_libfreeradius_ldap --without-libfreeradius-ldap}
+%{?el7: %global _without_rlm_eap_teap --without-rlm_eap_teap}
 
 # experimental modules
 %bcond_with rlm_idn
@@ -30,7 +31,7 @@
 
 Summary: High-performance and highly configurable free RADIUS server
 Name: freeradius
-Version: 3.2.3
+Version: 3.2.5
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
@@ -60,11 +61,12 @@ BuildRequires: autoconf
 BuildRequires: gdbm-devel
 BuildRequires: openssl, openssl-devel
 BuildRequires: pam-devel
+BuildRequires: pcre-devel
 BuildRequires: zlib-devel
 BuildRequires: net-snmp-devel
 BuildRequires: net-snmp-utils
-%{?el7:BuildRequires: libwbclient-devel}
-%{?el7:BuildRequires: samba-devel}
+BuildRequires: libwbclient-devel
+BuildRequires: samba-devel
 %if %{?_unitdir:1}%{!?_unitdir:0}
 BuildRequires: systemd-devel
 %endif
@@ -82,10 +84,9 @@ Requires: libpcap
 Requires: readline
 Requires: libtalloc
 Requires: net-snmp
-%{?el7:Requires: libwbclient}
+Requires: libwbclient
 Requires: zlib
 Requires: pam
-%{?el6:Requires: redhat-lsb-core}
 
 %if %{?_with_rlm_idn:1}%{?!_with_rlm_idn:0}
 Requires: libidn
@@ -193,13 +194,7 @@ Summary: Perl support for FreeRADIUS
 Group: System Environment/Daemons
 Requires: %{name} = %{version}-%{release}
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-%{?fedora:BuildRequires: perl-devel}
-%if 0%{?rhel} <= 5
-BuildRequires: perl
-%endif
-%if 0%{?rhel} >= 6
 BuildRequires: perl-devel
-%endif
 BuildRequires: perl(ExtUtils::Embed)
 
 %description perl
@@ -441,7 +436,7 @@ make %_smp_mflags
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/var/run/radiusd
 mkdir -p $RPM_BUILD_ROOT/var/lib/radiusd
-make install R=$RPM_BUILD_ROOT
+make install R=$RPM_BUILD_ROOT PACKAGE='redhat'
 # modify default configuration
 RADDB=$RPM_BUILD_ROOT%{_sysconfdir}/raddb
 perl -i -pe 's/^#user =.*$/user = radiusd/'   $RADDB/radiusd.conf
@@ -639,6 +634,7 @@ fi
 %{_libdir}/freeradius/rlm_detail.so
 %{_libdir}/freeradius/rlm_dhcp.so
 %{_libdir}/freeradius/rlm_digest.so
+%{_libdir}/freeradius/rlm_dpsk.so
 %{_libdir}/freeradius/rlm_dynamic_clients.so
 %{_libdir}/freeradius/rlm_eap.so
 %{_libdir}/freeradius/rlm_eap_fast.so
@@ -647,6 +643,9 @@ fi
 %{_libdir}/freeradius/rlm_eap_mschapv2.so
 %{_libdir}/freeradius/rlm_eap_peap.so
 %{_libdir}/freeradius/rlm_eap_sim.so
+%if 0%{?rhel} >= 8
+%{_libdir}/freeradius/rlm_eap_teap.so
+%endif
 %{_libdir}/freeradius/rlm_eap_tls.so
 %{_libdir}/freeradius/rlm_eap_ttls.so
 %{_libdir}/freeradius/rlm_exec.so
@@ -698,7 +697,13 @@ fi
 %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/trigger.conf
 %config(noreplace) %{_sysconfdir}/raddb/users
 %dir %attr(770,root,radiusd) %{_sysconfdir}/raddb/certs
-%attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/certs/*
+%attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/certs/README.md
+%attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/certs/Makefile
+%attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/certs/bootstrap
+%attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/certs/xpextensions
+%attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/certs/*.cnf
+%dir %attr(770,root,radiusd) %{_sysconfdir}/raddb/certs/realms
+%attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/certs/realms/*
 %attr(750,root,radiusd) %{_sysconfdir}/raddb/certs/bootstrap
 %dir %attr(750,root,radiusd) %{_sysconfdir}/raddb/sites-available
 %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/sites-available/*
@@ -840,6 +845,7 @@ fi
 /usr/bin/radeapclient
 /usr/bin/radlast
 /usr/bin/radtest
+/usr/bin/radsecret
 /usr/bin/radsniff
 /usr/bin/radsqlrelay
 /usr/bin/raduat