[freeradius/f21] Upgrade to upstream 3.0.4rc2 release
Nikolai Kondrashov
nkondras at fedoraproject.org
Tue Oct 14 15:49:18 UTC 2014
commit cb77e551082aecce908c9de384f88535dab98090
Author: Nikolai Kondrashov <Nikolai.Kondrashov at redhat.com>
Date: Mon Sep 8 13:04:08 2014 +0300
Upgrade to upstream 3.0.4rc2 release
Resolves Bug#1133959.
.gitignore | 1 +
freeradius-case-insensitive-matching.patch | 396 ----------------------------
freeradius-foreach.patch | 107 --------
freeradius-perl-string-escaping.patch | 28 --
freeradius-redhat-config.patch | 53 +++--
freeradius-segfault-on-config-parse.patch | 19 --
freeradius.spec | 23 +-
sources | 2 +-
8 files changed, 47 insertions(+), 582 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index db8ed86..601eafd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
/freeradius-server-3.0.1.tar.bz2
/freeradius-server-3.0.2.tar.bz2
/freeradius-server-3.0.3.tar.bz2
+/freeradius-server-3.0.4rc2.tar.bz2
diff --git a/freeradius-redhat-config.patch b/freeradius-redhat-config.patch
index 3a7e428..ecbd9bf 100644
--- a/freeradius-redhat-config.patch
+++ b/freeradius-redhat-config.patch
@@ -1,38 +1,50 @@
-diff -r -u freeradius-server-3.0.0.orig/raddb/mods-available/eap freeradius-server-3.0.0/raddb/mods-available/eap
---- freeradius-server-3.0.0.orig/raddb/mods-available/eap 2013-10-07 15:49:47.000000000 -0400
-+++ freeradius-server-3.0.0/raddb/mods-available/eap 2013-11-26 17:48:56.081183431 -0500
-@@ -435,7 +435,7 @@
+From af06b80f84b5e95153abc7ef55dedaa614eb6b04 Mon Sep 17 00:00:00 2001
+From: Nikolai Kondrashov <Nikolai.Kondrashov at redhat.com>
+Date: Mon, 8 Sep 2014 12:32:13 +0300
+Subject: [PATCH 1/1] Adjust configuration to fit Red Hat specifics
+
+---
+ raddb/mods-available/eap | 4 ++--
+ raddb/radiusd.conf.in | 7 +++----
+ 2 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/raddb/mods-available/eap b/raddb/mods-available/eap
+index 9ac2a74..86141d6 100644
+--- a/raddb/mods-available/eap
++++ b/raddb/mods-available/eap
+@@ -435,7 +435,7 @@ eap {
#
# You should also delete all of the files
# in the directory when the server starts.
-- # tmpdir = /tmp/radiusd
-+ # tmpdir = /var/run/radiusd/tmp
-
+- # tmpdir = /tmp/radiusd
++ # tmpdir = /var/run/radiusd/tmp
+
# The command used to verify the client cert.
# We recommend using the OpenSSL command-line
-@@ -449,7 +449,7 @@
+@@ -449,7 +449,7 @@ eap {
# in PEM format. This file is automatically
# deleted by the server when the command
# returns.
-- # client = "/path/to/openssl verify -CApath ${..ca_path} %{TLS-Client-Cert-Filename}"
-+ # client = "/usr/bin/openssl verify -CApath ${..ca_path} %{TLS-Client-Cert-Filename}"
+- # client = "/path/to/openssl verify -CApath ${..ca_path} %{TLS-Client-Cert-Filename}"
++ # client = "/usr/bin/openssl verify -CApath ${..ca_path} %{TLS-Client-Cert-Filename}"
}
-
+
#
-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-11-26 17:24:52.263467793 -0500
-@@ -71,8 +71,7 @@
+diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in
+index 307ae10..7cf71be 100644
+--- a/raddb/radiusd.conf.in
++++ b/raddb/radiusd.conf.in
+@@ -70,8 +70,7 @@ certdir = ${confdir}/certs
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 @@
+@@ -415,8 +414,8 @@ security {
# member. This can allow for some finer-grained access
# controls.
#
@@ -40,6 +52,9 @@ diff -r -u freeradius-server-3.0.0.orig/raddb/radiusd.conf.in freeradius-server-
-# group = radius
+ user = radiusd
+ group = radiusd
-
+
# Core dumps are a bad thing. This should only be set to
# 'yes' if you're debugging a problem with the server.
+--
+2.1.0
+
diff --git a/freeradius.spec b/freeradius.spec
index 020ea47..f30635f 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.3
-Release: 4%{?dist}
+Version: 3.0.4
+Release: 0.1.rc2%{?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}
+%global dist_base freeradius-server-%{version}rc2
Source0: ftp://ftp.freeradius.org/pub/radius/%{dist_base}.tar.bz2
Source100: radiusd.service
@@ -23,11 +23,7 @@ Source104: freeradius-tmpfiles.conf
Patch1: freeradius-redhat-config.patch
Patch2: freeradius-postgres-sql.patch
-Patch3: freeradius-case-insensitive-matching.patch
-Patch4: freeradius-perl-string-escaping.patch
-Patch5: freeradius-segfault-on-config-parse.patch
-Patch6: freeradius-foreach.patch
-Patch7: freeradius-heartbleed-confirm.patch
+Patch3: freeradius-heartbleed-confirm.patch
%global docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
@@ -187,10 +183,6 @@ This plugin provides the unixODBC support for the FreeRADIUS server project.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
%build
# Force compile/link options, extra security for network facing daemon
@@ -265,6 +257,7 @@ rm -rf $RPM_BUILD_ROOT/etc/raddb/mods-config/sql/main/oracle
rm $RPM_BUILD_ROOT/%{_sysconfdir}/raddb/mods-available/unbound
rm $RPM_BUILD_ROOT/%{_sysconfdir}/raddb/mods-config/unbound/default.conf
+rm $RPM_BUILD_ROOT/%{_sysconfdir}/raddb/mods-available/couchbase
# remove unsupported config files
rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/raddb/experimental.conf
@@ -412,6 +405,7 @@ exit 0
%attr(640,root,radiusd) %config(noreplace) /etc/raddb/sites-available/copy-acct-to-home-server
%attr(640,root,radiusd) %config(noreplace) /etc/raddb/sites-available/buffered-sql
%attr(640,root,radiusd) %config(noreplace) /etc/raddb/sites-available/tls
+%attr(640,root,radiusd) %config(noreplace) /etc/raddb/sites-available/channel_bindings
# sites-enabled
# symlink: /etc/raddb/sites-enabled/xxx -> ../sites-available/xxx
@@ -671,6 +665,7 @@ exit 0
%files python
%dir %attr(750,root,radiusd) /etc/raddb/mods-config/python
/etc/raddb/mods-config/python/example.py*
+/etc/raddb/mods-config/python/radiusd.py*
%{_libdir}/freeradius/rlm_python.so
%files mysql
@@ -768,6 +763,10 @@ exit 0
%{_libdir}/freeradius/rlm_sql_unixodbc.so
%changelog
+* Mon Sep 8 2014 Nikolai Kondrashov <Nikolai.Kondrashov at redhat.com> - 3.0.4-0.1.rc2
+- Upgrade to upstream 3.0.4-rc2 release.
+ See upstream ChangeLog for details (in freeradius-doc subpackage).
+
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index 227a6ce..99085a7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6093be8d2a962035d6b1111789b3447c freeradius-server-3.0.3.tar.bz2
+5035eb3a28aeba1fc20da9b2c01ce16e freeradius-server-3.0.4rc2.tar.bz2
More information about the scm-commits
mailing list