Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 23fa384454 | |||
| 6dcd9ddbfc | |||
| 102fbea1ba | |||
| e135327d2f | |||
| 415906b5a9 | |||
| 21ba3ec6d6 | |||
| 8be31c757a | |||
| 8e7d5b2b9d | |||
| 46a9d78c6d |
+1
-1
@@ -1,2 +1,2 @@
|
||||
/openwsmand.8.gz
|
||||
/v2.6.5.tar.gz
|
||||
/v2.6.8.tar.gz
|
||||
|
||||
@@ -1,16 +1,13 @@
|
||||
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
|
||||
diff -up openwsman-2.6.8/etc/pam/openwsman.orig openwsman-2.6.8/etc/pam/openwsman
|
||||
--- openwsman-2.6.8/etc/pam/openwsman.orig 2018-11-21 13:51:52.776325243 +0100
|
||||
+++ openwsman-2.6.8/etc/pam/openwsman 2018-11-21 13:54:17.066351134 +0100
|
||||
@@ -2,6 +2,6 @@
|
||||
auth required pam_unix.so nullok
|
||||
auth required pam_nologin.so
|
||||
-account required pam_unix2.so
|
||||
-password required pam_pwcheck.so nullok
|
||||
-password required pam_unix2.so nullok use_first_pass use_authtok
|
||||
-session required pam_unix2.so none
|
||||
+account required pam_unix.so
|
||||
account required pam_unix.so
|
||||
-password required pam_cracklib.so nullok
|
||||
-password required pam_unix.so nullok use_first_pass use_authtok nis shadow
|
||||
-session required pam_unix.so none
|
||||
+password required pam_pwquality.so
|
||||
+password required pam_unix.so nullok use_first_pass use_authtok
|
||||
+password required pam_unix.so nullok use_first_pass use_authtok
|
||||
+session required pam_unix.so
|
||||
|
||||
@@ -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.5/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.."
|
||||
|
||||
|
||||
@@ -1,31 +1,6 @@
|
||||
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;
|
||||
- X509 *cert = ctx->cert;
|
||||
EVP_MD *tempDigest;
|
||||
|
||||
unsigned char tempFingerprint[EVP_MAX_MD_SIZE];
|
||||
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-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
|
||||
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 */
|
||||
@@ -37,9 +12,9 @@ diff -up openwsman-2.6.5/src/server/shttpd/compat_unix.h.orig openwsman-2.6.5/sr
|
||||
#define DIRSEP '/'
|
||||
#define IS_DIRSEP_CHAR(c) ((c) == '/')
|
||||
#define O_BINARY 0
|
||||
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
|
||||
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"
|
||||
|
||||
@@ -64,9 +39,9 @@ diff -up openwsman-2.6.5/src/server/shttpd/io_ssl.c.orig openwsman-2.6.5/src/ser
|
||||
void
|
||||
_shttpd_ssl_handshake(struct stream *stream)
|
||||
{
|
||||
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
|
||||
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;
|
||||
@@ -94,22 +69,10 @@ diff -up openwsman-2.6.5/src/server/shttpd/shttpd.c.orig openwsman-2.6.5/src/ser
|
||||
|
||||
if ((CTX = SSL_CTX_new(SSLv23_server_method())) == NULL)
|
||||
_shttpd_elog(E_LOG, NULL, "SSL_CTX_new error");
|
||||
@@ -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);
|
||||
+#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-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 @@
|
||||
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>
|
||||
|
||||
@@ -130,7 +93,7 @@ diff -up openwsman-2.6.5/src/server/shttpd/ssl.h.orig openwsman-2.6.5/src/server
|
||||
-#define SSL_ERROR_SYSCALL 5
|
||||
-#define SSL_FILETYPE_PEM 1
|
||||
-
|
||||
#endif
|
||||
-#endif
|
||||
-
|
||||
-/*
|
||||
- * Dynamically loaded SSL functionality
|
||||
@@ -153,9 +116,11 @@ diff -up openwsman-2.6.5/src/server/shttpd/ssl.h.orig openwsman-2.6.5/src/server
|
||||
-#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 SSL_CTX_new(x) (* (SSL_CTX * (*)(const SSL_METHOD *)) FUNC(8))(x)
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
-#define SSLv23_server_method() (* (SSL_METHOD * (*)(void)) FUNC(9))()
|
||||
-#define SSL_library_init() (* (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))
|
||||
-#define SSL_CTX_use_certificate_file(x,y,z) (* (int (*)(SSL_CTX *, \
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
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);
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
@@ -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);
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
+39
-13
@@ -2,8 +2,8 @@
|
||||
%global gem_name %{name}
|
||||
|
||||
Name: openwsman
|
||||
Version: 2.6.5
|
||||
Release: 8%{?dist}
|
||||
Version: 2.6.8
|
||||
Release: 5%{?dist}
|
||||
Summary: Open source Implementation of WS-Management
|
||||
|
||||
License: BSD
|
||||
@@ -19,7 +19,9 @@ 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
|
||||
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
|
||||
BuildRequires: swig
|
||||
BuildRequires: libcurl-devel libxml2-devel pam-devel sblim-sfcc-devel
|
||||
BuildRequires: python3 python3-devel ruby ruby-devel rubygems-devel perl-interpreter
|
||||
@@ -78,7 +80,7 @@ Openwsman Server and service libraries.
|
||||
%package python3
|
||||
License: BSD
|
||||
Summary: Python bindings for openwsman client API
|
||||
Requires: python3
|
||||
Requires: %{__python3}
|
||||
Requires: libwsman1 = %{version}-%{release}
|
||||
%{?python_provide:%python_provide python3-openwsman}
|
||||
|
||||
@@ -126,7 +128,9 @@ You can use it to send shell commands to a remote Windows hosts.
|
||||
%patch2 -p1 -b .ruby-binding-build
|
||||
%patch3 -p1 -b .openssl-1.1-fix
|
||||
%patch4 -p1 -b .http-status-line
|
||||
%patch5 -p1 -b .fix-set-cipher-list-retval-check
|
||||
%patch5 -p1 -b .libcurl-error-codes-update
|
||||
%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.
|
||||
@@ -149,6 +153,7 @@ cmake \
|
||||
-DPACKAGE_ARCHITECTURE=`uname -m` \
|
||||
-DLIB=%{_lib} \
|
||||
-DBUILD_JAVA=no \
|
||||
-DBUILD_PYTHON=no \
|
||||
..
|
||||
|
||||
make
|
||||
@@ -198,12 +203,10 @@ 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}/
|
||||
|
||||
%post -n libwsman1 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libwsman1 -p /sbin/ldconfig
|
||||
%ldconfig_scriptlets -n libwsman1
|
||||
|
||||
%post server
|
||||
/sbin/ldconfig
|
||||
%{?ldconfig}
|
||||
%systemd_post openwsmand.service
|
||||
|
||||
%preun server
|
||||
@@ -212,11 +215,9 @@ cp -a ./build%{gem_extdir_mri}/{gem.build_complete,*.so} %{buildroot}%{gem_extdi
|
||||
%postun server
|
||||
rm -f /var/log/wsmand.log
|
||||
%systemd_postun_with_restart openwsmand.service
|
||||
/sbin/ldconfig
|
||||
%{?ldconfig}
|
||||
|
||||
%post client -p /sbin/ldconfig
|
||||
|
||||
%postun client -p /sbin/ldconfig
|
||||
%ldconfig_scriptlets client
|
||||
|
||||
%files -n libwsman1
|
||||
%doc AUTHORS COPYING ChangeLog README.md TODO
|
||||
@@ -283,6 +284,31 @@ rm -f /var/log/wsmand.log
|
||||
%{_bindir}/winrs
|
||||
|
||||
%changelog
|
||||
* Wed Mar 13 2019 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.8-5
|
||||
- Fix CVE-2019-3816
|
||||
Resolves: #1687760
|
||||
- Fix CVE-2019-3833
|
||||
Resolves: #1687762
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org>
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Mon Jan 21 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.6.8-3
|
||||
- F-30: rebuild against ruby26
|
||||
|
||||
* Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 2.6.8-2
|
||||
- Rebuilt for libcrypt.so.2 (#1666033)
|
||||
|
||||
* Thu Nov 22 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.8-1
|
||||
- Update to openwsman-2.6.8
|
||||
|
||||
* Wed Nov 14 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.5-10
|
||||
- Reflect changes in libcurl error codes
|
||||
Resolves: #1649393
|
||||
|
||||
* Mon Oct 01 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.6.5-9
|
||||
- Require the Python interpreter directly instead of using the package name
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.5-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
SHA512 (openwsmand.8.gz) = 751c40060781e8b5a847e09aee94833ed1e4fbe966f052e5023cb209361acc312078d0d75c0806bd9990da061d3048566418135d3670dd620c6b809e5d0e594c
|
||||
SHA512 (v2.6.5.tar.gz) = dff103d50ddf974aa90db5be74761dd83944e64e1bab65161ee2941949c46af57c5d53d011ccbf1ef21002c825f4a2be8d6431c83610dd930b5ac4352fd0762b
|
||||
SHA512 (v2.6.8.tar.gz) = 49e8ac9267602e3bedc5cca78f270798cd16cfb6ddf2fc5f2feb8539bb3eba3bbce09931a18c96cd231c4beeffda5c3ae5bb9e8531662c49ca6fd9681538ea31
|
||||
|
||||
Reference in New Issue
Block a user