Rename service file

.gitignore

@@ -1,3 +1,4 @@
 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.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.2.7/CMakeLists.txt.ruby openwsman-2.2.7/CMakeLists.txt
+--- openwsman-2.2.7/CMakeLists.txt.ruby	2012-02-09 09:13:51.222066933 +0100
++++ openwsman-2.2.7/CMakeLists.txt	2012-02-09 09:14:01.059119669 +0100
+@@ -103,7 +103,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 )
+ OPTION( BUILD_PERL "Build Perl bindings" YES )
+ OPTION( BUILD_JAVA "Build Java bindings" YES )
+ OPTION( BUILD_CSHARP "Build C# bindings" YES)

openwsman.spec

@@ -9,12 +9,13 @@
 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 ruby-rdoc perl
+BuildRequires:  python python-devel perl
 BuildRequires:  perl-devel pkgconfig openssl-devel
 BuildRequires:  cmake
-Requires:       net-tools
-Version:        2.2.5
-Release:        3%{?dist}
+BuildRequires:  systemd-units
+Version:        2.2.7
+Release:        5%{?dist}
 Url:            http://www.openwsman.org/
 License:        BSD
 Group:          Applications/System
@@ -22,8 +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
+Patch2:         openwsman-2.2.7-disable-ruby.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXX)
 
 %description
@@ -107,15 +112,15 @@ API.
 
 
 
-%package ruby
-License:        BSD
-Group:          Development/Libraries
-Requires:       ruby
-Requires:       ruby(abi) = 1.8
-Summary:        Ruby bindings for openwsman client API
-
-%description ruby
-This package provides Ruby bindings to access the openwsman client API.
+#%package ruby
+#License:        BSD
+#Group:          Development/Libraries
+#Requires:       ruby
+#Requires:       ruby(abi) = 1.9.1
+#Summary:        Ruby bindings for openwsman client API
+#
+#%description ruby
+#This package provides Ruby bindings to access the openwsman client API.
 
 
 
@@ -136,7 +141,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
+%patch2 -p1
 
 %build
 # Removing executable permissions on .c and .h files to fix rpmlint warnings. 
@@ -170,14 +175,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 $RPM_BUILD_ROOT%{_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/
@@ -195,19 +201,23 @@ rm -rf %{buildroot}
 
 %post server
 /sbin/ldconfig
-/sbin/chkconfig --add openwsmand
+if [ $1 -eq 1 ] ; then
+  # Initial installation 
+  /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
 
 %preun server
 if [ $1 = 0 ] ; then
-       /sbin/service %{name}d stop >/dev/null 2>&1
-       /sbin/chkconfig --del openwsmand
+       /bin/systemctl --no-reload disable openwsmand.service > /dev/null 2>&1 || :
+       /bin/systemctl stop openwsmand.service > /dev/null 2>&1 || :
 fi
 
 %postun server
 rm -f /var/log/wsmand.log
 
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
 if [ "$1" -ge "1" ] ; then
-     /sbin/service %{name}d condrestart >/dev/null 2>&1 || :
+     /bin/systemctl try-restart openwsmand.service >/dev/null 2>&1 || :
 fi
 /sbin/ldconfig
 
@@ -237,12 +247,13 @@ fi
 %{python_sitearch}/*.pyo
 %doc AUTHORS COPYING ChangeLog README
 
-%files ruby
-%defattr(-,root,root,-)
-%{ruby_sitearch}/openwsman.so
-%dir %{ruby_sitelib}/openwsman
-%{ruby_sitelib}/openwsman/*.rb
-%doc AUTHORS COPYING ChangeLog README
+#%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
 
 %files perl
 %defattr(-,root,root,-)
@@ -258,8 +269,9 @@ fi
 %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,7 +280,6 @@ fi
 %{_libdir}/openwsman/plugins/*.so
 %{_libdir}/openwsman/plugins/*.so.*
 %{_sbindir}/openwsmand
-%{_sbindir}/rcopenwsmand
 %{_libdir}/libwsman_server.so.*
 %{_mandir}/man8/*
 %doc AUTHORS COPYING ChangeLog README
@@ -281,6 +292,22 @@ fi
 
 
 %changelog
+* Mon May 28 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.7-5
+- Rename service file
+
+* Wed May 23 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.7-4
+- Add systemd support
+
+* 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
 

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,2 @@
 3958e97476aa94c506075e3cd165240d  openwsman-2.2.5.tar.bz2
+c72e3b34e25f393be8fd1ead6b4a5bae  openwsman-2.2.7.tar.bz2