Compare commits

..

6 Commits

Author SHA1 Message Date
Fedora Release Engineering 025743a0f7 dist-git conversion 2010-07-29 05:20:21 +00:00
Praveen K Paladugu 9fae8ae628 Changed the random file and some init script changes to not start the
server by default
2009-12-17 00:23:04 +00:00
Praveen K Paladugu 08a213624b Broke the package into lib, server and client parts 2009-12-11 21:58:27 +00:00
Bill Nottingham 5a196e83f1 Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-26 01:25:15 +00:00
Praveen K Paladugu 27a363eaf3 Updated the sources to 2.2.0. 2009-10-01 18:17:09 +00:00
Kevin Fenzi 1e7d79c565 Initialize branch F-12 for openwsman 2009-09-25 16:38:13 +00:00
8 changed files with 258 additions and 165 deletions
+1 -1
View File
@@ -1 +1 @@
openwsman-2.2.3.tar.bz2
openwsman-2.2.0.tar.bz2
-14
View File
@@ -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.
+103 -87
View File
@@ -1,7 +1,7 @@
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 @@
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
# Required-Stop: $network
@@ -20,93 +20,109 @@ diff -up ./etc/init/openwsmand.sh.in.old ./etc/init/openwsmand.sh.in
# 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
NAME=openwsmand
DAEMON=/usr/sbin/$NAME
-OPTIONS=
+OPTIONS=-S
PIDFILE=/var/run/$NAME.pid
@@ -145,6 +141,10 @@ case "$1" in
fi
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)
@@ -71,16 +73,28 @@ EOF
# 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
;;
+ condrestart)
+ [ -e $lockfile ] && restart
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 +105,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}"
+ echo "Usage: $0 {restart|start|stop|reload|force-reload|status|condrestart}"
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 [ -f "/etc/SuSe-release" ]; then
rc_exit
+elif [ -f "/etc/redhat-release" ]; then
+exit 0
+fi
+24
View File
@@ -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
+2
View File
@@ -0,0 +1,2 @@
addFilter("devel-file-in-non-devel-package .*/usr/lib.*/openwsman/.*/.*")
addFilter("openwsman-client.*shlib-policy-name-error.*")
+105 -62
View File
@@ -1,6 +1,20 @@
#
# spec file for package openwsman (Version 2.2.3)
# spec file for package openwsman (Version 2.2.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
@@ -15,21 +29,23 @@ BuildRequires: python python-devel ruby ruby-devel perl
BuildRequires: perl-devel pkgconfig openssl-devel
BuildRequires: libtool
Requires: net-tools
Version: 2.2.3
Version: 2.2.0
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
Source: %{name}-%{version}.tar.bz2
Source1: %{name}.rpmlintrc
Patch0: %{name}-pam-auth.patch
Patch1: %{name}-initscript.patch
Patch2: perl-bindings.patch
Patch3: %{name}-randfile.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXX)
%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
@@ -38,6 +54,11 @@ all system management aspects.
Authors:
--------
Anas Nashif <anas.nashif@intel.com>
Vadim Revyakin <vadim.revyakin@intel.com>
Denis Sadykov <denis.sadykov@intel.com>
%package -n libwsman1
License: BSD
@@ -45,12 +66,18 @@ Group: System Environment/Libraries
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
Authors:
--------
Anas Nashif <anas.nashif@intel.com>
Vadim Revyakin <vadim.revyakin@intel.com>
Denis Sadykov <denis.sadykov@intel.com>
%package -n libwsman-devel
License: BSD
@@ -68,6 +95,11 @@ Requires: libcurl-devel
Development files for openwsman
Authors:
--------
Anas Nashif <anas.nashif@intel.com>
Vadim Revyakin <vadim.revyakin@intel.com>
Denis Sadykov <denis.sadykov@intel.com>
%package client
License: BSD
@@ -79,11 +111,17 @@ Openwsman Client libraries
Authors:
--------
Anas Nashif <anas.nashif@intel.com>
Vadim Revyakin <vadim.revyakin@intel.com>
Denis Sadykov <denis.sadykov@intel.com>
%package server
License: BSD
Group: System Environment/Daemons
Requires: net-tools
Requires: openwsman-client
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(postun): initscripts
@@ -94,6 +132,11 @@ Openwsman Server and service libraries
Authors:
--------
Anas Nashif <anas.nashif@intel.com>
Vadim Revyakin <vadim.revyakin@intel.com>
Denis Sadykov <denis.sadykov@intel.com>
%package python
License: BSD
@@ -107,6 +150,11 @@ API.
Authors:
--------
Anas Nashif <anas.nashif@intel.com>
Vadim Revyakin <vadim.revyakin@intel.com>
Denis Sadykov <denis.sadykov@intel.com>
%package ruby
License: BSD
@@ -120,6 +168,11 @@ This package provides Ruby bindings to access the openwsman client API.
Authors:
--------
Anas Nashif <anas.nashif@intel.com>
Vadim Revyakin <vadim.revyakin@intel.com>
Denis Sadykov <denis.sadykov@intel.com>
%package perl
License: BSD
@@ -132,11 +185,18 @@ This package provides Perl bindings to access the openwsman client API.
Authors:
--------
Anas Nashif <anas.nashif@intel.com>
Vadim Revyakin <vadim.revyakin@intel.com>
Denis Sadykov <denis.sadykov@intel.com>
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
sh autoconfiscate.sh
@@ -158,18 +218,18 @@ make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_flags}
%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
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
install -m 644 etc/openwsman.conf %{buildroot}/%{_sysconfdir}/openwsman
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
make DESTDIR=$RPM_BUILD_ROOT install
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}
rm -rf $RPM_BUILD_ROOT
%post -n libwsman1 -p /sbin/ldconfig
@@ -180,16 +240,10 @@ rm -rf %{buildroot}
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
@@ -197,37 +251,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_sitelib}/*.py
%{python_sitelib}/*.pyc
%{python_sitelib}/*.pyo
#%{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/openwsman.rb
%{ruby_sitelib}/openwsman/xmlnode.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
@@ -235,7 +289,7 @@ 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
@@ -255,41 +309,31 @@ fi
%doc AUTHORS COPYING ChangeLog README
%files client
%defattr(-,root,root,-)
%defattr(-,root,root)
%{_libdir}/libwsman_clientpp.so.*
%doc AUTHORS COPYING ChangeLog README
%changelog
* Tue Aug 10 2010 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.3-3
- Moved the certificate generation from the init script. The user has to
- manually generate on before starting the service.
* Wed Dec 16 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-3
- Changed the random file used by openssl to generate a certificate while
- starting the openwsman-server service
* Thu Apr 22 2010 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.3-2
- 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.
* Wed Dec 9 2009 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.0-2
- Re-wrote the spec file to break the openwmsman pkg into lib, client
- and server components following the upstream spec file.
* Fri Apr 16 2010 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.3-1
- Updated the sources to 2.2.3
- Updated the spec file to follow the upstream packaging format.
- 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 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-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)
* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 2.1.0-4
- rebuilt with new openssl
@@ -305,4 +349,3 @@ fi
* Tue Aug 19 2008 <srinivas_ramanatha@dell.com> - 2.0.0-1%{?dist}
- Modified the spec file to adhere to fedora packaging guidelines.
+22
View File
@@ -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)
+1 -1
View File
@@ -1 +1 @@
79f637d86a2cbd2d6763b80f68e4bc96 openwsman-2.2.3.tar.bz2
62b4eaf752171058bf0036e049ca01d0 openwsman-2.2.0.tar.bz2