[pve-devel] [PATCH zfsonlinux 0/5] port some changes from salsa.d.o

[pve-devel] [PATCH zfsonlinux 0/5] port some changes from salsa.d.o

[Stoiko Ivanov]

The following patch-series is the result of diffing debian/ with the
version on salsa, and checking for commits in debian-upstream that might
make sense to port over (if only to keep our delta to debian small).

most patches are house-keeping to minimize our delta.
PATCH 1/5 might be relevant (see the linked bugs.d.o report), but afaict
the deletion is racy and does not happen often.

Tested by comparing the resulting deb-packages with the ones without the
patches via diffoscope, and running the package on 2 VMs with replication
and ztest.

Stoiko Ivanov (5):
  cherry-pick usr-merge fix for libzfs6linux
  d/: move some tools out of /usr/sbin and add links for compatibility
  usr-merge: synchronize debian/ with upstream
  d/control: record conflict with nordugrid-arc-client
  d/lintian-overrides: adapt to renamed tags

 debian/control                                   |  2 +-
 debian/libzfs6linux.postrm                       | 15 +++++++++++++++
 debian/libzfs6linux.preinst                      | 16 ++++++++++++++++
 debian/libzfslinux-dev.install.in                |  2 +-
 debian/rules                                     |  8 --------
 .../usr/share/initramfs-tools/hooks/zdev         | 12 ++++++------
 debian/zfs-test.lintian-overrides                |  4 ++--
 debian/zfsutils-linux.install                    |  6 +++---
 debian/zfsutils-linux.links                      |  3 +++
 debian/zfsutils-linux.lintian-overrides          | 11 ++++++-----
 10 files changed, 53 insertions(+), 26 deletions(-)
 create mode 100644 debian/libzfs6linux.postrm
 create mode 100644 debian/libzfs6linux.preinst

-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH zfsonlinux 1/5] cherry-pick usr-merge fix for libzfs6linux

[Stoiko Ivanov]

moving file canonical locations from e.g. /lib to /usr/lib (usr-merge)
while renaming a package (libzfs4linux -> libzfs6linux) could result
in file deletions during upgrades. The following workaround has been
used in debian upstream.

see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1092598 for the
details.

based on commit 0431247714965007bc156fd57852689b395b2bae
https://salsa.debian.org/zfsonlinux-team/zfs/

Originally-by: Shengqi Chen <harry-chen@outlook.com>
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 debian/libzfs6linux.postrm  | 15 +++++++++++++++
 debian/libzfs6linux.preinst | 16 ++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 debian/libzfs6linux.postrm
 create mode 100644 debian/libzfs6linux.preinst

diff --git a/debian/libzfs6linux.postrm b/debian/libzfs6linux.postrm
new file mode 100644
index 000000000..ae6478653
--- /dev/null
+++ b/debian/libzfs6linux.postrm
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+if test "$1" = remove; then
+	# DEP17 P1 M8. Clean up after libzfs6linux.preinst. This code should be
+	# removed once the diversions are deleted via postinst.
+	for lib in zfs_core.so.3 zfs_core.so.3.0.0; do
+		dpkg-divert --package libzfs6linux --no-rename --divert "/lib/#DEB_HOST_MULTIARCH#/lib$lib.usr-is-merged" --remove "/lib/#DEB_HOST_MULTIARCH#/lib$lib"
+	done
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/libzfs6linux.preinst b/debian/libzfs6linux.preinst
new file mode 100644
index 000000000..6d1870785
--- /dev/null
+++ b/debian/libzfs6linux.preinst
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+if test "$1" = install -o "$1" = upgrade; then
+	# DEP17 P1 M8: Divert aliased files to avoid their removal deleting the
+	# moved ones. These diversions should be removed via postinst once
+	# trixie is released.
+	for lib in zfs_core.so.3 zfs_core.so.3.0.0; do
+		dpkg-divert --package libzfs6linux --no-rename --divert "/lib/#DEB_HOST_MULTIARCH#/lib$lib.usr-is-merged" --add "/lib/#DEB_HOST_MULTIARCH#/lib$lib"
+	done
+fi
+
+#DEBHELPER#
+
+exit 0
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH zfsonlinux 2/5] d/: move some tools out of /usr/sbin and add links for compatibility

[Stoiko Ivanov]

adapted commit e1e64f07af5c4ca2a313625a15c24e4ad6fb42f1 from
debian-upstream https://salsa.debian.org/zfsonlinux-team/zfs/:

- arc_summary and zilstat do not require privilege.
- arcstat does not need root, but the name is taken by nordugrid-arc-client.
- dbufstat needs root permission to read /proc/spl/kstat.

See: #1064835, #1063457

Originally-by: Shengqi Chen <harry-chen@outlook.com>
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 debian/rules                  | 8 --------
 debian/zfsutils-linux.install | 6 +++---
 debian/zfsutils-linux.links   | 3 +++
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/debian/rules b/debian/rules
index 02896d554..7db5f127c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,14 +61,6 @@ override_dh_auto_install:
 	@# Install the utilities.
 	$(MAKE) install DESTDIR='$(CURDIR)/debian/tmp'
 
-	# Move from bin_dir to /usr/sbin
-	# Remove suffix (.py) as per policy 10.4 - Scripts
-	# https://www.debian.org/doc/debian-policy/ch-files.html#s-scripts
-	mkdir -p '$(CURDIR)/debian/tmp/usr/sbin/'
-	mv '$(CURDIR)/debian/tmp/usr/bin/arc_summary' '$(CURDIR)/debian/tmp/usr/sbin/arc_summary'
-	mv '$(CURDIR)/debian/tmp/usr/bin/arcstat' '$(CURDIR)/debian/tmp/usr/sbin/arcstat'
-	mv '$(CURDIR)/debian/tmp/usr/bin/dbufstat' '$(CURDIR)/debian/tmp/usr/sbin/dbufstat'
-
 	chmod a-x '$(CURDIR)/debian/tmp/etc/zfs/zfs-functions'
 	chmod a-x '$(CURDIR)/debian/tmp/etc/default/zfs'
 
diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install
index c74d4b654..447baf6cd 100644
--- a/debian/zfsutils-linux.install
+++ b/debian/zfsutils-linux.install
@@ -28,9 +28,9 @@ usr/lib/udev/
 usr/lib/zfs-linux/zfs_prepare_disk
 usr/lib/zfs-linux/zpool.d/
 usr/lib/zfs-linux/zpool_influxdb
-usr/sbin/arc_summary
-usr/sbin/arcstat
-usr/sbin/dbufstat
+usr/bin/arc_summary
+usr/bin/arcstat usr/sbin
+usr/bin/dbufstat usr/sbin
 usr/sbin/fsck.zfs
 usr/sbin/mount.zfs
 usr/sbin/zdb
diff --git a/debian/zfsutils-linux.links b/debian/zfsutils-linux.links
index 54099e657..3c3fc442b 100644
--- a/debian/zfsutils-linux.links
+++ b/debian/zfsutils-linux.links
@@ -1,3 +1,6 @@
 usr/sbin/zfs      usr/bin/zfs
 usr/sbin/zpool    usr/bin/zpool
 usr/lib/zfs-linux/zpool_influxdb  usr/bin/zpool_influxdb
+usr/bin/arc_summary  usr/sbin/arc_summary
+usr/bin/zilstat      usr/sbin/zilstat
+usr/bin/zvol_wait    usr/sbin/zvol_wait
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH zfsonlinux 3/5] usr-merge: synchronize debian/ with upstream

[Stoiko Ivanov]

minor changes found by `diff -ru` on debian/ with the one in
debian-upstream

based on https://salsa.debian.org/zfsonlinux-team/zfs/
commits: 3b029ca123417535a53efa23f54975649924c66c
3b029ca123417535a53efa23f54975649924c66c

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 debian/libzfslinux-dev.install.in                    |  2 +-
 .../usr/share/initramfs-tools/hooks/zdev             | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/libzfslinux-dev.install.in b/debian/libzfslinux-dev.install.in
index c286cc327..9b14b6f27 100644
--- a/debian/libzfslinux-dev.install.in
+++ b/debian/libzfslinux-dev.install.in
@@ -1,4 +1,4 @@
-usr/lib/@DEB_HOST_MULTIARCH@/*.a usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/@DEB_HOST_MULTIARCH@/*.a
 usr/include
 usr/lib/@DEB_HOST_MULTIARCH@/*.so
 /usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/*.pc
diff --git a/debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev b/debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev
index 0cf21a421..a1aa39ac0 100755
--- a/debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev
+++ b/debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev
@@ -5,7 +5,7 @@
 
 PREREQ="udev"
 PREREQ_UDEV_RULES="60-zvol.rules 69-vdev.rules"
-COPY_EXEC_LIST="/lib/udev/zvol_id /lib/udev/vdev_id"
+COPY_EXEC_LIST="/usr/lib/udev/zvol_id /usr/lib/udev/vdev_id"
 
 # Generic result code.
 RC=0
@@ -33,18 +33,18 @@ fi
 
 . /usr/share/initramfs-tools/hook-functions
 
-mkdir -p "$DESTDIR/lib/udev/rules.d/"
+mkdir -p "$DESTDIR/usr/lib/udev/rules.d/"
 for ii in $PREREQ_UDEV_RULES
 do
 	if [ -e "/etc/udev/rules.d/$ii" ]
 	then
-		cp -p "/etc/udev/rules.d/$ii" "$DESTDIR/lib/udev/rules.d/"
-	elif [ -e "/lib/udev/rules.d/$ii" ]
+		cp -p "/etc/udev/rules.d/$ii" "$DESTDIR/usr/lib/udev/rules.d/"
+	elif [ -e "/usr/lib/udev/rules.d/$ii" ]
 	then
-		cp -p "/lib/udev/rules.d/$ii" "$DESTDIR/lib/udev/rules.d/"
+		cp -p "/usr/lib/udev/rules.d/$ii" "$DESTDIR/usr/lib/udev/rules.d/"
 	else
 		echo "Error: Missing udev rule: $ii"
-		echo "       This file must be in the /etc/udev/rules.d or /lib/udev/rules.d directory."
+		echo "       This file must be in the /etc/udev/rules.d or /usr/lib/udev/rules.d directory."
 		exit 1
 	fi
 done
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH zfsonlinux 4/5] d/control: record conflict with nordugrid-arc-client

[Stoiko Ivanov]

nordugrid-arc-client also ships /usr/bin/arcstat, which conflicts
with zfsutils-linux after usrmerge and moving files from sbin to bin.

See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1063457 for
further details.

based on upstream https://salsa.debian.org/zfsonlinux-team/zfs/
commit 779b5232db366c4e48b159a76cb0d18be4452273

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index f2688dfac..8be70d999 100644
--- a/debian/control
+++ b/debian/control
@@ -213,7 +213,7 @@ Architecture: linux-any
 Depends: python3, ${misc:Depends}, ${shlibs:Depends},
 Recommends: zfs-zed,
 Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs,
-Conflicts: zfs, zfs-fuse,
+Conflicts: zfs, zfs-fuse, nordugrid-arc-client
 Provides: zfsutils,
 Description: command-line tools to manage OpenZFS filesystems
  OpenZFS is a storage platform that encompasses the functionality of
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH zfsonlinux 5/5] d/lintian-overrides: adapt to renamed tags

[Stoiko Ivanov]

based on upstream https://salsa.debian.org/zfsonlinux-team/zfs/
commit f575e9492bbbb92670934e1b6ced6e7c41e2072c

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 debian/zfs-test.lintian-overrides       |  4 ++--
 debian/zfsutils-linux.lintian-overrides | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/zfs-test.lintian-overrides b/debian/zfs-test.lintian-overrides
index 8b6af0439..ea5cec445 100644
--- a/debian/zfs-test.lintian-overrides
+++ b/debian/zfs-test.lintian-overrides
@@ -1,7 +1,7 @@
 arch-dependent-file-in-usr-share
-command-in-sbin-has-manpage-in-incorrect-section
+manual-page-for-system-command
 arch-dep-package-has-big-usr-share
-manpage-without-executable
+spare-manual-page
 national-encoding *usr/share/zfs/zfs-tests/tests/functional/channel_program/lua_core/tst.lib_table.lua*
 executable-not-elf-or-script *usr/share/zfs/zfs-tests/tests/functional/cli_root/*
 package-contains-documentation-outside-usr-share-doc *usr/share/zfs/zfs-tests/*
diff --git a/debian/zfsutils-linux.lintian-overrides b/debian/zfsutils-linux.lintian-overrides
index fbf53da63..3cc548e88 100644
--- a/debian/zfsutils-linux.lintian-overrides
+++ b/debian/zfsutils-linux.lintian-overrides
@@ -1,10 +1,11 @@
 spare-manual-page
 systemd-service-file-refers-to-unusual-wantedby-target
-binary-without-manpage *usr/sbin/dbufstat*
-binary-without-manpage *usr/sbin/arc_summary*
-manpage-has-errors-from-man
+no-manual-page [usr/sbin/dbufstat]
+no-manual-page [usr/sbin/arc_summary]
+no-manual-page [usr/sbin/zilstat]
+groff-message
 appstream-metadata-missing-modalias-provide
-command-in-sbin-has-manpage-in-incorrect-section
-spelling-error-in-manpage
+manual-page-for-system-command
+typo-in-manual-page
 systemd-service-file-missing-documentation-key *lib/systemd/system/zfs-volume-wait.service*
 extra-license-file *usr/share/doc/zfsutils-linux/LICENSE.gz*
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] applied-series: [PATCH zfsonlinux 0/5] port some changes from salsa.d.o

[Fabian Grünbichler]

On Tue, 27 May 2025 18:12:38 +0200, Stoiko Ivanov wrote:
> The following patch-series is the result of diffing debian/ with the
> version on salsa, and checking for commits in debian-upstream that might
> make sense to port over (if only to keep our delta to debian small).
> 
> most patches are house-keeping to minimize our delta.
> PATCH 1/5 might be relevant (see the linked bugs.d.o report), but afaict
> the deletion is racy and does not happen often.
> 
> [...]

Applied, thanks!

[1/5] cherry-pick usr-merge fix for libzfs6linux
      commit: 8b4e7cdfc628ade662065c7904eef29622c8c0b4
[2/5] d/: move some tools out of /usr/sbin and add links for compatibility
      commit: 85fa0057a54c50565ac11e24f955a185c8edfc11
[3/5] usr-merge: synchronize debian/ with upstream
      commit: 29b58287ee2d40f028915d43a8e2fbc2e00b0b2f
[4/5] d/control: record conflict with nordugrid-arc-client
      commit: f0ae2bcc39500f9ed523b270a85cac3872542411
[5/5] d/lintian-overrides: adapt to renamed tags
      commit: 1b901db7dce6a3ef4273178ed142961f77eecbf6

with two tiny follow-ups:

7414f26de03cf28a938a38b3fbc18e324761e8f6 d/control: set R^3 to no
cc473b97589448208eb3bf6c1bd7d230988685e1 d/control: bump Standards-Version to 4.7.2

Best regards,
-- 
Fabian Grünbichler <f.gruenbichler@proxmox.com>


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel