Bug#990937: unblock: l2tpns/2.3.3-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package l2tpns
* Backport patch to systemd unit from upstream
(and trivial metadata changes that are documented in d/changelog)
(changes by Julien Rabier and Sebastien Badia)
Reading [1] this two-line change sounds like something
that is wanted for bullseye.
https://code.ffdn.org/l2tpns/l2tpns/-/merge_requests/11
diff -Nru l2tpns-2.3.3/debian/changelog l2tpns-2.3.3/debian/changelog
--- l2tpns-2.3.3/debian/changelog 2021-02-06 02:11:00.000000000 +0200
+++ l2tpns-2.3.3/debian/changelog 2021-03-09 00:32:16.000000000 +0200
@@ -1,3 +1,15 @@
+l2tpns (2.3.3-2) unstable; urgency=medium
+
+ [ Sebastien Badia ]
+ * d/gbp: Added configuration
+ * d/patches: Update DEP-3 headers
+
+ [ Julien Rabier ]
+ * Update Uploader's e-mail address
+ * Backport patch to systemd unit from upstream
+
+ -- Sebastien Badia <sbadia@debian.org> Mon, 08 Mar 2021 23:32:16 +0100
+
l2tpns (2.3.3-1) unstable; urgency=medium
[ Julien Rabier ]
diff -Nru l2tpns-2.3.3/debian/control l2tpns-2.3.3/debian/control
--- l2tpns-2.3.3/debian/control 2021-02-06 02:09:30.000000000 +0200
+++ l2tpns-2.3.3/debian/control 2021-03-08 00:26:28.000000000 +0200
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian l2tpns Packaging Team <team+debian-l2tpns@tracker.debian.org>
Uploaders: Sebastien Badia <sbadia@debian.org>,
- Julien Rabier <jrabier@ilico.org>,
+ Julien Rabier <julien@ilico.org>,
Fernando Alves <fendo@sameswifi.fr>
Build-Depends: debhelper-compat (= 13), libcli-dev (>> 1.8.5)
Standards-Version: 4.5.1
diff -Nru l2tpns-2.3.3/debian/gbp.conf l2tpns-2.3.3/debian/gbp.conf
--- l2tpns-2.3.3/debian/gbp.conf 1970-01-01 02:00:00.000000000 +0200
+++ l2tpns-2.3.3/debian/gbp.conf 2021-03-08 00:26:19.000000000 +0200
@@ -0,0 +1,4 @@
+[DEFAULT]
+upstream-branch=upstream
+debian-branch=master
+pristine-tar = True
diff -Nru l2tpns-2.3.3/debian/patches/02-systemd-restart.patch l2tpns-2.3.3/debian/patches/02-systemd-restart.patch
--- l2tpns-2.3.3/debian/patches/02-systemd-restart.patch 1970-01-01 02:00:00.000000000 +0200
+++ l2tpns-2.3.3/debian/patches/02-systemd-restart.patch 2021-03-09 00:31:31.000000000 +0200
@@ -0,0 +1,17 @@
+Description: Restart l2tpns service on failure
+Author: Baptiste Jonglez <git@bitsofnetwork.org>
+Reviewed-by: Julien Rabier <julien@ilico.org>
+Bug: https://code.ffdn.org/l2tpns/l2tpns/-/merge_requests/11
+Applied-Upstream: https://code.ffdn.org/l2tpns/l2tpns/-/commit/a5ddc0f64a1099449c2f81b251cee6960f68ea18
+
+--- a/scripts/l2tpns.service
++++ b/scripts/l2tpns.service
+@@ -7,6 +7,8 @@ Documentation=man:l2tpns(8) man:startup-
+ EnvironmentFile=-/etc/default/l2tpns
+ ExecStart=/usr/sbin/l2tpns $L2TPNS_OPTS
+ ExecReload=/bin/kill -HUP $MAINPID
++Restart=on-failure
++RestartSec=5s
+
+ [Install]
+ WantedBy=multi-user.target
diff -Nru l2tpns-2.3.3/debian/patches/series l2tpns-2.3.3/debian/patches/series
--- l2tpns-2.3.3/debian/patches/series 2021-02-06 02:09:30.000000000 +0200
+++ l2tpns-2.3.3/debian/patches/series 2021-03-08 00:26:28.000000000 +0200
@@ -1 +1,2 @@
01-harden-compile.patch
+02-systemd-restart.patch
Reply to: