From 545bfebe72e1d7b69a0dbc3507643d2606098328 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 7 Jan 2019 14:34:23 +0000 Subject: [PATCH 01/11] Add libuv-devel Requires to devel package --- .gitignore | 1 + libwebsockets.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7c1f8b4..26ce246 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /libwebsockets-2.4.2.tar.gz /libwebsockets-3.0.0.tar.gz /libwebsockets-3.0.1.tar.gz +/libwebsockets-3.1.0.tar.gz diff --git a/libwebsockets.spec b/libwebsockets.spec index 55cfb60..72dc773 100644 --- a/libwebsockets.spec +++ b/libwebsockets.spec @@ -1,6 +1,6 @@ Name: libwebsockets Version: 3.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A lightweight C library for Websockets # base64-decode.c and ssl-http2.c is under MIT license with FPC exception. @@ -29,6 +29,7 @@ servers. %package devel Summary: Headers for developing programs that will use %{name} Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: libuv-devel %description devel This package contains the header files needed for developing @@ -84,6 +85,9 @@ find %{buildroot} -name '*_static.pc' -exec rm -f {} ';' %{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Jan 7 2019 Peter Robinson 3.0.1-2 +- Add libuv-devel Requires to devel package + * Tue Dec 18 2018 Fabian Affolter - 3.0.1-1 - Update to latest upstream release 3.0.1 (rhbz#1604687) diff --git a/sources b/sources index a558f64..b2d78d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libwebsockets-3.0.1.tar.gz) = ba96af918dc53e5fe15792985892e726154ec6cd8b0e6b71ec133e1ac53792c42276fd6ae2c48c274acf4163579d8326e403201a8090fc58be29518c9c5b4304 +SHA512 (libwebsockets-3.1.0.tar.gz) = e2a4c1b25bc6f028654a63fc01a2732e6c63414868f8d3d01fa477752fdabe0f61e8d271fe7dd2734db0e15b1250f6b0101285b6d694f971ec4bf67ba7ee067c From ea6166f7b6829a87d564333274f84c1354e8aecf Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 7 Jan 2019 14:38:03 +0000 Subject: [PATCH 02/11] restore unintentional source version bump --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index b2d78d3..a558f64 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libwebsockets-3.1.0.tar.gz) = e2a4c1b25bc6f028654a63fc01a2732e6c63414868f8d3d01fa477752fdabe0f61e8d271fe7dd2734db0e15b1250f6b0101285b6d694f971ec4bf67ba7ee067c +SHA512 (libwebsockets-3.0.1.tar.gz) = ba96af918dc53e5fe15792985892e726154ec6cd8b0e6b71ec133e1ac53792c42276fd6ae2c48c274acf4163579d8326e403201a8090fc58be29518c9c5b4304 From 61e31d24e3ad5d764ff65be7cb22ff6021b1b4b2 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:40:15 +0100 Subject: [PATCH 03/11] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- libwebsockets.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libwebsockets.spec b/libwebsockets.spec index 72dc773..63d5a2c 100644 --- a/libwebsockets.spec +++ b/libwebsockets.spec @@ -68,9 +68,7 @@ find %{buildroot} -name '*.a' -exec rm -f {} ';' find %{buildroot} -name '*.cmake' -exec rm -f {} ';' find %{buildroot} -name '*_static.pc' -exec rm -f {} ';' -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %doc README.md changelog From 6074836e1f44eb4ebd6bd971795f09f974bb1356 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 08:34:02 +0000 Subject: [PATCH 04/11] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libwebsockets.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libwebsockets.spec b/libwebsockets.spec index 63d5a2c..3daedbe 100644 --- a/libwebsockets.spec +++ b/libwebsockets.spec @@ -1,6 +1,6 @@ Name: libwebsockets Version: 3.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A lightweight C library for Websockets # base64-decode.c and ssl-http2.c is under MIT license with FPC exception. @@ -83,6 +83,9 @@ find %{buildroot} -name '*_static.pc' -exec rm -f {} ';' %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 3.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Jan 7 2019 Peter Robinson 3.0.1-2 - Add libuv-devel Requires to devel package From 4f8066449ab5d71aafcbe0c8a3d8a9ddd48f5486 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 9 Feb 2019 10:45:54 +0000 Subject: [PATCH 05/11] Update to 3.1.0, Enable new features/functionality, update options to upstream defaults, explicitly add soname version to ensure ABI bumps are caught --- libwebsockets.spec | 53 ++++++++++++++++++++++++++++++++-------------- sources | 2 +- 2 files changed, 38 insertions(+), 17 deletions(-) diff --git a/libwebsockets.spec b/libwebsockets.spec index 3daedbe..c5831cf 100644 --- a/libwebsockets.spec +++ b/libwebsockets.spec @@ -1,6 +1,6 @@ Name: libwebsockets -Version: 3.0.1 -Release: 3%{?dist} +Version: 3.1.0 +Release: 1%{?dist} Summary: A lightweight C library for Websockets # base64-decode.c and ssl-http2.c is under MIT license with FPC exception. @@ -11,12 +11,13 @@ 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 - -BuildRequires: gcc BuildRequires: cmake +BuildRequires: dbus-devel +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) @@ -36,20 +37,34 @@ 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_ROLE_DBUS=ON \ + -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 \ @@ -58,31 +73,37 @@ 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 %ldconfig_scriptlets %files -%doc README.md changelog %license LICENSE -%{_libdir}/%{name}.so.* +%doc README.md changelog +%{_libdir}/%{name}.so.14 %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 +* Sat Feb 9 2019 Peter Robinson 3.1.0-1 +- Update to 3.1.0 +- Enable new features/functionality + * Fri Feb 01 2019 Fedora Release Engineering - 3.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index a558f64..b2d78d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libwebsockets-3.0.1.tar.gz) = ba96af918dc53e5fe15792985892e726154ec6cd8b0e6b71ec133e1ac53792c42276fd6ae2c48c274acf4163579d8326e403201a8090fc58be29518c9c5b4304 +SHA512 (libwebsockets-3.1.0.tar.gz) = e2a4c1b25bc6f028654a63fc01a2732e6c63414868f8d3d01fa477752fdabe0f61e8d271fe7dd2734db0e15b1250f6b0101285b6d694f971ec4bf67ba7ee067c From ef8dd63b0ff46f9e7ba893ecbeaf1208b4760771 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 9 Feb 2019 11:03:42 +0000 Subject: [PATCH 06/11] drop dbus for the moment, it has issues on 32bit platforms for some off reason --- libwebsockets.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/libwebsockets.spec b/libwebsockets.spec index c5831cf..5b96d4d 100644 --- a/libwebsockets.spec +++ b/libwebsockets.spec @@ -12,7 +12,6 @@ URL: http://libwebsockets.org Source0: https://github.com/warmcat/libwebsockets/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: cmake -BuildRequires: dbus-devel BuildRequires: gcc BuildRequires: libev-devel BuildRequires: libuv-devel @@ -53,7 +52,6 @@ cd build -D LWS_WITH_LIBUV=ON \ -D LWS_WITH_LIBEV=ON \ -D LWS_WITH_LIBEVENT=OFF \ - -D LWS_ROLE_DBUS=ON \ -D LWS_WITH_FTS=ON \ -D LWS_WITH_THREADPOOL=ON \ -D LWS_UNIX_SOCK=ON \ From 23bd1fa4a08fcc47c10355c02ec27114681ec28e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 9 Feb 2019 21:11:58 +0000 Subject: [PATCH 07/11] devel requires libev-devel --- libwebsockets.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libwebsockets.spec b/libwebsockets.spec index 5b96d4d..ff9fff4 100644 --- a/libwebsockets.spec +++ b/libwebsockets.spec @@ -1,6 +1,6 @@ Name: libwebsockets Version: 3.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A lightweight C library for Websockets # base64-decode.c and ssl-http2.c is under MIT license with FPC exception. @@ -30,6 +30,7 @@ servers. 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 @@ -98,6 +99,9 @@ find %{buildroot} -name '*_static.pc' -delete %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Feb 9 2019 Peter Robinson 3.1.0-2 +- devel requires libev-devel + * Sat Feb 9 2019 Peter Robinson 3.1.0-1 - Update to 3.1.0 - Enable new features/functionality From 7b620e0fc1ffa6c5eec4f34016d057a0975e71ec Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 14:44:18 +0000 Subject: [PATCH 08/11] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libwebsockets.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libwebsockets.spec b/libwebsockets.spec index ff9fff4..e0ecac4 100644 --- a/libwebsockets.spec +++ b/libwebsockets.spec @@ -1,6 +1,6 @@ Name: libwebsockets Version: 3.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A lightweight C library for Websockets # base64-decode.c and ssl-http2.c is under MIT license with FPC exception. @@ -99,6 +99,9 @@ find %{buildroot} -name '*_static.pc' -delete %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 3.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Feb 9 2019 Peter Robinson 3.1.0-2 - devel requires libev-devel From f803d275a0b95823eeb6d35b91b48d97c2b40e50 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 2 Sep 2019 09:53:52 +0100 Subject: [PATCH 09/11] 3.2.0 --- .gitignore | 1 + libwebsockets.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 26ce246..1c20df8 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /libwebsockets-3.0.0.tar.gz /libwebsockets-3.0.1.tar.gz /libwebsockets-3.1.0.tar.gz +/libwebsockets-3.2.0.tar.gz diff --git a/libwebsockets.spec b/libwebsockets.spec index e0ecac4..2492938 100644 --- a/libwebsockets.spec +++ b/libwebsockets.spec @@ -1,6 +1,6 @@ Name: libwebsockets -Version: 3.1.0 -Release: 3%{?dist} +Version: 3.2.0 +Release: 1%{?dist} Summary: A lightweight C library for Websockets # base64-decode.c and ssl-http2.c is under MIT license with FPC exception. @@ -99,6 +99,9 @@ find %{buildroot} -name '*_static.pc' -delete %{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Sep 2 2019 Peter Robinson 3.2.0-1 +- Update to 3.2.0 + * Thu Jul 25 2019 Fedora Release Engineering - 3.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index b2d78d3..b664667 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libwebsockets-3.1.0.tar.gz) = e2a4c1b25bc6f028654a63fc01a2732e6c63414868f8d3d01fa477752fdabe0f61e8d271fe7dd2734db0e15b1250f6b0101285b6d694f971ec4bf67ba7ee067c +SHA512 (libwebsockets-3.2.0.tar.gz) = afc1c9e259d6d48000b09da111af4129680d50474cdfedbad197ee22260d57a837b67cc6a3f8e6b1aa7ce7dc5d3fd900569783631540501709868125c6d1e4da From 093c43dab042684063783ee0fa27d90e9108a7cf Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 2 Sep 2019 12:19:10 +0100 Subject: [PATCH 10/11] upstream patch for client build --- libwebsockets.spec | 1 + sock-fix-build.patch | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 sock-fix-build.patch diff --git a/libwebsockets.spec b/libwebsockets.spec index 2492938..3ba8e86 100644 --- a/libwebsockets.spec +++ b/libwebsockets.spec @@ -10,6 +10,7 @@ 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: cmake BuildRequires: gcc diff --git a/sock-fix-build.patch b/sock-fix-build.patch new file mode 100644 index 0000000..2583db9 --- /dev/null +++ b/sock-fix-build.patch @@ -0,0 +1,20 @@ +Author: Sviatoslav Grebenchucov +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; + From 7810ac1b4f61dc8fbeb85ea8b5902805bb5660d1 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 2 Sep 2019 12:33:58 +0100 Subject: [PATCH 11/11] update soname to 15 --- libwebsockets.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libwebsockets.spec b/libwebsockets.spec index 3ba8e86..9a4aad8 100644 --- a/libwebsockets.spec +++ b/libwebsockets.spec @@ -89,7 +89,7 @@ find %{buildroot} -name '*_static.pc' -delete %files %license LICENSE %doc README.md changelog -%{_libdir}/%{name}.so.14 +%{_libdir}/%{name}.so.15 %files devel %license LICENSE