From 172334166678d04894cf32eb8eda65148c2e6506 Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Tue, 1 Nov 2011 21:05:41 +0100 Subject: [PATCH] freeradius: Update to 2.1.12. Reference #281. --- freeradius/freeradius.nm | 55 +++++++-------- .../freeradius-2.1.6-cert-config.patch | 68 ------------------- .../patches/freeradius-cert-config.patch | 62 +++++++++++++++++ 3 files changed, 88 insertions(+), 97 deletions(-) delete mode 100644 freeradius/patches/freeradius-2.1.6-cert-config.patch create mode 100644 freeradius/patches/freeradius-cert-config.patch diff --git a/freeradius/freeradius.nm b/freeradius/freeradius.nm index e780786ff..a56d7804b 100644 --- a/freeradius/freeradius.nm +++ b/freeradius/freeradius.nm @@ -4,8 +4,8 @@ ############################################################################### name = freeradius-server -version = 2.1.9 -release = 2 +version = 2.1.12 +release = 1 groups = System/Daemons url = http://www.freeradius.org @@ -13,14 +13,14 @@ license = GPLv2+ and LGPLv2+ summary = High-performance and highly configurable free RADIUS server. description - The FreeRADIUS Server Project is a high performance and highly \ - configurable GPL'd free RADIUS server. \ - FreeRADIUS is an Internet authentication daemon, which implements \ - the RADIUS protocol, as defined in RFC 2865. It allows \ + The FreeRADIUS Server Project is a high performance and highly + configurable GPL'd free RADIUS server. + FreeRADIUS is an Internet authentication daemon, which implements + the RADIUS protocol, as defined in RFC 2865. It allows Network Access Servers to perform authentication for dial-up users. end -source_dl = +source_dl = ftp://ftp.freeradius.org/pub/freeradius/ build requires @@ -32,32 +32,29 @@ build perl end - build - ./configure \ - %{CONFIGURE_ARCH} \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libdir=/usr/lib/freeradius \ - --localstatedir=/var \ - --with-system-libtool \ - --with-threads \ - --with-thread-pool \ - --disable-ltdl-install \ - --with-gnu-ld \ - --without-rlm_eap_ikev2 \ - --without-rlm_sql_iodbc \ - --without-rlm_sql_firebird \ - --without-rlm_sql_db2 \ - --without-rlm_sql_oracle + PARALLELISMFLAGS = # Disabled - make LIBTOOL="libtool --tag=CC" #%{PARALLELISMFLAGS} - end + configure_options +=\ + %{CONFIGURE_ARCH} \ + --sysconfdir=/etc \ + --libdir=/usr/lib/freeradius \ + --localstatedir=/var \ + --with-system-libtool \ + --with-threads \ + --with-thread-pool \ + --disable-ltdl-install \ + --with-gnu-ld \ + --without-rlm_eap_ikev2 \ + --without-rlm_sql_iodbc \ + --without-rlm_sql_firebird \ + --without-rlm_sql_db2 \ + --without-rlm_sql_oracle + + make_build_targets = LINK_MODE=-pie install - R=%{BUILDROOT} make install - end + make install R=%{BUILDROOT} - install_cmds mkdir -pv %{BUILDROOT}/etc/logrotate.d/ cp -vf %{DIR_SOURCE}/logrotate/freeradius %{BUILDROOT}/etc/logrotate.d/ end diff --git a/freeradius/patches/freeradius-2.1.6-cert-config.patch b/freeradius/patches/freeradius-2.1.6-cert-config.patch deleted file mode 100644 index 8390beb78..000000000 --- a/freeradius/patches/freeradius-2.1.6-cert-config.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff -r -u freeradius-server-2.1.8.orig/raddb/certs/ca.cnf freeradius-server-2.1.8/raddb/certs/ca.cnf ---- freeradius-server-2.1.8.orig/raddb/certs/ca.cnf 2009-12-30 10:44:35.000000000 -0500 -+++ freeradius-server-2.1.8/raddb/certs/ca.cnf 2010-01-08 12:35:23.000000000 -0500 -@@ -14,9 +14,9 @@ - RANDFILE = $dir/.rand - name_opt = ca_default - cert_opt = ca_default --default_days = 365 -+default_days = 60 - default_crl_days = 30 --default_md = md5 -+default_md = sha1 - preserve = no - policy = policy_match - -Only in freeradius-server-2.1.8/raddb/certs: ca.cnf~ -diff -r -u freeradius-server-2.1.8.orig/raddb/certs/client.cnf freeradius-server-2.1.8/raddb/certs/client.cnf ---- freeradius-server-2.1.8.orig/raddb/certs/client.cnf 2009-12-30 10:44:35.000000000 -0500 -+++ freeradius-server-2.1.8/raddb/certs/client.cnf 2010-01-08 12:35:37.000000000 -0500 -@@ -14,9 +14,9 @@ - RANDFILE = $dir/.rand - name_opt = ca_default - cert_opt = ca_default --default_days = 365 -+default_days = 60 - default_crl_days = 30 --default_md = md5 -+default_md = sha1 - preserve = no - policy = policy_match - -Only in freeradius-server-2.1.8/raddb/certs: client.cnf~ -diff -r -u freeradius-server-2.1.8.orig/raddb/certs/server.cnf freeradius-server-2.1.8/raddb/certs/server.cnf ---- freeradius-server-2.1.8.orig/raddb/certs/server.cnf 2009-12-30 10:44:35.000000000 -0500 -+++ freeradius-server-2.1.8/raddb/certs/server.cnf 2010-01-08 12:35:05.000000000 -0500 -@@ -14,9 +14,9 @@ - RANDFILE = $dir/.rand - name_opt = ca_default - cert_opt = ca_default --default_days = 365 -+default_days = 60 - default_crl_days = 30 --default_md = md5 -+default_md = sha1 - preserve = no - policy = policy_match - -Only in freeradius-server-2.1.8/raddb/certs: server.cnf~ -diff -r -u freeradius-server-2.1.8.orig/raddb/eap.conf freeradius-server-2.1.8/raddb/eap.conf ---- freeradius-server-2.1.8.orig/raddb/eap.conf 2009-12-30 10:44:35.000000000 -0500 -+++ freeradius-server-2.1.8/raddb/eap.conf 2010-01-08 12:36:04.000000000 -0500 -@@ -251,15 +251,6 @@ - cipher_list = "DEFAULT" - - # -- -- # This configuration entry should be deleted -- # once the server is running in a normal -- # configuration. It is here ONLY to make -- # initial deployments easier. -- # -- make_cert_command = "${certdir}/bootstrap" -- -- # - # Session resumption / fast reauthentication - # cache. - # -Only in freeradius-server-2.1.8/raddb: eap.conf~ diff --git a/freeradius/patches/freeradius-cert-config.patch b/freeradius/patches/freeradius-cert-config.patch new file mode 100644 index 000000000..9967a152e --- /dev/null +++ b/freeradius/patches/freeradius-cert-config.patch @@ -0,0 +1,62 @@ +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 + cert_opt = ca_default +-default_days = 365 ++default_days = 60 + default_crl_days = 30 +-default_md = md5 ++default_md = sha1 + preserve = no + policy = policy_match + +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 + cert_opt = ca_default +-default_days = 365 ++default_days = 60 + default_crl_days = 30 +-default_md = md5 ++default_md = sha1 + preserve = no + policy = policy_match + +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 + cert_opt = ca_default +-default_days = 365 ++default_days = 60 + default_crl_days = 30 +-default_md = md5 ++default_md = sha1 + preserve = no + policy = policy_match + +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. + # +- make_cert_command = "${certdir}/bootstrap" ++ # Redhat RPM's run the bootstrap certificate creation ++ # as part of the RPM install (not upgrade), therefore ++ # the make_cert_command is commented out. ++ # ++ #make_cert_command = "${certdir}/bootstrap" + + # + # Elliptical cryptography configuration +Only in freeradius-server-2.1.12/raddb: eap.conf.orig -- 2.39.5