Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libnvme for openSUSE:Factory checked
in at 2022-03-20 20:55:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libnvme (Old)
and /work/SRC/openSUSE:Factory/.libnvme.new.25692 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libnvme"
Sun Mar 20 20:55:11 2022 rev:8 rq:962944 version:1.0~7
Changes:
--------
--- /work/SRC/openSUSE:Factory/libnvme/libnvme.changes 2022-03-14
19:37:00.586122311 +0100
+++ /work/SRC/openSUSE:Factory/.libnvme.new.25692/libnvme.changes
2022-03-20 20:55:19.878507704 +0100
@@ -1,0 +2,8 @@
+Fri Mar 18 19:08:52 UTC 2022 - Daniel Wagner <daniel.wag...@suse.com>
+
+- Update to version 1.0-rc7:
+ * linux: fixup log page offset in nvme_get_log_page()
+ * tree: Add support for default trsvcid for all controllers (bsc#1195858)
+ * tree: fixup coredump during nvme discover
+
+-------------------------------------------------------------------
Old:
----
libnvme-1.0~6.obscpio
New:
----
libnvme-1.0~7.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libnvme.spec ++++++
--- /var/tmp/diff_new_pack.77Z1wU/_old 2022-03-20 20:55:20.914509194 +0100
+++ /var/tmp/diff_new_pack.77Z1wU/_new 2022-03-20 20:55:20.918509200 +0100
@@ -19,7 +19,7 @@
%define sover 1
Name: libnvme
-Version: 1.0~6
+Version: 1.0~7
Release: 0
Summary: Linux-native nvme device management library
License: LGPL-2.1-or-later
++++++ _service ++++++
--- /var/tmp/diff_new_pack.77Z1wU/_old 2022-03-20 20:55:20.954509252 +0100
+++ /var/tmp/diff_new_pack.77Z1wU/_new 2022-03-20 20:55:20.958509258 +0100
@@ -5,7 +5,7 @@
<param name="filename">libnvme</param>
<!-- <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param> -->
<param name="versionformat">@PARENT_TAG@</param>
- <param name="revision">v1.0-rc6</param>
+ <param name="revision">v1.0-rc7</param>
<param name="match-tag">v[01].[0-9]*</param>
<param name="versionrewrite-pattern">v([^+]*)-rc([0-9]+)</param>
<param name="versionrewrite-replacement">\1~\2</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.77Z1wU/_old 2022-03-20 20:55:20.978509286 +0100
+++ /var/tmp/diff_new_pack.77Z1wU/_new 2022-03-20 20:55:20.982509292 +0100
@@ -1,7 +1,7 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/linux-nvme/libnvme.git</param>
- <param
name="changesrevision">8d083ce7f25fccf610ed1de6e10aa16db1920d98</param>
+ <param
name="changesrevision">131ee681a0e394b291cd407442886dbdf9fe124c</param>
</service>
</servicedata>
(No newline at EOF)
++++++ libnvme-1.0~6.obscpio -> libnvme-1.0~7.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnvme-1.0~6/Makefile new/libnvme-1.0~7/Makefile
--- old/libnvme-1.0~6/Makefile 2022-03-11 17:01:20.000000000 +0100
+++ new/libnvme-1.0~7/Makefile 2022-03-18 17:40:19.000000000 +0100
@@ -37,3 +37,7 @@
.PHONY: test
test: ${BUILD-DIR}
ninja -C ${BUILD-DIR} $@
+
+.PHONY: rpm
+rpm: dist
+ rpmbuild -ba ${BUILD-DIR}/libnvme.spec
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnvme-1.0~6/doc/meson.build
new/libnvme-1.0~7/doc/meson.build
--- old/libnvme-1.0~6/doc/meson.build 2022-03-11 17:01:20.000000000 +0100
+++ new/libnvme-1.0~7/doc/meson.build 2022-03-18 17:40:19.000000000 +0100
@@ -30,28 +30,36 @@
if want_docs != 'false'
kernel_doc = find_program('kernel-doc')
+ conf = configuration_data()
+ conf.set('SYSCONFDIR', sysconfdir)
+
if want_docs == 'all' or want_docs == 'man'
mandir = join_paths(get_option('mandir'), 'man2')
list_man_pages = find_program('list-man-pages.sh')
if want_docs_build
foreach apif : api_files
- afile = files('../src/nvme/' + apif)
- c = run_command(list_man_pages, afile)
- man_pages = c.stdout().split()
- foreach page : man_pages
- custom_target(
- page.underscorify() + '_man',
- input: afile,
- output: page + '.2',
- capture: true,
- command: [kernel_doc,
- '-module', 'libnvme',
- '-man',
- '-function',
- page,
- afile],
- install: true,
- install_dir: mandir)
+ foreach file : files('../src/nvme/' + apif)
+ subst = configure_file(
+ input: file,
+ output: '@BASENAME@.msubst',
+ configuration: conf)
+ c = run_command(list_man_pages, subst)
+ man_pages = c.stdout().split()
+ foreach page : man_pages
+ custom_target(
+ page.underscorify() + '_man',
+ input: subst,
+ output: page + '.2',
+ capture: true,
+ command: [kernel_doc,
+ '-module', 'libnvme',
+ '-man',
+ '-function',
+ page,
+ subst],
+ install: true,
+ install_dir: mandir)
+ endforeach
endforeach
endforeach
else
@@ -69,9 +77,13 @@
rsts = []
foreach apif : api_files
afile = files('../src/nvme/' + apif)
+ subst = configure_file(
+ input: afile,
+ output: '@BASENAME@.hsubst',
+ configuration: conf)
rst = custom_target(
apif.underscorify() + '_rst',
- input: afile,
+ input: subst,
output: '@BASENAME@._rst',
capture: true,
command: [kernel_doc,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnvme-1.0~6/libnvme.spec
new/libnvme-1.0~7/libnvme.spec
--- old/libnvme-1.0~6/libnvme.spec 2022-03-11 17:01:20.000000000 +0100
+++ new/libnvme-1.0~7/libnvme.spec 1970-01-01 01:00:00.000000000 +0100
@@ -1,51 +0,0 @@
-Name: libnvme
-Version: 0.1
-Release: 0
-Summary: Linux-native nvme device management library
-License: LGPLv2+
-Source: %{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-root
-URL: http://github.com/linux-nvme/libnvme
-BuildRequires: gcc
-
-%description
-Provides library functions for accessing and managing nvme devices on a Linux
-system.
-
-%package devel
-Summary: Development files for Linux-native nvme
-Requires: libnvme
-Provides: libnvme.so.1
-
-%description devel
-This package provides header files to include and libraries to link with
-for Linux-native nvme device maangement.
-
-%prep
-%setup
-
-%build
-./configure --prefix=/usr --libdir=/%{_libdir} --mandir=/usr/share/man
-
-%make_build
-
-%install
-%make_install
-
-%files
-%defattr(-,root,root)
-%attr(0755,root,root) %{_libdir}/libnvme.so.*
-%doc COPYING
-
-%files devel
-%defattr(-,root,root)
-%attr(-,root,root) %{_includedir}/nvme/
-%attr(0644,root,root) %{_includedir}/libnvme.h
-%attr(0755,root,root) %{_libdir}/libnvme.so
-%attr(0644,root,root) %{_libdir}/libnvme.a
-%attr(0644,root,root) %{_libdir}/pkgconfig/*
-%attr(0644,root,root) %{_mandir}/man2/*
-
-%changelog
-* Thu Dec 12 2019 Keith Busch <kbu...@kernel.org> - 0.1
-- Initial version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnvme-1.0~6/libnvme.spec.in
new/libnvme-1.0~7/libnvme.spec.in
--- old/libnvme-1.0~6/libnvme.spec.in 2022-03-11 17:01:20.000000000 +0100
+++ new/libnvme-1.0~7/libnvme.spec.in 2022-03-18 17:40:19.000000000 +0100
@@ -2,10 +2,14 @@
Version: @VERSION@
Release: 0
Summary: Linux-native nvme device management library
+
License: @LICENSE@
Source: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-root
URL: http://github.com/linux-nvme/libnvme
+
+BuildRequires: libuuid-devel
+BuildRequires: meson
BuildRequires: gcc
%description
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnvme-1.0~6/meson.build
new/libnvme-1.0~7/meson.build
--- old/libnvme-1.0~6/meson.build 2022-03-11 17:01:20.000000000 +0100
+++ new/libnvme-1.0~7/meson.build 2022-03-18 17:40:19.000000000 +0100
@@ -29,12 +29,15 @@
datadir = join_paths(prefixdir, get_option('datadir'))
mandir = join_paths(prefixdir, get_option('mandir'))
bindir = join_paths(prefixdir, get_option('bindir'))
+sysconfdir = join_paths(prefixdir, get_option('sysconfdir'))
pkgconfiglibdir = get_option('pkgconfiglibdir') == '' ? join_paths(libdir,
'pkgconfig') : get_option('pkgconfiglibdir')
################################################################################
conf = configuration_data()
+conf.set('SYSCONFDIR', '"@0@"'.format(sysconfdir))
+
# Check for libuuid availability
libuuid_dep = dependency('uuid', required: true)
conf.set('CONFIG_LIBUUID', libuuid_dep.found(), description: 'Is libuuid
required?')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnvme-1.0~6/src/nvme/fabrics.c
new/libnvme-1.0~7/src/nvme/fabrics.c
--- old/libnvme-1.0~6/src/nvme/fabrics.c 2022-03-11 17:01:20.000000000
+0100
+++ new/libnvme-1.0~7/src/nvme/fabrics.c 2022-03-18 17:40:19.000000000
+0100
@@ -41,9 +41,10 @@
#define NVMF_HOSTID_SIZE 37
#define UUID_SIZE 37 /* 1b4e28ba-2fa1-11d2-883f-0016d3cca427 +
\0 */
+#define NVMF_HOSTNQN_FILE SYSCONFDIR "/nvme/hostnqn"
+#define NVMF_HOSTID_FILE SYSCONFDIR "/nvme/hostid"
+
const char *nvmf_dev = "/dev/nvme-fabrics";
-const char *nvmf_hostnqn_file = "/etc/nvme/hostnqn";
-const char *nvmf_hostid_file = "/etc/nvme/hostid";
const char *arg_str(const char * const *strings,
size_t array_size, size_t idx)
@@ -967,12 +968,12 @@
char *nvmf_hostnqn_from_file()
{
- return nvmf_read_file(nvmf_hostnqn_file, NVMF_NQN_SIZE);
+ return nvmf_read_file(NVMF_HOSTNQN_FILE, NVMF_NQN_SIZE);
}
char *nvmf_hostid_from_file()
{
- return nvmf_read_file(nvmf_hostid_file, NVMF_HOSTID_SIZE);
+ return nvmf_read_file(NVMF_HOSTID_FILE, NVMF_HOSTID_SIZE);
}
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnvme-1.0~6/src/nvme/fabrics.h
new/libnvme-1.0~7/src/nvme/fabrics.h
--- old/libnvme-1.0~6/src/nvme/fabrics.h 2022-03-11 17:01:20.000000000
+0100
+++ new/libnvme-1.0~7/src/nvme/fabrics.h 2022-03-18 17:40:19.000000000
+0100
@@ -203,7 +203,7 @@
/**
* nvmf_hostnqn_from_file() - Reads the host nvm qualified name from the config
- * default location in /etc/nvme/
+ * default location in @SYSCONFDIR@/nvme/
* Return: The host nqn, or NULL if unsuccessful. If found, the caller
* is responsible to free the string.
*/
@@ -211,7 +211,7 @@
/**
* nvmf_hostid_from_file() - Reads the host identifier from the config default
- * location in /etc/nvme/.
+ * location in @SYSCONFDIR@/nvme/.
* Return: The host identifier, or NULL if unsuccessful. If found, the caller
* is responsible to free the string.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnvme-1.0~6/src/nvme/linux.c
new/libnvme-1.0~7/src/nvme/linux.c
--- old/libnvme-1.0~6/src/nvme/linux.c 2022-03-11 17:01:20.000000000 +0100
+++ new/libnvme-1.0~7/src/nvme/linux.c 2022-03-18 17:40:19.000000000 +0100
@@ -119,7 +119,7 @@
int nvme_get_log_page(int fd, __u32 xfer_len, struct nvme_get_log_args *args)
{
- __u64 offset = 0, xfer;
+ __u64 offset = 0, xfer, data_len = args->len;
bool retain = true;
void *ptr = args->log;
int ret;
@@ -129,7 +129,7 @@
* avoids having to check the MDTS value of the controller.
*/
do {
- xfer = args->len - offset;
+ xfer = data_len - offset;
if (xfer > xfer_len)
xfer = xfer_len;
@@ -138,7 +138,7 @@
* last portion of this log page so the data remains latched
* during the fetch sequence.
*/
- if (offset + xfer == args->len)
+ if (offset + xfer == data_len)
retain = args->rae;
args->lpo = offset;
@@ -151,7 +151,7 @@
offset += xfer;
ptr += xfer;
- } while (offset < args->len);
+ } while (offset < data_len);
return 0;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libnvme-1.0~6/src/nvme/tree.c
new/libnvme-1.0~7/src/nvme/tree.c
--- old/libnvme-1.0~6/src/nvme/tree.c 2022-03-11 17:01:20.000000000 +0100
+++ new/libnvme-1.0~7/src/nvme/tree.c 2022-03-18 17:40:19.000000000 +0100
@@ -933,7 +933,7 @@
#define ____stringify(x...) #x
#define __stringify(x...) ____stringify(x)
-static void discovery_trsvcid(nvme_ctrl_t c)
+static void set_default_trsvcid(nvme_ctrl_t c)
{
if (!strcmp(c->transport, "tcp")) {
if (c->discovery_ctrl) {
@@ -941,7 +941,7 @@
c->trsvcid = strdup(__stringify(NVME_DISC_IP_PORT));
} else {
/* Default port for NVMe/TCP io controllers */
- c->trsvcid = __stringify(NVME_RDMA_IP_PORT);
+ c->trsvcid = strdup(__stringify(NVME_RDMA_IP_PORT));
}
} else if (!strcmp(c->transport, "rdma")) {
/* Default port for NVMe/RDMA controllers */
@@ -970,7 +970,6 @@
const char *host_iface, const char *trsvcid)
{
struct nvme_ctrl *c;
- bool discovery = false;
if (!transport) {
nvme_msg(r, LOG_ERR, "No transport specified\n");
@@ -988,8 +987,7 @@
nvme_msg(r, LOG_ERR, "No subsystem NQN specified\n");
errno = EINVAL;
return NULL;
- } else if (!strcmp(subsysnqn, NVME_DISC_SUBSYS_NAME))
- discovery = true;
+ }
c = calloc(1, sizeof(*c));
if (!c) {
errno = ENOMEM;
@@ -1014,16 +1012,8 @@
c->cfg.host_iface = strdup(host_iface);
if (trsvcid)
c->trsvcid = strdup(trsvcid);
- else if (discovery)
- discovery_trsvcid(c);
- else if (!strncmp(transport, "rdma", 4) ||
- !strncmp(transport, "tcp", 3)) {
- nvme_msg(r, LOG_ERR, "No trsvcid specified for '%s'\n",
- transport);
- errno = EINVAL;
- __nvme_free_ctrl(c);
- c = NULL;
- }
+ else
+ set_default_trsvcid(c);
return c;
}
++++++ libnvme.obsinfo ++++++
--- /var/tmp/diff_new_pack.77Z1wU/_old 2022-03-20 20:55:21.366509845 +0100
+++ /var/tmp/diff_new_pack.77Z1wU/_new 2022-03-20 20:55:21.370509850 +0100
@@ -1,5 +1,5 @@
name: libnvme
-version: 1.0~6
-mtime: 1647014480
-commit: 8d083ce7f25fccf610ed1de6e10aa16db1920d98
+version: 1.0~7
+mtime: 1647621619
+commit: 131ee681a0e394b291cd407442886dbdf9fe124c
