Fix FTBFS, Remove RANDFILE and increase default bits in ssleay.conf

.gitignore

@@ -1,2 +1,2 @@
 /openwsmand.8.gz
-/v2.7.1.tar.gz
+/v2.6.8.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-2.7.1/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.8/include/ -o openwsman_wrap.c openwsman.i")
  
  $CPPFLAGS = "-I/usr/include/openwsman -I.."
  

openwsman-2.6.2-openssl-1.1-fix.patch

@@ -1,6 +1,6 @@
-diff -up openwsman-2.7.0/src/server/shttpd/compat_unix.h.orig openwsman-2.7.0/src/server/shttpd/compat_unix.h
---- openwsman-2.7.0/src/server/shttpd/compat_unix.h.orig	2020-05-25 15:16:28.000000000 +0200
-+++ openwsman-2.7.0/src/server/shttpd/compat_unix.h	2021-03-09 09:15:26.750942006 +0100
+diff -up openwsman-2.6.8/src/server/shttpd/compat_unix.h.orig openwsman-2.6.8/src/server/shttpd/compat_unix.h
+--- openwsman-2.6.8/src/server/shttpd/compat_unix.h.orig	2018-10-12 12:06:26.000000000 +0200
++++ openwsman-2.6.8/src/server/shttpd/compat_unix.h	2018-11-22 13:30:10.756423510 +0100
 @@ -27,10 +27,6 @@
  	pthread_create(&tid, NULL, (void *(*)(void *))a, c); } while (0)
  #endif /* !NO_THREADS */
@@ -12,10 +12,10 @@ diff -up openwsman-2.7.0/src/server/shttpd/compat_unix.h.orig openwsman-2.7.0/sr
  #define	DIRSEP				'/'
  #define	IS_DIRSEP_CHAR(c)		((c) == '/')
  #define	O_BINARY			0
-diff -up openwsman-2.7.0/src/server/shttpd/io_ssl.c.orig openwsman-2.7.0/src/server/shttpd/io_ssl.c
---- openwsman-2.7.0/src/server/shttpd/io_ssl.c.orig	2020-05-25 15:16:28.000000000 +0200
-+++ openwsman-2.7.0/src/server/shttpd/io_ssl.c	2021-03-09 09:15:26.750942006 +0100
-@@ -11,28 +11,6 @@
+diff -up openwsman-2.6.8/src/server/shttpd/io_ssl.c.orig openwsman-2.6.8/src/server/shttpd/io_ssl.c
+--- openwsman-2.6.8/src/server/shttpd/io_ssl.c.orig	2018-10-12 12:06:26.000000000 +0200
++++ openwsman-2.6.8/src/server/shttpd/io_ssl.c	2018-11-22 13:30:10.757423510 +0100
+@@ -11,23 +11,6 @@
  #include "defs.h"
  
  #if !defined(NO_SSL)
@@ -29,13 +29,8 @@ diff -up openwsman-2.7.0/src/server/shttpd/io_ssl.c.orig openwsman-2.7.0/src/ser
 -	{"SSL_set_fd",			{0}},
 -	{"SSL_new",			{0}},
 -	{"SSL_CTX_new",			{0}},
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
 -	{"SSLv23_server_method",	{0}},
 -	{"SSL_library_init",		{0}},
--#else
--	{"TLS_server_method",	{0}},
--	{"OPENSSL_init_ssl",		{0}},
--#endif
 -	{"SSL_CTX_use_PrivateKey_file",	{0}},
 -	{"SSL_CTX_use_certificate_file",{0}},
 -	{NULL,				{0}}
@@ -44,10 +39,10 @@ diff -up openwsman-2.7.0/src/server/shttpd/io_ssl.c.orig openwsman-2.7.0/src/ser
  void
  _shttpd_ssl_handshake(struct stream *stream)
  {
-diff -up openwsman-2.7.0/src/server/shttpd/shttpd.c.orig openwsman-2.7.0/src/server/shttpd/shttpd.c
---- openwsman-2.7.0/src/server/shttpd/shttpd.c.orig	2020-05-25 15:16:28.000000000 +0200
-+++ openwsman-2.7.0/src/server/shttpd/shttpd.c	2021-03-09 09:16:58.843241510 +0100
-@@ -1489,25 +1489,13 @@ set_ssl(struct shttpd_ctx *ctx, const ch
+diff -up openwsman-2.6.8/src/server/shttpd/shttpd.c.orig openwsman-2.6.8/src/server/shttpd/shttpd.c
+--- openwsman-2.6.8/src/server/shttpd/shttpd.c.orig	2018-10-12 12:06:26.000000000 +0200
++++ openwsman-2.6.8/src/server/shttpd/shttpd.c	2018-11-22 13:30:41.314416695 +0100
+@@ -1476,20 +1476,14 @@ set_ssl(struct shttpd_ctx *ctx, const ch
  	int		retval = FALSE;
  	EC_KEY*		key;
  
@@ -64,20 +59,20 @@ diff -up openwsman-2.7.0/src/server/shttpd/shttpd.c.orig openwsman-2.7.0/src/ser
 -		}
 -
  	/* Initialize SSL crap */
- 
- #if OPENSSL_VERSION_NUMBER < 0x10100000L
++	debug("Initialize SSL");
++	SSL_load_error_strings();
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	OPENSSL_init_ssl(0, NULL);
++#else
  	SSL_library_init();
++#endif
+ 
  	if ((CTX = SSL_CTX_new(SSLv23_server_method())) == NULL)
- #else
--        OPENSSL_init_ssl();
-+        OPENSSL_init_ssl(0, NULL);
- 	if ((CTX = SSL_CTX_new(TLS_server_method())) == NULL)
- #endif
  		_shttpd_elog(E_LOG, NULL, "SSL_CTX_new error");
-diff -up openwsman-2.7.0/src/server/shttpd/ssl.h.orig openwsman-2.7.0/src/server/shttpd/ssl.h
---- openwsman-2.7.0/src/server/shttpd/ssl.h.orig	2020-05-25 15:16:28.000000000 +0200
-+++ openwsman-2.7.0/src/server/shttpd/ssl.h	2021-03-09 09:15:26.750942006 +0100
-@@ -12,55 +12,4 @@
+diff -up openwsman-2.6.8/src/server/shttpd/ssl.h.orig openwsman-2.6.8/src/server/shttpd/ssl.h
+--- openwsman-2.6.8/src/server/shttpd/ssl.h.orig	2018-10-12 12:06:26.000000000 +0200
++++ openwsman-2.6.8/src/server/shttpd/ssl.h	2018-11-22 13:30:10.757423510 +0100
+@@ -12,52 +12,4 @@
  
  #include <openssl/ssl.h>
  
@@ -125,9 +120,6 @@ diff -up openwsman-2.7.0/src/server/shttpd/ssl.h.orig openwsman-2.7.0/src/server
 -#if OPENSSL_VERSION_NUMBER < 0x10100000L
 -#define	SSLv23_server_method()	(* (SSL_METHOD * (*)(void)) FUNC(9))()
 -#define	SSL_library_init() (* (int (*)(void)) FUNC(10))()
--#else
--#define	TLS_server_method()	(* (SSL_METHOD * (*)(void)) FUNC(9))()
--#define	OPENSSL_init_ssl() (* (int (*)(void)) FUNC(10))()
  #endif
 -#define	SSL_CTX_use_PrivateKey_file(x,y,z)	(* (int (*)(SSL_CTX *, \
 -		const char *, int)) FUNC(11))((x), (y), (z))

openwsman-2.6.5-libcurl-error-codes-update.patch

@@ -0,0 +1,27 @@
+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	2018-11-14 13:53:27.442138557 +0100
++++ openwsman-2.6.5/src/lib/wsman-curl-client-transport.c	2018-11-14 14:11:28.508714204 +0100
+@@ -186,16 +186,23 @@ convert_to_last_error(CURLcode r)
+ 		return WS_LASTERR_SSL_CONNECT_ERROR;
+         case CURLE_BAD_FUNCTION_ARGUMENT:
+                 return WS_LASTERR_CURL_BAD_FUNCTION_ARG;
++#if LIBCURL_VERSION_NUM < 0x073E00
+ 	case CURLE_SSL_PEER_CERTIFICATE:
+ 		return WS_LASTERR_SSL_PEER_CERTIFICATE;
++#endif
+ 	case CURLE_SSL_ENGINE_NOTFOUND:
+ 		return WS_LASTERR_SSL_ENGINE_NOTFOUND;
+ 	case CURLE_SSL_ENGINE_SETFAILED:
+ 		return WS_LASTERR_SSL_ENGINE_SETFAILED;
+ 	case CURLE_SSL_CERTPROBLEM:
+ 		return WS_LASTERR_SSL_CERTPROBLEM;
++#if LIBCURL_VERSION_NUM < 0x073E00
+ 	case CURLE_SSL_CACERT:
+ 		return WS_LASTERR_SSL_CACERT;
++#else
++	case CURLE_PEER_FAILED_VERIFICATION:
++		return WS_LASTERR_SSL_PEER_CERTIFICATE;
++#endif
+ #if LIBCURL_VERSION_NUM > 0x70C01
+ 	case CURLE_SSL_ENGINE_INITFAILED:
+ 		return WS_LASTERR_SSL_ENGINE_INITFAILED;

openwsman-2.6.8-CVE-2019-3816.patch

@@ -0,0 +1,79 @@
+diff -up openwsman-2.6.8/src/server/shttpd/shttpd.c.orig openwsman-2.6.8/src/server/shttpd/shttpd.c
+--- openwsman-2.6.8/src/server/shttpd/shttpd.c.orig	2019-03-13 08:52:06.112090942 +0100
++++ openwsman-2.6.8/src/server/shttpd/shttpd.c	2019-03-13 09:01:15.496156789 +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.8/src/server/wsmand.c.orig openwsman-2.6.8/src/server/wsmand.c
+--- openwsman-2.6.8/src/server/wsmand.c.orig	2018-10-12 12:06:26.000000000 +0200
++++ openwsman-2.6.8/src/server/wsmand.c	2019-03-13 09:03:25.919181279 +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.8-CVE-2019-3833.patch

@@ -0,0 +1,94 @@
+diff -up openwsman-2.6.8/src/server/shttpd/shttpd.c.orig openwsman-2.6.8/src/server/shttpd/shttpd.c
+--- openwsman-2.6.8/src/server/shttpd/shttpd.c.orig	2019-03-13 09:32:32.417633057 +0100
++++ openwsman-2.6.8/src/server/shttpd/shttpd.c	2019-03-13 09:58:04.482486589 +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
+@@ -1642,7 +1651,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.8-update-ssleay-conf.patch

@@ -1,9 +1,12 @@
-diff -up openwsman-2.7.1/etc/ssleay.cnf.orig openwsman-2.7.1/etc/ssleay.cnf
---- openwsman-2.7.1/etc/ssleay.cnf.orig	2021-11-09 08:27:48.577749509 +0100
-+++ openwsman-2.7.1/etc/ssleay.cnf	2021-11-09 08:28:10.499967010 +0100
-@@ -3,7 +3,7 @@
+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

openwsman.fc

@@ -1,7 +0,0 @@
-/usr/lib/systemd/system/openwsmand.*		--	gen_context(system_u:object_r:openwsman_unit_file_t,s0)
-
-/usr/sbin/openwsmand		--	gen_context(system_u:object_r:openwsman_exec_t,s0)
-
-/var/log/wsmand.*	--	gen_context(system_u:object_r:openwsman_log_t,s0)
-
-/var/run/wsmand.*	--	gen_context(system_u:object_r:openwsman_run_t,s0)

openwsman.if

@@ -1,79 +0,0 @@
-## <summary>WS-Management Server</summary>
-
-########################################
-## <summary>
-##	Execute openwsman in the openwsman domin.
-## </summary>
-## <param name="domain">
-## <summary>
-##	Domain allowed to transition.
-## </summary>
-## </param>
-#
-interface(`openwsman_domtrans',`
-	gen_require(`
-		type openwsman_t, openwsman_exec_t;
-	')
-
-	corecmd_search_bin($1)
-	domtrans_pattern($1, openwsman_exec_t, openwsman_t)
-')
-########################################
-## <summary>
-##	Execute openwsman server in the openwsman domain.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed to transition.
-##	</summary>
-## </param>
-#
-interface(`openwsman_systemctl',`
-	gen_require(`
-		type openwsman_t;
-		type openwsman_unit_file_t;
-	')
-
-	systemd_exec_systemctl($1)
-	init_reload_services($1)
-    systemd_read_fifo_file_passwd_run($1)
-	allow $1 openwsman_unit_file_t:file read_file_perms;
-	allow $1 openwsman_unit_file_t:service manage_service_perms;
-
-	ps_process_pattern($1, openwsman_t)
-')
-
-
-########################################
-## <summary>
-##	All of the rules required to administrate
-##	an openwsman environment
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-## <rolecap/>
-#
-interface(`openwsman_admin',`
-	gen_require(`
-		type openwsman_t;
-	    type openwsman_unit_file_t;
-	')
-
-	allow $1 openwsman_t:process { signal_perms };
-	ps_process_pattern($1, openwsman_t)
-
-    tunable_policy(`deny_ptrace',`',`
-        allow $1 openwsman_t:process ptrace;
-    ')
-
-	openwsman_systemctl($1)
-	admin_pattern($1, openwsman_unit_file_t)
-	allow $1 openwsman_unit_file_t:service all_service_perms;
-	optional_policy(`
-		systemd_passwd_agent_exec($1)
-		systemd_read_fifo_file_passwd_run($1)
-	')
-')

openwsman.spec

@@ -1,14 +1,9 @@
 # RubyGems's macros expect gem_name to exist.
 %global		gem_name %{name}
 
-# defining macros needed by SELinux
-%global with_selinux 1
-%global selinuxtype targeted
-%global modulename openwsman
-
 Name:		openwsman
-Version:	2.7.1
-Release:	3%{?dist}
+Version:	2.6.8
+Release:	17%{?dist}
 Summary:	Open source Implementation of WS-Management
 
 License:	BSD
@@ -20,17 +15,14 @@ Source1:	openwsmand.8.gz
 Source2:	openwsmand.service
 # script for testing presence of the certificates in ExecStartPre
 Source3:	owsmantestcert.sh
-# Source100-102: selinux policy for openwsman, extracted
-# from https://github.com/fedora-selinux/selinux-policy
-Source100: %{modulename}.te
-Source101: %{modulename}.if
-Source102: %{modulename}.fc
 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.8-update-ssleay-conf.patch
-BuildRequires: make
+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:	swig
 BuildRequires:	libcurl-devel libxml2-devel pam-devel sblim-sfcc-devel
 BuildRequires:	python3 python3-devel ruby ruby-devel rubygems-devel perl-interpreter
@@ -82,11 +74,6 @@ Openwsman Client libraries.
 License:	BSD
 Summary:	Openwsman Server and service libraries
 Requires:	libwsman1 = %{version}-%{release}
-%if 0%{?with_selinux}
-# This ensures that the *-selinux package and all it’s dependencies are not pulled
-# into containers and other systems that do not use SELinux
-Requires:  (%{name}-selinux if selinux-policy-%{selinuxtype})
-%endif
 
 %description server
 Openwsman Server and service libraries.
@@ -136,20 +123,6 @@ Requires:	rubygem-%{gem_name} = %{version}-%{release}
 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.
 
-%if 0%{?with_selinux}
-# SELinux subpackage
-%package selinux
-Summary:   openwsman SELinux policy
-BuildArch: noarch
-Requires:  selinux-policy-%{selinuxtype}
-Requires(post): selinux-policy-%{selinuxtype}
-BuildRequires: selinux-policy-devel
-%{?selinux_requires}
-
-%description selinux
-Custom SELinux policy module
-%endif
-
 %prep
 %setup -q
 
@@ -157,7 +130,10 @@ Custom SELinux policy module
 %patch2 -p1 -b .ruby-binding-build
 %patch3 -p1 -b .openssl-1.1-fix
 %patch4 -p1 -b .http-status-line
-%patch5 -p1 -b .update-ssleay-conf
+%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. 
@@ -193,22 +169,13 @@ export LD_LIBRARY_PATH=%{_builddir}/%{name}-%{version}/build/src/lib/
 
 %gem_install -n ./bindings/ruby/%{name}-%{version}.gem
 
-%if 0%{?with_selinux}
-# SELinux policy (originally from selinux-policy-contrib)
-# this policy module will override the production module
-mkdir selinux
-cp -p %{SOURCE100} %{SOURCE101} %{SOURCE102} selinux/
-make -f %{_datadir}/selinux/devel/Makefile %{modulename}.pp
-bzip2 -9 %{modulename}.pp
-%endif
-
 %install
 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
@@ -239,11 +206,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}/
 
-%if 0%{?with_selinux}
-install -D -m 0644 build/%{modulename}.pp.bz2 %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/%{modulename}.pp.bz2
-install -D -p -m 0644 build/selinux/%{modulename}.if %{buildroot}%{_datadir}/selinux/devel/include/distributed/%{name}.if
-%endif
-
 %ldconfig_scriptlets -n libwsman1
 
 %post server
@@ -260,28 +222,6 @@ rm -f /var/log/wsmand.log
 
 %ldconfig_scriptlets client
 
-%if 0%{?with_selinux}
-# SELinux contexts are saved so that only affected files can be
-# relabeled after the policy module installation
-%pre selinux
-%selinux_relabel_pre -s %{selinuxtype}
-
-%post selinux
-%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/%{modulename}.pp.bz2
-%selinux_relabel_post -s %{selinuxtype}
-
-if [ "$1" -le "1" ]; then # First install
-   # the service needs to be restarted for the custom label to be applied
-   %systemd_postun_with_restart openwsmand.service
-fi
-
-%postun selinux
-if [ $1 -eq 0 ]; then
-    %selinux_modules_uninstall -s %{selinuxtype} %{modulename}
-    %selinux_relabel_post -s %{selinuxtype}
-fi
-%endif
-
 %files -n libwsman1
 %doc AUTHORS COPYING ChangeLog README.md TODO
 %{_libdir}/libwsman.so.*
@@ -346,56 +286,9 @@ fi
 %files winrs
 %{_bindir}/winrs
 
-%if 0%{?with_selinux}
-%files selinux
-%{_datadir}/selinux/packages/%{selinuxtype}/%{modulename}.pp.*
-%{_datadir}/selinux/devel/include/distributed/%{modulename}.if
-%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{modulename}
-%endif
-
 %changelog
-* Thu Jan 27 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.7.1-3
-- F-36: rebuild against ruby31
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Nov 11 2021 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.7.1-1
-- Update to openwsman-2.7.1
-
-* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 2.7.0-6
-- Rebuilt with OpenSSL 3.0.0
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jun 08 2021 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.7.0-4
-- Incorporate -selinux subpackage
-  See https://fedoraproject.org/wiki/SELinux/IndependentPolicy
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 2.7.0-3
-- Rebuilt for Python 3.10
-
-* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 2.7.0-2
-- Perl 5.34 rebuild
-
-* Tue Mar 09 2021 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.7.0-1
-- Update to openwsman-2.7.0 (thanks for a patch to Bastian Germann)
-
-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.6.8-20
-- Rebuilt for updated systemd-rpm-macros
-  See https://pagure.io/fesco/issue/2583.
-
-* 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
+* Wed Mar 10 2021 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.8-17
+- Fix FTBFS (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

openwsman.te

@@ -1,74 +0,0 @@
-policy_module(openwsman, 1.0.0)
-
-########################################
-#
-# Declarations
-#
-
-type openwsman_t;
-type openwsman_exec_t;
-init_daemon_domain(openwsman_t, openwsman_exec_t)
-
-type openwsman_tmp_t;
-files_tmp_file(openwsman_tmp_t)
-
-type openwsman_tmpfs_t;
-files_tmpfs_file(openwsman_tmpfs_t)
-
-type openwsman_log_t;
-logging_log_file(openwsman_log_t)
-
-type openwsman_run_t;
-files_pid_file(openwsman_run_t)
-
-type openwsman_unit_file_t;
-systemd_unit_file(openwsman_unit_file_t)
-
-########################################
-#
-# openwsman local policy
-#
-
-allow openwsman_t self:capability setuid;
-
-allow openwsman_t self:process { fork };
-allow openwsman_t self:fifo_file rw_fifo_file_perms;
-allow openwsman_t self:unix_stream_socket create_stream_socket_perms;
-allow openwsman_t self:tcp_socket { accept create_socket_perms listen };
-
-manage_files_pattern(openwsman_t, openwsman_tmp_t, openwsman_tmp_t)
-manage_dirs_pattern(openwsman_t, openwsman_tmp_t, openwsman_tmp_t)
-files_tmp_filetrans(openwsman_t, openwsman_tmp_t, { dir file })
-
-manage_files_pattern(openwsman_t, openwsman_tmpfs_t, openwsman_tmpfs_t)
-manage_dirs_pattern(openwsman_t, openwsman_tmpfs_t, openwsman_tmpfs_t)
-fs_tmpfs_filetrans(openwsman_t, openwsman_tmpfs_t, { dir file })
-
-manage_files_pattern(openwsman_t, openwsman_log_t, openwsman_log_t)
-logging_log_filetrans(openwsman_t, openwsman_log_t, { file })
-
-manage_files_pattern(openwsman_t, openwsman_run_t, openwsman_run_t)
-files_pid_filetrans(openwsman_t, openwsman_run_t, { file })
-
-auth_use_nsswitch(openwsman_t)
-auth_domtrans_chkpwd(openwsman_t)
-
-corenet_tcp_connect_pegasus_https_port(openwsman_t)
-corenet_tcp_bind_vnc_port(openwsman_t)
-corenet_tcp_bind_http_port(openwsman_t)
-
-dev_read_urand(openwsman_t)
-
-logging_send_syslog_msg(openwsman_t)
-logging_send_audit_msgs(openwsman_t)
-
-optional_policy(`
-    sblim_stream_connect_sfcbd(openwsman_t)
-    sblim_rw_semaphores_sfcbd(openwsman_t)
-    sblim_getattr_exec_sfcbd(openwsman_t)
-')
-
-optional_policy(`
-    unconfined_domain(openwsman_t)
-')
-

sources

@@ -1,2 +1,2 @@
 SHA512 (openwsmand.8.gz) = 751c40060781e8b5a847e09aee94833ed1e4fbe966f052e5023cb209361acc312078d0d75c0806bd9990da061d3048566418135d3670dd620c6b809e5d0e594c
-SHA512 (v2.7.1.tar.gz) = 37738bc5be7b1c3fa961587fca4db74b8e7714fc0641a550682275fbe925b2c8e18a683cf493f4740e479f7461cc98392d3d675f4769f5cf04e7249f1e9ee880
+SHA512 (v2.6.8.tar.gz) = 49e8ac9267602e3bedc5cca78f270798cd16cfb6ddf2fc5f2feb8539bb3eba3bbce09931a18c96cd231c4beeffda5c3ae5bb9e8531662c49ca6fd9681538ea31

tests/tests-DSP.yml

@@ -1,37 +0,0 @@
-- hosts: localhost
-
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - classic
-    repositories:
-      - repo: https://pagure.io/DSP_test.git
-        dest: DSP_test
-        version: master
-
-    tests:
-    - DSP_test
-    environment:
-      # RPM package containing the policy module
-      TEST_RPM: openwsman-selinux
-      # policy module name
-      TEST_POLICY: openwsman
-      # policy sources will be extracted from corresponding .src.rpm
-      # policy tar filename regexp (e.g. "usbguard-selinux*.tar.gz")
-      # or empty string if policy sources are not inside a tar archive
-      POLICY_TAR: ''
-      # path to policy sources (in of the tar archive) -- <POLICY_TAR>/<POLICY_PATH>/<TEST_POLICY>.(te|if|fc)
-      # or path in the src.rpm if there is no tar archive -- <src.rpm>/<POLICY_PATH>/<TEST_POLICY>.(te|if|fc)
-      # can contain wildcards (e.g. for versions etc.)
-      POLICY_PATH: .
-
-    required_packages:
-    - policycoreutils
-    - selinux-policy
-    - selinux-policy-targeted
-    - setools-console
-    - libselinux-utils
-    - rpm
-    - tar
-    - git
-    - openwsman-server