Merge branch 'master' into epel8

.gitignore

@@ -11,3 +11,5 @@
 /libwebsockets-2.4.2.tar.gz
 /libwebsockets-3.0.0.tar.gz
 /libwebsockets-3.0.1.tar.gz
+/libwebsockets-3.1.0.tar.gz
+/libwebsockets-3.2.0.tar.gz

libwebsockets.spec

@@ -1,5 +1,5 @@
 Name:           libwebsockets
-Version:        3.0.1
+Version:        3.2.0
 Release:        1%{?dist}
 Summary:        A lightweight C library for Websockets
 
@@ -10,13 +10,14 @@ Summary:        A lightweight C library for Websockets
 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
 
-
-BuildRequires:  gcc
 BuildRequires:  cmake
+BuildRequires:  gcc
+BuildRequires:  libev-devel
+BuildRequires:  libuv-devel
 BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel
-BuildRequires:  libuv-devel
 
 Provides:       bundled(sha1-hollerbach)
 Provides:       bundled(base64-decode)
@@ -29,26 +30,41 @@ servers.
 %package devel
 Summary:        Headers for developing programs that will use %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       libuv-devel
+Requires:       libev-devel
 
 %description devel
 This package contains the header files needed for developing
 %{name} applications.
 
 %prep
-%setup -q -n %{name}-%{version}
+%autosetup -p1
 
 %build
 mkdir -p build
 cd build
+
 %cmake \
-    -D LWS_LINK_TESTAPPS_DYNAMIC=ON \
+    -D LWS_WITH_HTTP2=ON \
+    -D LWS_IPV6=ON \
+    -D LWS_WITH_ZIP_FOPS=ON \
+    -D LWS_WITH_SOCKS5=ON \
+    -D LWS_WITH_RANGES=ON \
+    -D LWS_WITH_ACME=ON \
     -D LWS_WITH_LIBUV=ON \
+    -D LWS_WITH_LIBEV=ON \
+    -D LWS_WITH_LIBEVENT=OFF \
+    -D LWS_WITH_FTS=ON \
+    -D LWS_WITH_THREADPOOL=ON \
+    -D LWS_UNIX_SOCK=ON \
+    -D LWS_WITH_HTTP_PROXY=ON \
+    -D LWS_WITH_DISKCACHE=ON \
+    -D LWS_WITH_LWSAC=ON \
+    -D LWS_LINK_TESTAPPS_DYNAMIC=ON \
     -D LWS_WITHOUT_BUILTIN_GETIFADDRS=ON \
     -D LWS_USE_BUNDLED_ZLIB=OFF \
     -D LWS_WITHOUT_BUILTIN_SHA1=ON \
     -D LWS_WITH_STATIC=OFF \
-    -D LWS_IPV6=ON \
-    -D LWS_WITH_HTTP2=OFF \
     -D LWS_WITHOUT_CLIENT=OFF \
     -D LWS_WITHOUT_SERVER=OFF \
     -D LWS_WITHOUT_TESTAPPS=ON \
@@ -57,33 +73,52 @@ cd build
     -D LWS_WITHOUT_TEST_PING=ON \
     -D LWS_WITHOUT_TEST_CLIENT=ON \
     ..
+
 %make_build
 
 %install
 cd build
 %make_install
-find %{buildroot} -name '*.la' -exec rm -f {} ';'
-find %{buildroot} -name '*.a' -exec rm -f {} ';'
-find %{buildroot} -name '*.cmake' -exec rm -f {} ';'
-find %{buildroot} -name '*_static.pc' -exec rm -f {} ';'
+find %{buildroot} -name '*.la' -delete
+find %{buildroot} -name '*.a' -delete
+find %{buildroot} -name '*.cmake' -delete
+find %{buildroot} -name '*_static.pc' -delete
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 
 %files
-%doc README.md changelog
 %license LICENSE
-%{_libdir}/%{name}.so.*
+%doc README.md changelog
+%{_libdir}/%{name}.so.15
 
 %files devel
-%doc READMEs/README.coding.md READMEs/ changelog
 %license LICENSE
+%doc READMEs/README.coding.md READMEs/ changelog
 %{_includedir}/*.h
+%{_includedir}/%{name}/
 %{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Sep  2 2019 Peter Robinson <pbrobinson@fedoraproject.org> 3.2.0-1
+- Update to 3.2.0
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Feb  9 2019 Peter Robinson <pbrobinson@fedoraproject.org> 3.1.0-2
+- devel requires libev-devel
+
+* Sat Feb  9 2019 Peter Robinson <pbrobinson@fedoraproject.org> 3.1.0-1
+- Update to 3.1.0
+- Enable new features/functionality
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jan  7 2019 Peter Robinson <pbrobinson@fedoraproject.org> 3.0.1-2
+- Add libuv-devel Requires to devel package
+
 * Tue Dec 18 2018 Fabian Affolter <mail@fabian-affolter.ch> - 3.0.1-1
 - Update to latest upstream release 3.0.1 (rhbz#1604687)
 

sock-fix-build.patch

@@ -0,0 +1,20 @@
+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;
+

sources

@@ -1 +1 @@
-SHA512 (libwebsockets-3.0.1.tar.gz) = ba96af918dc53e5fe15792985892e726154ec6cd8b0e6b71ec133e1ac53792c42276fd6ae2c48c274acf4163579d8326e403201a8090fc58be29518c9c5b4304
+SHA512 (libwebsockets-3.2.0.tar.gz) = afc1c9e259d6d48000b09da111af4129680d50474cdfedbad197ee22260d57a837b67cc6a3f8e6b1aa7ce7dc5d3fd900569783631540501709868125c6d1e4da