[proftpd] Update to 1.3.4a

[Paul Howarth]

commit 5b9846681f959fb5c65e0d671afe6f7ac3520189
Author: Paul Howarth <paul at city-fan.org>
Date:   Fri Nov 11 22:52:50 2011 +0000

    Update to 1.3.4a
    
    - New upstream release 1.3.4a:
      - Fixed mod_load/mod_wrap2 build issues
    - Drop now-redundant workaround for building mod_load and mod_wrap2
    - Drop upstreamed patch for xinetd config typo

 .gitignore                      |    7 ++++++-
 proftpd-1.3.4-xinetd-typo.patch |    8 --------
 proftpd.spec                    |   15 +++++++--------
 sources                         |    2 +-
 4 files changed, 14 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9702fb4..10951cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,9 @@
-# master/f15/f16
+# master
+/proftpd-1.3.4a.tar.bz2
+/proftpd-mod-geoip-0.3.tar.gz
+/proftpd-mod-vroot-0.9.2.tar.gz
+/Test-Unit-0.14.tar.gz
+# f16/f15
 /proftpd-1.3.4.tar.bz2
 /proftpd-mod-geoip-0.3.tar.gz
 /proftpd-mod-vroot-0.9.2.tar.gz
diff --git a/proftpd.spec b/proftpd.spec
index 7ba4af8..281f3cb 100644
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -45,7 +45,7 @@
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
-Version:		1.3.4
+Version:		1.3.4a
 Release:		%{?prever:0.}%{rpmrel}%{?prever:.%{prever}}%{?dist}
 License:		GPLv2+
 Group:			System Environment/Daemons
@@ -64,7 +64,6 @@ Source11:		http://www.castaglia.org/proftpd/modules/proftpd-mod-geoip-0.3.tar.gz
 Source13:		http://search.cpan.org/CPAN/authors/id/C/CL/CLEMBURG/Test-Unit-0.14.tar.gz
 Patch1:			proftpd-1.3.4rc3-mysql-password.patch
 Patch2:			proftpd.conf-no-memcached.patch
-Patch3:			proftpd-1.3.4-xinetd-typo.patch
 Patch4:			proftpd-1.3.4rc1-mod_vroot-test.patch
 Patch5:			proftpd-1.3.4-utf8.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
@@ -156,17 +155,11 @@ cp -p mod_vroot/t/modules/mod_vroot.t tests/t/modules/
 cp -p mod_geoip/mod_geoip.c contrib/
 cp -p mod_geoip/mod_geoip.html doc/contrib/
 
-# Allow conf.h to find config.h (upstream bug 3127)
-ln -s ../config.h include/config.h
-
 # Use my_make_scrambled_password rather than the deprecated
 # make_scrambled_password, which isn't exported from Fedora's MySQL
 # in F-15 onwards (#718327, upstream bug 3669)
 %patch1 -p1 -b .mypasswd
 
-# Fix typo in upstream xinetd configuration
-%patch3 -p1 -b .xinetd
-
 # If we're running the full test suite, include the mod_vroot test
 %patch4 -p1 -b .test_vroot
 
@@ -462,6 +455,12 @@ fi
 %{_libexecdir}/proftpd/mod_sql_postgres.so
 
 %changelog
+* Fri Nov 11 2011 Paul Howarth <paul at city-fan.org> 1.3.4a-1
+- Update to 1.3.4a:
+  - Fixed mod_load/mod_wrap2 build issues
+- Drop now-redundant workaround for building mod_load and mod_wrap2
+- Drop upstreamed patch for xinetd config typo
+
 * Thu Nov 10 2011 Paul Howarth <paul at city-fan.org> 1.3.4-1
 - Update to 1.3.4, addressing the following bugs since 1.3.4rc3:
   - ProFTPD with mod_sql_mysql dies of "Alarm clock" on FreeBSD (bug 3702)
diff --git a/sources b/sources
index 59cb65a..28a45ea 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-7734142c7fa7212ab9f188a617a4be87  proftpd-1.3.4.tar.bz2
+4e3235dc1ef95d36e59721d70c5c489c  proftpd-1.3.4a.tar.bz2
 cc0e479406436e474ca7d59994fa73bb  proftpd-mod-geoip-0.3.tar.gz
 6db495b25e9da2ba0c901e7c44e119bc  proftpd-mod-vroot-0.9.2.tar.gz
 ad574713bcd00f62883ff2f9a84eec1f  Test-Unit-0.14.tar.gz