From 09dea27b0a1f6424585183c2f0c690ce1b08e201533768cc9e00aa7830138105 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Thu, 7 Oct 2021 15:45:35 +0000 Subject: [PATCH 1/4] - freeradius-server-radiusd-logrotate.patch: move logrotate options into specific parts for each log as "global" options will persist past and clobber global options in the main logrotate config (bsc#1180525) OBS-URL: https://build.opensuse.org/package/show/network/freeradius-server?expand=0&rev=147 --- freeradius-server-3.0.23.tar.bz2 | 3 - freeradius-server-3.0.23.tar.bz2.sig | Bin 591 -> 0 bytes freeradius-server-3.0.24.tar.bz2 | 3 + freeradius-server-3.0.24.tar.bz2.sig | Bin 0 -> 591 bytes freeradius-server-radiusd-logrotate.patch | 74 ---------------------- freeradius-server.changes | 58 +++++++++++++++++ freeradius-server.spec | 42 ++---------- 7 files changed, 65 insertions(+), 115 deletions(-) delete mode 100644 freeradius-server-3.0.23.tar.bz2 delete mode 100644 freeradius-server-3.0.23.tar.bz2.sig create mode 100644 freeradius-server-3.0.24.tar.bz2 create mode 100644 freeradius-server-3.0.24.tar.bz2.sig delete mode 100644 freeradius-server-radiusd-logrotate.patch diff --git a/freeradius-server-3.0.23.tar.bz2 b/freeradius-server-3.0.23.tar.bz2 deleted file mode 100644 index 4a579bd..0000000 --- a/freeradius-server-3.0.23.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08ce42bf0ec217704ca163619c06efcae8a6d6a8ae7a626d77da9a6fd210e235 -size 3381917 diff --git a/freeradius-server-3.0.23.tar.bz2.sig b/freeradius-server-3.0.23.tar.bz2.sig deleted file mode 100644 index 19c1559fb148a82b17b9cfcda95f7dc6c21971e72a7f439872935c19cd9314a9..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 591 zcmV-V0x;-WnSDz4;c&_G_u8#6bJIk?c?v&D! zFT1M!)kG8V#bhn4{Uj%G)!t#tT4&~k<@!~`^fdi@A-)ZPNqU8O7yA9MyD1o?+DgVZ zHOg<7s?Ocolevneskf#pgC~g#o48JR%NM+DW3tGg!+i7$ZUeMl_7qjx-&MdoMg6( z4|nrnCG}DpDgyM1I{UpKhq)9pJ?%aYsT4c*D?dD|6PUi^GGkKSJI)pl;V*g5{)y2yPwW?n=%s d1S5dJ>J?&gN8GYzbx|f{tjVkc;Sr3()`WB8Afo^P diff --git a/freeradius-server-3.0.24.tar.bz2 b/freeradius-server-3.0.24.tar.bz2 new file mode 100644 index 0000000..874e623 --- /dev/null +++ b/freeradius-server-3.0.24.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7bb0f25bec869f71f81ff6ce0be13181ac75394857e919382220240f3b6f52ef +size 3400689 diff --git a/freeradius-server-3.0.24.tar.bz2.sig b/freeradius-server-3.0.24.tar.bz2.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..c6c0b408d59d4866970672dbdd14f7d7b1b577aaaaeb46c501eceb0460b29744 GIT binary patch literal 591 zcmV-V0%V3uWw9l5R!?ucDw7~_{3_4Pd!U1h9Tw$-R4Vj{-BwH_(IbUYUbWGCbp!iGkRzs+-M#WH^%W&lrCnLHdE-z3xm)^=-}s;3H-Uv zN9Jp0B)UZV5z+okOfkq(}`_G~BR#^yJ$SBq#AZBqnOIBEI# ddF$+CyLI1Yj#6;EAohCD3MhuQ_AJf%La@1vAWZ-O literal 0 HcmV?d00001 diff --git a/freeradius-server-radiusd-logrotate.patch b/freeradius-server-radiusd-logrotate.patch deleted file mode 100644 index 9912533..0000000 --- a/freeradius-server-radiusd-logrotate.patch +++ /dev/null @@ -1,74 +0,0 @@ -Index: freeradius-server-3.0.21/suse/radiusd-logrotate -=================================================================== ---- freeradius-server-3.0.21.orig/suse/radiusd-logrotate -+++ freeradius-server-3.0.21/suse/radiusd-logrotate -@@ -2,39 +2,33 @@ - # it to /etc/logrotate.d/radiusd - - # --# Global options for all files --# --dateext --maxage 365 --rotate 99 --missingok --compress --delaycompress --notifempty --su radiusd radiusd -- --# - # The main server log - # - /var/log/radius/radius.log { -+ dateext -+ maxage 365 -+ rotate 99 -+ missingok -+ compress -+ delaycompress -+ notifempty -+ -+ su radiusd radiusd - copytruncate -+ postrotate -+ kill -HUP `cat /run/radiusd/radiusd.pid` || : -+ endscript - } - - # - # Session monitoring utilities - # --/var/log/radius/checkrad.log /var/log/radius/radwatch.log { -- nocreate -- size=+1024k --} -+/var/log/radius/checkrad.log /var/log/radius/radwatch.log - - # - # SQL log files - # --/var/log/radius/sqllog.sql { -- nocreate -- size=+2048k --} -+/var/log/radius/sqllog.sql - - # There are different detail-rotating strategies you can use. One is - # to write to a single detail file per IP and use the rotate config -@@ -44,6 +38,15 @@ su radiusd radiusd - # second technique, you will need another cron job that removes old - # detail files. You do not need to comment out the below for method #2. - /var/log/radius/radacct/*/detail { -+ dateext -+ maxage 365 -+ rotate 99 -+ missingok -+ compress -+ delaycompress -+ notifempty -+ size 1M -+ su radiusd radiusd - nocreate - } - diff --git a/freeradius-server.changes b/freeradius-server.changes index 194e31c..e9ae05a 100644 --- a/freeradius-server.changes +++ b/freeradius-server.changes @@ -1,3 +1,61 @@ +------------------------------------------------------------------- +Thu Oct 7 15:02:11 UTC 2021 - Adam Majer + +- Update to version 3.0.24 (jsc#SLE-21237) + Feature Improvements + * Add sanitizer options to configure script. + * Log information needed by Wireshark to decode TLS sessions. + * Allow more liberal SQL commands in rlm_sql_map. + * Update dictionary.apc, dictionary.h3c. + * Add new Acct-Status-Type Subsystem-On and Subsystem-Off See + dictionary.iana and + https://freeradius.org/rfc/acct_status_type_subsystem.html. + * Add reject_unknown_intermediate_ca. See mods-available/eap. + * Add dynamic loading of certificates via TLS-Session-Cert-File + See raddb/certs/realms/README.md. + * Add Server Name Indication (SNI) for outbound RadSec connections + See raddb/sites-available/tls, and the home server tls + configuration. + * Support SNI for inbound RadSec connections. Certificates will be + loaded from "realm_dir" in the "tls" section. SNI will be cached + in the TLS-Server-Name-Indication attribute. + * Preliminary support for haproxy "PROXY" protocol See sites-available/tls, + "proxy_protocol" and doc/antora/modules/howto/pages/protocols/proxy/. + * Generate parse errors in more circumstances when we know that + the configuration is wrong. + * Add "weeklycounter" to sample sqlcounter configuration. + * Add certificate attributes to the request list, even if + the certificates have expired. + * The Simultaneous-Use code is now IPv6 aware, and can deal + with NAS-IPv6-Address. + * Add dictionary.cambium. + + Bug Fixes + * Fix crash in trustrouter module (#4115) + * Fix crash in state handling. + * Don't alter global options in redhat logrotate scripts. + * EAP-FAST will print errors and continue, rather than exiting + when OpenSSL fails various internal sanity checks. + * Allow admin to manually change core limits, even when core + limits are disabled. + * Fix chunked rlm_rest HTTP body. Closes #4131 + * Many fixes around the SQL ippool queries.conf and schema + * Fix MySQL stored procedures. PR #4170 + * Rework connection pool management for corner cases Fixes #4161, #4162, #4163. + * Final fix for double free in #3188. + * Fix sqlcounter wrong memory free. PR #4192 + * Accept slow writes from proxies over TCP, which allows the server + to make more progress when it receives partial packets. + * Add 'weeklycounter' for rlm_sqlcounter. + * Outbound proxying over TCP / TLS is better able to deal with + partial TCP reads, and has fewer issues with slow networks. + * Fix wrong data-type of Acct-Delay-Time in rlm_unix. + * Fix EAP-FAST PAC lifetime calculation. + * Print correct encoded packet length when debugging. + +- disable python2 build +- freeradius-server-radiusd-logrotate.patch: upstreamed + ------------------------------------------------------------------- Sun Jun 27 15:43:02 UTC 2021 - Ferdinand Thiessen diff --git a/freeradius-server.spec b/freeradius-server.spec index 47e097f..1037f89 100644 --- a/freeradius-server.spec +++ b/freeradius-server.spec @@ -18,15 +18,9 @@ %define unitname radiusd Name: freeradius-server -Version: 3.0.23 +Version: 3.0.24 Release: 0 -%if 0%{?suse_version} >= 1500 -%bcond_with python2 -%else -%bcond_without python2 -%endif - %if 0%{?suse_version} > 1140 %bcond_without systemd %bcond_without libjson @@ -62,7 +56,6 @@ Source1: radiusd.service Source2: freeradius-tmpfiles.conf Patch0: freeradius-server-fix-perl-shbang.patch Patch1: freeradius-server-tmpfiles.patch -Patch2: freeradius-server-radiusd-logrotate.patch Patch3: freeradius-server-rcradiusd.patch Patch5: freeradius-server-rlm_sql_unixodbc-configure.patch Patch6: freeradius-server-radclient-init-error-buffer.patch @@ -102,9 +95,6 @@ BuildRequires: openssl-devel > 1.0 BuildRequires: pam-devel BuildRequires: perl BuildRequires: postgresql-devel -%if 0%{with python2} -BuildRequires: python-devel -%endif BuildRequires: python3-devel BuildRequires: sqlite3-devel BuildRequires: unixODBC-devel @@ -211,14 +201,6 @@ Requires: perl %description perl FreeRADIUS plugin providing Perl support. -%package python -Summary: Python support for freeradius -Group: System/Daemons -Requires: %{name} = %{version} - -%description python -FreeRADIUS plugin providing Python support. - %package python3 Summary: Python3 support for freeradius Group: System/Daemons @@ -283,9 +265,7 @@ export LDFLAGS="-pie" --without-rlm_rediswho \ --without-rlm_sql_oracle \ --without-rlm_securid \ -%if ! %{with python2} --without-rlm_python \ -%endif --with-rlm-python3-include-dir=%{_includedir}/python%{python3_version}%{py3_abiflags} \ %if ! %{with memcached} --without-rlm_cache_memcached \ @@ -359,9 +339,6 @@ rm -r %{buildroot}%{_sysconfdir}/raddb/mods-config/sql/ippool-dhcp/oracle %if ! %{with json} rm %{buildroot}%{_sysconfdir}/raddb/mods-available/rest %endif -%if ! %{with python2} -rm %{buildroot}%{_sysconfdir}/raddb/mods-available/python -%endif rm %{buildroot}%{_sysconfdir}/raddb/mods-config/sql/ippool/mongo/queries.conf rm %{buildroot}%{_sysconfdir}/raddb/mods-config/sql/main/mongo/queries.conf rm %{buildroot}%{_sysconfdir}/raddb/sites-available/coa-relay @@ -467,8 +444,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/%{unitname}.conf %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-config/sql/moonshot-targeted-ids/* %dir %attr(750,root,radiusd) /etc/raddb/mods-config/sql/moonshot-targeted-ids %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-config/preprocess/* -#%%dir %%attr(750,root,radiusd) %%{_sysconfdir}/raddb/mods-config/python -#%%attr(640,root,radiusd) %%config(noreplace) %%{_sysconfdir}/raddb/mods-config/python/radiusd.py %dir %attr(750,root,radiusd) %{_sysconfdir}/raddb/mods-config/sql/ippool-dhcp/mysql %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-config/sql/ippool-dhcp/mysql/schema.sql %dir %attr(750,root,radiusd) %{_sysconfdir}/raddb/mods-config/sql/ippool/postgresql @@ -568,9 +543,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/%{unitname}.conf %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-available/pap %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-available/passwd %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-available/preprocess -%if %{with python2} -%attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-available/python -%endif %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-available/python3 %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-available/radutmp %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-available/realm @@ -769,15 +741,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/%{unitname}.conf %{_libdir}/freeradius/rlm_perl.so -%if %{with python2} -%files python -%defattr(-,root,root) -%dir %attr(750,root,radiusd) %{_sysconfdir}/raddb/mods-config/python -%attr(750,root,radiusd) %{_sysconfdir}/raddb/mods-config/python/radiusd.py -%{_sysconfdir}/raddb/mods-config/python/example.py* -%{_libdir}/freeradius/rlm_python.so -%endif - %files python3 %defattr(-,root,root) %dir %attr(750,root,radiusd) %{_sysconfdir}/raddb/mods-config/python3 @@ -789,6 +752,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/%{unitname}.conf %defattr(-,root,root) %dir %attr(750,root,radiusd) %{_sysconfdir}/raddb/mods-config/sql/counter/mysql %attr(640,root,radiusd) %config(noreplace)%{_sysconfdir}/raddb/mods-config/sql/counter/mysql/dailycounter.conf +%attr(640,root,radiusd) %config(noreplace)%{_sysconfdir}/raddb/mods-config/sql/counter/mysql/weeklycounter.conf %attr(640,root,radiusd) %config(noreplace)%{_sysconfdir}/raddb/mods-config/sql/counter/mysql/expire_on_login.conf %attr(640,root,radiusd) %config(noreplace)%{_sysconfdir}/raddb/mods-config/sql/counter/mysql/monthlycounter.conf %attr(640,root,radiusd) %config(noreplace)%{_sysconfdir}/raddb/mods-config/sql/counter/mysql/noresetcounter.conf @@ -835,6 +799,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/%{unitname}.conf %defattr(-,root,root) %dir %attr(750,root,radiusd) %{_sysconfdir}/raddb/mods-config/sql/counter/postgresql %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-config/sql/counter/postgresql/dailycounter.conf +%attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-config/sql/counter/postgresql/weeklycounter.conf %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-config/sql/counter/postgresql/expire_on_login.conf %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-config/sql/counter/postgresql/monthlycounter.conf %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-config/sql/counter/postgresql/noresetcounter.conf @@ -877,6 +842,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/%{unitname}.conf %dir %attr(750,root,radiusd) %{_sysconfdir}/raddb/mods-config/sql/counter/sqlite %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-config/sql/counter/sqlite/dailycounter.conf +%attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-config/sql/counter/sqlite/weeklycounter.conf %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-config/sql/counter/sqlite/expire_on_login.conf %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-config/sql/counter/sqlite/monthlycounter.conf %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-config/sql/counter/sqlite/noresetcounter.conf From 79ab8ece2d469e9423b359c8ed03e8f21bd7b5bbeade5be797002030f3ff01cc Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Thu, 7 Oct 2021 16:11:57 +0000 Subject: [PATCH 2/4] - remove python2 build - drop references to SLE11 OBS-URL: https://build.opensuse.org/package/show/network/freeradius-server?expand=0&rev=148 --- freeradius-server.changes | 3 +- freeradius-server.spec | 80 +++------------------------------------ 2 files changed, 7 insertions(+), 76 deletions(-) diff --git a/freeradius-server.changes b/freeradius-server.changes index e9ae05a..7552f9e 100644 --- a/freeradius-server.changes +++ b/freeradius-server.changes @@ -53,7 +53,8 @@ Thu Oct 7 15:02:11 UTC 2021 - Adam Majer * Fix EAP-FAST PAC lifetime calculation. * Print correct encoded packet length when debugging. -- disable python2 build +- remove python2 build +- drop references to SLE11 - freeradius-server-radiusd-logrotate.patch: upstreamed ------------------------------------------------------------------- diff --git a/freeradius-server.spec b/freeradius-server.spec index 1037f89..7cac1d8 100644 --- a/freeradius-server.spec +++ b/freeradius-server.spec @@ -21,26 +21,12 @@ Name: freeradius-server Version: 3.0.24 Release: 0 -%if 0%{?suse_version} > 1140 -%bcond_without systemd -%bcond_without libjson -%define runpath /run -%else -%bcond_with systemd -%bcond_with libjson -%define runpath /var/run -%endif - # Disable FreeTDS on SLE12. We never shipped it enabled with FreeTDS. -%if 0%{?suse_version} > 1330 || ( 0%{?suse_version} > 1140 && 0%{?is_opensuse} ) -%bcond_without freetds -%else -%bcond_with freetds -%endif - %if 0%{?suse_version} > 1330 || 0%{?is_opensuse} +%bcond_without freetds %bcond_without memcached %else +%bcond_with freetds %bcond_with memcached %endif @@ -64,9 +50,6 @@ Patch8: freeradius-server-enable-python3.patch BuildRequires: apache2-devel BuildRequires: cyrus-sasl-devel BuildRequires: db-devel -%if 0%{?suse_version} > 0 && 0%{?suse_version} <= 1110 -BuildRequires: libdb-5_1-devel -%endif %if %{with freetds} BuildRequires: freetds-devel %endif @@ -78,9 +61,7 @@ BuildRequires: krb5-devel BuildRequires: libcom_err-devel BuildRequires: libcurl-devel BuildRequires: libidn-devel -%if %{with json} BuildRequires: libjson-devel -%endif %if %{with memcached} BuildRequires: libmemcached-devel %endif @@ -98,14 +79,7 @@ BuildRequires: postgresql-devel BuildRequires: python3-devel BuildRequires: sqlite3-devel BuildRequires: unixODBC-devel -%if 0%{?suse_version} > 1110 BuildRequires: pkgconfig(apr-1) -%else -BuildRequires: libapr1-devel -%endif -%if !%{with systemd} -Requires: %insserv_prereq -%endif Requires: %{name}-libs = %{version} Requires: coreutils Requires: pwdutils @@ -117,10 +91,8 @@ Provides: radiusd Obsoletes: freeradius < %{version} %{?libperl_requires} Conflicts: radiusd-livingston radiusd-cistron icradius -%if %{with systemd} BuildRequires: pkgconfig(systemd) %{?systemd_requires} -%endif #bsc#1055679 - freeradius-server does not provide winbind/AD auth BuildRequires: libwbclient-devel @@ -272,9 +244,6 @@ export LDFLAGS="-pie" %endif %if ! %{with freetds} --without-rlm_sql_freetds \ -%endif -%if ! %{with json} - --without-rlm_rest \ %endif --disable-silent-rules \ --disable-openssl-version-check @@ -299,19 +268,13 @@ install -d %{buildroot}%{_sysconfdir}/pam.d install -d %{buildroot}%{_sysconfdir}/logrotate.d install -m 644 suse/radiusd-pam %{buildroot}%{_sysconfdir}/pam.d/radiusd install -m 644 suse/radiusd-logrotate %{buildroot}%{_sysconfdir}/logrotate.d/radiusd -%if %{with systemd} mkdir -p %{buildroot}%{_tmpfilesdir} install -m 0644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/%{unitname}.conf install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{unitname}.service # name the rc script according to the systemd unit ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcradiusd -%else -install -d -m 755 %{buildroot}%{_sysconfdir}/init.d -install -m 744 suse/rcradiusd %{buildroot}%{_sysconfdir}/init.d/freeradius -ln -sf %{_sysconfdir}/init.d/freeradius %{buildroot}%{_sbindir}/rcfreeradius -%endif cp -al %{buildroot}%{_sbindir}/radiusd %{buildroot}%{_sbindir}/radrelay -install -D -d -m 0710 %{buildroot}%{runpath}/radiusd +install -D -d -m 0710 %{buildroot}%{_rundir}/radiusd mv -v doc/README doc/README.doc # remove unneeded stuff rm %{buildroot}%{_sysconfdir}/raddb/certs/*.crl @@ -336,9 +299,7 @@ rm -r %{buildroot}%{_sysconfdir}/raddb/mods-config/sql/dhcp/oracle rm -r %{buildroot}%{_sysconfdir}/raddb/mods-config/sql/main/oracle rm -r %{buildroot}%{_sysconfdir}/raddb/mods-config/sql/ippool/oracle rm -r %{buildroot}%{_sysconfdir}/raddb/mods-config/sql/ippool-dhcp/oracle -%if ! %{with json} -rm %{buildroot}%{_sysconfdir}/raddb/mods-available/rest -%endif +rm -r %{buildroot}%{_sysconfdir}/raddb/mods-available/python rm %{buildroot}%{_sysconfdir}/raddb/mods-config/sql/ippool/mongo/queries.conf rm %{buildroot}%{_sysconfdir}/raddb/mods-config/sql/main/mongo/queries.conf rm %{buildroot}%{_sysconfdir}/raddb/sites-available/coa-relay @@ -354,39 +315,19 @@ getent passwd radiusd >/dev/null || %{_sbindir}/useradd -r -g radiusd \ %{_bindir}/getent group winbind >/dev/null \ || %{_sbindir}/groupadd -r winbind # add radiusd to winbind group -%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1140 -%{_sbindir}/groupmod -A radiusd winbind -%else %{_bindir}/gpasswd -a radiusd winbind -%endif -%if %{with systemd} %service_add_pre %{unitname}.service -%endif %post -%if %{with systemd} %service_add_post %{unitname}.service systemd-tmpfiles --create %{_tmpfilesdir}/%{unitname}.conf -%else -%fillup_and_insserv freeradius -%endif %preun -%if %{with systemd} %service_del_preun %{unitname}.service -%else -%insserv_cleanup -%restart_on_update freeradius -%endif %postun -%if %{with systemd} %service_del_postun %{unitname}.service -%else -%insserv_cleanup -%restart_on_update freeradius -%endif %files doc %defattr(-,root,root) @@ -401,12 +342,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/%{unitname}.conf # SUSE %config %{_sysconfdir}/pam.d/radiusd %config %{_sysconfdir}/logrotate.d/radiusd -%if %{with systemd} %{_sbindir}/rcradiusd -%else -%config %{_sysconfdir}/init.d/freeradius -%{_sbindir}/rcfreeradius -%endif %dir %attr(755,radiusd,radiusd) %{_localstatedir}/lib/radiusd # configs %dir %attr(750,root,radiusd) %{_sysconfdir}/raddb @@ -428,10 +364,8 @@ systemd-tmpfiles --create %{_tmpfilesdir}/%{unitname}.conf %{_sysconfdir}/raddb/panic.gdb %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/certs/*.cnf %attr(750,root,radiusd) %{_sysconfdir}/raddb/certs/bootstrap -%if %{with systemd} %{_tmpfilesdir}/%{unitname}.conf %{_unitdir}/%{unitname}.service -%endif # mods-config %dir %attr(750,root,radiusd) %{_sysconfdir}/raddb/mods-config @@ -549,9 +483,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/%{unitname}.conf %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-available/redis %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-available/rediswho %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-available/replicate -%if %{with json} %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-available/rest -%endif %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-available/smbpasswd %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-available/smsotp %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-available/soh @@ -623,7 +555,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/%{unitname}.conf %config(noreplace) %{_sysconfdir}/raddb/users %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/templates.conf -%attr(710,radiusd,radiusd) %dir %ghost %{runpath}/radiusd +%attr(710,radiusd,radiusd) %dir %ghost %{_rundir}/radiusd # binaries %defattr(-,root,root) %{_sbindir}/checkrad @@ -684,9 +616,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/%{unitname}.conf %{_libdir}/freeradius/rlm_radutmp.so %{_libdir}/freeradius/rlm_realm.so %{_libdir}/freeradius/rlm_replicate.so -%if %{with json} %{_libdir}/freeradius/rlm_rest.so -%endif %{_libdir}/freeradius/rlm_soh.so %{_libdir}/freeradius/rlm_sometimes.so %{_libdir}/freeradius/rlm_sql.so From 2a57c2d6484e5cbf7d97bfd3a2450c69f638aad2ac80afc269b0d3b44d5b7d8f Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Thu, 7 Oct 2021 16:47:23 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/network/freeradius-server?expand=0&rev=149 --- freeradius-server.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeradius-server.spec b/freeradius-server.spec index 7cac1d8..e24bb1a 100644 --- a/freeradius-server.spec +++ b/freeradius-server.spec @@ -299,7 +299,7 @@ rm -r %{buildroot}%{_sysconfdir}/raddb/mods-config/sql/dhcp/oracle rm -r %{buildroot}%{_sysconfdir}/raddb/mods-config/sql/main/oracle rm -r %{buildroot}%{_sysconfdir}/raddb/mods-config/sql/ippool/oracle rm -r %{buildroot}%{_sysconfdir}/raddb/mods-config/sql/ippool-dhcp/oracle -rm -r %{buildroot}%{_sysconfdir}/raddb/mods-available/python +rm %{buildroot}%{_sysconfdir}/raddb/mods-available/python rm %{buildroot}%{_sysconfdir}/raddb/mods-config/sql/ippool/mongo/queries.conf rm %{buildroot}%{_sysconfdir}/raddb/mods-config/sql/main/mongo/queries.conf rm %{buildroot}%{_sysconfdir}/raddb/sites-available/coa-relay From f32c5e805cfb3fa34d2b50e7f7bf28c2e3d1dfc1b916028316b88bcbcbd83044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Str=C3=B6der?= Date: Thu, 7 Oct 2021 21:50:17 +0000 Subject: [PATCH 4/4] Accepting request 924111 from home:stroeder:branches:network update to 3.0.25 OBS-URL: https://build.opensuse.org/request/show/924111 OBS-URL: https://build.opensuse.org/package/show/network/freeradius-server?expand=0&rev=150 --- freeradius-server-3.0.24.tar.bz2 | 3 --- freeradius-server-3.0.24.tar.bz2.sig | Bin 591 -> 0 bytes freeradius-server-3.0.25.tar.bz2 | 3 +++ freeradius-server-3.0.25.tar.bz2.sig | Bin 0 -> 591 bytes freeradius-server.changes | 9 +++++++++ freeradius-server.spec | 6 ++++-- 6 files changed, 16 insertions(+), 5 deletions(-) delete mode 100644 freeradius-server-3.0.24.tar.bz2 delete mode 100644 freeradius-server-3.0.24.tar.bz2.sig create mode 100644 freeradius-server-3.0.25.tar.bz2 create mode 100644 freeradius-server-3.0.25.tar.bz2.sig diff --git a/freeradius-server-3.0.24.tar.bz2 b/freeradius-server-3.0.24.tar.bz2 deleted file mode 100644 index 874e623..0000000 --- a/freeradius-server-3.0.24.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7bb0f25bec869f71f81ff6ce0be13181ac75394857e919382220240f3b6f52ef -size 3400689 diff --git a/freeradius-server-3.0.24.tar.bz2.sig b/freeradius-server-3.0.24.tar.bz2.sig deleted file mode 100644 index c6c0b408d59d4866970672dbdd14f7d7b1b577aaaaeb46c501eceb0460b29744..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 591 zcmV-V0%V3uWw9l5R!?ucDw7~_{3_4Pd!U1h9Tw$-R4Vj{-BwH_(IbUYUbWGCbp!iGkRzs+-M#WH^%W&lrCnLHdE-z3xm)^=-}s;3H-Uv zN9Jp0B)UZV5z+okOfkq(}`_G~BR#^yJ$SBq#AZBqnOIBEI# ddF$+CyLI1Yj#6;EAohCD3MhuQ_AJf%La@1vAWZ-O diff --git a/freeradius-server-3.0.25.tar.bz2 b/freeradius-server-3.0.25.tar.bz2 new file mode 100644 index 0000000..cb083bd --- /dev/null +++ b/freeradius-server-3.0.25.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc158cdab4a705b179b1a91cd72473006ef4dfb570b0d097db6c9c34049a4509 +size 3402380 diff --git a/freeradius-server-3.0.25.tar.bz2.sig b/freeradius-server-3.0.25.tar.bz2.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..3451b83dcb46b61d5a016687374937c846640cfa32dc9da717a1186f42f088f6 GIT binary patch literal 591 zcmV-V03P6aRj92p0Hqp=ByMT~rOBN&MHsZ$htZ8CVIg3lCq=yPpniwvs3g0R zzpE6-?O{f(j>n)Oa`@z{LRWN#dFEV9Di#4Lr9B^jDB06}WZ=j z-OX)EDMp8wuh8eE#m?VqlQ?aLyLFf9wFST7VopGt4<Q4G%In>(gzWZfZ z7wTkS|E}1nNH6TOI~gy)Q@X<16Ju)6k(IXTj=n_kOa*dT+$?z!=(&MY(hL1e6-5!g zEeFWYao&S;@E)8w7CGLoT66EBsIH;=>5^XWAs_eeJmF0SVAS5u>-{1#{Ot0rsl|PU z+-49A^M6ay)$Bzdy-8Q0d{smaQzSsaS7GFS0ajiRDaTaY)ZIWlvE9$k| z?o_w|qw--!%D}b;3=Z`Lz0vkOzZk74WSu^ba1}lw)S1=#sW&c>^L&xGyzC2Acc5p# zP|WmXD}uh>=cH--v)VRz$hEZof%j`pK47os;k$Yh84Q= + +- update to 3.0.25: + * `correct_escapes` has been added back into the default configuration. + * A segfault when trying to proxy to zombie home servers has been fixed. + * A number of other small bugs and compiler warnings were fixed. + * Added support for building with PostgreSQL 14. + ------------------------------------------------------------------- Thu Oct 7 15:02:11 UTC 2021 - Adam Majer diff --git a/freeradius-server.spec b/freeradius-server.spec index e24bb1a..6cdddd2 100644 --- a/freeradius-server.spec +++ b/freeradius-server.spec @@ -18,7 +18,7 @@ %define unitname radiusd Name: freeradius-server -Version: 3.0.24 +Version: 3.0.25 Release: 0 # Disable FreeTDS on SLE12. We never shipped it enabled with FreeTDS. @@ -90,7 +90,9 @@ Provides: freeradius = %{version} Provides: radiusd Obsoletes: freeradius < %{version} %{?libperl_requires} -Conflicts: radiusd-livingston radiusd-cistron icradius +Conflicts: icradius +Conflicts: radiusd-cistron +Conflicts: radiusd-livingston BuildRequires: pkgconfig(systemd) %{?systemd_requires}