Your message dated Sat, 03 Feb 2024 22:54:06 +0000
with message-id <e1rwoti-001v7b...@fasolo.debian.org>
and subject line Bug#1062803: fixed in libtirpc 1.3.4+ds-1.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: libtirpc
Source-Version: 1.3.4+ds-1.1~exp2
Done: Steve Langasek <vor...@debian.org>
We believe that the bug you reported is fixed in the latest version of
libtirpc, 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 libtirpc 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: Sat, 03 Feb 2024 21:26:30 +0000
Source: libtirpc
Architecture: source
Version: 1.3.4+ds-1.1~exp2
Distribution: experimental
Urgency: medium
Maintainer: Josue Ortega <jo...@debian.org>
Changed-By: Steve Langasek <vor...@debian.org>
Closes: 1062803
Changes:
libtirpc (1.3.4+ds-1.1~exp2) experimental; urgency=medium
.
[ Helmut Grohne ]
* Non-maintainer upload.
* Fix /usr-move mitigation. (Closes: #1062803)
Checksums-Sha1:
404ccfa91b5d90e20538a32af63f357649131359 2163 libtirpc_1.3.4+ds-1.1~exp2.dsc
6da41337153a088fc0a15f8b0844e20980101f9d 11820
libtirpc_1.3.4+ds-1.1~exp2.debian.tar.xz
e927381fffe4c88d1a436b11b211f1fbedaacdd7 5933
libtirpc_1.3.4+ds-1.1~exp2_source.buildinfo
Checksums-Sha256:
467eeda150ebf93238ebf28897e528b205321532cd445307209530dc92f21477 2163
libtirpc_1.3.4+ds-1.1~exp2.dsc
f5332b1aec1c5d7862249a114c0fbcc9771ec5278c24a3f06de985b9c7f8981b 11820
libtirpc_1.3.4+ds-1.1~exp2.debian.tar.xz
09b82c3f565d717047e7535223f661f7959463c302f339816f983e68f1e6b5ac 5933
libtirpc_1.3.4+ds-1.1~exp2_source.buildinfo
Files:
f577f4a6395c5ce7440f2f7f3ea991d1 2163 libs optional
libtirpc_1.3.4+ds-1.1~exp2.dsc
c8ac4f0d2d4e297f188ff26fcaae91c7 11820 libs optional
libtirpc_1.3.4+ds-1.1~exp2.debian.tar.xz
cc65c59aebd0892f940cc92a382274d8 5933 libs optional
libtirpc_1.3.4+ds-1.1~exp2_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQJGBAEBCgAwFiEErEg/aN5yj0PyIC/KVo0w8yGyEz0FAmW+r9oSHHZvcmxvbkBk
ZWJpYW4ub3JnAAoJEFaNMPMhshM98DcP/jMqnYV6638mAb2O8aJDUmBVBESXH00j
64kuGwkLhONBvabGYw5El33x5BDQcV46tSFm7pT4TYkZA5yx9fNrKYm2y6divv4+
h2R1AZwueFoumve136RdFRafWfWDH0rYy4WrNm725RLe6yY1S2p0sVWj/lOZjDIU
DArERh965euDRhOBy/22AwdU+f8SSwcOu/CcdaLsQOawQFdmk5cWDLSfOOpP3vXt
+/9clBVdeuj7M9d1iECT6MZkRRLZ8EFonv7gpztpCzqDgyAYTpHfNMwvBL6CHNtp
tpcVXcJ0OpGXTsIO5bAzsV5FLZdSq9NEwgda4+ilujE+QKuhjgsnqVFrXn0TwS2p
OcoHnHV4jgAm6RDLI1va5Zm6lGEh1GUv+aMVihHKdmyEOz5fJjB/r8qpU9u+lCXf
SlI02CJ3Y13mHI+HLY01rTfc3BT3EY7PlOYBccfwGhNIzRoPYTLRT/dWRcHQAAfc
w4CXMcfQ63W006LxAePXoSwNxfExTOjTBLng05NFL90j0IeOpIUg2M/n3apoKXCc
LO1jo+MEex+qq4OFMPZF+KEJ6xeGpvYuNFPceK6OHysNc6e9LFI38iMBROSQbBB4
IyiAFFaZRlo7Fb6JaxQS0WqxPUnEsUnODyV4Li4hbEJGbe7Ok43+ai9yRblO1T4D
GqG/y8R7IwXH
=VBFY
-----END PGP SIGNATURE-----
--- End Message ---
