rpms/openwsman/EL-5 openwsman-pam-auth.patch, NONE, 1.1 openwsman-randfile.patch, NONE, 1.1 perl-bindings.patch, NONE, 1.1 openwsman-initscript.patch, 1.1, 1.2 openwsman.spec, 1.6, 1.7
Praveen K Paladugu
praveenp at fedoraproject.org
Thu Dec 31 20:05:14 UTC 2009
Author: praveenp
Update of /cvs/pkgs/rpms/openwsman/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8231
Modified Files:
openwsman-initscript.patch openwsman.spec
Added Files:
openwsman-pam-auth.patch openwsman-randfile.patch
perl-bindings.patch
Log Message:
Updated the spec file to follow the upstream packaging format
openwsman-pam-auth.patch:
openwsman.conf | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE openwsman-pam-auth.patch ---
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:
ssleay.cnf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE openwsman-randfile.patch ---
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
perl-bindings.patch:
Makefile.am | 1 +
Makefile.in | 1 +
2 files changed, 2 insertions(+)
--- NEW FILE perl-bindings.patch ---
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)
openwsman-initscript.patch:
openwsmand.sh.in | 71 +++++++++++++++++++++++++++++++++++++++++--------------
1 file changed, 53 insertions(+), 18 deletions(-)
Index: openwsman-initscript.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/EL-5/openwsman-initscript.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openwsman-initscript.patch 1 Nov 2008 10:34:43 -0000 1.1
+++ openwsman-initscript.patch 31 Dec 2009 20:05:13 -0000 1.2
@@ -1,11 +1,14 @@
---- openwsman-2.0.0/etc/init/openwsmand.sh.in.orig 2008-09-07 00:01:29.000000000 -0500
-+++ openwsman-2.0.0/etc/init/openwsmand.sh.in 2008-09-07 00:34:57.000000000 -0500
-@@ -4,15 +4,13 @@
+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
-# 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
@@ -17,12 +20,109 @@
# description: Openwsman Daemon
# processname: openwsmand
-@@ -57,7 +55,7 @@ case "$1" in
- 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
+ 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)
+@@ -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
+ ;;
+
+ 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|condrestart}"
+ esac
+
++if [ -f "/etc/SuSe-release" ]; then
+ rc_exit
++elif [ -f "/etc/redhat-release" ]; then
++exit 0
++fi
Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/EL-5/openwsman.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- openwsman.spec 1 Oct 2009 18:14:51 -0000 1.6
+++ openwsman.spec 31 Dec 2009 20:05:14 -0000 1.7
@@ -1,21 +1,24 @@
+%{!?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)")}
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
-%define ruby_libdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
-
Name: openwsman
Version: 2.2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
License: BSD
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: Web Services Management libraries
-BuildRequires: sblim-sfcc-devel curl-devel libxml2-devel pkgconfig pam-devel openssl-devel swig python python-devel ruby ruby-devel
+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
@@ -29,132 +32,223 @@ is based on a suite of web services spec
requirements that exposes a set of operations focused on and covers
all system management aspects.
-
-%package devel
-Summary: Openwsman Development files
+%package -n libwsman1
+License: BSD
+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
+%package -n libwsman-devel
+License: BSD
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
-%description devel
-Openwsman Development files
+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: curl-devel
+
+%description -n libwsman-devel
+Development files for openwsman
+
+%package client
+License: BSD
+Group: System Environment/Libraries
+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
+Summary: Openwsman Server and service libraries
+
+%description server
+Openwsman Server and service libraries
+
%package python
-Summary: Openwsman Python bindings
+License: BSD
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Summary: Python bindings for openwsman client API
+Requires: python
+
%description python
-Openwsman python bindings
+This package provides Python bindings to access the openwsman client
+API.
-%package -n ruby-%{name}
-Summary: Openwsman Ruby bindings
+%package ruby
+License: BSD
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: ruby
Requires: ruby(abi) = 1.8
-Provides: ruby(%{name}) = %{version}
-%description -n ruby-%{name}
-Openwsman ruby bindings
+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
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Summary: Perl bindings for openwsman client API
+
+%description perl
+This package provides Perl bindings to access the openwsman client API.
+
+
+
%prep
-%setup -q
+%setup -q
%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
%build
+sh autoconfiscate.sh
chmod a-x src/lib/*.[ch]
chmod a-x src/cpp/*.[ch]
chmod a-x include/*.[ch]
# disable eventing, as Fedora libcurl isn't linked against openssl
# disable tests in 2.1.0, http://www.openwsman.org/bug/263
-%configure --with-examples=yes --with-tests=no --enable-python=yes --enable-ruby=yes --enable-eventing=no --disable-more-warnings PATH=$PATH:.
-make %{?_smp_flags}
+%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}
make DESTDIR=%{buildroot} install
-install -m 0644 etc/openwsman.conf %{buildroot}/etc/openwsman
-install -m 0644 etc/ssleay.cnf %{buildroot}/etc/openwsman
-install -D -m 0755 etc/init/%{name}d.sh %{buildroot}/%{_initrddir}/%{name}d
-# move this helper script out of /etc
-mkdir -p %{buildroot}/%{_libexecdir}/%{name}/
-chmod 0755 %{buildroot}/etc/%{name}/owsmangencert.sh
-mv %{buildroot}/etc/%{name}/owsmangencert.sh %{buildroot}/%{_libexecdir}/%{name}/
-find %{buildroot} -type f -name \*.la -exec rm \{\} \;
-find %{buildroot} -type f -name \*.a -exec rm \{\} \;
+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
+chkconfig --add openwsmand
+
+%preun server
+chkconfig --del openwsmand
+
+%postun server
+rm -f /var/log/wsmand.log
+/sbin/ldconfig
+
+%post client -p /sbin/ldconfig
+
+%postun client -p /sbin/ldconfig
-%files
+%files -n libwsman1
%defattr(-,root,root)
-%{_sbindir}/%{name}d
-%{_initrddir}/%{name}d
-%{_libexecdir}/%{name}
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/plugins
-%dir %{_libdir}/%{name}/authenticators
-%{_libdir}/libwsman*.so.*
-%{_libdir}/%{name}/plugins/*so.*
-%{_libdir}/%{name}/authenticators/*so.*
-%dir /etc/openwsman
-%config(noreplace) /etc/openwsman/openwsman.conf
-%config(noreplace) /etc/openwsman/ssleay.cnf
-%{ruby_libdir}/openwsman
-%config(noreplace) %{_sysconfdir}/pam.d/openwsman
-%doc COPYING README
+%doc AUTHORS COPYING ChangeLog README TODO
+%{_libdir}/libwsman.so.*
+%{_libdir}/libwsman_client.so.*
+%{_libdir}/libwsman_curl_client_transport.so.*
-%files devel
+%files -n libwsman-devel
%defattr(-,root,root)
%{_includedir}/*
+%{_libdir}/pkgconfig/*
%{_libdir}/*.so
-%{_libdir}/%{name}/plugins/*so
-%{_libdir}/%{name}/authenticators/*so
-%{_libdir}/pkgconfig/%{name}*.pc
-%doc COPYING examples/serialize.c doc/plugin*
+%doc AUTHORS COPYING ChangeLog README
%files python
%defattr(-,root,root)
-%{python_sitelib}/pywsman.py
%{python_sitearch}/*.so
-%doc COPYING
+%{python_sitelib}/*.py
+#%{python_sitelib}/*.pyc
+#%{python_sitelib}/*.pyo
+%doc AUTHORS COPYING ChangeLog README
-%files -n ruby-%{name}
+%files ruby
%defattr(-,root,root)
-%{ruby_sitearch}/*.so
-%doc COPYING
-
-%post
-/sbin/ldconfig
-/sbin/chkconfig --add %{name}d
+%{ruby_sitearch}/openwsman.so
+%dir %{ruby_sitelib}/openwsman
+%{ruby_sitelib}/openwsman/openwsman.rb
+%{ruby_sitelib}/openwsman/wsxmlnode.rb
+%doc AUTHORS COPYING ChangeLog README
-%preun
-if [ $1 = 0 ] ; then
- /sbin/service %{name}d stop >/dev/null 2>&1
- /sbin/chkconfig --del %{name}d
-fi
-
-%postun
-/sbin/ldconfig
-if [ "$1" -ge "1" ] ; then
- /sbin/service %{name}d condrestart >/dev/null 2>&1 || :
-fi
+%files perl
+%defattr(-,root,root)
+%{perl_vendorarch}/openwsman.so
+%{perl_vendorlib}/openwsman.pm
+%doc AUTHORS COPYING ChangeLog README
+
+%files server
+# Don't remove *.so files from the server package.
+# the server fails to start without these files.
+%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}/init.d/openwsmand
+%dir %{_libdir}/openwsman
+%dir %{_libdir}/openwsman/authenticators
+%{_libdir}/openwsman/authenticators/*.so
+%{_libdir}/openwsman/authenticators/*.so.*
+%dir %{_libdir}/openwsman/plugins
+%{_libdir}/openwsman/plugins/*.so
+%{_libdir}/openwsman/plugins/*.so.*
+%{_sbindir}/openwsmand
+%{_sbindir}/rcopenwsmand
+%{_libdir}/libwsman_server.so.*
+%doc AUTHORS COPYING ChangeLog README
+%files client
+%defattr(-,root,root)
+%{_libdir}/libwsman_clientpp.so.*
+%doc AUTHORS COPYING ChangeLog README
%changelog
+* Tue Dec 29 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-5
+- Updating the spec file to follow the upstream packaging format.
+
* Thu Oct 1 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-4
- removed the hard coding of ruby_libdir
+
* Tue Sep 29 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-3
- Changed back the hard coding of /usr/lib
+
* Tue Sep 29 2009 Praveen K Paladugu <praveen_paladugu at 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
+- 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 at 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 at redhat.com> - 2.1.0-4
- rebuilt with new openssl
More information about the fedora-extras-commits
mailing list