Update to openwsman-2.3.6

.gitignore

@@ -1,2 +1,7 @@
 openwsman-2.2.3.tar.bz2
 /openwsman-2.2.4.tar.bz2
+/openwsman-2.2.5.tar.bz2
+/openwsman-2.2.7.tar.bz2
+/openwsman-2.3.0.tar.bz2
+/openwsman-2.3.5.tar.bz2
+/openwsman-2.3.6.tar.bz2

openwsman-2.2.3-initscript.patch

@@ -1,11 +1,11 @@
-diff -up openwsman-2.2.4/etc/init/openwsmand.sh.cmake.orig openwsman-2.2.4/etc/init/openwsmand.sh.cmake
---- openwsman-2.2.4/etc/init/openwsmand.sh.cmake.orig	2010-10-06 11:10:10.000000000 +0200
-+++ openwsman-2.2.4/etc/init/openwsmand.sh.cmake	2010-11-11 16:52:19.494661859 +0100
+diff -up openwsman-2.2.7/etc/init/openwsmand.sh.cmake.orig openwsman-2.2.7/etc/init/openwsmand.sh.cmake
+--- openwsman-2.2.7/etc/init/openwsmand.sh.cmake.orig	2012-01-11 13:38:58.789392556 +0100
++++ openwsman-2.2.7/etc/init/openwsmand.sh.cmake	2012-01-11 13:44:32.383593944 +0100
 @@ -4,28 +4,28 @@
  # Provides: openwsmand
  # Required-Start: $remote_fs
  # Required-Stop: $network
--# Default-Start: 2 3 4 5
+-# Default-Start: 2 3 5
 -# Default-Stop: 0 1 6 
 +# Default-Start:
 +# Default-Stop:
@@ -57,16 +57,16 @@ diff -up openwsman-2.2.4/etc/init/openwsmand.sh.cmake.orig openwsman-2.2.4/etc/i
          echo "             running"
        else
          echo "             stopped"
-+        if [ -e $PIDFILE ]; then
-+          echo "             stopped, but pid file exists"
-+          exit 1
-+        elif [ -e $lockfile ]; then
-+          echo "             stopped, but lock file exists"
-+          exit 2
-+        else
-+          echo "             stopped"
-+          exit 3
-+        fi
++	if [ -e $PIDFILE ]; then
++	  echo "             stopped, but pid file exists"
++	  exit 1
++	elif [ -e $lockfile ]; then
++	  echo "             stopped, but lock file exists"
++	  exit 2
++	else
++	  echo "             stopped"
++	  exit 3
++	fi
        fi
      fi
      ;;

openwsman-2.2.7-disable-ruby.patch

@@ -0,0 +1,12 @@
+diff -up openwsman-2.3.0/CMakeLists.txt.orig openwsman-2.3.0/CMakeLists.txt
+--- openwsman-2.3.0/CMakeLists.txt.orig	2012-03-27 11:51:51.262460385 +0200
++++ openwsman-2.3.0/CMakeLists.txt	2012-03-27 11:52:13.732573549 +0200
+@@ -105,7 +105,7 @@ SET( BUILD_JAVA_EXPLICIT ${BUILD_JAVA})
+ OPTION( BUILD_LIBCIM "Build CIM plugin" YES )
+ OPTION( BUILD_EXAMPLES "Build examples" YES )
+ OPTION( BUILD_PYTHON "Build Python bindings" YES )
+-OPTION( BUILD_RUBY "Build Ruby bindings" YES )
++OPTION( BUILD_RUBY "Build Ruby bindings" NO )
+ IF( BUILD_RUBY )
+ OPTION( BUILD_RUBY_GEM "Build Ruby GEM" YES )
+ ENDIF( BUILD_RUBY )

openwsman-2.2.7-libssl.patch

@@ -0,0 +1,12 @@
+diff -up openwsman-2.2.7/src/server/shttpd/compat_unix.h.orig openwsman-2.2.7/src/server/shttpd/compat_unix.h
+--- openwsman-2.2.7/src/server/shttpd/compat_unix.h.orig	2012-02-09 13:04:47.528527681 +0100
++++ openwsman-2.2.7/src/server/shttpd/compat_unix.h	2012-02-09 13:05:31.582568867 +0100
+@@ -21,7 +21,7 @@
+ #include <dirent.h>
+ #include <dlfcn.h>
+ #ifndef SSL_LIB
+-#define	SSL_LIB				"libssl.so"
++#define	SSL_LIB				"libssl.so.10"
+ #endif
+ #define	DIRSEP				'/'
+ #define	IS_DIRSEP_CHAR(c)		((c) == '/')

openwsman.spec

@@ -3,18 +3,19 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %endif
-%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
-%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
+%{!?ruby_sitelib: %global ruby_sitelib %(ruby -r rbconfig -e 'vd = RbConfig::CONFIG["vendorlibdir"]; print(vd ? vd : RbConfig::CONFIG["sitelibdir"])')}
+%{!?ruby_sitearch: %global ruby_sitearch %(ruby -r rbconfig -e 'vad = RbConfig::CONFIG["vendorarchdir"]; print(vad ? vad : RbConfig::CONFIG["sitearchdir"])')}
 
 Name:           openwsman
 BuildRequires:  swig
 BuildRequires:  libcurl-devel libxml2-devel pam-devel sblim-sfcc-devel
-BuildRequires:  python python-devel ruby ruby-devel ruby-rdoc perl
+BuildRequires:  python python-devel ruby ruby-devel rubygem(rdoc) perl
+BuildRequires:  python python-devel perl
 BuildRequires:  perl-devel pkgconfig openssl-devel
 BuildRequires:  cmake
-Requires:       net-tools
-Version:        2.2.4
-Release:        3%{?dist}
+BuildRequires:  systemd-units
+Version:        2.3.6
+Release:        1%{?dist}
 Url:            http://www.openwsman.org/
 License:        BSD
 Group:          Applications/System
@@ -22,9 +23,12 @@ Summary:        Open source Implementation of WS-Management
 Source:         http://downloads.sourceforge.net/project/openwsman/%{name}/%{version}/%{name}-%{version}.tar.bz2
 # help2man generated manpage for openwsmand binary
 Source1:        openwsmand.8.gz
+# service file for systemd
+Source2:        openwsmand.service
+# script for testing presence of the certificates in ExecStartPre
+Source3:        owsmantestcert.sh
 Patch0:         %{name}-sitelibdir.patch
-Patch1:         openwsman-2.2.3-initscript.patch
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXX)
+Patch1:         openwsman-2.2.7-libssl.patch
 
 %description
 Openwsman is a project intended to provide an open-source
@@ -111,7 +115,7 @@ API.
 License:        BSD
 Group:          Development/Libraries
 Requires:       ruby
-Requires:       ruby(abi) = 1.8
+Requires:       ruby(abi) = 1.9.1
 Summary:        Ruby bindings for openwsman client API
 
 %description ruby
@@ -136,7 +140,7 @@ This package provides Perl bindings to access the openwsman client API.
 %setup -q
 # don't make backup of file patched by patch0, it'll be installed...
 %patch0 -p1
-%patch1 -p1 -b .initscript
+%patch1 -p1 -b .libssl
 
 %build
 # Removing executable permissions on .c and .h files to fix rpmlint warnings. 
@@ -157,12 +161,12 @@ cmake \
   -DCMAKE_SKIP_RPATH=1 \
   -DPACKAGE_ARCHITECTURE=`uname -m` \
   -DLIB=%{_lib} \
+  -DBUILD_RUBY_GEM=no \
    ..
 
 make CFLAGS="-DSSL_LIB='\"$SSL_LIB\"'"
 
 %install
-rm -rf %{buildroot}
 cd build
 make DESTDIR=%{buildroot} install
 cd ..
@@ -170,14 +174,15 @@ rm -f %{buildroot}/%{_libdir}/*.la
 rm -f %{buildroot}/%{_libdir}/openwsman/plugins/*.la
 rm -f %{buildroot}/%{_libdir}/openwsman/authenticators/*.la
 [ -d %{buildroot}/%{ruby_sitelib} ] && rm -f %{buildroot}/%{ruby_sitelib}/openwsmanplugin.rb
+[ -d %{buildroot}/%{ruby_sitelib} ] && rm -f %{buildroot}/%{ruby_sitelib}/openwsman.rb
 [ -d %{buildroot/}%{ruby_vendorlib} ] && rm -f %{buildroot}/%{ruby_vendorlib}/openwsmanplugin.rb
 mkdir -p %{buildroot}%{_sysconfdir}/init.d
 install -m 644 etc/openwsman.conf %{buildroot}/%{_sysconfdir}/openwsman
 install -m 644 etc/openwsman_client.conf %{buildroot}/%{_sysconfdir}/openwsman
-mkdir -p %{buildroot}/%{_sysconfdir}/rc.d/init.d
-install -m 755 build/etc/init/openwsmand.sh %{buildroot}/%{_sysconfdir}/rc.d/init.d/openwsmand
+mkdir -p %{buildroot}/%{_unitdir}
+install -p -m 644 %{SOURCE2} %{buildroot}/%{_unitdir}/openwsmand.service
 install -m 644 etc/ssleay.cnf %{buildroot}/%{_sysconfdir}/openwsman
-ln -sf %{_sysconfdir}/rc.d/init.d/openwsmand %{buildroot}/%{_sbindir}/rcopenwsmand
+install -p -m 755 %{SOURCE3} %{buildroot}/%{_sysconfdir}/openwsman
 # install manpage
 mkdir -p %{buildroot}/%{_mandir}/man8/
 cp %SOURCE1 %{buildroot}/%{_mandir}/man8/
@@ -186,29 +191,20 @@ 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
 
-%clean
-rm -rf %{buildroot}
-
 %post -n libwsman1 -p /sbin/ldconfig
 
 %postun -n libwsman1 -p /sbin/ldconfig
 
 %post server
 /sbin/ldconfig
-/sbin/chkconfig --add openwsmand
+%systemd_post openwsmand.service
 
 %preun server
-if [ $1 = 0 ] ; then
-       /sbin/service %{name}d stop >/dev/null 2>&1
-       /sbin/chkconfig --del openwsmand
-fi
+%systemd_preun openwsmand.service
 
 %postun server
 rm -f /var/log/wsmand.log
-
-if [ "$1" -ge "1" ] ; then
-     /sbin/service %{name}d condrestart >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart openwsmand.service
 /sbin/ldconfig
 
 %post client -p /sbin/ldconfig
@@ -216,50 +212,45 @@ fi
 %postun client -p /sbin/ldconfig
 
 %files -n libwsman1
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README TODO
+%doc AUTHORS COPYING ChangeLog README.md TODO
 %{_libdir}/libwsman.so.*
 %{_libdir}/libwsman_client.so.*
 %{_libdir}/libwsman_curl_client_transport.so.*
 
 %files -n libwsman-devel
-%defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/pkgconfig/*
 %{_libdir}/*.so
-%doc AUTHORS COPYING ChangeLog README
+%doc AUTHORS COPYING ChangeLog README.md
 
 %files python
-%defattr(-,root,root,-)
 %{python_sitearch}/*.so
 %{python_sitearch}/*.py
 %{python_sitearch}/*.pyc
 %{python_sitearch}/*.pyo
-%doc AUTHORS COPYING ChangeLog README
+%doc AUTHORS COPYING ChangeLog README.md
 
 %files ruby
-%defattr(-,root,root,-)
-%{ruby_sitearch}/openwsman.so
+%{ruby_sitearch}/_openwsman.so
 %dir %{ruby_sitelib}/openwsman
 %{ruby_sitelib}/openwsman/*.rb
-%doc AUTHORS COPYING ChangeLog README
+%doc AUTHORS COPYING ChangeLog README.md
 
 %files perl
-%defattr(-,root,root,-)
 %{perl_vendorarch}/openwsman.so
 %{perl_vendorlib}/openwsman.pm
-%doc AUTHORS COPYING ChangeLog README
+%doc AUTHORS COPYING ChangeLog README.md
 
 %files server
 # Don't remove *.so files from the server package.
 # the server fails to start without these files.
-%defattr(-,root,root,-)
 %dir %{_sysconfdir}/openwsman
 %config(noreplace) %{_sysconfdir}/openwsman/openwsman.conf
 %config(noreplace) %{_sysconfdir}/openwsman/ssleay.cnf
 %attr(0755,root,root) %{_sysconfdir}/openwsman/owsmangencert.sh
+%attr(0755,root,root) %{_sysconfdir}/openwsman/owsmantestcert.sh
 %config(noreplace) %{_sysconfdir}/pam.d/openwsman
-%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/openwsmand
+%{_unitdir}/openwsmand.service
 %dir %{_libdir}/openwsman
 %dir %{_libdir}/openwsman/authenticators
 %{_libdir}/openwsman/authenticators/*.so
@@ -268,19 +259,68 @@ fi
 %{_libdir}/openwsman/plugins/*.so
 %{_libdir}/openwsman/plugins/*.so.*
 %{_sbindir}/openwsmand
-%{_sbindir}/rcopenwsmand
 %{_libdir}/libwsman_server.so.*
 %{_mandir}/man8/*
-%doc AUTHORS COPYING ChangeLog README
+%doc AUTHORS COPYING ChangeLog README.md
 
 %files client
-%defattr(-,root,root,-)
 %{_libdir}/libwsman_clientpp.so.*
 %config(noreplace) %{_sysconfdir}/openwsman/openwsman_client.conf
-%doc AUTHORS COPYING ChangeLog README
+%doc AUTHORS COPYING ChangeLog README.md
 
 
 %changelog
+* Thu Nov 08 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.3.6-1
+- Update to openwsman-2.3.6
+
+* Mon Sep 17 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.3.5-1
+- Update to openwsman-2.3.5
+- Enable ruby subpackage again
+
+* Tue Aug 28 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.3.0-7
+- Fix issues found by fedora-review utility in the spec file
+
+* Thu Aug 23 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.3.0-6
+- Use new systemd-rpm macros
+  Resolves: #850405
+
+* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sun Jun 10 2012 Petr Pisar <ppisar@redhat.com> - 2.3.0-4
+- Perl 5.16 rebuild
+
+* Mon May 28 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.3.0-3
+- Rename service file
+
+* Wed May 23 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.3.0-2
+- Add systemd support
+
+* Tue Mar 27 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.3.0-1
+- Update to openwsman-2.3.0
+
+* Thu Feb 09 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.7-4
+- Fix libssl loading
+
+* Thu Feb 09 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.7-3
+- Temporarily disable ruby subpackage
+
+* Thu Jan 26 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.7-2
+- Remove unnecessary net-tools requirement
+  Resolves: #784787
+
+* Wed Jan 11 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.7-1
+- Update to openwsman-2.2.7
+
+* Mon Jun 20 2011 Marcela Mašláňová <mmaslano@redhat.com> - 2.2.5-3
+- Perl mass rebuild
+
+* Fri Jun 10 2011 Marcela Mašláňová <mmaslano@redhat.com> - 2.2.5-2
+- Perl 5.14 mass rebuild
+
+* Wed Mar 23 2011 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.5-1
+- Update to openwsman-2.2.5
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 

openwsmand.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=Openwsman WS-Management Service
+After=syslog.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/openwsmand
+ExecStartPre=/etc/openwsman/owsmantestcert.sh
+PIDFile=/var/run/wsmand.pid
+
+[Install]
+WantedBy=multi-user.target

owsmantestcert.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+if [ ! -f "/etc/openwsman/serverkey.pem" ]; then
+  if [ -f "/etc/ssl/servercerts/servercert.pem" \
+       -a -f "/etc/ssl/servercerts/serverkey.pem" ]; then
+    echo "Using common server certificate /etc/ssl/servercerts/servercert.pem"
+    ln -s /etc/ssl/servercerts/server{cert,key}.pem /etc/openwsman
+    exit 0
+  else
+    echo "FAILED: Starting openwsman server"
+    echo "There is no ssl server key available for openwsman server to use."
+    echo -e "Please generate one with the following script and start the openwsman service again:\n"
+    echo "##################################"
+    echo "/etc/openwsman/owsmangencert.sh"
+    echo "================================="
+    
+    echo "NOTE: The script uses /dev/random device for generating some random bits while generating the server key."
+    echo "      If this takes too long, you can replace the value of \"RANDFILE\" in /etc/openwsman/ssleay.cnf with /dev/urandom. Please understand the implications of replacing the RNADFILE."
+    exit 1
+  fi
+fi

sources

@@ -1 +1 @@
-e7e9da7a8c55d28c08151940d7ac61bd  openwsman-2.2.4.tar.bz2
+54eb12ce88c7750b240d6185df2d6716  openwsman-2.3.6.tar.bz2