!13 [sync] PR-12: fix failed to parse pid from pid-file

From: @openeuler-sync-bot Reviewed-by: @ruebb Signed-off-by: @ruebb
fix failed to parse pid from pid-file
2022-03-24 03:19:33 +00:00 · 2022-03-22 09:03:35 +08:00 · 2020-08-21 14:19:48 +08:00 · 2020-08-21 10:38:19 +08:00 · 2020-04-27 11:37:41 +08:00 · 2020-04-27 03:24:20 +00:00
3 changed files with 317 additions and 70 deletions
--- a/0001-Make-python-version-explitic-DBUILD_PYTHON3-or-DBUIL.patch
+++ b/0001-Make-python-version-explitic-DBUILD_PYTHON3-or-DBUIL.patch
@ -0,0 +1,273 @@
+From d01533ab1750d8b43be7829edef28ecb006d57cf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
+Date: Mon, 4 Dec 2017 14:33:17 +0100
+Subject: [PATCH] Make python version explitic: -DBUILD_PYTHON3 or
+ -DBUILD_PYTHON
+
+---
+ CMakeLists.txt                       | 13 +++++--
+ bindings/CMakeLists.txt              |  4 +--
+ bindings/python/CMakeLists.txt       |  6 +++-
+ bindings/python/tests/CMakeLists.txt | 68 ++++++++++++++++++------------------
+ bindings/python/tests/run            |  6 ++--
+ package/openwsman.spec.in            | 29 +++++++++++++++
+ 6 files changed, 83 insertions(+), 43 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8509fc7..8f7b955 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -101,6 +101,7 @@ ENDMACRO(NO_HEADERS_WARNING)
+ # the headers: if it was explicitly set then fail, otherwise
+ # just give a warning message
+ SET( BUILD_PYTHON_EXPLICIT ${BUILD_PYTHON})
+SET( BUILD_PYTHON3_EXPLICIT ${BUILD_PYTHON3})
+ SET( BUILD_RUBY_EXPLICIT ${BUILD_RUBY})
+ SET( BUILD_PERL_EXPLICIT ${BUILD_PERL})
+ SET( BUILD_JAVA_EXPLICIT ${BUILD_JAVA})
+@@ -111,7 +112,13 @@ SET( BUILD_SWIG_PLUGIN_EXPLICIT ${BUILD_SWIG_PLUGIN})
+ OPTION( BUILD_LIBCIM "Build CIM plugin" YES )
+ OPTION( BUILD_EXAMPLES "Build examples" YES )
+ OPTION( BUILD_BINDINGS "Build client bindings and swig server plugin" YES )
+-OPTION( BUILD_PYTHON "Build Python bindings" YES )
+OPTION( BUILD_PYTHON3 "Build Python3 bindings" YES )
+OPTION( BUILD_PYTHON "Build Python2 bindings" YES )
+IF (BUILD_PYTHON3)
+IF (BUILD_PYTHON)
+MESSAGE(FATAL_ERROR "Can only build for Python2 or Python3, but not both")
+ENDIF (BUILD_PYTHON)
+ENDIF (BUILD_PYTHON3)
+ OPTION( BUILD_RUBY "Build Ruby bindings" YES )
+ IF( BUILD_RUBY )
+ OPTION( BUILD_RUBY_GEM "Build Ruby GEM" YES )
+@@ -231,9 +238,9 @@ IF ( NOT SWIG_EXECUTABLE )
+     MESSAGE( FATAL "Cannot build SWIG server plugin" )
+   ENDIF (BUILD_SWIG_PLUGIN_EXPLICIT)
+   SET( BUILD_SWIG_PLUGIN NO )
+-  IF( BUILD_PYTHON_EXPLICIT OR BUILD_RUBY_EXPLICIT OR BUILD_PERL_EXPLICIT OR BUILD_JAVA_EXPLICIT)
+  IF( BUILD_PYTHON3_EXPLICIT OR BUILD_PYTHON_EXPLICIT OR BUILD_RUBY_EXPLICIT OR BUILD_PERL_EXPLICIT OR BUILD_JAVA_EXPLICIT)
+     MESSAGE( ERROR "Cannot build client bindings" )
+-  ENDIF( BUILD_PYTHON_EXPLICIT OR BUILD_RUBY_EXPLICIT OR BUILD_PERL_EXPLICIT OR BUILD_JAVA_EXPLICIT)
+  ENDIF( BUILD_PYTHON3_EXPLICIT OR BUILD_PYTHON_EXPLICIT OR BUILD_RUBY_EXPLICIT OR BUILD_PERL_EXPLICIT OR BUILD_JAVA_EXPLICIT)
+ ELSE ( NOT SWIG_EXECUTABLE )
+   MESSAGE( STATUS "SWIG ${SWIG_VERSION} found at ${SWIG_EXECUTABLE}" )
+   ADD_SUBDIRECTORY(bindings)
+diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt
+index 7886d98..66ff472 100644
+--- a/bindings/CMakeLists.txt
+++ b/bindings/CMakeLists.txt
+@@ -8,9 +8,9 @@ SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/openwsman.i" )
+ 
+ include_directories(${CMAKE_BINARY_DIR})
+ 
+-IF( BUILD_PYTHON )
+IF( BUILD_PYTHON3 OR BUILD_PYTHON )
+ add_subdirectory(python)
+-ENDIF( BUILD_PYTHON )
+ENDIF( BUILD_PYTHON3 OR BUILD_PYTHON )
+ 
+ IF( BUILD_RUBY )
+ add_subdirectory(ruby)
+diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
+index 305629b..35ae04c 100644
+--- a/bindings/python/CMakeLists.txt
+++ b/bindings/python/CMakeLists.txt
+@@ -12,7 +12,11 @@ enable_testing()
+ 
+ add_subdirectory(tests)
+ 
+-set(Python_ADDITIONAL_VERSIONS 3.6 3.5 2.7 2.6)
+IF( BUILD_PYTHON3 )
+set(Python_ADDITIONAL_VERSIONS 3.6 3.5)
+ELSE( BUILD_PYTHON3 )
+set(Python_ADDITIONAL_VERSIONS 2.7 2.6)
+ENDIF( BUILD_PYTHON3 )
+ FIND_PACKAGE(PythonLibs)
+ IF (PYTHON_LIBRARY)
+   FIND_PACKAGE(PythonInterp REQUIRED)
+diff --git a/bindings/python/tests/CMakeLists.txt b/bindings/python/tests/CMakeLists.txt
+index 23711b4..92686ec 100644
+--- a/bindings/python/tests/CMakeLists.txt
+++ b/bindings/python/tests/CMakeLists.txt
+@@ -4,55 +4,55 @@
+ ENABLE_TESTING()
+ 
+ 	# loading wsman
+-ADD_TEST(bindings_python_loading      ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} loading.py )
+ADD_TEST(bindings_python_loading      ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} loading.py )
+ 
+ 	# predefined stuff
+-# ADD_TEST(bindings_python_constants  ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} constants.py )
+# ADD_TEST(bindings_python_constants  ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} constants.py )
+ 
+         # Xml bindings
+-# ADD_TEST(bindings_python_xmldoc     ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} xmldoc.py )
+-# ADD_TEST(bindings_python_xmlnode    ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} xmlnode.py )
+-# ADD_TEST(bindings_python_xmlattr    ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} xmlattr.py )
+# ADD_TEST(bindings_python_xmldoc     ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} xmldoc.py )
+# ADD_TEST(bindings_python_xmlnode    ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} xmlnode.py )
+# ADD_TEST(bindings_python_xmlattr    ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} xmlattr.py )
+ 	
+ 	# Client
+-# ADD_TEST(bindings_python_client     ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} client.py )
+-# ADD_TEST(bindings_python_client_bad ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} client_bad.py )
+# ADD_TEST(bindings_python_client     ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} client.py )
+# ADD_TEST(bindings_python_client_bad ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} client_bad.py )
+ 
+ 	# Transport
+-# ADD_TEST(bindings_python_transport  ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} transport.py )
+# ADD_TEST(bindings_python_transport  ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} transport.py )
+ 	
+ 	# ClientOptions
+-# ADD_TEST(bindings_python_options    ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} clientoptions.py )
+-# ADD_TEST(bindings_python_debug      ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} debug.py )
+# ADD_TEST(bindings_python_options    ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} clientoptions.py )
+# ADD_TEST(bindings_python_debug      ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} debug.py )
+         # Identify
+-ADD_TEST(bindings_python_identify     ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} identify.py )
+ADD_TEST(bindings_python_identify     ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} identify.py )
+ 
+ 	# data types
+-# ADD_TEST(bindings_python_fault      ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} fault.py )
+# ADD_TEST(bindings_python_fault      ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} fault.py )
+ 
+-ADD_TEST(bindings_python_epr          ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} epr.py )
+ADD_TEST(bindings_python_epr          ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} epr.py )
+ 
+         # needs a CIMOM
+-# ADD_TEST(bindings_python_computer_system      ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} cim_computer_system.py )
+-# ADD_TEST(bindings_python_operating_system     ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} cim_operating_system.py )
+-# ADD_TEST(bindings_python_cim_process          ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} cim_process.py )
+-# ADD_TEST(bindings_python_system_configuration ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} cim_system_configuration.py )
+-# ADD_TEST(bindings_python_create               ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} create.py )
+-# ADD_TEST(bindings_python_each_child           ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} each_child.py )
+-ADD_TEST(bindings_python_enumerate            ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} enumerate.py )
+-ADD_TEST(bindings_python_add_selector         ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} add_selector.py )
+-ADD_TEST(bindings_python_add_selector2        ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} add_selector2.py )
+-# ADD_TEST(bindings_python_get                  ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} get.py )
+-# ADD_TEST(bindings_python_identify             ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} identify.py )
+-# ADD_TEST(bindings_python_invoke               ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} invoke.py )
+-# ADD_TEST(bindings_python_notepad              ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} notepad.py )
+-# ADD_TEST(bindings_python_nsconsts             ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} nsconsts.py )
+-# ADD_TEST(bindings_python_processes            ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} processes.py )
+-# ADD_TEST(bindings_python_pull                 ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} pull.py )
+-# ADD_TEST(bindings_python_put                  ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} put.py )
+-ADD_TEST(bindings_python_release              ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} release.py )
+# ADD_TEST(bindings_python_computer_system      ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} cim_computer_system.py )
+# ADD_TEST(bindings_python_operating_system     ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} cim_operating_system.py )
+# ADD_TEST(bindings_python_cim_process          ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} cim_process.py )
+# ADD_TEST(bindings_python_system_configuration ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} cim_system_configuration.py )
+# ADD_TEST(bindings_python_create               ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} create.py )
+# ADD_TEST(bindings_python_each_child           ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} each_child.py )
+ADD_TEST(bindings_python_enumerate            ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} enumerate.py )
+ADD_TEST(bindings_python_add_selector         ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} add_selector.py )
+ADD_TEST(bindings_python_add_selector2        ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} add_selector2.py )
+# ADD_TEST(bindings_python_get                  ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} get.py )
+# ADD_TEST(bindings_python_identify             ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} identify.py )
+# ADD_TEST(bindings_python_invoke               ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} invoke.py )
+# ADD_TEST(bindings_python_notepad              ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} notepad.py )
+# ADD_TEST(bindings_python_nsconsts             ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} nsconsts.py )
+# ADD_TEST(bindings_python_processes            ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} processes.py )
+# ADD_TEST(bindings_python_pull                 ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} pull.py )
+# ADD_TEST(bindings_python_put                  ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} put.py )
+ADD_TEST(bindings_python_release              ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} release.py )
+ 
+ 	# needs WinRM system
+-# ADD_TEST(bindings_python_win32_operatingsystem ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} win32_operatingsystem.py )
+-# ADD_TEST(bindings_python_win32_process         ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} win32_process.py )
+-# ADD_TEST(bindings_python_win32_services        ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} win32_services.py )
+# ADD_TEST(bindings_python_win32_operatingsystem ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} win32_operatingsystem.py )
+# ADD_TEST(bindings_python_win32_process         ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} win32_process.py )
+# ADD_TEST(bindings_python_win32_services        ${CMAKE_CURRENT_SOURCE_DIR}/run ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} win32_services.py )
+diff --git a/bindings/python/tests/run b/bindings/python/tests/run
+index 5ddc88d..9ec76a7 100755
+--- a/bindings/python/tests/run
+++ b/bindings/python/tests/run
+@@ -2,8 +2,8 @@
+ #
+ # run script for Python tests
+ #
+-# Usage: run <dir> <file>
+# Usage: run <python> <dir> <file>
+ #
+-(cd $1;
+(cd $2;
+  f=`dirname $0`;
+- LD_LIBRARY_PATH=$f/../../../build/src/lib python $2)
+ LD_LIBRARY_PATH=$f/../../../build/src/lib $1 $3)
+diff --git a/package/openwsman.spec.in b/package/openwsman.spec.in
+index 601294a..cbf1ba6 100644
+--- a/package/openwsman.spec.in
+++ b/package/openwsman.spec.in
+@@ -31,7 +31,11 @@ BuildRequires:  sblim-sfcc-devel
+ BuildRequires:  swig >= 2.0.5
+ 
+ BuildRequires:  perl
+%if 0%{?have_python3}
+BuildRequires:  python3-devel
+%else
+ BuildRequires:  python-devel
+%endif
+ 
+ %if 0%{?rhel_version} > 0
+ BuildRequires:  -vim
+@@ -214,6 +218,20 @@ This package provides a Openwsman server plugin to write a
+ WS-Management resource handler in Ruby
+ 
+ 
+%if 0%{?have_python3}
+%package python3
+Summary:        Python3 bindings for openwsman client API
+Group:          Development/Libraries/Python
+%{!?python3_sitelib: %global python3_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python3_sitearch: %global python3_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?py_requires: %define py_requires Requires: python3}
+%{py_requires}
+
+%description python3
+This package provides Python3 bindings to access the openwsman client
+API.
+
+%else
+ %package python
+ Summary:        Python bindings for openwsman client API
+ Group:          Development/Libraries/Python
+@@ -226,6 +244,7 @@ Group:          Development/Libraries/Python
+ This package provides Python bindings to access the openwsman client
+ API.
+ 
+%endif
+ 
+ %package ruby
+ Requires:       ruby
+@@ -344,6 +363,9 @@ cmake \
+ %if 0%{?suse_version} == 1010
+   -DBUILD_JAVA=FALSE \
+ %endif
+%if 0%{?have_python3}
+  -DBUILD_PYTHON=FALSE \
+%endif
+   -DCMAKE_VERBOSE_MAKEFILE=TRUE \
+   -DCMAKE_BUILD_TYPE=Release \
+   -DCMAKE_C_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS -fno-strict-aliasing" \
+@@ -458,10 +480,17 @@ rm -f /var/log/wsmand.log
+ %exclude %{_includedir}/openwsman/cpp/*.h
+ %exclude %{_libdir}/libwsman_clientpp.so
+ 
+%if 0%{?have_python3}
+%files python3
+%defattr(-,root,root)
+%{python3_sitearch}/*.so
+%{python3_sitearch}/*.py*
+%else
+ %files python
+ %defattr(-,root,root)
+ %{python_sitearch}/*.so
+ %{python_sitearch}/*.py*
+%endif
+ 
+ %files ruby
+ %defattr(-,root,root)
+-- 
+1.8.3.1
+
--- a/openwsman.spec
+++ b/openwsman.spec
@ -1,30 +1,27 @@
-%bcond_with pam
-
 # RubyGems's macros expect gem_name to exist.
 %global		gem_name %{name}

-Name:		openwsman
-Version:	2.6.5
-Release:	10
-Summary:	Opensource Implementation of WS-Management
-License:	BSD
-URL:		http://www.openwsman.org/
-Source0:	https://github.com/Openwsman/openwsman/archive/v%{version}.tar.gz
-Source1:	openwsmand.8.gz
-Source2:	openwsmand.service
-Source3:	owsmantestcert.sh
-%if %{with pam}
-Patch1:		openwsman-2.4.0-pamsetup.patch
-%endif
-Patch2:		openwsman-2.4.12-ruby-binding-build.patch
-Patch3:		openwsman-2.6.2-openssl-1.1-fix.patch
-Patch4:		openwsman-2.6.5-fix-set-cipher-list-retval-check.patch
-Patch5:		openwsman-2.6.5-libcurl-error-codes-update.patch
-Patch6000:     CVE-2019-3833.patch
+Name:       openwsman
+Version:    2.6.5
+Release:    15
+Summary:    Opensource Implementation of WS-Management
+License:    BSD
+URL:        http://www.openwsman.org/
+Source0:    https://github.com/Openwsman/openwsman/archive/v%{version}.tar.gz
+Source1:    openwsmand.8.gz
+Source2:    openwsmand.service
+Source3:    owsmantestcert.sh
+Patch0000:  openwsman-2.4.0-pamsetup.patch
+Patch0001:  openwsman-2.4.12-ruby-binding-build.patch
+Patch0002:  openwsman-2.6.2-openssl-1.1-fix.patch
+Patch0003:  openwsman-2.6.5-fix-set-cipher-list-retval-check.patch
+Patch0004:  openwsman-2.6.5-libcurl-error-codes-update.patch
+Patch6000:  CVE-2019-3833.patch
+Patch6001:  0001-Make-python-version-explitic-DBUILD_PYTHON3-or-DBUIL.patch

 BuildRequires:	swig libcurl-devel libxml2-devel pam-devel sblim-sfcc-devel python3
 BuildRequires:	python3-devel ruby ruby-devel rubygems-devel perl-interpreter
-BuildRequires:	perl-devel perl-generators pkgconfig openssl-devel
+BuildRequires:	perl-devel perl-generators pkgconfig openssl-devel libwsman-devel
 BuildRequires:	cmake systemd-units gcc gcc-c++ python2 python2-devel


@ -50,10 +47,8 @@ Requires:	libwsman1 = %{version}-%{release}
 Requires:	%{name}-server = %{version}-%{release}
 Requires:	%{name}-client = %{version}-%{release}
 Requires:	sblim-sfcc-devel libxml2-devel libcurl-devel
-
-%if %{with pam}
 Requires:	pam-devel
-%endif
+
 %description -n libwsman-devel
 Opensource Implementation of WS-Management stack
 (Development files)
@ -83,8 +78,7 @@ Requires:	libwsman1 = %{version}-%{release}
 %description python3
 This package provides Python3 bindings to access the openwsman client API.

-%if %{with pam}
-%package ruby
+%package -n rubygem-%{gem_name}
 License:	BSD
 Summary:	Ruby bindings for openwsman client API
 Obsoletes:	%{name}-ruby < %{version}-%{release}
@ -92,16 +86,14 @@ Obsoletes:	%{name}-ruby < %{version}-%{release}
 %description -n rubygem-%{gem_name}
 This package provides Ruby bindings to access the openwsman client API.

-%package ruby-docs
+%package -n rubygem-%{gem_name}-doc
 Summary:	HTML documentation for Opendwsman Ruby bindings
 BuildArch:	noarch

-%description ruby-docs
+%description -n rubygem-%{gem_name}-doc
 This package provides HTML documentation for the Openwsman Ruby
 bindings.

-%endif
-
 %package perl
 License:	BSD
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@ -144,32 +136,22 @@ cmake \
 	-DPACKAGE_ARCHITECTURE=`uname -m` \
 	-DLIB=%{_lib} \
 	-DBUILD_JAVA=no \
-%if %{without pam}
-	-DBUILD_RUBY_GEM=no \
-%endif
+	-DBUILD_PYTHON=FALSE\
 	..
-
 make

-%if %{with pam}
 # Make the freshly build openwsman libraries available to build the gem's
 # binary extension.
 export LIBRARY_PATH=%{_builddir}/%{name}-%{version}/build/src/lib
 export CPATH=%{_builddir}/%{name}-%{version}/include/
 export LD_LIBRARY_PATH=%{_builddir}/%{name}-%{version}/build/src/lib/
-%endif

-%if %{with pam}
 %gem_install -n ./bindings/ruby/%{name}-%{version}.gem
-%endif

 %install
 cd build
-
-%if %{with pam}
 # Do not install the ruby extension, we are proviging the rubygem- instead.
 echo -n > bindings/ruby/cmake_install.cmake
-%endif

 %make_install
 cd ..
@ -191,15 +173,12 @@ install -m 644 include/wsman-xml.h %{buildroot}/%{_includedir}/openwsman
 install -m 644 include/wsman-xml-binding.h %{buildroot}/%{_includedir}/openwsman
 install -m 644 include/wsman-dispatcher.h %{buildroot}/%{_includedir}/openwsman

-%if %{with pam}
 install -d %{buildroot}%{gem_dir}
 cp -pa ./build%{gem_dir}/* %{buildroot}%{gem_dir}/
 install -d %{buildroot}%{gem_extdir_mri}
 cp -a ./build%{gem_extdir_mri}/{gem.build_complete,*.so} %{buildroot}%{gem_extdir_mri}/
-%endif

 %post -n libwsman1 -p /sbin/ldconfig
-
 %postun -n libwsman1 -p /sbin/ldconfig

 %post server
@ -224,36 +203,17 @@ rm -f /var/log/wsmand.log
 %{_libdir}/libwsman_client.so.*
 %{_libdir}/libwsman_curl_client_transport.so.*

-%if %{without pam}
-%exclude %{_exec_prefix}/lib/debug/usr/lib64/ruby/vendor_ruby/_openwsman.so*
-%exclude %{_libdir}/ruby/vendor_ruby/_openwsman.so
-%exclude %{_datadir}/ruby/vendor_ruby/%{name}/%{name}.rb
-%exclude %{_datadir}/ruby/vendor_ruby/%{name}/version.rb
-%exclude %{_datadir}/ruby/vendor_ruby/%{name}/xmldoc.rb
-%exclude %{_datadir}/ruby/vendor_ruby/%{name}/xmlnode.rb
-%{_sysconfdir}/pam.d/openwsman
-%{_exec_prefix}/lib/debug%{python2_sitearch}/_pywsman.so*
-%{python2_sitearch}/_pywsman.so
-%{python2_sitearch}/pywsman.py
-%{python2_sitearch}/pywsman.pyc
-%{python2_sitearch}/pywsman.pyo
-
-%endif
-
 %files -n libwsman-devel
 %{_includedir}/*
 %{_libdir}/pkgconfig/*
 %{_libdir}/*.so

 %files python3
-%if %{with pam}
 %{python3_sitearch}/*.so
 %{python3_sitearch}/*.py
 %{python3_sitearch}/__pycache__/*
-%endif

-%if %{with pam}
-%files ruby
+%files -n rubygem-%{gem_name}
 %dir %{gem_instdir}
 %exclude %{gem_instdir}/ext
 %{gem_libdir}
@ -261,12 +221,9 @@ rm -f /var/log/wsmand.log
 %exclude %{gem_cache}
 %{gem_spec}

-%files ruby-docs
+%files -n rubygem-%{gem_name}-doc
 %doc %{gem_docdir}

-%endif
-
-
 %files perl
 %{perl_vendorarch}/openwsman.so
 %{perl_vendorlib}/openwsman.pm
@ -279,9 +236,7 @@ rm -f /var/log/wsmand.log
 %config(noreplace) %{_sysconfdir}/openwsman/ssleay.cnf
 %attr(0755,root,root) %{_sysconfdir}/openwsman/owsmangencert.sh
 %attr(0755,root,root) %{_sysconfdir}/openwsman/owsmantestcert.sh
-%if %{with pam}
 %config(noreplace) %{_sysconfdir}/pam.d/openwsman
-%endif
 %{_unitdir}/openwsmand.service
 %dir %{_libdir}/openwsman
 %dir %{_libdir}/openwsman/authenticators
@ -305,6 +260,24 @@ rm -f /var/log/wsmand.log
 %{_mandir}/man8/*

 %changelog
+* Mon Nov 08 2021 xu_ping <xuping33@huawei.com> - 2.6.5-15
+- fix failed to parse pid from pid-file
+
+* Fri Aug 21 2020 lunankun <lunankun@huawei.com> - 2.6.5-14
+- Type:bugfix
+- Id:NA
+- SUG:NA
+- DESC:release +1 for rebuild
+
+* Mon Apr  27 2020 huanghaitao <huanghaitao8@huawei.com> - 2.6.5-13
+- Restored unpackaged files of python3 subpackage
+
+* Mon Mar  9 2020 likexin <likexin4@huawei.com> - 2.6.5-12
+- rename sub package 
+
+* Fri Feb 28 2020 likexin <likexin4@huawei.com> - 2.6.5-11
+- update release 
+
 * Thu Feb 13 2020 fengbing <fengbing7@huawei.com> - 2.6.5-10
 - Type:N/A
 - ID:N/A
--- a/openwsmand.service
+++ b/openwsmand.service
@ -5,6 +5,7 @@ After=syslog.target
 [Service]
 Type=forking
 ExecStart=/usr/sbin/openwsmand -S
+ExecStartPost=/usr/bin/sleep 0.1
 ExecStartPre=/etc/openwsman/owsmantestcert.sh
 PIDFile=/var/run/wsmand.pid
Author	SHA1	Message	Date
openeuler-ci-bot	eec42365df	!13 [sync] PR-12: fix failed to parse pid from pid-file From: @openeuler-sync-bot Reviewed-by: @ruebb Signed-off-by: @ruebb	2022-03-24 03:19:33 +00:00
cherry530	77212fcb90	fix failed to parse pid from pid-file Signed-off-by: cherry530 <xuping33@huawei.com> (cherry picked from commit 1ded7e358963a6c2b1a2604d814a2bfad9f3d1e1)	2022-03-22 09:03:35 +08:00
openeuler-ci-bot	02f3ebdc7e	!10 openwsman release +1 for rebuild Merge pull request !10 from lunankun/openEuler-20.03-LTS	2020-08-21 14:19:48 +08:00
lunankun	b16de886f4	release +1 for rebuild	2020-08-21 10:38:19 +08:00
openeuler-ci-bot	960fd92512	!7 Restored unpackaged files of python3 subpackage Merge pull request !7 from huanghaitao/openEuler-20.03-LTS	2020-04-27 11:37:41 +08:00
hht8	1d00ca44f5	1	2020-04-27 03:24:20 +00:00
hht8	fd10ab431d	Restored unpackaged files of python3 subpackage	2020-04-27 02:16:30 +00:00
openeuler-ci-bot	3f413fe3d7	!5 rename sub package Merge pull request !5 from lkx690/master	2020-03-12 09:25:32 +08:00
lkx690	88f442fbc1	rename sub package	2020-03-11 19:44:58 +08:00
openeuler-ci-bot	ec3fe9f517	!2 update release Merge pull request !2 from lkx690/master	2020-02-28 16:41:10 +08:00
lkx690	0c59d59058	update release	2020-02-28 16:29:34 +08:00