Your message dated Thu, 28 Mar 2024 15:00:12 +0000
with message-id <e1rprei-00bjgd...@fasolo.debian.org>
and subject line Bug#1067776: fixed in openrc 0.53-2
has caused the Debian Bug report #1067776,
regarding openrc: move files to /usr (DEP17) and revert unnecessary time64
transition
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.)
--
1067776: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1067776
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: openrc,libeinfo1,libeinfo1t64,librc1t64
Version: 0.53-1.1
Severity: serious
Tags: patch
User: helm...@debian.org
Usertags: dep17p1 dep17m2
Control: affects -1 librc1
Hi,
I am sending you a patch for moving files to /usr for DEP17, because
doing so requires mitigations due to time64 having renamed libraries. In
particular, I verified that libeinfo did not actually break ABI.
Therefore, I am proposing to revert the time64 transition for libeinfo.
As a consequence of the reversion, we need fewer /usr-move mitigations.
We still need the mitigation for librc though. I have set the severity
of this bug to serious to prevent libeinfo1t64 from migrating to trixie.
It should either be reverted before migration or it should not be
reverted. If you disagree with the reversion, please lower the severity
of this bug and I'll send a patch that extends the mitigation to
libeinfo. That said, fewer library renames make upgrades less painful.
I've tested the patch using piuparts and with a manual test case
precisely triggering the DEP17 P1 file loss scenario:
mmdebstrap trixie /dev/null --variant=apt --include librc-dev
--customize-hook='echo "deb http://deb.debian.org/debian sid main" >
"$1/etc/apt/sources.list.d/sid.list"' --chrooted-customize-hook="apt-get
update" --customize-hook="upload librc1t64_0.53-1.2_amd64.deb /l.deb"
--customize-hook="upload librc-dev_0.53-1.2_amd64.deb /d.deb"
--chrooted-customize-hook="dpkg --auto-deconfigure --unpack /l.deb /d.deb;
apt-get -y install /l.deb /d.deb" --chrooted-customize-hook="dpkg --verify"
Do note that this patch must not be backported to bookworm-backports or
earlier. If you intend to backport, you must revert both this patch and
the time64 transition for your backport.
I recommend uploading this sooner rather than later, because the
reversion helps people who have not yet upgraded libeinfo to unstable.
Helmut
diff -Nru openrc-0.53/debian/changelog openrc-0.53/debian/changelog
--- openrc-0.53/debian/changelog 2024-02-29 13:48:11.000000000 +0100
+++ openrc-0.53/debian/changelog 2024-03-26 15:56:35.000000000 +0100
@@ -1,3 +1,11 @@
+openrc (0.53-1.2) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Revert unnecessary time64 transition for libeinfo
+ * Move files to /usr and mitigate file loss (DEP17) (Closes: #-1).
+
+ -- Helmut Grohne <hel...@subdivi.de> Tue, 26 Mar 2024 15:56:35 +0100
+
openrc (0.53-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru openrc-0.53/debian/control openrc-0.53/debian/control
--- openrc-0.53/debian/control 2024-02-29 13:48:11.000000000 +0100
+++ openrc-0.53/debian/control 2024-03-26 15:56:35.000000000 +0100
@@ -47,7 +47,7 @@
Package: librc1t64
Provides: ${t64:Provides}
Replaces: librc1
-Breaks: librc1 (<< ${source:Version})
+Conflicts: librc1 (<< ${source:Version})
Architecture: any
Section: libs
Depends: ${misc:Depends},
@@ -84,10 +84,10 @@
.
This package provides development files for the runtime library.
-Package: libeinfo1t64
-Provides: ${t64:Provides}
-Replaces: libeinfo1
-Breaks: libeinfo1 (<< ${source:Version})
+Package: libeinfo1
+Provides: libeinfo1t64
+Replaces: libeinfo1t64
+Breaks: libeinfo1t64 (<< ${source:Version})
Architecture: any
Section: libs
Depends: ${misc:Depends},
@@ -110,7 +110,7 @@
Package: libeinfo-dev
Architecture: any
Section: libdevel
-Depends: libeinfo1t64 (=${binary:Version}),
+Depends: libeinfo1 (=${binary:Version}),
${misc:Depends},
Multi-Arch: same
Description: dependency based service manager (pretty console display
development)
diff -Nru openrc-0.53/debian/libeinfo-dev.links
openrc-0.53/debian/libeinfo-dev.links
--- openrc-0.53/debian/libeinfo-dev.links 2024-01-22 18:18:38.000000000
+0100
+++ openrc-0.53/debian/libeinfo-dev.links 2024-03-26 15:56:35.000000000
+0100
@@ -1,3 +1,3 @@
#! /usr/bin/dh-exec
-lib/${DEB_HOST_MULTIARCH}/libeinfo.so.1
usr/lib/${DEB_HOST_MULTIARCH}/libeinfo.so
+usr/lib/${DEB_HOST_MULTIARCH}/libeinfo.so.1
usr/lib/${DEB_HOST_MULTIARCH}/libeinfo.so
diff -Nru openrc-0.53/debian/libeinfo1.install
openrc-0.53/debian/libeinfo1.install
--- openrc-0.53/debian/libeinfo1.install 1970-01-01 01:00:00.000000000
+0100
+++ openrc-0.53/debian/libeinfo1.install 2024-03-26 15:56:35.000000000
+0100
@@ -0,0 +1 @@
+usr/lib/*/libeinfo.so.*
diff -Nru openrc-0.53/debian/libeinfo1t64.install
openrc-0.53/debian/libeinfo1t64.install
--- openrc-0.53/debian/libeinfo1t64.install 2024-01-22 18:18:38.000000000
+0100
+++ openrc-0.53/debian/libeinfo1t64.install 1970-01-01 01:00:00.000000000
+0100
@@ -1 +0,0 @@
-lib/*/libeinfo.so.*
diff -Nru openrc-0.53/debian/libeinfo1t64.lintian-overrides
openrc-0.53/debian/libeinfo1t64.lintian-overrides
--- openrc-0.53/debian/libeinfo1t64.lintian-overrides 2024-02-29
13:48:06.000000000 +0100
+++ openrc-0.53/debian/libeinfo1t64.lintian-overrides 1970-01-01
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-libeinfo1t64: package-name-doesnt-match-sonames libeinfo1
diff -Nru openrc-0.53/debian/librc-dev.links openrc-0.53/debian/librc-dev.links
--- openrc-0.53/debian/librc-dev.links 2024-01-22 18:18:38.000000000 +0100
+++ openrc-0.53/debian/librc-dev.links 2024-03-26 15:56:35.000000000 +0100
@@ -1,3 +1,3 @@
#! /usr/bin/dh-exec
-lib/${DEB_HOST_MULTIARCH}/librc.so.1 usr/lib/${DEB_HOST_MULTIARCH}/librc.so
+usr/lib/${DEB_HOST_MULTIARCH}/librc.so.1 usr/lib/${DEB_HOST_MULTIARCH}/librc.so
diff -Nru openrc-0.53/debian/librc1t64.install
openrc-0.53/debian/librc1t64.install
--- openrc-0.53/debian/librc1t64.install 2024-01-22 18:18:38.000000000
+0100
+++ openrc-0.53/debian/librc1t64.install 2024-03-26 15:56:35.000000000
+0100
@@ -1 +1 @@
-/lib/*/librc.so.*
+/usr/lib/*/librc.so.*
diff -Nru openrc-0.53/debian/librc1t64.lintian-overrides
openrc-0.53/debian/librc1t64.lintian-overrides
--- openrc-0.53/debian/librc1t64.lintian-overrides 2024-02-29
13:48:06.000000000 +0100
+++ openrc-0.53/debian/librc1t64.lintian-overrides 2024-03-26
15:56:35.000000000 +0100
@@ -1 +1,5 @@
librc1t64: package-name-doesnt-match-sonames librc1
+# begin-remove-after: released:trixie
+# DEP17
+diversion-for-unknown-file lib/*/librc.so.1 [*]
+# end-remove-after
diff -Nru openrc-0.53/debian/librc1t64.postinst
openrc-0.53/debian/librc1t64.postinst
--- openrc-0.53/debian/librc1t64.postinst 1970-01-01 01:00:00.000000000
+0100
+++ openrc-0.53/debian/librc1t64.postinst 2024-03-26 15:56:35.000000000
+0100
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+# begin-remove-after: released:trixie
+if test "$1" = configure; then
+ dpkg-divert --no-rename --package librc1t64 --divert
"/lib/#DEB_HOST_MULTIARCH#/librc.so.1.usr-is-merged" --remove
"/lib/#DEB_HOST_MULTIARCH#/librc.so.1"
+fi
+# end-remove-after
+
+#DEBHELPER#
diff -Nru openrc-0.53/debian/librc1t64.preinst
openrc-0.53/debian/librc1t64.preinst
--- openrc-0.53/debian/librc1t64.preinst 1970-01-01 01:00:00.000000000
+0100
+++ openrc-0.53/debian/librc1t64.preinst 2024-03-26 15:56:35.000000000
+0100
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+# begin-remove-after: released:trixie
+if test "$1" = upgrade || test "$1" = install; then
+ dpkg-divert --no-rename --package librc1t64 --divert
"/lib/#DEB_HOST_MULTIARCH#/librc.so.1.usr-is-merged" --add
"/lib/#DEB_HOST_MULTIARCH#/librc.so.1"
+fi
+# end-remove-after
+
+#DEBHELPER#
diff -Nru openrc-0.53/debian/not-installed openrc-0.53/debian/not-installed
--- openrc-0.53/debian/not-installed 2024-01-22 18:18:38.000000000 +0100
+++ openrc-0.53/debian/not-installed 2024-03-26 15:56:35.000000000 +0100
@@ -1,3 +1,3 @@
-lib/*/librc.so
-lib/*/libeinfo.so
+usr/lib/*/librc.so
+usr/lib/*/libeinfo.so
usr/share/openrc/support/*
diff -Nru openrc-0.53/debian/openrc.install openrc-0.53/debian/openrc.install
--- openrc-0.53/debian/openrc.install 2024-01-22 18:18:38.000000000 +0100
+++ openrc-0.53/debian/openrc.install 2024-03-26 15:56:35.000000000 +0100
@@ -1,9 +1,9 @@
debian/rc /etc/init.d
debian/rcS /etc/init.d
-debian/tmp/bin /
+debian/tmp/usr/bin /usr
debian/tmp/etc /
-debian/tmp/lib/rc /lib
-debian/tmp/sbin /
+debian/tmp/usr/lib/rc /usr/lib
+debian/tmp/usr/sbin /usr
debian/tmp/usr/share/man/man8 /usr/share/man
usr/share/bash-completion/completions /usr/share/bash-completion/completions/
usr/share/zsh/site-functions /usr/share/zsh/site-functions
diff -Nru openrc-0.53/debian/openrc.postrm openrc-0.53/debian/openrc.postrm
--- openrc-0.53/debian/openrc.postrm 2024-01-22 18:18:38.000000000 +0100
+++ openrc-0.53/debian/openrc.postrm 2024-03-26 15:56:35.000000000 +0100
@@ -3,7 +3,7 @@
set -e
if [ "${1}" = "purge" ] ; then
- rm -rf /lib/rc /etc/runlevels
+ rm -rf /lib/rc /usr/lib/rc /etc/runlevels
rm -f /etc/init.d/transit
fi
diff -Nru openrc-0.53/debian/rc openrc-0.53/debian/rc
--- openrc-0.53/debian/rc 2024-01-22 18:18:38.000000000 +0100
+++ openrc-0.53/debian/rc 2024-03-26 15:56:35.000000000 +0100
@@ -6,17 +6,17 @@
# map numbered to named runlevel
case $1 in
0 )
- /sbin/openrc off && /sbin/openrc shutdown && \
+ /usr/sbin/openrc off && /usr/sbin/openrc shutdown && \
/etc/init.d/halt stop
;;
1 )
- exec /sbin/openrc recovery
+ exec /usr/sbin/openrc recovery
;;
6 )
- /sbin/openrc off && /sbin/openrc reboot && \
+ /usr/sbin/openrc off && /usr/sbin/openrc reboot && \
/etc/init.d/reboot stop
;;
* )
- exec /sbin/openrc default
+ exec /usr/sbin/openrc default
;;
esac
diff -Nru openrc-0.53/debian/rcS openrc-0.53/debian/rcS
--- openrc-0.53/debian/rcS 2024-01-22 18:18:38.000000000 +0100
+++ openrc-0.53/debian/rcS 2024-03-26 15:56:35.000000000 +0100
@@ -2,4 +2,4 @@
# Wrapper of OpenRC called from inittab
set -e
-exec /sbin/openrc sysinit
+exec /usr/sbin/openrc sysinit
diff -Nru openrc-0.53/debian/rules openrc-0.53/debian/rules
--- openrc-0.53/debian/rules 2024-01-22 18:18:38.000000000 +0100
+++ openrc-0.53/debian/rules 2024-03-26 15:56:35.000000000 +0100
@@ -4,7 +4,7 @@
%:
dh $@
-CONFIG_ARGS = --libexecdir=lib -Drootprefix=/
+CONFIG_ARGS = --libexecdir=lib -Drootprefix=/usr
ifeq ($(DEB_HOST_ARCH_OS),linux)
CONFIG_ARGS += -Dpam=true
else
@@ -19,7 +19,7 @@
# These are symlinks for compatibility reasons, and we don't want
# them in Debian.
for file in start-stop-daemon runscript rc service ; do \
- rm -f $(CURDIR)/debian/openrc/sbin/$${file} ; \
+ rm -f $(CURDIR)/debian/openrc/usr/sbin/$${file} ; \
done
# As openrc start-stop-daemon executable is removed above, we don't
--- End Message ---
--- Begin Message ---
Source: openrc
Source-Version: 0.53-2
Done: Mark Hindley <lee...@debian.org>
We believe that the bug you reported is fixed in the latest version of
openrc, 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 1067...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Mark Hindley <lee...@debian.org> (supplier of updated openrc 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: Tue, 26 Mar 2024 16:02:54 +0000
Source: openrc
Binary: libeinfo-dev libeinfo1 libeinfo1-dbgsym librc-dev librc1t64
librc1t64-dbgsym openrc openrc-dbgsym
Architecture: source amd64
Version: 0.53-2
Distribution: unstable
Urgency: medium
Maintainer: OpenRC Debian Maintainers <ope...@packages.debian.org>
Changed-By: Mark Hindley <lee...@debian.org>
Description:
libeinfo-dev - dependency based service manager (pretty console display
developm
libeinfo1 - dependency based service manager (pretty console display library)
librc-dev - dependency based service manager (runtime development)
librc1t64 - dependency based service manager (runtime library)
openrc - dependency based service manager (runlevel change mechanism)
Closes: 1067776
Changes:
openrc (0.53-2) unstable; urgency=medium
.
[ Helmut Grohne ]
* Revert unnecessary time64 transition for libeinfo
* Move files to /usr and mitigate file loss (DEP17) (Closes: #1067776).
.
[ Mark Hindley ]
* Import Non-maintainer upload.
Checksums-Sha1:
d67a5cb0624e929bef60425d04fe0eab89c93aca 2333 openrc_0.53-2.dsc
441428d75c70189548346029270144b7b2d00dae 26640 openrc_0.53-2.debian.tar.xz
f6eb653470cdeb6b2979d55fad69e9c40112fd97 10304 libeinfo-dev_0.53-2_amd64.deb
1944fd43f40ecce32a13e81c364b8377e4d1c0ae 19244
libeinfo1-dbgsym_0.53-2_amd64.deb
0a81f1cc91bc28a2ed5e9d9969dbbf242d8d7db6 13944 libeinfo1_0.53-2_amd64.deb
b19c46dc4da5361a01206cc69c30ca9de4bbd8ce 20256 librc-dev_0.53-2_amd64.deb
5d5be328fc1fad20823d59e6b74fed36f4abc859 77548
librc1t64-dbgsym_0.53-2_amd64.deb
1b81f815cd7078a1b6a2f021f33cd9f050e68964 32544 librc1t64_0.53-2_amd64.deb
4e70c9214a484a9378747ca25e8e8b9765014e4f 431764 openrc-dbgsym_0.53-2_amd64.deb
876dc8ca72ff67a825b7b522675df386ae9c8fc8 173432 openrc_0.53-2_amd64.deb
Checksums-Sha256:
4c6b2570e5d3caa1f23837f01d485925bb8c08d08fe7c4219b62a37688aec014 2333
openrc_0.53-2.dsc
31b99c133b666a6be787c8daeff9562d236d8a96271a0bba5411dd3cce5d217f 26640
openrc_0.53-2.debian.tar.xz
92947d7fd55fd493b0ae4b2cc6e053d1f7966be5535f4b534eb55b3400a8e301 10304
libeinfo-dev_0.53-2_amd64.deb
38417aa894939ef26b8f032558a23f5975c84206f3b3054edbc9c9abc82efdfc 19244
libeinfo1-dbgsym_0.53-2_amd64.deb
7f9919d09a4626c2683aaa083e7d0e59597ac148d80ea987240c69f34a0c1d6a 13944
libeinfo1_0.53-2_amd64.deb
6c6488689199bf4c419507605a05705f9ebd2530e0c13daf8bd5e46fa38898da 20256
librc-dev_0.53-2_amd64.deb
16500a55044c7bbc0eb4c53a9e425c14e4ab0bb9df41128e4ccc26ca6b4c500b 77548
librc1t64-dbgsym_0.53-2_amd64.deb
6d5dbc7096f196f81d4b1d4eb30d5c70a9775b4266078af919d64797e944e574 32544
librc1t64_0.53-2_amd64.deb
bdd76dc2fdad92f705212d2876ef019711e6289a946d35afba4de164c316d9f1 431764
openrc-dbgsym_0.53-2_amd64.deb
e0f671c0e9e275283d0476d5b8a64c6ab0bb61d06ba069c0058611da987d8aee 173432
openrc_0.53-2_amd64.deb
Files:
7d87df8f11474a0089125e25859a0973 2333 admin optional openrc_0.53-2.dsc
de18ef74a66bb2bf4fe0e5c6afe6a90c 26640 admin optional
openrc_0.53-2.debian.tar.xz
e06386775d13b203388d74a8379b2dea 10304 libdevel optional
libeinfo-dev_0.53-2_amd64.deb
1a4a2b5b9485f6dc754b942a15a353b3 19244 debug optional
libeinfo1-dbgsym_0.53-2_amd64.deb
eb6b37aeebc4fc23277ce86c9531fef7 13944 libs optional libeinfo1_0.53-2_amd64.deb
cd35f94b897f63b4f7ee0e6d296cb040 20256 libdevel optional
librc-dev_0.53-2_amd64.deb
d68248cf56acf1fa62216571c2cda01f 77548 debug optional
librc1t64-dbgsym_0.53-2_amd64.deb
1b1a5de1626b299bc124c72c7a9eb6fd 32544 libs optional librc1t64_0.53-2_amd64.deb
d07ade034404f6eee3c5fdaf4fa05e5a 431764 debug optional
openrc-dbgsym_0.53-2_amd64.deb
9fbc76f20dd71f37353d81d33b1b30af 173432 admin optional openrc_0.53-2_amd64.deb
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEUGwVpCsK9aCoVCPu0opFvzKH1kkFAmYEFe4ACgkQ0opFvzKH
1knkFQ//e/h6IJ3T6jKCY2xaieaxE7r1PwGZKH5BKYpN6NHn3HIiXg/NOkaRnqw+
3ddteQEzJdj9x7qNmNvE1+3MS7L0yFUSWMKW3u2wbq0nec7rgVpdELx387L8Hmpa
2dOYxvmcUZ9rXD2hOVqLp+kL7zrHa8xEPsJWDee0OLcx03Z82pZmBArTUp9P2IOR
pGbu7YdGjupqymvwyyL+sD4Cut8hV4LEVt4riFkKkQZ+pbbXgyV02hVJ3CIWaPB+
2HKxWQ2aFD+Rgjm6cdgujKxOWT8h7+MNCU+QxUU/dPaP63MsLd14pmS1oLK/KKjy
NatuHAa0Nwp0alxpfrh6IJ1jJo9jiHpPsZFyTVuOwcoTPzm+4pi45CV/OrOeTYRU
+BV8xuejbN897oM4Z9q9fAkY6IF8td1TxAmwUx7xkn421IAelA++WuGF5uFcXrSV
W9MP0wqgrlKHpSpuKfmx6avnRaFpC91NIOxRy/mQviamstxtNruQo4mnaG8yr9iM
LqecvtXDaPjONJYxfu37YzEq0aMUvoUj7f1jPyPnaJ7PAIRFUzUnbHv095xs4Yho
VEgjwoKBFWQ3iSXdm9MZF4+CrZeW0C/Up6jLxjujo7b0e0tQQNWYJQ1OkJwck8gg
D6QPQcnN7pwbWMjVaZzwQ7Sy7t84mD+llGF336k9ZZP3ntzTWko=
=h4rD
-----END PGP SIGNATURE-----
pgp1VGvs7fUXw.pgp
Description: PGP signature
--- End Message ---
