From d21fbc9b797959971bd053d7b5d109f47e93afec Mon Sep 17 00:00:00 2001
From: John Dennis <jdennis@redhat.com>
Date: Jun 22 2011 16:08:01 +0000
Subject: Upgrade to latest upstream release: 2.1.11


---

diff --git a/.gitignore b/.gitignore
index 1939ae4..49c9a03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 freeradius-server-2.1.9.tar.bz2
 /freeradius-server-2.1.10.tar.bz2
+/freeradius-server-2.1.11.tar.bz2
diff --git a/freeradius-lt-dladvise.patch b/freeradius-lt-dladvise.patch
deleted file mode 100644
index 7eb4db1..0000000
--- a/freeradius-lt-dladvise.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -r -u freeradius-server-2.1.10.orig/autogen.sh freeradius-server-2.1.10/autogen.sh
---- freeradius-server-2.1.10.orig/autogen.sh	2010-09-28 07:03:56.000000000 -0400
-+++ freeradius-server-2.1.10/autogen.sh	2011-03-24 10:36:26.000000000 -0400
-@@ -16,6 +16,6 @@
- for F in $mysubdirs
- do
- 	echo "Configuring in $F..."
--	(cd $F && grep "^AC_CONFIG_HEADER" configure.in > /dev/null && autoheader -I$parentdir)
-+	(cd $F && grep "^AC_CONFIG_HEADER" configure.in > /dev/null || exit 0; autoheader -I$parentdir)
- 	(cd $F && autoconf -I$parentdir)
- done
-Only in freeradius-server-2.1.10: autogen.sh~
-diff -r -u freeradius-server-2.1.10.orig/configure freeradius-server-2.1.10/configure
---- freeradius-server-2.1.10.orig/configure	2010-09-28 07:03:56.000000000 -0400
-+++ freeradius-server-2.1.10/configure	2011-03-23 18:09:45.000000000 -0400
-@@ -25121,7 +25121,7 @@
- if test $ac_cv_func_lt_dladvise_init = yes; then
- 
- cat >>confdefs.h <<\_ACEOF
--#define HAVE_HAVE_LT_DLADVISE_INIT
-+#define HAVE_LT_DLADVISE_INIT
- _ACEOF
- 
- fi
-Only in freeradius-server-2.1.10: configure~
-diff -r -u freeradius-server-2.1.10.orig/configure.in freeradius-server-2.1.10/configure.in
---- freeradius-server-2.1.10.orig/configure.in	2010-09-28 07:03:56.000000000 -0400
-+++ freeradius-server-2.1.10/configure.in	2011-03-23 18:09:33.000000000 -0400
-@@ -936,7 +936,7 @@
- 
- old_LIBS="$LIBS"
- LIBS="$LIBS $LIBLTDL"
--AC_CHECK_FUNC(lt_dladvise_init, AC_DEFINE(HAVE_HAVE_LT_DLADVISE_INIT, [], [Do we have the lt_dladvise_init function]))
-+AC_CHECK_FUNC(lt_dladvise_init, AC_DEFINE(HAVE_LT_DLADVISE_INIT, [], [Do we have the lt_dladvise_init function]))
- LIBS="$old_LIBS"
- 
- dnl Check for libcrypt
-Only in freeradius-server-2.1.10: configure.in~
diff --git a/freeradius-radtest-ipv6.patch b/freeradius-radtest-ipv6.patch
deleted file mode 100644
index d2baf3d..0000000
--- a/freeradius-radtest-ipv6.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- freeradius-server-2.1.10/src/main/radtest.in.orig	2011-02-14 16:19:05.000000000 -0500
-+++ freeradius-server-2.1.10/src/main/radtest.in	2011-02-14 16:24:18.000000000 -0500
-@@ -16,6 +16,8 @@
- 	echo "        -t <type>           Set authentication method" >&2
- 	echo "                            type can be pap, chap, mschap, or eap-md5" >&2
- 	echo "        -x                  Enable debug output" >&2
-+	echo "        -4                  Use IPv4 address family for the NAS (default)" >&2
-+	echo "        -6                  Use IPv6 address family for the NAS" >&2
- 	exit 1
- }
- 
-@@ -30,6 +32,7 @@
- 
- OPTIONS=
- PASSWORD="User-Password"
-+family="IPv4"
- 
- #  We need at LEAST these many options
- if [ $# -lt 5 ]
-@@ -41,6 +44,14 @@
- while [ `echo "$1" | cut -c 1` = "-" ]
- do
-    case "$1" in
-+	-4) 
-+		family="IPv4"
-+		shift
-+		;;
-+	-6) 
-+		family="IPv6"
-+		shift
-+		;;
- 	-d) 
- 		OPTIONS="$OPTIONS -d $2"
-     		shift;shift
-@@ -97,10 +108,25 @@
- 	nas=`hostname`
- fi
- 
-+# Set the address family
-+case "$family" in
-+	IPv4)
-+		OPTIONS="$OPTIONS -4"
-+		NAS_ADDR_ATTR="NAS-IP-Address"
-+		;;
-+	IPv6)
-+		OPTIONS="$OPTIONS -6"
-+		NAS_ADDR_ATTR="NAS-IPv6-Address"
-+		;;
-+	*)
-+		echo "ERROR: unknown address family ($family)" >&2
-+		usage
-+esac
-+
- (
- 	echo "User-Name = \"$1\""
- 	echo "$PASSWORD = \"$2\""
--	echo "NAS-IP-Address = $nas"
-+	echo "$NAS_ADDR_ATTR = $nas"
- 	echo "NAS-Port = $4"
- 	if [ "$radclient" = "$radeapclient" ]
- 	then
diff --git a/sources b/sources
index 9f6ab2e..98c709e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8ea2bd39460a06212decf2c14fdf3fb8  freeradius-server-2.1.10.tar.bz2
+96b21a95117d8ebde689c4c13c028d30  freeradius-server-2.1.11.tar.bz2