Your message dated Mon, 01 Apr 2024 16:25:46 +0000
with message-id <e1rrkti-00dc2a...@fasolo.debian.org>
and subject line Bug#1054484: fixed in varnish 7.1.1-1.2
has caused the Debian Bug report #1054484,
regarding varnish: installs varnish.service twice once dh_installsystemd
installs to /usr
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
1054484: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1054484
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
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
--- End Message ---
--- Begin Message ---
Source: varnish
Source-Version: 7.1.1-1.2
Done: Marco d'Itri <m...@linux.it>
We believe that the bug you reported is fixed in the latest version of
varnish, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 1054...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Marco d'Itri <m...@linux.it> (supplier of updated varnish package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Mon, 01 Apr 2024 17:56:26 +0200
Source: varnish
Architecture: source
Version: 7.1.1-1.2
Distribution: unstable
Urgency: medium
Maintainer: Varnish Package Maintainers <team+varnish-t...@tracker.debian.org>
Changed-By: Marco d'Itri <m...@linux.it>
Closes: 1054484
Changes:
varnish (7.1.1-1.2) unstable; urgency=medium
.
[ Marco d'Itri ]
* Non-maintainer upload.
* Import the precedent non-maintainer upload.
.
[ Helmut Grohne ]
* Install the systemd units using dh_installsystemd only.
(Closes: #1054484)
Checksums-Sha1:
5c863cf9f0e228d59821a690b50bdb5b356bf631 1796 varnish_7.1.1-1.2.dsc
c5cf9dbef030e934916f8f2eeb368a88f7f5e3a3 27332 varnish_7.1.1-1.2.debian.tar.xz
70b0e314c170940dbc8ed610c9710308d6b47843 10682
varnish_7.1.1-1.2_amd64.buildinfo
Checksums-Sha256:
39ace21be6eb0e2a21d311358b6682bf70722c1e4e3ec033e10633366f0546cd 1796
varnish_7.1.1-1.2.dsc
c7cfbecbe59a713896ce3b5f9f0f42adfcadb605642b636472d6c27322e78ca2 27332
varnish_7.1.1-1.2.debian.tar.xz
c388eb4578ead5fd31711449c38eacb668a663036b6d6c448c5f0e5f7ed6ea83 10682
varnish_7.1.1-1.2_amd64.buildinfo
Files:
9f11d274bdd3a2f2c845a6632cfb12e8 1796 web optional varnish_7.1.1-1.2.dsc
dbaff443e442da6daa03b6b19459e053 27332 web optional
varnish_7.1.1-1.2.debian.tar.xz
0ba3ce9daf7110eeb5a087716df67f1a 10682 web optional
varnish_7.1.1-1.2_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iHUEARYIAB0WIQQnKUXNg20437dCfobLPsM64d7XgQUCZgrcdgAKCRDLPsM64d7X
gZs5AQDgtI9Jc5SZnD7FUJhaoS65n9x1VFp8PMZ4kcla+0fQaAD/bgWvZR8WwLny
5W+Y2OQX9+XXJE3J+IvFCtdAndyCcg0=
=yGyh
-----END PGP SIGNATURE-----
pgpNRTEYYWT2i.pgp
Description: PGP signature
--- End Message ---
