From c14cefd10cf33439525a5cef811be9a8a4739547 Mon Sep 17 00:00:00 2001 From: Maurizio Lombardi Date: Mon, 3 Apr 2023 16:59:37 +0200 Subject: [PATCH] libnvme: Update to version 1.4 Resolves: #2166329 Signed-off-by: Maurizio Lombardi --- .gitignore | 1 + ...UUID-size-introduced-in-recent-UUID-.patch | 33 ------------------- libnvme.spec | 22 ++++++++----- sources | 2 +- 4 files changed, 15 insertions(+), 43 deletions(-) delete mode 100644 0001-fabrics-Fix-bad-UUID-size-introduced-in-recent-UUID-.patch diff --git a/.gitignore b/.gitignore index 9c4564c..3e84acc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /libnvme-1.0.tar.gz /libnvme-1.1.tar.gz /libnvme-1.2.tar.gz +/libnvme-1.4.tar.gz diff --git a/0001-fabrics-Fix-bad-UUID-size-introduced-in-recent-UUID-.patch b/0001-fabrics-Fix-bad-UUID-size-introduced-in-recent-UUID-.patch deleted file mode 100644 index c5fc11a..0000000 --- a/0001-fabrics-Fix-bad-UUID-size-introduced-in-recent-UUID-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 78ce3528d00bb433c661fd24672a1b5c6795b59f Mon Sep 17 00:00:00 2001 -From: Martin Belanger -Date: Fri, 18 Nov 2022 10:41:32 -0500 -Subject: [PATCH] fabrics: Fix bad UUID size introduced in recent UUID changes -Content-type: text/plain - -71c25d1cf741 ("util: Add simple UUID type") introduced a regression in -nvmf_get_tel(). nvmf_get_tel() returns the lenght of the binary -representation. Hence use NVME_UUID_LEN instead. - -Signed-off-by: Martin Belanger -[dwagner: massaged commit message] -Signed-off-by: Daniel Wagner ---- - src/nvme/fabrics.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/nvme/fabrics.c b/src/nvme/fabrics.c -index f943090..36bdc2d 100644 ---- a/src/nvme/fabrics.c -+++ b/src/nvme/fabrics.c -@@ -1127,7 +1127,7 @@ static __u32 nvmf_get_tel(const char *hostsymname) - __u16 len; - - /* Host ID is mandatory */ -- tel += nvmf_exat_size(NVME_UUID_LEN_STRING); -+ tel += nvmf_exat_size(NVME_UUID_LEN); - - /* Symbolic name is optional */ - len = hostsymname ? strlen(hostsymname) : 0; --- -2.31.1 - diff --git a/libnvme.spec b/libnvme.spec index da747c4..60f2339 100644 --- a/libnvme.spec +++ b/libnvme.spec @@ -3,20 +3,22 @@ Name: libnvme Summary: Linux-native nvme device management library -Version: 1.2 -Release: 2%{?dist} +Version: 1.4 +Release: 1%{?dist} License: LGPLv2+ URL: https://github.com/linux-nvme/libnvme Source0: %{url}/archive/v%{version_no_tilde}/%{name}-%{version_no_tilde}.tar.gz -Patch0: 0001-fabrics-Fix-bad-UUID-size-introduced-in-recent-UUID-.patch - BuildRequires: gcc gcc-c++ BuildRequires: swig BuildRequires: python3-devel -BuildRequires: meson >= 0.48.0 +BuildRequires: meson >= 0.50.0 BuildRequires: json-c-devel >= 0.13 BuildRequires: openssl-devel +BuildRequires: keyutils-libs-devel +BuildRequires: dbus-devel + +Requires: keyutils-libs %description Provides type definitions for NVMe specification structures, @@ -45,7 +47,6 @@ This package contains the reference manual for %{name}. Summary: Python3 bindings for libnvme Requires: %{name}%{?_isa} = %{version}-%{release} Provides: python3-nvme = %{version}-%{release} -Obsoletes: python3-nvme < 1.0~rc7 %{?python_provide:%python_provide python3-libnvme} %description -n python3-libnvme @@ -55,7 +56,7 @@ This package contains Python bindings for libnvme. %autosetup -p1 -n %{name}-%{version_no_tilde} %build -%meson -Dpython=true -Ddocs=all -Ddocs-build=true -Dhtmldir=%{_pkgdocdir} +%meson -Dpython=enabled -Ddocs=all -Ddocs-build=true -Dhtmldir=%{_pkgdocdir} %meson_build %install @@ -71,9 +72,9 @@ mv %{buildroot}/usr/*.rst %{buildroot}%{_pkgdocdir}/ %files %license COPYING ccan/licenses/* %{_libdir}/libnvme.so.1 -%{_libdir}/libnvme.so.1.2.0 +%{_libdir}/libnvme.so.1.4.0 %{_libdir}/libnvme-mi.so.1 -%{_libdir}/libnvme-mi.so.1.2.0 +%{_libdir}/libnvme-mi.so.1.4.0 %files devel %{_libdir}/libnvme.so @@ -93,6 +94,9 @@ mv %{buildroot}/usr/*.rst %{buildroot}%{_pkgdocdir}/ %{python3_sitearch}/libnvme/* %changelog +* Mon Apr 03 2023 Maurizio Lombardi - 1.4-1 +- Update to version 1.4 + * Thu Jan 12 2023 John Meneghini - 1.2-2 - Fix BZ2158264 diff --git a/sources b/sources index 727e5c6..d59d94f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libnvme-1.2.tar.gz) = f50517838cd1df3cdd123afdb67870633e9e484bf84dba70b784d7e86ecb355b96ba9d6a1cffb96b35444da7870dfe21c54b69701b5fe5b515319280db4a84e4 +SHA512 (libnvme-1.4.tar.gz) = cc4a0a78083471e912736d76e4faaa5c285e1149029560f212ff06254863e8f21b48fcb1638599bd68efcf888312a248fb748d23776af03574b39fbd9b2a418d