Sync from SUSE:SLFO:Main libnvme revision c0a91214e40e210787f206e9d2097870

0001-linux-fix-derive_psk_digest-OpenSSL-1.1-version.patch

@@ -1,39 +0,0 @@
-From 81073a178c198a1b7f08964300905cbec595c14e Mon Sep 17 00:00:00 2001
-From: Daniel Wagner <wagi@kernel.org>
-Date: Thu, 31 Oct 2024 14:54:21 +0100
-Subject: [PATCH] linux: fix derive_psk_digest OpenSSL 1.1 version
-
-The reordering of the variables broke derive_psk_digest OpenSSL 1.1
-version.
-
-Fixes: 4cc727d19221 ("linux: reorder variable declarations")
-
-Signed-off-by: Daniel Wagner <wagi@kernel.org>
----
- src/nvme/linux.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/nvme/linux.c b/src/nvme/linux.c
-index e74fac20ba18..0d48792431d0 100644
---- a/src/nvme/linux.c
-+++ b/src/nvme/linux.c
-@@ -881,14 +881,14 @@ int nvme_gen_dhchap_key(char *hostnqn, enum nvme_hmac_alg hmac,
- }
- 
- static int derive_psk_digest(const char *hostnqn, const char *subsysnqn,
--			     int version, int hmac,
-+			     int version, int cipher,
- 			     unsigned char *retained, size_t key_len,
- 			     char *digest, size_t digest_len)
- {
- 	static const char hmac_seed[] = "NVMe-over-Fabrics";
--	const EVP_MD *md = select_hmac(hmac, &hmac_len);
- 	_cleanup_hmac_ctx_ HMAC_CTX *hmac_ctx = NULL;
- 	_cleanup_free_ unsigned char *psk_ctx = NULL;
-+	const EVP_MD *md;
- 	size_t hmac_len;
- 	size_t len;
- 
--- 
-2.47.0
-

_service

@@ -1,11 +1,14 @@
 <services>
   <service name="obs_scm" mode="manual">
     <param name="scm">git</param>
-    <param name="url">https://github.com/linux-nvme/libnvme.git</param>
+    <param name="url">https://github.com/openSUSE/libnvme.git</param>
     <param name="filename">libnvme</param>
-    <param name="versionformat">@PARENT_TAG@</param>
-    <param name="revision">v1.11</param>
-    <param name="versionrewrite-pattern">v(.*)</param>
+    <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@.g%h</param>
+    <param name="revision">18b9f8e5bea99517609c117620d5db4be96a5def</param>
+    <!-- preserve plain upstream version, add tag offset + hash for
+	 modifications  -->
+    <param name="versionrewrite-pattern">v([^+]*)(\+0.*$)?(\+[1-9].*$)?</param>
+    <param name="versionrewrite-replacement">\1\3</param>
     <param name="changesgenerate">enable</param>
   </service>
   <service name="set_version" mode="manual">

_servicedata

@@ -3,4 +3,6 @@
     <param name="url">https://github.com/linux-nvme/libnvme.git</param>
     <param name="changesrevision">2b3cb1746451f58583408a25857ca897d18cd4ca</param>
   </service>
-</servicedata>
+<service name="tar_scm">
+                <param name="url">https://github.com/openSUSE/libnvme.git</param>
+              <param name="changesrevision">18b9f8e5bea99517609c117620d5db4be96a5def</param></service></servicedata>

libnvme.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Tue Jul 22 09:49:59 UTC 2025 - Daniel Wagner <dwagner@suse.de>
+
+- Update to version 1.11+4.g18b9f8e5:
+  * tree: free ctrl attributes when (re)configure ctrl (bsc#1243716)
+  * tree: filter tree after scan has completed (bsc#1243716)
+  * test/mock: pass thru unknown ioctls
+  * linux: fix derive_psk_digest OpenSSL 1.1 version
+- Drop intergrated patches
+  * remove 0001-linux-fix-derive_psk_digest-OpenSSL-1.1-version.patch
+  * remove 0002-test-mock-pass-thru-unknown-ioctls.patch
+
+-------------------------------------------------------------------
+Mon Nov 25 13:15:00 UTC 2024 - Daniel Wagner <daniel.wagner@suse.com>
+
+- Fix tests on s390
+  * add 0002-test-mock-pass-thru-unknown-ioctls.patch
+
 -------------------------------------------------------------------
 Thu Oct 31 13:06:35 UTC 2024 - Daniel Wagner <daniel.wagner@suse.com>
 

libnvme.obsinfo

@@ -1,4 +1,4 @@
 name: libnvme
-version: 1.11
-mtime: 1730365599
-commit: 2b3cb1746451f58583408a25857ca897d18cd4ca
+version: 1.11+4.g18b9f8e5
+mtime: 1753177646
+commit: 18b9f8e5bea99517609c117620d5db4be96a5def

libnvme.spec

@@ -21,13 +21,12 @@
 %bcond_without check
 
 Name:           libnvme
-Version:        1.11
+Version:        1.11+4.g18b9f8e5
 Release:        0
 Summary:        Linux-native nvme device management library
 License:        LGPL-2.1-or-later
 URL:            https://github.com/linux-nvme/libnvme/
 Source0:        libnvme-%{version}.tar.gz
-Patch01:        0001-linux-fix-derive_psk_digest-OpenSSL-1.1-version.patch
 BuildRequires:  dbus-1-devel
 BuildRequires:  gcc
 BuildRequires:  gcc-c++