[Git][debian-proftpd-team/proftpd][bookworm] Changes that reflect modification applied in unstable v1.3.8+dfsg-7.

[Francesco Paolo Lovergine (@frankie)]

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


Commits:
60c567f6 by Francesco Paolo Lovergine at 2023-06-26T18:22:27+02:00
Changes that reflect modification applied in unstable v1.3.8+dfsg-7.

- - - - -


5 changed files:

- debian/changelog
- debian/proftpd-core.NEWS
- debian/proftpd-core.prerm
- − debian/proftpd-core.proftpd-run.service
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,11 +1,11 @@
-proftpd-dfsg (1.3.8+dfsg-4+deb12u1) bookworm-proposed-updates; urgency=medium
+proftpd-dfsg (1.3.8+dfsg-4+deb12u1) bookworm; urgency=medium
 
-  * Introduced a new systemd service to start the main socket/service 
-    on the basis of the proftpd.conf configuration (standalone/inetd).
+  * 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 now
-    not more managed by DH scripts.
-  * Added an entry to NEWS file to explain the change in unit files.
+  * 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 <frankie at debian.org>  Thu, 22 Jun 2023 11:15:57 +0200


=====================================
debian/proftpd-core.NEWS
=====================================
@@ -1,12 +1,13 @@
-proftpd-dfsg (1.3.8+dfsg-4+deb12u1) bookworm-proposed-updates; 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.
+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 <frankie at debian.org>  Wed, 21 Jun 2023 15:21:32 +0200
 


=====================================
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.socket' 'proftpd.service' >/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/60c567f6c9eb0993d835a73d198590894a90afc5

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/commit/60c567f6c9eb0993d835a73d198590894a90afc5
You're receiving this email because of your account on salsa.debian.org.