[Git][debian-proftpd-team/proftpd][master] 4 commits: Changes including the fix of #1038416

Francesco Paolo Lovergine (@frankie) frankie at debian.org
Wed Jun 21 17:41:28 BST 2023



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


Commits:
e2c9af13 by Francesco Paolo Lovergine at 2023-06-21T11:53:00+02:00
Changes including the fix of #1038416

- - - - -
fdfd6c44 by Francesco Paolo Lovergine at 2023-06-21T10:30:43+00:00
Fixed wrong order in dh_installsystemd.

- - - - -
ba08f9e8 by Francesco Paolo Lovergine at 2023-06-21T15:39:39+02:00
Added NEWS entry and fixed for having the oneshot unit properly working at boot.

- - - - -
899363f5 by Francesco Paolo Lovergine at 2023-06-21T15:41:12+02:00
Preparing for unstable uploading.

- - - - -


7 changed files:

- debian/changelog
- debian/control
- debian/control.in
- debian/proftpd-core.NEWS
- + debian/proftpd-core.proftpd-run.service
- + debian/proftpd-substvars
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-proftpd-dfsg (1.3.8+dfsg-5) UNRELEASED; urgency=medium
+proftpd-dfsg (1.3.8+dfsg-5) unstable; urgency=medium
 
   [ Hilmar Preusse ]
   * Run just "make check-api" in test suite instead of patching
@@ -6,8 +6,14 @@ proftpd-dfsg (1.3.8+dfsg-5) UNRELEASED; urgency=medium
 
   [ Francesco Paolo Lovergine ]
   * Replaced deprecated which command in postinst/rm.
-
- -- Hilmar Preusse <hille42 at web.de>  Wed, 15 Mar 2023 10:00:43 +0100
+  * Stripped obsolete proftpd-basic virtual package (Closes: #1038311).
+  * Policy bumped to 4.6.2. No changes required.
+  * Introduced a new systemd service to start the main socket/service 
+    on the basis of the proftpd.conf configuration (standalone/inetd).
+    (Closes: #1038416)
+  * Added an entry to NEWS file to explain the change in unit files.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 21 Jun 2023 11:41:27 +0200
 
 proftpd-dfsg (1.3.8+dfsg-4) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: ProFTPD Maintainance Team <pkg-proftpd-maintainers at alioth-lists.debian.net>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
            Hilmar Preusse <hille42 at web.de>
-Standards-Version: 4.6.0
+Standards-Version: 4.6.2
 Build-Depends: debhelper-compat (= 13),
                dh-exec,
                libacl1-dev,
@@ -240,8 +240,8 @@ Package: proftpd-mod-crypto
 Architecture: any
 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~)
+Breaks: proftpd-core (<= 1.3.7a+dfsg-3~)
+Replaces: 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
@@ -264,8 +264,6 @@ Package: proftpd-mod-wrap
 Architecture: any
 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
@@ -281,19 +279,3 @@ Description: Versatile, virtual-hosting FTP daemon - tcpwrapper module
  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
-Section: oldlibs
-Depends: proftpd-core, proftpd-mod-wrap, proftpd-mod-crypto, ${misc:Depends}
-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
=====================================
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: ProFTPD Maintainance Team <pkg-proftpd-maintainers at alioth-lists.debian.net>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
            Hilmar Preusse <hille42 at web.de>
-Standards-Version: 4.6.0
+Standards-Version: 4.6.2
 Build-Depends: debhelper-compat (= 13),
                dh-exec,
                libacl1-dev,
@@ -240,8 +240,8 @@ Package: proftpd-mod-crypto
 Architecture: any
 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~)
+Breaks: proftpd-core (<= 1.3.7a+dfsg-3~)
+Replaces: 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
@@ -264,8 +264,6 @@ Package: proftpd-mod-wrap
 Architecture: any
 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
@@ -281,19 +279,3 @@ Description: Versatile, virtual-hosting FTP daemon - tcpwrapper module
  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
-Section: oldlibs
-Depends: proftpd-core, proftpd-mod-wrap, proftpd-mod-crypto, ${misc:Depends}
-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-core.NEWS
=====================================
@@ -1,3 +1,16 @@
+proftpd-dfsg (1.3.8+dfsg-5) unstable; urgency=medium
+
+    Starting from this version a new systemd unit file 'proftpd-run.service' has
+    been introduced to allow switching between standalone and systemd (socket) mode.
+    In order to switch mode, it possible to change ServerType from standalone to inetd
+    in /etc/proftpd/proftpd.conf and run
+        systemctl stop proftpd.service
+        systemctl start proftpd.socket
+    The only unit to be maintained enabled is proftpd-run.service, and disabling
+    it would ensures to stop the ftp service at boot time.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 21 Jun 2023 15:21:32 +0200
+
 proftpd-dfsg (1.3.7a+dfsg-6) unstable; urgency=medium
 
     The default method of installation is the traditional standalone


=====================================
debian/proftpd-core.proftpd-run.service
=====================================
@@ -0,0 +1,14 @@
+[Unit]
+Description=ProFTPD FTP Server in standalone/socket mode
+Documentation=man:proftpd(8)
+OnFailure=proftpd.socket
+OnSuccess=proftpd.service
+
+[Service]
+Type=oneshot
+Environment=CONFIG_FILE=/etc/proftpd/proftpd.conf
+EnvironmentFile=-/etc/default/proftpd
+ExecStart=/usr/bin/grep -iqE '^[[:space:]]*ServerType[[:space:]]+standalone$' $CONFIG_FILE
+
+[Install]
+WantedBy=multi-user.target


=====================================
debian/proftpd-substvars
=====================================
@@ -0,0 +1 @@
+proftpd:Depends=proftpd-abi-1.3.8 


=====================================
debian/rules
=====================================
@@ -93,8 +93,9 @@ override_dh_installinit:
 	dh_installinit --name=$(NAME)
 
 override_dh_installsystemd:
-	dh_installsystemd -p$(PACKAGE) --name=$(NAME) $(NAME).socket
+	dh_installsystemd -p$(PACKAGE) --no-enable --no-start --name=$(NAME) $(NAME).socket
 	dh_installsystemd -p$(PACKAGE) --name=$(NAME)@ $(NAME)@.service
-	dh_installsystemd -p$(PACKAGE) --name=$(NAME) $(NAME).service
+	dh_installsystemd -p$(PACKAGE) --no-enable --no-start --name=$(NAME) $(NAME).service
+	dh_installsystemd -p$(PACKAGE) --name=$(NAME)-run $(NAME)-run.service
 
 .PHONY: debian/proftpd-substvars debian/control



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/compare/6b07054b46ea55aea8ab31314b8aa2ea646e5ff0...899363f55512f41cc567133409553a8a4addb34c

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/compare/6b07054b46ea55aea8ab31314b8aa2ea646e5ff0...899363f55512f41cc567133409553a8a4addb34c
You're receiving this email because of your account on salsa.debian.org.




More information about the Pkg-proftpd-maintainers mailing list