From b826951140a3fa9357ce14f9a61663eb4a419c9f Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Nov 02 2010 15:32:26 +0000 Subject: Update to 1.3.3c New upstream maintenance release 1.3.3c (#647965) - Fixed Telnet IAC stack overflow vulnerability (ZDI-CAN-925) - Fixed directory traversal bug in mod_site_misc (CVE-2010-3867) - Fixed SQLite authentications using "SQLAuthType Backend" New DSO module: mod_geoip --- diff --git a/.gitignore b/.gitignore index e9db5de..19f281d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ -/proftpd-1.3.3b.tar.bz2 +/proftpd-1.3.3c.tar.bz2 +/proftpd-mod-geoip-0.2.tar.gz /proftpd-mod-vroot-0.8.5.tar.gz diff --git a/proftpd.conf b/proftpd.conf index 1b9756a..3bf6127 100644 --- a/proftpd.conf +++ b/proftpd.conf @@ -104,6 +104,11 @@ LogFormat auth "%v [%P] %h %t \"%r\" %s" # (http://www.proftpd.org/docs/modules/mod_facl.html) # LoadModule mod_facl.c # +# Support for using the GeoIP library to look up geographical information on +# the connecting client and usng that to set access controls for the server +# (http://www.castaglia.org/proftpd/modules/mod_geoip.html) +# LoadModule mod_geoip.c +# # Configure server availability based on system load # (http://www.proftpd.org/docs/contrib/mod_load.html) # LoadModule mod_load.c diff --git a/proftpd.spec b/proftpd.spec index ac56d24..73aa1e3 100644 --- a/proftpd.spec +++ b/proftpd.spec @@ -11,7 +11,7 @@ Summary: Flexible, stable and highly-configurable FTP server Name: proftpd -Version: 1.3.3b +Version: 1.3.3c Release: %{?prever:0.}%{rpmrel}%{?prever:.%{prever}}%{?dist} License: GPLv2+ Group: System Environment/Daemons @@ -27,6 +27,7 @@ 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 @@ -34,7 +35,7 @@ Requires(preun): /sbin/service, /sbin/chkconfig, coreutils, findutils Requires(postun): /sbin/service BuildRequires: pam-devel, ncurses-devel, pkgconfig, gettext, zlib-devel BuildRequires: openssl-devel, libacl-devel, libcap-devel, /usr/include/tcpd.h -BuildRequires: openldap-devel, mysql-devel, postgresql-devel +BuildRequires: openldap-devel, mysql-devel, postgresql-devel, GeoIP-devel Provides: ftpserver %description @@ -72,12 +73,16 @@ Requires: %{name} = %{version}-%{release} Module to add PostgreSQL support to the ProFTPD FTP server. %prep -%setup -q -n %{name}-%{version}%{?prever} -a 10 +%setup -q -n %{name}-%{version}%{?prever} -a 10 -a 11 # Copy mod_vroot source and documentation into place %{__cp} -p mod_vroot/mod_vroot.c contrib/ %{__cp} -p mod_vroot/mod_vroot.html doc/contrib/ +# Copy mod_geoip source and documentation into place +%{__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 @@ -126,7 +131,7 @@ done SMOD1=mod_sql:mod_sql_passwd:mod_sql_mysql:mod_sql_postgres SMOD2=mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_radius:mod_quotatab_sql SMOD3=mod_ldap:mod_ban:mod_wrap:mod_ctrls_admin:mod_facl:mod_load -SMOD4=mod_radius:mod_ratio:mod_rewrite:mod_site_misc:mod_exec:mod_shaper +SMOD4=mod_radius:mod_ratio:mod_rewrite:mod_site_misc:mod_exec:mod_shaper:mod_geoip SMOD5=mod_wrap2:mod_wrap2_file:mod_wrap2_sql SMOD6=mod_sftp:mod_sftp_pam:mod_sftp_sql:mod_tls_shmcache @@ -238,6 +243,7 @@ fi %{_libexecdir}/proftpd/mod_ctrls_admin.so %{_libexecdir}/proftpd/mod_exec.so %{_libexecdir}/proftpd/mod_facl.so +%{_libexecdir}/proftpd/mod_geoip.so %{_libexecdir}/proftpd/mod_ifsession.so %{_libexecdir}/proftpd/mod_load.so %{_libexecdir}/proftpd/mod_quotatab.so @@ -279,6 +285,13 @@ fi %{_libexecdir}/proftpd/mod_sql_postgres.so %changelog +* Mon Nov 1 2010 Paul Howarth 1.3.3c-1 +- Update to 1.3.3c (#647965) + - Fixed Telnet IAC stack overflow vulnerability (ZDI-CAN-925) + - Fixed directory traversal bug in mod_site_misc (CVE-2010-3867) + - Fixed SQLite authentications using "SQLAuthType Backend" +- New DSO module: mod_geoip + * Fri Sep 10 2010 Paul Howarth 1.3.3b-1 - Update to 1.3.3b - Fixed SFTP directory listing bug diff --git a/sources b/sources index 72e78ff..ffbc64c 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -721b8232fcac36317a6a1d29fa86250e proftpd-1.3.3b.tar.bz2 +8571bd78874b557e98480ed48e2df1d2 proftpd-1.3.3c.tar.bz2 +6242218c0c98efbab8076ec3bc9fd4d5 proftpd-mod-geoip-0.2.tar.gz 139fc328c43a9afbe290ec787713096b proftpd-mod-vroot-0.8.5.tar.gz