[PR PATCH] nvme-cli: update to 2.10.2, libnvme: update to 1.10

[PR PATCH] nvme-cli: update to 2.10.2, libnvme: update to 1.10

[slymattz]

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

There is a new pull request by slymattz against master on the void-packages repository

https://github.com/slymattz/void-packages nvme-cli-2.10.2
https://github.com/void-linux/void-packages/pull/51900

nvme-cli: update to 2.10.2, libnvme: update to 1.10
<!-- 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
  - x86_64-musl (build)
  - aarch64 (cross build)



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

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

From c58e8cb1855b1f1174d99353f798b2acc538f712 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Sun, 18 Aug 2024 17:53:11 +0200
Subject: [PATCH 1/2] libnvme: update to 1.10

---
 common/shlibs            | 3 ++-
 srcpkgs/libnvme/template | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4b2660a025f11f..d2e7af2d7d9a06 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -800,6 +800,7 @@ libsvn_ra_serf-1.so.0 libsvn-1.8.1_1
 libsvn_fs_x-1.so.0 libsvn-1.9.0_1
 libsvn_swig_py-1.so.0 subversion-python-1.7.5_1
 libsvn_swig_perl-1.so.0 subversion-perl-1.7.5_1
+libjson-c.so.5 json-c-0.14.0_1
 libjson-glib-1.0.so.0 json-glib-0.12.2_1
 libcjson.so.1 cJSON-1.7.8_1
 libvirt.so.0 libvirt-0.8.7_1
@@ -4324,7 +4325,7 @@ librz_type.so.0.7 rizin-0.7.2_1
 librz_util.so.0.7 rizin-0.7.2_1
 libaravis-0.8.so.0 libaravis-0.8.21_1
 libLimeSuite.so.23.11-1 LimeSuite-23.11.0_1
-libnvme.so.1 libnvme-1.0_1
+libnvme.so.1 libnvme-1.10_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
diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template
index c878d834d4a351..499a9f17bd487f 100644
--- a/srcpkgs/libnvme/template
+++ b/srcpkgs/libnvme/template
@@ -1,6 +1,6 @@
 # Template file for 'libnvme'
 pkgname=libnvme
-version=1.9
+version=1.10
 revision=1
 build_style=meson
 configure_args="-Ddocs=man"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 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=455867060d2b7563eab59fe21779dff469d98465028997178c7efbe4b8763206
+checksum=add9efa968e8341459fcaa2d96f2594a6f871e1fb3f57c02ce1c8ba5424f3960
 
 libnvme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} json-c-devel openssl-devel"

From a4f9fb5e22638cc22757c58465b9f84e4f5967d0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Sun, 18 Aug 2024 17:55:11 +0200
Subject: [PATCH 2/2] nvme-cli: update to 2.10.2

---
 srcpkgs/nvme-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template
index c09504f3e6b261..ae668cd6af4af7 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'nvme-cli'
 pkgname=nvme-cli
-version=2.8
+version=2.10.2
 revision=1
 build_style=meson
 configure_args="-Ddocs=man -Dudevrulesdir=lib/udev/rules.d"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://nvmexpress.org"
 distfiles="https://github.com/linux-nvme/nvme-cli/archive/v${version}.tar.gz"
-checksum=0743d9188792a87d39187ae5e5cb31e8f46cca8c6f100547c50ec0dd659d2531
+checksum=b3c256959ff34124788aa96c8602c9cef00705d01cc3cb9322bf3269e00ae904
 conf_files="/etc/nvme/*.conf"
 
 if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then

Re: [PR PATCH] [Updated] nvme-cli: update to 2.10.2, libnvme: update to 1.10

[slymattz]

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

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

https://github.com/slymattz/void-packages nvme-cli-2.10.2
https://github.com/void-linux/void-packages/pull/51900

nvme-cli: update to 2.10.2, libnvme: update to 1.10
<!-- 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
  - x86_64-musl (build)
  - aarch64 (cross build)



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

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

From c58e8cb1855b1f1174d99353f798b2acc538f712 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Sun, 18 Aug 2024 17:53:11 +0200
Subject: [PATCH 1/2] libnvme: update to 1.10

---
 common/shlibs            | 3 ++-
 srcpkgs/libnvme/template | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4b2660a025f11f..d2e7af2d7d9a06 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -800,6 +800,7 @@ libsvn_ra_serf-1.so.0 libsvn-1.8.1_1
 libsvn_fs_x-1.so.0 libsvn-1.9.0_1
 libsvn_swig_py-1.so.0 subversion-python-1.7.5_1
 libsvn_swig_perl-1.so.0 subversion-perl-1.7.5_1
+libjson-c.so.5 json-c-0.14.0_1
 libjson-glib-1.0.so.0 json-glib-0.12.2_1
 libcjson.so.1 cJSON-1.7.8_1
 libvirt.so.0 libvirt-0.8.7_1
@@ -4324,7 +4325,7 @@ librz_type.so.0.7 rizin-0.7.2_1
 librz_util.so.0.7 rizin-0.7.2_1
 libaravis-0.8.so.0 libaravis-0.8.21_1
 libLimeSuite.so.23.11-1 LimeSuite-23.11.0_1
-libnvme.so.1 libnvme-1.0_1
+libnvme.so.1 libnvme-1.10_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
diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template
index c878d834d4a351..499a9f17bd487f 100644
--- a/srcpkgs/libnvme/template
+++ b/srcpkgs/libnvme/template
@@ -1,6 +1,6 @@
 # Template file for 'libnvme'
 pkgname=libnvme
-version=1.9
+version=1.10
 revision=1
 build_style=meson
 configure_args="-Ddocs=man"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 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=455867060d2b7563eab59fe21779dff469d98465028997178c7efbe4b8763206
+checksum=add9efa968e8341459fcaa2d96f2594a6f871e1fb3f57c02ce1c8ba5424f3960
 
 libnvme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} json-c-devel openssl-devel"

From 5001fee907e5689fc681a634fd52a6cad1a6f151 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Sun, 18 Aug 2024 17:55:11 +0200
Subject: [PATCH 2/2] nvme-cli: update to 2.10.2

---
 srcpkgs/nvme-cli/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template
index c09504f3e6b261..fd136ca45a0c7f 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'nvme-cli'
 pkgname=nvme-cli
-version=2.8
+version=2.10.2
 revision=1
 build_style=meson
 configure_args="-Ddocs=man -Dudevrulesdir=lib/udev/rules.d"
@@ -11,8 +11,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://nvmexpress.org"
 distfiles="https://github.com/linux-nvme/nvme-cli/archive/v${version}.tar.gz"
-checksum=0743d9188792a87d39187ae5e5cb31e8f46cca8c6f100547c50ec0dd659d2531
+checksum=b3c256959ff34124788aa96c8602c9cef00705d01cc3cb9322bf3269e00ae904
 conf_files="/etc/nvme/*.conf"
+make_check="no" # uint128 test fails on x86_64-musl
 
 if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
 	makedepends+=" libhugetlbfs-devel"

Re: nvme-cli: update to 2.10.2, libnvme: update to 1.10

[slymattz]

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

New comment by slymattz on void-packages repository

https://github.com/void-linux/void-packages/pull/51900#issuecomment-2295344127

Comment:
With regard to skipping do_check() because of x86_64-musl failing the test, Alpine seems to do [the same](https://git.alpinelinux.org/aports/commit/main/nvme-cli/APKBUILD?id=ce0eae12061063482439b3f0928d4f0caee66445).

Re: [PR REVIEW] nvme-cli: update to 2.10.2, libnvme: update to 1.10

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51900#discussion_r1721056728

Comment:
make this conditional

Re: [PR PATCH] [Updated] nvme-cli: update to 2.10.2, libnvme: update to 1.10

[slymattz]

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

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

https://github.com/slymattz/void-packages nvme-cli-2.10.2
https://github.com/void-linux/void-packages/pull/51900

nvme-cli: update to 2.10.2, libnvme: update to 1.10
<!-- 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
  - x86_64-musl (build)
  - aarch64 (cross build)



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

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

From c58e8cb1855b1f1174d99353f798b2acc538f712 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Sun, 18 Aug 2024 17:53:11 +0200
Subject: [PATCH 1/2] libnvme: update to 1.10

---
 common/shlibs            | 3 ++-
 srcpkgs/libnvme/template | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4b2660a025f11f..d2e7af2d7d9a06 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -800,6 +800,7 @@ libsvn_ra_serf-1.so.0 libsvn-1.8.1_1
 libsvn_fs_x-1.so.0 libsvn-1.9.0_1
 libsvn_swig_py-1.so.0 subversion-python-1.7.5_1
 libsvn_swig_perl-1.so.0 subversion-perl-1.7.5_1
+libjson-c.so.5 json-c-0.14.0_1
 libjson-glib-1.0.so.0 json-glib-0.12.2_1
 libcjson.so.1 cJSON-1.7.8_1
 libvirt.so.0 libvirt-0.8.7_1
@@ -4324,7 +4325,7 @@ librz_type.so.0.7 rizin-0.7.2_1
 librz_util.so.0.7 rizin-0.7.2_1
 libaravis-0.8.so.0 libaravis-0.8.21_1
 libLimeSuite.so.23.11-1 LimeSuite-23.11.0_1
-libnvme.so.1 libnvme-1.0_1
+libnvme.so.1 libnvme-1.10_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
diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template
index c878d834d4a351..499a9f17bd487f 100644
--- a/srcpkgs/libnvme/template
+++ b/srcpkgs/libnvme/template
@@ -1,6 +1,6 @@
 # Template file for 'libnvme'
 pkgname=libnvme
-version=1.9
+version=1.10
 revision=1
 build_style=meson
 configure_args="-Ddocs=man"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 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=455867060d2b7563eab59fe21779dff469d98465028997178c7efbe4b8763206
+checksum=add9efa968e8341459fcaa2d96f2594a6f871e1fb3f57c02ce1c8ba5424f3960
 
 libnvme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} json-c-devel openssl-devel"

From b6d2f6370d8f0a8c333f1f4f35f6413cf60e12e1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Sun, 18 Aug 2024 17:55:11 +0200
Subject: [PATCH 2/2] nvme-cli: update to 2.10.2

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

diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template
index c09504f3e6b261..f514d21ba7b09c 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'nvme-cli'
 pkgname=nvme-cli
-version=2.8
+version=2.10.2
 revision=1
 build_style=meson
 configure_args="-Ddocs=man -Dudevrulesdir=lib/udev/rules.d"
@@ -11,9 +11,14 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://nvmexpress.org"
 distfiles="https://github.com/linux-nvme/nvme-cli/archive/v${version}.tar.gz"
-checksum=0743d9188792a87d39187ae5e5cb31e8f46cca8c6f100547c50ec0dd659d2531
+checksum=b3c256959ff34124788aa96c8602c9cef00705d01cc3cb9322bf3269e00ae904
 conf_files="/etc/nvme/*.conf"
 
+case "$XBPS_TARGET_MACHINE" in
+	x86_64-musl) make_check="no" # uint128 test fails on x86_64-musl
+	;;
+esac
+
 if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
 	makedepends+=" libhugetlbfs-devel"
 else

Re: [PR REVIEW] nvme-cli: update to 2.10.2, libnvme: update to 1.10

[slymattz]

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

New review comment by slymattz on void-packages repository

https://github.com/void-linux/void-packages/pull/51900#discussion_r1721562742

Comment:
sure, done.

Re: [PR PATCH] [Updated] nvme-cli: update to 2.10.2, libnvme: update to 1.10

[slymattz]

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

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

https://github.com/slymattz/void-packages nvme-cli-2.10.2
https://github.com/void-linux/void-packages/pull/51900

nvme-cli: update to 2.10.2, libnvme: update to 1.10
<!-- 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
  - x86_64-musl (build)
  - aarch64 (cross build)



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

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

From c58e8cb1855b1f1174d99353f798b2acc538f712 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Sun, 18 Aug 2024 17:53:11 +0200
Subject: [PATCH 1/2] libnvme: update to 1.10

---
 common/shlibs            | 3 ++-
 srcpkgs/libnvme/template | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4b2660a025f11f..d2e7af2d7d9a06 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -800,6 +800,7 @@ libsvn_ra_serf-1.so.0 libsvn-1.8.1_1
 libsvn_fs_x-1.so.0 libsvn-1.9.0_1
 libsvn_swig_py-1.so.0 subversion-python-1.7.5_1
 libsvn_swig_perl-1.so.0 subversion-perl-1.7.5_1
+libjson-c.so.5 json-c-0.14.0_1
 libjson-glib-1.0.so.0 json-glib-0.12.2_1
 libcjson.so.1 cJSON-1.7.8_1
 libvirt.so.0 libvirt-0.8.7_1
@@ -4324,7 +4325,7 @@ librz_type.so.0.7 rizin-0.7.2_1
 librz_util.so.0.7 rizin-0.7.2_1
 libaravis-0.8.so.0 libaravis-0.8.21_1
 libLimeSuite.so.23.11-1 LimeSuite-23.11.0_1
-libnvme.so.1 libnvme-1.0_1
+libnvme.so.1 libnvme-1.10_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
diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template
index c878d834d4a351..499a9f17bd487f 100644
--- a/srcpkgs/libnvme/template
+++ b/srcpkgs/libnvme/template
@@ -1,6 +1,6 @@
 # Template file for 'libnvme'
 pkgname=libnvme
-version=1.9
+version=1.10
 revision=1
 build_style=meson
 configure_args="-Ddocs=man"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 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=455867060d2b7563eab59fe21779dff469d98465028997178c7efbe4b8763206
+checksum=add9efa968e8341459fcaa2d96f2594a6f871e1fb3f57c02ce1c8ba5424f3960
 
 libnvme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} json-c-devel openssl-devel"

From 164f1d6398bbb4175003e873a6c6652c72c34938 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Sun, 18 Aug 2024 17:55:11 +0200
Subject: [PATCH 2/2] nvme-cli: update to 2.10.2

---
 srcpkgs/nvme-cli/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template
index c09504f3e6b261..f731368585ad27 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'nvme-cli'
 pkgname=nvme-cli
-version=2.8
+version=2.10.2
 revision=1
 build_style=meson
 configure_args="-Ddocs=man -Dudevrulesdir=lib/udev/rules.d"
@@ -9,11 +9,17 @@ makedepends="libnvme-devel zlib-devel json-c-devel"
 short_desc="NVMe management command line interface"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
-homepage="http://nvmexpress.org"
+homepage="https://nvmexpress.org"
+changelog="https://github.com/linux-nvme/nvme-cli/releases"
 distfiles="https://github.com/linux-nvme/nvme-cli/archive/v${version}.tar.gz"
-checksum=0743d9188792a87d39187ae5e5cb31e8f46cca8c6f100547c50ec0dd659d2531
+checksum=b3c256959ff34124788aa96c8602c9cef00705d01cc3cb9322bf3269e00ae904
 conf_files="/etc/nvme/*.conf"
 
+case "$XBPS_TARGET_MACHINE" in
+	x86_64-musl) make_check="no" # uint128 test fails on x86_64-musl
+	;;
+esac
+
 if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
 	makedepends+=" libhugetlbfs-devel"
 else

Re: [PR PATCH] [Updated] nvme-cli: update to 2.10.2, libnvme: update to 1.10

[slymattz]

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

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

https://github.com/slymattz/void-packages nvme-cli-2.10.2
https://github.com/void-linux/void-packages/pull/51900

nvme-cli: update to 2.10.2, libnvme: update to 1.10
<!-- 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
  - x86_64-musl (build)
  - aarch64 (cross build)



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

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

From 8beede079d71902ecfdb5081b4bbebe96777df16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Sun, 18 Aug 2024 17:53:11 +0200
Subject: [PATCH 1/2] libnvme: update to 1.10

---
 common/shlibs            | 3 ++-
 srcpkgs/libnvme/template | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4b2660a025f11f..d2e7af2d7d9a06 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -800,6 +800,7 @@ libsvn_ra_serf-1.so.0 libsvn-1.8.1_1
 libsvn_fs_x-1.so.0 libsvn-1.9.0_1
 libsvn_swig_py-1.so.0 subversion-python-1.7.5_1
 libsvn_swig_perl-1.so.0 subversion-perl-1.7.5_1
+libjson-c.so.5 json-c-0.14.0_1
 libjson-glib-1.0.so.0 json-glib-0.12.2_1
 libcjson.so.1 cJSON-1.7.8_1
 libvirt.so.0 libvirt-0.8.7_1
@@ -4324,7 +4325,7 @@ librz_type.so.0.7 rizin-0.7.2_1
 librz_util.so.0.7 rizin-0.7.2_1
 libaravis-0.8.so.0 libaravis-0.8.21_1
 libLimeSuite.so.23.11-1 LimeSuite-23.11.0_1
-libnvme.so.1 libnvme-1.0_1
+libnvme.so.1 libnvme-1.10_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
diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template
index c878d834d4a351..c447667fed4b04 100644
--- a/srcpkgs/libnvme/template
+++ b/srcpkgs/libnvme/template
@@ -1,6 +1,6 @@
 # Template file for 'libnvme'
 pkgname=libnvme
-version=1.9
+version=1.10
 revision=1
 build_style=meson
 configure_args="-Ddocs=man"
@@ -11,8 +11,9 @@ short_desc="C Library for NVM Express on Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/linux-nvme/libnvme"
+changelog="https://github.com/linux-nvme/libnvme/releases"
 distfiles="https://github.com/linux-nvme/libnvme/archive/v${version}.tar.gz"
-checksum=455867060d2b7563eab59fe21779dff469d98465028997178c7efbe4b8763206
+checksum=add9efa968e8341459fcaa2d96f2594a6f871e1fb3f57c02ce1c8ba5424f3960
 
 libnvme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} json-c-devel openssl-devel"

From 380c7308d6f3a94c6442c4ef8a2b9bbf339aed9b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Sun, 18 Aug 2024 17:55:11 +0200
Subject: [PATCH 2/2] nvme-cli: update to 2.10.2

---
 srcpkgs/nvme-cli/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template
index c09504f3e6b261..f731368585ad27 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'nvme-cli'
 pkgname=nvme-cli
-version=2.8
+version=2.10.2
 revision=1
 build_style=meson
 configure_args="-Ddocs=man -Dudevrulesdir=lib/udev/rules.d"
@@ -9,11 +9,17 @@ makedepends="libnvme-devel zlib-devel json-c-devel"
 short_desc="NVMe management command line interface"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
-homepage="http://nvmexpress.org"
+homepage="https://nvmexpress.org"
+changelog="https://github.com/linux-nvme/nvme-cli/releases"
 distfiles="https://github.com/linux-nvme/nvme-cli/archive/v${version}.tar.gz"
-checksum=0743d9188792a87d39187ae5e5cb31e8f46cca8c6f100547c50ec0dd659d2531
+checksum=b3c256959ff34124788aa96c8602c9cef00705d01cc3cb9322bf3269e00ae904
 conf_files="/etc/nvme/*.conf"
 
+case "$XBPS_TARGET_MACHINE" in
+	x86_64-musl) make_check="no" # uint128 test fails on x86_64-musl
+	;;
+esac
+
 if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
 	makedepends+=" libhugetlbfs-devel"
 else

Re: nvme-cli: update to 2.10.2, libnvme: update to 1.10

[slymattz]

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

New comment by slymattz on void-packages repository

https://github.com/void-linux/void-packages/pull/51900#issuecomment-2296383302

Comment:
Added changelog lines to both templates as they were missing.

Re: [PR REVIEW] nvme-cli: update to 2.10.2, libnvme: update to 1.10

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51900#discussion_r1777524681

Comment:
this package needs to be revbumped, I think

Re: [PR PATCH] [Updated] nvme-cli: update to 2.10.2, libnvme: update to 1.10

[slymattz]

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

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

https://github.com/slymattz/void-packages nvme-cli-2.10.2
https://github.com/void-linux/void-packages/pull/51900

nvme-cli: update to 2.10.2, libnvme: update to 1.10
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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
  - x86_64-musl (build)
  - aarch64 (cross build)



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

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

From 8beede079d71902ecfdb5081b4bbebe96777df16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Sun, 18 Aug 2024 17:53:11 +0200
Subject: [PATCH 1/3] libnvme: update to 1.10

---
 common/shlibs            | 3 ++-
 srcpkgs/libnvme/template | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4b2660a025f11f..d2e7af2d7d9a06 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -800,6 +800,7 @@ libsvn_ra_serf-1.so.0 libsvn-1.8.1_1
 libsvn_fs_x-1.so.0 libsvn-1.9.0_1
 libsvn_swig_py-1.so.0 subversion-python-1.7.5_1
 libsvn_swig_perl-1.so.0 subversion-perl-1.7.5_1
+libjson-c.so.5 json-c-0.14.0_1
 libjson-glib-1.0.so.0 json-glib-0.12.2_1
 libcjson.so.1 cJSON-1.7.8_1
 libvirt.so.0 libvirt-0.8.7_1
@@ -4324,7 +4325,7 @@ librz_type.so.0.7 rizin-0.7.2_1
 librz_util.so.0.7 rizin-0.7.2_1
 libaravis-0.8.so.0 libaravis-0.8.21_1
 libLimeSuite.so.23.11-1 LimeSuite-23.11.0_1
-libnvme.so.1 libnvme-1.0_1
+libnvme.so.1 libnvme-1.10_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
diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template
index c878d834d4a351..c447667fed4b04 100644
--- a/srcpkgs/libnvme/template
+++ b/srcpkgs/libnvme/template
@@ -1,6 +1,6 @@
 # Template file for 'libnvme'
 pkgname=libnvme
-version=1.9
+version=1.10
 revision=1
 build_style=meson
 configure_args="-Ddocs=man"
@@ -11,8 +11,9 @@ short_desc="C Library for NVM Express on Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/linux-nvme/libnvme"
+changelog="https://github.com/linux-nvme/libnvme/releases"
 distfiles="https://github.com/linux-nvme/libnvme/archive/v${version}.tar.gz"
-checksum=455867060d2b7563eab59fe21779dff469d98465028997178c7efbe4b8763206
+checksum=add9efa968e8341459fcaa2d96f2594a6f871e1fb3f57c02ce1c8ba5424f3960
 
 libnvme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} json-c-devel openssl-devel"

From 380c7308d6f3a94c6442c4ef8a2b9bbf339aed9b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Sun, 18 Aug 2024 17:55:11 +0200
Subject: [PATCH 2/3] nvme-cli: update to 2.10.2

---
 srcpkgs/nvme-cli/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template
index c09504f3e6b261..f731368585ad27 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'nvme-cli'
 pkgname=nvme-cli
-version=2.8
+version=2.10.2
 revision=1
 build_style=meson
 configure_args="-Ddocs=man -Dudevrulesdir=lib/udev/rules.d"
@@ -9,11 +9,17 @@ makedepends="libnvme-devel zlib-devel json-c-devel"
 short_desc="NVMe management command line interface"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
-homepage="http://nvmexpress.org"
+homepage="https://nvmexpress.org"
+changelog="https://github.com/linux-nvme/nvme-cli/releases"
 distfiles="https://github.com/linux-nvme/nvme-cli/archive/v${version}.tar.gz"
-checksum=0743d9188792a87d39187ae5e5cb31e8f46cca8c6f100547c50ec0dd659d2531
+checksum=b3c256959ff34124788aa96c8602c9cef00705d01cc3cb9322bf3269e00ae904
 conf_files="/etc/nvme/*.conf"
 
+case "$XBPS_TARGET_MACHINE" in
+	x86_64-musl) make_check="no" # uint128 test fails on x86_64-musl
+	;;
+esac
+
 if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
 	makedepends+=" libhugetlbfs-devel"
 else

From 9620f4678196324ca3c1df7f862ed8060299b57d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Fri, 27 Sep 2024 19:59:20 +0200
Subject: [PATCH 3/3] json-c: revbump for nvme-cli

---
 srcpkgs/json-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/json-c/template b/srcpkgs/json-c/template
index 4e306fbb8b0b0a..e3642853466e9c 100644
--- a/srcpkgs/json-c/template
+++ b/srcpkgs/json-c/template
@@ -1,7 +1,7 @@
 # Template file for 'json-c'
 pkgname=json-c
 version=0.17
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_THREADING=ON -DBUILD_STATIC_LIBS=ON
  -DENABLE_RDRAND=$(vopt_if rdrand ON OFF)"

Re: [PR REVIEW] nvme-cli: update to 2.10.2, libnvme: update to 1.10

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51900#discussion_r1778983837

Comment:
```suggestion
libjson-c.so.5 json-c-0.14.0_2
```
and the commit message is misleading. you're revbumping because you added it to shlibs not because of nvme-cli

Re: [PR PATCH] [Updated] nvme-cli: update to 2.10.2, libnvme: update to 1.10

[slymattz]

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

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

https://github.com/slymattz/void-packages nvme-cli-2.10.2
https://github.com/void-linux/void-packages/pull/51900

nvme-cli: update to 2.10.2, libnvme: update to 1.10
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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
  - x86_64-musl (build)
  - aarch64 (cross build)



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

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

From 8beede079d71902ecfdb5081b4bbebe96777df16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Sun, 18 Aug 2024 17:53:11 +0200
Subject: [PATCH 1/3] libnvme: update to 1.10

---
 common/shlibs            | 3 ++-
 srcpkgs/libnvme/template | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4b2660a025f11f..d2e7af2d7d9a06 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -800,6 +800,7 @@ libsvn_ra_serf-1.so.0 libsvn-1.8.1_1
 libsvn_fs_x-1.so.0 libsvn-1.9.0_1
 libsvn_swig_py-1.so.0 subversion-python-1.7.5_1
 libsvn_swig_perl-1.so.0 subversion-perl-1.7.5_1
+libjson-c.so.5 json-c-0.14.0_1
 libjson-glib-1.0.so.0 json-glib-0.12.2_1
 libcjson.so.1 cJSON-1.7.8_1
 libvirt.so.0 libvirt-0.8.7_1
@@ -4324,7 +4325,7 @@ librz_type.so.0.7 rizin-0.7.2_1
 librz_util.so.0.7 rizin-0.7.2_1
 libaravis-0.8.so.0 libaravis-0.8.21_1
 libLimeSuite.so.23.11-1 LimeSuite-23.11.0_1
-libnvme.so.1 libnvme-1.0_1
+libnvme.so.1 libnvme-1.10_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
diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template
index c878d834d4a351..c447667fed4b04 100644
--- a/srcpkgs/libnvme/template
+++ b/srcpkgs/libnvme/template
@@ -1,6 +1,6 @@
 # Template file for 'libnvme'
 pkgname=libnvme
-version=1.9
+version=1.10
 revision=1
 build_style=meson
 configure_args="-Ddocs=man"
@@ -11,8 +11,9 @@ short_desc="C Library for NVM Express on Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/linux-nvme/libnvme"
+changelog="https://github.com/linux-nvme/libnvme/releases"
 distfiles="https://github.com/linux-nvme/libnvme/archive/v${version}.tar.gz"
-checksum=455867060d2b7563eab59fe21779dff469d98465028997178c7efbe4b8763206
+checksum=add9efa968e8341459fcaa2d96f2594a6f871e1fb3f57c02ce1c8ba5424f3960
 
 libnvme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} json-c-devel openssl-devel"

From 380c7308d6f3a94c6442c4ef8a2b9bbf339aed9b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Sun, 18 Aug 2024 17:55:11 +0200
Subject: [PATCH 2/3] nvme-cli: update to 2.10.2

---
 srcpkgs/nvme-cli/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template
index c09504f3e6b261..f731368585ad27 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'nvme-cli'
 pkgname=nvme-cli
-version=2.8
+version=2.10.2
 revision=1
 build_style=meson
 configure_args="-Ddocs=man -Dudevrulesdir=lib/udev/rules.d"
@@ -9,11 +9,17 @@ makedepends="libnvme-devel zlib-devel json-c-devel"
 short_desc="NVMe management command line interface"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
-homepage="http://nvmexpress.org"
+homepage="https://nvmexpress.org"
+changelog="https://github.com/linux-nvme/nvme-cli/releases"
 distfiles="https://github.com/linux-nvme/nvme-cli/archive/v${version}.tar.gz"
-checksum=0743d9188792a87d39187ae5e5cb31e8f46cca8c6f100547c50ec0dd659d2531
+checksum=b3c256959ff34124788aa96c8602c9cef00705d01cc3cb9322bf3269e00ae904
 conf_files="/etc/nvme/*.conf"
 
+case "$XBPS_TARGET_MACHINE" in
+	x86_64-musl) make_check="no" # uint128 test fails on x86_64-musl
+	;;
+esac
+
 if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
 	makedepends+=" libhugetlbfs-devel"
 else

From 052d27c6d0a11bc9a018674d4ca4b8ff80a1bcd2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Fri, 27 Sep 2024 19:59:20 +0200
Subject: [PATCH 3/3] json-c: bump shlibs

---
 common/shlibs           | 2 +-
 srcpkgs/json-c/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d2e7af2d7d9a06..85fd6a32705535 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -800,7 +800,7 @@ libsvn_ra_serf-1.so.0 libsvn-1.8.1_1
 libsvn_fs_x-1.so.0 libsvn-1.9.0_1
 libsvn_swig_py-1.so.0 subversion-python-1.7.5_1
 libsvn_swig_perl-1.so.0 subversion-perl-1.7.5_1
-libjson-c.so.5 json-c-0.14.0_1
+libjson-c.so.5 json-c-0.14.0_2
 libjson-glib-1.0.so.0 json-glib-0.12.2_1
 libcjson.so.1 cJSON-1.7.8_1
 libvirt.so.0 libvirt-0.8.7_1
diff --git a/srcpkgs/json-c/template b/srcpkgs/json-c/template
index 4e306fbb8b0b0a..e3642853466e9c 100644
--- a/srcpkgs/json-c/template
+++ b/srcpkgs/json-c/template
@@ -1,7 +1,7 @@
 # Template file for 'json-c'
 pkgname=json-c
 version=0.17
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_THREADING=ON -DBUILD_STATIC_LIBS=ON
  -DENABLE_RDRAND=$(vopt_if rdrand ON OFF)"

Re: [PR REVIEW] nvme-cli: update to 2.10.2, libnvme: update to 1.10

[slymattz]

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

New review comment by slymattz on void-packages repository

https://github.com/void-linux/void-packages/pull/51900#discussion_r1780009661

Comment:
@classabbyamp may I ask you something so that I know what's going on here? The current version of json-c is 0.17 which is already >=0.14.0_[12]. I bumped it to revision 2, as requested. Why do we map libjson-c.so.5 to json-c-0.14.0_2 and not json-c-0.**17**.0_2? Is there any real difference introduced by mapping `libjson-c.so.5 json-c-0.14.0_2` as opposed to `libjson-c.so.5 json-c-0.17.0_2`?

I tried to get my head around it by re-reading MANUAL and meator's guide but still don't quite get it unless it's just a typo. 

Re: [PR REVIEW] nvme-cli: update to 2.10.2, libnvme: update to 1.10

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51900#discussion_r1780067484

Comment:
you wrote 14, I don't know why you did it. if the shlib is newly added to common/shlibs, use the current version

Re: [PR REVIEW] nvme-cli: update to 2.10.2, libnvme: update to 1.10

[slymattz]

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

New review comment by slymattz on void-packages repository

https://github.com/void-linux/void-packages/pull/51900#discussion_r1780069285

Comment:
Yes, I did write 14. I should've asked the question before. But to my defense the Suggested change read what it read. Will fix that in a minute. Thank you for responding.

Re: [PR PATCH] [Updated] nvme-cli: update to 2.10.2, libnvme: update to 1.10

[slymattz]

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

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

https://github.com/slymattz/void-packages nvme-cli-2.10.2
https://github.com/void-linux/void-packages/pull/51900

nvme-cli: update to 2.10.2, libnvme: update to 1.10
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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
  - x86_64-musl (build)
  - aarch64 (cross build)



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

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

From 4581b9bf4af9bbdc02d0c793702e67c6cd4b8890 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Sun, 18 Aug 2024 17:53:11 +0200
Subject: [PATCH 1/3] libnvme: update to 1.10

---
 common/shlibs            | 3 ++-
 srcpkgs/libnvme/template | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e03048c75bc428..92bbfd890090fb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -799,6 +799,7 @@ libsvn_ra_serf-1.so.0 libsvn-1.8.1_1
 libsvn_fs_x-1.so.0 libsvn-1.9.0_1
 libsvn_swig_py-1.so.0 subversion-python-1.7.5_1
 libsvn_swig_perl-1.so.0 subversion-perl-1.7.5_1
+libjson-c.so.5 json-c-0.14.0_1
 libjson-glib-1.0.so.0 json-glib-0.12.2_1
 libcjson.so.1 cJSON-1.7.8_1
 libvirt.so.0 libvirt-0.8.7_1
@@ -4325,7 +4326,7 @@ librz_type.so.0.7 rizin-0.7.2_1
 librz_util.so.0.7 rizin-0.7.2_1
 libaravis-0.8.so.0 libaravis-0.8.21_1
 libLimeSuite.so.23.11-1 LimeSuite-23.11.0_1
-libnvme.so.1 libnvme-1.0_1
+libnvme.so.1 libnvme-1.10_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
diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template
index c878d834d4a351..c447667fed4b04 100644
--- a/srcpkgs/libnvme/template
+++ b/srcpkgs/libnvme/template
@@ -1,6 +1,6 @@
 # Template file for 'libnvme'
 pkgname=libnvme
-version=1.9
+version=1.10
 revision=1
 build_style=meson
 configure_args="-Ddocs=man"
@@ -11,8 +11,9 @@ short_desc="C Library for NVM Express on Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/linux-nvme/libnvme"
+changelog="https://github.com/linux-nvme/libnvme/releases"
 distfiles="https://github.com/linux-nvme/libnvme/archive/v${version}.tar.gz"
-checksum=455867060d2b7563eab59fe21779dff469d98465028997178c7efbe4b8763206
+checksum=add9efa968e8341459fcaa2d96f2594a6f871e1fb3f57c02ce1c8ba5424f3960
 
 libnvme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} json-c-devel openssl-devel"

From 83e313cf76fe2c339ca9254ab8483cb808b70130 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Sun, 18 Aug 2024 17:55:11 +0200
Subject: [PATCH 2/3] nvme-cli: update to 2.10.2

---
 srcpkgs/nvme-cli/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template
index c09504f3e6b261..f731368585ad27 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'nvme-cli'
 pkgname=nvme-cli
-version=2.8
+version=2.10.2
 revision=1
 build_style=meson
 configure_args="-Ddocs=man -Dudevrulesdir=lib/udev/rules.d"
@@ -9,11 +9,17 @@ makedepends="libnvme-devel zlib-devel json-c-devel"
 short_desc="NVMe management command line interface"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
-homepage="http://nvmexpress.org"
+homepage="https://nvmexpress.org"
+changelog="https://github.com/linux-nvme/nvme-cli/releases"
 distfiles="https://github.com/linux-nvme/nvme-cli/archive/v${version}.tar.gz"
-checksum=0743d9188792a87d39187ae5e5cb31e8f46cca8c6f100547c50ec0dd659d2531
+checksum=b3c256959ff34124788aa96c8602c9cef00705d01cc3cb9322bf3269e00ae904
 conf_files="/etc/nvme/*.conf"
 
+case "$XBPS_TARGET_MACHINE" in
+	x86_64-musl) make_check="no" # uint128 test fails on x86_64-musl
+	;;
+esac
+
 if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
 	makedepends+=" libhugetlbfs-devel"
 else

From ad0c9cf374dab6450c944da29b43c7971b880ac3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Fri, 27 Sep 2024 19:59:20 +0200
Subject: [PATCH 3/3] json-c: bump shlibs

---
 common/shlibs           | 2 +-
 srcpkgs/json-c/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 92bbfd890090fb..533ed501533214 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -799,7 +799,7 @@ libsvn_ra_serf-1.so.0 libsvn-1.8.1_1
 libsvn_fs_x-1.so.0 libsvn-1.9.0_1
 libsvn_swig_py-1.so.0 subversion-python-1.7.5_1
 libsvn_swig_perl-1.so.0 subversion-perl-1.7.5_1
-libjson-c.so.5 json-c-0.14.0_1
+libjson-c.so.5 json-c-0.17.0_2
 libjson-glib-1.0.so.0 json-glib-0.12.2_1
 libcjson.so.1 cJSON-1.7.8_1
 libvirt.so.0 libvirt-0.8.7_1
diff --git a/srcpkgs/json-c/template b/srcpkgs/json-c/template
index 4e306fbb8b0b0a..e3642853466e9c 100644
--- a/srcpkgs/json-c/template
+++ b/srcpkgs/json-c/template
@@ -1,7 +1,7 @@
 # Template file for 'json-c'
 pkgname=json-c
 version=0.17
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_THREADING=ON -DBUILD_STATIC_LIBS=ON
  -DENABLE_RDRAND=$(vopt_if rdrand ON OFF)"

Re: [PR REVIEW] nvme-cli: update to 2.10.2, libnvme: update to 1.10

[slymattz]

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

New review comment by slymattz on void-packages repository

https://github.com/void-linux/void-packages/pull/51900#discussion_r1780069285

Comment:
Yes, I did write 14. I should've asked the question before. But to my defense the Suggested change read what it read and it led me astray. Thank you for responding, though. 

Re: [PR REVIEW] nvme-cli: update to 2.10.2, libnvme: update to 1.10

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51900#discussion_r1780155335

Comment:
this doesn't need to be changed unless the ABI of `libnvme` changed.

Re: [PR REVIEW] nvme-cli: update to 2.10.2, libnvme: update to 1.10

[slymattz]

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

New review comment by slymattz on void-packages repository

https://github.com/void-linux/void-packages/pull/51900#discussion_r1780772621

Comment:
Hi! 

Gimme a while and I'll test sth. The way I remember it was:
I compiled nvme-cli (w/out libnvme 1.10) and didn't receive any warning about the SHLIB in question. However, when launching nvme from CLI I was greeted with the message that it requires libnvme >=1.10, so I suppose ABI changed.

But to make sure, let me try to reproduce it. 

Re: [PR REVIEW] nvme-cli: update to 2.10.2, libnvme: update to 1.10

[slymattz]

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

New review comment by slymattz on void-packages repository

https://github.com/void-linux/void-packages/pull/51900#discussion_r1780772621

Comment:
Hi! 

Gimme a while and I'll test sth. The way I remember it was:
I compiled nvme-cli (w/out libnvme 1.10) and didn't receive any warning about the SHLIB in question. However, when launching nvme from CLI I was greeted with the message that it requires libnvme >=1.10, so I suppose ABI changed.

But to make sure, let me try to reproduce it. 

From the top of my head:
I did receive something of this sort: https://github.com/linux-nvme/nvme-cli/issues/2472

Re: [PR REVIEW] nvme-cli: update to 2.10.2, libnvme: update to 1.10

[slymattz]

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

New review comment by slymattz on void-packages repository

https://github.com/void-linux/void-packages/pull/51900#discussion_r1780772621

Comment:
Hi! 

Gimme a while and I'll test sth. The way I remember it was:
I compiled nvme-cli (w/out libnvme 1.10) and didn't receive any warning about the SHLIB in question. However, when launching nvme from CLI I was greeted with the message that it requires libnvme >=1.10, so I suppose ABI changed.

But to make sure, let me try to reproduce it. 

From the top of my head:
I did receive something of this sort: https://github.com/linux-nvme/nvme-cli/issues/2472

OK, not it just stops at the configure stage with an explicit mention that libnvme>=1.10 is required.
![libnvme](https://github.com/user-attachments/assets/0e89a4d4-ed5d-47dd-ab54-5247ef95d4a1)

Re: [PR REVIEW] nvme-cli: update to 2.10.2, libnvme: update to 1.10

[slymattz]

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

New review comment by slymattz on void-packages repository

https://github.com/void-linux/void-packages/pull/51900#discussion_r1780772621

Comment:
Hi! 

Gimme a while and I'll test sth. The way I remember it was:
I compiled nvme-cli along with libnvme 1.10 and didn't receive any warning about the SHLIB in question. However, when launching nvme from CLI I was greeted with the message that it requires libnvme >=1.10, so I suppose ABI changed.

But to make sure, let me try to reproduce it. 

From the top of my head:
I did receive something of this sort: https://github.com/linux-nvme/nvme-cli/issues/2472

OK, now when trying to compile nvme-cli alone, it just stops at the configure stage with an explicit mention that libnvme>=1.10 is required.
![libnvme](https://github.com/user-attachments/assets/0e89a4d4-ed5d-47dd-ab54-5247ef95d4a1)

Re: [PR REVIEW] nvme-cli: update to 2.10.2, libnvme: update to 1.10

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51900#discussion_r1781034382

Comment:
very well then. is this the only package that needs libnvme? if not, others need to be rebuilt

Re: [PR REVIEW] nvme-cli: update to 2.10.2, libnvme: update to 1.10

[slymattz]

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

New review comment by slymattz on void-packages repository

https://github.com/void-linux/void-packages/pull/51900#discussion_r1781068620

Comment:
I believe libblockdev is the only one missing. I'll add an appropriate commit. Thank you!

Re: [PR PATCH] [Updated] nvme-cli: update to 2.10.2, libnvme: update to 1.10

[slymattz]

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

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

https://github.com/slymattz/void-packages nvme-cli-2.10.2
https://github.com/void-linux/void-packages/pull/51900

nvme-cli: update to 2.10.2, libnvme: update to 1.10
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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
  - x86_64-musl (build)
  - aarch64 (cross build)



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

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

From 4581b9bf4af9bbdc02d0c793702e67c6cd4b8890 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Sun, 18 Aug 2024 17:53:11 +0200
Subject: [PATCH 1/4] libnvme: update to 1.10

---
 common/shlibs            | 3 ++-
 srcpkgs/libnvme/template | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e03048c75bc428..92bbfd890090fb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -799,6 +799,7 @@ libsvn_ra_serf-1.so.0 libsvn-1.8.1_1
 libsvn_fs_x-1.so.0 libsvn-1.9.0_1
 libsvn_swig_py-1.so.0 subversion-python-1.7.5_1
 libsvn_swig_perl-1.so.0 subversion-perl-1.7.5_1
+libjson-c.so.5 json-c-0.14.0_1
 libjson-glib-1.0.so.0 json-glib-0.12.2_1
 libcjson.so.1 cJSON-1.7.8_1
 libvirt.so.0 libvirt-0.8.7_1
@@ -4325,7 +4326,7 @@ librz_type.so.0.7 rizin-0.7.2_1
 librz_util.so.0.7 rizin-0.7.2_1
 libaravis-0.8.so.0 libaravis-0.8.21_1
 libLimeSuite.so.23.11-1 LimeSuite-23.11.0_1
-libnvme.so.1 libnvme-1.0_1
+libnvme.so.1 libnvme-1.10_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
diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template
index c878d834d4a351..c447667fed4b04 100644
--- a/srcpkgs/libnvme/template
+++ b/srcpkgs/libnvme/template
@@ -1,6 +1,6 @@
 # Template file for 'libnvme'
 pkgname=libnvme
-version=1.9
+version=1.10
 revision=1
 build_style=meson
 configure_args="-Ddocs=man"
@@ -11,8 +11,9 @@ short_desc="C Library for NVM Express on Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/linux-nvme/libnvme"
+changelog="https://github.com/linux-nvme/libnvme/releases"
 distfiles="https://github.com/linux-nvme/libnvme/archive/v${version}.tar.gz"
-checksum=455867060d2b7563eab59fe21779dff469d98465028997178c7efbe4b8763206
+checksum=add9efa968e8341459fcaa2d96f2594a6f871e1fb3f57c02ce1c8ba5424f3960
 
 libnvme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} json-c-devel openssl-devel"

From 83e313cf76fe2c339ca9254ab8483cb808b70130 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Sun, 18 Aug 2024 17:55:11 +0200
Subject: [PATCH 2/4] nvme-cli: update to 2.10.2

---
 srcpkgs/nvme-cli/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template
index c09504f3e6b261..f731368585ad27 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'nvme-cli'
 pkgname=nvme-cli
-version=2.8
+version=2.10.2
 revision=1
 build_style=meson
 configure_args="-Ddocs=man -Dudevrulesdir=lib/udev/rules.d"
@@ -9,11 +9,17 @@ makedepends="libnvme-devel zlib-devel json-c-devel"
 short_desc="NVMe management command line interface"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
-homepage="http://nvmexpress.org"
+homepage="https://nvmexpress.org"
+changelog="https://github.com/linux-nvme/nvme-cli/releases"
 distfiles="https://github.com/linux-nvme/nvme-cli/archive/v${version}.tar.gz"
-checksum=0743d9188792a87d39187ae5e5cb31e8f46cca8c6f100547c50ec0dd659d2531
+checksum=b3c256959ff34124788aa96c8602c9cef00705d01cc3cb9322bf3269e00ae904
 conf_files="/etc/nvme/*.conf"
 
+case "$XBPS_TARGET_MACHINE" in
+	x86_64-musl) make_check="no" # uint128 test fails on x86_64-musl
+	;;
+esac
+
 if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
 	makedepends+=" libhugetlbfs-devel"
 else

From ad0c9cf374dab6450c944da29b43c7971b880ac3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Fri, 27 Sep 2024 19:59:20 +0200
Subject: [PATCH 3/4] json-c: bump shlibs

---
 common/shlibs           | 2 +-
 srcpkgs/json-c/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 92bbfd890090fb..533ed501533214 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -799,7 +799,7 @@ libsvn_ra_serf-1.so.0 libsvn-1.8.1_1
 libsvn_fs_x-1.so.0 libsvn-1.9.0_1
 libsvn_swig_py-1.so.0 subversion-python-1.7.5_1
 libsvn_swig_perl-1.so.0 subversion-perl-1.7.5_1
-libjson-c.so.5 json-c-0.14.0_1
+libjson-c.so.5 json-c-0.17.0_2
 libjson-glib-1.0.so.0 json-glib-0.12.2_1
 libcjson.so.1 cJSON-1.7.8_1
 libvirt.so.0 libvirt-0.8.7_1
diff --git a/srcpkgs/json-c/template b/srcpkgs/json-c/template
index 4e306fbb8b0b0a..e3642853466e9c 100644
--- a/srcpkgs/json-c/template
+++ b/srcpkgs/json-c/template
@@ -1,7 +1,7 @@
 # Template file for 'json-c'
 pkgname=json-c
 version=0.17
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_THREADING=ON -DBUILD_STATIC_LIBS=ON
  -DENABLE_RDRAND=$(vopt_if rdrand ON OFF)"

From f725f0451311ff5bffbd6ef1f0efae1dc5a171d9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 30 Sep 2024 15:08:53 +0200
Subject: [PATCH 4/4] libblockdev: build against libnvme-1.10

---
 srcpkgs/libblockdev/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libblockdev/template b/srcpkgs/libblockdev/template
index 50fb0778cad4b9..29f9c555bd0779 100644
--- a/srcpkgs/libblockdev/template
+++ b/srcpkgs/libblockdev/template
@@ -1,7 +1,7 @@
 # Template file for 'libblockdev'
 pkgname=libblockdev
 version=3.1.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_check_target="test"
 hostmakedepends="pkg-config python3-setuptools"