diff --git a/.gitignore b/.gitignore index 60422df..e4ee075 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /freeradius-server-2.2.0.tar.bz2 /freeradius-server-release_3_0_0_rc0.tar.gz /freeradius-server-release_3_0_0_rc1.tar.gz +/freeradius-server-3.0.0.tar.bz2 diff --git a/freeradius-redhat-config.patch b/freeradius-redhat-config.patch index 3af3e8f..6b3ce4e 100644 --- a/freeradius-redhat-config.patch +++ b/freeradius-redhat-config.patch @@ -1,6 +1,17 @@ ---- freeradius-server-release_3_0_0_rc0.orig/raddb/radiusd.conf.in 2013-07-11 11:09:02.000000000 -0400 -+++ freeradius-server-release_3_0_0_rc0/raddb/radiusd.conf.in 2013-07-20 07:51:22.811104727 -0400 -@@ -376,8 +376,8 @@ +diff -r -u freeradius-server-3.0.0.orig/raddb/radiusd.conf.in freeradius-server-3.0.0/raddb/radiusd.conf.in +--- freeradius-server-3.0.0.orig/raddb/radiusd.conf.in 2013-10-07 15:49:47.000000000 -0400 ++++ freeradius-server-3.0.0/raddb/radiusd.conf.in 2013-10-09 14:10:18.595543308 -0400 +@@ -71,8 +71,7 @@ + cadir = ${confdir}/certs + run_dir = ${localstatedir}/run/${name} + +-# Should likely be ${localstatedir}/lib/radiusd +-db_dir = ${raddbdir} ++db_dir = ${localstatedir}/lib/radiusd + + # + # libdir: Where to find the rlm_* modules. +@@ -376,8 +375,8 @@ # member. This can allow for some finer-grained access # controls. # @@ -11,3 +22,4 @@ # Core dumps are a bad thing. This should only be set to # 'yes' if you're debugging a problem with the server. +Only in freeradius-server-3.0.0/raddb: radiusd.conf.in~ diff --git a/freeradius.spec b/freeradius.spec index 9752316..fdd4b6a 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.0 -Release: 0.4.rc1%{?dist} +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Daemons URL: http://www.freeradius.org/ @@ -13,10 +13,9 @@ URL: http://www.freeradius.org/ %global HAVE_EC_CRYPTO 0 %endif -%global dist_base freeradius-server-release_3_0_0_rc1 +%global dist_base freeradius-server-3.0.0 -Source0: %{dist_base}.tar.gz -#FIXME, after 3.0 is released Source0: ftp://ftp.freeradius.org/pub/radius/%{dist_base}.tar.bz2 +Source0: ftp://ftp.freeradius.org/pub/radius/%{dist_base}.tar.bz2 Source100: radiusd.service Source102: freeradius-logrotate Source103: freeradius-pam-conf @@ -723,6 +722,11 @@ exit 0 %{_libdir}/freeradius/rlm_sql_unixodbc.so %changelog +* Sun Oct 13 2013 John Dennis - 3.0.0-1 +- Offical 3.0 gold release from upstream +- resolves: bug#1016873 +- resolves: bug#891297 + * Sun Sep 8 2013 John Dennis - 3.0.0-0.4.rc1 - upgrade to second 3.0 release candidate rc1 diff --git a/sources b/sources index f200f6d..9ae467b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -59d2a59fd52445cf017dcad03d8a02e1 freeradius-server-release_3_0_0_rc1.tar.gz +e805282ff8fc2b273c23e44967322002 freeradius-server-3.0.0.tar.bz2