From 4004751c5fda31515fac54fbb7a1aa9221ceb7ea Mon Sep 17 00:00:00 2001 From: Nikolai Kondrashov Date: Mon, 15 Sep 2014 10:45:27 +0300 Subject: [PATCH] Upgrade to upstream 3.0.4 release Resolves Bug#1099620. --- .gitignore | 1 + freeradius-redhat-config.patch | 8 ++++---- freeradius.spec | 11 +++++++++-- sources | 2 +- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 601eafd..1761974 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /freeradius-server-3.0.2.tar.bz2 /freeradius-server-3.0.3.tar.bz2 /freeradius-server-3.0.4rc2.tar.bz2 +/freeradius-server-3.0.4.tar.bz2 diff --git a/freeradius-redhat-config.patch b/freeradius-redhat-config.patch index ecbd9bf..7baf80d 100644 --- a/freeradius-redhat-config.patch +++ b/freeradius-redhat-config.patch @@ -1,4 +1,4 @@ -From af06b80f84b5e95153abc7ef55dedaa614eb6b04 Mon Sep 17 00:00:00 2001 +From 61aa3696bb0179a8296e4f389f34ffc31424dbf1 Mon Sep 17 00:00:00 2001 From: Nikolai Kondrashov Date: Mon, 8 Sep 2014 12:32:13 +0300 Subject: [PATCH 1/1] Adjust configuration to fit Red Hat specifics @@ -9,10 +9,10 @@ Subject: [PATCH 1/1] Adjust configuration to fit Red Hat specifics 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/raddb/mods-available/eap b/raddb/mods-available/eap -index 9ac2a74..86141d6 100644 +index 6938171..95ef666 100644 --- a/raddb/mods-available/eap +++ b/raddb/mods-available/eap -@@ -435,7 +435,7 @@ eap { +@@ -430,7 +430,7 @@ eap { # # You should also delete all of the files # in the directory when the server starts. @@ -21,7 +21,7 @@ index 9ac2a74..86141d6 100644 # The command used to verify the client cert. # We recommend using the OpenSSL command-line -@@ -449,7 +449,7 @@ eap { +@@ -444,7 +444,7 @@ eap { # in PEM format. This file is automatically # deleted by the server when the command # returns. diff --git a/freeradius.spec b/freeradius.spec index ea5bb5c..7caddfa 100644 --- a/freeradius.spec +++ b/freeradius.spec @@ -1,7 +1,7 @@ Summary: High-performance and highly configurable free RADIUS server Name: freeradius Version: 3.0.4 -Release: 0.2.rc2%{?dist} +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Daemons URL: http://www.freeradius.org/ @@ -13,7 +13,7 @@ URL: http://www.freeradius.org/ %global HAVE_EC_CRYPTO 0 %endif -%global dist_base freeradius-server-%{version}rc2 +%global dist_base freeradius-server-%{version} Source0: ftp://ftp.freeradius.org/pub/radius/%{dist_base}.tar.bz2 Source100: radiusd.service @@ -512,6 +512,7 @@ exit 0 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/policy.d/canonicalization %attr(640,root,radiusd) %config(noreplace) /etc/raddb/policy.d/control %attr(640,root,radiusd) %config(noreplace) /etc/raddb/policy.d/cui +%attr(640,root,radiusd) %config(noreplace) /etc/raddb/policy.d/debug %attr(640,root,radiusd) %config(noreplace) /etc/raddb/policy.d/dhcp %attr(640,root,radiusd) %config(noreplace) /etc/raddb/policy.d/eap %attr(640,root,radiusd) %config(noreplace) /etc/raddb/policy.d/filter @@ -684,6 +685,7 @@ 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/queries.conf +%attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-config/sql/ippool-dhcp/mysql/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/setup.sql @@ -762,6 +764,11 @@ exit 0 %{_libdir}/freeradius/rlm_sql_unixodbc.so %changelog +* Mon Sep 15 2014 Nikolai Kondrashov - 3.0.4-1 +- Upgrade to upstream 3.0.4 release. + See upstream ChangeLog for details (in freeradius-doc subpackage). +- Resolves: Bug#1099620 + * Tue Sep 09 2014 Jitka Plesnikova - 3.0.4-0.2.rc2 - Perl 5.20 mass diff --git a/sources b/sources index 99085a7..f6fef59 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5035eb3a28aeba1fc20da9b2c01ce16e freeradius-server-3.0.4rc2.tar.bz2 +5457f10d006767e77541b87049f0a7d2 freeradius-server-3.0.4.tar.bz2