Merge branch 'master' into epel8

.gitignore

@@ -13,4 +13,5 @@
 /libwebsockets-3.0.1.tar.gz
 /libwebsockets-3.1.0.tar.gz
 /libwebsockets-3.2.0.tar.gz
+/libwebsockets-3.2.1.tar.gz
 /libwebsockets-3.2.2.tar.gz

libwebsockets.spec

@@ -9,8 +9,7 @@ Summary:        A lightweight C library for Websockets
 # Test suite is licensed as Public domain (CC-zero)
 License:        LGPLv2 and Public Domain and BSD and MIT and zlib
 URL:            http://libwebsockets.org
-Source0:        https://github.com/warmcat/libwebsockets/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Patch0:         sock-fix-build.patch
+Source0:        https://github.com/warmcat/libwebsockets/archive/v%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires:  cmake
 BuildRequires:  gcc
@@ -103,6 +102,9 @@ find %{buildroot} -name '*_static.pc' -delete
 * Sat Jan 18 2020 Fabian Affolter <mail@fabian-affolter.ch> - 3.2.2-1
 - Update to latest upstream release 3.2.2 (rhbz#1792585)
 
+* Thu Dec 19 2019 Peter Robinson <pbrobinson@fedoraproject.org> 3.2.1-1
+- Update to 3.2.1
+
 * Mon Sep  2 2019 Peter Robinson <pbrobinson@fedoraproject.org> 3.2.0-1
 - Update to 3.2.0
 

sock-fix-build.patch

@@ -1,20 +0,0 @@
-Author: Sviatoslav Grebenchucov <m1r4gexx@gmail.com>
-Date: Sun Aug 25 20:52:20 2019 +0200
-
-socks: Fix compilation error
-
-
-diff --git a/lib/roles/http/client/client.c b/lib/roles/http/client/client.c
-index 65b7c54..b1e795d 100644
---- a/lib/roles/http/client/client.c
-+++ b/lib/roles/http/client/client.c
-@@ -214,7 +214,7 @@ lws_client_socket_service(struct lws *wsi, struct lws_pollfd *pollfd,
- 			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;
-