Your message dated Tue, 13 Aug 2024 18:36:43 +0000
with message-id <e1sdwnv-009grp...@fasolo.debian.org>
and subject line Bug#1067817: fixed in fuse 2.9.9-8.2
has caused the Debian Bug report #1067817,
regarding libfuse2: move library to /usr (DEP17 P1)
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.)


-- 
1067817: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1067817
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: libfuse2t64
Version: 2.9.9-8.1
Severity: important
Tags: patch
User: helm...@debian.org
Usertags: dep17m2 dep17p1
Control: affects -1 + libfuse2

Hi,

fuse2 is involved in the /usr-move (DEP17) in multiple ways. In this bug
report, I am staying away from binaries to avoid interference with the
statoverride matter #1060229. That still has to be dealt with
separately. Here, it is about moving the fuse library having become
non-trivial due to the time64 transition. Simply moving it would cause a
DEP17 P1 problem incurring file loss on upgrade. I'm attaching a patch
implementing the library move in a mitigated (P8 protective diversions)
way.

I've tested this patch with piuparts and manually tried triggering the
problem:
mmdebstrap trixie /dev/null --variant apt --include libfuse-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 libfuse2t64_2.9.9-8.2_amd64.deb /l.deb" 
--customize-hook="upload libfuse-dev_2.9.9-8.2_amd64.deb /d.deb" 
--chrooted-customize-hook="dpkg --auto-deconfigure --unpack /l.deb /d.deb && 
apt-get -y install /l.deb /d.deb && dpkg --verify"

Note that none of this patch, #1060229 and the time64 rename is
appropriate for bookworm-backports or earlier. All of them must be
reverted in case of performing a backport. Please contact me if a need
for backporting arises.

I also appreciate feedback to Chris' questions on #1060229 as that
enables us to produce the necessary patches.

Helmut
diff -Nru fuse-2.9.9/debian/changelog fuse-2.9.9/debian/changelog
--- fuse-2.9.9/debian/changelog 2024-02-29 23:24:20.000000000 +0100
+++ fuse-2.9.9/debian/changelog 2024-03-27 07:29:06.000000000 +0100
@@ -1,3 +1,11 @@
+fuse (2.9.9-8.2) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Move fuse library to /usr and add DEP17 P1 M8 protective diversions.
+    (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Wed, 27 Mar 2024 07:29:06 +0100
+
 fuse (2.9.9-8.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru fuse-2.9.9/debian/control fuse-2.9.9/debian/control
--- fuse-2.9.9/debian/control   2024-02-29 23:24:11.000000000 +0100
+++ fuse-2.9.9/debian/control   2024-03-27 07:29:06.000000000 +0100
@@ -29,7 +29,6 @@
 Package: libfuse2t64
 Provides: ${t64:Provides}
 Replaces: libfuse2
-Breaks: libfuse2 (<< ${source:Version})
 Section: libs
 Architecture: linux-any kfreebsd-any
 Multi-Arch: same
@@ -37,7 +36,7 @@
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
-Conflicts: fuse (<< ${binary:Version})
+Conflicts: fuse (<< ${binary:Version}), libfuse2 (<< ${source:Version})
 Suggests: fuse
 Description: Filesystem in Userspace (library)
  Filesystem in Userspace (FUSE) is a simple interface for userspace programs to
diff -Nru fuse-2.9.9/debian/libfuse2-udeb.install 
fuse-2.9.9/debian/libfuse2-udeb.install
--- fuse-2.9.9/debian/libfuse2-udeb.install     2014-06-20 08:23:50.000000000 
+0200
+++ fuse-2.9.9/debian/libfuse2-udeb.install     2024-03-27 07:21:56.000000000 
+0100
@@ -1 +1 @@
-usr/lib/*/*.so.*       lib
+usr/lib/*/*.so.*
diff -Nru fuse-2.9.9/debian/libfuse2t64.install 
fuse-2.9.9/debian/libfuse2t64.install
--- fuse-2.9.9/debian/libfuse2t64.install       2024-02-29 23:24:11.000000000 
+0100
+++ fuse-2.9.9/debian/libfuse2t64.install       2024-03-27 07:20:59.000000000 
+0100
@@ -1 +1 @@
-usr/lib/*/*.so.*       lib
+usr/lib/*/*.so.*
diff -Nru fuse-2.9.9/debian/libfuse2t64.postinst 
fuse-2.9.9/debian/libfuse2t64.postinst
--- fuse-2.9.9/debian/libfuse2t64.postinst      1970-01-01 01:00:00.000000000 
+0100
+++ fuse-2.9.9/debian/libfuse2t64.postinst      2024-03-27 07:28:59.000000000 
+0100
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+# begin-remove-after: released:trixie
+if test "$1" = configure; then
+       # Remove DEP17 P1 M8 protective diversions
+       for f in libfuse.so.2 libfuse.so.2.9.9 libulockmgr.so.1 
libulockmgr.so.1.0.1; do
+               dpkg-divert --no-rename --package libfuse2t64 --divert 
"/lib/#DEB_HOST_MULTIARCH#/$f.usr-is-merged" --remove 
"/lib/#DEB_HOST_MULTIARCH#/$f"
+       done
+fi
+# end-remove-after
+
+#DEBHELPER#
diff -Nru fuse-2.9.9/debian/libfuse2t64.preinst 
fuse-2.9.9/debian/libfuse2t64.preinst
--- fuse-2.9.9/debian/libfuse2t64.preinst       1970-01-01 01:00:00.000000000 
+0100
+++ fuse-2.9.9/debian/libfuse2t64.preinst       2024-03-27 07:28:02.000000000 
+0100
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+# begin-remove-after: released:trixie
+if test "$1" = upgrade || test "$1" = install; then
+       # Add DEP17 P1 M8 protective diversions
+       for f in libfuse.so.2 libfuse.so.2.9.9 libulockmgr.so.1 
libulockmgr.so.1.0.1; do
+               dpkg-divert --no-rename --package libfuse2t64 --divert 
"/lib/#DEB_HOST_MULTIARCH#/$f.usr-is-merged" --add 
"/lib/#DEB_HOST_MULTIARCH#/$f"
+       done
+fi
+# end-remove-after
+
+#DEBHELPER#
diff -Nru fuse-2.9.9/debian/rules fuse-2.9.9/debian/rules
--- fuse-2.9.9/debian/rules     2024-02-29 23:24:11.000000000 +0100
+++ fuse-2.9.9/debian/rules     2024-03-27 07:23:34.000000000 +0100
@@ -43,29 +43,12 @@
 
        dh_install
 
-       # adjusting /lib for multiarch
-       mkdir -p debian/libfuse2t64/lib/$(DEB_HOST_MULTIARCH)
-       mv debian/libfuse2t64/lib/*.so* 
debian/libfuse2t64/lib/$(DEB_HOST_MULTIARCH)
-ifeq ($(with_udeb),yes)
-       mkdir -p debian/libfuse2-udeb/lib/$(DEB_HOST_MULTIARCH)
-       mv debian/libfuse2-udeb/lib/*.so* 
debian/libfuse2-udeb/lib/$(DEB_HOST_MULTIARCH)
-endif
-
        # adding initramfs-tools integration
        install -D -m 0755 debian/local/fuse.hook 
debian/fuse/usr/share/initramfs-tools/hooks/fuse
 
        # adding kmod integration
 #      install -D -m 0644 debian/local/fuse.kmod 
debian/fuse/lib/modules-load.d/fuse.conf
 
-override_dh_link:
-       # correcting symlink targets
-       for LIB in debian/tmp/usr/lib/*/*.so; \
-       do \
-               dh_link -plibfuse-dev lib/$(DEB_HOST_MULTIARCH)/$$(basename 
$$(readlink $${LIB})) usr/lib/$(DEB_HOST_MULTIARCH)/$$(basename $${LIB}); \
-       done
-
-       dh_link --remaining-packages
-
 .PHONY: override_dh_autoreconf override_dh_auto_configure \
        override_dh_compress override_dh_fixperms \
        override_dh_install override_dh_link

--- End Message ---
--- Begin Message ---
Source: fuse
Source-Version: 2.9.9-8.2
Done: Chris Hofstaedtler <z...@debian.org>

We believe that the bug you reported is fixed in the latest version of
fuse, 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.
Chris Hofstaedtler <z...@debian.org> (supplier of updated fuse 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, 13 Aug 2024 19:25:27 +0200
Source: fuse
Architecture: source
Version: 2.9.9-8.2
Distribution: unstable
Urgency: medium
Maintainer: Laszlo Boszormenyi (GCS) <g...@debian.org>
Changed-By: Chris Hofstaedtler <z...@debian.org>
Closes: 1067817 1078151
Changes:
 fuse (2.9.9-8.2) unstable; urgency=medium
 .
   * Non-maintainer upload.
   * Install utility programs into /usr (DEP17 M2).
 .
   [ Helmut Grohne ]
   * Move fuse library to /usr and add DEP17 P1 M8 protective diversions.
     (Closes: #1067817)
   * Handle both canonial and aliased statoverride. (DEP17 P5) (Closes:
     #1078151)
Checksums-Sha1:
 f9480cd49841ad2e61a5b022a17857ba42813801 2342 fuse_2.9.9-8.2.dsc
 86bd5302d42d367bc9c78936b38e2fff2c21f2f7 25356 fuse_2.9.9-8.2.debian.tar.xz
 c196b566f83ec713cd3186e449ca916ce3ce41dd 7141 fuse_2.9.9-8.2_arm64.buildinfo
Checksums-Sha256:
 96d2470fcb1e079b9b6a38f8dbdad2e6ce8504eb2f5e2d6bc49989d8826ab5b8 2342 
fuse_2.9.9-8.2.dsc
 c489156f98a97a3866bb856665dedde813047331b6120194cfb0b693526ec2d9 25356 
fuse_2.9.9-8.2.debian.tar.xz
 ac754e4eb22581d9828973760097996397420d7495828c19c7aa2148bf912cba 7141 
fuse_2.9.9-8.2_arm64.buildinfo
Files:
 4061f6179b4117b18ea48592d44cf7c8 2342 utils optional fuse_2.9.9-8.2.dsc
 56e0fbe6b30ab6e54884516e4764c7e8 25356 utils optional 
fuse_2.9.9-8.2.debian.tar.xz
 99f0f51afccc5632fb6562ed7d203683 7141 utils optional 
fuse_2.9.9-8.2_arm64.buildinfo

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCAAdFiEEfRrP+tnggGycTNOSXBPW25MFLgMFAma7nBAACgkQXBPW25MF
LgOtsRAAg5RpzYiBnYk+yjC6rdC2dN0B4JjVgq+ic9OKY/OsFyTmDWibyLG1YbmO
RnxyIJ+lhLSUykCYV4YSGokba7NVeDLO3VuRXmi1j6ATP5o765VG1o2BlM01liIN
1n0dFxgkFWFTRzzKr/+uUf5rBzs5B2rudXgsbTE7l6TZZp72Mw1x2Sitk+xiNF8Q
qa6y3b+CeKB4phCdm7i4yHU+DvAoc8TuBmQj/QFDLt928rfVtLxC82wDqu9C/Leb
Zqa1bIB0idaUuFAVZXmSO0L7lzDnAos5lic2fU1X8jX+L0wAyIS/njXD4R+Ng27W
wiV9zRL+M40kHWa6xcOJ2yLUi078EcGLxmGNV3DS0DIpjG+dpDjeiZkEIeb0rK3k
uEvDGkldtnvSAP9WfzoZ+qVpCMQ2zSGgbfBz1cJSW0dWDuDqhVcGNNeq9G2m5hOk
Vpc4jP/8Y8V8cEDj7r/W6KFWDngRpLFYOBPmv3Uk7fnpOGnTPF9K7yz5AxNNH0VH
J5Q6iUoFcXErRfxr25EAW10iiSFIzmsaVihJIfa0jOF82mbLsCbuZ9TBH8Cz8Heo
qac5+DuPAifo0anDpWGnXcdVYoQWTRHRXLI0IwpjG3cneHGDWsVTfovELTC9+khH
LyfH7Kj/6AOdJDKH7cJ7atfuJcvzq1hudfQw7GQ6ls5WnF8I+qA=
=QD4J
-----END PGP SIGNATURE-----

Attachment: pgpYaE9qi2yJv.pgp
Description: PGP signature


--- End Message ---

Reply via email to