Compare commits

..

3 Commits

Author SHA1 Message Date
Vitezslav Crhonek c3d946be38 Rename service file 2012-05-28 12:35:16 +02:00
Vitezslav Crhonek 6328b1131a Add systemd support 2012-05-23 15:12:19 +02:00
Vitezslav Crhonek 1f538de197 Temporarily disable ruby subpackage 2012-02-09 09:38:00 +01:00
8 changed files with 186 additions and 108 deletions
-4
View File
@@ -2,7 +2,3 @@ openwsman-2.2.3.tar.bz2
/openwsman-2.2.4.tar.bz2
/openwsman-2.2.5.tar.bz2
/openwsman-2.2.7.tar.bz2
/openwsman-2.3.0.tar.bz2
/openwsman-2.3.5.tar.bz2
/openwsman-2.3.6.tar.bz2
/openwsmand.8.gz
+81
View File
@@ -0,0 +1,81 @@
diff -up openwsman-2.2.7/etc/init/openwsmand.sh.cmake.orig openwsman-2.2.7/etc/init/openwsmand.sh.cmake
--- openwsman-2.2.7/etc/init/openwsmand.sh.cmake.orig 2012-01-11 13:38:58.789392556 +0100
+++ openwsman-2.2.7/etc/init/openwsmand.sh.cmake 2012-01-11 13:44:32.383593944 +0100
@@ -4,28 +4,28 @@
# Provides: openwsmand
# Required-Start: $remote_fs
# Required-Stop: $network
-# Default-Start: 2 3 5
-# Default-Stop: 0 1 6
+# Default-Start:
+# Default-Stop:
# Short-Description: Openwsman Daemon
# Description: openwsmand
# Start/Stop the Openwsman Daemon
### END INIT INFO
#
#
-# chkconfig: 2345 36 64
+# chkconfig: - 36 64
# description: Openwsman Daemon
# processname: openwsmand
NAME=openwsmand
DAEMON=/usr/sbin/$NAME
OPTIONS=-S # with SSL
-PIDFILE=/var/run/$NAME.pid
+PIDFILE=/var/run/wsmand.pid
lsb=0
if [ $EUID != 0 ]; then
echo "This script must be run as root."
- exit 1;
+ exit 4;
fi
if [ "$DESCRIPTIVE" = "" ]; then
@@ -65,6 +65,7 @@ start()
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. Please understand the implications of replacing the RNADFILE."
+ exit 6 # Six means "program is not configured", seems to be suitable value
fi
fi
@@ -103,6 +104,9 @@ case "$1" in
stop)
stop
rm -f $lockfile
+ # pid file should be removed by server itself, but it's marked as
+ # TODO in wsmand.c source file;)
+ rm -f $PIDFILE
;;
restart)
@@ -137,6 +141,16 @@ case "$1" in
echo " running"
else
echo " stopped"
+ if [ -e $PIDFILE ]; then
+ echo " stopped, but pid file exists"
+ exit 1
+ elif [ -e $lockfile ]; then
+ echo " stopped, but lock file exists"
+ exit 2
+ else
+ echo " stopped"
+ exit 3
+ fi
fi
fi
;;
@@ -147,6 +161,8 @@ case "$1" in
*)
echo "Usage: $0 {restart|start|stop|reload|force-reload|status|condrestart}"
+ [ "$1" = "usage" ] && exit 0
+ exit 2
esac
if [ $lsb -ne 0 ]; then
+12
View File
@@ -0,0 +1,12 @@
diff -up openwsman-2.2.7/CMakeLists.txt.ruby openwsman-2.2.7/CMakeLists.txt
--- openwsman-2.2.7/CMakeLists.txt.ruby 2012-02-09 09:13:51.222066933 +0100
+++ openwsman-2.2.7/CMakeLists.txt 2012-02-09 09:14:01.059119669 +0100
@@ -103,7 +103,7 @@ SET( BUILD_JAVA_EXPLICIT ${BUILD_JAVA})
OPTION( BUILD_LIBCIM "Build CIM plugin" YES )
OPTION( BUILD_EXAMPLES "Build examples" YES )
OPTION( BUILD_PYTHON "Build Python bindings" YES )
-OPTION( BUILD_RUBY "Build Ruby bindings" YES )
+OPTION( BUILD_RUBY "Build Ruby bindings" NO )
OPTION( BUILD_PERL "Build Perl bindings" YES )
OPTION( BUILD_JAVA "Build Java bindings" YES )
OPTION( BUILD_CSHARP "Build C# bindings" YES)
-12
View File
@@ -1,12 +0,0 @@
diff -up openwsman-2.2.7/src/server/shttpd/compat_unix.h.orig openwsman-2.2.7/src/server/shttpd/compat_unix.h
--- openwsman-2.2.7/src/server/shttpd/compat_unix.h.orig 2012-02-09 13:04:47.528527681 +0100
+++ openwsman-2.2.7/src/server/shttpd/compat_unix.h 2012-02-09 13:05:31.582568867 +0100
@@ -21,7 +21,7 @@
#include <dirent.h>
#include <dlfcn.h>
#ifndef SSL_LIB
-#define SSL_LIB "libssl.so"
+#define SSL_LIB "libssl.so.10"
#endif
#define DIRSEP '/'
#define IS_DIRSEP_CHAR(c) ((c) == '/')
+29
View File
@@ -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
+62 -90
View File
@@ -3,19 +3,19 @@
%{!?python_sitelib: %global 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))")}
%endif
%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
Name: openwsman
BuildRequires: swig
BuildRequires: libcurl-devel libxml2-devel pam-devel sblim-sfcc-devel
BuildRequires: python python-devel ruby ruby-devel rubygem(rdoc) perl
#BuildRequires: python python-devel ruby ruby-devel ruby-rdoc perl
BuildRequires: python python-devel perl
BuildRequires: perl-devel pkgconfig openssl-devel
#BuildRequires: java-1.8.0-openjdk-devel
BuildRequires: cmake
BuildRequires: systemd-units
Version: 2.3.6
Release: 6%{?dist}
Version: 2.2.7
Release: 5%{?dist}
Url: http://www.openwsman.org/
License: BSD
Group: Applications/System
@@ -27,7 +27,9 @@ Source1: openwsmand.8.gz
Source2: openwsmand.service
# script for testing presence of the certificates in ExecStartPre
Source3: owsmantestcert.sh
Patch1: openwsman-2.2.7-libssl.patch
Patch0: %{name}-sitelibdir.patch
Patch2: openwsman-2.2.7-disable-ruby.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXX)
%description
Openwsman is a project intended to provide an open-source
@@ -110,24 +112,17 @@ API.
%package ruby
License: BSD
Group: Development/Libraries
Requires: ruby
Requires: ruby(release)
Summary: Ruby bindings for openwsman client API
%description ruby
This package provides Ruby bindings to access the openwsman client API.
#%package java
#Requires: java
#Requires: libwsman1 = %{version}
#Summary: Java bindings for openwsman client API
#%package ruby
#License: BSD
#Group: Development/Libraries
#Requires: ruby
#Requires: ruby(abi) = 1.9.1
#Summary: Ruby bindings for openwsman client API
#
#%description ruby
#This package provides Ruby bindings to access the openwsman client API.
#%description java
#This package provides Java bindings to access the openwsman client API.
%package perl
@@ -144,7 +139,9 @@ This package provides Perl bindings to access the openwsman client API.
%prep
%setup -q
%patch1 -p1 -b .libssl
# don't make backup of file patched by patch0, it'll be installed...
%patch0 -p1
%patch2 -p1
%build
# Removing executable permissions on .c and .h files to fix rpmlint warnings.
@@ -165,24 +162,25 @@ cmake \
-DCMAKE_SKIP_RPATH=1 \
-DPACKAGE_ARCHITECTURE=`uname -m` \
-DLIB=%{_lib} \
-DBUILD_RUBY_GEM=no \
..
make CFLAGS="-DSSL_LIB='\"$SSL_LIB\"'"
%install
rm -rf %{buildroot}
cd build
make DESTDIR=%{buildroot} install
cd ..
rm -f %{buildroot}/%{_libdir}/*.la
rm -f %{buildroot}/%{_libdir}/openwsman/plugins/*.la
rm -f %{buildroot}/%{_libdir}/openwsman/authenticators/*.la
[ -d %{buildroot}/%{ruby_vendorlibdir} ] && rm -f %{buildroot}/%{ruby_vendorlibdir}/openwsmanplugin.rb
[ -d %{buildroot}/%{ruby_vendorlibdir} ] && rm -f %{buildroot}/%{ruby_vendorlibdir}/openwsman.rb
[ -d %{buildroot}/%{ruby_sitelib} ] && rm -f %{buildroot}/%{ruby_sitelib}/openwsmanplugin.rb
[ -d %{buildroot}/%{ruby_sitelib} ] && rm -f %{buildroot}/%{ruby_sitelib}/openwsman.rb
[ -d %{buildroot/}%{ruby_vendorlib} ] && rm -f %{buildroot}/%{ruby_vendorlib}/openwsmanplugin.rb
mkdir -p %{buildroot}%{_sysconfdir}/init.d
install -m 644 etc/openwsman.conf %{buildroot}/%{_sysconfdir}/openwsman
install -m 644 etc/openwsman_client.conf %{buildroot}/%{_sysconfdir}/openwsman
mkdir -p %{buildroot}/%{_unitdir}
mkdir -p $RPM_BUILD_ROOT%{_unitdir}
install -p -m 644 %{SOURCE2} %{buildroot}/%{_unitdir}/openwsmand.service
install -m 644 etc/ssleay.cnf %{buildroot}/%{_sysconfdir}/openwsman
install -p -m 755 %{SOURCE3} %{buildroot}/%{_sysconfdir}/openwsman
@@ -194,20 +192,33 @@ install -m 644 include/wsman-xml.h %{buildroot}/%{_includedir}/openwsman
install -m 644 include/wsman-xml-binding.h %{buildroot}/%{_includedir}/openwsman
install -m 644 include/wsman-dispatcher.h %{buildroot}/%{_includedir}/openwsman
%clean
rm -rf %{buildroot}
%post -n libwsman1 -p /sbin/ldconfig
%postun -n libwsman1 -p /sbin/ldconfig
%post server
/sbin/ldconfig
%systemd_post openwsmand.service
if [ $1 -eq 1 ] ; then
# Initial installation
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
fi
%preun server
%systemd_preun openwsmand.service
if [ $1 = 0 ] ; then
/bin/systemctl --no-reload disable openwsmand.service > /dev/null 2>&1 || :
/bin/systemctl stop openwsmand.service > /dev/null 2>&1 || :
fi
%postun server
rm -f /var/log/wsmand.log
%systemd_postun_with_restart openwsmand.service
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ "$1" -ge "1" ] ; then
/bin/systemctl try-restart openwsmand.service >/dev/null 2>&1 || :
fi
/sbin/ldconfig
%post client -p /sbin/ldconfig
@@ -215,43 +226,45 @@ rm -f /var/log/wsmand.log
%postun client -p /sbin/ldconfig
%files -n libwsman1
%doc AUTHORS COPYING ChangeLog README.md TODO
%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,-)
%{_includedir}/*
%{_libdir}/pkgconfig/*
%{_libdir}/*.so
%doc AUTHORS COPYING ChangeLog README.md
%doc AUTHORS COPYING ChangeLog README
%files python
%defattr(-,root,root,-)
%{python_sitearch}/*.so
%{python_sitearch}/*.py
%{python_sitearch}/*.pyc
%{python_sitearch}/*.pyo
%doc AUTHORS COPYING ChangeLog README.md
%doc AUTHORS COPYING ChangeLog README
%files ruby
%{ruby_vendorarchdir}/_openwsman.so
%dir %{ruby_vendorlibdir}/openwsman
%{ruby_vendorlibdir}/openwsman/*.rb
%doc AUTHORS COPYING ChangeLog README.md
#%files java
#%defattr(-,root,root)
#%{_javadir}/*jar
#%files ruby
#%defattr(-,root,root,-)
#%{ruby_sitearch}/openwsman.so
#%{ruby_sitearch}/_openwsman.so
#%dir %{ruby_sitelib}/openwsman
#%{ruby_sitelib}/openwsman/*.rb
#%doc AUTHORS COPYING ChangeLog README
%files perl
%defattr(-,root,root,-)
%{perl_vendorarch}/openwsman.so
%{perl_vendorlib}/openwsman.pm
%doc AUTHORS COPYING ChangeLog README.md
%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
@@ -269,63 +282,22 @@ rm -f /var/log/wsmand.log
%{_sbindir}/openwsmand
%{_libdir}/libwsman_server.so.*
%{_mandir}/man8/*
%doc AUTHORS COPYING ChangeLog README.md
%doc AUTHORS COPYING ChangeLog README
%files client
%defattr(-,root,root,-)
%{_libdir}/libwsman_clientpp.so.*
%config(noreplace) %{_sysconfdir}/openwsman/openwsman_client.conf
%doc AUTHORS COPYING ChangeLog README.md
%doc AUTHORS COPYING ChangeLog README
%changelog
* Tue Mar 19 2013 Vít Ondruch <vondruch@redhat.com> - 2.3.6-6
- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
* Mon Mar 18 2013 Praveen K Paladugu <praveen_paladugu@dell.com>-2.3.6-5
- Disabling the java binding for now.
* Fri Mar 15 2013 Praveen K Paladugu <praveen_paladugu@dell.com>-2.3.6-4
- Enabled java bindings in the build
- Removed versioned dep on ruby
* Wed Mar 13 2013 Peter Robinson <pbrobinson@fedoraproject.org> 2.3.6-3
- rebuild for ruby 2
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Thu Nov 08 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.3.6-1
- Update to openwsman-2.3.6
* Mon Sep 17 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.3.5-1
- Update to openwsman-2.3.5
- Enable ruby subpackage again
* Tue Aug 28 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.3.0-7
- Fix issues found by fedora-review utility in the spec file
* Thu Aug 23 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.3.0-6
- Use new systemd-rpm macros
Resolves: #850405
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Sun Jun 10 2012 Petr Pisar <ppisar@redhat.com> - 2.3.0-4
- Perl 5.16 rebuild
* Mon May 28 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.3.0-3
* Mon May 28 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.7-5
- Rename service file
* Wed May 23 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.3.0-2
* Wed May 23 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.7-4
- Add systemd support
* Tue Mar 27 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.3.0-1
- Update to openwsman-2.3.0
* Thu Feb 09 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.7-4
- Fix libssl loading
* Thu Feb 09 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.7-3
- Temporarily disable ruby subpackage
BIN
View File
Binary file not shown.
+2 -2
View File
@@ -1,2 +1,2 @@
54eb12ce88c7750b240d6185df2d6716 openwsman-2.3.6.tar.bz2
57979ad828cabf969adac186642f69bc openwsmand.8.gz
3958e97476aa94c506075e3cd165240d openwsman-2.2.5.tar.bz2
c72e3b34e25f393be8fd1ead6b4a5bae openwsman-2.2.7.tar.bz2