Fix CVE-2019-3816 and CVE-2019-3833

openwsman-2.6.8-update-ssleay-conf.patch

@@ -1,15 +0,0 @@
-diff -up openwsman-2.6.8/etc/ssleay.cnf.orig openwsman-2.6.8/etc/ssleay.cnf
---- openwsman-2.6.8/etc/ssleay.cnf.orig	2018-10-12 12:06:26.000000000 +0200
-+++ openwsman-2.6.8/etc/ssleay.cnf	2020-09-22 14:27:56.216306882 +0200
-@@ -2,10 +2,8 @@
- # SSLeay example configuration file.
- #
- 
--RANDFILE                = /dev/random
--
- [ req ]
--default_bits            = 1024
-+default_bits            = 2048
- default_keyfile         = privkey.pem
- distinguished_name      = req_distinguished_name
- 

openwsman.spec

@@ -3,7 +3,7 @@
 
 Name:		openwsman
 Version:	2.6.8
-Release:	19%{?dist}
+Release:	5%{?dist}
 Summary:	Open source Implementation of WS-Management
 
 License:	BSD
@@ -22,8 +22,6 @@ Patch4:		openwsman-2.6.5-http-status-line.patch
 Patch5:		openwsman-2.6.5-libcurl-error-codes-update.patch
 Patch6:		openwsman-2.6.8-CVE-2019-3816.patch
 Patch7:		openwsman-2.6.8-CVE-2019-3833.patch
-Patch8:		openwsman-2.6.8-update-ssleay-conf.patch
-BuildRequires: make
 BuildRequires:	swig
 BuildRequires:	libcurl-devel libxml2-devel pam-devel sblim-sfcc-devel
 BuildRequires:	python3 python3-devel ruby ruby-devel rubygems-devel perl-interpreter
@@ -93,7 +91,6 @@ This package provides Python3 bindings to access the openwsman client API.
 License:	BSD
 Summary:	Ruby client bindings for Openwsman
 Obsoletes:	%{name}-ruby < %{version}-%{release}
-Requires:	libwsman1 = %{version}-%{release}
 
 %description -n rubygem-%{gem_name}
 The openwsman gem provides a Ruby API to manage systems using
@@ -134,7 +131,6 @@ You can use it to send shell commands to a remote Windows hosts.
 %patch5 -p1 -b .libcurl-error-codes-update
 %patch6 -p1 -b .CVE-2019-3816
 %patch7 -p1 -b .CVE-2019-3833
-%patch8 -p1 -b .update-ssleay-conf
 
 %build
 # Removing executable permissions on .c and .h files to fix rpmlint warnings. 
@@ -144,8 +140,8 @@ rm -rf build
 mkdir build
 
 export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DFEDORA -DNO_SSL_CALLBACK"
-export CFLAGS="$RPM_OPT_FLAGS -fPIC -pie -Wl,-z,relro -Wl,-z,now"
-export CXXFLAGS="$RPM_OPT_FLAGS -fPIC -pie -Wl,-z,relro -Wl,-z,now"
+export CFLAGS="-D_GNU_SOURCE -fPIE -DPIE"
+export LDFLAGS="$LDFLAGS -Wl,-z,now -pie"
 cd build
 cmake \
 	-DCMAKE_INSTALL_PREFIX=/usr \
@@ -176,7 +172,7 @@ cd build
 # Do not install the ruby extension, we are proviging the rubygem- instead.
 echo -n > bindings/ruby/cmake_install.cmake
 
-%make_install
+make DESTDIR=%{buildroot} install
 cd ..
 rm -f %{buildroot}/%{_libdir}/*.la
 rm -f %{buildroot}/%{_libdir}/openwsman/plugins/*.la
@@ -288,57 +284,11 @@ rm -f /var/log/wsmand.log
 %{_bindir}/winrs
 
 %changelog
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.8-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jan 06 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.6.8-18
-- F-34: rebuild against ruby 3.0
-
-* Tue Sep 22 2020 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.8-17
-- Use make macros, patch by Tom Stellard <tstellar@redhat.com>
-  (https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro)
-- Update flags, enable LTO
-- Remove RANDFILE and increase default bits in ssleay.conf
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.8-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jul 08 2020 Jeff Law <law@redhat.com> - 2.6.8-15
-- Disable LTO
-
-* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 2.6.8-14
-- Perl 5.32 rebuild
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 2.6.8-13
-- Rebuilt for Python 3.9
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.8-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jan 18 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.6.8-11
-- F-32: rebuild against ruby27
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 2.6.8-10
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 2.6.8-9
-- Rebuilt for Python 3.8
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.8-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2.6.8-7
-- Perl 5.30 rebuild
-
-* Mon Apr 01 2019 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.8-6
-- Add requires libwsman1 for rubygem-openwsman
-
 * Wed Mar 13 2019 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.8-5
 - Fix CVE-2019-3816
   Resolves: #1687760
 - Fix CVE-2019-3833
   Resolves: #1687762
-- Remove Dist Tag from the oldest changelog entry
 
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
@@ -670,5 +620,5 @@ rm -f /var/log/wsmand.log
 * Mon Sep 22 2008 Matt Domsch <Matt_Domsch@dell.com> - 2.1.0-1
 - update to 2.1.0, resolves security issues
 
-* Tue Aug 19 2008  <srinivas_ramanatha@dell.com> - 2.0.0-1
+* Tue Aug 19 2008  <srinivas_ramanatha@dell.com> - 2.0.0-1%{?dist}
 - Modified the spec file to adhere to fedora packaging guidelines.