On Mon, Jun 26, 2023 at 07:28:36PM +0200, Francesco P. Lovergine wrote:
Updated debdiff attached.
Sorry wrong diff, this is the correct one :-/ -- Francesco P. Lovergine
diff -Nru proftpd-dfsg-1.3.8+dfsg/debian/changelog proftpd-dfsg-1.3.8+dfsg/debian/changelog --- proftpd-dfsg-1.3.8+dfsg/debian/changelog 2023-03-14 10:16:31.000000000 +0100 +++ proftpd-dfsg-1.3.8+dfsg/debian/changelog 2023-06-22 11:15:57.000000000 +0200 @@ -1,3 +1,15 @@ +proftpd-dfsg (1.3.8+dfsg-4+deb12u1) bookworm; urgency=medium + + * Now do not enable proftpd.socket to avoid conflicts at boot time. + (Closes: #1038416) + * Introduced a new prerm script to manage stop of service/socket before + remove. + * Added an entry to NEWS file to explain the change in unit files + and how to deal with changes. + * Revised README.Debian to reflect changes in unit file management. + + -- Francesco Paolo Lovergine <fran...@debian.org> Thu, 22 Jun 2023 11:15:57 +0200 + proftpd-dfsg (1.3.8+dfsg-4) unstable; urgency=medium * Correct Umask entry in commented section (Closes: #1006011). diff -Nru proftpd-dfsg-1.3.8+dfsg/debian/proftpd-core.NEWS proftpd-dfsg-1.3.8+dfsg/debian/proftpd-core.NEWS --- proftpd-dfsg-1.3.8+dfsg/debian/proftpd-core.NEWS 2023-03-13 12:24:28.000000000 +0100 +++ proftpd-dfsg-1.3.8+dfsg/debian/proftpd-core.NEWS 2023-06-22 11:15:57.000000000 +0200 @@ -1,3 +1,16 @@ +proftpd-dfsg (1.3.8+dfsg-4+deb12u1) bookworm; urgency=medium + + If you upgrade from 1.3.8+dfsg-4 (i.e. th 12.0 edition of bookworm) note + that you will need to + systemctl disable --now proftpd.socket + systemctl enable --now proftpd.service + after upgrade, if you run the proftpd in (default) standalone mode and you did not + do that before. See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1038416 + for more information. For other information about inetd/standalone switching + see also the relevant section in /usr/share/doc/proftpd-core/README.Debian.gz. + + -- Francesco Paolo Lovergine <fran...@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 diff -Nru proftpd-dfsg-1.3.8+dfsg/debian/proftpd-core.prerm proftpd-dfsg-1.3.8+dfsg/debian/proftpd-core.prerm --- proftpd-dfsg-1.3.8+dfsg/debian/proftpd-core.prerm 1970-01-01 01:00:00.000000000 +0100 +++ proftpd-dfsg-1.3.8+dfsg/debian/proftpd-core.prerm 2023-06-22 11:15:57.000000000 +0200 @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +if [ -z "${DPKG_ROOT:-}" ] && [ "$1" = remove ] && [ -d /run/systemd/system ] ; +then + deb-systemd-invoke stop 'proftpd.socket' 'proftpd.service' >/dev/null || true +fi + +#DEBHELPER# diff -Nru proftpd-dfsg-1.3.8+dfsg/debian/proftpd-core.README.Debian proftpd-dfsg-1.3.8+dfsg/debian/proftpd-core.README.Debian --- proftpd-dfsg-1.3.8+dfsg/debian/proftpd-core.README.Debian 2023-03-13 12:24:28.000000000 +0100 +++ proftpd-dfsg-1.3.8+dfsg/debian/proftpd-core.README.Debian 2023-06-22 11:15:57.000000000 +0200 @@ -104,8 +104,7 @@ That could be done by running - service proftpd stop - systemctl disable proftpd.service + systemctl disable --now proftpd.service then changing from 'standalone' to 'inetd' the ServerType entry in /etc/proftpd/proftpd.conf, and: @@ -131,10 +130,7 @@ - or using systemd support for socket. To do that run: - systemctl stop proftpd.service - systemctl disable proftpd.service - systemctl enable proftpd.socket - systemctl start proftpd.socket + systemctl enable --now proftpd.socket ** Other information diff -Nru proftpd-dfsg-1.3.8+dfsg/debian/rules proftpd-dfsg-1.3.8+dfsg/debian/rules --- proftpd-dfsg-1.3.8+dfsg/debian/rules 2023-03-13 12:24:28.000000000 +0100 +++ proftpd-dfsg-1.3.8+dfsg/debian/rules 2023-06-22 11:15:57.000000000 +0200 @@ -93,7 +93,7 @@ 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
