From 1b828f28a53199d89c437bf9da2f3a862eeeabb3 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 06 2019 10:52:22 +0000 Subject: import libstoragemgmt-1.7.3-3.el7 --- diff --git a/.gitignore b/.gitignore index 8b456f4..ba4c187 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libstoragemgmt-1.6.2.tar.gz +SOURCES/libstoragemgmt-1.7.3.tar.gz diff --git a/.libstoragemgmt.metadata b/.libstoragemgmt.metadata index dd07ce6..f83b1a9 100644 --- a/.libstoragemgmt.metadata +++ b/.libstoragemgmt.metadata @@ -1 +1 @@ -27b43886ace3ad8c98f91d9c4c0c7e544f4c85c5 SOURCES/libstoragemgmt-1.6.2.tar.gz +f4831f2a90f180583a55ac3effc7bde37720ab34 SOURCES/libstoragemgmt-1.7.3.tar.gz diff --git a/SOURCES/BZ_1582458-Python-plugin-runner-don-t-print-socket-error-to-sys.patch b/SOURCES/BZ_1582458-Python-plugin-runner-don-t-print-socket-error-to-sys.patch deleted file mode 100644 index e4f43cd..0000000 --- a/SOURCES/BZ_1582458-Python-plugin-runner-don-t-print-socket-error-to-sys.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 4c87bf280d7d2a0bdb101d1d3d61cd1acfa71c5f Mon Sep 17 00:00:00 2001 -From: Gris Ge -Date: Tue, 26 Jun 2018 01:10:33 +0800 -Subject: [PATCH] Python plugin runner: don't print socket error to syslog. - -Treat socket.error as client went away if plugin is registered. - -Fixing bug: https://bugzilla.redhat.com/show_bug.cgi?id=1582458 - -Signed-off-by: Gris Ge ---- - python_binding/lsm/_pluginrunner.py | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/python_binding/lsm/_pluginrunner.py b/python_binding/lsm/_pluginrunner.py -index 0b52e95a..f2642f2e 100644 ---- a/python_binding/lsm/_pluginrunner.py -+++ b/python_binding/lsm/_pluginrunner.py -@@ -20,6 +20,7 @@ - from lsm import LsmError, error, ErrorNumber - from lsm.lsmcli import cmd_line_wrapper - import six -+import errno - - from lsm._common import SocketEOF as _SocketEOF - from lsm._transport import TransPort -@@ -137,6 +138,12 @@ def run(self): - # occurring. - if need_shutdown: - error('Client went away, exiting plug-in') -+ except socket.error as se: -+ if se.errno == errno.EPIPE: -+ error('Client went away, exiting plug-in') -+ else: -+ error("Unhandled exception in plug-in!\n" + -+ traceback.format_exc()) - except Exception: - error("Unhandled exception in plug-in!\n" + traceback.format_exc()) - --- -2.18.0 - diff --git a/SOURCES/BZ_1623515-FHS_fix.patch b/SOURCES/BZ_1623515-FHS_fix.patch deleted file mode 100644 index 8e56664..0000000 --- a/SOURCES/BZ_1623515-FHS_fix.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -Nur libstoragemgmt-1.6.2_old/tools/Makefile.am libstoragemgmt-1.6.2/tools/Makefile.am ---- libstoragemgmt-1.6.2_old/tools/Makefile.am 2018-05-18 16:10:52.000000000 +0800 -+++ libstoragemgmt-1.6.2/tools/Makefile.am 2018-08-22 01:05:52.760911360 +0800 -@@ -4,5 +4,5 @@ - - EXTRA_DIST=use_cases/find_unused_lun.py - --lsm_bindir=$(bindir)/lsm.d -+lsm_bindir=$(libexecdir)/lsm.d - lsm_bin_DATA=sanity_check/local_sanity_check.py use_cases/find_unused_lun.py diff --git a/SPECS/libstoragemgmt.spec b/SPECS/libstoragemgmt.spec index 84b79c5..08d002c 100644 --- a/SPECS/libstoragemgmt.spec +++ b/SPECS/libstoragemgmt.spec @@ -3,15 +3,13 @@ %endif Name: libstoragemgmt -Version: 1.6.2 -Release: 4%{?dist} +Version: 1.7.3 +Release: 3%{?dist} Summary: Storage array management library Group: System Environment/Libraries License: LGPLv2+ URL: https://github.com/libstorage/libstoragemgmt Source0: https://github.com/libstorage/libstoragemgmt/releases/download/%{version}/%{name}-%{version}.tar.gz -Patch1: BZ_1582458-Python-plugin-runner-don-t-print-socket-error-to-sys.patch -Patch2: BZ_1623515-FHS_fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-python BuildRequires: autoconf automake libtool yajl-devel libxml2-devel check-devel perl @@ -177,6 +175,7 @@ Summary: Files for NFS local filesystem support for %{name} Group: System Environment/Libraries Requires: %{name}-python = %{version}-%{release} Requires: %{name}-nfs-plugin-clibs = %{version}-%{release} +Requires: nfs-utils Requires(post): %{name}-python = %{version}-%{release} Requires(postun): %{name}-python = %{version}-%{release} BuildArch: noarch @@ -220,7 +219,7 @@ without caring which real plugin(s) should be used. ./autogen.sh #Tell the install program to preserve file date/timestamps -%configure --disable-static \ +%configure --disable-static --with-yajl \ %if 0%{?skip_mem_check} == 1 --without-mem-leak-test %endif @@ -406,8 +405,8 @@ fi %{_unitdir}/%{name}.service -%ghost %dir %attr(0755, -, -) /run/lsm/ -%ghost %dir %attr(0755, -, -) /run/lsm/ipc +%ghost %dir %attr(0775, root, libstoragemgmt) /run/lsm/ +%ghost %dir %attr(0775, root, libstoragemgmt) /run/lsm/ipc %attr(0644, root, root) %{_tmpfilesdir}/%{name}.conf @@ -554,6 +553,19 @@ fi %{_mandir}/man1/local_lsmplugin.1* %changelog +* Thu Mar 28 2019 Tony Asleson - 1.7.3-3 +* https://bugzilla.redhat.com/show_bug.cgi?id=1693678 + +* Sat Feb 16 2019 Tony Asleson - 1.7.3-2 +* https://bugzilla.redhat.com/show_bug.cgi?id=1629735 + +* Fri Feb 15 2019 Tony Asleson - 1.7.3-1 +- Add nfs-utils as a dependency +- Upgrade to 1.7.3 + +* Wed Dec 19 2018 Tony Asleson - 1.7.2-1 +- Upgrade to 1.7.2 + * Fri Aug 31 2018 Gris Ge - 1.6.2-4 - Fix FHS problem of find_unused_lun.py and etc, (RHBZ #1623515)