diff --git a/freeradius-server-2.1.6-ltdl.patch b/freeradius-server-2.1.6-ltdl.patch index 5b74ac7..a297730 100644 --- a/freeradius-server-2.1.6-ltdl.patch +++ b/freeradius-server-2.1.6-ltdl.patch @@ -1,24 +1,30 @@ +--- + src/main/modules.c | 6 +++++- + src/modules/rlm_eap/eap.c | 6 +++++- + src/modules/rlm_sql/rlm_sql.c | 6 +++++- + 3 files changed, 15 insertions(+), 3 deletions(-) + Index: src/main/modules.c =================================================================== ---- src/main/modules.c.orig 2009-09-14 16:43:29.000000000 +0200 -+++ src/main/modules.c 2009-12-17 13:23:09.000000000 +0100 -@@ -411,7 +411,11 @@ static module_entry_t *linkto_module(con +--- src/main/modules.c.orig 2009-12-30 16:44:35.000000000 +0100 ++++ src/main/modules.c 2010-03-09 15:59:29.000000000 +0100 +@@ -436,7 +436,11 @@ static module_entry_t *linkto_module(con /* * Keep the handle around so we can dlclose() it. */ -- handle = lt_dlopenext(module_name); +- handle = fr_dlopenext(module_name); + char *tmp = malloc(strlen(module_name) + 4); + strcpy(tmp, module_name); + strcat(tmp, ".so"); -+ handle = lt_dlopenext(tmp); ++ handle = fr_dlopenext(tmp); + free(tmp); if (handle == NULL) { cf_log_err(cf_sectiontoitem(cs), "Failed to link to module '%s': %s\n", Index: src/modules/rlm_eap/eap.c =================================================================== ---- src/modules/rlm_eap/eap.c.orig 2009-09-14 16:43:29.000000000 +0200 -+++ src/modules/rlm_eap/eap.c 2009-12-17 13:23:09.000000000 +0100 +--- src/modules/rlm_eap/eap.c.orig 2009-12-30 16:44:35.000000000 +0100 ++++ src/modules/rlm_eap/eap.c 2010-03-09 15:42:08.000000000 +0100 @@ -83,7 +83,11 @@ int eaptype_load(EAP_TYPES **type, int e snprintf(buffer, sizeof(buffer), "rlm_eap_%s", eaptype_name); @@ -34,8 +40,8 @@ Index: src/modules/rlm_eap/eap.c eaptype_name, lt_dlerror()); Index: src/modules/rlm_sql/rlm_sql.c =================================================================== ---- src/modules/rlm_sql/rlm_sql.c.orig 2009-09-14 16:43:29.000000000 +0200 -+++ src/modules/rlm_sql/rlm_sql.c 2009-12-17 13:23:09.000000000 +0100 +--- src/modules/rlm_sql/rlm_sql.c.orig 2009-12-30 16:44:35.000000000 +0100 ++++ src/modules/rlm_sql/rlm_sql.c 2010-03-09 15:42:08.000000000 +0100 @@ -904,7 +904,11 @@ static int rlm_sql_instantiate(CONF_SECT return -1; } diff --git a/freeradius-server-2.1.7.tar.bz2 b/freeradius-server-2.1.7.tar.bz2 deleted file mode 100644 index 7c57a3d..0000000 --- a/freeradius-server-2.1.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f88cabca8ce320569015198f303119269b59bdce22f41d7937a6becb65418e9 -size 2544164 diff --git a/freeradius-server-2.1.8.tar.bz2 b/freeradius-server-2.1.8.tar.bz2 new file mode 100644 index 0000000..ff907aa --- /dev/null +++ b/freeradius-server-2.1.8.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9329607d8082f8d7197b7ebad23a83c5239fb129c68b9cab43a3752300708d22 +size 2544696 diff --git a/freeradius-server-fix-cert-bootstrap.patch b/freeradius-server-fix-cert-bootstrap.patch index 5fb2fbe..a48f295 100644 --- a/freeradius-server-fix-cert-bootstrap.patch +++ b/freeradius-server-fix-cert-bootstrap.patch @@ -1,7 +1,7 @@ -Index: freeradius-server-2.1.6/raddb/certs/Makefile +Index: freeradius-server-2.1.8/raddb/certs/Makefile =================================================================== ---- freeradius-server-2.1.6.orig/raddb/certs/Makefile 2009-05-18 13:13:55.000000000 +0200 -+++ freeradius-server-2.1.6/raddb/certs/Makefile 2009-10-15 10:46:28.000000000 +0200 +--- freeradius-server-2.1.8.orig/raddb/certs/Makefile 2010-03-09 16:00:11.000000000 +0100 ++++ freeradius-server-2.1.8/raddb/certs/Makefile 2010-03-09 16:00:22.000000000 +0100 @@ -51,7 +51,7 @@ dh: # Create a new self-signed CA certificate # @@ -10,8 +10,8 @@ Index: freeradius-server-2.1.6/raddb/certs/Makefile +ca.key ca.pem: openssl req -new -x509 -keyout ca.key -out ca.pem \ -days $(CA_DEFAULT_DAYS) -config ./ca.cnf - -@@ -64,7 +64,7 @@ ca.der: ca.pem + +@@ -63,7 +63,7 @@ ca.der: ca.pem # Create a new server certificate, signed by the above CA. # ###################################################################### @@ -20,7 +20,7 @@ Index: freeradius-server-2.1.6/raddb/certs/Makefile openssl req -new -out server.csr -keyout server.key -config ./server.cnf server.crt: server.csr ca.key ca.pem index.txt serial -@@ -86,7 +86,7 @@ server.vrfy: ca.pem +@@ -85,7 +85,7 @@ server.vrfy: ca.pem # certificate. # ###################################################################### @@ -28,11 +28,11 @@ Index: freeradius-server-2.1.6/raddb/certs/Makefile +client.csr client.key: openssl req -new -out client.csr -keyout client.key -config ./client.cnf - client.crt: client.csr server.crt server.key index.txt serial -Index: freeradius-server-2.1.6/raddb/certs/bootstrap + client.crt: client.csr ca.pem ca.key index.txt serial +Index: freeradius-server-2.1.8/raddb/certs/bootstrap =================================================================== ---- freeradius-server-2.1.6.orig/raddb/certs/bootstrap 2009-05-18 13:13:55.000000000 +0200 -+++ freeradius-server-2.1.6/raddb/certs/bootstrap 2009-10-15 10:47:34.000000000 +0200 +--- freeradius-server-2.1.8.orig/raddb/certs/bootstrap 2010-03-09 16:00:11.000000000 +0100 ++++ freeradius-server-2.1.8/raddb/certs/bootstrap 2010-03-09 16:00:22.000000000 +0100 @@ -19,6 +19,7 @@ make all # if [ "$?" = "0" ] diff --git a/freeradius-server-no-default-case.patch b/freeradius-server-no-default-case.patch deleted file mode 100644 index 2bd6fca..0000000 --- a/freeradius-server-no-default-case.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: freeradius-server-2.1.7/src/modules/rlm_ldap/rlm_ldap.c -=================================================================== ---- freeradius-server-2.1.7.orig/src/modules/rlm_ldap/rlm_ldap.c 2009-12-17 13:23:44.000000000 +0100 -+++ freeradius-server-2.1.7/src/modules/rlm_ldap/rlm_ldap.c 2009-12-17 13:24:00.000000000 +0100 -@@ -1896,7 +1896,7 @@ static int ldap_authenticate(void *insta - RDEBUG("ldap auth option = %s", vp_auth_opt->vp_strvalue); - strncpy(seq, vp_auth_opt->vp_strvalue, vp_auth_opt->length); - seq[vp_auth_opt->length] = '\0'; -- if( strcmp(seq, "") ){ -+ if( strcasecmp(seq, "") ){ - - /* Get the client IP address to check for packet validity */ - inet_ntop(AF_INET, &request->packet->src_ipaddr, host_ipaddr, sizeof(host_ipaddr)); diff --git a/freeradius-server.changes b/freeradius-server.changes index 68e553a..c526b93 100644 --- a/freeradius-server.changes +++ b/freeradius-server.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Mar 9 15:01:46 UTC 2010 - puzel@novell.com + +- update to 2.1.8 + - for full list of changes, please see + /usr/share/doc/packages/freeradius-server/ChangeLog +- drop freeradius-server-no-default-case.patch: fixed upstream + ------------------------------------------------------------------- Thu Dec 17 15:50:19 UTC 2009 - puzel@novell.com diff --git a/freeradius-server.spec b/freeradius-server.spec index 993dae3..3c32193 100644 --- a/freeradius-server.spec +++ b/freeradius-server.spec @@ -1,7 +1,7 @@ # -# spec file for package freeradius-server (Version 2.1.7) +# spec file for package freeradius-server (Version 2.1.8) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: freeradius-server -Version: 2.1.7 +Version: 2.1.8 Release: 1 License: GPLv2 ; LGPLv2.1 Group: Productivity/Networking/Radius/Servers @@ -37,7 +37,6 @@ Patch4: %{name}-2.1.6-edir-64bit.patch Patch5: %{name}-2.1.6-overflow.patch Patch6: freeradius-server-sha1-default.patch Patch7: freeradius-server-fix-cert-bootstrap.patch -Patch8: freeradius-server-no-default-case.patch PreReq: perl openssl pwdutils coreutils PreReq: %insserv_prereq %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -81,6 +80,7 @@ Authors: %package oracle + BuildRequires: oracle-instantclient-basic oracle-instantclient-devel Group: Productivity/Networking/Radius/Servers Summary: FreeRADIUS Oracle database support @@ -217,7 +217,6 @@ Authors: %patch5 %patch6 -p1 %patch7 -p1 -%patch8 -p1 %build # This package failed when testing with -Wl,-as-needed being default. @@ -348,6 +347,7 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/raddb/attrs.access_reject %config(noreplace) %{_sysconfdir}/raddb/attrs.accounting_response %config(noreplace) %{_sysconfdir}/raddb/attrs.pre-proxy +%config(noreplace) %{_sysconfdir}/raddb/attrs.access_challenge %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/clients.conf %config(noreplace) %{_sysconfdir}/raddb/hints %config(noreplace) %{_sysconfdir}/raddb/huntgroups