Control: tags -1 + patch
Hello!
Please see the attached debdiff which adds a native systemd unit file
and does other related fixes. Please see the added debian/changelog
entries for further details.
I'm wondering if the next upload should also orphan the package given
there has been no maintainer upload in over 10 years?
Regards,
Andreas Henriksson
diff -Nru linux-atm-2.5.1/debian/atm-tools.atm
linux-atm-2.5.1/debian/atm-tools.atm
--- linux-atm-2.5.1/debian/atm-tools.atm 2012-09-22 16:18:14.000000000
+0200
+++ linux-atm-2.5.1/debian/atm-tools.atm 2016-06-13 18:18:40.000000000
+0200
@@ -16,6 +16,8 @@
test -f $DAEMON || exit 0
+. /lib/lsb/init-functions
+
OPTIONS='-l syslog'
START_DAEMON='yes'
diff -Nru linux-atm-2.5.1/debian/atm-tools.atm.service
linux-atm-2.5.1/debian/atm-tools.atm.service
--- linux-atm-2.5.1/debian/atm-tools.atm.service 1970-01-01
01:00:00.000000000 +0100
+++ linux-atm-2.5.1/debian/atm-tools.atm.service 2016-06-13
19:03:22.000000000 +0200
@@ -0,0 +1,21 @@
+[Unit]
+Documentation=man:atmarpd(8)
+Description=Start/stop the atm daemon(s).
+DefaultDependencies=no
+Before=sysinit.target
+Before=networking.service
+After=local-fs.target
+ConditionCapability=CAP_NET_ADMIN
+
+[Service]
+#Environment=OPTIONS=-l syslog
+## The EnvironmentFile line only included for backwards/sysvinit compat,
+## but using the file to configure is discuraged!
+## Instead use 'systemctl edit atm.service' and override the
+## Environment or ExecStart lines directly.
+#EnvironmentFile=-/etc/default/atm
+ExecStart=/sbin/atmarpd $OPTIONS
+Restart=on-abort
+
+[Install]
+WantedBy=sysinit.target
diff -Nru linux-atm-2.5.1/debian/changelog linux-atm-2.5.1/debian/changelog
--- linux-atm-2.5.1/debian/changelog 2012-09-22 16:18:14.000000000 +0200
+++ linux-atm-2.5.1/debian/changelog 2016-06-13 19:00:33.000000000 +0200
@@ -1,3 +1,20 @@
+linux-atm (1:2.5.1-1.6) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Add atm.service masking the atm init script (Closes: #796628)
+ * Build-depend on dh-systemd and use dh_systemd_{enable,start}
+ in debian/rules for the above.
+ * Source LSB init function in atm init script
+ - this it possible for systemd LSB hook to properly redirect
+ direct invocations of the init script to systemctl.
+ * Add an explicit Depends on lsb-base because of the above.
+ * Drop build-dependency on initscripts package.
+ - the original intention was likely to have this as a dependency
+ rather than build-dependency, but either way should no longer
+ be needed so just drop it.
+
+ -- Andreas Henriksson <[email protected]> Mon, 13 Jun 2016 18:18:44 +0200
+
linux-atm (1:2.5.1-1.5) unstable; urgency=low
* Non-maintainer upload.
diff -Nru linux-atm-2.5.1/debian/control linux-atm-2.5.1/debian/control
--- linux-atm-2.5.1/debian/control 2012-09-22 16:18:14.000000000 +0200
+++ linux-atm-2.5.1/debian/control 2016-06-13 18:58:11.000000000 +0200
@@ -2,13 +2,14 @@
Section: net
Priority: optional
Maintainer: Peter De Schrijver (p2) <[email protected]>
-Build-Depends: debhelper (>> 8.1.3~), bison, flex, autoconf, automake,
libtool, perl, initscripts (>= 2.88dsf-13.3)
+Build-Depends: debhelper (>> 8.1.3~), dh-systemd (>= 1.5),
+ bison, flex, autoconf, automake, libtool, perl
Standards-Version: 3.9.2
Package: atm-tools
Architecture: linux-any
Multi-Arch: foreign
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: lsb-base, ${shlibs:Depends}, ${misc:Depends}
Description: Base programs for ATM in Linux, the net-tools for ATM
This package provides all the basic programs needed for setting up,
monitoring and tuning ATM networks. Such as:
diff -Nru linux-atm-2.5.1/debian/rules linux-atm-2.5.1/debian/rules
--- linux-atm-2.5.1/debian/rules 2012-09-22 16:18:14.000000000 +0200
+++ linux-atm-2.5.1/debian/rules 2016-06-13 18:38:13.000000000 +0200
@@ -76,7 +76,9 @@
debian/libatm1-dev/usr/lib/libatm.so
dh_installdocs --link-doc=libatm1
+ dh_systemd_enable --name=atm
dh_installinit --init-script=atm -- start 39 S .
+ dh_systemd_start --name=atm
dh_installman
dh_installchangelogs ChangeLog
dh_link
