Accepting request 1219892 from Base:System

OBS-URL: https://build.opensuse.org/request/show/1219892
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libnvme?expand=0&rev=31

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

@@ -0,0 +1,39 @@
+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

@@ -3,8 +3,8 @@
     <param name="scm">git</param>
     <param name="url">https://github.com/linux-nvme/libnvme.git</param>
     <param name="filename">libnvme</param>
-    <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@.g%h</param>
+    <param name="versionformat">@PARENT_TAG@</param>
-    <param name="revision">dd51fa8550564c93436423a4d8ed4be92ae50290</param>
+    <param name="revision">v1.11</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="changesgenerate">enable</param>
   </service>

_servicedata

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

libnvme-1.10+0.gdd51fa8.obscpio

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b3463d811b1772376fd4d5ac5c563b04f0d1bc2a725cb6c675dc93430713d9f2
-size 3405836

libnvme.changes

@@ -1,12 +1,62 @@
+-------------------------------------------------------------------
+Thu Oct 31 13:06:35 UTC 2024 - Daniel Wagner <daniel.wagner@suse.com>
+
+- Update to version 1.11:
+  * prefix: Use Request or Response Length in DLEN and DOFF for MI
+  * types: Add ETPVDS and SSI fields of sanitize status log
+  * json: do not escape strings when printing the configuration
+  * tree: do no export tls keys when not provided by user
+  * types: add struct nvme_id_ctrl_nvm ver and lbamqf member variables
+  * types: add NVMe 2.1 get log page LIDs
+  * type: Added enums for ANSAN and RGCNS bit of OAES field
+  * linux: fixup PSK HMAC type '0' handling
+  * util: added error code for ENOKEY
+  * fabrics: fix map error level in __nvmf_add_ctrl
+  * fabrics: add ctrl connect interface
+  * fabrics: use hex numbers when generating command line options
+  * fabrics: rename first argument for argument macros
+  * linux: handle key import correctly
+  * linux: export keys to config
+  * tree: read tls_configured_key and tls_keyring from sysfs
+  * tree: move dhchap and tls sysfs parser into separate functions
+  * json: move keystore operations out of the JSON parser
+  * tree: add getter/setters for TLS PSK
+  * linux: add import/export function for TLS pre-shared keys
+  * linux: only return the description of a key
+  * linux: use ssize_t as return type for nvme_identity_len
+  * linux: reorder variable declarations
+  * types: Added enum for SMVES event of PEL log
+  * libnvme: add lockdown log page support(LID : 0x14)
+  * libnvme: add EMVS support to sanitize command
+  * types: Add TP4159 PCIe Infrastructure for Live Migration definitions
+  * types: add NVME_CTRL_OAES get macro definitions
+  * types: add NVME_CTRL_OAES_TTHR definition
+  * types: add NVME_CTRL_FNA definitions to get field values
+  * types: add NVME_VAL() definition
+  * tree: fix tls key mem leak (bsc#1231668)
+  * tree: fix dhchap_ctrl_key mem leak (bsc#1231668)
+  * tree: fix dhchap_key mem leak (bsc#1231668)
+  * types: add NVME_CHECK() definition to check nvme register field value
+  * types: add kv opcodes
+  * types: added new fields in nvme_nvme_id_ns
+  * types: Add enum for Completion Condition of Get LBA status command
+  * ioctl: refactoring set_features
+  * types: add new fields added in TP4142
+  * mi: add control primitive command
+  * linux: Correct error handling for derive_psk_digest (bsc#1228376)
+  * types: Added new field CSER in enum as per TP4167
+- build fix for OpenSSL 1.1
+  * add 0001-linux-fix-derive_psk_digest-OpenSSL-1.1-version.patch
+
 -------------------------------------------------------------------
 Fri Aug 02 08:23:49 UTC 2024 - Daniel Wagner <daniel.wagner@suse.com>
 
 - Update to version 1.10:
   * linux: update TLS version 1 PSK derivation (bsc#1228376)
   * tree: fix nvme_read_config() to not set errno if return 0
-  * types: add new fields added in TP4165
+  * types: add new fields added in TP4165 (bsc#1231668)
-  * types: Changed the space into tap space
+  * types: Changed the space into tap space (bsc#1231668)
-  * tree: handle no address phy slot dirs
+  * tree: handle no address phy slot dirs (bsc#1229193)
   * linux: Remove the use of OpenSSL Engine API
   * types: Added new controller attribute as per TP4104
   * tree: add helper to lookup hostnqn/hostid (bsc#1226216)
@@ -14,9 +64,9 @@ Fri Aug 02 08:23:49 UTC 2024 - Daniel Wagner <daniel.wagner@suse.com>
   * json: filter out pcie transport (bsc#1226216)
   * tree: preserve parsing order of a config file (bsc#1226216)
   * types: add new field added in TP4099
-  * types: add new field added in TP4090
+  * types: add new field added in TP4090 (bsc#1231668)
   * linux: add nvme_revoke_tls_key (bsc#1226197)
-  * tree: fix segfault in nvme_free_tree()
+  * tree: fix segfault in nvme_free_tree() (bsc#1231668)
   * types: add PEL vendor specific and TCG defined events definitions
   * mi-mctp: initialize the rc variable in handle_mctp_endpoint()
   * linux: avoid potential null pointer dereference
@@ -75,7 +125,7 @@ Fri May 03 13:11:16 UTC 2024 - Daniel Wagner <daniel.wagner@suse.com>
   * linux: Allocate aligned payload for nvme_get_telemetry_log
   * test: use diff to compare sysfs output (bsc#1226216)
   * tree: fix lba_count size calculation
-  * tree: Add NVM subsystem controller identifier
+  * tree: Add NVM subsystem controller identifier (bsc#1224024)
   * test: Add unit test for nvme_id_ns_flbas_to_lbaf_inuse()
   * types: Fix NVME_CSTS_SHST_MASK definition
   * util: Fixed nvme_id_ns_flbas_to_lbaf_inuse()
@@ -113,7 +163,7 @@ Fri May 03 13:11:16 UTC 2024 - Daniel Wagner <daniel.wagner@suse.com>
   * log: Respect DEFAULT_LOGLEVEL on uninitialized logging
   * log: Introduce nvme_get_logging_level()
   * ioctl: remove incomplete debug logging infrastructure
-  * ioctl: export nvme_submit_passthru{64} as weak symbol
+  * ioctl: export nvme_submit_passthru{64} as weak symbol (bsc#1231668)
   * log: move nvme_{set|get}_debug to log.c
   * fabrics: check the read() return value
   * types: Add PEL reporting context port identifier type definitions

libnvme.obsinfo

@@ -1,4 +1,4 @@
 name: libnvme
-version: 1.10+0.gdd51fa8
+version: 1.11
-mtime: 1722585273
+mtime: 1730365599
-commit: dd51fa8550564c93436423a4d8ed4be92ae50290
+commit: 2b3cb1746451f58583408a25857ca897d18cd4ca

libnvme.spec

@@ -21,12 +21,13 @@
 %bcond_without check
 
 Name:           libnvme
-Version:        1.10+0.gdd51fa8
+Version:        1.11
 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++