Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock X-Debbugs-Cc: z...@debian.org
Please unblock package smartdns [ Reason ] Fix invalid systemd unit file, https://bugs.debian.org/989072 [ Impact ] systemd journal will have "Unknown key" noise. [ Tests ] I have installed the new version, and check the systemd journal. There's no complain from systemd now. [ Risks ] No, trivial fix. [ Checklist ] [x] all changes are documented in the d/changelog [x] I reviewed all changes and I approve them [x] attach debdiff against the package in testing [ Other info ] unblock smartdns/33+dfsg-2.1 diff -Nru smartdns-33+dfsg/debian/changelog smartdns-33+dfsg/debian/changelog --- smartdns-33+dfsg/debian/changelog 2020-12-02 19:57:30.000000000 +0800 +++ smartdns-33+dfsg/debian/changelog 2021-05-28 00:37:23.000000000 +0800 @@ -1,3 +1,12 @@ +smartdns (33+dfsg-2.1) unstable; urgency=medium + + * Non-maintainer upload. + ACK by maintainer. + * Backport patch to fix TimeoutStopSec key in systemd unit file + (Closes: #989072) + + -- Shengjing Zhu <z...@debian.org> Fri, 28 May 2021 00:37:23 +0800 + smartdns (33+dfsg-2) unstable; urgency=medium [ Chris Lamb ] diff -Nru smartdns-33+dfsg/debian/patches/fix-TimeoutStopSec-key-in-systemd-unit.patch smartdns-33+dfsg/debian/patches/fix-TimeoutStopSec-key-in-systemd-unit.patch --- smartdns-33+dfsg/debian/patches/fix-TimeoutStopSec-key-in-systemd-unit.patch 1970-01-01 08:00:00.000000000 +0800 +++ smartdns-33+dfsg/debian/patches/fix-TimeoutStopSec-key-in-systemd-unit.patch 2021-05-28 00:37:23.000000000 +0800 @@ -0,0 +1,29 @@ +From: Felix Yan <felixonm...@archlinux.org> +Date: Thu, 10 Sep 2020 21:54:48 +0800 +Subject: fix TimeoutStopSec key in systemd unit + +Origin: backport, https://github.com/pymumu/smartdns/commit/baa1397fb0d748055d56042739f19aff3f69c4fe +--- + systemd/smartdns.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/systemd/smartdns.service.in b/systemd/smartdns.service.in +index 79e218c..450e0a0 100644 +--- a/systemd/smartdns.service.in ++++ b/systemd/smartdns.service.in +@@ -3,7 +3,6 @@ Description=smartdns server + After=network.target + StartLimitBurst=0 + StartLimitIntervalSec=60 +-TimeoutStopSec=5 + + [Service] + Type=forking +@@ -13,6 +12,7 @@ ExecStart=@SBINDIR@/smartdns -p @RUNSTATEDIR@/smartdns.pid $SMART_DNS_OPTS + KillMode=process + Restart=always + RestartSec=2 ++TimeoutStopSec=5 + + [Install] + WantedBy=multi-user.target diff -Nru smartdns-33+dfsg/debian/patches/series smartdns-33+dfsg/debian/patches/series --- smartdns-33+dfsg/debian/patches/series 2020-12-02 19:56:09.000000000 +0800 +++ smartdns-33+dfsg/debian/patches/series 2021-05-28 00:37:23.000000000 +0800 @@ -1,2 +1,3 @@ init.patch reproducible-build.patch +fix-TimeoutStopSec-key-in-systemd-unit.patch