Final init script changes

openwsman-initscript.patch

@@ -1,6 +1,6 @@
-diff -up openwsman-2.2.3/etc/init/openwsmand.sh.in.orig openwsman-2.2.3/etc/init/openwsmand.sh.in
---- openwsman-2.2.3/etc/init/openwsmand.sh.in.orig	2010-04-22 09:36:29.186800378 -0500
-+++ openwsman-2.2.3/etc/init/openwsmand.sh.in	2010-04-22 09:38:15.507820659 -0500
+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
@@ -20,27 +20,93 @@ diff -up openwsman-2.2.3/etc/init/openwsmand.sh.in.orig openwsman-2.2.3/etc/init
  # description: Openwsman Daemon
  # processname: openwsmand
  
-@@ -61,7 +61,7 @@ start()
- 	if [ "x${FQDN}" = "x" ]; then
- 	  FQDN=localhost.localdomain
- 	fi
+@@ -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
-+cat << EOF | sh @libexecdir@/openwsman/owsmangencert.sh > /dev/null 2>&1
- --
- SomeState
- SomeCity
-@@ -145,8 +145,13 @@ case "$1" in
+---
+-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}"
-+    echo "Usage: $0 {restart|start|stop|reload|force-reload|status|condrestart}"
+     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
  
- if [ $lsb -ne 0 ]; then

openwsman-sitelibdir.patch

@@ -0,0 +1,29 @@
+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

@@ -0,0 +1,82 @@
+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

@@ -17,7 +17,7 @@ BuildRequires:  perl-devel pkgconfig openssl-devel
 BuildRequires:  libtool
 Requires:       net-tools
 Version:        2.2.3
-Release:        5%{?dist}
+Release:        8%{?dist}
 Url:            http://www.openwsman.org/
 License:        BSD
 Group:          Applications/System
@@ -26,6 +26,8 @@ Source:         http://downloads.sourceforge.net/project/openwsman/%{name}/%{ver
 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)
 
 %description
@@ -85,6 +87,7 @@ Openwsman Client libraries
 License:        BSD
 Group:          System Environment/Daemons
 Requires:       net-tools
+Requires:	openssl
 Requires(post):       chkconfig
 Requires(preun):      chkconfig
 Requires(postun):     initscripts
@@ -139,6 +142,9 @@ This package provides Perl bindings to access the openwsman client API.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
 
 %build
 sh autoconfiscate.sh
@@ -264,6 +270,18 @@ fi
 
 
 %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.
+
+* 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
+
+* Mon Aug  2 2010 Praveen K Paladugu <praveen_paladugu@dell.com> -2.2.3-6
+- Fixed swig version checking in acinclude.m4
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 2.2.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild