From eb543faa6cf0989a40cea3008d0a9b2a213c9220c724c183ab645135e5848393 Mon Sep 17 00:00:00 2001
From: Petr Uzel <puzel@suse.com>
Date: Mon, 21 Jun 2010 19:27:27 +0000
Subject: [PATCH 1/2] update to 2.1.9, bnc#615699

OBS-URL: https://build.opensuse.org/package/show/network/freeradius-server?expand=0&rev=23
---
 freeradius-server-2.1.6-codecleanup.patch  | 34 ++++++++++-------
 freeradius-server-2.1.6-dialup_admin.patch | 44 +++++++++++-----------
 freeradius-server-2.1.6-edir-64bit.patch   |  6 +--
 freeradius-server-2.1.6-overflow.patch     |  8 ++--
 freeradius-server-2.1.6-rcradiusd.patch    | 12 ++++--
 freeradius-server-2.1.8.tar.bz2            |  3 --
 freeradius-server-2.1.9.tar.bz2            |  3 ++
 freeradius-server.changes                  |  7 ++++
 freeradius-server.spec                     |  4 +-
 9 files changed, 71 insertions(+), 50 deletions(-)
 delete mode 100644 freeradius-server-2.1.8.tar.bz2
 create mode 100644 freeradius-server-2.1.9.tar.bz2

diff --git a/freeradius-server-2.1.6-codecleanup.patch b/freeradius-server-2.1.6-codecleanup.patch
index 7da6ca6..fd907dd 100644
--- a/freeradius-server-2.1.6-codecleanup.patch
+++ b/freeradius-server-2.1.6-codecleanup.patch
@@ -1,6 +1,8 @@
---- src/modules/rlm_smb/rfcnb-util.c
-+++ src/modules/rlm_smb/rfcnb-util.c
-@@ -208,7 +208,7 @@
+Index: src/modules/rlm_smb/rfcnb-util.c
+===================================================================
+--- src/modules/rlm_smb/rfcnb-util.c.orig	2010-06-21 21:15:56.000000000 +0200
++++ src/modules/rlm_smb/rfcnb-util.c	2010-06-21 21:16:06.000000000 +0200
+@@ -208,7 +208,7 @@ struct RFCNB_Pkt *RFCNB_Alloc_Pkt(int n)
  
  /* Free up a packet */
  
@@ -9,16 +11,20 @@
  
  { struct RFCNB_Pkt *pkt_next; char *data_ptr;
  
---- src/modules/rlm_smb/rfcnb-util.h
-+++ src/modules/rlm_smb/rfcnb-util.h
-@@ -52,3 +52,4 @@
+Index: src/modules/rlm_smb/rfcnb-util.h
+===================================================================
+--- src/modules/rlm_smb/rfcnb-util.h.orig	2010-06-21 21:15:56.000000000 +0200
++++ src/modules/rlm_smb/rfcnb-util.h	2010-06-21 21:16:06.000000000 +0200
+@@ -52,3 +52,4 @@ int RFCNB_Session_Req(struct RFCNB_Con *
  		      struct in_addr *Dest_IP,
  		      int * port);
  
 +void RFCNB_Free_Pkt(struct RFCNB_Pkt *pkt);
---- src/modules/rlm_smb/session.c
-+++ src/modules/rlm_smb/session.c
-@@ -41,6 +41,7 @@
+Index: src/modules/rlm_smb/session.c
+===================================================================
+--- src/modules/rlm_smb/session.c.orig	2010-06-21 21:15:56.000000000 +0200
++++ src/modules/rlm_smb/session.c	2010-06-21 21:16:06.000000000 +0200
+@@ -41,6 +41,7 @@ int RFCNB_saved_errno = 0;
  
  #include "rfcnb-priv.h"
  #include "rfcnb-util.h"
@@ -26,7 +32,7 @@
  
  int RFCNB_Stats[RFCNB_MAX_STATS];
  
-@@ -315,7 +316,7 @@
+@@ -315,7 +316,7 @@ int RFCNB_Set_Sock_NoDelay(struct RFCNB_
  void *RFCNB_Listen()
  
  {
@@ -35,7 +41,7 @@
  }
  
  /* Pick up the last error response as a string, hmmm, this routine should */
-@@ -357,7 +358,7 @@
+@@ -357,7 +358,7 @@ int RFCNB_Get_Last_Errno()
  
  /* Pick up the last error response and return in string ...             */
  
@@ -44,8 +50,10 @@
  
  {
  
---- src/modules/rlm_smb/smbencrypt.c
-+++ src/modules/rlm_smb/smbencrypt.c
+Index: src/modules/rlm_smb/smbencrypt.c
+===================================================================
+--- src/modules/rlm_smb/smbencrypt.c.orig	2010-06-21 21:15:56.000000000 +0200
++++ src/modules/rlm_smb/smbencrypt.c	2010-06-21 21:16:06.000000000 +0200
 @@ -25,6 +25,7 @@
  RCSID("$Id$")
  
diff --git a/freeradius-server-2.1.6-dialup_admin.patch b/freeradius-server-2.1.6-dialup_admin.patch
index 6a99aa8..9be4e33 100644
--- a/freeradius-server-2.1.6-dialup_admin.patch
+++ b/freeradius-server-2.1.6-dialup_admin.patch
@@ -1,7 +1,7 @@
 Index: dialup_admin/bin/backup_radacct
 ===================================================================
---- dialup_admin/bin/backup_radacct.orig	2009-06-02 14:53:31.000000000 +0200
-+++ dialup_admin/bin/backup_radacct	2009-06-02 14:53:40.000000000 +0200
+--- dialup_admin/bin/backup_radacct.orig	2010-06-21 21:15:56.000000000 +0200
++++ dialup_admin/bin/backup_radacct	2010-06-21 21:15:57.000000000 +0200
 @@ -2,7 +2,7 @@
  use POSIX;
  use File::Temp;
@@ -19,8 +19,8 @@ Index: dialup_admin/bin/backup_radacct
 +`/usr/bin/gzip -9 $backup_directory/$date3`;
 Index: dialup_admin/bin/clean_radacct
 ===================================================================
---- dialup_admin/bin/clean_radacct.orig	2009-06-02 14:53:31.000000000 +0200
-+++ dialup_admin/bin/clean_radacct	2009-06-02 14:53:40.000000000 +0200
+--- dialup_admin/bin/clean_radacct.orig	2010-06-21 21:15:56.000000000 +0200
++++ dialup_admin/bin/clean_radacct	2010-06-21 21:15:57.000000000 +0200
 @@ -7,7 +7,7 @@
  use POSIX;
  use File::Temp;
@@ -32,8 +32,8 @@ Index: dialup_admin/bin/clean_radacct
  
 Index: dialup_admin/bin/clearsession
 ===================================================================
---- dialup_admin/bin/clearsession.orig	2009-06-02 14:53:31.000000000 +0200
-+++ dialup_admin/bin/clearsession	2009-06-02 14:53:40.000000000 +0200
+--- dialup_admin/bin/clearsession.orig	2010-06-21 21:15:56.000000000 +0200
++++ dialup_admin/bin/clearsession	2010-06-21 21:15:57.000000000 +0200
 @@ -49,8 +49,8 @@ if ($nastype eq 'cisco' && $type eq 'tel
  }
  if ($nastype eq 'cisco' && $type eq 'snmp'){
@@ -47,8 +47,8 @@ Index: dialup_admin/bin/clearsession
  	die "Could not find snmpset binary. Please make sure that the \$SNMPSET variable points to the right location\n" if (! -x $SNMPSET);
 Index: dialup_admin/bin/dialup_admin.cron
 ===================================================================
---- dialup_admin/bin/dialup_admin.cron.orig	2009-06-02 14:53:31.000000000 +0200
-+++ dialup_admin/bin/dialup_admin.cron	2009-06-02 14:53:40.000000000 +0200
+--- dialup_admin/bin/dialup_admin.cron.orig	2010-06-21 21:15:56.000000000 +0200
++++ dialup_admin/bin/dialup_admin.cron	2010-06-21 21:15:57.000000000 +0200
 @@ -1,4 +1,4 @@
 -1 0 * * * /usr/local/dialup_admin/bin/tot_stats >/dev/null 2>&1
 -5 0 * * * /usr/local/dialup_admin/bin/monthly_tot_stats >/dev/null 2>&1
@@ -60,8 +60,8 @@ Index: dialup_admin/bin/dialup_admin.cron
 +15 0 1 * * /usr/share/dialup_admin/bin/clean_radacct >/dev/null 2>&1
 Index: dialup_admin/bin/log_badlogins
 ===================================================================
---- dialup_admin/bin/log_badlogins.orig	2009-06-02 14:53:31.000000000 +0200
-+++ dialup_admin/bin/log_badlogins	2009-06-02 14:53:40.000000000 +0200
+--- dialup_admin/bin/log_badlogins.orig	2010-06-21 21:15:56.000000000 +0200
++++ dialup_admin/bin/log_badlogins	2010-06-21 21:15:57.000000000 +0200
 @@ -18,7 +18,7 @@ use File::Temp;
  $|=1;
  
@@ -73,8 +73,8 @@ Index: dialup_admin/bin/log_badlogins
  # Uncomment to force inserts even if there are sql errors. That can
 Index: dialup_admin/bin/monthly_tot_stats
 ===================================================================
---- dialup_admin/bin/monthly_tot_stats.orig	2009-06-02 14:53:31.000000000 +0200
-+++ dialup_admin/bin/monthly_tot_stats	2009-06-02 14:53:40.000000000 +0200
+--- dialup_admin/bin/monthly_tot_stats.orig	2010-06-21 21:15:56.000000000 +0200
++++ dialup_admin/bin/monthly_tot_stats	2010-06-21 21:15:57.000000000 +0200
 @@ -9,7 +9,7 @@ use File::Temp;
  # Works only with mysql and postgresql
  #
@@ -86,8 +86,8 @@ Index: dialup_admin/bin/monthly_tot_stats
  open CONF, "<$conf"
 Index: dialup_admin/bin/showmodem
 ===================================================================
---- dialup_admin/bin/showmodem.orig	2009-06-02 14:53:31.000000000 +0200
-+++ dialup_admin/bin/showmodem	2009-06-02 14:53:40.000000000 +0200
+--- dialup_admin/bin/showmodem.orig	2010-06-21 21:15:56.000000000 +0200
++++ dialup_admin/bin/showmodem	2010-06-21 21:15:57.000000000 +0200
 @@ -7,7 +7,7 @@ $user=shift;
  $comm=shift || "public";
  $type=shift|| "xml";
@@ -99,8 +99,8 @@ Index: dialup_admin/bin/showmodem
  while(<CONF>){
 Index: dialup_admin/bin/snmpfinger
 ===================================================================
---- dialup_admin/bin/snmpfinger.orig	2009-06-02 14:53:31.000000000 +0200
-+++ dialup_admin/bin/snmpfinger	2009-06-02 14:53:40.000000000 +0200
+--- dialup_admin/bin/snmpfinger.orig	2010-06-21 21:15:56.000000000 +0200
++++ dialup_admin/bin/snmpfinger	2010-06-21 21:15:57.000000000 +0200
 @@ -6,7 +6,7 @@ $host=shift;
  $comm=shift || 'public';
  $type=shift || 'cisco';
@@ -112,8 +112,8 @@ Index: dialup_admin/bin/snmpfinger
  while(<CONF>){
 Index: dialup_admin/bin/tot_stats
 ===================================================================
---- dialup_admin/bin/tot_stats.orig	2009-06-02 14:53:31.000000000 +0200
-+++ dialup_admin/bin/tot_stats	2009-06-02 14:53:40.000000000 +0200
+--- dialup_admin/bin/tot_stats.orig	2010-06-21 21:15:56.000000000 +0200
++++ dialup_admin/bin/tot_stats	2010-06-21 21:15:57.000000000 +0200
 @@ -8,7 +8,7 @@ use File::Temp;
  # Works with mysql and postgresql
  #
@@ -125,8 +125,8 @@ Index: dialup_admin/bin/tot_stats
  open CONF, "<$conf"
 Index: dialup_admin/bin/truncate_radacct
 ===================================================================
---- dialup_admin/bin/truncate_radacct.orig	2009-06-02 14:53:31.000000000 +0200
-+++ dialup_admin/bin/truncate_radacct	2009-06-02 14:53:40.000000000 +0200
+--- dialup_admin/bin/truncate_radacct.orig	2010-06-21 21:15:56.000000000 +0200
++++ dialup_admin/bin/truncate_radacct	2010-06-21 21:15:57.000000000 +0200
 @@ -7,7 +7,7 @@
  use POSIX;
  use File::Temp;
@@ -138,8 +138,8 @@ Index: dialup_admin/bin/truncate_radacct
  
 Index: dialup_admin/conf/admin.conf
 ===================================================================
---- dialup_admin/conf/admin.conf.orig	2009-06-02 14:53:31.000000000 +0200
-+++ dialup_admin/conf/admin.conf	2009-06-02 14:53:40.000000000 +0200
+--- dialup_admin/conf/admin.conf.orig	2010-06-21 21:15:56.000000000 +0200
++++ dialup_admin/conf/admin.conf	2010-06-21 21:15:57.000000000 +0200
 @@ -19,11 +19,11 @@ general_charset: iso-8859-1
  #
  # The directory where dialupadmin is installed
diff --git a/freeradius-server-2.1.6-edir-64bit.patch b/freeradius-server-2.1.6-edir-64bit.patch
index 9fde2fc..82f43b0 100644
--- a/freeradius-server-2.1.6-edir-64bit.patch
+++ b/freeradius-server-2.1.6-edir-64bit.patch
@@ -1,8 +1,8 @@
 Index: src/modules/rlm_ldap/rlm_ldap.c
 ===================================================================
---- src/modules/rlm_ldap/rlm_ldap.c.orig	2009-09-14 16:43:29.000000000 +0200
-+++ src/modules/rlm_ldap/rlm_ldap.c	2009-12-17 13:23:44.000000000 +0100
-@@ -1875,7 +1875,7 @@ static int ldap_authenticate(void *insta
+--- 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;
diff --git a/freeradius-server-2.1.6-overflow.patch b/freeradius-server-2.1.6-overflow.patch
index fec7ce2..180f9c9 100644
--- a/freeradius-server-2.1.6-overflow.patch
+++ b/freeradius-server-2.1.6-overflow.patch
@@ -1,6 +1,8 @@
---- src/modules/rlm_sqlhpwippool/rlm_sqlhpwippool.c
-+++ src/modules/rlm_sqlhpwippool/rlm_sqlhpwippool.c
-@@ -771,7 +771,7 @@
+Index: src/modules/rlm_sqlhpwippool/rlm_sqlhpwippool.c
+===================================================================
+--- src/modules/rlm_sqlhpwippool/rlm_sqlhpwippool.c.orig	2010-06-21 21:15:56.000000000 +0200
++++ src/modules/rlm_sqlhpwippool/rlm_sqlhpwippool.c	2010-06-21 21:16:15.000000000 +0200
+@@ -771,7 +771,7 @@ static int sqlhpwippool_accounting(void
  
  			nasip.s_addr = vp->vp_ipaddr;
  			strncpy(nasipstr, inet_ntoa(nasip), sizeof(nasipstr) - 1);
diff --git a/freeradius-server-2.1.6-rcradiusd.patch b/freeradius-server-2.1.6-rcradiusd.patch
index 1a73953..e053daf 100644
--- a/freeradius-server-2.1.6-rcradiusd.patch
+++ b/freeradius-server-2.1.6-rcradiusd.patch
@@ -1,5 +1,7 @@
---- suse/rcradius-relayd
-+++ suse/rcradius-relayd
+Index: suse/rcradius-relayd
+===================================================================
+--- suse/rcradius-relayd.orig	2010-06-21 21:15:56.000000000 +0200
++++ suse/rcradius-relayd	2010-06-21 21:16:03.000000000 +0200
 @@ -12,8 +12,8 @@
  #
  ### BEGIN INIT INFO
@@ -11,8 +13,10 @@
  # Default-Start:     3 5
  # Default-Stop:      0 1 2 6
  # Short-Description: RADIUS Relay Server
---- suse/rcradiusd
-+++ suse/rcradiusd
+Index: suse/rcradiusd
+===================================================================
+--- suse/rcradiusd.orig	2010-06-21 21:15:56.000000000 +0200
++++ suse/rcradiusd	2010-06-21 21:16:03.000000000 +0200
 @@ -12,8 +12,8 @@
  #
  ### BEGIN INIT INFO
diff --git a/freeradius-server-2.1.8.tar.bz2 b/freeradius-server-2.1.8.tar.bz2
deleted file mode 100644
index ff907aa..0000000
--- a/freeradius-server-2.1.8.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9329607d8082f8d7197b7ebad23a83c5239fb129c68b9cab43a3752300708d22
-size 2544696
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.changes b/freeradius-server.changes
index 2914305..fa1a260 100644
--- a/freeradius-server.changes
+++ b/freeradius-server.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jun 21 19:24:08 UTC 2010 - puzel@novell.com
+
+- update to 2.1.9 (bnc#615699)
+  - bugfix release, for list of changes please see
+  /usr/share/doc/packages/freeradius-server/ChangeLog
+
 -------------------------------------------------------------------
 Mon May  3 13:50:08 UTC 2010 - puzel@novell.com
 
diff --git a/freeradius-server.spec b/freeradius-server.spec
index 2e202e9..3673d88 100644
--- a/freeradius-server.spec
+++ b/freeradius-server.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package freeradius-server (Version 2.1.8)
+# 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.8
+Version:        2.1.9
 Release:        3
 License:        GPLv2 ; LGPLv2.1
 Group:          Productivity/Networking/Radius/Servers

From 628dde00e28238aeef05bb6dfa8e3054aa4ca7fea1749ea334c35eb72488ab04 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Tue, 22 Jun 2010 08:10:17 +0000
Subject: [PATCH 2/2] Accepting request 41852 from network

checked in (request 41852)

OBS-URL: https://build.opensuse.org/request/show/41852
OBS-URL: https://build.opensuse.org/package/show/network/freeradius-server?expand=0&rev=24
---
 freeradius-server.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/freeradius-server.spec b/freeradius-server.spec
index 3673d88..1ce820f 100644
--- a/freeradius-server.spec
+++ b/freeradius-server.spec
@@ -19,7 +19,7 @@
 
 Name:           freeradius-server
 Version:        2.1.9
-Release:        3
+Release:        1
 License:        GPLv2 ; LGPLv2.1
 Group:          Productivity/Networking/Radius/Servers
 Provides:       radiusd