diff --git a/.gitignore b/.gitignore index 19f281d..17beaf6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /proftpd-1.3.3c.tar.bz2 /proftpd-mod-geoip-0.2.tar.gz -/proftpd-mod-vroot-0.8.5.tar.gz +/proftpd-mod-vroot-0.9.tar.gz diff --git a/proftpd.conf b/proftpd.conf index f391cfb..736f610 100644 --- a/proftpd.conf +++ b/proftpd.conf @@ -15,7 +15,7 @@ DefaultServer on # work at session-end time (http://bugzilla.redhat.com/477120) VRootEngine on DefaultRoot ~ !adm -VRootAlias etc/security/pam_env.conf /etc/security/pam_env.conf +VRootAlias /etc/security/pam_env.conf etc/security/pam_env.conf # Use pam to authenticate (default) and be authoritative AuthPAMConfig proftpd diff --git a/proftpd.init b/proftpd.init old mode 100755 new mode 100644 index f00f790..868720a --- a/proftpd.init +++ b/proftpd.init @@ -18,6 +18,7 @@ # Provides: proftpd ftpserver # Required-Start: $local_fs $network $named $remote_fs # Required-Stop: $local_fs $network $named $remote_fs +# Default-Stop: 0 1 6 # Short-Description: ProFTPd FTP Server # Description: ProFTPd is an enhanced FTP server with a focus towards # simplicity, security, and ease of configuration. diff --git a/proftpd.spec b/proftpd.spec index 0cdaf50..666572f 100644 --- a/proftpd.spec +++ b/proftpd.spec @@ -7,7 +7,7 @@ %endif #global prever rc4 -%global rpmrel 2 +%global rpmrel 3 Summary: Flexible, stable and highly-configurable FTP server Name: proftpd @@ -26,7 +26,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.8.5.tar.gz +Source10: http://www.castaglia.org/proftpd/modules/proftpd-mod-vroot-0.9.tar.gz Source11: http://www.castaglia.org/proftpd/modules/proftpd-mod-geoip-0.2.tar.gz Source12: proftpd-tmpfs.conf Patch0: proftpd-1.3.2rc3-nostrip.patch @@ -300,6 +300,12 @@ fi %{_libexecdir}/proftpd/mod_sql_postgres.so %changelog +* Fri Dec 10 2010 Paul Howarth 1.3.3c-3 +- Update mod_vroot to 0.9 (improvements to alias handling) +- Note that the previous default configuration is broken by this change; see + the new VRootAlias line in proftpd.conf +- Add Default-Stop LSB keyword in initscript (for runlevels 0, 1, and 6) + * Wed Dec 1 2010 Paul Howarth 1.3.3c-2 - Add /etc/tmpfiles.d/proftpd.conf for builds on Fedora 15 onwards to support running with /var/run on tmpfs (#656675) diff --git a/sources b/sources index ffbc64c..979ccb0 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 8571bd78874b557e98480ed48e2df1d2 proftpd-1.3.3c.tar.bz2 6242218c0c98efbab8076ec3bc9fd4d5 proftpd-mod-geoip-0.2.tar.gz -139fc328c43a9afbe290ec787713096b proftpd-mod-vroot-0.8.5.tar.gz +181669582a2cf5d54f0df15a4d83eae6 proftpd-mod-vroot-0.9.tar.gz