commit: cbc3b12df9b3aa2f1e11f5881c51e665a793da70 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Tue Jan 26 07:16:58 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jan 26 15:54:11 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbc3b12d
net-libs/libwebsockets: remove unused patch(es) Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/19225 Signed-off-by: Sam James <sam <AT> gentoo.org> .../libwebsockets-3.2.0-check_chown_result.patch | 22 ---------------- ...kets-3.2.1-socks5-noclient-compilefailure.patch | 29 ---------------------- 2 files changed, 51 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 deleted file mode 100644 index 3dafd60e731..00000000000 --- a/net-libs/libwebsockets/files/libwebsockets-3.2.0-check_chown_result.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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.1-socks5-noclient-compilefailure.patch b/net-libs/libwebsockets/files/libwebsockets-3.2.1-socks5-noclient-compilefailure.patch deleted file mode 100644 index a7cffbb1f11..00000000000 --- a/net-libs/libwebsockets/files/libwebsockets-3.2.1-socks5-noclient-compilefailure.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a27dabfd3a422a348135e49ffd4f163cc5c6baae Mon Sep 17 00:00:00 2001 -From: Jaco Kroon <[email protected]> -Date: Mon, 6 Jan 2020 11:52:54 +0200 -Subject: [PATCH] lws_create_vhost compile failure with +SOCKS5 -client. - -If LWS is build with SOCKS5 support, but WITHOUT_CLIENT then a compile -failure occurs which this fixes. - -Signed-off-by: Jaco Kroon <[email protected]> ---- - lib/core-net/vhost.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/core-net/vhost.c b/lib/core-net/vhost.c -index 69fe26a5..283b802e 100644 ---- a/lib/core-net/vhost.c -+++ b/lib/core-net/vhost.c -@@ -437,7 +437,7 @@ lws_create_vhost(struct lws_context *context, - struct lws_protocols *lwsp; - int m, f = !info->pvo, fx = 0, abs_pcol_count = 0; - char buf[96]; --#if !defined(LWS_WITHOUT_CLIENT) && defined(LWS_HAVE_GETENV) -+#if (!defined(LWS_WITHOUT_CLIENT) || defined(LWS_WITH_SOCKS5)) && defined(LWS_HAVE_GETENV) - char *p; - #endif - int n; --- -2.23.0 -
