net-libs/libwebsockets: Fix compile issue (#704180)

Closes: https://bugs.gentoo.org/704180
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Jaco Kroon <jaco@uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/14262
Signed-off-by: Joonas Niilola <juippis@gentoo.org>

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
new file mode 100644 (file)
index 0000000..d76744a
--- /dev/null
+++ b/net-libs/libwebsockets/files/libwebsockets-3.2.1-socks5-noclient-compilefailure.patch
@@ -0,0 +1,29 @@
+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
+

diff --git a/net-libs/libwebsockets/libwebsockets-3.2.1.ebuild b/net-libs/libwebsockets/libwebsockets-3.2.1.ebuild
index f9284f98884912e643f7315be55472a616e6f3c5..c3f2abb8f44d6ac5380016ddf999dab4f2ea916a 100644 (file)
--- a/net-libs/libwebsockets/libwebsockets-3.2.1.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-3.2.1.ebuild
@@ -41,6 +41,7 @@ BDEPEND="dev-lang/perl"
 
 PATCHES=(
        "${FILESDIR}/libwebsockets-3.2.0-check_chown_result.patch"
+       "${FILESDIR}/libwebsockets-3.2.1-socks5-noclient-compilefailure.patch"
 )
 
 src_configure() {