[proftpd/f14] Update to 1.3.3f

[Paul Howarth]

commit cc14023cc83f2271057f59196f8b82d9de54e332
Author: Paul Howarth <paul at city-fan.org>
Date:   Tue Sep 27 13:14:16 2011 +0100

    Update to 1.3.3f
    
    - New upstream release 1.3.3f, fixing a number of bugs:
      - Avoid spinning proftpd process if read(2) returns EAGAIN (bug 3639)
      - Segfault seen in mod_sql_mysql if "SQLAuthenticate groupsetfast" used
        (bug 3642)
      - Disable signal handling for exiting session processes (bug 3644)
      - TCPAccessSyslogLevel directive broken by Bug#3317 (bug 3652)
      - TLSVerifyOrder directive is broken (bug 3658)
      - Segmentation fault if there is regex <IfUser> section in a <VirtualHost>
        section; this is a regression caused by a bad backport of the fix for
        Bug#3625 to the 1.3.3 branch (bug 3659)
      - Filenames with embedded IAC do not get processed correctly (bug 3697)
    - Drop upstreamed nostrip patch
    - Use new --disable-strip option to retain debugging symbols
    - Use upstream LDAP quota table schema rather than our own copy

 .gitignore                       |    2 +-
 proftpd-1.3.2rc3-nostrip.patch   |   36 ------------------------------------
 proftpd-mod_quotatab_ldap.ldif   |   29 -----------------------------
 proftpd-mod_quotatab_ldap.schema |    9 ---------
 proftpd.spec                     |   31 +++++++++++++++++++------------
 sources                          |    2 +-
 6 files changed, 21 insertions(+), 88 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ba4e0c3..42290f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/proftpd-1.3.3e.tar.bz2
+/proftpd-1.3.3f.tar.bz2
 /proftpd-mod-geoip-0.2.tar.gz
 /proftpd-mod-vroot-0.8.5.tar.gz
diff --git a/proftpd.spec b/proftpd.spec
index f39fe7f..f79cdc9 100644
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -11,7 +11,7 @@
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
-Version:		1.3.3e
+Version:		1.3.3f
 Release:		%{?prever:0.}%{rpmrel}%{?prever:.%{prever}}%{?dist}
 License:		GPLv2+
 Group:			System Environment/Daemons
@@ -23,12 +23,9 @@ Source3:		proftpd-xinetd
 Source4:		proftpd.logrotate
 Source5:		proftpd-welcome.msg
 Source6:		proftpd.pam
-Source7:		proftpd-mod_quotatab_ldap.ldif
-Source8:		proftpd-mod_quotatab_ldap.schema
 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-geoip-0.2.tar.gz
-Patch0:			proftpd-1.3.2rc3-nostrip.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post):		/sbin/chkconfig
 Requires(preun):	/sbin/service, /sbin/chkconfig, coreutils, findutils
@@ -83,9 +80,6 @@ cp -p mod_vroot/mod_vroot.html doc/contrib/
 cp -p mod_geoip/mod_geoip.c contrib/
 cp -p mod_geoip/mod_geoip.html doc/contrib/
 
-# Don't strip binaries - needed for useful debuginfo
-%patch0 -p1 -b .nostrip
-
 # Avoid documentation name conflicts
 mv contrib/README contrib/README.contrib
 
@@ -96,10 +90,6 @@ sed -e 's#@PKIDIR@#%{pkidir}#g' \
 # Avoid docfile dependencies
 chmod -x contrib/xferstats.holger-preiss
 
-# Copy in LDAP schema/LDIF
-cp -p %{SOURCE7} 70proftpd-quota.ldif
-cp -p %{SOURCE8} proftpd-quota.schema
-
 # PAM Configuration:
 # Default PAM configuration file uses password-auth common config;
 # revert to system-auth if password-auth is not available
@@ -138,6 +128,7 @@ SMOD6=mod_sftp:mod_sftp_pam:mod_sftp_sql:mod_tls_shmcache
 %configure \
 	--libexecdir="%{_libexecdir}/proftpd" \
 	--localstatedir="%{_localstatedir}/run/proftpd" \
+	--disable-strip \
 	--enable-ctrls \
 	--enable-dso \
 	--enable-facl \
@@ -272,7 +263,7 @@ fi
 
 %files ldap
 %defattr(-,root,root,-)
-%doc README.LDAP 70proftpd-quota.ldif proftpd-quota.schema
+%doc README.LDAP contrib/mod_quotatab_ldap.ldif contrib/mod_quotatab_ldap.schema
 %{_libexecdir}/proftpd/mod_ldap.so
 %{_libexecdir}/proftpd/mod_quotatab_ldap.so
 
@@ -285,6 +276,22 @@ fi
 %{_libexecdir}/proftpd/mod_sql_postgres.so
 
 %changelog
+* Tue Sep 27 2011 Paul Howarth <paul at city-fan.org> 1.3.3f-1
+- Update to 1.3.3f, fixing a large number of bugs reported upstream:
+  - Avoid spinning proftpd process if read(2) returns EAGAIN (bug 3639)
+  - Segfault seen in mod_sql_mysql if "SQLAuthenticate groupsetfast" used
+    (bug 3642)
+  - Disable signal handling for exiting session processes (bug 3644)
+  - TCPAccessSyslogLevel directive broken by Bug#3317 (bug 3652)
+  - TLSVerifyOrder directive is broken (bug 3658)
+  - Segmentation fault if there is regex <IfUser> section in a <VirtualHost>
+    section; this is a regression caused by a bad backport of the fix for
+    Bug#3625 to the 1.3.3 branch (bug 3659)
+  - Filenames with embedded IAC do not get processed correctly (bug 3697)
+- Drop upstreamed nostrip patch
+- Use new --disable-strip option to retain debugging symbols
+- Use upstream LDAP quota table schema rather than our own copy
+
 * Mon Apr  4 2011 Paul Howarth <paul at city-fan.org> 1.3.3e-1
 - Update to 1.3.3e, fixing a large number of bugs reported upstream:
   - Process privileges may not handled properly when --enable-autoshadow is
diff --git a/sources b/sources
index 0d5e069..37690e4 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-acc49b6589bc8c9fdf1dce9000bebdbd  proftpd-1.3.3e.tar.bz2
+e9416d2aa7ac1246af4fc8a80fd73f27  proftpd-1.3.3f.tar.bz2
 6242218c0c98efbab8076ec3bc9fd4d5  proftpd-mod-geoip-0.2.tar.gz
 139fc328c43a9afbe290ec787713096b  proftpd-mod-vroot-0.8.5.tar.gz