summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>2021-01-26 08:16:58 +0100
committerSam James <sam@gentoo.org>2021-01-26 15:54:11 +0000
commitcbc3b12df9b3aa2f1e11f5881c51e665a793da70 (patch)
tree31d77577f2a99cc2c3b913f384b8bfc8d032ef2a /net-libs/libwebsockets
parentnet-libs/libircclient: remove unused patch (diff)
downloadgentoo-cbc3b12df9b3aa2f1e11f5881c51e665a793da70.tar.gz
gentoo-cbc3b12df9b3aa2f1e11f5881c51e665a793da70.tar.bz2
gentoo-cbc3b12df9b3aa2f1e11f5881c51e665a793da70.zip
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@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/19225 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-libs/libwebsockets')
-rw-r--r--net-libs/libwebsockets/files/libwebsockets-3.2.0-check_chown_result.patch22
-rw-r--r--net-libs/libwebsockets/files/libwebsockets-3.2.1-socks5-noclient-compilefailure.patch29
2 files changed, 0 insertions, 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 3dafd60e7315..000000000000
--- 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 a7cffbb1f111..000000000000
--- 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 <jaco@iewc.co.za>
-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 <jaco@iewc.co.za>
----
- 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
-