diff --git a/.gitignore b/.gitignore index 44bfd43..7295f19 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,9 @@ -# master/f22 +# master +/proftpd-1.3.5.tar.gz +/proftpd-mod-geoip-0.3.tar.gz +/v0.9.4.tar.gz +/Test-Unit-0.14.tar.gz +# f22 /proftpd-1.3.5.tar.gz /proftpd-mod-geoip-0.3.tar.gz /mod_vroot-0.9.3.tar.gz diff --git a/proftpd.spec b/proftpd.spec index 19252e5..c2e7ba2 100644 --- a/proftpd.spec +++ b/proftpd.spec @@ -41,9 +41,9 @@ %define _hardened_build 1 #global prever rc3 -%global rpmrel 6 +%global rpmrel 7 %global mod_geoip_version 0.3 -%global mod_vroot_version 0.9.3 +%global mod_vroot_version 0.9.4 Summary: Flexible, stable and highly-configurable FTP server Name: proftpd @@ -58,7 +58,7 @@ Source2: proftpd.socket Source3: proftpd@.service Source5: proftpd-welcome.msg Source9: proftpd.sysconfig -Source10: http://github.com/Castaglia/proftpd-mod_vroot/archive/mod_vroot-%{mod_vroot_version}.tar.gz +Source10: http://github.com/Castaglia/proftpd-mod_vroot/archive/v%{mod_vroot_version}.tar.gz Source11: http://www.castaglia.org/proftpd/modules/proftpd-mod-geoip-%{mod_geoip_version}.tar.gz # The integration tests require perl(Test::Unit) 0.14, which is the latest release on CPAN # However, the version in Fedora is 0.25 from sourceforge, which is incompatible with the test suite, @@ -196,7 +196,7 @@ ProFTPD server: %setup -q -n %{name}-%{version}%{?prever} -a 10 -a 11 -a 13 # Copy mod_vroot source, documentation and tests into place -cd proftpd-mod_vroot-mod_vroot-%{mod_vroot_version} +cd proftpd-mod_vroot-%{mod_vroot_version} cp -p mod_vroot.c ../contrib/ cp -p mod_vroot.html ../doc/contrib/ cp -p t/lib/ProFTPD/Tests/Modules/mod_vroot.pm \ @@ -510,6 +510,12 @@ fi %{_mandir}/man1/ftpwho.1* %changelog +* Wed May 27 2015 Paul Howarth - 1.3.5-7 +- Update mod_vroot to 0.9.4 + - Fix broken vroot alias checks (GH#4, GH#5) + - Improve documentation + - Add further regression tests + * Tue Apr 28 2015 Paul Howarth - 1.3.5-6 - Unauthenticated copying of files via SITE CPFR/CPTO was allowed by mod_copy (CVE-2015-3306, http://bugs.proftpd.org/show_bug.cgi?id=4169) diff --git a/sources b/sources index c4e66e3..7f66326 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ aff1bff40e675244d72c4667f203e5bb proftpd-1.3.5.tar.gz cc0e479406436e474ca7d59994fa73bb proftpd-mod-geoip-0.3.tar.gz -511e295d7f9447a07229010045fb9ca8 mod_vroot-0.9.3.tar.gz +af6af66bbd41fa24dfba2f461781d847 v0.9.4.tar.gz ad574713bcd00f62883ff2f9a84eec1f Test-Unit-0.14.tar.gz