!51 [sync] PR-50: Update to 3.0.25

From: @openeuler-sync-bot 
Reviewed-by: @ruebb 
Signed-off-by: @ruebb

Add-missing-backslash-that-precluded-server-from-starting.patch

@@ -1,28 +0,0 @@
-From eef366956e2e4a689ab33a0d1f265eb15f749d8d Mon Sep 17 00:00:00 2001
-From: Alejandro Perez <alex.perez-mendez@jisc.ac.uk>
-Date: Mon, 6 Apr 2020 15:52:38 +0200
-Subject: [PATCH] Add missing backslash that precluded server from starting
-
-Server did not start, because it found an unterminated string. Adding the previous-existing backslash fixed it.
-```
-including configuration file /etc/raddb/mods-config/sql/main/postgresql/queries.conf
-/etc/raddb/mods-config/sql/main/postgresql/queries.conf[505]: Parse error: Unterminated string
-Errors reading or parsing /etc/raddb/radiusd.conf
-```
----
- raddb/mods-config/sql/main/postgresql/queries.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/raddb/mods-config/sql/main/postgresql/queries.conf b/raddb/mods-config/sql/main/postgresql/queries.conf
-index da82467aea5..b868238306a 100644
---- a/raddb/mods-config/sql/main/postgresql/queries.conf
-+++ b/raddb/mods-config/sql/main/postgresql/queries.conf
-@@ -502,7 +502,7 @@ accounting {
- 					FramedInterfaceId = NULLIF('%{Framed-Interface-Id}', ''), \
- 					DelegatedIPv6Prefix = NULLIF('%{Delegated-IPv6-Prefix}', '')::inet, \
- 					AcctUpdateTime = ${....event_timestamp}, \
--					AcctSessionTime = COALESCE(%{%{Acct-Session-Time}:-NULL},
-+					AcctSessionTime = COALESCE(%{%{Acct-Session-Time}:-NULL}, \
- 						(${....event_timestamp_epoch} - EXTRACT(EPOCH FROM(AcctStartTime)))), \
- 					AcctInputOctets = (('%{%{Acct-Input-Gigawords}:-0}'::bigint << 32) + \
- 						'%{%{Acct-Input-Octets}:-0}'::bigint), \

Fix-radeapclient-option-q.patch

@@ -1,43 +0,0 @@
-From 8a6cdf29ea6427cd8e96c00bc3d03abe1a67e8a3 Mon Sep 17 00:00:00 2001
-From: lingsheng <lingsheng@huawei.com>
-Date: Thu, 11 Mar 2021 16:03:35 +0800
-Subject: [PATCH] Fix radeapclient option -q
-
----
- src/modules/rlm_eap/radeapclient.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/modules/rlm_eap/radeapclient.c b/src/modules/rlm_eap/radeapclient.c
-index 553a6a6..d505ae8 100644
---- a/src/modules/rlm_eap/radeapclient.c
-+++ b/src/modules/rlm_eap/radeapclient.c
-@@ -1899,8 +1899,6 @@ int main(int argc, char **argv)
- 		.debug_file = NULL,
- 	};
- 
--	radlog_init(&radclient_log, false);
--
- 	/*
- 	 *	We probably don't want to free the talloc autofree context
- 	 *	directly, so we'll allocate a new context beneath it, and
-@@ -1938,6 +1936,8 @@ int main(int argc, char **argv)
- 			break;
- 		case 'q':
- 			do_output = 0;
-+			radclient_log.dst = L_DST_NULL;
-+			radclient_log.fd = 0;
- 			break;
- 		case 'x':
- 			rad_debug_lvl++;
-@@ -2013,6 +2013,8 @@ int main(int argc, char **argv)
- 		usage();
- 	}
- 
-+	radlog_init(&radclient_log, false);
-+
- 	/* Prepare the timeout. */
- 	rc_float_to_timeval(&tv_timeout, timeout);
- 
--- 
-2.23.0
-

freeradius.spec

@@ -3,23 +3,18 @@
 %define perl_version %(eval "`%{__perl} -V:version`"; echo $version)
 
 Name:           freeradius
-Version:        3.0.21
+Version:        3.0.25
-Release:        8
+Release:        1
 Summary:        Remote Authentication Dial-In User Service
 
 License:        GPLv2+ and LGPLv2+
 URL:            http://www.freeradius.org/
-Source0:        https://freeradius.org/ftp/pub/radius/freeradius-server-%{version}.tar.bz2
+Source0:        https://freeradius.org/ftp/pub/radius/freeradius-server-%{version}.tar.gz
 Source1:        radiusd.service
 Source2:        freeradius-logrotate
 Source3:        freeradius-pam-conf
 Source4:        freeradius-tmpfiles.conf
 
-Patch0000:      remove-unused-arguement.patch
-Patch0001:      Fix-radeapclient-option-q.patch
-Patch0002:      Add-missing-backslash-that-precluded-server-from-starting.patch
-# patch for backport CVE
-
 BuildRequires:  autoconf gdbm-devel openssl openssl-devel pam-devel zlib-devel net-snmp-devel
 BuildRequires:  net-snmp-utils readline-devel libpcap-devel systemd-units libtalloc-devel
 BuildRequires:  pcre-devel unixODBC-devel json-c-devel libcurl-devel gcc chrpath
@@ -169,7 +164,6 @@ install -m 644 mibs/*RADIUS*.mib $RPM_BUILD_ROOT%{_datadir}/snmp/mibs/
 
 rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/raddb/mods-config/sql/ippool/mongo/queries.conf
 rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/raddb/mods-config/sql/main/mongo/queries.conf
-rm -rf $RPM_BUILD_ROOT/etc/raddb/mods-config/sql/main/mssql
 rm -rf $RPM_BUILD_ROOT/etc/raddb/mods-config/sql/ippool/mssql
 
 install -D LICENSE $RPM_BUILD_ROOT/%{docdir}/LICENSE.gpl
@@ -248,7 +242,7 @@ exit 0
 %config(noreplace) /etc/raddb/certs/{Makefile,passwords.mk,xpextensions}
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/certs/*.cnf
 %attr(750,root,radiusd) /etc/raddb/certs/{bootstrap}
-/etc/raddb/certs/README
+/etc/raddb/certs/README.md
 %exclude /etc/raddb/certs/{*.crt,*.crl,*.csr,*.der,*.key,*.pem,*.p12}
 %exclude /etc/raddb/certs/{index.*,serial*,dh,random}
 
@@ -282,6 +276,7 @@ exit 0
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/sites-available/{proxy-inner-tunnel,dynamic-clients}
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/sites-available/{copy-acct-to-home-server,buffered-sql}
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/sites-available/{tls,channel_bindings,challenge}
+%attr(640,root,radiusd) %config(noreplace) /etc/raddb/sites-available/{resource-check,totp} 
 %exclude /etc/raddb/sites-available/abfab*
 
 # /etc/raddb/sites-enabled dir
@@ -305,6 +300,7 @@ exit 0
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/{smsotp,soh,sometimes,sql,sqlcounter}
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/{sqlippool,sradutmp,unix,unpack}
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/{utf8,wimax,yubikey}
+%attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/{dhcp_files,dhcp_passwd,dhcp_sql,sql_map,totp} 
 %exclude /etc/raddb/mods-available/{unbound,couchbase,abfab*,moonshot-targeted-ids}
 
 # /etc/raddb/mods-enabled dir
@@ -312,7 +308,7 @@ exit 0
 %config(missingok) /etc/raddb/mods-enabled/{always,attr_filter,cache_eap,chap,date,detail,detail.log}
 %config(missingok) /etc/raddb/mods-enabled/{dhcp,digest,dynamic_clients,eap,echo,exec,expiration,expr}
 %config(missingok) /etc/raddb/mods-enabled/{files,linelog,logintime,mschap,ntlm_auth,pap,passwd,preprocess}
-%config(missingok) /etc/raddb/mods-enabled/{radutmp,realm,replicate,soh,sradutmp,unix,unpack,utf8}
+%config(missingok) /etc/raddb/mods-enabled/{radutmp,realm,replicate,soh,sradutmp,unix,unpack,utf8,totp}
 
 # /etc/raddb/policy.d dir
 %dir %attr(750,root,radiusd) /etc/raddb/policy.d
@@ -348,6 +344,7 @@ exit 0
 %{_libdir}/freeradius/{rlm_preprocess.so,rlm_radutmp.so,rlm_realm.so,rlm_replicate.so,rlm_soh.so}
 %{_libdir}/freeradius/{rlm_sometimes.so,rlm_sql.so,rlm_sqlcounter.so,rlm_sqlippool.so,rlm_sql_null.so}
 %{_libdir}/freeradius/{rlm_unix.so,rlm_unpack.so,rlm_utf8.so,rlm_wimax.so,rlm_yubikey.so}
+%{_libdir}/freeradius/{rlm_sql_map.so,rlm_totp.so}
 %exclude %{_libdir}/freeradius/{*.a,*.la,rlm_test.so}
 
 # MIB files
@@ -399,7 +396,32 @@ exit 0
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-config/sql/counter/mysql/*
 
 %dir %attr(750,root,radiusd) /etc/raddb/mods-config/sql/cui/mysql
-%attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-config/sql/cui/mysql/*
+%attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-config/sql/cui/mysql/* 
+	
+%dir %attr(750,root,radiusd) /etc/raddb/mods-config/sql/dhcp/mssql	
+%attr(640,root,radiusd) /etc/raddb/mods-config/sql/dhcp/mssql/queries.conf	
+%attr(640,root,radiusd) /etc/raddb/mods-config/sql/dhcp/mssql/schema.sql
+		
+%dir %attr(750,root,radiusd) /etc/raddb/mods-config/sql/dhcp/mysql	
+%attr(640,root,radiusd) /etc/raddb/mods-config/sql/dhcp/mysql/queries.conf	
+%attr(640,root,radiusd) /etc/raddb/mods-config/sql/dhcp/mysql/schema.sql	
+%attr(640,root,radiusd) /etc/raddb/mods-config/sql/dhcp/mysql/setup.sql	 
+	
+%dir %attr(750,root,radiusd) /etc/raddb/mods-config/sql/dhcp/oracle	
+%attr(640,root,radiusd) /etc/raddb/mods-config/sql/dhcp/oracle/queries.conf	
+%attr(640,root,radiusd) /etc/raddb/mods-config/sql/dhcp/oracle/schema.sql 
+	
+%dir %attr(750,root,radiusd) /etc/raddb/mods-config/sql/dhcp/postgresql	
+%attr(640,root,radiusd) /etc/raddb/mods-config/sql/dhcp/postgresql/queries.conf	
+%attr(640,root,radiusd) /etc/raddb/mods-config/sql/dhcp/postgresql/schema.sql	
+%attr(640,root,radiusd) /etc/raddb/mods-config/sql/dhcp/postgresql/setup.sql	
+ 
+	
+%dir %attr(750,root,radiusd) /etc/raddb/mods-config/sql/dhcp/sqlite
+	
+%attr(640,root,radiusd) /etc/raddb/mods-config/sql/dhcp/sqlite/queries.conf
+	
+%attr(640,root,radiusd) /etc/raddb/mods-config/sql/dhcp/sqlite/schema.sql
 
 %dir %attr(750,root,radiusd) /etc/raddb/mods-config/sql/ippool/mysql
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-config/sql/ippool/mysql/*
@@ -407,11 +429,20 @@ exit 0
 %dir %attr(750,root,radiusd) /etc/raddb/mods-config/sql/ippool-dhcp/mysql
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-config/sql/ippool-dhcp/mysql/*
 
+%dir %attr(750,root,radiusd) /etc/raddb/mods-config/sql/ippool-dhcp/mssql	
+%attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-config/sql/ippool-dhcp/mssql/procedure.sql	
+%attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-config/sql/ippool-dhcp/mssql/queries.conf	
+%attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-config/sql/ippool-dhcp/mssql/schema.sql 
+	
+%dir %attr(750,root,radiusd) /etc/raddb/mods-config/sql/ippool-dhcp/postgresql	
+%attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-config/sql/ippool-dhcp/postgresql/procedure.sql	
+%attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-config/sql/ippool-dhcp/postgresql/queries.conf	
+%attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-config/sql/ippool-dhcp/postgresql/schema.sql
+
 %dir %attr(750,root,radiusd) /etc/raddb/mods-config/sql/main/mysql
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-config/sql/main/mysql/*
 
-%dir %attr(750,root,radiusd) /etc/raddb/mods-config/sql/main/mysql/extras
+%dir %attr(750,root,radiusd) /etc/raddb/mods-config/sql/main/mysql/extras	
-%dir %attr(750,root,radiusd) /etc/raddb/mods-config/sql/main/mysql/extras/wimax
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-config/sql/main/mysql/extras/wimax/*
 
 %dir %attr(750,root,radiusd) /etc/raddb/mods-config/sql/main/ndb
@@ -431,8 +462,10 @@ exit 0
 %dir %attr(750,root,radiusd) /etc/raddb/mods-config/sql/main/postgresql
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-config/sql/main/postgresql/*
 
-%dir %attr(750,root,radiusd) /etc/raddb/mods-config/sql/main/postgresql/extras
+	
+%dir %attr(750,root,radiusd) /etc/raddb/mods-config/sql/main/postgresql/extras	
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-config/sql/main/postgresql/extras/*
+%{_libdir}/freeradius/rlm_sql_postgresql.so 
 
 %files sqlite
 %{_libdir}/freeradius/rlm_sql_sqlite.so
@@ -456,6 +489,9 @@ exit 0
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/ldap
 
 %changelog
+* Thu Dec 30 2021 baizhonggui <baizhonggui@huawei.com> - 3.0.25-1
+- update to 3.0.25
+
 * Wed Sep 08 2021 chenchen <chen_aka_jan@163.com> - 3.0.21-8
 - del rpath from some binaries and bin
 

remove-unused-arguement.patch

@@ -1,24 +0,0 @@
-From f06084a007fdcaad3bd68f29e243fa8edcf0b590 Mon Sep 17 00:00:00 2001
-From: "Alan T. DeKok" <aland@freeradius.org>
-Date: Thu, 24 Dec 2020 07:38:59 -0500
-Subject: [PATCH] remove unused argument.  Fixes #3817
-
----
- src/tests/map/map_unit.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/tests/map/map_unit.c b/src/tests/map/map_unit.c
-index af6d016..df906a5 100644
---- a/src/tests/map/map_unit.c
-+++ b/src/tests/map/map_unit.c
-@@ -81,7 +81,6 @@ static void NEVER_RETURNS usage(void)
- 	fprintf(stderr, "usage: map_unit [OPTS] filename ...\n");
- 	fprintf(stderr, "  -d <raddb>             Set user dictionary directory (defaults to " RADDBDIR ").\n");
- 	fprintf(stderr, "  -D <dictdir>           Set main dictionary directory (defaults to " DICTDIR ").\n");
--	fprintf(stderr, "  -O <output_dir>	  Set output directory\n");
- 	fprintf(stderr, "  -x                     Debugging mode.\n");
- 	fprintf(stderr, "  -M                     Show program version information.\n");
- 
--- 
-2.23.0
-