From 1bf87289236007ac019ade530075a5c6a220682c Mon Sep 17 00:00:00 2001 From: John Dennis Date: Mon, 3 Oct 2011 15:04:20 -0400 Subject: [PATCH] Upgrade to latest upstream release, 2.1.12 --- .gitignore | 1 + freeradius-cert-config.patch | 27 ++++++++-------- freeradius.spec | 62 +++++++++++++++++++++++++++++++++--- sources | 2 +- 4 files changed, 74 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 49c9a03..97a00d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ freeradius-server-2.1.9.tar.bz2 /freeradius-server-2.1.10.tar.bz2 /freeradius-server-2.1.11.tar.bz2 +/freeradius-server-2.1.12.tar.bz2 diff --git a/freeradius-cert-config.patch b/freeradius-cert-config.patch index 03110ae..9967a15 100644 --- a/freeradius-cert-config.patch +++ b/freeradius-cert-config.patch @@ -1,6 +1,6 @@ -diff -u -r freeradius-server-2.1.11.orig/raddb/certs/ca.cnf freeradius-server-2.1.11/raddb/certs/ca.cnf ---- freeradius-server-2.1.11.orig/raddb/certs/ca.cnf 2011-06-20 10:57:14.000000000 -0400 -+++ freeradius-server-2.1.11/raddb/certs/ca.cnf 2011-06-21 18:42:02.000000000 -0400 +diff -r -u freeradius-server-2.1.12.orig/raddb/certs/ca.cnf freeradius-server-2.1.12/raddb/certs/ca.cnf +--- freeradius-server-2.1.12.orig/raddb/certs/ca.cnf 2011-09-07 06:59:21.000000000 -0400 ++++ freeradius-server-2.1.12/raddb/certs/ca.cnf 2011-09-07 10:28:28.000000000 -0400 @@ -14,9 +14,9 @@ RANDFILE = $dir/.rand name_opt = ca_default @@ -13,9 +13,9 @@ diff -u -r freeradius-server-2.1.11.orig/raddb/certs/ca.cnf freeradius-server-2. preserve = no policy = policy_match -diff -u -r freeradius-server-2.1.11.orig/raddb/certs/client.cnf freeradius-server-2.1.11/raddb/certs/client.cnf ---- freeradius-server-2.1.11.orig/raddb/certs/client.cnf 2011-06-20 10:57:14.000000000 -0400 -+++ freeradius-server-2.1.11/raddb/certs/client.cnf 2011-06-21 18:42:02.000000000 -0400 +diff -r -u freeradius-server-2.1.12.orig/raddb/certs/client.cnf freeradius-server-2.1.12/raddb/certs/client.cnf +--- freeradius-server-2.1.12.orig/raddb/certs/client.cnf 2011-09-07 06:59:21.000000000 -0400 ++++ freeradius-server-2.1.12/raddb/certs/client.cnf 2011-09-07 10:28:28.000000000 -0400 @@ -14,9 +14,9 @@ RANDFILE = $dir/.rand name_opt = ca_default @@ -28,9 +28,9 @@ diff -u -r freeradius-server-2.1.11.orig/raddb/certs/client.cnf freeradius-serve preserve = no policy = policy_match -diff -u -r freeradius-server-2.1.11.orig/raddb/certs/server.cnf freeradius-server-2.1.11/raddb/certs/server.cnf ---- freeradius-server-2.1.11.orig/raddb/certs/server.cnf 2011-06-20 10:57:14.000000000 -0400 -+++ freeradius-server-2.1.11/raddb/certs/server.cnf 2011-06-21 18:42:02.000000000 -0400 +diff -r -u freeradius-server-2.1.12.orig/raddb/certs/server.cnf freeradius-server-2.1.12/raddb/certs/server.cnf +--- freeradius-server-2.1.12.orig/raddb/certs/server.cnf 2011-09-07 06:59:21.000000000 -0400 ++++ freeradius-server-2.1.12/raddb/certs/server.cnf 2011-09-07 10:28:28.000000000 -0400 @@ -14,9 +14,9 @@ RANDFILE = $dir/.rand name_opt = ca_default @@ -43,9 +43,9 @@ diff -u -r freeradius-server-2.1.11.orig/raddb/certs/server.cnf freeradius-serve preserve = no policy = policy_match -diff -u -r freeradius-server-2.1.11.orig/raddb/eap.conf freeradius-server-2.1.11/raddb/eap.conf ---- freeradius-server-2.1.11.orig/raddb/eap.conf 2011-06-20 10:57:14.000000000 -0400 -+++ freeradius-server-2.1.11/raddb/eap.conf 2011-06-22 10:40:42.000000000 -0400 +diff -r -u freeradius-server-2.1.12.orig/raddb/eap.conf freeradius-server-2.1.12/raddb/eap.conf +--- freeradius-server-2.1.12.orig/raddb/eap.conf 2011-09-07 06:59:21.000000000 -0400 ++++ freeradius-server-2.1.12/raddb/eap.conf 2011-09-07 10:28:28.000000000 -0400 @@ -281,7 +281,11 @@ # for the server to print out an error message, # and refuse to start. @@ -58,4 +58,5 @@ diff -u -r freeradius-server-2.1.11.orig/raddb/eap.conf freeradius-server-2.1.11 + #make_cert_command = "${certdir}/bootstrap" # - # Session resumption / fast reauthentication + # Elliptical cryptography configuration +Only in freeradius-server-2.1.12/raddb: eap.conf.orig diff --git a/freeradius.spec b/freeradius.spec index 3571930..99d6016 100644 --- a/freeradius.spec +++ b/freeradius.spec @@ -1,7 +1,7 @@ Summary: High-performance and highly configurable free RADIUS server Name: freeradius -Version: 2.1.11 -Release: 7%{?dist} +Version: 2.1.12 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Daemons URL: http://www.freeradius.org/ @@ -216,7 +216,7 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/dialup_admin/sql/oracle rm -rf $RPM_BUILD_ROOT/%{_datadir}/dialup_admin/lib/sql/oracle rm -rf $RPM_BUILD_ROOT/%{_datadir}/dialup_admin/lib/sql/drivers/oracle -# remove header files, we don't ship a devel package and the +# remove header files, we don't ship a devel package and the # headers have multilib conflicts rm -rf $RPM_BUILD_ROOT/%{_includedir} @@ -252,7 +252,7 @@ exit 0 %post if [ $1 -eq 1 ]; then # install - # Initial installation + # Initial installation /bin/systemctl daemon-reload >/dev/null 2>&1 || : if [ ! -e /etc/raddb/certs/server.pem ]; then /sbin/runuser -g radiusd -c 'umask 007; /etc/raddb/certs/bootstrap' > /dev/null 2>&1 @@ -540,7 +540,14 @@ exit 0 %doc %{_mandir}/man1/radtest.1.gz %doc %{_mandir}/man1/radwho.1.gz %doc %{_mandir}/man1/radzap.1.gz +%doc %{_mandir}/man1/smbencrypt.1.gz +%doc %{_mandir}/man5/checkrad.5.gz +%doc %{_mandir}/man8/radconf2xml.8.gz +%doc %{_mandir}/man8/radcrypt.8.gz +%doc %{_mandir}/man8/radsniff.8.gz %doc %{_mandir}/man8/radsqlrelay.8.gz +%doc %{_mandir}/man8/rlm_dbm_cat.8.gz +%doc %{_mandir}/man8/rlm_dbm_parse.8.gz %doc %{_mandir}/man8/rlm_ippool_tool.8.gz %files krb5 @@ -581,6 +588,53 @@ exit 0 %{_libdir}/freeradius/rlm_sql_unixodbc-%{version}.so %changelog +* Mon Oct 3 2011 John Dennis - 2.1.12-1 +- Upgrade to latest upstream release: 2.1.12 +- Upstream changelog for 2.1.12: + Feature improvements + * Updates to dictionary.erx, dictionary.siemens, dictionary.starent, + dictionary.starent.vsa1, dictionary.zyxel, added dictionary.symbol + * Added support for PCRE from Phil Mayers + * Configurable file permission in rlm_linelog + * Added "relaxed" option to rlm_attr_filter. This copies attributes + if at least one match occurred. + * Added documentation on dynamic clients. + See raddb/modules/dynamic_clients. + * Added support for elliptical curve cryptography. + See ecdh_curve in raddb/eap.conf. + * Added support for 802.1X MIBs in checkrad + * Added support for %{rand:...}, which generates a uniformly + distributed number between 0 and the number you specify. + * Created "man" pages for all installed commands, and documented + options for all commands. Patch from John Dennis. + * Allow radsniff to decode encrypted VSAs and CoA packets. + Patch from Bjorn Mork. + * Always send Message-Authenticator in radtest. Patch from John Dennis. + radclient continues to be more flexible. + * Updated Oracle schema and queries + * Added SecurID module. See src/modules/rlm_securid/README + + Bug fixes + * Fix memory leak in rlm_detail + * Fix "failed to insert event" + * Allow virtual servers to be reloaded on HUP. + It no longer complains about duplicate virtual servers. + * Fix %{string:...} expansion + * Fix "server closed socket" loop in radmin + * Set ownership of control socket when starting up + * Always allow root to connect to control socket, even if + "uid" is set. They're root. They can already do anything. + * Save all attributes in Access-Accept when proxying inner-tunnel + EAP-MSCHAPv2 + * Fixes for DHCP relaying. + * Check certificate validity when using OCSP. + * Updated Oracle "configure" script + * Fixed typos in dictionary.alvarion + * WARNING on potential proxy loop. + * Be more aggressive about clearing old requests from the + internal queue + * Don't open network sockets when using -C + * Wed Sep 21 2011 Tom Callaway - 2.1.11-7 - restore defattr customization in the main package diff --git a/sources b/sources index 98c709e..c9b2a89 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -96b21a95117d8ebde689c4c13c028d30 freeradius-server-2.1.11.tar.bz2 +862d3a2c11011e61890ba84fa636ed8c freeradius-server-2.1.12.tar.bz2