- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

.gitignore

@@ -1 +1,12 @@
 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
+/openwsmand.8.gz
+/openwsman-2.4.0.tar.gz
+/v2.4.3.tar.gz
+/v2.4.4.tar.gz
+/v2.4.6.tar.gz

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-2.4.0-pamsetup.patch

@@ -0,0 +1,15 @@
+diff -up openwsman-2.4.0/etc/pam/openwsman.pamsetup openwsman-2.4.0/etc/pam/openwsman
+--- openwsman-2.4.0/etc/pam/openwsman.pamsetup	2013-09-27 17:14:39.147565052 +0200
++++ openwsman-2.4.0/etc/pam/openwsman	2013-09-27 17:15:12.744578165 +0200
+@@ -1,7 +1,7 @@
+ #%PAM-1.0
+-auth       required	pam_unix2.so	nullok
++auth       required	pam_unix.so	nullok
+ auth       required	pam_nologin.so
+-account    required	pam_unix2.so
++account    required	pam_unix.so
+ password   required	pam_pwcheck.so	nullok
+-password   required	pam_unix2.so	nullok use_first_pass use_authtok
+-session    required	pam_unix2.so	none
++password   required	pam_unix.so	nullok use_first_pass use_authtok
++session    required	pam_unix.so	none

openwsman-authors.patch

@@ -1,14 +0,0 @@
-diff -up openwsman-2.2.3/AUTHORS.diff openwsman-2.2.3/AUTHORS
---- openwsman-2.2.3/AUTHORS.diff	2010-04-20 10:42:40.156797595 -0500
-+++ openwsman-2.2.3/AUTHORS	2010-04-20 10:43:10.440803220 -0500
-@@ -13,5 +13,10 @@ Contributions and Patches by:
- 	Viktor Mihajlovski, IBM
- 	Klaus Kaempf, Novell
- 
-+AUTHORS from Spec file:
-+    Anas Nashif <anas.nashif@intel.com>
-+    Vadim Revyakin <vadim.revyakin@intel.com>
-+    Denis Sadykov <denis.sadykov@intel.com>
-+
- 
- If you think you name should be here and I forgot it, please let me know.

openwsman-initscript.patch

@@ -1,112 +0,0 @@
-diff -up ./etc/init/openwsmand.sh.in.old ./etc/init/openwsmand.sh.in
---- ./etc/init/openwsmand.sh.in.old	2010-08-04 16:43:40.212100948 -0500
-+++ ./etc/init/openwsmand.sh.in	2010-08-04 17:26:20.013849220 -0500
-@@ -4,15 +4,15 @@
- # Provides: openwsmand
- # Required-Start: $remote_fs
- # Required-Stop: $network
--# Default-Start: 2 3 4 5
--# Default-Stop: 0 1 6 
-+# Default-Start:
-+# Default-Stop:
- # Short-Description: Openwsman Daemon
- # Description: openwsmand
- #       Start/Stop the Openwsman Daemon
- ### END INIT INFO
- #
- #
--# chkconfig: 2345 36 64
-+# chkconfig: - 36 64
- # description: Openwsman Daemon
- # processname: openwsmand
- 
-@@ -56,20 +56,16 @@ start()
- 	echo "Using common server certificate /etc/ssl/servercerts/servercert.pem"
- 	ln -s /etc/ssl/servercerts/server{cert,key}.pem @SYSCONFDIR@
-       else
--        echo "Generating Openwsman server public certificate and private key"
--	FQDN=`hostname --fqdn`
--	if [ "x${FQDN}" = "x" ]; then
--	  FQDN=localhost.localdomain
--	fi
--cat << EOF | sh @SYSCONFDIR@/owsmangencert.sh > /dev/null 2>&1
----
--SomeState
--SomeCity
--SomeOrganization
--SomeOrganizationalUnit
--${FQDN}
--root@${FQDN}
--EOF
-+	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 @SYSCONFDIR@/ssleay.cnf with /dev/urandom."
-+		
-       fi
-     fi
- 
-@@ -145,6 +141,10 @@ case "$1" in
-     fi
-     ;;
- 
-+   condrestart)
-+      [ -e $lockfile ] && restart
-+    ;;
-+
-     *)
-     echo "Usage: $0 {restart|start|stop|reload|force-reload|status}"
- esac
-diff -up ./etc/owsmangencert.sh.in.old ./etc/owsmangencert.sh.in
---- ./etc/owsmangencert.sh.in.old	2010-08-04 17:14:31.241100874 -0500
-+++ ./etc/owsmangencert.sh.in	2010-08-04 17:21:02.944850958 -0500
-@@ -1,7 +1,5 @@
- #!/bin/sh
- 
--#!/bin/sh -e
--
- CERTFILE=@SYSCONFDIR@/servercert.pem
- KEYFILE=@SYSCONFDIR@/serverkey.pem
- CNFFILE=@SYSCONFDIR@/ssleay.cnf
-@@ -15,19 +13,33 @@ if [ "$1" = "--force" ]; then
-   shift
- fi
- 
-+FQDN=`hostname --fqdn`
-+        if [ "x${FQDN}" = "x" ]; then
-+          FQDN=localhost.localdomain
-+        fi
- echo
- echo creating selfsingned certificate
- echo "replace it with one signed by a certification authority (CA)"
- echo
--echo enter your ServerName at the Common Name prompt
-+#echo enter your ServerName at the Common Name prompt
- echo
- 
- # use special .cnf, because with normal one no valid selfsigned
- # certificate is created
- 
--export RANDFILE=/dev/random
--openssl req -days 365 $@ -config $CNFFILE \
-+#export RANDFILE=/dev/random
-+cat <<EOF  |openssl req -days 365 $@ -config $CNFFILE \
-   -new -x509 -nodes -out $CERTFILE \
-   -keyout $KEYFILE
-+--
-+SomeState
-+SomeCity
-+SomeOrganization
-+SomeOrganizationalUnit
-+${FQDN}
-+root@${FQDN}
-+EOF
-+
-+ 
- chmod 600 $KEYFILE
- 

openwsman-randfile.patch

@@ -1,12 +0,0 @@
-diff -up ./etc/ssleay.cnf.new ./etc/ssleay.cnf
---- ./etc/ssleay.cnf.new	2009-12-16 17:04:15.000000000 -0600
-+++ ./etc/ssleay.cnf	2009-12-16 17:04:55.000000000 -0600
-@@ -2,7 +2,7 @@
- # SSLeay example configuration file.
- #
- 
--RANDFILE                = $ENV::HOME/.rnd
-+RANDFILE                = /dev/random
- 
- [ req ]
- default_bits            = 1024

openwsman-sitelibdir.patch

@@ -1,29 +0,0 @@
-diff -up ./bindings/ruby/Makefile.am.diff ./bindings/ruby/Makefile.am
---- ./bindings/ruby/Makefile.am.diff	2010-08-02 16:57:20.407937479 -0500
-+++ ./bindings/ruby/Makefile.am	2010-08-02 16:57:54.718188163 -0500
-@@ -4,8 +4,10 @@
- 
- SUBDIRS = openwsman tests
- 
--rubyarchdir = $(shell ruby -r rbconfig -e "vad = Config::CONFIG['vendorarchdir']; print(vad ? vad : Config::CONFIG['sitearchdir'])")
--rubydir = $(shell ruby -r rbconfig -e "vd = Config::CONFIG['vendorlibdir']; print(vd ? vd : Config::CONFIG['sitelibdir'])")
-+#rubyarchdir = $(shell ruby -r rbconfig -e "vad = Config::CONFIG['vendorarchdir']; print(vad ? vad : Config::CONFIG['sitearchdir'])")
-+rubyarchdir = $(shell ruby -r rbconfig -e " print( Config::CONFIG['sitearchdir'])")
-+#rubydir = $(shell ruby -r rbconfig -e "vd = Config::CONFIG['vendorlibdir']; print(vd ? vd : Config::CONFIG['sitelibdir'])")
-+rubydir = $(shell ruby -r rbconfig -e " print(Config::CONFIG['sitelibdir'])")
- rubyincdir = $(shell ruby -r rbconfig -e "print(Config::CONFIG['archdir'])")
- 
- INCLUDES =  \
-diff -up ./bindings/ruby/openwsman/Makefile.am.diff ./bindings/ruby/openwsman/Makefile.am
---- ./bindings/ruby/openwsman/Makefile.am.diff	2010-08-02 16:58:05.201189127 -0500
-+++ ./bindings/ruby/openwsman/Makefile.am	2010-08-02 16:58:20.999937941 -0500
-@@ -2,7 +2,8 @@
- # Makefile.am for openwsman/bindings/ruby/openwsman
- #
- 
--rubylibdir = $(shell ruby -r rbconfig -e "vld = Config::CONFIG['vendorlibdir']; print(vld ? vld : Config::CONFIG['sitelibdir'])")
-+#rubylibdir = $(shell ruby -r rbconfig -e "vld = Config::CONFIG['vendorlibdir']; print(vld ? vld : Config::CONFIG['sitelibdir'])")
-+rubylibdir = $(shell ruby -r rbconfig -e "print( Config::CONFIG['sitelibdir'])")
- 
- install-data-local:
- 	$(mkinstalldirs) $(DESTDIR)$(rubylibdir)/openwsman

openwsman-swig-ver-check.patch

@@ -1,82 +0,0 @@
-diff -up ./acinclude.m4.old ./acinclude.m4
---- ./acinclude.m4.old	2010-08-02 12:13:27.135937703 -0500
-+++ ./acinclude.m4	2010-08-02 12:15:07.896938631 -0500
-@@ -157,6 +157,20 @@ AC_SUBST(SFCC_LDFLAGS)
- #   may extend this special exception to the GPL to apply to your
- #   modified version as well.
- 
-+AC_DEFUN([SWIG_VERSION_GOOD],[
-+	AC_MSG_NOTICE([SWIG executable is '$SWIG'])
-+        SWIG_LIB=`$SWIG -swiglib`
-+        AC_MSG_NOTICE([SWIG library directory is '$SWIG_LIB'])
-+        SWIG_VERSION=`echo $(( $available_major * 100 * 100 + $available_minor * 100 + $available_patch ))`
-+        AC_MSG_NOTICE([SWIG version is '$SWIG_VERSION'])
-+        # AM_CONDITIONAL(SWIG_NEW_OPTIONS, test "$SWIG_VERSION" \> 10331)
-+])
-+
-+AC_DEFUN([SWIG_VERSION_BAD],[
-+	AC_MSG_WARN([SWIG version >= $1 is required.  You have $swig_version.  You should look at http://www.swig.org])
-+        SWIG='echo "Error: SWIG version >= $1 is required.  You have '"$swig_version"'.  You should look at http://www.swig.org" ; false'
-+])
-+
- AC_DEFUN([AC_PROG_SWIG],[
-         AC_PATH_PROG([SWIG],[swig])
-         if test -z "$SWIG" ; then
-@@ -199,19 +213,44 @@ AC_DEFUN([AC_PROG_SWIG],[
-                         if test -z "$available_patch" ; then
-                                 [available_patch=0]
-                         fi
--                        if test $available_major -ne $required_major \
--                                -o $available_minor -ne $required_minor \
--                                -o $available_patch -lt $required_patch ; then
--                                AC_MSG_WARN([SWIG version >= $1 is required.  You have $swig_version.  You should look at http://www.swig.org])
--                                SWIG='echo "Error: SWIG version >= $1 is required.  You have '"$swig_version"'.  You should look at http://www.swig.org" ; false'
--                        else
--                                AC_MSG_NOTICE([SWIG executable is '$SWIG'])
--                                SWIG_LIB=`$SWIG -swiglib`
--                                AC_MSG_NOTICE([SWIG library directory is '$SWIG_LIB'])
--				SWIG_VERSION=`echo $(( $available_major * 100 * 100 + $available_minor * 100 + $available_patch ))`
--                                AC_MSG_NOTICE([SWIG version is '$SWIG_VERSION'])
--				# AM_CONDITIONAL(SWIG_NEW_OPTIONS, test "$SWIG_VERSION" \> 10331)
--                        fi
-+
-+
-+ 
-+			if test $available_major -gt $required_major; then  
-+				# the available major is greater than  required major --GOOD
-+				SWIG_VERSION_GOOD()	
-+                         
-+			elif test $available_major -lt $required_major ; then  
-+				# the avialable major is less than required major -- BAD
-+				SWIG_VERSION_BAD()
-+			else  
-+				# the available and require major are equal check the minor and patch versions.
-+				
-+				if test $available_minor -gt $required_minor ; then 
-+					# GOOD
-+					SWIG_VERSION_GOOD()
-+				elif test $avaialble_minor -lt $required_minor ; then  
-+					# BAD
-+					SWIG_VERSION_BAD()
-+				else  
-+					# the minor version are also equal
-+
-+					if test $available_patch -gt $required_patch ; then   
-+						# GOOD						
-+					 	SWIG_VERSION_GOOD()
-+					elif test $available_minor -lt $required_minor ; then 
-+						# BAD
-+						SWIG_VERSION_BAD()
-+					else 
-+						# all the available major, minor and patch levels are the same as the required -- GOOD
-+						SWIG_VERSION_GOOD()
-+					fi
-+				fi
-+			fi	
-+	
-+	
-+                               
-+
-                 else
-                         AC_MSG_WARN([cannot determine SWIG version])
-                         SWIG='echo "Error: Cannot determine SWIG version.  You should look at http://www.swig.org" ; false'

openwsman.spec

@@ -1,34 +1,36 @@
-#
-# spec file for package openwsman (Version 2.2.3)
-#
 
-# norootforbuild
+%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
+%{!?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
 
-%{!?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)")}
-%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
-%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
+# RubyGems's macros expect gem_name to exist.
+%global gem_name %{name}
 
 Name:           openwsman
 BuildRequires:  swig
 BuildRequires:  libcurl-devel libxml2-devel pam-devel sblim-sfcc-devel
-BuildRequires:  python python-devel ruby ruby-devel perl
+BuildRequires:  python python-devel ruby ruby-devel rubygems-devel perl
+BuildRequires:  python python-devel perl
 BuildRequires:  perl-devel pkgconfig openssl-devel
-BuildRequires:  libtool
-Requires:       net-tools
-Version:        2.2.3
-Release:        8%{?dist}
+#BuildRequires: java-1.8.0-openjdk-devel
+BuildRequires:  cmake
+BuildRequires:  systemd-units
+Version:        2.4.6
+Release:        3%{?dist}
 Url:            http://www.openwsman.org/
 License:        BSD
 Group:          Applications/System
-Summary:        Opensource Implementation of WS-Management
-Source:         http://downloads.sourceforge.net/project/openwsman/%{name}/%{version}/%{name}-%{version}.tar.bz2
-Patch0:         %{name}-initscript.patch
-Patch1:         %{name}-randfile.patch
-Patch2:         %{name}-authors.patch
-Patch3:		%{name}-swig-ver-check.patch
-Patch4: 	%{name}-sitelibdir.patch
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXX)
+Summary:        Open source Implementation of WS-Management
+Source:         https://github.com/Openwsman/openwsman/archive/v%{version}.tar.gz
+# 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
+Patch1:         openwsman-2.2.7-libssl.patch
+Patch2:         openwsman-2.4.0-pamsetup.patch
 
 %description
 Openwsman is a project intended to provide an open-source
@@ -45,9 +47,9 @@ all system management aspects.
 %package -n libwsman1
 License:        BSD
 Group:          System Environment/Libraries
-Summary:        Opensource Implementation of WS-Management
-Provides:       %{name} = %{version}
-Obsoletes:      %{name} < %{version}
+Summary:        Open source Implementation of WS-Management
+Provides:       %{name} = %{version}-%{release}
+Obsoletes:      %{name} < %{version}-%{release}
 
 %description -n libwsman1
 Openwsman library for packages dependent on openwsman
@@ -58,12 +60,12 @@ Openwsman library for packages dependent on openwsman
 %package -n libwsman-devel
 License:        BSD
 Group:          Development/Libraries
-Summary:        Opensource Implementation of WS-Management
-Provides:       %{name}-devel = %{version}
-Obsoletes:      %{name}-devel < %{version}
-Requires:       libwsman1 = %{version}
-Requires:       %{name}-server = %{version}
-Requires:       %{name}-client = %{version}
+Summary:        Open source Implementation of WS-Management
+Provides:       %{name}-devel = %{version}-%{release}
+Obsoletes:      %{name}-devel < %{version}-%{release}
+Requires:       libwsman1 = %{version}-%{release}
+Requires:       %{name}-server = %{version}-%{release}
+Requires:       %{name}-client = %{version}-%{release}
 Requires:       sblim-sfcc-devel libxml2-devel pam-devel
 Requires:       libcurl-devel
 
@@ -87,11 +89,11 @@ Openwsman Client libraries
 License:        BSD
 Group:          System Environment/Daemons
 Requires:       net-tools
-Requires:	openssl
 Requires(post):       chkconfig
 Requires(preun):      chkconfig
 Requires(postun):     initscripts
 Summary:        Openwsman Server and service libraries
+Requires:       libwsman1 = %{version}-%{release}
 
 %description server
 Openwsman Server and service libraries
@@ -104,6 +106,7 @@ License:        BSD
 Group:          Development/Libraries
 Summary:        Python bindings for openwsman client API
 Requires:       python
+Requires:       libwsman1 = %{version}-%{release}
 
 %description python
 This package provides Python bindings to access the openwsman client
@@ -112,16 +115,34 @@ API.
 
 
 
-%package ruby
+%package -n rubygem-%{gem_name}
 License:        BSD
 Group:          Development/Libraries
-Requires:       ruby
-Requires:       ruby(abi) = 1.8
-Summary:        Ruby bindings for openwsman client API
+Summary:        Ruby client bindings for Openwsman
+Obsoletes:      %{name}-ruby < %{version}-%{release}
 
-%description ruby
-This package provides Ruby bindings to access the openwsman client API.
+%description -n rubygem-%{gem_name}
+The openwsman gem provides a Ruby API to manage systems using
+the WS-Management protocol.
 
+%package -n rubygem-%{gem_name}-doc
+Summary: Documentation for %{name}
+Group: Documentation
+Requires: rubygem-%{gem_name} = %{version}-%{release}
+BuildArch: noarch
+
+%description -n rubygem-%{gem_name}-doc
+Documentation for rubygem-%{gem_name}
+
+
+#%package java
+#Requires:      java
+#Requires:      libwsman1 = %{version}
+#Summary:       Java bindings for openwsman client API
+#Group:          Development/Libraries
+
+#%description java
+#This package provides Java bindings to access the openwsman client API.
 
 
 
@@ -130,6 +151,7 @@ License:        BSD
 Group:          Development/Libraries
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Summary:        Perl bindings for openwsman client API
+Requires:       libwsman1 = %{version}-%{release}
 
 %description perl
 This package provides Perl bindings to access the openwsman client API.
@@ -139,45 +161,83 @@ This package provides Perl bindings to access the openwsman client API.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%patch1 -p1 -b .libssl
+%patch2 -p1 -b .pamsetup
 
+# Fix wrong symlinks (fixed upstream, will be in 2.4.1)
+ln -sf %{_bindir}/rdoc bindings/ruby/rdoc1_9.rb 
+ln -sf %{_bindir}/rdoc bindings/ruby/rdoc2_0.rb 
 
 %build
-sh autoconfiscate.sh
 # Removing executable permissions on .c and .h files to fix rpmlint warnings. 
 chmod -x src/cpp/WsmanClient.h
-chmod -x src/lib/wsman-filter.c
-chmod -x include/wsman-filter.h
-%configure \
-    --disable-more-warnings \
-    --disable-static \
-    --enable-python \
-    --enable-ruby \
-    --enable-perl \
-    --enable-ipv6
-#make clean
 
-export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DFEDORA"
-make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_flags}
+rm -rf build
+mkdir build
+
+export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DFEDORA -DNO_SSL_CALLBACK"
+export SSL_LIB=`readlink %{_libdir}/libssl.so`
+export CFLAGS="-D_GNU_SOURCE -fPIE -DPIE"
+export LDFLAGS="$LDFLAGS -Wl,-z,now -pie"
+cd build
+cmake \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DCMAKE_VERBOSE_MAKEFILE=TRUE \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_C_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS -fno-strict-aliasing" \
+  -DCMAKE_CXX_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS" \
+  -DCMAKE_SKIP_RPATH=1 \
+  -DPACKAGE_ARCHITECTURE=`uname -m` \
+  -DLIB=%{_lib} \
+   ..
+
+make CFLAGS="-DSSL_LIB='\"$SSL_LIB\"'"
+
+# Make the freshly build openwsman libraries available to build the gem's
+# binary extension.
+export LIBRARY_PATH=/builddir/build/BUILD/%{name}-%{version}/build/src/lib
+export CPATH=/builddir/build/BUILD/%{name}-%{version}/include/
+export LD_LIBRARY_PATH=/builddir/build/BUILD/%{name}-%{version}/build/src/lib/
+
+%gem_install -n ./bindings/ruby/%{name}-%{version}.gem
 
 %install
-rm -rf %{buildroot}
+cd build
+
+# Do not install the ruby extension, we are proviging the rubygem- instead.
+echo -n > bindings/ruby/cmake_install.cmake
+
 make DESTDIR=%{buildroot} install
+cd ..
 rm -f %{buildroot}/%{_libdir}/*.la
 rm -f %{buildroot}/%{_libdir}/openwsman/plugins/*.la
 rm -f %{buildroot}/%{_libdir}/openwsman/authenticators/*.la
-mkdir -p %{buildroot}/%{_sysconfdir}/init.d
+[ -d %{buildroot}/%{ruby_vendorlibdir} ] && rm -f %{buildroot}/%{ruby_vendorlibdir}/openwsmanplugin.rb
+[ -d %{buildroot}/%{ruby_vendorlibdir} ] && rm -f %{buildroot}/%{ruby_vendorlibdir}/openwsman.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}/%{_unitdir}
+install -p -m 644 %{SOURCE2} %{buildroot}/%{_unitdir}/openwsmand.service
 install -m 644 etc/ssleay.cnf %{buildroot}/%{_sysconfdir}/openwsman
-install -m 755 etc/init/openwsmand.sh %{buildroot}/%{_sysconfdir}/init.d/openwsmand
-ln -sf %{_sysconfdir}/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/
+# install missing headers
+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
+
+mkdir -p %{buildroot}%{gem_dir}
+cp -pa ./build%{gem_dir}/* \
+        %{buildroot}%{gem_dir}/
+
+rm -rf %{buildroot}%{gem_instdir}/ext
+
+mkdir -p %{buildroot}%{gem_extdir_mri}
+cp -a ./build%{gem_extdir_mri}/{gem.build_complete,*.so} %{buildroot}%{gem_extdir_mri}/
 
-%clean
-rm -rf %{buildroot}
 
 %post -n libwsman1 -p /sbin/ldconfig
 
@@ -185,20 +245,14 @@ rm -rf %{buildroot}
 
 %post server
 /sbin/ldconfig
-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
@@ -206,51 +260,55 @@ 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_sitelib}/*.py
-%{python_sitelib}/*.pyc
-%{python_sitelib}/*.pyo
-%doc AUTHORS COPYING ChangeLog README
+%{python_sitearch}/*.py
+%{python_sitearch}/*.pyc
+%{python_sitearch}/*.pyo
+%doc AUTHORS COPYING ChangeLog README.md
+
+%files -n rubygem-%{gem_name}
+%doc AUTHORS COPYING ChangeLog README.md
+%dir %{gem_instdir}
+%{gem_libdir}
+%{gem_extdir_mri}
+%exclude %{gem_cache}
+%{gem_spec}
+
+%files -n rubygem-%{gem_name}-doc
+%doc %{gem_docdir}
+
+#%files java
+#%defattr(-,root,root)
+#%{_javadir}/*jar
 
-%files ruby
-%defattr(-,root,root,-)
-%{ruby_sitearch}/openwsman.so
-%dir %{ruby_sitelib}/openwsman
-%{ruby_sitelib}/openwsman/openwsman.rb
-%{ruby_sitelib}/openwsman/xmlnode.rb
-%doc AUTHORS COPYING ChangeLog README
 
 %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}/init.d/openwsmand
+%{_unitdir}/openwsmand.service
 %dir %{_libdir}/openwsman
 %dir %{_libdir}/openwsman/authenticators
 %{_libdir}/openwsman/authenticators/*.so
@@ -259,28 +317,147 @@ fi
 %{_libdir}/openwsman/plugins/*.so
 %{_libdir}/openwsman/plugins/*.so.*
 %{_sbindir}/openwsmand
-%{_sbindir}/rcopenwsmand
 %{_libdir}/libwsman_server.so.*
-%doc AUTHORS COPYING ChangeLog README
+%{_mandir}/man8/*
+%doc AUTHORS COPYING ChangeLog README.md
 
 %files client
-%defattr(-,root,root,-)
 %{_libdir}/libwsman_clientpp.so.*
-%doc AUTHORS COPYING ChangeLog README
+%config(noreplace) %{_sysconfdir}/openwsman/openwsman_client.conf
+%doc AUTHORS COPYING ChangeLog README.md
 
 
 %changelog
-* Fri Aug  6 2010 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.3.8
-- Added openssl among the dependencies of server
-- The init script will break and ask the user to create a cert manually if 
--   none exists.
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
-* Mon Aug  2 2010 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.3-7
-- Forcing all the ruby files to be installed in site{arch,lib}dir instead
--   of vendor{arch,lib}dir following Fedora guidelines
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
-* Mon Aug  2 2010 Praveen K Paladugu <praveen_paladugu@dell.com> -2.2.3-6
-- Fixed swig version checking in acinclude.m4
+* Tue May 20 2014 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.4.6-1
+- Update to openwsman-2.4.6
+
+* Fri Apr 25 2014 Vít Ondruch <vondruch@redhat.com> - 2.4.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.1
+
+* Tue Mar 11 2014 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.4.4-1
+- Update to openwsman-2.4.4
+- Provide rubygem-openwsman instead of openwsman-ruby (patch by Vit Ondruch)
+
+* Wed Feb 05 2014 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.4.3-2
+- Update openwsmand man page
+
+* Thu Jan 23 2014 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.4.3-1
+- Update to openwsman-2.4.3
+
+* Tue Jan 07 2014 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.4.0-3
+- Start the service using SSL by default
+
+* Mon Sep 30 2013 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.4.0-2
+- Build with full relro
+- Fix provides/requires
+- Fix pam.d config (patch by Ales Ledvinka)
+  Resolves: #1013018
+
+* Tue Sep 17 2013 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.4.0-1
+- Update to openwsman-2.4.0
+- Fix bogus date in %%changelog
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.6-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 2.3.6-7
+- Perl 5.18 rebuild
+
+* Tue Mar 19 2013 Vít Ondruch <vondruch@redhat.com> - 2.3.6-6
+- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
+
+* Mon Mar 18 2013 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.3.6-4
+- Updated the dependency for ruby bindings and introduced the java bindings.
+
+* Wed Mar 13 2013 Peter Robinson <pbrobinson@fedoraproject.org> 2.3.6-3
+- rebuild for ruby 2
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* 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
+
+* Thu Dec  9 2010 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.4-2
+- Recompile with -DNO_SSL_CALLBACK
+
+* Tue Nov 16 2010 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.4-1
+- Update to openwsman-2.2.4
+- Add help2man generated manpage for openwsmand binary
+- Add missing openwsman headers to libwsman-devel
+- Add configuration file to openwsman-client
+
+* Wed Sep 29 2010 jkeating - 2.2.3-9
+- Rebuilt for gcc bug 634757
+
+* Mon Sep 13 2010 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.3-8
+- Move initscript to the right place
+- Fix return values from initscript according to guidelines
+
+* Tue Aug 10 2010 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.3-7
+- Moved the certificate generation from init script. The user will have to 
+-   generate the certificate manually.
+
+* Mon Aug  2 2010 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.3-6
+- Fixed the version checking of swig and forced all the ruby files to be 
+-   installed into site{lib,arch} dirs 
 
 * Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 2.2.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
@@ -288,7 +465,7 @@ fi
 * Tue Jun 01 2010 Marcela Maslanova <mmaslano@redhat.com> - 2.2.3-4
 - Mass rebuild with perl-5.12.0
 
-* Tue Apr 22 2010 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.3-3
+* Thu Apr 22 2010 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.3-3
 - authors.patch: Moved all the AUTHORS info to AUTHORS file.
 - Corrected the Source tag.
 - Corrected the package dependencies to break cyclic dependencies.

openwsmand.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=Openwsman WS-Management Service
+After=syslog.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/openwsmand -S
+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 @@
-79f637d86a2cbd2d6763b80f68e4bc96  openwsman-2.2.3.tar.bz2
+4f2d9b1d7da6d87fcd38a9aa23559723  openwsmand.8.gz
+02902aafcd58708c0cdab51af9f4086e  v2.4.6.tar.gz