From c9468c5411a957535512fd9c7757f817bf863c49 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 28 Mar 2023 09:11:19 +0000
Subject: [PATCH] import libnvme-1.2-2.el9

---
 .gitignore                                    |  2 +-
 .libnvme.metadata                             |  2 +-
 ...UUID-size-introduced-in-recent-UUID-.patch | 33 +++++++++++++++++++
 SPECS/libnvme.spec                            | 26 +++++++++++----
 4 files changed, 55 insertions(+), 8 deletions(-)
 create mode 100644 SOURCES/0001-fabrics-Fix-bad-UUID-size-introduced-in-recent-UUID-.patch

diff --git a/.gitignore b/.gitignore
index 1e9545e..e28004b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/libnvme-1.0.tar.gz
+SOURCES/libnvme-1.2.tar.gz
diff --git a/.libnvme.metadata b/.libnvme.metadata
index ff09d1d..c278f6a 100644
--- a/.libnvme.metadata
+++ b/.libnvme.metadata
@@ -1 +1 @@
-91a96ddb43b7cc2e50faed8bd22e01c4e1e6a952 SOURCES/libnvme-1.0.tar.gz
+32d5f81b7af835e5596cb390f7dd2ac889414e1d SOURCES/libnvme-1.2.tar.gz
diff --git a/SOURCES/0001-fabrics-Fix-bad-UUID-size-introduced-in-recent-UUID-.patch b/SOURCES/0001-fabrics-Fix-bad-UUID-size-introduced-in-recent-UUID-.patch
new file mode 100644
index 0000000..c5fc11a
--- /dev/null
+++ b/SOURCES/0001-fabrics-Fix-bad-UUID-size-introduced-in-recent-UUID-.patch
@@ -0,0 +1,33 @@
+From 78ce3528d00bb433c661fd24672a1b5c6795b59f Mon Sep 17 00:00:00 2001
+From: Martin Belanger <martin.belanger@dell.com>
+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 <martin.belanger@dell.com>
+[dwagner: massaged commit message]
+Signed-off-by: Daniel Wagner <dwagner@suse.de>
+---
+ 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/SPECS/libnvme.spec b/SPECS/libnvme.spec
index ad641fa..da747c4 100644
--- a/SPECS/libnvme.spec
+++ b/SPECS/libnvme.spec
@@ -3,18 +3,18 @@
 
 Name:    libnvme
 Summary: Linux-native nvme device management library
-Version: 1.0
-Release: 5%{?dist}
+Version: 1.2
+Release: 2%{?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.47.0
-BuildRequires: libuuid-devel
+BuildRequires: meson >= 0.48.0
 BuildRequires: json-c-devel >= 0.13
 BuildRequires: openssl-devel
 
@@ -64,17 +64,22 @@ This package contains Python bindings for libnvme.
 %{__install} -pm 644 doc/config-schema.json %{buildroot}%{_pkgdocdir}
 mv %{buildroot}%{_pkgdocdir}/nvme/html %{buildroot}%{_pkgdocdir}/html
 rm -rf %{buildroot}%{_pkgdocdir}/nvme
+mv %{buildroot}/usr/*.rst %{buildroot}%{_pkgdocdir}/
 
 %ldconfig_scriptlets
 
 %files
 %license COPYING ccan/licenses/*
 %{_libdir}/libnvme.so.1
-%{_libdir}/libnvme.so.1.0.0
+%{_libdir}/libnvme.so.1.2.0
+%{_libdir}/libnvme-mi.so.1
+%{_libdir}/libnvme-mi.so.1.2.0
 
 %files devel
 %{_libdir}/libnvme.so
+%{_libdir}/libnvme-mi.so
 %{_includedir}/libnvme.h
+%{_includedir}/libnvme-mi.h
 %dir %{_includedir}/nvme
 %{_includedir}/nvme/*.h
 %{_libdir}/pkgconfig/*.pc
@@ -88,6 +93,15 @@ rm -rf %{buildroot}%{_pkgdocdir}/nvme
 %{python3_sitearch}/libnvme/*
 
 %changelog
+* Thu Jan 12 2023 John Meneghini <jmeneghi@redhat.com> - 1.2-2
+- Fix BZ2158264
+
+* Fri Nov 04 2022 Maurizio Lombardi <mlombard@redhat.com> - 1.2-1
+- Update to upstream version v1.2
+
+* Mon Sep 19 2022 Maurizio Lombardi <mlombard@redhat.com> - 1.1-1
+- Update to upstream version v1.1
+
 * Fri Jun 24 2022 Maurizio Lombardi <mlombard@redhat.com> - 1.0-5
 - Rebuild for RHEL9.1