From d3d2127cb9f12216e55daa219285dda998ae81c7 Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Tue, 2 Aug 2022 15:57:28 +0530 Subject: [PATCH 1/2] libnvme: update to 1.1 --- srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch | 13 ------------- srcpkgs/libnvme/template | 5 +++-- 2 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch diff --git a/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch deleted file mode 100644 index c25df742e763..000000000000 --- a/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch +++ /dev/null @@ -1,13 +0,0 @@ -SCOPE_DELIMITER not defined in musl - ---- a/src/nvme/fabrics.c -+++ b/src/nvme/fabrics.c -@@ -325,7 +325,7 @@ - nvme_msg(r, LOG_ERR, "cannot copy: %s\n", src); - - const char *scope = NULL; -- char *p = strchr(tmp, SCOPE_DELIMITER); -+ char *p = strchr(tmp, '%'); - if (p) { - *p = '\0'; - scope = src + (p - tmp) + 1; diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template index aafe21aa9aa5..56fc82e44277 100644 --- a/srcpkgs/libnvme/template +++ b/srcpkgs/libnvme/template @@ -1,17 +1,18 @@ # Template file for 'libnvme' pkgname=libnvme -version=1.0 +version=1.1 revision=1 build_style=meson configure_args="-Ddocs=man" hostmakedepends="pkg-config swig" makedepends="libuuid-devel json-c-devel openssl-devel python3-devel" +checkdepends="perl" short_desc="C Library for NVM Express on Linux" maintainer="Subhaditya Nath " 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=387524b1c24a4091a88bfb258c98c054f716da210e77702f0709164740370807 +checksum=d000181356513733671409c747c88826155b60f45f76e7289d6bbf27a8f851b0 libnvme-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From ca079dadbef18e072ec0cc9bdff0527978dd90b1 Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Tue, 2 Aug 2022 15:57:44 +0530 Subject: [PATCH 2/2] nvme-cli: update to 2.1.1 --- srcpkgs/nvme-cli/patches/musl.patch | 18 ------------------ srcpkgs/nvme-cli/template | 4 ++-- 2 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 srcpkgs/nvme-cli/patches/musl.patch diff --git a/srcpkgs/nvme-cli/patches/musl.patch b/srcpkgs/nvme-cli/patches/musl.patch deleted file mode 100644 index 4ebfba11d38f..000000000000 --- a/srcpkgs/nvme-cli/patches/musl.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit ddf3610e8326d014360c9550d54a73f97b40e862 -Author: q66 -Date: Wed Apr 27 04:20:41 2022 +0200 - - fix build on musl - -diff --git a/util/base64.c b/util/base64.c -index e386c11..dad4492 100644 ---- a/util/base64.c -+++ b/util/base64.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - static const char base64_table[65] = - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template index d4e7bc892403..fb64fece0644 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.0 +version=2.1.1 revision=1 build_style=meson configure_args="-Ddocs=man -Dudevrulesdir=lib/udev/rules.d" @@ -11,7 +11,7 @@ maintainer="Subhaditya Nath " license="GPL-2.0-only" homepage="http://nvmexpress.org" distfiles="https://github.com/linux-nvme/nvme-cli/archive/v${version}.tar.gz" -checksum=471869b3bf643bb357dc9613ad14d24ff342fcd97e2db5a753c81c335ad8859c +checksum=cc8bd36b9aa71243e2bace238aa5505244fef3fef5418b0c61f75d1988458272 conf_files="/etc/nvme/*.conf" if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then