Moved the cert generation

#2781)

openwsman-initscript.patch

@@ -1,6 +1,6 @@
-diff -up ./etc/init/openwsmand.sh.in.new ./etc/init/openwsmand.sh.in
---- ./etc/init/openwsmand.sh.in.new	2009-12-16 18:16:06.000000000 -0600
-+++ ./etc/init/openwsmand.sh.in	2009-12-16 18:16:18.000000000 -0600
+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
@@ -46,7 +46,36 @@ diff -up ./etc/init/openwsmand.sh.in.new ./etc/init/openwsmand.sh.in
  
  case "$1" in
      start)
-@@ -71,16 +73,28 @@ EOF
+@@ -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"
@@ -79,7 +108,7 @@ diff -up ./etc/init/openwsmand.sh.in.new ./etc/init/openwsmand.sh.in
      rm -f $lockfile
      ;;
  
-@@ -91,19 +105,40 @@ EOF
+@@ -91,19 +101,40 @@ EOF
      ;;
  
      reload)
@@ -126,3 +155,44 @@ diff -up ./etc/init/openwsmand.sh.in.new ./etc/init/openwsmand.sh.in
 +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.spec

@@ -5,7 +5,7 @@
 
 Name:          openwsman
 Version:       2.2.0
-Release:        8%{?dist}
+Release:        6%{?dist}
 License:        BSD
 Url:            http://www.openwsman.org/
 Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -93,7 +93,7 @@ API.
 License:        BSD
 Group:          Development/Libraries
 Requires:       ruby
-Requires:       ruby-libs >= 1.8
+Requires:       ruby(abi) = 1.8
 Summary:        Ruby bindings for openwsman client API
 
 %description ruby
@@ -229,45 +229,40 @@ rm -f /var/log/wsmand.log
 %{_libdir}/libwsman_clientpp.so.*
 %doc AUTHORS COPYING ChangeLog README
 
-
 %changelog
-* Tue May 31 2011 Praveen K Paladugu <praveen_paladugu@dell.com> -2.2.0-8
-- Replaced the ruby(abi) dependency with ruby-libs for el4 branch.
+* 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 31 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-7
-- Removed the dependency on libcurl-devel and added curl-devel.
-- remove the hard coding of ruby while determing the sitearch and sitelibs.
+* 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.
 
-* Mon Dec 28 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-6
-- Changed the random file used for creating an openssl cert
+* Thu Oct  1 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-4
+- removed the hard coding of ruby_libdir
 
-* Mon Dec 28 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-5
-- Added a few Build dependencies
+* Tue Sep 29 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-3
+- Changed back the hard coding of /usr/lib
 
-* Mon Dec 28 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-4
-- Following the upstream packaging, updated the spec file to break the
-- package into server, client, lib components.
+* 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.
 
-* Tue Nov  3 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-3
-- Changed the python-config script for it to be working on el4
+* Wed Sep 23 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-1
+- Added the new 2.2.0 sources.
+- Changed the release and version numbers.
 
-* Thu Oct  1 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-2
-- Increasing the release number to make another tag 
+* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 2.1.0-4
+- rebuilt with new openssl
 
-* Thu Oct  1 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-1
-- Updated the sources to 2.2.0. Couple of major changes are as follows:
-- Major changes:
-- 	Adapt IANA ports of 5985 (http) and 5986 (https)
-- 	Change the Ruby bindings module name to 'Openwsman'
-- 	Change the Ruby plugin module name to 'Openwsman'
-- 	IPv6 support (A_Venkatachalam@Dell.com)
-- 	preliminary support for wbem intrinsic operations
--           'EnumerateClassNames' and 'GetClass' (kkaempf@suse.de)
--            (needs fixed sblim-sfcc, see www.openwsman.org for details)
-- Added a few more files in %files 
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Mon Sep 22 2008 Matt Domsch <Matt_Domsch@dell.com> - 2.1.0-1
 - update to 2.1.0, resolves security issues
 
-* Tue Aug 19 2008  <srinivas_ramanatha@dell.com> - 2.0.0-1
+* Tue Aug 19 2008  <srinivas_ramanatha@dell.com> - 2.0.0-1%{?dist}
 - Modified the spec file to adhere to fedora packaging guidelines.

python-config

@@ -7,14 +7,10 @@ from distutils import sysconfig
 
 valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags', 
               'ldflags', 'help']
-all_opts = ""
-for opt in valid_opts:
-     all_opts = all_opts +'|--'+opt
-
-
 
 def exit_with_usage(code=1):
-    print >>sys.stderr, "Usage: %s [%s]" % (sys.argv[0],all_opts)
+    print >>sys.stderr, "Usage: %s [%s]" % (sys.argv[0], 
+                                            '|'.join('--'+opt for opt in valid_opts))
     sys.exit(code)
 
 try: