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

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1,2 +1,2 @@
 /openwsmand.8.gz
-/openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b.tar.gz
+/v2.6.5.tar.gz

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-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/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.5/include/ -o openwsman_wrap.c openwsman.i")
  
  $CPPFLAGS = "-I/usr/include/openwsman -I.."
  

openwsman-2.6.2-openssl-1.1-fix.patch

@@ -1,7 +1,7 @@
-diff -up openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/lib/wsman-curl-client-transport.c.orig openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/lib/wsman-curl-client-transport.c
---- openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/lib/wsman-curl-client-transport.c.orig	2016-07-27 16:03:55.000000000 +0200
-+++ openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/lib/wsman-curl-client-transport.c	2017-01-16 14:40:03.094728843 +0100
-@@ -241,12 +241,16 @@ write_handler( void *ptr, size_t size, s
+diff -up openwsman-2.6.5/src/lib/wsman-curl-client-transport.c.orig openwsman-2.6.5/src/lib/wsman-curl-client-transport.c
+--- openwsman-2.6.5/src/lib/wsman-curl-client-transport.c.orig	2017-11-28 09:32:15.000000000 +0100
++++ openwsman-2.6.5/src/lib/wsman-curl-client-transport.c	2018-01-23 13:14:59.357153453 +0100
+@@ -241,12 +241,20 @@ write_handler( void *ptr, size_t size, s
  static int ssl_certificate_thumbprint_verify_callback(X509_STORE_CTX *ctx, void *arg)
  {
  	unsigned char *thumbprint = (unsigned char *)arg;
@@ -12,60 +12,34 @@ diff -up openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/lib/wsman-curl-c
  	unsigned int      tempFingerprintLen;
  	tempDigest = (EVP_MD*)EVP_sha1( );
 +
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
 +	X509 *cert = X509_STORE_CTX_get_current_cert(ctx);
++#else
++	X509 *cert = ctx->cert;
++#endif
 +	if(!cert)
 +		return 0;
 +
  	if ( X509_digest(cert, tempDigest, tempFingerprint, &tempFingerprintLen ) <= 0)
  		return 0;
  	if(!memcmp(tempFingerprint, thumbprint, tempFingerprintLen))
-diff -up openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/server/shttpd/compat_unix.h.orig openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/server/shttpd/compat_unix.h
---- openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/server/shttpd/compat_unix.h.orig	2016-07-27 16:03:55.000000000 +0200
-+++ openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/server/shttpd/compat_unix.h	2017-01-16 14:40:03.094728843 +0100
-@@ -27,7 +27,6 @@
+diff -up openwsman-2.6.5/src/server/shttpd/compat_unix.h.orig openwsman-2.6.5/src/server/shttpd/compat_unix.h
+--- openwsman-2.6.5/src/server/shttpd/compat_unix.h.orig	2017-11-28 09:32:15.000000000 +0100
++++ openwsman-2.6.5/src/server/shttpd/compat_unix.h	2018-01-23 13:14:59.357153453 +0100
+@@ -27,10 +27,6 @@
  	pthread_create(&tid, NULL, (void *(*)(void *))a, c); } while (0)
  #endif /* !NO_THREADS */
  
+-#ifndef SSL_LIB
 -#define	SSL_LIB				"libssl.so"
+-#endif
+-
  #define	DIRSEP				'/'
  #define	IS_DIRSEP_CHAR(c)		((c) == '/')
  #define	O_BINARY			0
-diff -up openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/server/shttpd/config.h.orig openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/server/shttpd/config.h
---- openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/server/shttpd/config.h.orig	2017-01-16 14:40:57.223705664 +0100
-+++ openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/server/shttpd/config.h	2017-01-16 14:38:15.000000000 +0100
-@@ -0,0 +1,29 @@
-+/*
-+ * Copyright (c) 2004-2005 Sergey Lyubka <valenok@gmail.com>
-+ * All rights reserved
-+ *
-+ * "THE BEER-WARE LICENSE" (Revision 42):
-+ * Sergey Lyubka wrote this file.  As long as you retain this notice you
-+ * can do whatever you want with this stuff. If we meet some day, and you think
-+ * this stuff is worth it, you can buy me a beer in return.
-+ */
-+
-+#ifndef CONFIG_HEADER_DEFINED
-+#define	CONFIG_HEADER_DEFINED
-+
-+#define	SHTTPD_VERSION	"1.42"		/* Version			*/
-+#define	CONFIG_FILE	"shttpd.conf"	/* Configuration file		*/
-+#define	HTPASSWD	".htpasswd"	/* Passwords file name		*/
-+#define	URI_MAX		16384		/* Default max request size	*/
-+#define	LISTENING_PORTS	"80"		/* Default listening ports	*/
-+#define	INDEX_FILES	"index.html,index.htm,index.php,index.cgi"
-+#define	CGI_EXT		"cgi,pl,php"	/* Default CGI extensions	*/
-+#define	SSI_EXT		"shtml,shtm"	/* Default SSI extensions	*/
-+#define	REALM		"mydomain.com"	/* Default authentication realm	*/
-+#define	DELIM_CHARS	","		/* Separators for lists		*/
-+#define	EXPIRE_TIME	3600		/* Expiration time, seconds	*/
-+#define	ENV_MAX		4096		/* Size of environment block	*/
-+#define	CGI_ENV_VARS	64		/* Maximum vars passed to CGI	*/
-+#define	SERVICE_NAME	"SHTTPD " VERSION	/* NT service name	*/
-+
-+#endif /* CONFIG_HEADER_DEFINED */
-diff -up openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/server/shttpd/io_ssl.c.orig openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/server/shttpd/io_ssl.c
---- openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/server/shttpd/io_ssl.c.orig	2016-07-27 16:03:55.000000000 +0200
-+++ openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/server/shttpd/io_ssl.c	2017-01-16 14:40:03.094728843 +0100
+diff -up openwsman-2.6.5/src/server/shttpd/io_ssl.c.orig openwsman-2.6.5/src/server/shttpd/io_ssl.c
+--- openwsman-2.6.5/src/server/shttpd/io_ssl.c.orig	2017-11-28 09:32:15.000000000 +0100
++++ openwsman-2.6.5/src/server/shttpd/io_ssl.c	2018-01-23 13:14:59.357153453 +0100
 @@ -11,23 +11,6 @@
  #include "defs.h"
  
@@ -90,12 +64,12 @@ diff -up openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/server/shttpd/io
  void
  _shttpd_ssl_handshake(struct stream *stream)
  {
-diff -up openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/server/shttpd/shttpd.c.orig openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/server/shttpd/shttpd.c
---- openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/server/shttpd/shttpd.c.orig	2016-07-27 16:03:55.000000000 +0200
-+++ openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/server/shttpd/shttpd.c	2017-01-16 14:40:03.095728843 +0100
-@@ -1474,20 +1474,14 @@ set_ssl(struct shttpd_ctx *ctx, const ch
- 	char *ssl_disabled_protocols = wsmand_options_get_ssl_disabled_protocols();
+diff -up openwsman-2.6.5/src/server/shttpd/shttpd.c.orig openwsman-2.6.5/src/server/shttpd/shttpd.c
+--- openwsman-2.6.5/src/server/shttpd/shttpd.c.orig	2017-11-28 09:32:15.000000000 +0100
++++ openwsman-2.6.5/src/server/shttpd/shttpd.c	2018-01-23 13:16:13.738228773 +0100
+@@ -1476,20 +1476,14 @@ set_ssl(struct shttpd_ctx *ctx, const ch
  	int		retval = FALSE;
+ 	EC_KEY*		key;
  
 -	/* Load SSL library dynamically */
 -	if ((lib = dlopen(SSL_LIB, RTLD_LAZY)) == NULL) {
@@ -112,26 +86,29 @@ diff -up openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/server/shttpd/sh
  	/* Initialize SSL crap */
 +	debug("Initialize SSL");
 +	SSL_load_error_strings();
-+	#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 	SSL_library_init();
-+	#else
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
 +	OPENSSL_init_ssl(0, NULL);
-+	#endif
++#else
+ 	SSL_library_init();
++#endif
  
  	if ((CTX = SSL_CTX_new(SSLv23_server_method())) == NULL)
  		_shttpd_elog(E_LOG, NULL, "SSL_CTX_new error");
-@@ -1523,7 +1517,7 @@ set_ssl(struct shttpd_ctx *ctx, const ch
+@@ -1532,7 +1526,11 @@ set_ssl(struct shttpd_ctx *ctx, const ch
  			if (strncasecmp(protocols[idx].name, ssl_disabled_protocols, blank_ptr-ssl_disabled_protocols) == 0) {
  				//_shttpd_elog(E_LOG, NULL, "SSL: disable %s protocol", protocols[idx].name);
  				debug("SSL: disable %s protocol", protocols[idx].name);
--				SSL_CTX_ctrl(CTX, SSL_CTRL_OPTIONS, protocols[idx].opt, NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
 +				SSL_CTX_set_options(CTX, protocols[idx].opt);
++#else
+ 				SSL_CTX_ctrl(CTX, SSL_CTRL_OPTIONS, protocols[idx].opt, NULL);
++#endif
  				break;
  			}
  		}
-diff -up openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/server/shttpd/ssl.h.orig openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/server/shttpd/ssl.h
---- openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/server/shttpd/ssl.h.orig	2016-07-27 16:03:55.000000000 +0200
-+++ openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/server/shttpd/ssl.h	2017-01-16 14:40:03.095728843 +0100
+diff -up openwsman-2.6.5/src/server/shttpd/ssl.h.orig openwsman-2.6.5/src/server/shttpd/ssl.h
+--- openwsman-2.6.5/src/server/shttpd/ssl.h.orig	2017-11-28 09:32:15.000000000 +0100
++++ openwsman-2.6.5/src/server/shttpd/ssl.h	2018-01-23 13:14:59.358153454 +0100
 @@ -12,50 +12,4 @@
  
  #include <openssl/ssl.h>

openwsman-2.6.2-python3.patch

@@ -1,179 +0,0 @@
-diff -up openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/CMakeLists.txt.orig openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/CMakeLists.txt
---- openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/CMakeLists.txt.orig	2016-07-27 16:03:55.000000000 +0200
-+++ openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/CMakeLists.txt	2017-01-16 14:08:53.201529586 +0100
-@@ -10,6 +10,7 @@ include_directories(${CMAKE_BINARY_DIR})
- 
- IF( BUILD_PYTHON )
- add_subdirectory(python)
-+add_subdirectory(python3)
- ENDIF( BUILD_PYTHON )
- 
- IF( BUILD_RUBY )
-diff -up openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/python3/CMakeLists.txt.orig openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/python3/CMakeLists.txt
---- openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/python3/CMakeLists.txt.orig	2017-01-16 14:08:09.000000000 +0100
-+++ openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/python3/CMakeLists.txt	2017-01-16 14:10:48.945480021 +0100
-@@ -12,11 +12,28 @@ enable_testing()
- 
- add_subdirectory(tests)
- 
--EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))" OUTPUT_VARIABLE PYTHON_LIB_DIR)
--STRING(REPLACE "\n" "" PYTHON_LIB_DIR "${PYTHON_LIB_DIR}")
-+MESSAGE(STATUS "Python3 build:")
-+unset(Python_ADDITIONAL_VERSIONS)
-+set(Python_ADDITIONAL_VERSIONS 3.5)
-+FIND_PACKAGE(PythonLibs)
-+IF (PYTHON_LIBRARY)
-+  FIND_PACKAGE(PythonInterp REQUIRED)
-+  #MESSAGE(STATUS "Found PythonLibs...")
-+  FIND_PACKAGE(PythonLinkLibs)
-+  #IF (PYTHON_LINK_LIBS)
-+  #  MESSAGE(STATUS "Building Python...")
-+  #ENDIF (PYTHON_LINK_LIBS)
-+ENDIF (PYTHON_LIBRARY)
-+
-+set(PYTHON3_EXECUTABLE "${PYTHON_EXECUTABLE}")
-+set(PYTHON3_INCLUDE_DIRS "${PYTHON_INCLUDE_DIRS}")
-+set({PYTHON3_INCLUDE_PATH "${PYTHON_INCLUDE_PATH}")
- 
--MESSAGE(STATUS "Python executable: ${PYTHON_EXECUTABLE}")
--MESSAGE(STATUS "Python lib dir: ${PYTHON_LIB_DIR}")
-+EXECUTE_PROCESS(COMMAND ${PYTHON3_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))" OUTPUT_VARIABLE PYTHON3_LIB_DIR)
-+STRING(REPLACE "\n" "" PYTHON3_LIB_DIR "${PYTHON3_LIB_DIR}")
-+
-+MESSAGE(STATUS "Python executable: ${PYTHON3_EXECUTABLE}")
-+MESSAGE(STATUS "Python lib dir: ${PYTHON3_LIB_DIR}")
- 
- SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/openwsman_wrap.c" )
- 
-@@ -36,14 +53,14 @@ SET(pywsman_SRCS ${SWIG_OUTPUT} ${CMAKE_
- ADD_LIBRARY( pywsman SHARED ${pywsman_SRCS} )
- SET_TARGET_PROPERTIES( pywsman PROPERTIES PREFIX "_" )
- 
--INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_DIRS} )
-+INCLUDE_DIRECTORIES( ${PYTHON3_INCLUDE_DIRS} )
- # RHEL5 needs this:
--INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_PATH} )
-+INCLUDE_DIRECTORIES( ${PYTHON3_INCLUDE_PATH} )
- INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} )
- INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/bindings ${CMAKE_SOURCE_DIR}/include )
- 
- TARGET_LINK_LIBRARIES( pywsman wsman )
- TARGET_LINK_LIBRARIES( pywsman wsman_client )
- 
--INSTALL(TARGETS pywsman LIBRARY DESTINATION ${PYTHON_LIB_DIR})
--INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pywsman.py DESTINATION ${PYTHON_LIB_DIR} )
-+INSTALL(TARGETS pywsman LIBRARY DESTINATION ${PYTHON3_LIB_DIR})
-+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pywsman.py DESTINATION ${PYTHON3_LIB_DIR} )
-diff -up openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/python/CMakeLists.txt.orig openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/python/CMakeLists.txt
---- openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/python/CMakeLists.txt.orig	2016-07-27 16:03:55.000000000 +0200
-+++ openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/bindings/python/CMakeLists.txt	2017-01-16 14:12:51.954427345 +0100
-@@ -12,11 +12,52 @@ enable_testing()
- 
- add_subdirectory(tests)
- 
--EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))" OUTPUT_VARIABLE PYTHON_LIB_DIR)
--STRING(REPLACE "\n" "" PYTHON_LIB_DIR "${PYTHON_LIB_DIR}")
-+MESSAGE(STATUS "Python2 build:")
-+set(Python_ADDITIONAL_VERSIONS 2.7)
-+FIND_PACKAGE(PythonLibs)
-+IF (PYTHON_LIBRARY)
-+  FIND_PACKAGE(PythonInterp REQUIRED)
-+  #MESSAGE(STATUS "Found PythonLibs...")
-+  FIND_PACKAGE(PythonLinkLibs)
-+  #IF (PYTHON_LINK_LIBS)
-+  #  MESSAGE(STATUS "Building Python...")
-+  #ENDIF (PYTHON_LINK_LIBS)
-+ENDIF (PYTHON_LIBRARY)
-+
-+set(PYTHON2_EXECUTABLE "${PYTHON_EXECUTABLE}")
-+set(PYTHON2_INCLUDE_DIRS "${PYTHON_INCLUDE_DIRS}")
-+set(PYTHON2_INCLUDE_PATH "${PYTHON_INCLUDE_PATH}")
-+
-+# clear FIND_PACKAGE(PythonLibs) side effects
-+unset(PYTHONLIBS_FOUND)
-+unset(PYTHON_LIBRARIES)
-+unset(PYTHON_INCLUDE_PATH)
-+unset(PYTHON_INCLUDE_DIRS)
-+unset(PYTHON_DEBUG_LIBRARIES)
-+unset(PYTHONLIBS_VERSION_STRING)
-+unset(PYTHON_DEBUG_LIBRARY CACHE)
-+unset(PYTHON_LIBRARY)
-+unset(PYTHON_LIBRARY_DEBUG)
-+unset(PYTHON_LIBRARY_RELEASE)
-+unset(PYTHON_LIBRARY CACHE)
-+unset(PYTHON_LIBRARY_DEBUG CACHE)
-+unset(PYTHON_LIBRARY_RELEASE CACHE)
-+unset(PYTHON_INCLUDE_DIR CACHE)
-+unset(PYTHON_INCLUDE_DIR2 CACHE)
-+
-+# clear FIND_PACKAGE(PythonInterp) side effects
-+unset(PYTHONINTERP_FOUND)
-+unset(PYTHON_EXECUTABLE CACHE)
-+unset(PYTHON_VERSION_STRING)
-+unset(PYTHON_VERSION_MAJOR)
-+unset(PYTHON_VERSION_MINOR)
-+unset(PYTHON_VERSION_PATCH)
- 
--MESSAGE(STATUS "Python executable: ${PYTHON_EXECUTABLE}")
--MESSAGE(STATUS "Python lib dir: ${PYTHON_LIB_DIR}")
-+EXECUTE_PROCESS(COMMAND ${PYTHON2_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" OUTPUT_VARIABLE PYTHON2_LIB_DIR)
-+STRING(REPLACE "\n" "" PYTHON2_LIB_DIR "${PYTHON2_LIB_DIR}")
-+
-+MESSAGE(STATUS "Python executable: ${PYTHON2_EXECUTABLE}")
-+MESSAGE(STATUS "Python lib dir: ${PYTHON2_LIB_DIR}")
- 
- SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/openwsman_wrap.c" )
- 
-@@ -36,14 +77,14 @@ SET(pywsman_SRCS ${SWIG_OUTPUT} ${CMAKE_
- ADD_LIBRARY( pywsman SHARED ${pywsman_SRCS} )
- SET_TARGET_PROPERTIES( pywsman PROPERTIES PREFIX "_" )
- 
--INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_DIRS} )
-+INCLUDE_DIRECTORIES( ${PYTHON2_INCLUDE_DIRS} )
- # RHEL5 needs this:
--INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_PATH} )
-+INCLUDE_DIRECTORIES( ${PYTHON2_INCLUDE_PATH} )
- INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} )
- INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/bindings ${CMAKE_SOURCE_DIR}/include )
- 
- TARGET_LINK_LIBRARIES( pywsman wsman )
- TARGET_LINK_LIBRARIES( pywsman wsman_client )
- 
--INSTALL(TARGETS pywsman LIBRARY DESTINATION ${PYTHON_LIB_DIR})
--INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pywsman.py DESTINATION ${PYTHON_LIB_DIR} )
-+INSTALL(TARGETS pywsman LIBRARY DESTINATION ${PYTHON2_LIB_DIR})
-+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pywsman.py DESTINATION ${PYTHON2_LIB_DIR} )
-diff -up openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/CMakeLists.txt.orig openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/CMakeLists.txt
---- openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/CMakeLists.txt.orig	2016-07-27 16:03:55.000000000 +0200
-+++ openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/CMakeLists.txt	2017-01-16 14:13:37.300407926 +0100
-@@ -175,30 +175,6 @@ MESSAGE(STATUS "Building Ruby bindings"
-  ENDIF(NOT RUBY_INCLUDE_PATH )
- ENDIF( BUILD_RUBY )
- 
--IF( BUILD_PYTHON )
--  MESSAGE(STATUS "Building Python bindings" )
--  FIND_PACKAGE(PythonLibs 2.6 REQUIRED)
--  IF (PYTHON_LIBRARY)
--    FIND_PACKAGE(PythonInterp 2.6 REQUIRED)
--    MESSAGE(STATUS "Found PythonLibs...")
--    FIND_PACKAGE(PythonLinkLibs)
--    IF (PYTHON_LINK_LIBS)
--      MESSAGE(STATUS "Building Python...")
--    ENDIF (PYTHON_LINK_LIBS)
--  ENDIF (PYTHON_LIBRARY)
--  IF(NOT PYTHON_INCLUDE_DIRS )
--    # fallback for older versions of cmake
--    SET(PYTHON_INCLUDE_DIRS PYTHON_INCLUDE_PATH)
--  ENDIF(NOT PYTHON_INCLUDE_DIRS )
--  IF(NOT PYTHON_INCLUDE_DIRS )
--    IF(BUILD_PYTHON_EXPLICIT)
--      NO_HEADERS_WARNING_EXPL(BUILD_PYTHON Python)
--    ELSE(BUILD_PYTHON_EXPLICIT)
--      NO_HEADERS_WARNING(BUILD_PYTHON Python)
--    ENDIF(BUILD_PYTHON_EXPLICIT)
--  ENDIF(NOT PYTHON_INCLUDE_DIRS )
--ENDIF( BUILD_PYTHON )
--
- IF( BUILD_PERL )
-   INCLUDE(FindPerl)
-   IF(PERL_EXECUTABLE)

openwsman-2.6.5-CVE-2019-3816.patch

@@ -0,0 +1,79 @@
+diff -up openwsman-2.6.5/src/server/shttpd/shttpd.c.orig openwsman-2.6.5/src/server/shttpd/shttpd.c
+--- openwsman-2.6.5/src/server/shttpd/shttpd.c.orig	2019-03-13 10:20:07.376527798 +0100
++++ openwsman-2.6.5/src/server/shttpd/shttpd.c	2019-03-13 10:20:07.380527801 +0100
+@@ -336,10 +336,12 @@ date_to_epoch(const char *s)
+ }
+ 
+ static void
+-remove_double_dots(char *s)
++remove_all_leading_dots(char *s)
+ {
+ 	char	*p = s;
+ 
++	while (*s != '\0' && *s == '.') s++;
++
+ 	while (*s != '\0') {
+ 		*p++ = *s++;
+ 		if (s[-1] == '/' || s[-1] == '\\')
+@@ -546,7 +548,7 @@ decide_what_to_do(struct conn *c)
+ 		*c->query++ = '\0';
+ 
+ 	_shttpd_url_decode(c->uri, strlen(c->uri), c->uri, strlen(c->uri) + 1);
+-	remove_double_dots(c->uri);
++	remove_all_leading_dots(c->uri);
+ 
+ 	root = c->ctx->options[OPT_ROOT];
+ 	if (strlen(c->uri) + strlen(root) >= sizeof(path)) {
+@@ -556,6 +558,7 @@ decide_what_to_do(struct conn *c)
+ 
+ 	(void) _shttpd_snprintf(path, sizeof(path), "%s%s", root, c->uri);
+ 
++	DBG(("decide_what_to_do -> processed path: [%s]", path));
+ 	/* User may use the aliases - check URI for mount point */
+ 	if (is_alias(c->ctx, c->uri, &alias_uri, &alias_path) != NULL) {
+ 		(void) _shttpd_snprintf(path, sizeof(path), "%.*s%s",
+@@ -572,7 +575,10 @@ decide_what_to_do(struct conn *c)
+ 	if ((ruri = _shttpd_is_registered_uri(c->ctx, c->uri)) != NULL) {
+ 		_shttpd_setup_embedded_stream(c,
+ 		    ruri->callback, ruri->callback_data);
+-	} else
++	} else {
++		_shttpd_send_server_error(c, 403, "Forbidden");
++	}
++#if 0
+ 	if (strstr(path, HTPASSWD)) {
+ 		/* Do not allow to view passwords files */
+ 		_shttpd_send_server_error(c, 403, "Forbidden");
+@@ -656,6 +662,7 @@ decide_what_to_do(struct conn *c)
+ 	} else {
+ 		_shttpd_send_server_error(c, 500, "Internal Error");
+ 	}
++#endif
+ }
+ 
+ static int
+diff -up openwsman-2.6.5/src/server/wsmand.c.orig openwsman-2.6.5/src/server/wsmand.c
+--- openwsman-2.6.5/src/server/wsmand.c.orig	2017-11-28 09:32:15.000000000 +0100
++++ openwsman-2.6.5/src/server/wsmand.c	2019-03-13 10:20:07.380527801 +0100
+@@ -198,6 +198,10 @@ static void daemonize(void)
+ 	int fd;
+ 	char *pid;
+ 
++	/* Change our CWD to / */
++	i = chdir("/");
++	assert(i == 0);
++
+ 	if (wsmand_options_get_foreground_debug() > 0) {
+ 		return;
+ 	}
+@@ -214,10 +218,6 @@ static void daemonize(void)
+ 	log_pid = 0;
+ 	setsid();
+ 
+-	/* Change our CWD to / */
+-	i=chdir("/");
+-        assert(i == 0);
+-
+ 	/* Close all file descriptors. */
+ 	for (i = getdtablesize(); i >= 0; --i)
+ 		close(i);

openwsman-2.6.5-CVE-2019-3833.patch

@@ -0,0 +1,94 @@
+diff -up openwsman-2.6.5/src/server/shttpd/shttpd.c.orig openwsman-2.6.5/src/server/shttpd/shttpd.c
+--- openwsman-2.6.5/src/server/shttpd/shttpd.c.orig	2019-03-13 10:22:04.707624240 +0100
++++ openwsman-2.6.5/src/server/shttpd/shttpd.c	2019-03-13 10:22:04.711624243 +0100
+@@ -705,11 +705,11 @@ parse_http_request(struct conn *c)
+ 		_shttpd_send_server_error(c, 500, "Cannot allocate request");
+ 	}
+ 
++	io_inc_tail(&c->rem.io, req_len);
++
+ 	if (c->loc.flags & FLAG_CLOSED)
+ 		return;
+ 
+-	io_inc_tail(&c->rem.io, req_len);
+-
+ 	DBG(("Conn %d: parsing request: [%.*s]", c->rem.chan.sock, req_len, s));
+ 	c->rem.flags |= FLAG_HEADERS_PARSED;
+ 
+@@ -975,7 +975,7 @@ write_stream(struct stream *from, struct
+ }
+ 
+ 
+-static void
++static int
+ connection_desctructor(struct llhead *lp)
+ {
+ 	struct conn		*c = LL_ENTRY(lp, struct conn, link);
+@@ -999,7 +999,8 @@ connection_desctructor(struct llhead *lp
+ 	 * Check the "Connection: " header before we free c->request
+ 	 * If it its 'keep-alive', then do not close the connection
+ 	 */
+-	do_close = (c->ch.connection.v_vec.len >= vec.len &&
++	do_close = c->rem.flags & FLAG_CLOSED ||
++	    (c->ch.connection.v_vec.len >= vec.len &&
+ 	    !_shttpd_strncasecmp(vec.ptr,c->ch.connection.v_vec.ptr,vec.len)) ||
+ 	    (c->major_version < 1 ||
+ 	    (c->major_version >= 1 && c->minor_version < 1));
+@@ -1021,7 +1022,7 @@ connection_desctructor(struct llhead *lp
+ 		io_clear(&c->loc.io);
+ 		c->birth_time = _shttpd_current_time;
+ 		if (io_data_len(&c->rem.io) > 0)
+-			process_connection(c, 0, 0);
++			return 1;
+ 	} else {
+ 		if (c->rem.io_class != NULL)
+ 			c->rem.io_class->close(&c->rem);
+@@ -1032,6 +1033,8 @@ connection_desctructor(struct llhead *lp
+ 
+ 		free(c);
+ 	}
++
++	return 0;
+ }
+ 
+ static void
+@@ -1039,7 +1042,7 @@ worker_destructor(struct llhead *lp)
+ {
+ 	struct worker	*worker = LL_ENTRY(lp, struct worker, link);
+ 
+-	free_list(&worker->connections, connection_desctructor);
++	free_list(&worker->connections, (void (*)(struct llhead *))connection_desctructor);
+ 	free(worker);
+ }
+ 
+@@ -1072,6 +1075,8 @@ add_to_set(int fd, fd_set *set, int *max
+ static void
+ process_connection(struct conn *c, int remote_ready, int local_ready)
+ {
++again:
++
+ 	/* Read from remote end if it is ready */
+ 	if (remote_ready && io_space_len(&c->rem.io))
+ 		read_stream(&c->rem);
+@@ -1100,7 +1105,11 @@ process_connection(struct conn *c, int r
+ 	if ((_shttpd_current_time > c->expire_time) ||
+ 	    (c->rem.flags & FLAG_CLOSED) ||
+ 	    ((c->loc.flags & FLAG_CLOSED) && !io_data_len(&c->loc.io)))
+-		connection_desctructor(&c->link);
++		if (connection_desctructor(&c->link)) {
++			remote_ready = 0;
++			local_ready = 0;
++			goto again;
++		}
+ }
+ 
+ static int
+@@ -1640,7 +1649,7 @@ worker_function(void *param)
+ 	while (worker->exit_flag == 0)
+ 		poll_worker(worker, 1000 * 10);
+ 
+-	free_list(&worker->connections, connection_desctructor);
++	free_list(&worker->connections, (void (*)(struct llhead *))connection_desctructor);
+ 	free(worker);
+ }
+ 

openwsman-2.6.5-fix-set-cipher-list-retval-check.patch

@@ -0,0 +1,12 @@
+diff -up openwsman-2.6.5/src/server/shttpd/shttpd.c.orig openwsman-2.6.5/src/server/shttpd/shttpd.c
+--- openwsman-2.6.5/src/server/shttpd/shttpd.c.orig	2018-02-21 10:53:24.964163710 +0100
++++ openwsman-2.6.5/src/server/shttpd/shttpd.c	2018-02-21 10:53:31.854162875 +0100
+@@ -1541,7 +1541,7 @@ set_ssl(struct shttpd_ctx *ctx, const ch
+ 
+ 	if (ssl_cipher_list) {
+           int rc = SSL_CTX_set_cipher_list(CTX, ssl_cipher_list);
+-          if (rc != 0) {
++          if (rc != 1) {
+             _shttpd_elog(E_LOG, NULL, "Failed to set SSL cipher list \"%s\"", ssl_cipher_list);
+           }
+         }

openwsman-2.6.5-http-status-line.patch

@@ -0,0 +1,39 @@
+diff -up openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/server/wsmand-listener.c.orig openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/server/wsmand-listener.c
+--- openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/server/wsmand-listener.c.orig	2016-07-27 16:03:55.000000000 +0200
++++ openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/src/server/wsmand-listener.c	2018-01-22 13:05:04.478923300 +0100
+@@ -344,6 +344,35 @@ DONE:
+ 	if (fault_reason == NULL) {
+ 		// this is a way to segfault, investigate
+ 		//fault_reason = shttpd_reason_phrase(status);
++		// ugly workaround follows...
++		switch (status) {
++			case 200:
++				fault_reason = "OK";
++				break;
++			case 400:
++				fault_reason = "Bad request";
++				break;
++			case 401:
++				fault_reason = "Unauthorized";
++				break;
++			case 403:
++				fault_reason = "Forbidden";
++				break;
++			case 404:
++				fault_reason = "Not found";
++				break;
++			case 500:
++				fault_reason = "Internal Error";
++				break;
++			case 501:
++				fault_reason = "Not implemented";
++				break;
++			case 415:
++				fault_reason = "Unsupported Media Type";
++				break;
++			default:
++				fault_reason = "";
++		}
+ 	}
+ 	debug("Response status=%d (%s)", status, fault_reason);
+ 

openwsman.spec

@@ -1,202 +1,135 @@
 # RubyGems's macros expect gem_name to exist.
-%global gem_name %{name}
+%global		gem_name %{name}
 
-%global commit 4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+Name:		openwsman
+Version:	2.6.5
+Release:	4%{?dist}
+Summary:	Open source Implementation of WS-Management
 
-Name:           openwsman
-BuildRequires:  swig
-BuildRequires:  libcurl-devel libxml2-devel pam-devel sblim-sfcc-devel
-BuildRequires:  python3 python3-devel python2 python2-devel ruby ruby-devel rubygems-devel perl
-BuildRequires:  perl-devel perl-generators pkgconfig openssl-devel
-BuildRequires:  cmake
-BuildRequires:  systemd-units
-Version:        2.6.3
-Release:        2.git%{shortcommit}%{?dist}
-Url:            http://www.openwsman.org/
-License:        BSD
-Group:          Applications/System
-Summary:        Open source Implementation of WS-Management
-# The source for this package was pulled from upstream's vcs.  Use the
-# following commands to generate the tarball:
-#  git clone https://github.com/Openwsman/openwsman.git; cd openwsman
-#  git archive --format tar --prefix openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b/ \
-#    4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b | gzip > openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b.tar.gz
-Source:         %{name}-%{commit}.tar.gz
+License:	BSD
+URL:		http://www.openwsman.org/
+Source0:	https://github.com/Openwsman/openwsman/archive/v%{version}.tar.gz
 # help2man generated manpage for openwsmand binary
-Source1:        openwsmand.8.gz
+Source1:	openwsmand.8.gz
 # service file for systemd
-Source2:        openwsmand.service
+Source2:	openwsmand.service
 # script for testing presence of the certificates in ExecStartPre
-Source3:        owsmantestcert.sh
-Patch1:         openwsman-2.4.0-pamsetup.patch
-Patch2:         openwsman-2.4.12-ruby-binding-build.patch
-Patch3:         openwsman-2.6.2-python3.patch
-Patch4:         openwsman-2.6.2-openssl-1.1-fix.patch
+Source3:	owsmantestcert.sh
+Patch1:		openwsman-2.4.0-pamsetup.patch
+Patch2:		openwsman-2.4.12-ruby-binding-build.patch
+Patch3:		openwsman-2.6.2-openssl-1.1-fix.patch
+Patch4:		openwsman-2.6.5-http-status-line.patch
+Patch5:		openwsman-2.6.5-fix-set-cipher-list-retval-check.patch
+Patch6:		openwsman-2.6.5-CVE-2019-3816.patch
+Patch7:		openwsman-2.6.5-CVE-2019-3833.patch
+BuildRequires:	swig
+BuildRequires:	libcurl-devel libxml2-devel pam-devel sblim-sfcc-devel
+BuildRequires:	python3 python3-devel ruby ruby-devel rubygems-devel perl-interpreter
+BuildRequires:	perl-devel perl-generators pkgconfig openssl-devel
+BuildRequires:	cmake
+BuildRequires:	systemd-units
 
 %description
 Openwsman is a project intended to provide an open-source
-implementation of the Web Services Management specipication
+implementation of the Web Services Management specification
 (WS-Management) and to expose system management information on the
 Linux operating system using the WS-Management protocol. WS-Management
 is based on a suite of web services specifications and usage
 requirements that exposes a set of operations focused on and covers
 all system management aspects.
 
-
-
-
 %package -n libwsman1
-License:        BSD
-Group:          System Environment/Libraries
-Summary:        Open source Implementation of WS-Management
-Provides:       %{name} = %{version}-%{release}
-Obsoletes:      %{name} < %{version}-%{release}
+License:	BSD
+Summary:	Open source Implementation of WS-Management
+Provides:	%{name} = %{version}-%{release}
+Obsoletes:	%{name} < %{version}-%{release}
 
 %description -n libwsman1
-Openwsman library for packages dependent on openwsman
-
-
-
+Openwsman library for packages dependent on openwsman.
 
 %package -n libwsman-devel
-License:        BSD
-Group:          Development/Libraries
-Summary:        Open source Implementation of WS-Management
-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
+License:	BSD
+Summary:	Open source Implementation of WS-Management
+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
 
 %description -n libwsman-devel
-Development files for openwsman
-
-
+Development files for openwsman.
 
 %package client
-License:        BSD
-Group:          System Environment/Libraries
-Summary:        Openwsman Client libraries
+License:	BSD
+Summary:	Openwsman Client libraries
 
 %description client
-Openwsman Client libraries
-
-
-
+Openwsman Client libraries.
 
 %package server
-License:        BSD
-Group:          System Environment/Daemons
-Requires:       net-tools
-Requires(post):       chkconfig
-Requires(preun):      chkconfig
-Requires(postun):     initscripts
-Summary:        Openwsman Server and service libraries
-Requires:       libwsman1 = %{version}-%{release}
+License:	BSD
+Summary:	Openwsman Server and service libraries
+Requires:	libwsman1 = %{version}-%{release}
 
 %description server
-Openwsman Server and service libraries
-
-
-
-
-%package python
-License:        BSD
-Group:          Development/Libraries
-Summary:        Python bindings for openwsman client API
-Requires:       python2
-Requires:       libwsman1 = %{version}-%{release}
-
-%description python
-This package provides Python2 bindings to access the openwsman client
-API.
-
-
-
+Openwsman Server and service libraries.
 
 %package python3
-License:        BSD
-Group:          Development/Libraries
-Summary:        Python bindings for openwsman client API
-Requires:       python3
-Requires:       libwsman1 = %{version}-%{release}
+License:	BSD
+Summary:	Python bindings for openwsman client API
+Requires:	python3
+Requires:	libwsman1 = %{version}-%{release}
+%{?python_provide:%python_provide python3-openwsman}
 
 %description python3
-This package provides Python3 bindings to access the openwsman client
-API.
-
-
-
+This package provides Python3 bindings to access the openwsman client API.
 
 %package -n rubygem-%{gem_name}
-License:        BSD
-Group:          Development/Libraries
-Summary:        Ruby client bindings for Openwsman
-Obsoletes:      %{name}-ruby < %{version}-%{release}
+License:	BSD
+Summary:	Ruby client bindings for Openwsman
+Obsoletes:	%{name}-ruby < %{version}-%{release}
 
 %description -n rubygem-%{gem_name}
 The openwsman gem provides a Ruby API to manage systems using
 the WS-Management protocol.
 
 %package -n rubygem-%{gem_name}-doc
-Summary: Documentation for %{name}
-Group: Documentation
-Requires: rubygem-%{gem_name} = %{version}-%{release}
-BuildArch: noarch
+Summary:	Documentation for %{name}
+Requires:	rubygem-%{gem_name} = %{version}-%{release}
+BuildArch:	noarch
 
 %description -n rubygem-%{gem_name}-doc
 Documentation for rubygem-%{gem_name}
 
-
-
-
 %package perl
-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}
+License:	BSD
+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.
 
-
-
-
 %package winrs
-Summary:        Windows Remote Shell
-Requires:       rubygem-%{gem_name} = %{version}-%{release}
+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.
-
-
-
+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 -n %{name}-%{commit}
-
-# support python3
-pushd bindings
-cp -r python python3
-popd
+%setup -q
 
 %patch1 -p1 -b .pamsetup
 %patch2 -p1 -b .ruby-binding-build
-%patch3 -p1 -b .python3
-%patch4 -p1 -b .openssl-1.1-fix
-
-# 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
-
+%patch3 -p1 -b .openssl-1.1-fix
+%patch4 -p1 -b .http-status-line
+%patch5 -p1 -b .fix-set-cipher-list-retval-check
+%patch6 -p1 -b .CVE-2019-3816
+%patch7 -p1 -b .CVE-2019-3833
 
 %build
 # Removing executable permissions on .c and .h files to fix rpmlint warnings. 
@@ -210,23 +143,24 @@ export CFLAGS="-D_GNU_SOURCE -fPIE -DPIE"
 export LDFLAGS="$LDFLAGS -Wl,-z,now -pie"
 cd build
 cmake \
-  -DCMAKE_INSTALL_PREFIX=/usr \
-  -DCMAKE_VERBOSE_MAKEFILE=TRUE \
-  -DCMAKE_BUILD_TYPE=Release \
-  -DCMAKE_C_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS -fno-strict-aliasing" \
-  -DCMAKE_CXX_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS" \
-  -DCMAKE_SKIP_RPATH=1 \
-  -DPACKAGE_ARCHITECTURE=`uname -m` \
-  -DLIB=%{_lib} \
-   ..
+	-DCMAKE_INSTALL_PREFIX=/usr \
+	-DCMAKE_VERBOSE_MAKEFILE=TRUE \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_C_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS -fno-strict-aliasing" \
+	-DCMAKE_CXX_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS" \
+	-DCMAKE_SKIP_RPATH=1 \
+	-DPACKAGE_ARCHITECTURE=`uname -m` \
+	-DLIB=%{_lib} \
+	-DBUILD_JAVA=no \
+	..
 
 make
 
 # Make the freshly build openwsman libraries available to build the gem's
 # binary extension.
-export LIBRARY_PATH=/builddir/build/BUILD/%{name}-%{commit}/build/src/lib
-export CPATH=/builddir/build/BUILD/%{name}-%{commit}/include/
-export LD_LIBRARY_PATH=/builddir/build/BUILD/%{name}-%{commit}/build/src/lib/
+export LIBRARY_PATH=%{_builddir}/%{name}-%{version}/build/src/lib
+export CPATH=%{_builddir}/%{name}-%{version}/include/
+export LD_LIBRARY_PATH=%{_builddir}/%{name}-%{version}/build/src/lib/
 
 %gem_install -n ./bindings/ruby/%{name}-%{version}.gem
 
@@ -260,7 +194,7 @@ install -m 644 include/wsman-dispatcher.h %{buildroot}/%{_includedir}/openwsman
 
 mkdir -p %{buildroot}%{gem_dir}
 cp -pa ./build%{gem_dir}/* \
-        %{buildroot}%{gem_dir}/
+	%{buildroot}%{gem_dir}/
 
 rm -rf %{buildroot}%{gem_instdir}/ext
 
@@ -294,23 +228,16 @@ rm -f /var/log/wsmand.log
 %{_libdir}/libwsman_curl_client_transport.so.*
 
 %files -n libwsman-devel
+%doc AUTHORS COPYING ChangeLog README.md
 %{_includedir}/*
 %{_libdir}/pkgconfig/*
 %{_libdir}/*.so
-%doc AUTHORS COPYING ChangeLog README.md
-
-%files python
-%{python2_sitearch}/*.so
-%{python2_sitearch}/*.py
-%{python2_sitearch}/*.pyc
-%{python2_sitearch}/*.pyo
-%doc AUTHORS COPYING ChangeLog README.md
 
 %files python3
+%doc AUTHORS COPYING ChangeLog README.md
 %{python3_sitearch}/*.so
 %{python3_sitearch}/*.py
 %{python3_sitearch}/__pycache__/*
-%doc AUTHORS COPYING ChangeLog README.md
 
 %files -n rubygem-%{gem_name}
 %doc AUTHORS COPYING ChangeLog README.md
@@ -324,11 +251,12 @@ rm -f /var/log/wsmand.log
 %doc %{gem_docdir}
 
 %files perl
+%doc AUTHORS COPYING ChangeLog README.md
 %{perl_vendorarch}/openwsman.so
 %{perl_vendorlib}/openwsman.pm
-%doc AUTHORS COPYING ChangeLog README.md
 
 %files server
+%doc AUTHORS COPYING ChangeLog README.md
 # Don't remove *.so files from the server package.
 # the server fails to start without these files.
 %dir %{_sysconfdir}/openwsman
@@ -348,18 +276,66 @@ rm -f /var/log/wsmand.log
 %{_sbindir}/openwsmand
 %{_libdir}/libwsman_server.so.*
 %{_mandir}/man8/*
-%doc AUTHORS COPYING ChangeLog README.md
 
 %files client
+%doc AUTHORS COPYING ChangeLog README.md
 %{_libdir}/libwsman_clientpp.so.*
 %config(noreplace) %{_sysconfdir}/openwsman/openwsman_client.conf
-%doc AUTHORS COPYING ChangeLog README.md
 
 %files winrs
 %{_bindir}/winrs
 
-
 %changelog
+* Wed Mar 13 2019 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.5-4
+- Fix CVE-2019-3816
+  Resolves: #1687760
+- Fix CVE-2019-3833
+  Resolves: #1687762
+
+* Wed Feb 21 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.5-3
+- Fix wrong SSL_CTX_set_cipher_list() retval check
+- Explicitly disable build of java bindings (build fails if java-devel is installed)
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Jan 23 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.5-1
+- Update to openwsman-2.6.5
+- Simplify python binding build and drop python2 subpackage
+- Fix malformed HTTP 200 status line
+
+* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 2.6.3-11.git4391e5c
+- Rebuilt for switch to libxcrypt
+
+* Sat Jan  6 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.6.3-10.git4391e5c
+- F-28: rebuild for ruby 2.5
+- Backport git patches to support ruby 2.5
+
+* Wed Oct 04 2017 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.3-9.git
+- Remove unnecessary net-tools requirement
+  Resolves: #1496142
+
+* Tue Sep 12 2017 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.3-8.git4391e5c
+- Spec file clean up (removed RPM Groups tags, removed obsolete chkconfig/initscripts
+  dependencies, improved readability, fixed indentation)
+- Updated openssl-1.1 patch to support builds with older openssl versions
+
+* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.6.3-7.git4391e5c
+- Add Provides for the old name without %%_isa
+
+* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.6.3-6.git4391e5c
+- Python 2 binary package renamed to python2-openwsman
+  See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.3-5.git4391e5c
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.3-4.git4391e5c
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sun Jun 04 2017 Jitka Plesnikova <jplesnik@redhat.com> - 2.6.3-3.git4391e5c
+- Perl 5.26 rebuild
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.3-2.git4391e5c
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

sources

@@ -1,2 +1,2 @@
 SHA512 (openwsmand.8.gz) = 751c40060781e8b5a847e09aee94833ed1e4fbe966f052e5023cb209361acc312078d0d75c0806bd9990da061d3048566418135d3670dd620c6b809e5d0e594c
-SHA512 (openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b.tar.gz) = 9126053fb65457662e7a6275afe16b6fa6aaf978c2909aff97bca3d7dd3c8c1e7378e86ced97de42f86dd1060f2c7246ac3b1ecc4bf3d853606cc9d2d60d8eed
+SHA512 (v2.6.5.tar.gz) = dff103d50ddf974aa90db5be74761dd83944e64e1bab65161ee2941949c46af57c5d53d011ccbf1ef21002c825f4a2be8d6431c83610dd930b5ac4352fd0762b