Update to openwsman-2.4.3

.gitignore

@@ -5,3 +5,6 @@ openwsman-2.2.3.tar.bz2
 /openwsman-2.3.0.tar.bz2
 /openwsman-2.3.5.tar.bz2
 /openwsman-2.3.6.tar.bz2
+/openwsmand.8.gz
+/openwsman-2.4.0.tar.gz
+/v2.4.3.tar.gz

openwsman-2.2.3-initscript.patch

@@ -1,81 +0,0 @@
-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

openwsman-2.2.7-disable-ruby.patch

@@ -1,12 +0,0 @@
-diff -up openwsman-2.3.0/CMakeLists.txt.orig openwsman-2.3.0/CMakeLists.txt
---- openwsman-2.3.0/CMakeLists.txt.orig	2012-03-27 11:51:51.262460385 +0200
-+++ openwsman-2.3.0/CMakeLists.txt	2012-03-27 11:52:13.732573549 +0200
-@@ -105,7 +105,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 )
- IF( BUILD_RUBY )
- OPTION( BUILD_RUBY_GEM "Build Ruby GEM" YES )
- ENDIF( BUILD_RUBY )

openwsman-2.4.0-pamsetup.patch

@@ -0,0 +1,15 @@
+diff -up openwsman-2.4.0/etc/pam/openwsman.pamsetup openwsman-2.4.0/etc/pam/openwsman
+--- openwsman-2.4.0/etc/pam/openwsman.pamsetup	2013-09-27 17:14:39.147565052 +0200
++++ openwsman-2.4.0/etc/pam/openwsman	2013-09-27 17:15:12.744578165 +0200
+@@ -1,7 +1,7 @@
+ #%PAM-1.0
+-auth       required	pam_unix2.so	nullok
++auth       required	pam_unix.so	nullok
+ auth       required	pam_nologin.so
+-account    required	pam_unix2.so
++account    required	pam_unix.so
+ password   required	pam_pwcheck.so	nullok
+-password   required	pam_unix2.so	nullok use_first_pass use_authtok
+-session    required	pam_unix2.so	none
++password   required	pam_unix.so	nullok use_first_pass use_authtok
++session    required	pam_unix.so	none

openwsman-sitelibdir.patch

@@ -1,29 +0,0 @@
-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

openwsman.spec

@@ -3,8 +3,6 @@
 %{!?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 -r rbconfig -e 'vd = RbConfig::CONFIG["vendorlibdir"]; print(vd ? vd : RbConfig::CONFIG["sitelibdir"])')}
-%{!?ruby_sitearch: %global ruby_sitearch %(ruby -r rbconfig -e 'vad = RbConfig::CONFIG["vendorarchdir"]; print(vad ? vad : RbConfig::CONFIG["sitearchdir"])')}
 
 Name:           openwsman
 BuildRequires:  swig
@@ -12,23 +10,24 @@ BuildRequires:  libcurl-devel libxml2-devel pam-devel sblim-sfcc-devel
 BuildRequires:  python python-devel ruby ruby-devel rubygem(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:        3%{?dist}
+Version:        2.4.3
+Release:        1%{?dist}
 Url:            http://www.openwsman.org/
 License:        BSD
 Group:          Applications/System
 Summary:        Open source Implementation of WS-Management
-Source:         http://downloads.sourceforge.net/project/openwsman/%{name}/%{version}/%{name}-%{version}.tar.bz2
+Source:         https://github.com/Openwsman/openwsman/archive/v%{version}.tar.gz
 # help2man generated manpage for openwsmand binary
 Source1:        openwsmand.8.gz
 # service file for systemd
 Source2:        openwsmand.service
 # script for testing presence of the certificates in ExecStartPre
 Source3:        owsmantestcert.sh
-Patch0:         %{name}-sitelibdir.patch
 Patch1:         openwsman-2.2.7-libssl.patch
+Patch2:         openwsman-2.4.0-pamsetup.patch
 
 %description
 Openwsman is a project intended to provide an open-source
@@ -46,8 +45,8 @@ all system management aspects.
 License:        BSD
 Group:          System Environment/Libraries
 Summary:        Open source Implementation of WS-Management
-Provides:       %{name} = %{version}
-Obsoletes:      %{name} < %{version}
+Provides:       %{name} = %{version}-%{release}
+Obsoletes:      %{name} < %{version}-%{release}
 
 %description -n libwsman1
 Openwsman library for packages dependent on openwsman
@@ -59,11 +58,11 @@ Openwsman library for packages dependent on openwsman
 License:        BSD
 Group:          Development/Libraries
 Summary:        Open source Implementation of WS-Management
-Provides:       %{name}-devel = %{version}
-Obsoletes:      %{name}-devel < %{version}
-Requires:       libwsman1 = %{version}
-Requires:       %{name}-server = %{version}
-Requires:       %{name}-client = %{version}
+Provides:       %{name}-devel = %{version}-%{release}
+Obsoletes:      %{name}-devel < %{version}-%{release}
+Requires:       libwsman1 = %{version}-%{release}
+Requires:       %{name}-server = %{version}-%{release}
+Requires:       %{name}-client = %{version}-%{release}
 Requires:       sblim-sfcc-devel libxml2-devel pam-devel
 Requires:       libcurl-devel
 
@@ -91,6 +90,7 @@ Requires(post):       chkconfig
 Requires(preun):      chkconfig
 Requires(postun):     initscripts
 Summary:        Openwsman Server and service libraries
+Requires:       libwsman1 = %{version}-%{release}
 
 %description server
 Openwsman Server and service libraries
@@ -103,6 +103,7 @@ License:        BSD
 Group:          Development/Libraries
 Summary:        Python bindings for openwsman client API
 Requires:       python
+Requires:       libwsman1 = %{version}-%{release}
 
 %description python
 This package provides Python bindings to access the openwsman client
@@ -115,12 +116,21 @@ API.
 License:        BSD
 Group:          Development/Libraries
 Requires:       ruby
-Requires:       ruby(abi) = 1.9.1
+Requires:       ruby(release)
 Summary:        Ruby bindings for openwsman client API
+Requires:       libwsman1 = %{version}-%{release}
 
 %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
+#Group:          Development/Libraries
+
+#%description java
+#This package provides Java bindings to access the openwsman client API.
 
 
 
@@ -129,6 +139,7 @@ License:        BSD
 Group:          Development/Libraries
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Summary:        Perl bindings for openwsman client API
+Requires:       libwsman1 = %{version}-%{release}
 
 %description perl
 This package provides Perl bindings to access the openwsman client API.
@@ -138,9 +149,12 @@ This package provides Perl bindings to access the openwsman client API.
 
 %prep
 %setup -q
-# don't make backup of file patched by patch0, it'll be installed...
-%patch0 -p1
 %patch1 -p1 -b .libssl
+%patch2 -p1 -b .pamsetup
+
+# Fix wrong symlinks (fixed upstream, will be in 2.4.1)
+ln -sf %{_bindir}/rdoc bindings/ruby/rdoc1_9.rb 
+ln -sf %{_bindir}/rdoc bindings/ruby/rdoc2_0.rb 
 
 %build
 # Removing executable permissions on .c and .h files to fix rpmlint warnings. 
@@ -151,6 +165,8 @@ mkdir build
 
 export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DFEDORA -DNO_SSL_CALLBACK"
 export SSL_LIB=`readlink %{_libdir}/libssl.so`
+export CFLAGS="-D_GNU_SOURCE -fPIE -DPIE"
+export LDFLAGS="$LDFLAGS -Wl,-z,now -pie"
 cd build
 cmake \
   -DCMAKE_INSTALL_PREFIX=/usr \
@@ -173,9 +189,8 @@ cd ..
 rm -f %{buildroot}/%{_libdir}/*.la
 rm -f %{buildroot}/%{_libdir}/openwsman/plugins/*.la
 rm -f %{buildroot}/%{_libdir}/openwsman/authenticators/*.la
-[ -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
+[ -d %{buildroot}/%{ruby_vendorlibdir} ] && rm -f %{buildroot}/%{ruby_vendorlibdir}/openwsmanplugin.rb
+[ -d %{buildroot}/%{ruby_vendorlibdir} ] && rm -f %{buildroot}/%{ruby_vendorlibdir}/openwsman.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
@@ -231,11 +246,16 @@ rm -f /var/log/wsmand.log
 %doc AUTHORS COPYING ChangeLog README.md
 
 %files ruby
-%{ruby_sitearch}/_openwsman.so
-%dir %{ruby_sitelib}/openwsman
-%{ruby_sitelib}/openwsman/*.rb
+%{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 perl
 %{perl_vendorarch}/openwsman.so
 %{perl_vendorlib}/openwsman.pm
@@ -270,6 +290,34 @@ rm -f /var/log/wsmand.log
 
 
 %changelog
+* Thu Jan 23 2014 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.4.3-1
+- Update to openwsman-2.4.3
+
+* Tue Jan 07 2014 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.4.0-3
+- Start the service using SSL by default
+
+* Mon Sep 30 2013 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.4.0-2
+- Build with full relro
+- Fix provides/requires
+- Fix pam.d config (patch by Ales Ledvinka)
+  Resolves: #1013018
+
+* Tue Sep 17 2013 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.4.0-1
+- Update to openwsman-2.4.0
+- Fix bogus date in %%changelog
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.6-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 2.3.6-7
+- Perl 5.18 rebuild
+
+* 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-4
+- Updated the dependency for ruby bindings and introduced the java bindings.
+
 * Wed Mar 13 2013 Peter Robinson <pbrobinson@fedoraproject.org> 2.3.6-3
 - rebuild for ruby 2
 
@@ -360,7 +408,7 @@ rm -f /var/log/wsmand.log
 * Tue Jun 01 2010 Marcela Maslanova <mmaslano@redhat.com> - 2.2.3-4
 - Mass rebuild with perl-5.12.0
 
-* Tue Apr 22 2010 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.3-3
+* Thu Apr 22 2010 Praveen K Paladugu <praveen_paladugu@dell.com> - 2.2.3-3
 - authors.patch: Moved all the AUTHORS info to AUTHORS file.
 - Corrected the Source tag.
 - Corrected the package dependencies to break cyclic dependencies.

openwsmand.service

@@ -4,7 +4,7 @@ After=syslog.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/openwsmand
+ExecStart=/usr/sbin/openwsmand -S
 ExecStartPre=/etc/openwsman/owsmantestcert.sh
 PIDFile=/var/run/wsmand.pid
 

sources

@@ -1 +1,2 @@
-54eb12ce88c7750b240d6185df2d6716  openwsman-2.3.6.tar.bz2
+57979ad828cabf969adac186642f69bc  openwsmand.8.gz
+794b0d968f92577ff3451b8925744a43  v2.4.3.tar.gz