From 4b03a7316ac896f137f82401f32b020aa3997d8cc1b37df7f506e49eaf299ce2 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Fri, 11 Nov 2022 16:01:30 +0000 Subject: [PATCH] - Update to 1.9.6: * Update the systemd run directory - Refresh move_to_run.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/libstoragemgmt?expand=0&rev=87 --- libstoragemgmt-1.9.5.tar.gz | 3 -- libstoragemgmt-1.9.6.tar.gz | 3 ++ libstoragemgmt.changes | 7 +++++ libstoragemgmt.spec | 2 +- move_to_run.patch | 63 ++++++++++++++----------------------- 5 files changed, 34 insertions(+), 44 deletions(-) delete mode 100644 libstoragemgmt-1.9.5.tar.gz create mode 100644 libstoragemgmt-1.9.6.tar.gz diff --git a/libstoragemgmt-1.9.5.tar.gz b/libstoragemgmt-1.9.5.tar.gz deleted file mode 100644 index 6e4c599..0000000 --- a/libstoragemgmt-1.9.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ca9e9eed222fa23366a8e5efa9ed684140bafd3f011bb2498d0982c1e26092b -size 1077445 diff --git a/libstoragemgmt-1.9.6.tar.gz b/libstoragemgmt-1.9.6.tar.gz new file mode 100644 index 0000000..20dffea --- /dev/null +++ b/libstoragemgmt-1.9.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4abb4ccd1ce2e006d7ae0aa416c187384c9acf524dfbf8b1a7a07dfde9efa59 +size 1077397 diff --git a/libstoragemgmt.changes b/libstoragemgmt.changes index b043cf1..14fa67b 100644 --- a/libstoragemgmt.changes +++ b/libstoragemgmt.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Nov 11 15:52:38 UTC 2022 - Michael Vetter + +- Update to 1.9.6: + * Update the systemd run directory +- Refresh move_to_run.patch + ------------------------------------------------------------------- Tue Oct 18 12:10:13 UTC 2022 - Michael Vetter diff --git a/libstoragemgmt.spec b/libstoragemgmt.spec index 38c4ffd..7c3ceae 100644 --- a/libstoragemgmt.spec +++ b/libstoragemgmt.spec @@ -26,7 +26,7 @@ %define python3 0 %endif Name: libstoragemgmt -Version: 1.9.5 +Version: 1.9.6 Release: 0 Summary: Storage array management library License: GPL-2.0-or-later AND LGPL-2.1-or-later diff --git a/move_to_run.patch b/move_to_run.patch index da1932e..3f20e0c 100644 --- a/move_to_run.patch +++ b/move_to_run.patch @@ -1,10 +1,7 @@ -bsc#1185067, migrate /var/run to /run. - -Index: libstoragemgmt-1.9.3/c_binding/lsm_datatypes.cpp -=================================================================== ---- libstoragemgmt-1.9.3.orig/c_binding/lsm_datatypes.cpp -+++ libstoragemgmt-1.9.3/c_binding/lsm_datatypes.cpp -@@ -52,7 +52,7 @@ +diff -urEbw libstoragemgmt-1.9.6/c_binding/lsm_datatypes.cpp libstoragemgmt-1.9.6.new/c_binding/lsm_datatypes.cpp +--- libstoragemgmt-1.9.6/c_binding/lsm_datatypes.cpp 2022-04-06 19:55:18.000000000 +0200 ++++ libstoragemgmt-1.9.6.new/c_binding/lsm_datatypes.cpp 2022-11-11 16:55:27.674287708 +0100 +@@ -51,7 +51,7 @@ #ifdef __cplusplus extern "C" { #endif @@ -13,10 +10,9 @@ Index: libstoragemgmt-1.9.3/c_binding/lsm_datatypes.cpp int lsm_string_list_append(lsm_string_list *sl, const char *value) { int rc = LSM_ERR_INVALID_ARGUMENT; -Index: libstoragemgmt-1.9.3/daemon/lsm_daemon.c -=================================================================== ---- libstoragemgmt-1.9.3.orig/daemon/lsm_daemon.c -+++ libstoragemgmt-1.9.3/daemon/lsm_daemon.c +diff -urEbw libstoragemgmt-1.9.6/daemon/lsm_daemon.c libstoragemgmt-1.9.6.new/daemon/lsm_daemon.c +--- libstoragemgmt-1.9.6/daemon/lsm_daemon.c 2022-04-06 19:55:18.000000000 +0200 ++++ libstoragemgmt-1.9.6.new/daemon/lsm_daemon.c 2022-11-11 16:56:06.354471805 +0100 @@ -44,7 +44,7 @@ #include #include @@ -26,19 +22,9 @@ Index: libstoragemgmt-1.9.3/daemon/lsm_daemon.c #define SOCKET_DIR BASE_DIR "/ipc" #define PLUGIN_DIR "/usr/bin" #define LSM_USER "libstoragemgmt" -Index: libstoragemgmt-1.9.3/packaging/daemon/libstoragemgmt.conf -=================================================================== ---- libstoragemgmt-1.9.3.orig/packaging/daemon/libstoragemgmt.conf -+++ libstoragemgmt-1.9.3/packaging/daemon/libstoragemgmt.conf -@@ -1,2 +1,2 @@ --D /var/run/lsm 0775 root libstoragemgmt - --D /var/run/lsm/ipc 0775 root libstoragemgmt - -+D /run/lsm 0775 root libstoragemgmt - -+D /run/lsm/ipc 0775 root libstoragemgmt - -Index: libstoragemgmt-1.9.3/packaging/daemon/libstoragemgmtd -=================================================================== ---- libstoragemgmt-1.9.3.orig/packaging/daemon/libstoragemgmtd -+++ libstoragemgmt-1.9.3/packaging/daemon/libstoragemgmtd +diff -urEbw libstoragemgmt-1.9.6/packaging/daemon/libstoragemgmtd libstoragemgmt-1.9.6.new/packaging/daemon/libstoragemgmtd +--- libstoragemgmt-1.9.6/packaging/daemon/libstoragemgmtd 2022-03-15 23:38:45.000000000 +0100 ++++ libstoragemgmt-1.9.6.new/packaging/daemon/libstoragemgmtd 2022-11-11 16:57:40.126918116 +0100 @@ -15,7 +15,7 @@ NAME=lsmd @@ -48,7 +34,7 @@ Index: libstoragemgmt-1.9.3/packaging/daemon/libstoragemgmtd LOCK=/var/lock/subsys/libstoragemgmtd RETVAL=0 -@@ -27,8 +27,8 @@ if [ "`id -u`" != 0 ] ; then +@@ -27,8 +27,8 @@ fi check_dirs() { @@ -59,11 +45,10 @@ Index: libstoragemgmt-1.9.3/packaging/daemon/libstoragemgmtd } status_lsm() { -Index: libstoragemgmt-1.9.3/packaging/libstoragemgmt.spec -=================================================================== ---- libstoragemgmt-1.9.3.orig/packaging/libstoragemgmt.spec -+++ libstoragemgmt-1.9.3/packaging/libstoragemgmt.spec -@@ -264,7 +264,7 @@ popd +diff -urEbw libstoragemgmt-1.9.6/packaging/libstoragemgmt.spec libstoragemgmt-1.9.6.new/packaging/libstoragemgmt.spec +--- libstoragemgmt-1.9.6/packaging/libstoragemgmt.spec 2022-11-08 16:20:12.000000000 +0100 ++++ libstoragemgmt-1.9.6.new/packaging/libstoragemgmt.spec 2022-11-11 16:58:20.231109009 +0100 +@@ -264,7 +264,7 @@ %pre getent group libstoragemgmt >/dev/null || groupadd -r libstoragemgmt getent passwd libstoragemgmt >/dev/null || \ @@ -72,11 +57,10 @@ Index: libstoragemgmt-1.9.3/packaging/libstoragemgmt.spec -c "daemon account for libstoragemgmt" libstoragemgmt %post -Index: libstoragemgmt-1.9.3/packaging/libstoragemgmt.spec.in -=================================================================== ---- libstoragemgmt-1.9.3.orig/packaging/libstoragemgmt.spec.in -+++ libstoragemgmt-1.9.3/packaging/libstoragemgmt.spec.in -@@ -264,7 +264,7 @@ popd +diff -urEbw libstoragemgmt-1.9.6/packaging/libstoragemgmt.spec.in libstoragemgmt-1.9.6.new/packaging/libstoragemgmt.spec.in +--- libstoragemgmt-1.9.6/packaging/libstoragemgmt.spec.in 2022-04-06 19:55:18.000000000 +0200 ++++ libstoragemgmt-1.9.6.new/packaging/libstoragemgmt.spec.in 2022-11-11 16:58:47.279237761 +0100 +@@ -264,7 +264,7 @@ %pre getent group libstoragemgmt >/dev/null || groupadd -r libstoragemgmt getent passwd libstoragemgmt >/dev/null || \ @@ -85,11 +69,10 @@ Index: libstoragemgmt-1.9.3/packaging/libstoragemgmt.spec.in -c "daemon account for libstoragemgmt" libstoragemgmt %post -Index: libstoragemgmt-1.9.3/python_binding/lsm/_common.py -=================================================================== ---- libstoragemgmt-1.9.3.orig/python_binding/lsm/_common.py -+++ libstoragemgmt-1.9.3/python_binding/lsm/_common.py -@@ -151,7 +151,7 @@ class Proxy(object): +diff -urEbw libstoragemgmt-1.9.6/python_binding/lsm/_common.py libstoragemgmt-1.9.6.new/python_binding/lsm/_common.py +--- libstoragemgmt-1.9.6/python_binding/lsm/_common.py 2022-04-06 19:55:18.000000000 +0200 ++++ libstoragemgmt-1.9.6.new/python_binding/lsm/_common.py 2022-11-11 16:59:14.139365618 +0100 +@@ -151,7 +151,7 @@ # variable in client and specified on the command line for the daemon