From 65d2f81865d38a44151c6274f695236cecc6190f Mon Sep 17 00:00:00 2001
From: Paul Howarth <pghmcfc@fedoraproject.org>
Date: Oct 21 2009 11:18:26 +0000
Subject: update to 1.3.2b; drop upstreamed defines patch (bug 3221)


---

diff --git a/.cvsignore b/.cvsignore
index fa5aabf..0ef3122 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
-proftpd-1.3.2a.tar.bz2
+proftpd-1.3.2b.tar.bz2
 proftpd-mod-vroot-0.8.5.tar.gz
 proftpd-mod-exec-0.9.6.tar.gz
diff --git a/proftpd-1.3.2a-defines.patch b/proftpd-1.3.2a-defines.patch
deleted file mode 100644
index a293e05..0000000
--- a/proftpd-1.3.2a-defines.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://bugs.proftpd.org/show_bug.cgi?id=3221
-
---- proftpd-1.3.2a/src/dirtree.c	2009-04-28 23:33:57.000000000 +0100
-+++ proftpd-1.3.2a/src/dirtree.c	2009-07-06 12:06:51.000000000 +0100
-@@ -575,6 +575,17 @@
-     }
-   }
- 
-+  if (defines_perm_list) {
-+    char **defines = defines_perm_list->elts;
-+    register unsigned int i = 0;
-+
-+    for (i = 0; i < defines_perm_list->nelts; i++) {
-+      if (defines[i] &&
-+          strcmp(defines[i], definition) == 0)
-+        return TRUE;
-+    }
-+  }
-+
-   errno = ENOENT;
-   return FALSE;
- }
diff --git a/proftpd.spec b/proftpd.spec
index 972f544..773fd1f 100644
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -7,11 +7,11 @@
 %endif
 
 #global prever rc3
-%global rpmrel 7
+%global rpmrel 1
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
-Version:		1.3.2a
+Version:		1.3.2b
 Release:		%{?prever:0.}%{rpmrel}%{?prever:.%{prever}}%{?dist}
 License:		GPLv2+
 Group:			System Environment/Daemons
@@ -29,7 +29,6 @@ Source9:		proftpd.sysconfig
 Source10:		http://www.castaglia.org/proftpd/modules/proftpd-mod-vroot-0.8.5.tar.gz
 Source11:		http://www.castaglia.org/proftpd/modules/proftpd-mod-exec-0.9.6.tar.gz
 Patch0:			proftpd-1.3.2rc3-nostrip.patch
-Patch1:			proftpd-1.3.2a-defines.patch
 Patch2:			proftpd-1.3.2-parallel-build.patch
 Patch3:			proftpd-1.3.2a-mlsd.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
@@ -93,9 +92,6 @@ Module to add PostgreSQL support to the ProFTPD FTP server.
 # Don't strip binaries - needed for useful debuginfo
 %patch0 -p1 -b .nostrip
 
-# Reinstate command-line defines (http://bugs.proftpd.org/3221)
-%patch1 -p1 -b .defines
-
 # Fix parallel build (http://bugs.proftpd.org/3189)
 %patch2 -p1 -b .parallel
 
@@ -295,6 +291,16 @@ fi
 
 
 %changelog
+* 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)
+  - Fixed improper SSL/TLS certificate subjectAltName verification (bug 3275)
+  - Use correct cached user values with "SQLNegativeCache on" (bug 3282)
+  - Fix slower transfers of multiple small files (bug 3284)
+  - Support MaxTransfersPerHost, MaxTransfersPerUser properly (bug 3287)
+  - Handle symlinks to directories with trailing slashes properly (bug 3297)
+- Drop upstreamed defines patch (bug 3221)
+
 * Thu Sep 17 2009 Paul Howarth <paul@city-fan.org> 1.3.2a-7
 - Restore backward SRPM compatibility broken by previous change
 
diff --git a/sources b/sources
index 4da0c37..1b98cee 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-ad3cbb5db30c5ae39e09b308892392b3  proftpd-1.3.2a.tar.bz2
+0d6777839f37115654ce384841f68131  proftpd-1.3.2b.tar.bz2
 139fc328c43a9afbe290ec787713096b  proftpd-mod-vroot-0.8.5.tar.gz
 dfcaf605f116c29d7b4771a9b02f509b  proftpd-mod-exec-0.9.6.tar.gz