This commit was manufactured by cvs2git to create tag 'auto-ac-freeradius-

1_1_0-5'.

Sprout from master 2006-03-09 17:06:32 UTC Jan Rękorajski <baggins@pld-linux.org> '- updated to 1.1.0'
Cherrypick from AC-branch 2006-06-20 17:35:22 UTC zbyniu <zbyniu@pld-linux.org> '- patch from http://bugs.freeradius.org/show_bug.cgi?id=312':
    freeradius-sizeof.patch -> 1.1.2.1
Cherrypick from unlabeled-1.62.2 2006-09-09 01:22:15 UTC Elan Ruusamäe <glen@pld-linux.org> '- rel 5 (rebuild with fixed %useradd/%groupadd macros)':
    freeradius.spec -> 1.62.2.3
Delete:
    freeradius-autoconf_mysql.patch
    freeradius-sql_injection.patch

diff --git a/freeradius-autoconf_mysql.patch b/freeradius-autoconf_mysql.patch
deleted file mode 100644 (file)
index 74908ff..0000000
--- a/freeradius-autoconf_mysql.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -dur freeradius-1.0.1.orig/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in freeradius-1.0.1/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in
---- freeradius-1.0.1.orig/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in       2004-01-22 19:23:19.000000000 +0100
-+++ freeradius-1.0.1/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in    2004-09-30 14:24:40.165438814 +0200
-@@ -32,7 +32,7 @@
-       then
-               sql_mysql_ldflags=`mysql_config --libs`
-               sql_mysql_cflags=`mysql_config --cflags`
--              AC_DEFINE(HAVE_MYSQL_H)
-+              AC_DEFINE([HAVE_MYSQL_H], [], [Define if mysql.h is available])
-       else
-               AC_CHECK_LIB(z, compress, LIBS="$LIBS -lz")
- 
-@@ -55,7 +55,7 @@
-                                       MYSQL_INCLUDE=
-                               )
-                               if test "x$MYSQL_INCLUDE" != "x"; then
--                                      AC_DEFINE(HAVE_MYSQL_MYSQL_H)
-+                                      AC_DEFINE([HAVE_MYSQL_H], [], [Define if mysql.h is available])
-                                       break;
-                               fi
-                       done
-@@ -69,7 +69,7 @@
-               else
-                       sql_mysql_cflags="${sql_mysql_cflags} ${MYSQL_INCLUDE}"
-                       AC_MSG_RESULT(yes)
--                      AC_DEFINE(HAVE_MYSQL_H)
-+                      AC_DEFINE([HAVE_MYSQL_H], [], [Define if mysql.h is available])
-   
-                       AC_MSG_CHECKING([for mysql_init in -lmysqlclient])
- 

diff --git a/freeradius-sizeof.patch b/freeradius-sizeof.patch
new file mode 100644 (file)
index 0000000..19993ef
--- /dev/null
+++ b/freeradius-sizeof.patch
@@ -0,0 +1,12 @@
+diff -u -r1.50.2.4.2.2 dict.c
+--- src/lib/dict.c      9 Jan 2006 23:02:47 -0000       1.50.2.4.2.2
++++ src/lib/dict.c      15 Jan 2006 14:30:06 -0000
+@@ -1207,7 +1207,7 @@
+       if (!name) return NULL;
+ 
+       hash = dict_hashname(name);
+-      hash = lrad_hash_update(&attr, sizeof(&attr), hash);
++      hash = lrad_hash_update(&attr, sizeof(attr), hash);
+ 
+       return lrad_hash_table_finddata(values_byname, hash);
+ }

diff --git a/freeradius-sql_injection.patch b/freeradius-sql_injection.patch
deleted file mode 100644 (file)
index 42703d7..0000000
--- a/freeradius-sql_injection.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-===================================================================
-RCS file: /web/pages/us.freeradius.org/cvs/radiusd/src/modules/rlm_sql/rlm_sql.c,v
-retrieving revision 1.131.2.1
-retrieving revision 1.131.2.3
-diff -u -p -r1.131.2.1 -r1.131.2.3
---- radiusd/src/modules/rlm_sql/rlm_sql.c      2004/09/30 14:54:22     1.131.2.1
-+++ radiusd/src/modules/rlm_sql/rlm_sql.c      2005/05/18 13:22:18     1.131.2.3
-@@ -2,7 +2,7 @@
-  * rlm_sql.c          SQL Module
-  *            Main SQL module file. Most ICRADIUS code is located in sql.c
-  *
-- * Version:   $Id$
-+ * Version:   $Id$
-  *
-  *   This program is free software; you can redistribute it and/or modify
-  *   it under the terms of the GNU General Public License as published by
-@@ -24,7 +24,7 @@
-  */
- 
- static const char rcsid[] =
--      "$Id$";
-+      "$Id$";
- 
- #include "autoconf.h"
- 
-@@ -158,6 +158,7 @@ static int rlm_sql_init(void) {
-  */
- static int sql_set_user(SQL_INST *inst, REQUEST *request, char *sqlusername, const char *username);
- static int generate_sql_clients(SQL_INST *inst);
-+static int sql_escape_func(char *out, int outlen, const char *in);
- 
- /*
-  *    sql xlat function. Right now only SELECTs are supported. Only
-@@ -184,7 +185,7 @@ static int sql_xlat(void *instance, REQU
-       /*
-        * Do an xlat on the provided string (nice recursive operation).
-        */
--      if (!radius_xlat(querystr, sizeof(querystr), fmt, request, func)) {
-+      if (!radius_xlat(querystr, sizeof(querystr), fmt, request, sql_escape_func)) {
-               radlog(L_ERR, "rlm_sql (%s): xlat failed.",
-                      inst->config->xlat_name);
-               return 0;
-@@ -409,18 +410,18 @@ static int sql_escape_func(char *out, in
- 
-       while (in[0]) {
-               /*
--               *  Only one byte left.
--               */
--              if (outlen <= 1) {
--                      break;
--              }
--
--              /*
-                *      Non-printable characters get replaced with their
-                *      mime-encoded equivalents.
-                */
-               if ((in[0] < 32) ||
-                   strchr(allowed_chars, *in) == NULL) {
-+                      /*
-+                       *      Only 3 or less bytes available.
-+                       */
-+                      if (outlen <= 3) {
-+                              break;
-+                      }
-+
-                       snprintf(out, outlen, "=%02X", (unsigned char) in[0]);
-                       in++;
-                       out += 3;
-@@ -430,7 +431,14 @@ static int sql_escape_func(char *out, in
-               }
- 
-               /*
--               *      Else it's a nice character.
-+               *      Only one byte left.
-+               */
-+              if (outlen <= 1) {
-+                      break;
-+              }
-+
-+              /*
-+               *      Allowed character.
-                */
-               *out = *in;
-               out++;
-@@ -517,7 +525,7 @@ static int sql_groupcmp(void *instance, 
-        */
-       if (sql_set_user(inst, req, sqlusername, 0) < 0)
-               return 1;
--      if (!radius_xlat(querystr, sizeof(querystr), inst->config->groupmemb_query, req, NULL)){
-+      if (!radius_xlat(querystr, sizeof(querystr), inst->config->groupmemb_query, req, sql_escape_func)){
-               radlog(L_ERR, "rlm_sql (%s): xlat failed.",
-                      inst->config->xlat_name);
-               /* Remove the username we (maybe) added above */
-@@ -1149,7 +1157,7 @@ static int rlm_sql_checksimul(void *inst
-       if(sql_set_user(inst, request, sqlusername, 0) <0)
-               return RLM_MODULE_FAIL;
- 
--      radius_xlat(querystr, sizeof(querystr), inst->config->simul_count_query, request, NULL);
-+      radius_xlat(querystr, sizeof(querystr), inst->config->simul_count_query, request, sql_escape_func);
- 
-       /* initialize the sql socket */
-       sqlsocket = sql_get_socket(inst);
-@@ -1193,7 +1201,7 @@ static int rlm_sql_checksimul(void *inst
-               return RLM_MODULE_OK;
-       }
- 
--      radius_xlat(querystr, sizeof(querystr), inst->config->simul_verify_query, request, NULL);
-+      radius_xlat(querystr, sizeof(querystr), inst->config->simul_verify_query, request, sql_escape_func);
-       if(rlm_sql_select_query(sqlsocket, inst, querystr)) {
-               radlog(L_ERR, "rlm_sql (%s): sql_checksimul: Database query error", inst->config->xlat_name);
-               sql_release_socket(inst, sqlsocket);

diff --git a/freeradius.spec b/freeradius.spec
index def1187ae7700cffeed243a5eadb0cd1350f1075..df8e6616d04caa3997e19e3cfb44bab17b6fd2cd 100644 (file)
--- a/freeradius.spec
+++ b/freeradius.spec
@@ -8,7 +8,7 @@ Summary:        High-performance and highly configurable RADIUS server
 Summary(pl):   Szybki i wysoce konfigurowalny serwer RADIUS
 Name:          freeradius
 Version:       1.1.0
-Release:       0.1
+Release:       5
 License:       GPL
 Group:         Networking/Daemons
 Source0:       ftp://ftp.freeradius.org/pub/radius/%{name}-%{version}.tar.gz
@@ -16,13 +16,14 @@ Source0:    ftp://ftp.freeradius.org/pub/radius/%{name}-%{version}.tar.gz
 Source1:       %{name}.logrotate
 Source2:       %{name}.init
 Source3:       %{name}.pam
-Patch1:                %{name}-makefile.patch
-Patch2:                %{name}-smbencrypt.patch
-Patch3:                %{name}-linking.patch
-Patch4:                %{name}-moduledir.patch
-Patch5:                %{name}-rundir.patch
-Patch6:                %{name}-config.patch
-Patch7:                %{name}-eap_install_order.patch
+Patch0:                %{name}-makefile.patch
+Patch1:                %{name}-smbencrypt.patch
+Patch2:                %{name}-linking.patch
+Patch3:                %{name}-moduledir.patch
+Patch4:                %{name}-rundir.patch
+Patch5:                %{name}-config.patch
+Patch6:                %{name}-eap_install_order.patch
+Patch7:                %{name}-sizeof.patch
 URL:           http://www.freeradius.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -41,7 +42,6 @@ BuildRequires:        postgresql-devel
 BuildRequires: python
 BuildRequires: python-devel
 BuildRequires: rpm-perlprov
-BuildRequires: rpmbuild(macros) >= 1.202
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: unixODBC-devel
 Requires(post,preun):  /sbin/chkconfig
@@ -73,13 +73,14 @@ wi
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
+%patch7 -p0
 
 awk 'BEGIN { printit=0; } { if (printit) print $0; } /## end libtool.m4/ { printit=1;}' \
        < aclocal.m4 > acinclude.m4