[proftpd] Update mod_vroot to 0.9.2

[Paul Howarth]

commit 06304b78c1cdbbb3a0e63045c05bf52b2eb8390a
Author: Paul Howarth <paul at city-fan.org>
Date:   Tue Jan 11 12:11:34 2011 +0000

    Update mod_vroot to 0.9.2
    
    New upstream release of mod_vroot: 0.9.2
    
    Get more of the integration tests working, though there are still
    lots of fails and hence they are not run by default

 .gitignore                            |    2 +-
 proftpd-1.3.4rc1-mod_vroot-test.patch |   14 ++++++++++++++
 proftpd.spec                          |   15 +++++++++++++--
 sources                               |    2 +-
 4 files changed, 29 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a3be245..becba01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 /proftpd-1.3.4rc1.tar.bz2
 /proftpd-mod-geoip-0.2.tar.gz
-/proftpd-mod-vroot-0.9.1.tar.gz
+/proftpd-mod-vroot-0.9.2.tar.gz
 /Test-Unit-0.14.tar.gz
diff --git a/proftpd-1.3.4rc1-mod_vroot-test.patch b/proftpd-1.3.4rc1-mod_vroot-test.patch
new file mode 100644
index 0000000..e2314cc
--- /dev/null
+++ b/proftpd-1.3.4rc1-mod_vroot-test.patch
@@ -0,0 +1,14 @@
+--- proftpd-1.3.4rc1/tests/tests.pl	2010-12-15 00:57:04.000000000 +0000
++++ proftpd-1.3.4rc1/tests/tests.pl	2011-01-11 09:22:57.746669659 +0000
+@@ -283,6 +283,11 @@
+       test_class => [qw(mod_unique_id)],
+     },
+ 
++    't/modules/mod_vroot.t' => {
++      order => ++$order,
++      test_class => [qw(mod_vroot)],
++    },
++
+     't/modules/mod_wrap.t' => {
+       order => ++$order,
+       test_class => [qw(mod_wrap)],
diff --git a/proftpd.spec b/proftpd.spec
index f3e8c1b..c29f390 100644
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -12,7 +12,7 @@
 %endif
 
 %global prever rc1
-%global rpmrel 2
+%global rpmrel 3
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
@@ -31,7 +31,7 @@ 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.9.1.tar.gz
+Source10:		http://www.castaglia.org/proftpd/modules/proftpd-mod-vroot-0.9.2.tar.gz
 Source11:		http://www.castaglia.org/proftpd/modules/proftpd-mod-geoip-0.2.tar.gz
 Source12:		proftpd-tmpfs.conf
 # The integration tests require perl(Test::Unit) 0.14, which is the latest release on CPAN
@@ -44,6 +44,7 @@ Patch0:			proftpd-1.3.2rc3-nostrip.patch
 Patch1:			proftpd-1.3.4rc1-tests.patch
 Patch2:			proftpd-1.3.4rc1-netacl-localhost.patch
 Patch3:			proftpd-1.3.4rc1-netaddr-localhost.patch
+Patch4:			proftpd-1.3.4rc1-mod_vroot-test.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post):		/sbin/chkconfig
 Requires(preun):	/sbin/service, /sbin/chkconfig, coreutils, findutils
@@ -131,6 +132,9 @@ Module to add PostgreSQL support to the ProFTPD FTP server.
 %patch2 -p1 -b .netacl
 %patch3 -p1 -b .netaddr
 
+# If we're running the full test suite, include the mod_vroot test
+%patch4 -p1 -b .test_vroot
+
 # Avoid documentation name conflicts
 %{__mv} contrib/README contrib/README.contrib
 
@@ -227,7 +231,10 @@ SMOD6=mod_sftp:mod_sftp_pam:mod_sftp_sql:mod_tls_shmcache
 %check
 # Integration tests not fully maintained - stick to API tests only by default
 %if 0%{?_with_integrationtests:1}
+# Make sure we can find everything we need
 export PERL5LIB=$(pwd)/Test-Unit-0.14/lib
+export PROFTPD_TEST_DIR=$(pwd)/tests
+ln ftpdctl ftpwho tests/
 %{__make} check
 %else
 # API tests should always be OK
@@ -361,6 +368,10 @@ fi
 %{_libexecdir}/proftpd/mod_sql_postgres.so
 
 %changelog
+* Tue Jan 11 2011 Paul Howarth <paul at city-fan.org> 1.3.4-0.3.rc1
+- Update mod_vroot to 0.9.2
+- Get more of the integration tests working
+
 * Wed Jan  5 2011 Paul Howarth <paul at city-fan.org> 1.3.4-0.2.rc1
 - Update mod_vroot to 0.9.1
 - Add upstream patches making unit tests work on systems where 127.0.0.1
diff --git a/sources b/sources
index 9bc2325..1c09383 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 3472f7a8fb760f549daf485642277024  proftpd-1.3.4rc1.tar.bz2
 6242218c0c98efbab8076ec3bc9fd4d5  proftpd-mod-geoip-0.2.tar.gz
-03d114027397d62b0e3bd53337886952  proftpd-mod-vroot-0.9.1.tar.gz
+6db495b25e9da2ba0c901e7c44e119bc  proftpd-mod-vroot-0.9.2.tar.gz
 ad574713bcd00f62883ff2f9a84eec1f  Test-Unit-0.14.tar.gz