From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id E1F2C69BA1 for ; Wed, 24 Feb 2021 22:08:23 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B29032DEA7 for ; Wed, 24 Feb 2021 22:08:23 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id C37912DDFE for ; Wed, 24 Feb 2021 22:08:20 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8F347462FC for ; Wed, 24 Feb 2021 22:08:20 +0100 (CET) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Wed, 24 Feb 2021 22:07:59 +0100 Message-Id: <20210224210802.8425-2-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210224210802.8425-1-s.ivanov@proxmox.com> References: <20210224210802.8425-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.064 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [libnvpair2linux.docs, libzfs4linux.docs, libzpool4linux.docs, proxmox.com, install.in, libuutil3linux.docs, libnvpair3linux.docs, libzfs3linux.docs, libuutil2linux.docs, zfsonlinux.org, libzpool3linux.docs] Subject: [pve-devel] [PATCH zfsonlinux 1/4] d/control: match package names to debian-upstream X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Feb 2021 21:08:23 -0000 during the tracking of zfs-2.0.x integration in debian upstream I did not notice that the library packages got renamed yet another time (see [0]) to match the soname version. This patch renames our library packagenames to match debian upstream and includes Breaks,Depends on the intermediate versions we shipped with the zfs-2.0.3 release. Noticed while checking an issue (with `aptitude` vs. `apt`) reported on pve-user. Tested on a VM running our latest packages and on one still running zfs 0.8.5 [0] https://salsa.debian.org/zfsonlinux-team/zfs/-/commit/42ba750f8ca07625e9d58c14b46420768ab23c09 Signed-off-by: Stoiko Ivanov --- Makefile | 8 +-- debian/control | 50 ++++++++++--------- debian/libnvpair2linux.lintian-overrides | 1 - ...nvpair2linux.docs => libnvpair3linux.docs} | 0 ....install.in => libnvpair3linux.install.in} | 0 debian/libnvpair3linux.lintian-overrides | 1 + debian/libuutil2linux.lintian-overrides | 1 - ...ibuutil2linux.docs => libuutil3linux.docs} | 0 ...x.install.in => libuutil3linux.install.in} | 0 debian/libuutil3linux.lintian-overrides | 1 + debian/libzfs3linux.lintian-overrides | 1 - .../{libzfs3linux.docs => libzfs4linux.docs} | 0 ...nux.install.in => libzfs4linux.install.in} | 0 debian/libzfs4linux.lintian-overrides | 1 + debian/libzpool3linux.lintian-overrides | 1 - ...ibzpool3linux.docs => libzpool4linux.docs} | 0 ...x.install.in => libzpool4linux.install.in} | 0 debian/libzpool4linux.lintian-overrides | 1 + 18 files changed, 34 insertions(+), 32 deletions(-) delete mode 100644 debian/libnvpair2linux.lintian-overrides rename debian/{libnvpair2linux.docs => libnvpair3linux.docs} (100%) rename debian/{libnvpair2linux.install.in => libnvpair3linux.install.in} (100%) create mode 100644 debian/libnvpair3linux.lintian-overrides delete mode 100644 debian/libuutil2linux.lintian-overrides rename debian/{libuutil2linux.docs => libuutil3linux.docs} (100%) rename debian/{libuutil2linux.install.in => libuutil3linux.install.in} (100%) create mode 100644 debian/libuutil3linux.lintian-overrides delete mode 100644 debian/libzfs3linux.lintian-overrides rename debian/{libzfs3linux.docs => libzfs4linux.docs} (100%) rename debian/{libzfs3linux.install.in => libzfs4linux.install.in} (100%) create mode 100644 debian/libzfs4linux.lintian-overrides delete mode 100644 debian/libzpool3linux.lintian-overrides rename debian/{libzpool3linux.docs => libzpool4linux.docs} (100%) rename debian/{libzpool3linux.install.in => libzpool4linux.install.in} (100%) create mode 100644 debian/libzpool4linux.lintian-overrides diff --git a/Makefile b/Makefile index e0dad3a6..bc168cda 100644 --- a/Makefile +++ b/Makefile @@ -6,12 +6,12 @@ ZFSPKGVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion ZFSDIR=zfs-linux_${ZFSVER} ZFSSRC=upstream -ZFS_DEB1= libnvpair2linux_${ZFSPKGVER}_amd64.deb +ZFS_DEB1= libnvpair3linux_${ZFSPKGVER}_amd64.deb ZFS_DEB2= \ -libuutil2linux_${ZFSPKGVER}_amd64.deb \ -libzfs3linux_${ZFSPKGVER}_amd64.deb \ +libuutil3linux_${ZFSPKGVER}_amd64.deb \ +libzfs4linux_${ZFSPKGVER}_amd64.deb \ libzfslinux-dev_${ZFSPKGVER}_amd64.deb \ -libzpool3linux_${ZFSPKGVER}_amd64.deb \ +libzpool4linux_${ZFSPKGVER}_amd64.deb \ zfs-dbg_${ZFSPKGVER}_amd64.deb \ zfs-zed_${ZFSPKGVER}_amd64.deb \ zfs-initramfs_${ZFSPKGVER}_all.deb \ diff --git a/debian/control b/debian/control index 096d4afe..4ab6bda4 100644 --- a/debian/control +++ b/debian/control @@ -21,12 +21,12 @@ Homepage: https://www.zfsonlinux.org/ Vcs-Git: https://git.proxmox.com/git/zfsonlinux.git Vcs-Browser: https://git.proxmox.com/?p=zfsonlinux.git;a=summary -Package: libnvpair2linux +Package: libnvpair3linux Section: contrib/libs Architecture: linux-any Depends: ${misc:Depends}, ${shlibs:Depends} -Breaks: libnvpair1, libnvpair1linux -Replaces: libnvpair1, libnvpair1linux +Breaks: libnvpair1, libnvpair1linux, libnvpair2linux, libnvpair3 +Replaces: libnvpair1, libnvpair1linux, libnvpair2linux, libnvpair3 Description: Solaris name-value library for Linux This library provides routines for packing and unpacking nv pairs for transporting data across process boundaries, transporting between @@ -44,12 +44,12 @@ Description: PAM module for managing encryption keys for ZFS This provides a Pluggable Authentication Module (PAM) that automatically unlocks encrypted ZFS datasets upon login. -Package: libuutil2linux +Package: libuutil3linux Section: contrib/libs Architecture: linux-any Depends: ${misc:Depends}, ${shlibs:Depends} -Breaks: libuutil1, libuutil1linux -Replaces: libuutil1, libuutil1linux +Breaks: libuutil1, libuutil1linux, libuutil2linux, libuutil3 +Replaces: libuutil1, libuutil1linux, libuutil2linux, libuutil3 Description: Solaris userland utility library for Linux This library provides a variety of glue functions for ZFS on Linux: * libspl: The Solaris Porting Layer userland library, which provides APIs @@ -64,26 +64,26 @@ Description: Solaris userland utility library for Linux Package: libzfslinux-dev Section: contrib/libdevel Architecture: linux-any -Depends: libnvpair2linux (= ${binary:Version}), - libuutil2linux (= ${binary:Version}), - libzfs3linux (= ${binary:Version}), +Depends: libnvpair3linux (= ${binary:Version}), + libuutil3linux (= ${binary:Version}), + libzfs4linux (= ${binary:Version}), libzfsbootenv1linux (= ${binary:Version}), - libzpool3linux (= ${binary:Version}), + libzpool4linux (= ${binary:Version}), ${misc:Depends} Provides: libnvpair-dev, libuutil-dev Description: OpenZFS filesystem development files for Linux Header files and static libraries for compiling software against libraries of OpenZFS filesystem. . - This package includes the development files of libnvpair2, libuutil2, - libzpool3 and libzfs3. + This package includes the development files of libnvpair3, libuutil3, + libzpool4 and libzfs4. -Package: libzfs3linux +Package: libzfs4linux Section: contrib/libs Architecture: linux-any Depends: ${misc:Depends}, ${shlibs:Depends} -Breaks: libzfs2, libzfs2linux -Replaces: libzfs2, libzfs2linux +Breaks: libzfs2, libzfs2linux, libzfs3linux, libzfs4 +Replaces: libzfs2, libzfs2linux, libzfs3linux, libzfs4 Description: OpenZFS filesystem library for Linux OpenZFS is a storage platform that encompasses the functionality of traditional filesystems and volume managers. It supports data checksums, @@ -95,6 +95,8 @@ Package: libzfsbootenv1linux Section: contrib/libs Architecture: linux-any Depends: ${misc:Depends}, ${shlibs:Depends} +Breaks: libzfs2, libzfs4 +Replaces: libzfs2, libzfs4 Description: OpenZFS filesystem library for Linux OpenZFS is a storage platform that encompasses the functionality of traditional filesystems and volume managers. It supports data checksums, @@ -102,12 +104,12 @@ Description: OpenZFS filesystem library for Linux . The zfsbootenv library provides support for modifying ZFS label information. -Package: libzpool3linux +Package: libzpool4linux Section: contrib/libs Architecture: linux-any Depends: ${misc:Depends}, ${shlibs:Depends} -Breaks: libzpool2, libzpool2linux -Replaces: libzpool2, libzpool2linux +Breaks: libzpool2, libzpool2linux, libzpool3linux, libzpool4 +Replaces: libzpool2, libzpool2linux, libzpool3linux, libzpool4 Description: OpenZFS pool library for Linux OpenZFS is a storage platform that encompasses the functionality of traditional filesystems and volume managers. It supports data checksums, @@ -242,10 +244,10 @@ Package: zfs-dbg Section: contrib/debug Priority: optional Architecture: linux-any -Depends: libnvpair2linux (= ${binary:Version}), - libuutil2linux (= ${binary:Version}), - libzfs3linux (= ${binary:Version}), - libzpool3linux (= ${binary:Version}), +Depends: libnvpair3linux (= ${binary:Version}), + libuutil3linux (= ${binary:Version}), + libzfs4linux (= ${binary:Version}), + libzpool4linux (= ${binary:Version}), zfs-zed (= ${binary:Version}), zfsutils-linux (= ${binary:Version}), ${misc:Depends} @@ -254,8 +256,8 @@ Description: Debugging symbols for OpenZFS userland libraries and tools traditional filesystems and volume managers. It supports data checksums, compression, encryption, snapshots, and more. . - This package contains the debugging symbols for libzpool3linux, libzfs3linux, - libnvpair2linux, libuutil2linux, zfs-zed and zfsutils-linux. + This package contains the debugging symbols for libzpool4linux, libzfs4linux, + libnvpair3linux, libuutil3linux, zfs-zed and zfsutils-linux. Package: spl Section: contrib/metapackages diff --git a/debian/libnvpair2linux.lintian-overrides b/debian/libnvpair2linux.lintian-overrides deleted file mode 100644 index ad4f1dfa..00000000 --- a/debian/libnvpair2linux.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libnvpair2linux: package-name-doesnt-match-sonames diff --git a/debian/libnvpair2linux.docs b/debian/libnvpair3linux.docs similarity index 100% rename from debian/libnvpair2linux.docs rename to debian/libnvpair3linux.docs diff --git a/debian/libnvpair2linux.install.in b/debian/libnvpair3linux.install.in similarity index 100% rename from debian/libnvpair2linux.install.in rename to debian/libnvpair3linux.install.in diff --git a/debian/libnvpair3linux.lintian-overrides b/debian/libnvpair3linux.lintian-overrides new file mode 100644 index 00000000..86759793 --- /dev/null +++ b/debian/libnvpair3linux.lintian-overrides @@ -0,0 +1 @@ +package-name-doesnt-match-sonames diff --git a/debian/libuutil2linux.lintian-overrides b/debian/libuutil2linux.lintian-overrides deleted file mode 100644 index 30f7d718..00000000 --- a/debian/libuutil2linux.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libuutil2linux: package-name-doesnt-match-sonames diff --git a/debian/libuutil2linux.docs b/debian/libuutil3linux.docs similarity index 100% rename from debian/libuutil2linux.docs rename to debian/libuutil3linux.docs diff --git a/debian/libuutil2linux.install.in b/debian/libuutil3linux.install.in similarity index 100% rename from debian/libuutil2linux.install.in rename to debian/libuutil3linux.install.in diff --git a/debian/libuutil3linux.lintian-overrides b/debian/libuutil3linux.lintian-overrides new file mode 100644 index 00000000..86759793 --- /dev/null +++ b/debian/libuutil3linux.lintian-overrides @@ -0,0 +1 @@ +package-name-doesnt-match-sonames diff --git a/debian/libzfs3linux.lintian-overrides b/debian/libzfs3linux.lintian-overrides deleted file mode 100644 index 0630b2dd..00000000 --- a/debian/libzfs3linux.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libzfs3linux: package-name-doesnt-match-sonames diff --git a/debian/libzfs3linux.docs b/debian/libzfs4linux.docs similarity index 100% rename from debian/libzfs3linux.docs rename to debian/libzfs4linux.docs diff --git a/debian/libzfs3linux.install.in b/debian/libzfs4linux.install.in similarity index 100% rename from debian/libzfs3linux.install.in rename to debian/libzfs4linux.install.in diff --git a/debian/libzfs4linux.lintian-overrides b/debian/libzfs4linux.lintian-overrides new file mode 100644 index 00000000..86759793 --- /dev/null +++ b/debian/libzfs4linux.lintian-overrides @@ -0,0 +1 @@ +package-name-doesnt-match-sonames diff --git a/debian/libzpool3linux.lintian-overrides b/debian/libzpool3linux.lintian-overrides deleted file mode 100644 index 09f8fa21..00000000 --- a/debian/libzpool3linux.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libzpool3linux: package-name-doesnt-match-sonames diff --git a/debian/libzpool3linux.docs b/debian/libzpool4linux.docs similarity index 100% rename from debian/libzpool3linux.docs rename to debian/libzpool4linux.docs diff --git a/debian/libzpool3linux.install.in b/debian/libzpool4linux.install.in similarity index 100% rename from debian/libzpool3linux.install.in rename to debian/libzpool4linux.install.in diff --git a/debian/libzpool4linux.lintian-overrides b/debian/libzpool4linux.lintian-overrides new file mode 100644 index 00000000..86759793 --- /dev/null +++ b/debian/libzpool4linux.lintian-overrides @@ -0,0 +1 @@ +package-name-doesnt-match-sonames -- 2.20.1