Compare commits

..
8 changed files with 60 additions and 122 deletions
View File
+21
View File
@@ -0,0 +1,21 @@
# Makefile for source rpm: openwsman
# $Id: Makefile,v 1.1 2008/10/13 10:50:29 huzaifas Exp $
NAME := openwsman
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
+1
View File
@@ -0,0 +1 @@
EL-4
+1
View File
@@ -0,0 +1 @@
openwsman-2_1_0-1_fc9:EL-4:openwsman-2.1.0-1.fc9.src.rpm:1225537139
+5 -75
View File
@@ -1,6 +1,6 @@
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
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
@@ -4,21 +4,21 @@
# Provides: openwsmand
# Required-Start: $remote_fs
@@ -46,36 +46,7 @@ diff -up ./etc/init/openwsmand.sh.in.bak ./etc/init/openwsmand.sh.in
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
@@ -71,16 +73,28 @@ EOF
# Start daemons.
echo -n "Starting the $DESCRIPTIVE"
@@ -108,7 +79,7 @@ diff -up ./etc/init/openwsmand.sh.in.bak ./etc/init/openwsmand.sh.in
rm -f $lockfile
;;
@@ -91,19 +101,40 @@ EOF
@@ -91,19 +105,40 @@ EOF
;;
reload)
@@ -155,44 +126,3 @@ diff -up ./etc/init/openwsmand.sh.in.bak ./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
-12
View File
@@ -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
+26 -33
View File
@@ -1,11 +1,11 @@
%{!?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"] ')}
%{!?ruby_sitelib: %global ruby_sitelib %(/usr/bin/ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
%{!?ruby_sitearch: %global ruby_sitearch %(/usr/bin/ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
Name: openwsman
Version: 2.2.0
Release: 6%{?dist}
Release: 5%{?dist}
License: BSD
Url: http://www.openwsman.org/
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -13,7 +13,6 @@ 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
@@ -52,7 +51,7 @@ Requires: libwsman1 = %{version}
Requires: %{name}-server = %{version}
Requires: %{name}-client = %{version}
Requires: sblim-sfcc-devel libxml2-devel pam-devel
Requires: curl-devel
Requires: libcurl-devel
%description -n libwsman-devel
Development files for openwsman
@@ -117,7 +116,6 @@ This package provides Perl bindings to access the openwsman client API.
%patch0 -p1
%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
@@ -229,40 +227,35 @@ rm -f /var/log/wsmand.log
%{_libdir}/libwsman_clientpp.so.*
%doc AUTHORS COPYING ChangeLog README
%changelog
* 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 28 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-5
- Added a few Build dependencies
* 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.
* Thu 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.
* Thu Oct 1 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-4
- removed the hard coding of ruby_libdir
* 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
* Tue Sep 29 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-3
- Changed back the hard coding of /usr/lib
* Thu Oct 1 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-2
- Increasing the release number to make another tag
* 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.
- Changed the release and version numbers.
* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 2.1.0-4
- rebuilt with new openssl
* 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
* 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
* 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%{?dist}
* Tue Aug 19 2008 <srinivas_ramanatha@dell.com> - 2.0.0-1
- Modified the spec file to adhere to fedora packaging guidelines.
+6 -2
View File
@@ -7,10 +7,14 @@ 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],
'|'.join('--'+opt for opt in valid_opts))
print >>sys.stderr, "Usage: %s [%s]" % (sys.argv[0],all_opts)
sys.exit(code)
try: