diff --git a/freeradius-server-2.1.10.tar.bz2 b/freeradius-server-2.1.10.tar.bz2 deleted file mode 100644 index 2f95a24..0000000 --- a/freeradius-server-2.1.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c56356cec5fd33522d86118a1065e004cce6735f0889146526f9839261fee9e -size 2545578 diff --git a/freeradius-server-2.1.6-edir-64bit.patch b/freeradius-server-2.1.6-edir-64bit.patch new file mode 100644 index 0000000..82f43b0 --- /dev/null +++ b/freeradius-server-2.1.6-edir-64bit.patch @@ -0,0 +1,13 @@ +Index: src/modules/rlm_ldap/rlm_ldap.c +=================================================================== +--- src/modules/rlm_ldap/rlm_ldap.c.orig 2010-06-21 21:15:56.000000000 +0200 ++++ src/modules/rlm_ldap/rlm_ldap.c 2010-06-21 21:16:09.000000000 +0200 +@@ -1883,7 +1883,7 @@ static int ldap_authenticate(void *insta + LDAP_CONN *conn1; + int auth_state = -1; + char *challenge = NULL; +- int challenge_len = MAX_CHALLENGE_LEN; ++ size_t challenge_len = MAX_CHALLENGE_LEN; + char *state = NULL; + + dattr = dict_attrbyname("eDir-APC"); diff --git a/freeradius-server-2.1.9.tar.bz2 b/freeradius-server-2.1.9.tar.bz2 new file mode 100644 index 0000000..0848303 --- /dev/null +++ b/freeradius-server-2.1.9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0b7c5fe334e826e2f643569485ce203520ecb1d058d42b8df2a94a73acb05b1 +size 2524497 diff --git a/freeradius-server-fix-cert-bootstrap.patch b/freeradius-server-fix-cert-bootstrap.patch index 8312698..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.10/raddb/certs/Makefile +Index: freeradius-server-2.1.8/raddb/certs/Makefile =================================================================== ---- freeradius-server-2.1.10.orig/raddb/certs/Makefile -+++ freeradius-server-2.1.10/raddb/certs/Makefile +--- 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 # @@ -19,7 +19,7 @@ Index: freeradius-server-2.1.10/raddb/certs/Makefile +server.csr server.key: openssl req -new -out server.csr -keyout server.key -config ./server.cnf - server.crt: server.csr ca.key ca.pem + server.crt: server.csr ca.key ca.pem index.txt serial @@ -85,7 +85,7 @@ server.vrfy: ca.pem # certificate. # @@ -28,25 +28,21 @@ Index: freeradius-server-2.1.10/raddb/certs/Makefile +client.csr client.key: openssl req -new -out client.csr -keyout client.key -config ./client.cnf - client.crt: client.csr ca.pem ca.key -Index: freeradius-server-2.1.10/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.10.orig/raddb/certs/bootstrap -+++ freeradius-server-2.1.10/raddb/certs/bootstrap -@@ -21,7 +21,9 @@ make -h > /dev/null 2>&1 +--- 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" ]; then - make all -- exit $? -+ ret=$? + if [ "$?" = "0" ] + then + chgrp radiusd * -+ exit $ret + exit 0 fi - # -@@ -79,3 +81,5 @@ fi - if [ ! -f client.crt ]; then - openssl ca -batch -keyfile ca.key -cert ca.pem -in client.csr -key `grep output_password ca.cnf | sed 's/.*=//;s/^ *//'` -out client.crt -extensions xpclient_ext -extfile xpextensions -config ./client.cnf - fi -+ +@@ -44,3 +45,4 @@ openssl ca -batch -keyfile ca.key -cert + openssl pkcs12 -export -in server.crt -inkey server.key -out server.p12 -passin pass:`grep output_password server.cnf | sed 's/.*=//;s/^ *//'` -passout pass:`grep output_password server.cnf | sed 's/.*=//;s/^ *//'` || exit 1 + openssl pkcs12 -in server.p12 -out server.pem -passin pass:`grep output_password server.cnf | sed 's/.*=//;s/^ *//'` -passout pass:`grep output_password server.cnf | sed 's/.*=//;s/^ *//'` || exit 1 + openssl x509 -inform PEM -outform DER -in ca.pem -out ca.der || exit 1 +chgrp radiusd * diff --git a/freeradius-server.changes b/freeradius-server.changes index 0f3db00..6b056c6 100644 --- a/freeradius-server.changes +++ b/freeradius-server.changes @@ -1,11 +1,3 @@ -------------------------------------------------------------------- -Mon Oct 4 10:54:23 UTC 2010 - puzel@novell.com - -- update to 2.1.10 - - see /usr/share/doc/packages/freeradius-server/ChangeLog - for complete list of changes in this release -- drop freeradius-server-2.1.6-edir-64bit.patch (fixed upstream) - ------------------------------------------------------------------- Thu Sep 16 14:22:15 CEST 2010 - pgajdos@suse.cz diff --git a/freeradius-server.spec b/freeradius-server.spec index 8776911..f26e2bf 100644 --- a/freeradius-server.spec +++ b/freeradius-server.spec @@ -1,5 +1,5 @@ # -# spec file for package freeradius-server (Version 2.1.10) +# spec file for package freeradius-server (Version 2.1.9) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: freeradius-server -Version: 2.1.10 +Version: 2.1.9 Release: 4 License: GPLv2 ; LGPLv2.1 Group: Productivity/Networking/Radius/Servers @@ -29,10 +29,11 @@ Conflicts: radiusd-livingston radiusd-cistron icradius Url: http://www.freeradius.org/ Summary: Very Highly Configurable Radius Server Source: %{name}-%{version}.tar.bz2 -Patch1: freeradius-server-2.1.6-dialup_admin.patch -Patch2: freeradius-server-2.1.6-rcradiusd.patch -Patch3: freeradius-server-2.1.6-codecleanup.patch -Patch5: freeradius-server-2.1.6-overflow.patch +Patch1: %{name}-2.1.6-dialup_admin.patch +Patch2: %{name}-2.1.6-rcradiusd.patch +Patch3: %{name}-2.1.6-codecleanup.patch +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-initscript-pidfile.patch @@ -232,6 +233,7 @@ Authors: %patch1 %patch2 %patch3 +%patch4 %patch5 %patch6 -p1 %patch7 -p1