Your message dated Sun, 18 Feb 2024 08:43:35 +0000
with message-id <e1rbclr-006i1y...@fasolo.debian.org>
and subject line Bug#1062803: fixed in libsigrok 0.5.2-5.1~exp2
has caused the Debian Bug report #1062803,
regarding libsigrok4t64: improper /usr-move mitigation
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.)
--
1062803: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1062803
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: libsigrok4t64
Version: 0.5.2-5.1~exp1
Severity: serious
Tags: patch
User: helm...@debian.org
Usertags: dep17p1
Control: affects -1 + libsigrok4
X-Debbugs-Cc: vor...@debian.org
Hi Steve,
this NMU also introduces a DEP17 P1 problem. To make matters worse, the
affected file already is being mitigated for DEP17 P7. Mitigating both
problems at the same time is "interesting". I think I found a solution
and it passes piuparts. As I do not want to interfere with the time64
transition, I am not uploading this and merely attaching a patch.
For P7 mitigations, the diversion must not be owned by the causing
package. Hence these diversions are assigned to usr-is-merged and must
remain there. We're also dealing with the problem that these mitigations
now have to move from libsigrok4 to libsigrok4t64. I'd appreciate
another pair of eyeballs double checking this.
Helmut
diff --minimal -Nru libsigrok-0.5.2/debian/changelog
libsigrok-0.5.2/debian/changelog
--- libsigrok-0.5.2/debian/changelog 2024-02-02 08:36:33.000000000 +0100
+++ libsigrok-0.5.2/debian/changelog 2024-02-03 11:50:34.000000000 +0100
@@ -1,3 +1,10 @@
+libsigrok (0.5.2-5.1~exp1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Extend /usr-move mitigation for package rename. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Sat, 03 Feb 2024 11:50:34 +0100
+
libsigrok (0.5.2-5.1~exp1) experimental; urgency=medium
* Non-maintainer upload.
diff --minimal -Nru libsigrok-0.5.2/debian/libsigrok4t64.postinst
libsigrok-0.5.2/debian/libsigrok4t64.postinst
--- libsigrok-0.5.2/debian/libsigrok4t64.postinst 2024-02-02
08:36:33.000000000 +0100
+++ libsigrok-0.5.2/debian/libsigrok4t64.postinst 1970-01-01
01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-#!/bin/sh
-set -e
-
-# begin-remove-after: released:forky
-# protective diversion of files moved from / to /usr, to avoid file loss.
-# Only for upgrades.
-if [ "$1" = "configure" ]; then
- # At this point, the package will have installed the same file in */usr*.
- dpkg-divert --package usr-is-merged --no-rename \
- --divert /lib/udev/rules.d/60-libsigrok.rules.usr-is-merged \
- --remove /lib/udev/rules.d/60-libsigrok.rules
- dpkg-divert --package usr-is-merged --no-rename \
- --divert /lib/udev/rules.d/61-libsigrok-plugdev.rules.usr-is-merged \
- --remove /lib/udev/rules.d/61-libsigrok-plugdev.rules
- dpkg-divert --package usr-is-merged --no-rename \
- --divert /lib/udev/rules.d/61-libsigrok-uaccess.rules.usr-is-merged \
- --remove /lib/udev/rules.d/61-libsigrok-uaccess.rules
-fi
-# end-remove-after
-
-#DEBHELPER#
-
-exit 0
diff --minimal -Nru libsigrok-0.5.2/debian/libsigrok4t64.postrm
libsigrok-0.5.2/debian/libsigrok4t64.postrm
--- libsigrok-0.5.2/debian/libsigrok4t64.postrm 2024-02-02 08:36:33.000000000
+0100
+++ libsigrok-0.5.2/debian/libsigrok4t64.postrm 2024-02-03 11:50:16.000000000
+0100
@@ -1,9 +1,7 @@
#!/bin/sh
set -e
-# begin-remove-after: released:forky
# protective diversion of files moved from / to /usr, to avoid file loss.
-# Only for upgrades.
if [ "$1" = "remove" ] && [ "$DPKG_MAINTSCRIPT_PACKAGE_REFCOUNT" = "1" ]; then
# Cleanup in case package is removed before upgrade is finished (postinst
ran).
dpkg-divert --package usr-is-merged --no-rename \
@@ -16,7 +14,6 @@
--divert /lib/udev/rules.d/61-libsigrok-uaccess.rules.usr-is-merged \
--remove /lib/udev/rules.d/61-libsigrok-uaccess.rules
fi
-# end-remove-after
#DEBHELPER#
diff --minimal -Nru libsigrok-0.5.2/debian/libsigrok4t64.preinst
libsigrok-0.5.2/debian/libsigrok4t64.preinst
--- libsigrok-0.5.2/debian/libsigrok4t64.preinst 2024-02-02
08:36:33.000000000 +0100
+++ libsigrok-0.5.2/debian/libsigrok4t64.preinst 2024-02-03
11:50:34.000000000 +0100
@@ -1,10 +1,10 @@
#!/bin/sh
set -e
-# begin-remove-after: released:forky
# protective diversion of files moved from / to /usr, to avoid file loss.
-# Only for upgrades.
-if [ "$1" = "upgrade" ]; then
+# These protect both from M-A:same shared file loss and from loss due to moving
+# from libsigrok4 to libsigrok4t64.
+if [ "$1" = upgrade ] || [ "$1" = install ]; then
dpkg-divert --package usr-is-merged --no-rename \
--divert /lib/udev/rules.d/60-libsigrok.rules.usr-is-merged \
--add /lib/udev/rules.d/60-libsigrok.rules
@@ -14,8 +14,11 @@
dpkg-divert --package usr-is-merged --no-rename \
--divert /lib/udev/rules.d/61-libsigrok-uaccess.rules.usr-is-merged \
--add /lib/udev/rules.d/61-libsigrok-uaccess.rules
+
+ # These diversions are supposed to be taken over from libsigrok4, which
+ # will attempt to remove them in postinst and postrm. Prevent that.
+ rm -f /var/lib/dpkg/libsigrok4:*.postinst /var/lib/dpkg/libsigrok4:*.postrm
fi
-# end-remove-after
#DEBHELPER#
--- End Message ---
--- Begin Message ---
Source: libsigrok
Source-Version: 0.5.2-5.1~exp2
Done: Steve Langasek <vor...@debian.org>
We believe that the bug you reported is fixed in the latest version of
libsigrok, 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 1062...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Steve Langasek <vor...@debian.org> (supplier of updated libsigrok 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: SHA512
Format: 1.8
Date: Sun, 18 Feb 2024 07:59:53 +0000
Source: libsigrok
Architecture: source
Version: 0.5.2-5.1~exp2
Distribution: experimental
Urgency: medium
Maintainer: Debian Electronics Packaging Team
<pkg-electronics-de...@alioth-lists.debian.net>
Changed-By: Steve Langasek <vor...@debian.org>
Closes: 1062803
Changes:
libsigrok (0.5.2-5.1~exp2) experimental; urgency=medium
.
* Non-maintainer upload.
.
[ Helmut Grohne ]
* Extend /usr-move mitigation for package rename. (Closes: #1062803)
Checksums-Sha1:
b12b6c25624ede68c97562327d8fe8cab9bb1781 2396 libsigrok_0.5.2-5.1~exp2.dsc
2b23b2302cefd9404e87fc2e0c937103f69a65b1 10136
libsigrok_0.5.2-5.1~exp2.debian.tar.xz
16a3781a8e074560ac8c22e08e0cb28d282f0c13 8440
libsigrok_0.5.2-5.1~exp2_source.buildinfo
Checksums-Sha256:
82637bcdf856b1ae56cf1ebda02bad7e04d821d48ae7ebb40a3e98259a25a710 2396
libsigrok_0.5.2-5.1~exp2.dsc
3e932d9e261177dd040350226519f691390ea4699dadf4b08c7092e2748e3c38 10136
libsigrok_0.5.2-5.1~exp2.debian.tar.xz
b251a3b66d1a0c68c3bb82ff90e629bcc5d144d14e0e72975f7dcac23f507a02 8440
libsigrok_0.5.2-5.1~exp2_source.buildinfo
Files:
76e8dd3b5ba8c61bcfb116a8aceb3f0c 2396 libs optional
libsigrok_0.5.2-5.1~exp2.dsc
c5de87456eba28a48297e86a6b6ed4f3 10136 libs optional
libsigrok_0.5.2-5.1~exp2.debian.tar.xz
8af2888907f2ffdc437ca3b4cb7d053c 8440 libs optional
libsigrok_0.5.2-5.1~exp2_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQJGBAEBCgAwFiEErEg/aN5yj0PyIC/KVo0w8yGyEz0FAmXRuWISHHZvcmxvbkBk
ZWJpYW4ub3JnAAoJEFaNMPMhshM92xgQAJokvV0VOeIdAGV1S1WQDDwpjFGaIemx
YpcvP0RLapvD3PdoEq4pNwCwgyb1BbK0GUP5Zh49kONzXMYlnZcdykgDmm/2isUK
hqE5vM+xGTdqAi5HUbqp+BSZjrlI3BT19m4T4O4k3zzgzxe8GFusulSRvZw9icoz
ccrC1ywJuV70MWwfKwID+vQXpq8nOeAiTPSy7nGlKVWIVRtRCmB2LQx8IwtXhw6I
CXqvQBo5C0ddhK8WoxNk+RyikNKC+d7uwe/1/C7zPJMi4TFy5V6kovuppwf9d13Y
jIeIIgElULW0K3u3yolYNgG6t3u9d0+7QCS+AUqQviEW6IzwG1BDCQjWSK8eLY1M
Yih65yLlrCEi3SSEtKyuS+R7Z2RQWiye0fd1Jn5dfGovlni3yTFDA9Ckli41cS9l
9rkc51/d50FoWfRNmECyoz5ovz44FN91vWYjfS3wzanKZYDsyuiXZxz6eLjWklqI
9+iag7d0BQTO+IRxJDJg0iE88z9XHU4guW68f0wXhQdmNG6jdcBB+7h5QPyGdVqb
Gg4wI0lxlY8NCLNqV5K4MdYmpUTaavzSZK62zEig0jgOZps0GUQJBCkGl9ixvA2e
ORYOjYpS4WgLKFDvY8FBrOlB7APfXjD5ccomrgrnO1PA9GNf/SU5fuFXGpSIvJLF
ku+d1DrLbSTo
=cJWg
-----END PGP SIGNATURE-----
pgp8LTxdFH5Wu.pgp
Description: PGP signature
--- End Message ---
