debian/changelog

@@ -5,6 +5,8 @@ proftpd-dfsg (1.3.6-3) UNRELEASED; urgency=medium
     (Closes: #897168)
   * Do create /run/proftpd also in postinst, if not exists yet.
     (Closes: #608881)
+  * New Proftp module package: proftpd-mod-snmp.
+  * Add "Enhances: proftpd-basic" to all modules built by this package.
 
  -- Francesco Paolo Lovergine <frankie@debian.org>  Tue, 01 May 2018 14:57:41 +0200
 

debian/clean

@@ -11,6 +11,8 @@ contrib/mod_auth_otp/auth-otp
 contrib/mod_auth_otp/Makefile
 contrib/mod_auth_otp/mod_auth_otp.h
 contrib/mod_auth_otp/t/Makefile
+contrib/mod_snmp/Makefile
+contrib/mod_snmp/mod_snmp.h
 src/ftpdctl.8
 src/proftpd.8
 src/proftpd.conf.5

debian/control

@@ -49,7 +49,8 @@ Suggests: openbsd-inetd | inet-superserver,
           proftpd-mod-odbc,
           proftpd-mod-pgsql,
           proftpd-mod-sqlite,
-          proftpd-mod-geoip
+          proftpd-mod-geoip,
+          proftpd-mod-snmp
 Recommends: proftpd-doc
 Description: Versatile, virtual-hosting FTP daemon - binaries
  ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
@@ -113,6 +114,7 @@ Homepage: http://www.proftpd.org/docs
 Package: proftpd-mod-mysql
 Architecture: any
 Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-basic
 Description: Versatile, virtual-hosting FTP daemon - MySQL module
  ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
  Protocol daemon supports also hidden directories, virtual hosts, and
@@ -129,6 +131,7 @@ Description: Versatile, virtual-hosting FTP daemon - MySQL module
 Package: proftpd-mod-pgsql
 Architecture: any
 Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-basic
 Description: Versatile, virtual-hosting FTP daemon - PostgreSQL module
  ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
  Protocol daemon supports also hidden directories, virtual hosts, and
@@ -145,6 +148,7 @@ Description: Versatile, virtual-hosting FTP daemon - PostgreSQL module
 Package: proftpd-mod-ldap
 Architecture: any
 Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-basic
 Description: Versatile, virtual-hosting FTP daemon - LDAP module
  ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
  Protocol daemon supports also hidden directories, virtual hosts, and
@@ -161,6 +165,7 @@ Description: Versatile, virtual-hosting FTP daemon - LDAP module
 Package: proftpd-mod-odbc
 Architecture: any
 Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-basic
 Description: Versatile, virtual-hosting FTP daemon - ODBC module
  ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
  Protocol daemon supports also hidden directories, virtual hosts, and
@@ -177,6 +182,7 @@ Description: Versatile, virtual-hosting FTP daemon - ODBC module
 Package: proftpd-mod-sqlite
 Architecture: any
 Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-basic
 Description: Versatile, virtual-hosting FTP daemon - SQLite3 module
  ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
  Protocol daemon supports also hidden directories, virtual hosts, and
@@ -193,6 +199,7 @@ Description: Versatile, virtual-hosting FTP daemon - SQLite3 module
 Package: proftpd-mod-geoip
 Architecture: any
 Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-basic
 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
@@ -205,3 +212,21 @@ Description: Versatile, virtual-hosting FTP daemon - GeoIP module
  upload/download ratios are also supported.
  .
  This package provides GeoIP functionalities.
+
+Package: proftpd-mod-snmp
+Architecture: any
+Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-basic
+Description: Versatile, virtual-hosting FTP daemon - SNMP 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.
+ .
+ The mod_snmp module implements SNMPv1 and SNMPv2, for monitoring of
+ proftpd statistics via SNMP.

debian/control.in

@@ -49,7 +49,8 @@ Suggests: openbsd-inetd | inet-superserver,
           proftpd-mod-odbc,
           proftpd-mod-pgsql,
           proftpd-mod-sqlite,
-          proftpd-mod-geoip
+          proftpd-mod-geoip,
+          proftpd-mod-snmp
 Recommends: proftpd-doc
 Description: Versatile, virtual-hosting FTP daemon - binaries
  ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
@@ -113,6 +114,7 @@ Homepage: http://www.proftpd.org/docs
 Package: proftpd-mod-mysql
 Architecture: any
 Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-basic
 Description: Versatile, virtual-hosting FTP daemon - MySQL module
  ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
  Protocol daemon supports also hidden directories, virtual hosts, and
@@ -129,6 +131,7 @@ Description: Versatile, virtual-hosting FTP daemon - MySQL module
 Package: proftpd-mod-pgsql
 Architecture: any
 Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-basic
 Description: Versatile, virtual-hosting FTP daemon - PostgreSQL module
  ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
  Protocol daemon supports also hidden directories, virtual hosts, and
@@ -145,6 +148,7 @@ Description: Versatile, virtual-hosting FTP daemon - PostgreSQL module
 Package: proftpd-mod-ldap
 Architecture: any
 Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-basic
 Description: Versatile, virtual-hosting FTP daemon - LDAP module
  ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
  Protocol daemon supports also hidden directories, virtual hosts, and
@@ -161,6 +165,7 @@ Description: Versatile, virtual-hosting FTP daemon - LDAP module
 Package: proftpd-mod-odbc
 Architecture: any
 Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-basic
 Description: Versatile, virtual-hosting FTP daemon - ODBC module
  ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
  Protocol daemon supports also hidden directories, virtual hosts, and
@@ -177,6 +182,7 @@ Description: Versatile, virtual-hosting FTP daemon - ODBC module
 Package: proftpd-mod-sqlite
 Architecture: any
 Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-basic
 Description: Versatile, virtual-hosting FTP daemon - SQLite3 module
  ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
  Protocol daemon supports also hidden directories, virtual hosts, and
@@ -193,6 +199,7 @@ Description: Versatile, virtual-hosting FTP daemon - SQLite3 module
 Package: proftpd-mod-geoip
 Architecture: any
 Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-basic
 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
@@ -205,3 +212,21 @@ Description: Versatile, virtual-hosting FTP daemon - GeoIP module
  upload/download ratios are also supported.
  .
  This package provides GeoIP functionalities.
+
+Package: proftpd-mod-snmp
+Architecture: any
+Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-basic
+Description: Versatile, virtual-hosting FTP daemon - SNMP 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.
+ .
+ The mod_snmp module implements SNMPv1 and SNMPv2, for monitoring of
+ proftpd statistics via SNMP.

debian/proftpd-basic.install

@@ -3,7 +3,8 @@ usr/bin/ftpcount
 usr/bin/ftpdctl
 usr/bin/ftptop
 usr/bin/ftpwho
-etc/proftpd
+etc/proftpd/blacklist.dat
+etc/proftpd/dhparams.pem
 usr/lib/proftpd/mod_auth_otp.so
 usr/lib/proftpd/mod_ban.so
 usr/lib/proftpd/mod_copy.so

debian/proftpd-mod-snmp.dirs

+var/lib/proftpd/snmp

debian/proftpd-mod-snmp.install

+etc/proftpd/PROFTPD-MIB.txt
+usr/lib/proftpd/mod_snmp.so

debian/proftpd-mod-snmp.prerm

+#!/bin/sh
+
+set -e
+
+if [ -d /var/lib/proftpd/snmp/empty ]; then
+       rm -r /var/lib/proftpd/snmp/empty
+fi
+
+rm -f /var/lib/proftpd/snmp/*
+
+#DEBHELPER#
\ No newline at end of file

debian/rules

@@ -45,7 +45,7 @@ DSOMODS1 = mod_unique_id:mod_site_misc:mod_load:mod_ban:mod_quotatab:mod_sql:mod
 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
 DSOMODS4 = mod_geoip:mod_exec:mod_sftp:mod_sftp_pam:mod_sftp_sql:mod_shaper:mod_sql_passwd:mod_ifsession:mod_auth_otp:mod_tls_redis
-DSOMODS5 = mod_wrap2_redis:mod_redis:mod_memcache:mod_tls_memcache:mod_readme
+DSOMODS5 = mod_wrap2_redis:mod_redis:mod_memcache:mod_tls_memcache:mod_readme:mod_snmp
 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=/run --libexecdir=/usr/lib/$(NAME) \

debian/templates/mod_snmp.conf

+<IfModule mod_snmp.c>
+
+SNMPEngine on
+
+# REQUIRED: Configure the agent to listen on 1.2.3.4, port 161
+# Do not configure mod_snmp to listen on a public Internet address!
+SNMPAgent master 127.0.0.1 161
+
+# REQUIRED: Configure the SNMP community string
+SNMPCommunity proftp
+
+SNMPLog /var/log/proftpd/snmp.log
+
+#The mod_snmp module supports sending notifications (via SNMP traps) whenever
+#certain events occur or conditions are met. Note that only SNMPv2 traps are
+#generated; there is currently no support for SNMPv1 traps.
+
+#Currently supported notifications:
+
+#  • MaxInstances limit exceeded
+#  • Failed FTP login due to bad/wrong password
+#  • Failed FTP login due to bad/unknown user name
+
+# SNMPNotify
+
+# SNMPOptions
+
+# Configure the directory that mod_snmp will use for its database files
+SNMPTables /var/lib/proftpd/snmp
+
+#  <Limit SNMP>
+#    # Allow SNMP packets from 10.x.x.x and 127.0.0.1 addresses
+#    Allow from 10., 127.0.0.1
+#    DenyAll
+#  </Limit>
+
+</IfModule>

debian/templates/modules.conf

@@ -101,5 +101,8 @@ LoadModule mod_readme.c
 # Install proftpd-mod-geoip to use the GeoIP feature
 #LoadModule mod_geoip.c
 
+# Install proftpd-mod-snmp to use the SNMP feature
+#LoadModule mod_snmp.c
+
 # keep this module the last one
 LoadModule mod_ifsession.c