From fbc5c14a81571fddd0e5b2c1b62eba5843c01b8d Mon Sep 17 00:00:00 2001
From: Paul Howarth <pghmcfc@fedoraproject.org>
Date: Feb 19 2010 13:37:15 +0000
Subject: Update to 1.3.2d


---

diff --git a/.cvsignore b/.cvsignore
index 0ef3122..0d8f788 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
-proftpd-1.3.2b.tar.bz2
+proftpd-1.3.2d.tar.bz2
 proftpd-mod-vroot-0.8.5.tar.gz
 proftpd-mod-exec-0.9.6.tar.gz
diff --git a/proftpd.spec b/proftpd.spec
index 1aa31b6..32d8dc9 100644
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -11,7 +11,7 @@
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
-Version:		1.3.2b
+Version:		1.3.2d
 Release:		%{?prever:0.}%{rpmrel}%{?prever:.%{prever}}%{?dist}
 License:		GPLv2+
 Group:			System Environment/Daemons
@@ -164,7 +164,6 @@ SMOD5=mod_wrap2:mod_wrap2_file:mod_wrap2_sql
 
 %{__make} %{?_smp_mflags}
 
-
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot} \
@@ -184,11 +183,9 @@ SMOD5=mod_wrap2:mod_wrap2_file:mod_wrap2_sql
 # Find translations
 %find_lang proftpd
 
-
 %clean
 %{__rm} -rf %{buildroot}
 
-
 %post
 if [ $1 -eq 1 ]; then
 	/sbin/chkconfig --add proftpd
@@ -214,7 +211,6 @@ if [ $1 -ge 1 ]; then
 	/sbin/service proftpd condrestart &>/dev/null || :
 fi
 
-
 %files -f proftpd.lang
 %defattr(-,root,root,-)
 %doc COPYING CREDITS ChangeLog NEWS README
@@ -289,8 +285,34 @@ fi
 %defattr(-,root,root,-)
 %{_libexecdir}/proftpd/mod_sql_postgres.so
 
-
 %changelog
+* Mon Feb 15 2010 Paul Howarth <paul@city-fan.org> 1.3.2d-1
+- Update to 1.3.2d, addressing the following issues: 
+  - mod_tls doesn't compile with pre-0.9.7 openssl (bug 3358) 
+  - Lack of PID protection in ScoreboardFile (bug 3370) 
+  - Crash when retrying a failed login with mod_radius being used (bug 3372) 
+  - RADIUS authentication broken on 64-bit platforms (bug 3381) 
+  - SIGHUP eventually causes certain DSO modules to segfault (bug 3387) 
+
+* Thu Dec 10 2009 Paul Howarth <paul@city-fan.org> 1.3.2c-1
+- Update to 1.3.2c, addressing the following issues:
+  - SSL/TLS renegotiation vulnerability (CVE-2009-3555, bug 3324)
+  - Failed database transaction can cause mod_quotatab to loop (bug 3228)
+  - Segfault in mod_wrap (bug 3332)
+  - <Directory> sections can have <Limit> problems (bug 3337)
+  - mod_wrap2 segfaults when a valid user retries the USER command (bug 3341)
+  - mod_auth_file handles 'getgroups' request incorrectly (bug 3347)
+  - Segfault caused by scrubbing zero-length portion of memory (bug 3350)
+- Drop upstreamed segfault patch
+
+* Thu Dec 10 2009 Paul Howarth <paul@city-fan.org> 1.3.2b-3
+- Add patch for upstream bug 3350 - segfault on auth failures
+
+* Wed Dec  9 2009 Paul Howarth <paul@city-fan.org> 1.3.2b-2
+- Reduce the mod_facts patch to the single commit addressing the issue with
+  directory names with glob characters (#521634), avoiding introducing a
+  further problem with <Limit> (#544002)
+
 * Wed Oct 21 2009 Paul Howarth <paul@city-fan.org> 1.3.2b-1
 - Update to 1.3.2b
   - Fixed regression causing command-line define options not to work (bug 3221)
diff --git a/sources b/sources
index 1b98cee..c00dcf5 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-0d6777839f37115654ce384841f68131  proftpd-1.3.2b.tar.bz2
+0941935e30199a3f22f7225fe76bc489  proftpd-1.3.2d.tar.bz2
 139fc328c43a9afbe290ec787713096b  proftpd-mod-vroot-0.8.5.tar.gz
 dfcaf605f116c29d7b4771a9b02f509b  proftpd-mod-exec-0.9.6.tar.gz