[Git][debian-proftpd-team/proftpd][master] 6 commits: Introduced transitional package and fixed template of modules.conf

Francesco Paolo Lovergine frankie at debian.org
Mon Dec 14 15:18:54 GMT 2020



Francesco Paolo Lovergine pushed to branch master at Debian ProFTPD Team / proftpd


Commits:
86cd222c by Francesco Paolo Lovergine at 2020-12-14T12:16:52+01:00
Introduced transitional package and fixed template of modules.conf

- - - - -
60cd028f by Francesco Paolo Lovergine at 2020-12-14T11:54:38+00:00
Fixed short descriptions

- - - - -
139e21a4 by Francesco Paolo Lovergine at 2020-12-14T13:10:49+01:00
Moved -mod-wrap and -mod-crypto among Suggests

- - - - -
66794873 by Francesco Paolo Lovergine at 2020-12-14T14:57:51+01:00
Fixed layout in binary package and modules.conf for new installation and upgrades

- - - - -
dc719594 by Francesco Paolo Lovergine at 2020-12-14T15:07:14+01:00
Better breaks/replaces to use with backports just in case

- - - - -
b5db06e1 by Francesco Paolo Lovergine at 2020-12-14T16:13:31+01:00
Preparing upload to unstable

- - - - -


23 changed files:

- − debian/NEWS
- debian/changelog
- debian/control
- debian/control.in
- − debian/proftpd-basic.lintian-overrides
- debian/proftpd-basic.NEWS → debian/proftpd-core.NEWS
- debian/proftpd-basic.README.Debian → debian/proftpd-core.README.Debian
- debian/proftpd-basic.dirs → debian/proftpd-core.dirs
- debian/proftpd-basic.install → debian/proftpd-core.install
- debian/proftpd-basic.links → debian/proftpd-core.links
- + debian/proftpd-core.lintian-overrides
- debian/proftpd-basic.logrotate → debian/proftpd-core.logrotate
- debian/proftpd-basic.manpages → debian/proftpd-core.manpages
- debian/proftpd-basic.postinst → debian/proftpd-core.postinst
- debian/proftpd-basic.postrm → debian/proftpd-core.postrm
- debian/proftpd-basic.preinst → debian/proftpd-core.preinst
- debian/proftpd-basic.proftpd.default → debian/proftpd-core.proftpd.default
- debian/proftpd-basic.proftpd.init → debian/proftpd-core.proftpd.init
- debian/proftpd-basic.proftpd.pam → debian/proftpd-core.proftpd.pam
- debian/proftpd-basic.proftpd.service → debian/proftpd-core.proftpd.service
- debian/proftpd-mod-crypto.install
- debian/rules
- debian/templates/modules.conf


Changes:

=====================================
debian/NEWS deleted
=====================================
@@ -1,85 +0,0 @@
-proftpd-dfsg (1.3.4~rc2-4) unstable; urgency=low
-
-    The mod_ldap 2.9 version introduced in 1.3.4 series changed completely
-    configuration settings. See the Changes section in README.LDAP for
-    new configuration directives to be used and DO NOT assume you can simply
-    use your current configuration.
-
- -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 01 Sep 2011 14:10:09 +0200
-
-proftpd-dfsg (1.3.4~rc2-2) unstable; urgency=low
-
-    Starting from this version the core package does not provide the
-    still experimental non-core mod_vroot package. You need to install the separate
-    proftpd-mod-vroot package explicitly instead, or to comment the mod_vroot.c
-    loading in /etc/proftpd/modules.conf.
-
- -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 20 Apr 2011 17:46:30 +0200
-
-proftpd-dfsg (1.3.3d-4) unstable; urgency=low
-
-    Starting from this version /etc/proftpd/proftpd.conf also includes
-    all files present at /etc/proftpd/conf.d/ to allow a better customization
-    without need of changing the main system files.
-
- -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 15 Feb 2011 13:45:18 +0100
-
-proftpd-dfsg (1.3.2e-3) unstable; urgency=low
-
-    This version adds the useful contributed module mod_vroot, which is still not
-    part of the standard modules. It can be used for providing shared
-    directories under chrooted environments, among other useful features..
-    A new template 'virtuals.conf' is provided also to keep things
-    ordered about vhosts/vroots and show some examples.
-
- -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 16 Mar 2010 12:13:00 +0100
-
-proftpd-dfsg (1.3.2b-2) unstable; urgency=low
-
-    This version stops client-initiated TLS renegotiations by default. This is
-    a side effect of fixing CVE-2009-3555 in OpenSSL protocol. Unfortunately
-    that could break some clients until a better approach is adopted to fix
-    this protocol issue globally. In order to avoid connection losses in
-    those cases a new directive has been adopted:
-
-    TLSOption AllowClientRenegotiations
-
-    which can be added to tls.conf. It is currently commented out in Debian
-    provided configuration as in default ProFTPD setting.
-    See also http://bugs.proftpd.org/show_bug.cgi?id=3324 for more information.
-
- -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 11 Dec 2009 10:00:02 +0100
-
-proftpd-dfsg (1.3.2e-3) unstable; urgency=low
-
-    This version stops client-initiated TLS renegotiations by default. This is
-    a side effect of fixing CVE-2009-3555 in OpenSSL protocol. Unfortunately
-    that could break some clients until a better approach is adopted to fix
-    this protocol issue globally. In order to avoid connection losses in
-    those cases a new directive has been adopted:
-
-    TLSOption AllowClientRenegotiations
-
-    which can be added to tls.conf. It is currently commented out in Debian
-    provided configuration as in default ProFTPD setting.
-    See also http://bugs.proftpd.org/show_bug.cgi?id=3324 for more information.
-
- -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 16 Mar 2010 12:13:00 +0100
-
-proftpd-dfsg (1.3.3d-4) unstable; urgency=low
-
-    This version adds the useful contributed module mod_vroot, which is still not
-    part of the standard modules. It can be used for providing shared
-    directories under chrooted environments, among other useful features..
-    A new template 'virtuals.conf' is provided also to keep things
-    ordered about vhosts/vroots and show some examples.
-
- -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 15 Feb 2011 13:45:18 +0100
-
-proftpd-dfsg (1.3.4~rc2-2) unstable; urgency=low
-
-    Starting from this version /etc/proftpd/proftpd.conf also includes
-    all files present at /etc/proftpd/conf.d/ to allow a better customization
-    without need of changing the main system files.
-
- -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 20 Apr 2011 17:46:30 +0200


=====================================
debian/changelog
=====================================
@@ -1,3 +1,22 @@
+proftpd-dfsg (1.3.7a+dfsg-3) unstable; urgency=medium
+
+  * Introduced a new (old) -core package and made -basic a transitional
+    package in order to ensure a smooth upgrade from current stable and
+    testing. This is due because of the new -mod-tls and mod-crypto
+    packages. (closes: #977349) 
+  * Added an appropriate NEWS entry.
+  * Changed modules.conf template to reflect changes in layouts of modules vs
+    packages.
+  * Housekeeping proftpd-core.NEWS file and removed old global NEWS to avoid 
+    spreading the same NEWS file among multiple packages.
+  * Fixed short descriptions.
+  * Moved -mod-wrap and -mod-crypto among Suggests, thanks to changes to default
+    template for modules.conf.
+  * Moved all modules dependent on mod_tls and mod_sftp to -mod-crypto.
+  * Added some missing LoadModules entry template modules.conf.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 14 Dec 2020 16:12:56 +0100
+
 proftpd-dfsg (1.3.7a+dfsg-2) unstable; urgency=medium
 
   * Fixed a bit debian/watch for current versioning by upstream.


=====================================
debian/control
=====================================
@@ -29,7 +29,7 @@ Homepage: http://www.proftpd.org/
 Vcs-Browser: https://salsa.debian.org/debian-proftpd-team/proftpd
 Vcs-Git: https://salsa.debian.org/debian-proftpd-team/proftpd.git
 
-Package: proftpd-basic
+Package: proftpd-core
 Architecture: any
 Depends: adduser,
          debianutils (>= 1.21.0),
@@ -52,8 +52,10 @@ Suggests: openbsd-inetd | inet-superserver,
           proftpd-mod-pgsql,
           proftpd-mod-sqlite,
           proftpd-mod-geoip,
-          proftpd-mod-snmp
-Recommends: proftpd-doc, proftpd-mod-crypto, proftpd-mod-wrap
+          proftpd-mod-snmp,
+		  proftpd-mod-crypto, 
+		  proftpd-mod-wrap
+Recommends: proftpd-doc
 Description: Versatile, virtual-hosting FTP daemon - binaries
  ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
  Protocol daemon supports also hidden directories, virtual hosts, and
@@ -76,7 +78,7 @@ Depends: libacl1-dev,
          libssl-dev,
          libtool,
          libtool-bin,
-         proftpd-basic (=${binary:Version}),
+         proftpd-core (=${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: pkg-config
@@ -97,7 +99,7 @@ Description: Versatile, virtual-hosting FTP daemon - development files
 Package: proftpd-doc
 Architecture: all
 Multi-Arch: foreign
-Suggests: proftpd-basic
+Suggests: proftpd-core
 Section: doc
 Depends: ${misc:Depends}
 Description: Versatile, virtual-hosting FTP daemon - documentation
@@ -117,7 +119,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
+Enhances: proftpd-core
 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
@@ -133,8 +135,8 @@ 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
+Depends: proftpd-core (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-core
 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
@@ -150,8 +152,8 @@ 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
+Depends: proftpd-core (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-core
 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
@@ -167,8 +169,8 @@ 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
+Depends: proftpd-core (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-core
 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
@@ -184,8 +186,8 @@ 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
+Depends: proftpd-core (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-core
 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
@@ -201,8 +203,8 @@ 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
+Depends: proftpd-core (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-core
 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
@@ -218,8 +220,8 @@ Description: Versatile, virtual-hosting FTP daemon - GeoIP module
 
 Package: proftpd-mod-snmp
 Architecture: any
-Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Enhances: proftpd-basic
+Depends: proftpd-core (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-core
 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
@@ -236,11 +238,11 @@ Description: Versatile, virtual-hosting FTP daemon - SNMP module
 
 Package: proftpd-mod-crypto
 Architecture: any
-Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Enhances: proftpd-basic
-Breaks: proftpd-basic (<= 1.3.7a-1)
-Replaces: proftpd-basic (<= 1.3.7a-1)
-Description: Versatile, virtual-hosting FTP daemon - SNMP module
+Depends: proftpd-core (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-core
+Breaks: proftpd-basic (<= 1.3.7a+dfsg-3~), proftpd-core (<= 1.3.7a+dfsg-3~)
+Replaces: proftpd-basic (<= 1.3.7a+dfsg-3~), proftpd-core (<= 1.3.7a+dfsg-3~)  
+Description: Versatile, virtual-hosting FTP daemon - TLS/SSL/SFTP modules
  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
@@ -260,11 +262,11 @@ Description: Versatile, virtual-hosting FTP daemon - SNMP module
 
 Package: proftpd-mod-wrap
 Architecture: any
-Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Enhances: proftpd-basic
-Breaks: proftpd-basic (<= 1.3.7a-1)
-Replaces: proftpd-basic (<= 1.3.7a-1)
-Description: Versatile, virtual-hosting FTP daemon - SNMP module
+Depends: proftpd-core (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-core
+Breaks: proftpd-basic (<= 1.3.7a-3~)
+Replaces: proftpd-basic (<= 1.3.7a-3~)
+Description: Versatile, virtual-hosting FTP daemon - tcpwrapper 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
@@ -278,3 +280,20 @@ Description: Versatile, virtual-hosting FTP daemon - SNMP module
  This module is contained in the contrib/mod_wrap.c file for ProFTPD 1.2+. It
  enables the daemon to use the common tcpwrappers access control library while
  in standalone mode, and in a very configurable manner.
+
+Package: proftpd-basic
+Architecture: all
+Depends: proftpd-core, proftpd-mod-wrap, proftpd-mod-crypto
+Description: Transitional dummy package for ProFTPD
+ 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 is a transitional package only. It can safely be removed.
+


=====================================
debian/control.in
=====================================
@@ -29,7 +29,7 @@ Homepage: http://www.proftpd.org/
 Vcs-Browser: https://salsa.debian.org/debian-proftpd-team/proftpd
 Vcs-Git: https://salsa.debian.org/debian-proftpd-team/proftpd.git
 
-Package: proftpd-basic
+Package: proftpd-core
 Architecture: any
 Depends: adduser,
          debianutils (>= 1.21.0),
@@ -52,8 +52,10 @@ Suggests: openbsd-inetd | inet-superserver,
           proftpd-mod-pgsql,
           proftpd-mod-sqlite,
           proftpd-mod-geoip,
-          proftpd-mod-snmp
-Recommends: proftpd-doc, proftpd-mod-crypto, proftpd-mod-wrap
+          proftpd-mod-snmp,
+		  proftpd-mod-crypto, 
+		  proftpd-mod-wrap
+Recommends: proftpd-doc
 Description: Versatile, virtual-hosting FTP daemon - binaries
  ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
  Protocol daemon supports also hidden directories, virtual hosts, and
@@ -76,7 +78,7 @@ Depends: libacl1-dev,
          libssl-dev,
          libtool,
          libtool-bin,
-         proftpd-basic (=${binary:Version}),
+         proftpd-core (=${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: pkg-config
@@ -97,7 +99,7 @@ Description: Versatile, virtual-hosting FTP daemon - development files
 Package: proftpd-doc
 Architecture: all
 Multi-Arch: foreign
-Suggests: proftpd-basic
+Suggests: proftpd-core
 Section: doc
 Depends: ${misc:Depends}
 Description: Versatile, virtual-hosting FTP daemon - documentation
@@ -117,7 +119,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
+Enhances: proftpd-core
 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
@@ -133,8 +135,8 @@ 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
+Depends: proftpd-core (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-core
 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
@@ -150,8 +152,8 @@ 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
+Depends: proftpd-core (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-core
 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
@@ -167,8 +169,8 @@ 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
+Depends: proftpd-core (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-core
 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
@@ -184,8 +186,8 @@ 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
+Depends: proftpd-core (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-core
 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
@@ -201,8 +203,8 @@ 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
+Depends: proftpd-core (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-core
 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
@@ -218,8 +220,8 @@ Description: Versatile, virtual-hosting FTP daemon - GeoIP module
 
 Package: proftpd-mod-snmp
 Architecture: any
-Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Enhances: proftpd-basic
+Depends: proftpd-core (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-core
 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
@@ -236,11 +238,11 @@ Description: Versatile, virtual-hosting FTP daemon - SNMP module
 
 Package: proftpd-mod-crypto
 Architecture: any
-Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Enhances: proftpd-basic
-Breaks: proftpd-basic (<= 1.3.7a-1)
-Replaces: proftpd-basic (<= 1.3.7a-1)
-Description: Versatile, virtual-hosting FTP daemon - SNMP module
+Depends: proftpd-core (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-core
+Breaks: proftpd-basic (<= 1.3.7a+dfsg-3~), proftpd-core (<= 1.3.7a+dfsg-3~)
+Replaces: proftpd-basic (<= 1.3.7a+dfsg-3~), proftpd-core (<= 1.3.7a+dfsg-3~)  
+Description: Versatile, virtual-hosting FTP daemon - TLS/SSL/SFTP modules
  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
@@ -260,11 +262,11 @@ Description: Versatile, virtual-hosting FTP daemon - SNMP module
 
 Package: proftpd-mod-wrap
 Architecture: any
-Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Enhances: proftpd-basic
-Breaks: proftpd-basic (<= 1.3.7a-1)
-Replaces: proftpd-basic (<= 1.3.7a-1)
-Description: Versatile, virtual-hosting FTP daemon - SNMP module
+Depends: proftpd-core (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Enhances: proftpd-core
+Breaks: proftpd-basic (<= 1.3.7a-3~)
+Replaces: proftpd-basic (<= 1.3.7a-3~)
+Description: Versatile, virtual-hosting FTP daemon - tcpwrapper 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
@@ -278,3 +280,20 @@ Description: Versatile, virtual-hosting FTP daemon - SNMP module
  This module is contained in the contrib/mod_wrap.c file for ProFTPD 1.2+. It
  enables the daemon to use the common tcpwrappers access control library while
  in standalone mode, and in a very configurable manner.
+
+Package: proftpd-basic
+Architecture: all
+Depends: proftpd-core, proftpd-mod-wrap, proftpd-mod-crypto
+Description: Transitional dummy package for ProFTPD
+ 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 is a transitional package only. It can safely be removed.
+


=====================================
debian/proftpd-basic.lintian-overrides deleted
=====================================
@@ -1,2 +0,0 @@
-proftpd-basic: binary-without-manpage
-proftpd-basic: embedded-library usr/sbin/proftpd: ltdl


=====================================
debian/proftpd-basic.NEWS → debian/proftpd-core.NEWS
=====================================
@@ -1,3 +1,15 @@
+proftpd-dfsg (1.3.7a+dfsg-3) unstable; urgency=medium
+    
+    Starting from this release, a few modules related to libwrap and
+    TLS/SSL moved to new proftpd-mod-crypto and proftpd-mod-tls, in order
+    to reduce the number of libraries to depend on. A transitional
+    package ensure to avoid breakage of existing configurations
+    in upgrade. New installation needs to take the new layout in
+    consideration and usually install proftpd-core instead of 
+    proftpd-basic, and only strictly required add-on packages, as well.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 14 Dec 2020 11:05:01 +0100
+
 proftpd-dfsg (1.3.6-1) unstable; urgency=medium
 
     mod_readme is now build as module instead of compiled in. Make sure it is
@@ -15,6 +27,48 @@ proftpd-dfsg (1.3.5d-1) unstable; urgency=medium
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 27 Jan 2017 14:44:31 +0100
 
+proftpd-dfsg (1.3.4~rc2-4) unstable; urgency=low
+
+    The mod_ldap 2.9 version introduced in 1.3.4 series changed completely
+    configuration settings. See the Changes section in README.LDAP for
+    new configuration directives to be used and DO NOT assume you can simply
+    use your current configuration.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 01 Sep 2011 14:10:09 +0200
+
+proftpd-dfsg (1.3.4~rc2-2) unstable; urgency=low
+
+    Starting from this version the core package does not provide the
+    still experimental non-core mod_vroot package. You need to install the separate
+    proftpd-mod-vroot package explicitly instead, or to comment the mod_vroot.c
+    loading in /etc/proftpd/modules.conf.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 20 Apr 2011 17:46:30 +0200
+
+proftpd-dfsg (1.3.3d-4) unstable; urgency=low
+
+    Starting from this version /etc/proftpd/proftpd.conf also includes
+    all files present at /etc/proftpd/conf.d/ to allow a better customization
+    without need of changing the main system files.
+
+    This version adds the useful contributed module mod_vroot, which is still not
+    part of the standard modules. It can be used for providing shared
+    directories under chrooted environments, among other useful features..
+    A new template 'virtuals.conf' is provided also to keep things
+    ordered about vhosts/vroots and show some examples.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 15 Feb 2011 13:45:18 +0100
+
+proftpd-dfsg (1.3.2e-3) unstable; urgency=low
+
+    This version adds the useful contributed module mod_vroot, which is still not
+    part of the standard modules. It can be used for providing shared
+    directories under chrooted environments, among other useful features..
+    A new template 'virtuals.conf' is provided also to keep things
+    ordered about vhosts/vroots and show some examples.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 16 Mar 2010 12:13:00 +0100
+
 proftpd-dfsg (1.3.2e-1) unstable; urgency=low
 
     A new contributed module mod_vroot has been added to the provided modules pool.
@@ -22,6 +76,22 @@ proftpd-dfsg (1.3.2e-1) unstable; urgency=low
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 19 Apr 2010 13:13:45 +0200
 
+proftpd-dfsg (1.3.2b-2) unstable; urgency=low
+
+    This version stops client-initiated TLS renegotiations by default. This is
+    a side effect of fixing CVE-2009-3555 in OpenSSL protocol. Unfortunately
+    that could break some clients until a better approach is adopted to fix
+    this protocol issue globally. In order to avoid connection losses in
+    those cases a new directive has been adopted:
+
+    TLSOption AllowClientRenegotiations
+
+    which can be added to tls.conf. It is currently commented out in Debian
+    provided configuration as in default ProFTPD setting.
+    See also http://bugs.proftpd.org/show_bug.cgi?id=3324 for more information.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 11 Dec 2009 10:00:02 +0100
+
 proftpd-dfsg (1.3.2a-1) unstable; urgency=low
 
     The traditional monthly cron job to collect statistics has been removed


=====================================
debian/proftpd-basic.README.Debian → debian/proftpd-core.README.Debian
=====================================


=====================================
debian/proftpd-basic.dirs → debian/proftpd-core.dirs
=====================================


=====================================
debian/proftpd-basic.install → debian/proftpd-core.install
=====================================
@@ -34,14 +34,8 @@ usr/lib/proftpd/mod_readme.so
 usr/lib/proftpd/mod_rewrite.so
 usr/lib/proftpd/mod_shaper.so
 usr/lib/proftpd/mod_site_misc.so
-usr/lib/proftpd/mod_sftp_sql.so
-usr/lib/proftpd/mod_sftp_pam.so
 usr/lib/proftpd/mod_sql.so
 usr/lib/proftpd/mod_statcache.so
-usr/lib/proftpd/mod_tls_fscache.so
-usr/lib/proftpd/mod_tls_memcache.so
-usr/lib/proftpd/mod_tls_redis.so
-usr/lib/proftpd/mod_tls_shmcache.so
 usr/lib/proftpd/mod_unique_id.so
 usr/lib/proftpd/mod_wrap2.so
 usr/lib/proftpd/mod_wrap2_file.so
@@ -54,4 +48,4 @@ contrib/ftpquota usr/sbin/
 contrib/xferstats.holger-preiss => usr/sbin/ftpstats
 debian/templates/ftpusers etc/
 debian/templates/*.conf usr/share/proftpd/templates/
-debian/templates/welcome.msg usr/share/proftpd/templates/
\ No newline at end of file
+debian/templates/welcome.msg usr/share/proftpd/templates/


=====================================
debian/proftpd-basic.links → debian/proftpd-core.links
=====================================


=====================================
debian/proftpd-core.lintian-overrides
=====================================
@@ -0,0 +1,2 @@
+proftpd-core: binary-without-manpage
+proftpd-cor: embedded-library usr/sbin/proftpd: ltdl


=====================================
debian/proftpd-basic.logrotate → debian/proftpd-core.logrotate
=====================================


=====================================
debian/proftpd-basic.manpages → debian/proftpd-core.manpages
=====================================


=====================================
debian/proftpd-basic.postinst → debian/proftpd-core.postinst
=====================================


=====================================
debian/proftpd-basic.postrm → debian/proftpd-core.postrm
=====================================


=====================================
debian/proftpd-basic.preinst → debian/proftpd-core.preinst
=====================================


=====================================
debian/proftpd-basic.proftpd.default → debian/proftpd-core.proftpd.default
=====================================


=====================================
debian/proftpd-basic.proftpd.init → debian/proftpd-core.proftpd.init
=====================================


=====================================
debian/proftpd-basic.proftpd.pam → debian/proftpd-core.proftpd.pam
=====================================


=====================================
debian/proftpd-basic.proftpd.service → debian/proftpd-core.proftpd.service
=====================================


=====================================
debian/proftpd-mod-crypto.install
=====================================
@@ -1,3 +1,9 @@
 usr/lib/proftpd/mod_sftp.so
+usr/lib/proftpd/mod_sftp_pam.so
+usr/lib/proftpd/mod_sftp_sql.so
 usr/lib/proftpd/mod_sql_passwd.so
 usr/lib/proftpd/mod_tls.so
+usr/lib/proftpd/mod_tls_fscache.so
+usr/lib/proftpd/mod_tls_memcache.so
+usr/lib/proftpd/mod_tls_redis.so
+usr/lib/proftpd/mod_tls_shmcache.so


=====================================
debian/rules
=====================================
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-PACKAGE=proftpd-basic
+PACKAGE=proftpd-core
 PACKAGE_DEV=proftpd-dev
 NAME=proftpd
 VERSION=$(shell grep PROFTPD_VERSION_TEXT $(CURDIR)/include/version.h|cut -d\" -f2)


=====================================
debian/templates/modules.conf
=====================================
@@ -16,7 +16,12 @@ ModuleControlsACLs lsmod allow user *
 #LoadModule mod_ident.c
 
 LoadModule mod_ctrls_admin.c
-LoadModule mod_tls.c
+
+# Install proftpd-mod-crypto to use this module for TLS/SSL support.
+#LoadModule mod_tls.c
+# Even these modules depend on the previous one
+#LoadModule mod_tls_fscache.c
+#LoadModule mod_tls_shmcache.c
 
 # Install one of proftpd-mod-mysql, proftpd-mod-pgsql or any other
 # SQL backend engine to use this module and the required backend.
@@ -24,7 +29,7 @@ LoadModule mod_tls.c
 # the existent SQL backeds.
 #LoadModule mod_sql.c
 
-# Install proftpd-mod-ldap to use this
+# Install proftpd-mod-ldap to use this for LDAP support.
 #LoadModule mod_ldap.c
 
 #
@@ -64,7 +69,8 @@ LoadModule mod_quotatab_file.c
 # the previous mod_sql.c module to use this
 #LoadModule mod_quotatab_sql.c
 LoadModule mod_quotatab_radius.c
-LoadModule mod_wrap.c
+# Install proftpd-mod-wrap module to use this
+#LoadModule mod_wrap.c
 LoadModule mod_rewrite.c
 LoadModule mod_load.c
 LoadModule mod_ban.c
@@ -79,8 +85,10 @@ LoadModule mod_shaper.c
 LoadModule mod_ratio.c
 LoadModule mod_site_misc.c
 
-LoadModule mod_sftp.c
-LoadModule mod_sftp_pam.c
+# Install proftpd-mod-crypto to use this module for SFTP support.
+#LoadModule mod_sftp.c
+#LoadModule mod_sftp_pam.c
+
 # Install one of the previous SQL backends and decomment 
 # the previous mod_sql.c module to use this
 #LoadModule mod_sftp_sql.c
@@ -91,9 +99,11 @@ LoadModule mod_copy.c
 LoadModule mod_deflate.c
 LoadModule mod_ifversion.c
 LoadModule mod_memcache.c
-LoadModule mod_tls_memcache.c
+# Install proftpd-mod-crypto to use this module for TLS/SSL support.
+#LoadModule mod_tls_memcache.c
 
 #LoadModule mod_redis.c
+# Install proftpd-mod-crypto to use this module for TLS/SSL support.
 #LoadModule mod_tls_redis.c
 #LoadModule mod_wrap2_redis.c
 



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/compare/645e241dbafdd754c980bca3d4e51718f87276e7...b5db06e17f78a961b4bd46250df6ea9009aeb48c

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/compare/645e241dbafdd754c980bca3d4e51718f87276e7...b5db06e17f78a961b4bd46250df6ea9009aeb48c
You're receiving this email because of your account on salsa.debian.org.




More information about the Pkg-proftpd-maintainers mailing list