Attachment 215073 Details for Bug 246878 – patch to update to 3.2.2

[patch] patch to update to 3.2.2

libwebsockets-3.2.2.patch (text/plain), 5.54 KB, created by Steven Hartland on 2020-05-30 21:04:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steven Hartland

Created: 2020-05-30 21:04:25 UTC

Size: 5.54 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 536994)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	libwebsockets
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	2.4.2
>+DISTVERSION=	3.2.2
> PORTREVISION=	1
> CATEGORIES=	net devel
> 
>@@ -25,17 +25,18 @@
> 		-DLWS_WITHOUT_TEST_SERVER=ON \
> 		-DLWS_WITHOUT_TEST_SERVER_EXTPOLL=ON \
> 		-DLWS_WITHOUT_TEST_PING=ON \
>-		-DLWS_WITHOUT_TEST_ECHO=ON \
>-		-DLWS_WITHOUT_TEST_CLIENT=ON \
>-		-DLWS_WITHOUT_TEST_FRAGGLE=ON
>+		-DLWS_WITHOUT_TEST_CLIENT=ON
> 
>-OPTIONS_DEFINE=	HTTP2 HTTP_PROXY IPV6 LIBEV LIBUV UNIX_SOCK WEBSERVER PLUGINS
>+OPTIONS_DEFINE=	HTTP2 HTTP_PROXY IPV6 LIBEV LIBUV UNIX_SOCK WEBSERVER PLUGINS \
>+		SOCKS5
> OPTIONS_DEFAULT=HTTP2 LIBUV
> OPTIONS_SUB=	yes
> 
>+HTTP2_DESC=	Compile with server support for HTTP/2
> HTTP_PROXY_DESC=	HTTP proxy support
> LIBUV_DESC=	Asynchronous I/O support via libuv
> UNIX_SOCK_DESC=	Unix domain socket support
>+SOCKS5_DESC=	Allow use of SOCKS5 proxy on client connections
> 
> HTTP2_CMAKE_ON=	-DLWS_WITH_HTTP2=ON
> 
>@@ -61,4 +62,6 @@
> 			-DLWS_WITH_GENERIC_SESSIONS=ON
> PLUGINS_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
> 
>+SOCKS5_CMAKE_ON=	-DLWS_WITH_SOCKS5=ON
>+
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 536994)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1538641163
>-SHA256 (warmcat-libwebsockets-v2.4.2_GH0.tar.gz) = 73012d7fcf428dedccc816e83a63a01462e27819d5537b8e0d0c7264bfacfad6
>-SIZE (warmcat-libwebsockets-v2.4.2_GH0.tar.gz) = 3777160
>+TIMESTAMP = 1590791127
>+SHA256 (warmcat-libwebsockets-v3.2.2_GH0.tar.gz) = 166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
>+SIZE (warmcat-libwebsockets-v3.2.2_GH0.tar.gz) = 9867911
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 536994)
>+++ pkg-plist	(working copy)
>@@ -1,6 +1,60 @@
> %%WEBSERVER%%bin/lwsws
>-%%WEBSERVER%%include/lejp.h
> include/libwebsockets.h
>+include/libwebsockets/abstract/abstract.h
>+include/libwebsockets/abstract/protocols.h
>+include/libwebsockets/abstract/protocols/smtp.h
>+include/libwebsockets/abstract/transports.h
>+include/libwebsockets/abstract/transports/raw-skt.h
>+include/libwebsockets/abstract/transports/unit-test.h
>+include/libwebsockets/lws-adopt.h
>+include/libwebsockets/lws-callbacks.h
>+include/libwebsockets/lws-cgi.h
>+include/libwebsockets/lws-client.h
>+include/libwebsockets/lws-context-vhost.h
>+include/libwebsockets/lws-dbus.h
>+include/libwebsockets/lws-diskcache.h
>+include/libwebsockets/lws-dsh.h
>+include/libwebsockets/lws-esp32.h
>+include/libwebsockets/lws-fts.h
>+include/libwebsockets/lws-genaes.h
>+include/libwebsockets/lws-gencrypto.h
>+include/libwebsockets/lws-genec.h
>+include/libwebsockets/lws-genhash.h
>+include/libwebsockets/lws-genrsa.h
>+include/libwebsockets/lws-http.h
>+include/libwebsockets/lws-jose.h
>+include/libwebsockets/lws-jwe.h
>+include/libwebsockets/lws-jwk.h
>+include/libwebsockets/lws-jws.h
>+include/libwebsockets/lws-lejp.h
>+include/libwebsockets/lws-logs.h
>+include/libwebsockets/lws-lwsac.h
>+include/libwebsockets/lws-misc.h
>+include/libwebsockets/lws-network-helper.h
>+include/libwebsockets/lws-optee.h
>+include/libwebsockets/lws-plugin-generic-sessions.h
>+include/libwebsockets/lws-protocols-plugins.h
>+include/libwebsockets/lws-purify.h
>+include/libwebsockets/lws-retry.h
>+include/libwebsockets/lws-ring.h
>+include/libwebsockets/lws-sequencer.h
>+include/libwebsockets/lws-service.h
>+include/libwebsockets/lws-sha1-base64.h
>+include/libwebsockets/lws-spa.h
>+include/libwebsockets/lws-stats.h
>+include/libwebsockets/lws-struct.h
>+include/libwebsockets/lws-system.h
>+include/libwebsockets/lws-test-sequencer.h
>+include/libwebsockets/lws-threadpool.h
>+include/libwebsockets/lws-timeout-timer.h
>+include/libwebsockets/lws-tokenize.h
>+include/libwebsockets/lws-vfs.h
>+include/libwebsockets/lws-write.h
>+include/libwebsockets/lws-writeable.h
>+include/libwebsockets/lws-ws-close.h
>+include/libwebsockets/lws-ws-ext.h
>+include/libwebsockets/lws-ws-state.h
>+include/libwebsockets/lws-x509.h
> include/lws-plugin-ssh.h
> include/lws_config.h
> lib/cmake/libwebsockets/LibwebsocketsConfig.cmake
>@@ -9,14 +63,17 @@
> lib/cmake/libwebsockets/LibwebsocketsTargets.cmake
> lib/libwebsockets.a
> lib/libwebsockets.so
>-lib/libwebsockets.so.12
>+lib/libwebsockets.so.15
> libdata/pkgconfig/libwebsockets.pc
> libdata/pkgconfig/libwebsockets_static.pc
>-%%DATADIR%%-test-server/lws-ssh-test-keys
>-%%DATADIR%%-test-server/lws-ssh-test-keys.pub
>+%%PLUGINS%%%%DATADIR%%-test-server/deaddrop/deaddrop.css
>+%%PLUGINS%%%%DATADIR%%-test-server/deaddrop/deaddrop.js
>+%%PLUGINS%%%%DATADIR%%-test-server/deaddrop/drop.svg
>+%%PLUGINS%%%%DATADIR%%-test-server/deaddrop/index.html
> %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/failed-login.html
> %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/index.html
> %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/lwsgs-logo.png
>+%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/lwsgs.css
> %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/lwsgs.js
> %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/needadmin/admin-login.html
> %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/needauth/successful-login.html
>@@ -32,4 +89,6 @@
> %%PLUGINS%%%%DATADIR%%-test-server/generic-table/index.html
> %%PLUGINS%%%%DATADIR%%-test-server/generic-table/lwsgt.js
> %%PLUGINS%%%%DATADIR%%-test-server/server-status/lwsws-logo.png
>+%%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.css
> %%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.html
>+%%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.js

Actions: View | Diff

Attachments on bug 246878: 215073