Package: varnish Version: 7.1.1-1.1 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2
We want to modify dh_installsystemd such that it installs units below /usr in order to finalize the /usr-merge transition via DEP17. When doing so, varnish.service is being installed to both /lib (via dh_install) and /usr/lib (via dh_installsystemd). Such behaviour constitutes a policy violation and therefore this bug will become release-critical once I upload debhelper. In the attached patch, I also change the way varnishncsa.service is installed to allow dh_installsystemd to choose its location. Therefore, varnish will hopefully not need any other changes for the /usr-merge. Helmut
diff -Nru varnish-7.1.1/debian/changelog varnish-7.1.1/debian/changelog --- varnish-7.1.1/debian/changelog 2023-01-09 22:09:31.000000000 +0100 +++ varnish-7.1.1/debian/changelog 2023-10-24 12:33:34.000000000 +0200 @@ -1,3 +1,10 @@ +varnish (7.1.1-1.2) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install systemd units using dh_installsystemd only. (Closes: #-1) + + -- Helmut Grohne <hel...@subdivi.de> Tue, 24 Oct 2023 12:33:34 +0200 + varnish (7.1.1-1.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru varnish-7.1.1/debian/rules varnish-7.1.1/debian/rules --- varnish-7.1.1/debian/rules 2023-01-09 21:59:22.000000000 +0100 +++ varnish-7.1.1/debian/rules 2023-10-24 12:32:17.000000000 +0200 @@ -105,6 +105,9 @@ dh_installinit --name=varnishlog dh_installinit --name=varnishncsa +execute_after_dh_installsystemd: + dh_installsystemd --package=varnish --name=varnishncsa + override_dh_makeshlibs: dh_makeshlibs -VUpstream-Version diff -Nru varnish-7.1.1/debian/varnish.install varnish-7.1.1/debian/varnish.install --- varnish-7.1.1/debian/varnish.install 2023-01-09 21:59:22.000000000 +0100 +++ varnish-7.1.1/debian/varnish.install 2023-10-24 12:33:28.000000000 +0200 @@ -4,4 +4,3 @@ usr/lib/*/varnish usr/share/man usr/share/varnish/vcl -debian/*.service lib/systemd/system/ diff -Nru varnish-7.1.1/debian/varnish.varnishncsa.service varnish-7.1.1/debian/varnish.varnishncsa.service --- varnish-7.1.1/debian/varnish.varnishncsa.service 1970-01-01 01:00:00.000000000 +0100 +++ varnish-7.1.1/debian/varnish.varnishncsa.service 2023-01-09 21:59:22.000000000 +0100 @@ -0,0 +1,20 @@ +[Unit] +Description=Varnish HTTP accelerator log daemon +Documentation=https://www.varnish-cache.org/docs/6.1/ man:varnishncsa +After=varnish.service + +[Service] +Type=forking +PIDFile=/run/varnishncsa/varnishncsa.pid +RuntimeDirectory=varnishncsa +User=varnishlog +Group=varnish +ExecStart=/usr/bin/varnishncsa -a -w /var/log/varnish/varnishncsa.log -D -P /run/varnishncsa/varnishncsa.pid +ExecReload=/bin/kill -HUP $MAINPID +PrivateDevices=true +PrivateTmp=true +ProtectHome=true +ProtectSystem=full + +[Install] +WantedBy=multi-user.target diff -Nru varnish-7.1.1/debian/varnishncsa.service varnish-7.1.1/debian/varnishncsa.service --- varnish-7.1.1/debian/varnishncsa.service 2023-01-09 21:59:22.000000000 +0100 +++ varnish-7.1.1/debian/varnishncsa.service 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -[Unit] -Description=Varnish HTTP accelerator log daemon -Documentation=https://www.varnish-cache.org/docs/6.1/ man:varnishncsa -After=varnish.service - -[Service] -Type=forking -PIDFile=/run/varnishncsa/varnishncsa.pid -RuntimeDirectory=varnishncsa -User=varnishlog -Group=varnish -ExecStart=/usr/bin/varnishncsa -a -w /var/log/varnish/varnishncsa.log -D -P /run/varnishncsa/varnishncsa.pid -ExecReload=/bin/kill -HUP $MAINPID -PrivateDevices=true -PrivateTmp=true -ProtectHome=true -ProtectSystem=full - -[Install] -WantedBy=multi-user.target