[Git][debian-proftpd-team/proftpd][master] Reverted (partially) changes introduced in -5 for a simpler approach.

[Francesco P. Lovergine]

Hi, 

after some discussion under d-release and the p-u bug opened for bookworm,
I simplified a bit the approach as shown. This will be also the approach
to be used tentatively in the -4+deb12u1 update. If anyone would see and share a way
to manage better the -4 to -4+deb12u1 upgrade, it would be great.

On Mon, Jun 26, 2023 at 10:49:37AM +0000, Francesco Paolo Lovergine (@frankie) wrote:
>
>
>Francesco Paolo Lovergine pushed to branch master at Debian ProFTPD Team / proftpd
>
>
>Commits:
>29de69dc by Francesco Paolo Lovergine at 2023-06-25T20:33:49+02:00
>Reverted (partially) changes introduced in -5 for a simpler approach.
>
>- - - - -
>
>
>6 changed files:
>
>- debian/changelog
>- debian/proftpd-core.NEWS
>- debian/proftpd-core.README.Debian
>- debian/proftpd-core.prerm
>- − debian/proftpd-core.proftpd-run.service
>- debian/rules
>
>
>Changes:
>
>=====================================
>debian/changelog
>=====================================
>@@ -1,3 +1,11 @@
>+proftpd-dfsg (1.3.8+dfsg-7) UNRELEASED; urgency=medium
>+
>+  * Partially reverted changes in -6. The new proftpd-run.service has been
>+    dropped in favour of what seems the simplest approach.
>+  * Revised NEWS/README files to reflect changes.
>+
>+ -- Francesco Paolo Lovergine <frankie at debian.org>  Sun, 25 Jun 2023 20:24:49 +0200
>+
> proftpd-dfsg (1.3.8+dfsg-6) unstable; urgency=medium
>
>   * Added a postrm to force stop of systemd units at remove time. This is due
>
>
>=====================================
>debian/proftpd-core.NEWS
>=====================================
>@@ -1,16 +1,3 @@
>-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 is 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.README.Debian
>=====================================
>@@ -104,8 +104,7 @@ superservers (inetd/xinetd) or systemd socket to run proftpd instances.
>
> That could be done by running
>
>-	systemctl stop proftpd.service
>-	systemctl disable proftpd-run.service (only for xinetd/inetd use)
>+	systemctl disable --now proftpd.service
>
> then changing from 'standalone' to 'inetd' the ServerType entry in
> /etc/proftpd/proftpd.conf, and:
>@@ -131,10 +130,7 @@ then changing from 'standalone' to 'inetd' the ServerType entry in
>
>   - or using systemd support for socket. To do that run:
>
>-	systemctl stop proftpd.service
>-	systemctl start proftpd.socket
>-
>-    The proftpd-run.service will take care of the mode switching at boot time.
>+	systemctl enable --now proftpd.socket
>
> ** Other information
>
>
>
>=====================================
>debian/proftpd-core.prerm
>=====================================
>@@ -4,8 +4,7 @@ set -e
>
> if [ -z "${DPKG_ROOT:-}" ] && [ "$1" = remove ] && [ -d /run/systemd/system ] ;
> then
>-    deb-systemd-invoke stop 'proftpd.service' >/dev/null || true
>-    deb-systemd-invoke stop 'proftpd.socket' >/dev/null || true
>+    deb-systemd-invoke stop 'proftpd.service' 'proftpd.socket' >/dev/null || true
> fi
>
> #DEBHELPER#
>
>
>=====================================
>debian/proftpd-core.proftpd-run.service deleted
>=====================================
>@@ -1,14 +0,0 @@
>-[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/rules
>=====================================
>@@ -95,7 +95,6 @@ override_dh_installinit:
> override_dh_installsystemd:
> 	dh_installsystemd -p$(PACKAGE) --no-enable --no-start --name=$(NAME) $(NAME).socket
> 	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
>+	dh_installsystemd -p$(PACKAGE) --name=$(NAME) $(NAME).service
>
> .PHONY: debian/proftpd-substvars debian/control
>
>
>
>View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/commit/29de69dc5d43acab50045b0fa3c2f84f22eef797
>
>-- 
>View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/commit/29de69dc5d43acab50045b0fa3c2f84f22eef797
>You're receiving this email because of your account on salsa.debian.org.
>
>
>_______________________________________________
>Pkg-proftpd-maintainers mailing list
>Pkg-proftpd-maintainers at alioth-lists.debian.net
>https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-proftpd-maintainers

-- 
Francesco P. Lovergine