Moved the cert generation

#2781)

.gitignore

@@ -1,2 +1 @@
-openwsman-2.2.3.tar.bz2
-/openwsman-2.2.4.tar.bz2
+openwsman-2.2.0.tar.bz2

openwsman-2.2.3-initscript.patch

@@ -1,81 +0,0 @@
-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
-@@ -4,28 +4,28 @@
- # 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
- 
- NAME=openwsmand
- DAEMON=/usr/sbin/$NAME
- OPTIONS=-S # with SSL
--PIDFILE=/var/run/$NAME.pid
-+PIDFILE=/var/run/wsmand.pid
- 
- lsb=0
- 
- if [ $EUID != 0 ]; then
-  echo "This script must be run as root."
-- exit 1;
-+ exit 4;
- fi
- 
- if [ "$DESCRIPTIVE" = "" ]; then
-@@ -65,6 +65,7 @@ start()
- 
- 	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. Please understand the implications of replacing the RNADFILE."
-+	exit 6 # Six means "program is not configured", seems to be suitable value
- 		
-       fi
-     fi
-@@ -103,6 +104,9 @@ case "$1" in
-     stop)
-     	stop
- 	rm -f $lockfile
-+	# pid file should be removed by server itself, but it's marked as
-+	# TODO in wsmand.c source file;)
-+	rm -f $PIDFILE
-     ;;
- 
-     restart)
-@@ -137,6 +141,16 @@ case "$1" in
-         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
-       fi
-     fi
-     ;;
-@@ -147,6 +161,8 @@ case "$1" in
- 
-     *)
-     echo "Usage: $0 {restart|start|stop|reload|force-reload|status|condrestart}"
-+    [ "$1" = "usage" ] && exit 0
-+    exit 2
- esac
- 
- if [ $lsb -ne 0 ]; then

openwsman-initscript.patch

@@ -0,0 +1,198 @@
+diff -up ./etc/init/openwsmand.sh.in.bak ./etc/init/openwsmand.sh.in
+--- ./etc/init/openwsmand.sh.in.bak	2010-08-10 10:43:50.158889277 -0500
++++ ./etc/init/openwsmand.sh.in	2010-08-10 10:46:19.345860143 -0500
+@@ -4,21 +4,21 @@
+ # 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
+ 
+ NAME=openwsmand
+ DAEMON=/usr/sbin/$NAME
+-OPTIONS=
++OPTIONS=-S
+ PIDFILE=/var/run/$NAME.pid
+ 
+ if [ $EUID != 0 ]; then
+@@ -37,12 +37,14 @@ lockfile=${SVIlock:-/var/lock/subsys/$NA
+ if [ -f "/etc/sysconfig/openwsman" ]; then
+     . /etc/sysconfig/openwsman
+ fi
+-# See how we were called.
+-. /etc/rc.status
+ 
+-# Reset status of this service
+-rc_reset
++if [ -f "/etc/SuSe-release" ]; then
++     # See how we were called.
++     . /etc/rc.status
+ 
++     # Reset status of this service
++     rc_reset
++fi
+ 
+ case "$1" in
+     start)
+@@ -52,35 +54,43 @@ case "$1" in
+             echo "Using common server certificate /etc/ssl/servercerts/servercert.pem"
+             ln -s /etc/ssl/servercerts/server{cert,key}.pem /etc/openwsman/
+         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 -e "      If this takes too long, you can replace the value of \"RANDFILE\" in @SYSCONFDIR@/ssleay.cnf with /dev/urandom.\n      Please understand the implications of doing so."
++
+         fi
+     fi
+ 
+     # Start daemons.
+     echo -n "Starting the $DESCRIPTIVE"
+-    startproc -p $PIDFILE $DAEMON > /dev/null 2>&1
+-    rc_status -v
++    if [ -f "/etc/SuSe-release" ]; then
++    	startproc -p $PIDFILE $DAEMON > /dev/null 2>&1
++    	rc_status -v
++    elif [ -f "/etc/redhat-release" ]; then
++    	$DAEMON -S && echo "          done." || echo "   failed."
++    fi
++    
+     touch $lockfile
+     ;;
+ 
+     stop)
+     # Stop daemons.
+     echo -n "Shutting down $DESCRIPTIVE"
+-    killproc -p $PIDFILE -TERM $DAEMON
+-    rc_status -v
++    if [ -f "/etc/SuSe-release" ]; then
++       killproc -p $PIDFILE -TERM $DAEMON
++       rc_status -v
++    elif [ -f "/etc/redhat-release" ]; then
++       kill -9 `pidof openwsmand` > /dev/null 2>&1
++          if [ $? -eq 0 ]; then
++             echo "         done"
++          fi
++    fi
+     rm -f $lockfile
+     ;;
+ 
+@@ -91,19 +101,40 @@ EOF
+     ;;
+ 
+     reload)
+-    echo -n "Reload service $DESCRIPTIVE"
+-    killproc -p $PIDFILE  -HUP $DAEMON
+-    rc_status -v
++    echo -n "Reloading service $DESCRIPTIVE"
++    if [ -f "/etc-SuSe-release" ]; then
++    	killproc -p $PIDFILE  -HUP $DAEMON
++    	rc_status -v
++    elif [ -f "/etc/redhat-release" ]; then
++    	killall -HUP openwsmad && echo "            done."|| echo "    failed."
++    fi
+     ;;
+ 
+     status)
+     echo -n "Checking for service $DESCRIPTIVE"
+-    checkproc -p $PIDFILE $DAEMON
+-    rc_status -v
++    if [ -f "/etc/SuSe-release" ]; then
++        checkproc -p $PIDFILE $DAEMON
++        rc_status -v
++    elif [ -f "/etc/redhat-release" ]; then
++        pidof opewsmand > /dev/null 2>&1
++        if [ $? -eq 0 ]; then
++           echo "         running"
++        else
++           echo "         stopped"
++        fi 
++    fi
++        
++    ;;
++    condrestart)
++       [ -f $lockfile ] && restart || :
+     ;;
+ 
+     *)
+-    echo "Usage: $0 {restart|start|stop|reload|force-reload|status}"
++    echo "Usage: $0 {restart|start|stop|reload|force-reload|status|condrestart}"
+ esac
+ 
++if [ -f "/etc/SuSe-release" ]; then
+ rc_exit
++elif [ -f "/etc/redhat-release" ]; then
++exit 0 
++fi
+diff -up ./etc/owsmangencert.sh.in.bak ./etc/owsmangencert.sh.in
+--- ./etc/owsmangencert.sh.in.bak	2010-08-10 10:46:36.554862986 -0500
++++ ./etc/owsmangencert.sh.in	2010-08-10 10:50:45.843859853 -0500
+@@ -15,19 +15,34 @@ 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-pam-auth.patch

@@ -0,0 +1,24 @@
+Index: openwsman.conf
+===================================================================
+--- openwsman-2.0.0/etc/openwsman.conf	(revision 3221)
++++ openwsman-2.0.0/etc/openwsman.conf	(working copy)
+@@ -4,7 +4,7 @@
+ ssl_cert_file = /etc/openwsman/servercert.pem
+ ssl_key_file = /etc/openwsman/serverkey.pem
+ digest_password_file = /etc/openwsman/digest_auth.passwd
+-basic_password_file = /etc/openwsman/simple_auth.passwd
++#basic_password_file = /etc/openwsman/simple_auth.passwd
+ 
+ min_threads = 4
+ max_threads = 10
+@@ -15,8 +15,8 @@
+ # Authentication backend for BASIC authentication. Default is to read a configuration file defined with 'basic_password_file'
+ #
+ 
+-#basic_authenticator = libwsman_pam_auth.so
+-#basic_authenticator_arg = openwsman
++basic_authenticator = libwsman_pam_auth.so
++basic_authenticator_arg = openwsman
+ 
+ #
+ # WS-Management unauthenticated wsmid:Identify file

openwsman-randfile.patch

@@ -0,0 +1,12 @@
+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.spec

@@ -1,73 +1,62 @@
-
-%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: %define 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"] ')}
 
-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:  perl-devel pkgconfig openssl-devel
-BuildRequires:  cmake
-Requires:       net-tools
-Version:        2.2.4
-Release:        3%{?dist}
-Url:            http://www.openwsman.org/
+Name:          openwsman
+Version:       2.2.0
+Release:        6%{?dist}
 License:        BSD
-Group:          Applications/System
-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
-Patch0:         %{name}-sitelibdir.patch
-Patch1:         openwsman-2.2.3-initscript.patch
+Url:            http://www.openwsman.org/
+Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source2:        python-config
+Patch0:         %{name}-initscript.patch
+Patch1:         %{name}-pam-auth.patch
+Patch2:         perl-bindings.patch
+Patch3:         openwsman-randfile.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXX)
+Group:          System Environment/Daemons
+Summary:        Opensource Implementation of WS-Management
+BuildRequires:  sblim-sfcc-devel curl-devel libxml2-devel pkgconfig pam-devel openssl-devel swig python python-devel ruby ruby-devel libtool
+BuildRequires:  perl pkgconfig openssl-devel net-tools
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(postun): initscripts
 
 %description
 Openwsman is a project intended to provide an open-source
-implementation of the Web Services Management specipication
+implementation of the Web Services Management specification
 (WS-Management) and to expose system management information on the
 Linux operating system using the WS-Management protocol. WS-Management
 is based on a suite of web services specifications and usage
 requirements that exposes a set of operations focused on and covers
 all system management aspects.
 
-
-
-
 %package -n libwsman1
 License:        BSD
 Group:          System Environment/Libraries
-Summary:        Open source Implementation of WS-Management
+Summary:        Opensource Implementation of WS-Management
 Provides:       %{name} = %{version}
 Obsoletes:      %{name} < %{version}
+Requires:       %{name}-client
 
 %description -n libwsman1
 Openwsman library for packages dependent on openwsman
-
-
-
-
 %package -n libwsman-devel
 License:        BSD
 Group:          Development/Libraries
-Summary:        Open source Implementation of WS-Management
+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}
 Requires:       sblim-sfcc-devel libxml2-devel pam-devel
-Requires:       libcurl-devel
+Requires:       curl-devel
 
 %description -n libwsman-devel
 Development files for openwsman
 
-
-
 %package client
 License:        BSD
 Group:          System Environment/Libraries
@@ -76,13 +65,11 @@ Summary:        Openwsman Client libraries
 %description client
 Openwsman Client libraries
 
-
-
-
 %package server
 License:        BSD
 Group:          System Environment/Daemons
 Requires:       net-tools
+Requires:       openwsman-client
 Requires(post):       chkconfig
 Requires(preun):      chkconfig
 Requires(postun):     initscripts
@@ -92,8 +79,6 @@ Summary:        Openwsman Server and service libraries
 Openwsman Server and service libraries
 
 
-
-
 %package python
 License:        BSD
 Group:          Development/Libraries
@@ -104,9 +89,6 @@ Requires:       python
 This package provides Python bindings to access the openwsman client
 API.
 
-
-
-
 %package ruby
 License:        BSD
 Group:          Development/Libraries
@@ -117,9 +99,6 @@ Summary:        Ruby bindings for openwsman client API
 %description ruby
 This package provides Ruby bindings to access the openwsman client API.
 
-
-
-
 %package perl
 License:        BSD
 Group:          Development/Libraries
@@ -132,83 +111,55 @@ This package provides Perl bindings to access the openwsman client API.
 
 
 
+
 %prep
-%setup -q
-# don't make backup of file patched by patch0, it'll be installed...
+%setup -q 
 %patch0 -p1
-%patch1 -p1 -b .initscript
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+cp -p %{SOURCE2} %{_builddir}/%{name}-%{version}
+sed -i -e 's|#!/usr/bin/python2.5|#!%{__python}|' %{_builddir}/%{name}-%{version}/python-config
 
 %build
-# Removing executable permissions on .c and .h files to fix rpmlint warnings. 
-chmod -x src/cpp/WsmanClient.h
+sh autoconfiscate.sh
+chmod a-x src/lib/*.[ch]
+chmod a-x src/cpp/*.[ch]
+chmod a-x include/*.[ch]
 
-rm -rf build
-mkdir build
-
-export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DFEDORA -DNO_SSL_CALLBACK"
-export SSL_LIB=`readlink %{_libdir}/libssl.so`
-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\"'"
+# disable eventing, as Fedora libcurl isn't linked against openssl
+# disable tests in 2.1.0, http://www.openwsman.org/bug/263
+%configure  --enable-python=yes --enable-ruby=yes --enable-eventing=no --disable-more-warnings --disable-static --enable-perl --enable-ipv6 PATH=$PATH:.
+export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DFEDORA"
+make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_flags}
 
 %install
 rm -rf %{buildroot}
-cd build
 make DESTDIR=%{buildroot} install
-cd ..
-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_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
-install -m 644 etc/ssleay.cnf %{buildroot}/%{_sysconfdir}/openwsman
-ln -sf %{_sysconfdir}/rc.d/init.d/openwsmand %{buildroot}/%{_sbindir}/rcopenwsmand
-# 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
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/openwsman/plugins/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/openwsman/authenticators/*.la
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
+install -m 644 etc/openwsman.conf $RPM_BUILD_ROOT%{_sysconfdir}/openwsman
+install -m 644 etc/ssleay.cnf $RPM_BUILD_ROOT%{_sysconfdir}/openwsman
+install -m 755 etc/init/openwsmand.sh $RPM_BUILD_ROOT%{_sysconfdir}/init.d/openwsmand
+ln -sf %{_sysconfdir}/init.d/openwsmand $RPM_BUILD_ROOT%{_sbindir}/rcopenwsmand
 
 %clean
 rm -rf %{buildroot}
-
 %post -n libwsman1 -p /sbin/ldconfig
 
 %postun -n libwsman1 -p /sbin/ldconfig
 
 %post server
 /sbin/ldconfig
-/sbin/chkconfig --add openwsmand
+chkconfig --add  openwsmand
 
 %preun server
-if [ $1 = 0 ] ; then
-       /sbin/service %{name}d stop >/dev/null 2>&1
-       /sbin/chkconfig --del openwsmand
-fi
+chkconfig --del openwsmand
 
 %postun server
 rm -f /var/log/wsmand.log
-
-if [ "$1" -ge "1" ] ; then
-     /sbin/service %{name}d condrestart >/dev/null 2>&1 || :
-fi
 /sbin/ldconfig
 
 %post client -p /sbin/ldconfig
@@ -216,36 +167,37 @@ fi
 %postun client -p /sbin/ldconfig
 
 %files -n libwsman1
-%defattr(-,root,root,-)
+%defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_libdir}/libwsman.so.*
 %{_libdir}/libwsman_client.so.*
 %{_libdir}/libwsman_curl_client_transport.so.*
 
 %files -n libwsman-devel
-%defattr(-,root,root,-)
+%defattr(-,root,root)
 %{_includedir}/*
 %{_libdir}/pkgconfig/*
 %{_libdir}/*.so
 %doc AUTHORS COPYING ChangeLog README
 
 %files python
-%defattr(-,root,root,-)
+%defattr(-,root,root)
 %{python_sitearch}/*.so
-%{python_sitearch}/*.py
-%{python_sitearch}/*.pyc
-%{python_sitearch}/*.pyo
+%{python_sitelib}/*.py
+#%{python_sitelib}/*.pyc
+#%{python_sitelib}/*.pyo
 %doc AUTHORS COPYING ChangeLog README
 
 %files ruby
-%defattr(-,root,root,-)
+%defattr(-,root,root)
 %{ruby_sitearch}/openwsman.so
 %dir %{ruby_sitelib}/openwsman
-%{ruby_sitelib}/openwsman/*.rb
+%{ruby_sitelib}/openwsman/openwsman.rb
+%{ruby_sitelib}/openwsman/wsxmlnode.rb
 %doc AUTHORS COPYING ChangeLog README
 
 %files perl
-%defattr(-,root,root,-)
+%defattr(-,root,root)
 %{perl_vendorarch}/openwsman.so
 %{perl_vendorlib}/openwsman.pm
 %doc AUTHORS COPYING ChangeLog README
@@ -253,13 +205,13 @@ fi
 %files server
 # Don't remove *.so files from the server package.
 # the server fails to start without these files.
-%defattr(-,root,root,-)
+%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
 %config(noreplace) %{_sysconfdir}/pam.d/openwsman
-%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/openwsmand
+%attr(0755,root,root) %{_sysconfdir}/init.d/openwsmand
 %dir %{_libdir}/openwsman
 %dir %{_libdir}/openwsman/authenticators
 %{_libdir}/openwsman/authenticators/*.so
@@ -270,76 +222,31 @@ fi
 %{_sbindir}/openwsmand
 %{_sbindir}/rcopenwsmand
 %{_libdir}/libwsman_server.so.*
-%{_mandir}/man8/*
 %doc AUTHORS COPYING ChangeLog README
 
 %files client
-%defattr(-,root,root,-)
+%defattr(-,root,root)
 %{_libdir}/libwsman_clientpp.so.*
-%config(noreplace) %{_sysconfdir}/openwsman/openwsman_client.conf
 %doc AUTHORS COPYING ChangeLog README
 
-
 %changelog
-* 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
+* Tue Aug 10 2010 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-6
+- Moved the cert generation from the the init script.
 
-* Thu Dec  9 2010 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.4-2
-- Recompile with -DNO_SSL_CALLBACK
+* Tue Dec 29 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-5
+- Updating the spec file to follow the upstream packaging format.
 
-* 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
+* Thu Oct  1 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-4
+- removed the hard coding of ruby_libdir
 
-* 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
-
-* 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
-- authors.patch: Moved all the AUTHORS info to AUTHORS file.
-- Corrected the Source tag.
-- Corrected the package dependencies to break cyclic dependencies.
-- Fixed the default attributes.
-- Fixed the preun & postun scripts, to make sure the openwsmand service
--    is stopped before the package is removed.
-- Added 'condrestart' function to the init script.
-- Had to let the *.so files be part of the openwsman-server becuase
--    some of the source files explicitly call out for *.so files.
-
-
-* Thu Apr 15 2010 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.3-2
-- Updated the spec file to adhere to the upstream standard of breaking
-- the package in server, client, lib modules 
-- randfile.patch: when openwsmand daemon creates a certificate the
-- first time it needs a file which have random content it. This
-- is pointed to $HOME/.rnd in /etc/openwsman/ssleay.cnf. Changed this
-- random file to /dev/urandom. 
-- initscript.patch: patch to edit the init script so that the services
-- are not started by default.
-
-
-* Wed Mar  3 2010 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.3-1
-- Update to openwsman-2.2.3
+* Tue Sep 29 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-3
+- Changed back the hard coding of /usr/lib
 
+* Tue Sep 29 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-2
+- check for python-configure in configure.ac fails because python-config
+- is not part of python-2.4 which is currently available in RHEL
+- So added a script python-config to the sources, and allowed configure to
+- search in BUILD/opewsman-2.2.0 for python-configure script.
 
 * Wed Sep 23 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-1
 - Added the new 2.2.0 sources.

perl-bindings.patch

@@ -0,0 +1,22 @@
+diff -up openwsman-2.2.0/bindings/perl/Makefile.am.org openwsman-2.2.0/bindings/perl/Makefile.am
+--- openwsman-2.2.0/bindings/perl/Makefile.am.org	2009-12-10 13:34:55.000000000 -0600
++++ openwsman-2.2.0/bindings/perl/Makefile.am	2009-12-10 13:35:56.000000000 -0600
+@@ -33,6 +33,7 @@ SWIG_INPUT = ../openwsman.i
+ openwsman_la_SOURCES = openwsman_wrap.c \
+ 			 ../openwsman.c \
+ 			 $(SWIG_INPUT)
++all-local: openwsman.pm
+ 
+ openwsman_la_LIBADD = $(LIBS) -lpthread $(CURL_LIBS)
+ 
+diff -up openwsman-2.2.0/bindings/perl/Makefile.in.org openwsman-2.2.0/bindings/perl/Makefile.in
+--- openwsman-2.2.0/bindings/perl/Makefile.in.org	2009-12-10 13:35:03.000000000 -0600
++++ openwsman-2.2.0/bindings/perl/Makefile.in	2009-12-10 13:36:18.000000000 -0600
+@@ -289,6 +289,7 @@ SWIG_INPUT = ../openwsman.i
+ openwsman_la_SOURCES = openwsman_wrap.c \
+ 			 ../openwsman.c \
+ 			 $(SWIG_INPUT)
++all-local: openwsman.pm
+ 
+ openwsman_la_LIBADD = $(LIBS) -lpthread $(CURL_LIBS)
+ openwsman_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)

python-config

@@ -0,0 +1,53 @@
+#!/usr/bin/python2.5
+
+import sys
+import os
+import getopt
+from distutils import sysconfig
+
+valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags', 
+              'ldflags', 'help']
+
+def exit_with_usage(code=1):
+    print >>sys.stderr, "Usage: %s [%s]" % (sys.argv[0], 
+                                            '|'.join('--'+opt for opt in valid_opts))
+    sys.exit(code)
+
+try:
+    opts, args = getopt.getopt(sys.argv[1:], '', valid_opts)
+except getopt.error:
+    exit_with_usage()
+
+if not opts:
+    exit_with_usage()
+
+opt = opts[0][0]
+
+pyver = sysconfig.get_config_var('VERSION')
+getvar = sysconfig.get_config_var
+
+if opt == '--help':
+    exit_with_usage(0)
+
+elif opt == '--prefix':
+    print sysconfig.PREFIX
+
+elif opt == '--exec-prefix':
+    print sysconfig.EXEC_PREFIX
+
+elif opt in ('--includes', '--cflags'):
+    flags = ['-I' + sysconfig.get_python_inc(),
+             '-I' + sysconfig.get_python_inc(plat_specific=True)]
+    if opt == '--cflags':
+        flags.extend(getvar('CFLAGS').split())
+    print ' '.join(flags)
+
+elif opt in ('--libs', '--ldflags'):
+    libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
+    libs.append('-lpython'+pyver)
+    # add the prefix/lib/pythonX.Y/config dir, but only if there is no
+    # shared library in prefix/lib/.
+    if opt == '--ldflags' and not getvar('Py_ENABLE_SHARED'):
+        libs.insert(0, '-L' + getvar('LIBPL'))
+    print ' '.join(libs)
+

sources

@@ -1 +1 @@
-e7e9da7a8c55d28c08151940d7ac61bd  openwsman-2.2.4.tar.bz2
+62b4eaf752171058bf0036e049ca01d0  openwsman-2.2.0.tar.bz2