SSL rebuild

.gitignore

@@ -14,5 +14,3 @@ openwsman-2.2.3.tar.bz2
 /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,16 +1,15 @@
-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
+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_unix.so	nullok
  auth       required	pam_nologin.so
 -account    required	pam_unix2.so
--password   required	pam_pwcheck.so	nullok
++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
-+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
++password   required	pam_unix.so	nullok use_first_pass use_authtok
++session    required	pam_unix.so	none

openwsman-2.4.12-ruby-binding-build.patch

@@ -6,7 +6,7 @@ diff -up openwsman-2.4.12/bindings/ruby/extconf.rb.orig openwsman-2.4.12/binding
  
  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")
++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.0/include/ -o openwsman_wrap.c openwsman.i")
  
  $CPPFLAGS = "-I/usr/include/openwsman -I.."
  

openwsman-2.6.2-winrs-shebang.patch

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

@@ -15,8 +15,8 @@ BuildRequires:  python python-devel perl
 BuildRequires:  perl-devel pkgconfig openssl-devel
 BuildRequires:  cmake
 BuildRequires:  systemd-units
-Version:        2.6.2
-Release:        4%{?dist}
+Version:        2.6.0
+Release:        2%{?dist}
 Url:            http://www.openwsman.org/
 License:        BSD
 Group:          Applications/System
@@ -33,8 +33,6 @@ 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
@@ -154,23 +152,11 @@ 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
 
 # support ruby 2.2
 pushd bindings/ruby
@@ -249,9 +235,6 @@ 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
 
 %postun -n libwsman1 -p /sbin/ldconfig
@@ -334,28 +317,11 @@ 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)
+* Mon Jan 25 2016 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.0-2
+- SSL rebuild
+  Resolves: #1301062
 
 * Tue Jun 16 2015 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.0-1
 - Update to openwsman-2.6.0

sources

@@ -1,2 +1,2 @@
 4f2d9b1d7da6d87fcd38a9aa23559723  openwsmand.8.gz
-221163800046cca5ddb38868d3f82d7e  openwsman-2.6.2.tar.gz
+824834a86040b98b03f3fc0f7f62e853  openwsman-2.6.0.tar.gz