- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

.gitignore

@@ -1,16 +1,2 @@
-openwsman-2.2.3.tar.bz2
-/openwsman-2.2.4.tar.bz2
-/openwsman-2.2.5.tar.bz2
-/openwsman-2.2.7.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
-/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-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b.tar.gz

openwsman-2.2.7-libssl.patch

@@ -1,12 +0,0 @@
-diff -up openwsman-2.2.7/src/server/shttpd/compat_unix.h.orig openwsman-2.2.7/src/server/shttpd/compat_unix.h
---- openwsman-2.2.7/src/server/shttpd/compat_unix.h.orig	2012-02-09 13:04:47.528527681 +0100
-+++ openwsman-2.2.7/src/server/shttpd/compat_unix.h	2012-02-09 13:05:31.582568867 +0100
-@@ -21,7 +21,7 @@
- #include <dirent.h>
- #include <dlfcn.h>
- #ifndef SSL_LIB
--#define	SSL_LIB				"libssl.so"
-+#define	SSL_LIB				"libssl.so.10"
- #endif
- #define	DIRSEP				'/'
- #define	IS_DIRSEP_CHAR(c)		((c) == '/')

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

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

openwsman-2.6.2-openssl-1.1-fix.patch

@@ -0,0 +1,185 @@
+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
+ static int ssl_certificate_thumbprint_verify_callback(X509_STORE_CTX *ctx, void *arg)
+ {
+ 	unsigned char *thumbprint = (unsigned char *)arg;
+-	X509 *cert = ctx->cert;
+ 	EVP_MD                                  *tempDigest;
+ 
+ 	unsigned char   tempFingerprint[EVP_MAX_MD_SIZE];
+ 	unsigned int      tempFingerprintLen;
+ 	tempDigest = (EVP_MD*)EVP_sha1( );
++
++	X509 *cert = X509_STORE_CTX_get_current_cert(ctx);
++	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 @@
+ 	pthread_create(&tid, NULL, (void *(*)(void *))a, c); } while (0)
+ #endif /* !NO_THREADS */
+ 
+-#define	SSL_LIB				"libssl.so"
+ #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
+@@ -11,23 +11,6 @@
+ #include "defs.h"
+ 
+ #if !defined(NO_SSL)
+-struct ssl_func	ssl_sw[] = {
+-	{"SSL_free",			{0}},
+-	{"SSL_accept",			{0}},
+-	{"SSL_connect",			{0}},
+-	{"SSL_read",			{0}},
+-	{"SSL_write",			{0}},
+-	{"SSL_get_error",		{0}},
+-	{"SSL_set_fd",			{0}},
+-	{"SSL_new",			{0}},
+-	{"SSL_CTX_new",			{0}},
+-	{"SSLv23_server_method",	{0}},
+-	{"SSL_library_init",		{0}},
+-	{"SSL_CTX_use_PrivateKey_file",	{0}},
+-	{"SSL_CTX_use_certificate_file",{0}},
+-	{NULL,				{0}}
+-};
+-
+ 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();
+ 	int		retval = FALSE;
+ 
+-	/* Load SSL library dynamically */
+-	if ((lib = dlopen(SSL_LIB, RTLD_LAZY)) == NULL) {
+-		_shttpd_elog(E_LOG, NULL, "set_ssl: cannot load %s", SSL_LIB);
+-		return (FALSE);
+-	}
+-
+-	for (fp = ssl_sw; fp->name != NULL; fp++)
+-		if ((fp->ptr.v_void = dlsym(lib, fp->name)) == NULL) {
+-			_shttpd_elog(E_LOG, NULL,"set_ssl: cannot find %s", fp->name);
+-			return (FALSE);
+-		}
+-
+ 	/* Initialize SSL crap */
++	debug("Initialize SSL");
++	SSL_load_error_strings();
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_library_init();
++	#else
++	OPENSSL_init_ssl(0, NULL);
++	#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
+ 			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);
++				SSL_CTX_set_options(CTX, protocols[idx].opt);
+ 				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
+@@ -12,50 +12,4 @@
+ 
+ #include <openssl/ssl.h>
+ 
+-#else
+-
+-/*
+- * Snatched from OpenSSL includes. I put the prototypes here to be independent
+- * from the OpenSSL source installation. Having this, shttpd + SSL can be
+- * built on any system with binary SSL libraries installed.
+- */
+-
+-typedef struct ssl_st SSL;
+-typedef struct ssl_method_st SSL_METHOD;
+-typedef struct ssl_ctx_st SSL_CTX;
+-
+-#define	SSL_ERROR_WANT_READ	2
+-#define	SSL_ERROR_WANT_WRITE	3
+-#define	SSL_ERROR_SYSCALL	5
+-#define	SSL_FILETYPE_PEM	1
+-
+ #endif
+-
+-/*
+- * Dynamically loaded SSL functionality
+- */
+-struct ssl_func {
+-	const char	*name;		/* SSL function name	*/
+-	union variant	ptr;		/* Function pointer	*/
+-};
+-
+-extern struct ssl_func	ssl_sw[];
+-
+-#define	FUNC(x)	ssl_sw[x].ptr.v_func
+-
+-#define	SSL_free(x)	(* (void (*)(SSL *)) FUNC(0))(x)
+-#define	SSL_accept(x)	(* (int (*)(SSL *)) FUNC(1))(x)
+-#define	SSL_connect(x)	(* (int (*)(SSL *)) FUNC(2))(x)
+-#define	SSL_read(x,y,z)	(* (int (*)(SSL *, void *, int)) FUNC(3))((x),(y),(z))
+-#define	SSL_write(x,y,z) \
+-	(* (int (*)(SSL *, const void *,int)) FUNC(4))((x), (y), (z))
+-#define	SSL_get_error(x,y)(* (int (*)(SSL *, int)) FUNC(5))((x), (y))
+-#define	SSL_set_fd(x,y)	(* (int (*)(SSL *, int)) FUNC(6))((x), (y))
+-#define	SSL_new(x)	(* (SSL * (*)(SSL_CTX *)) FUNC(7))(x)
+-#define	SSL_CTX_new(x)	(* (SSL_CTX * (*)(SSL_METHOD *)) FUNC(8))(x)
+-#define	SSLv23_server_method()	(* (SSL_METHOD * (*)(void)) FUNC(9))()
+-#define	SSL_library_init() (* (int (*)(void)) FUNC(10))()
+-#define	SSL_CTX_use_PrivateKey_file(x,y,z)	(* (int (*)(SSL_CTX *, \
+-		const char *, int)) FUNC(11))((x), (y), (z))
+-#define	SSL_CTX_use_certificate_file(x,y,z)	(* (int (*)(SSL_CTX *, \
+-		const char *, int)) FUNC(12))((x), (y), (z))

openwsman-2.6.2-python3.patch

@@ -0,0 +1,179 @@
+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.spec

@@ -1,38 +1,38 @@
-
-%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
-%{!?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
-
 # RubyGems's macros expect gem_name to exist.
 %global gem_name %{name}
 
+%global commit 4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
 Name:           openwsman
 BuildRequires:  swig
 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:  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.0
-Release:        2%{?dist}
+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
-# You can get this tarball here:
-# https://github.com/Openwsman/openwsman/archive/v%{version}.tar.gz
-Source:         %{name}-%{version}.tar.gz
+# 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
 # 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
-Patch1:         openwsman-2.2.7-libssl.patch
-Patch2:         openwsman-2.4.0-pamsetup.patch
-Patch3:         openwsman-2.4.12-ruby-binding-build.patch
+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
 
 %description
 Openwsman is a project intended to provide an open-source
@@ -107,11 +107,25 @@ Openwsman Server and service libraries
 License:        BSD
 Group:          Development/Libraries
 Summary:        Python bindings for openwsman client API
-Requires:       python
+Requires:       python2
 Requires:       libwsman1 = %{version}-%{release}
 
 %description python
-This package provides Python bindings to access the openwsman client
+This package provides Python2 bindings to access the openwsman client
+API.
+
+
+
+
+%package python3
+License:        BSD
+Group:          Development/Libraries
+Summary:        Python bindings for openwsman client API
+Requires:       python3
+Requires:       libwsman1 = %{version}-%{release}
+
+%description python3
+This package provides Python3 bindings to access the openwsman client
 API.
 
 
@@ -152,11 +166,29 @@ 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
+%setup -q -n %{name}-%{commit}
+
+# support python3
+pushd bindings
+cp -r python python3
+popd
+
+%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
@@ -165,6 +197,7 @@ 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. 
 chmod -x src/cpp/WsmanClient.h
@@ -173,7 +206,6 @@ rm -rf build
 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
@@ -188,13 +220,13 @@ cmake \
   -DLIB=%{_lib} \
    ..
 
-make CFLAGS="-DSSL_LIB='\"$SSL_LIB\"'"
+make
 
 # Make the freshly build openwsman libraries available to build the gem's
 # binary extension.
-export LIBRARY_PATH=/builddir/build/BUILD/%{name}-%{version}/build/src/lib
-export CPATH=/builddir/build/BUILD/%{name}-%{version}/include/
-export LD_LIBRARY_PATH=/builddir/build/BUILD/%{name}-%{version}/build/src/lib/
+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/
 
 %gem_install -n ./bindings/ruby/%{name}-%{version}.gem
 
@@ -268,10 +300,16 @@ rm -f /var/log/wsmand.log
 %doc AUTHORS COPYING ChangeLog README.md
 
 %files python
-%{python_sitearch}/*.so
-%{python_sitearch}/*.py
-%{python_sitearch}/*.pyc
-%{python_sitearch}/*.pyo
+%{python2_sitearch}/*.so
+%{python2_sitearch}/*.py
+%{python2_sitearch}/*.pyc
+%{python2_sitearch}/*.pyo
+%doc AUTHORS COPYING ChangeLog README.md
+
+%files python3
+%{python3_sitearch}/*.so
+%{python3_sitearch}/*.py
+%{python3_sitearch}/__pycache__/*
 %doc AUTHORS COPYING ChangeLog README.md
 
 %files -n rubygem-%{gem_name}
@@ -317,11 +355,57 @@ rm -f /var/log/wsmand.log
 %config(noreplace) %{_sysconfdir}/openwsman/openwsman_client.conf
 %doc AUTHORS COPYING ChangeLog README.md
 
+%files winrs
+%{_bindir}/winrs
+
 
 %changelog
-* Mon Jan 25 2016 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.0-2
-- SSL rebuild
-  Resolves: #1301062
+* 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
+
+* Tue Jan 17 2017 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.3-1.git4391e5c
+- Update to openwsman-2.6.3 from upstream VCS
+  (because it contains shttpd 1.42)
+
+* Thu Jan 12 2017 Vít Ondruch <vondruch@redhat.com> - 2.6.2-11
+- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.4
+
+* Mon Jan 09 2017 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.2-10
+- Disable SSL protocols listed in config file
+
+* Tue Jan 03 2017 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.2-9
+- Port to openssl 1.1.0
+  Resolves: #1383992
+
+* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 2.6.2-8
+- Rebuild for Python 3.6
+
+* Thu Aug 11 2016 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.2-7
+- Add openwsman-python3 subpackage
+  Resolves: #1354481
+
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6.2-6
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
+* Sun May 15 2016 Jitka Plesnikova <jplesnik@redhat.com> - 2.6.2-5
+- Perl 5.24 rebuild
+
+* Tue Mar 22 2016 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.2-4
+- Remove SSL_LIB acquired by readlink from CFLAGS
+
+* 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

sources

@@ -1,2 +1,2 @@
-4f2d9b1d7da6d87fcd38a9aa23559723  openwsmand.8.gz
-824834a86040b98b03f3fc0f7f62e853  openwsman-2.6.0.tar.gz
+SHA512 (openwsmand.8.gz) = 751c40060781e8b5a847e09aee94833ed1e4fbe966f052e5023cb209361acc312078d0d75c0806bd9990da061d3048566418135d3670dd620c6b809e5d0e594c
+SHA512 (openwsman-4391e5c68d99c6239e1672d1c8a5a16d7d8c4c2b.tar.gz) = 9126053fb65457662e7a6275afe16b6fa6aaf978c2909aff97bca3d7dd3c8c1e7378e86ced97de42f86dd1060f2c7246ac3b1ecc4bf3d853606cc9d2d60d8eed