diff options
| author |   Jaco Kroon <jaco@uls.co.za> | 2019-11-07 12:46:17 +0200 |
|---|---|---|
| committer |   Joonas Niilola <juippis@gentoo.org> | 2019-11-12 16:45:29 +0200 |
| commit | 31ceadbd479ef83029bfa47e3315dd713bb584fe (patch) | |
| tree | 16503878567c771ced6918423c0e93c0a35ac568 /net-libs/libwebsockets/files | |
| parent | net-libs/libhubbub: bump to 0.3.6 and fix for json-c issue. (diff) | |
| download | gentoo-31ceadbd479ef83029bfa47e3315dd713bb584fe.tar.gz gentoo-31ceadbd479ef83029bfa47e3315dd713bb584fe.tar.bz2 gentoo-31ceadbd479ef83029bfa47e3315dd713bb584fe.zip | |
net-libs/libwebsockets: version bump to 3.2.0
Closes: https://bugs.gentoo.org/696554
Closes: https://bugs.gentoo.org/615532
Closes: https://bugs.gentoo.org/618428
Closes: https://bugs.gentoo.org/672194
Closes: https://bugs.gentoo.org/669152
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Jaco Kroon <jaco@uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/13579
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'net-libs/libwebsockets/files')
| -rw-r--r-- | net-libs/libwebsockets/files/libwebsockets-3.2.0-check_chown_result.patch | 22 | ||||
| -rw-r--r-- | net-libs/libwebsockets/files/libwebsockets-3.2.0-string_assignment.patch | 11 |
2 files changed, 33 insertions, 0 deletions
diff --git a/net-libs/libwebsockets/files/libwebsockets-3.2.0-check_chown_result.patch b/net-libs/libwebsockets/files/libwebsockets-3.2.0-check_chown_result.patch new file mode 100644 index 000000000000..3dafd60e7315 --- /dev/null +++ b/net-libs/libwebsockets/files/libwebsockets-3.2.0-check_chown_result.patch @@ -0,0 +1,22 @@ +--- libwebsockets-3.2.0.o/lib/misc/lws-struct-sqlite.c 2019-08-14 10:22:50.000000000 +0200 ++++ libwebsockets-3.2.0/lib/misc/lws-struct-sqlite.c 2019-11-07 20:03:43.939423877 +0200 +@@ -23,6 +23,7 @@ + #include <core/private.h> + + #include <sqlite3.h> ++#include <string.h> + + /* + * we get one of these per matching result from the query +@@ -253,8 +254,9 @@ + } + + lws_get_effective_uid_gid(context, &uid, &gid); +- if (uid) +- chown(sqlite3_path, uid, gid); ++ if (uid && chown(sqlite3_path, uid, gid) < 0) ++ lwsl_err("%s: Error setting ownership of %s: %s\n", ++ __func__, sqlite3_path, strerror(errno)); + chmod(sqlite3_path, 0600); + + lwsl_notice("%s: created %s owned by %u:%u mode 0600\n", __func__, diff --git a/net-libs/libwebsockets/files/libwebsockets-3.2.0-string_assignment.patch b/net-libs/libwebsockets/files/libwebsockets-3.2.0-string_assignment.patch new file mode 100644 index 000000000000..86010aafd619 --- /dev/null +++ b/net-libs/libwebsockets/files/libwebsockets-3.2.0-string_assignment.patch @@ -0,0 +1,11 @@ +--- libwebsockets-3.2.0.o/lib/roles/http/client/client.c 2019-08-14 10:22:50.000000000 +0200 ++++ libwebsockets-3.2.0/lib/roles/http/client/client.c 2019-11-07 19:59:52.959534874 +0200 +@@ -214,7 +214,7 @@ + lwsl_client("SOCKS password OK, sending connect\n"); + if (socks_generate_msg(wsi, SOCKS_MSG_CONNECT, &len)) { + socks_send_msg_fail: +- *cce = "socks gen msg fail"; ++ cce = "socks gen msg fail"; + goto bail3; + } + conn_mode = LRS_WAITING_SOCKS_CONNECT_REPLY; |