Re: [PR PATCH] [Updated] Update libnvme and nvme-cli

[subnut <subnut@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1246 bytes --]

There is an updated pull request by subnut against master on the void-packages repository

https://github.com/subnut/void-packages nvme
https://github.com/void-linux/void-packages/pull/41919

Update libnvme and nvme-cli
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41919.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nvme-41919.patch --]
[-- Type: text/x-diff, Size: 3860 bytes --]

From bbba0d08af4fcec8f0f91547e8c8d86834aa498a Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 28 Jan 2023 22:45:58 +0530
Subject: [PATCH 1/2] libnvme: update to 1.2

---
 common/shlibs            |  1 +
 srcpkgs/libnvme/template | 11 +++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 3042ced11d4b..f243ac17a555 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4151,6 +4151,7 @@ librz_util.so.0.4 rizin-0.4.0_1
 libaravis-0.8.so.0 libaravis-0.8.21_1
 libLimeSuite.so.22.09-1 LimeSuite-22.09.0_1
 libnvme.so.1 libnvme-1.0_1
+libnvme-mi.so.1 libnvme-1.2_1
 libRInside.so R-cran-RInside-0.2.16_1
 libXrdUtils.so.3 xrootd-5.4.0_1
 libXrdCl.so.3 xrootd-5.4.0_1
diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template
index ea9de2f2f1f7..b628be9cabb9 100644
--- a/srcpkgs/libnvme/template
+++ b/srcpkgs/libnvme/template
@@ -1,22 +1,21 @@
 # Template file for 'libnvme'
 pkgname=libnvme
-version=1.1
-revision=2
+version=1.2
+revision=1
 build_style=meson
 configure_args="-Ddocs=man"
 hostmakedepends="pkg-config swig"
-makedepends="libuuid-devel json-c-devel openssl-devel python3-devel"
+makedepends="json-c-devel openssl-devel python3-devel"
 checkdepends="perl"
 short_desc="C Library for NVM Express on Linux"
 maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/linux-nvme/libnvme"
 distfiles="https://github.com/linux-nvme/libnvme/archive/v${version}.tar.gz"
-checksum=d000181356513733671409c747c88826155b60f45f76e7289d6bbf27a8f851b0
+checksum=2697c86e9d8597fcd264f8bf8af57a529346efa4f611ca2be855e3aa89b9eb2c
 
 libnvme-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	depends+=" json-c-devel libuuid-devel openssl-devel"	# otherwise 'pkgconf libnvme' doesn't work
+	depends="${sourcepkg}>=${version}_${revision} json-c-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 6640a6d695a969a401d72e7e1eced5cac46e92b9 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 28 Jan 2023 22:46:06 +0530
Subject: [PATCH 2/2] nvme-cli: update to 2.2.1

---
 srcpkgs/nvme-cli/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template
index a80699cd4a3b..9564926f7555 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,17 +1,17 @@
 # Template file for 'nvme-cli'
 pkgname=nvme-cli
-version=2.1.2
+version=2.2.1
 revision=1
 build_style=meson
 configure_args="-Ddocs=man -Dudevrulesdir=lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libnvme-devel zlib-devel json-c-devel libuuid-devel"
+makedepends="libnvme-devel zlib-devel json-c-devel"
 short_desc="NVMe management command line interface"
 maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="GPL-2.0-only"
 homepage="http://nvmexpress.org"
 distfiles="https://github.com/linux-nvme/nvme-cli/archive/v${version}.tar.gz"
-checksum=b39811fd2ab8005d515f2f539984cc08f9ab1fe34e5359da10091fdf153df231
+checksum=68720bc25c68adb93dafe1186de4fabbe40f8390ff1416256b52fe74f78259ae
 conf_files="/etc/nvme/*.conf"
 
 if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
@@ -21,8 +21,7 @@ else
 fi
 
 post_install() {
-	# remove files that are systemd-only
-	rm -rf "${DESTDIR}/usr/lib/systemd"
-	rm -rf "${DESTDIR}/usr/lib/udev/rules.d/70-nvmf-autoconnect.rules"         # calls systemctl
-	rm -rf "${DESTDIR}/usr/lib/dracut/dracut.conf.d/70-nvmf-autoconnect.conf"  # needs 70-nvmf-autoconnect.rules
+	# remove files that need systemd
+	rm "${DESTDIR}/usr/lib/udev/rules.d/70-nvmf-autoconnect.rules"         # calls systemctl
+	rm "${DESTDIR}/usr/lib/dracut/dracut.conf.d/70-nvmf-autoconnect.conf"  # needs 70-nvmf-autoconnect.rules
 }