[SCM] proftpd-dfsg branch, master, updated. upstream/1.3.4a-82-g99fbc33

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit f2d974db9902b99178b815ae037da1c2eb56759e
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Jan 8 16:18:17 2013 +0100

    Added mod_geoip support.

diff --git a/debian/changelog b/debian/changelog
index 2d6bf92..f7f4f59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ proftpd-dfsg (1.3.5~rc1-1) experimental; urgency=low
 
   * New upstream pre-release.
   * Refreshed main patchset for 1.3.5 source tree.
+  * Added mod_geoip module among contributed module and a new binary
+    package to depend on GeoIP library.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 08 Jan 2013 15:42:27 +0100
 
diff --git a/debian/control b/debian/control
index 18c41cb..86096c0 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,8 @@ Build-Depends: autotools-dev,
                libssl-dev (>= 0.9.8l),
                libwrap0-dev,
                unixodbc-dev,
-               zlib1g-dev
+               zlib1g-dev,
+               libgeoip-dev
 Homepage: http://www.proftpd.org/
 Vcs-Git: git://git.debian.org/pkg-proftpd/proftpd-dfsg.git
 Vcs-Browser: http://git.debian.org/?p=pkg-proftpd/proftpd-dfsg.git
@@ -185,3 +186,19 @@ Description: Versatile, virtual-hosting FTP daemon - SQLite3 module
  upload/download ratios are also supported.
  .
  This package provides SQLite based authentication.
+
+Package: proftpd-mod-geoip
+Architecture: any
+Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Description: Versatile, virtual-hosting FTP daemon - GeoIP module
+ ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
+ Protocol daemon supports also hidden directories, virtual hosts, and
+ per-directory ".ftpaccess" files. It uses a single main configuration
+ file, with a syntax similar to Apache.
+ .
+ Because of the advanced design, anonymous-FTP directories can have
+ an arbitrary internal structure (bin, lib, etc, and special files are
+ not needed). Advanced features such as multiple password files and
+ upload/download ratios are also supported.
+ .
+ This package provides GeoIP functionalities.
diff --git a/debian/control.in b/debian/control.in
index c1aa848..ee59138 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -19,7 +19,8 @@ Build-Depends: autotools-dev,
                libssl-dev (>= 0.9.8l),
                libwrap0-dev,
                unixodbc-dev,
-               zlib1g-dev
+               zlib1g-dev,
+               libgeoip-dev
 Homepage: http://www.proftpd.org/
 Vcs-Git: git://git.debian.org/pkg-proftpd/proftpd-dfsg.git
 Vcs-Browser: http://git.debian.org/?p=pkg-proftpd/proftpd-dfsg.git
@@ -185,3 +186,19 @@ Description: Versatile, virtual-hosting FTP daemon - SQLite3 module
  upload/download ratios are also supported.
  .
  This package provides SQLite based authentication.
+
+Package: proftpd-mod-geoip
+Architecture: any
+Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Description: Versatile, virtual-hosting FTP daemon - GeoIP module
+ ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
+ Protocol daemon supports also hidden directories, virtual hosts, and
+ per-directory ".ftpaccess" files. It uses a single main configuration
+ file, with a syntax similar to Apache.
+ .
+ Because of the advanced design, anonymous-FTP directories can have
+ an arbitrary internal structure (bin, lib, etc, and special files are
+ not needed). Advanced features such as multiple password files and
+ upload/download ratios are also supported.
+ .
+ This package provides GeoIP functionalities.
diff --git a/debian/proftpd-mod-geoip.install b/debian/proftpd-mod-geoip.install
new file mode 100644
index 0000000..9d2686a
--- /dev/null
+++ b/debian/proftpd-mod-geoip.install
@@ -0,0 +1 @@
+usr/lib/proftpd/mod_geoip.so
diff --git a/debian/rules b/debian/rules
index 79e7ccb..2286b95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ endif
 DSOMODS1 = mod_unique_id:mod_site_misc:mod_load:mod_ban:mod_quotatab:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_sql_sqlite:mod_sql_odbc:mod_dynmasq:
 DSOMODS2 = mod_quotatab_sql:mod_ldap:mod_quotatab_ldap:mod_ratio:mod_tls:mod_rewrite:mod_radius:mod_wrap:mod_wrap2:mod_wrap2_file:
 DSOMODS3 = mod_wrap2_sql:mod_quotatab_file:mod_quotatab_radius:mod_facl:mod_ctrls_admin:mod_copy:mod_deflate:mod_ifversion:mod_tls_memcache:
-DSOMODS4 = mod_exec:mod_sftp:mod_sftp_pam:mod_sftp_sql:mod_shaper:mod_sql_passwd:mod_ifsession
+DSOMODS4 = mod_geoip:mod_exec:mod_sftp:mod_sftp_pam:mod_sftp_sql:mod_shaper:mod_sql_passwd:mod_ifsession
 CONF_ARGS := --prefix=/usr \
 	     --with-includes=$(shell pg_config --includedir):$(shell mysql_config --include|sed -e 's/-I//') \
 	     --mandir=/usr/share/man --sysconfdir=/etc/$(NAME) --localstatedir=/var/run --libexecdir=/usr/lib/$(NAME) \

-- 
ProFTPD core package