Add shebang to winrs ruby script, make it executable

.gitignore

@@ -10,3 +10,9 @@ openwsman-2.2.3.tar.bz2
 /v2.4.3.tar.gz
 /v2.4.4.tar.gz
 /v2.4.6.tar.gz
+/openwsman-2.4.12.tar.gz
+/openwsman-2.4.14.tar.gz
+/openwsman-2.4.15.tar.gz
+/openwsman-2.6.0.tar.gz
+/openwsman-2.6.1.tar.gz
+/openwsman-2.6.2.tar.gz

openwsman-2.4.0-pamsetup.patch

@@ -1,15 +1,16 @@
-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
+diff -up openwsman-2.6.1/etc/pam/openwsman.pamsetup openwsman-2.6.1/etc/pam/openwsman
+--- openwsman-2.6.1/etc/pam/openwsman.pamsetup	2015-08-27 15:46:46.000000000 +0200
++++ openwsman-2.6.1/etc/pam/openwsman	2015-08-31 16:08:28.166913889 +0200
 @@ -1,7 +1,7 @@
  #%PAM-1.0
 -auth       required	pam_unix2.so	nullok
-+auth       required	pam_unix.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_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
++account    required	pam_unix.so
++password   required	pam_pwquality.so
++password   required	pam_unix.so		nullok use_first_pass use_authtok
++session    required	pam_unix.so

openwsman-2.4.12-ruby-binding-build.patch

@@ -0,0 +1,12 @@
+diff -up openwsman-2.4.12/bindings/ruby/extconf.rb.orig openwsman-2.4.12/bindings/ruby/extconf.rb
+--- openwsman-2.4.12/bindings/ruby/extconf.rb.orig	2015-02-09 09:28:58.232581263 +0100
++++ openwsman-2.4.12/bindings/ruby/extconf.rb	2015-02-09 09:38:22.836772879 +0100
+@@ -32,7 +32,7 @@ swig = find_executable("swig")
+ raise "SWIG not found" unless swig
+ 
+ major, minor, path = RUBY_VERSION.split(".")
+-raise "SWIG failed to run" unless system("#{swig} -ruby -autorename -DRUBY_VERSION=#{major}#{minor} -I. -I/usr/include/openwsman -o openwsman_wrap.c openwsman.i")
++raise "SWIG failed to run" unless system("#{swig} -ruby -autorename -DRUBY_VERSION=#{major}#{minor} -I. -I/usr/include/openwsman -I/builddir/build/BUILD/openwsman-2.6.2/include/ -o openwsman_wrap.c openwsman.i")
+ 
+ $CPPFLAGS = "-I/usr/include/openwsman -I.."
+ 

openwsman-2.6.2-winrs-shebang.patch

@@ -0,0 +1,9 @@
+diff -up openwsman-2.6.2/examples/winrs.rb.orig openwsman-2.6.2/examples/winrs.rb
+--- openwsman-2.6.2/examples/winrs.rb.orig	2015-10-19 15:27:46.000000000 +0200
++++ openwsman-2.6.2/examples/winrs.rb	2017-03-13 10:30:22.812169561 +0100
+@@ -1,3 +1,5 @@
++#!/usr/bin/env ruby
++#
+ # winrs.rb
+ #
+ # Windows Remote Shell

openwsman.spec

@@ -13,16 +13,17 @@ BuildRequires:  libcurl-devel libxml2-devel pam-devel sblim-sfcc-devel
 BuildRequires:  python python-devel ruby ruby-devel rubygems-devel 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.4.6
-Release:        3%{?dist}
+Version:        2.6.2
+Release:        4%{?dist}
 Url:            http://www.openwsman.org/
 License:        BSD
 Group:          Applications/System
 Summary:        Open source Implementation of WS-Management
-Source:         https://github.com/Openwsman/openwsman/archive/v%{version}.tar.gz
+# You can get this tarball here:
+# https://github.com/Openwsman/openwsman/archive/v%{version}.tar.gz
+Source:         %{name}-%{version}.tar.gz
 # help2man generated manpage for openwsmand binary
 Source1:        openwsmand.8.gz
 # service file for systemd
@@ -31,6 +32,9 @@ Source2:        openwsmand.service
 Source3:        owsmantestcert.sh
 Patch1:         openwsman-2.2.7-libssl.patch
 Patch2:         openwsman-2.4.0-pamsetup.patch
+Patch3:         openwsman-2.4.12-ruby-binding-build.patch
+# Patch4: adds shebang to winrs ruby script, already upstream
+Patch4:         openwsman-2.6.2-winrs-shebang.patch
 
 %description
 Openwsman is a project intended to provide an open-source
@@ -135,15 +139,6 @@ BuildArch: noarch
 Documentation for rubygem-%{gem_name}
 
 
-#%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.
-
 
 
 %package perl
@@ -159,14 +154,30 @@ This package provides Perl bindings to access the openwsman client API.
 
 
 
+%package winrs
+Summary:        Windows Remote Shell
+Requires:       rubygem-%{gem_name} = %{version}-%{release}
+
+%description winrs
+This is a command line tool for the Windows Remote Shell protocol. You
+can use it to send shell commands to a remote Windows hosts.
+
+
+
+
 %prep
 %setup -q
 %patch1 -p1 -b .libssl
 %patch2 -p1 -b .pamsetup
+%patch3 -p1 -b .ruby-binding-build
+%patch4 -p1 -b .winrs-shebang
 
-# 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 
+# support ruby 2.2
+pushd bindings/ruby
+cat rdoc2.1 | sed -e 's|rdoc2_1|rdoc2_2|' > rdoc2.2
+chmod 0755 rdoc2.2
+ln -sf %{_bindir}/rdoc rdoc2_2.rb
+popd
 
 %build
 # Removing executable permissions on .c and .h files to fix rpmlint warnings. 
@@ -238,6 +249,8 @@ rm -rf %{buildroot}%{gem_instdir}/ext
 mkdir -p %{buildroot}%{gem_extdir_mri}
 cp -a ./build%{gem_extdir_mri}/{gem.build_complete,*.so} %{buildroot}%{gem_extdir_mri}/
 
+# rename winrs.rb -> winrs
+mv %{buildroot}/%{_bindir}/winrs.rb %{buildroot}%{_bindir}/winrs
 
 %post -n libwsman1 -p /sbin/ldconfig
 
@@ -289,11 +302,6 @@ rm -f /var/log/wsmand.log
 %files -n rubygem-%{gem_name}-doc
 %doc %{gem_docdir}
 
-#%files java
-#%defattr(-,root,root)
-#%{_javadir}/*jar
-
-
 %files perl
 %{perl_vendorarch}/openwsman.so
 %{perl_vendorlib}/openwsman.pm
@@ -326,8 +334,53 @@ rm -f /var/log/wsmand.log
 %config(noreplace) %{_sysconfdir}/openwsman/openwsman_client.conf
 %doc AUTHORS COPYING ChangeLog README.md
 
+%files winrs
+%attr(0755,root,root) %{_bindir}/winrs
+
 
 %changelog
+* Mon Mar 13 2017 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.2-4
+- Add shebang to winrs ruby script, make it executable
+  Resolves: #1387087
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Jan 12 2016 Vít Ondruch <vondruch@redhat.com> - 2.6.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.3
+
+* Thu Nov 05 2015 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.2-1
+- Update to openwsman-2.6.2
+
+* Mon Aug 31 2015 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.1-1
+- Update to openwsman-2.6.1
+- Review PAM rules
+  (pam_pwcheck is replaced by pam_pwquality, pam_unix has no 'none' option)
+
+* Tue Jun 16 2015 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.0-1
+- Update to openwsman-2.6.0
+
+* Wed Jun 03 2015 Jitka Plesnikova <jplesnik@redhat.com> - 2.4.15-2
+- Perl 5.22 rebuild
+
+* Thu May 21 2015 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.4.15-1
+- Update to openwsman-2.4.15
+
+* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 2.4.14-2
+- Rebuilt for GCC 5 C++11 ABI change
+
+* Thu Feb 26 2015 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.4.14-1
+- Update to openwsman-2.4.14
+
+* Mon Feb 09 2015 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.4.12-1
+- Update to openwsman-2.4.12
+
+* Sat Jan 17 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.4.6-5
+- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_2.2
+
+* Tue Aug 26 2014 Jitka Plesnikova <jplesnik@redhat.com> - 2.4.6-4
+- Perl 5.20 rebuild
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 

sources

@@ -1,2 +1,2 @@
 4f2d9b1d7da6d87fcd38a9aa23559723  openwsmand.8.gz
-02902aafcd58708c0cdab51af9f4086e  v2.4.6.tar.gz
+221163800046cca5ddb38868d3f82d7e  openwsman-2.6.2.tar.gz