From 2601d91d12ee117cc97820cee452963205e02753 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@fedoraproject.org>
Date: Fri, 8 Sep 2006 12:36:59 +0000
Subject: [PATCH] [tw] - new version 1.1.3 with lots of upstream bug fixes,
 some security fixes     (#205654)

---
 .cvsignore                   |  2 +-
 freeradius-1.1.3-build.patch | 13 +++++++++++++
 freeradius.spec              | 15 ++++++++++-----
 sources                      |  2 +-
 4 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 freeradius-1.1.3-build.patch

diff --git a/.cvsignore b/.cvsignore
index b61a203..c6ad80b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-freeradius-1.1.2.tar.gz
+freeradius-1.1.3.tar.bz2
diff --git a/freeradius-1.1.3-build.patch b/freeradius-1.1.3-build.patch
new file mode 100644
index 0000000..117a445
--- /dev/null
+++ b/freeradius-1.1.3-build.patch
@@ -0,0 +1,13 @@
+--- freeradius-1.1.2/src/modules/rules.mak.build	2006-05-25 18:24:40.000000000 +0200
++++ freeradius-1.1.2/src/modules/rules.mak	2006-06-01 16:12:49.000000000 +0200
+@@ -113,8 +113,8 @@
+ $(TARGET).la: $(LT_OBJS)
+ 	$(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
+ 	-module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) -o $@     \
+-	-rpath $(libdir) $^ $(top_builddir)/src/lib/libradius.la \
+-	$(RLM_LIBS) $(LIBS)
++	-rpath $(libdir) $^ \
++	$(RLM_LIBS) -L$(libdir) $(LIBS)
+ 
+ #######################################################################
+ #
diff --git a/freeradius.spec b/freeradius.spec
index f8f4d3a..047b3ff 100644
--- a/freeradius.spec
+++ b/freeradius.spec
@@ -1,11 +1,11 @@
 Summary: High-performance and highly configurable free RADIUS server.
 Name: freeradius
-Version: 1.1.2
-Release: 2
+Version: 1.1.3
+Release: 1
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
-Source0: ftp://ftp.freeradius.org/pub/radius/%{name}-%{version}.tar.gz
+Source0: ftp://ftp.freeradius.org/pub/radius/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires: chkconfig net-snmp krb5-libs net-snmp-utils
 BuildRequires: net-snmp-devel net-snmp-utils krb5-devel openldap-devel 
@@ -19,7 +19,7 @@ Patch3: freeradius-0.9.0-pam-multilib.patch
 Patch4: freeradius-0.9.0-com_err.patch
 Patch5: freeradius-1.1.1-pie.patch
 Patch8: freeradius-1.0.0-samba3.patch
-Patch10: freeradius-1.1.2-build.patch
+Patch10: freeradius-1.1.3-build.patch
 Patch11: freeradius-1.1.2-no_sql_inc.patch
 
 %description
@@ -95,6 +95,7 @@ export LDFLAGS="-L${RPM_BUILD_ROOT}%{_libdir}"
 	--with-threads \
 	--with-thread-pool \
  	--disable-ltdl-install \
+	--with-docdir=%{_docdir}/freeradius-%{version} \
 	--with-rlm-sql_postgresql-include-dir=/usr/include/pgsql \
 	--with-rlm-sql-postgresql-lib-dir=%{_libdir} \
 	--with-rlm-sql_mysql-include-dir=/usr/include/mysql \
@@ -178,7 +179,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc %{_docdir}/freeradius-%{version}*/
+%doc %{_docdir}/freeradius-%{version}/
 %config (noreplace) /etc/pam.d/radiusd
 %config (noreplace) /etc/logrotate.d/radiusd
 %config (noreplace) /etc/rc.d/init.d/radiusd
@@ -279,6 +280,10 @@ fi
 
 
 %changelog
+* Tue Aug 15 2006 Thomas Woerner <twoerner@redhat.com> 1.1.3-1
+- new version 1.1.3 with lots of upstream bug fixes, some security fixes
+  (#205654)
+
 * Tue Aug 15 2006 Thomas Woerner <twoerner@redhat.com> 1.1.2-2
 - commented out include for sql.conf in radiusd.conf (#202561)
 
diff --git a/sources b/sources
index c40d44d..f5bc5ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6649ac5f9666b4a8cd55a837068ca61e  freeradius-1.1.2.tar.gz
+ee4b817e5f808bf2e95c1aeadff09990  freeradius-1.1.3.tar.bz2