Attachment #220546 for bug #251835

Lines 3-10 Link Here

(-)b/net/libwebsockets/Makefile (-50 / +55 lines)
3		3
4	PORTNAME= libwebsockets	4	PORTNAME= libwebsockets
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	DISTVERSION= 4.0.21	6	DISTVERSION= 4.1.6
7	CATEGORIES= net devel	7	CATEGORIES= net devel
		8	MASTER_SITES= https://libwebsockets.org/git/libwebsockets/snapshot/
8		9
9	MAINTAINER= iblis@hs.ntnu.edu.tw	10	MAINTAINER= iblis@hs.ntnu.edu.tw
10	COMMENT= C library for lightweight websocket clients and servers	11	COMMENT= C library for lightweight websocket clients and servers
Lines 12-74 COMMENT= C library for lightweight websocket clients and servers Link Here
12	LICENSE= MIT	13	LICENSE= MIT
13	LICENSE_FILE= ${WRKSRC}/LICENSE	14	LICENSE_FILE= ${WRKSRC}/LICENSE
14		15
15	USES= cmake pkgconfig ssl	16	USES= cmake localbase pkgconfig tar:xz
16	USE_LDCONFIG= yes	17	USE_LDCONFIG= yes
17		18
18	PORTSCOUT= limit:^v\d+\.*	19	CMAKE_ON= LWS_IPV6 LWS_WITH_SSL LWS_WITH_ZLIB \
		20	LWS_WITHOUT_TESTAPPS LWS_WITHOUT_TEST_SERVER \
		21	LWS_WITHOUT_TEST_SERVER_EXTPOLL \
		22	LWS_WITHOUT_TEST_PING LWS_WITHOUT_TEST_CLIENT
19		23
20	USE_GITHUB= yes	24	OPTIONS_DEFINE= HTTP_PROXY HTTP2 MQTT PEERLIMITS PLUGINS \
21	GH_ACCOUNT= warmcat	25	SECURE_STREAMS SOCKS SQLITE WEBSERVER
		26	OPTIONS_DEFAULT= HTTP2 OPENSSL LIBUV
		27	OPTIONS_SUB= yes
22		28
23	CMAKE_ARGS= -DLWS_WITHOUT_TESTAPPS=ON \	29	OPTIONS_SINGLE= SSL
24	-DLWS_WITHOUT_TEST_SERVER=ON \	30	OPTIONS_SINGLE_SSL= MBEDTLS OPENSSL
25	-DLWS_WITHOUT_TEST_SERVER_EXTPOLL=ON \	31	OPTIONS_GROUP= EVLOOP
26	-DLWS_WITHOUT_TEST_PING=ON \	32	OPTIONS_GROUP_EVLOOP= GLIB LIBEV LIBEVENT LIBUV
27	-DLWS_WITHOUT_TEST_CLIENT=ON
28		33
29	OPTIONS_DEFINE= HTTP2 HTTP_PROXY IPV6 LIBEV LIBUV UNIX_SOCK WEBSERVER PLUGINS \
30	SOCKS5 MQTT SECURE_STREAMS
31	OPTIONS_DEFAULT=HTTP2 LIBUV
32	OPTIONS_SUB= yes
33
34	HTTP2_DESC= Compile with server support for HTTP/2
35	HTTP_PROXY_DESC= HTTP proxy support	34	HTTP_PROXY_DESC= HTTP proxy support
36	LIBUV_DESC= Asynchronous I/O support via libuv
37	UNIX_SOCK_DESC= Unix domain socket support
38	SOCKS5_DESC= Allow use of SOCKS5 proxy on client connections
39	MQTT_DESC= MQTT client support	35	MQTT_DESC= MQTT client support
40	SECURE_STREAMS_DESC= Secure Streams API support	36	PEERLIMITS_DESC= Tracking and limiting of resources of peer(s)
41		37	PLUGINS_DESC= Plugins support
42	HTTP2_CMAKE_ON= -DLWS_WITH_HTTP2=ON	38	SECURE_STREAMS_DESC= Secure streams protocol API support
43		39	SOCKS_DESC= Allow use of SOCKS5 proxy on client connections
44	HTTP_PROXY_CMAKE_ON= -DLWS_WITH_HTTP_PROXY=ON \	40	EVLOOP_DESC= Event loop support
45	-DLIBHUBBUB_LIBRARIES=${LOCALBASE}/lib/libhubbub.so	41	GLIB_DESC= Events support via Glib
46	HTTP_PROXY_LIB_DEPENDS= libhubbub.so:www/libhubbub	42	LIBEVENT_DESC= Asynchronous event notification via libevent
47		43	LIBUV_DESC= Asynchronous I/O support via libuv
48	IPV6_CMAKE_ON= -DLWS_IPV6=ON	44
49		45	HTTP_PROXY_CMAKE_BOOL= LWS_WITH_HTTP_PROXY
50	LIBEV_CMAKE_ON= -DLWS_WITH_LIBEV=ON	46	HTTP2_CMAKE_BOOL= LWS_WITH_HTTP2
		47	MQTT_CMAKE_BOOL= LWS_ROLE_MQTT
		48	PEERLIMITS_CMAKE_BOOL= LWS_WITH_PEER_LIMITS
		49	PLUGINS_CMAKE_BOOL= LWS_WITH_PLUGINS \
		50	LWS_WITH_PLUGINS_API
		51	SECURE_STREAMS_CMAKE_BOOL= LWS_WITH_SECURE_STREAMS \
		52	LWS_WITH_SECURE_STREAMS_PROXY_API
		53	SOCKS_CMAKE_BOOL= LWS_WITH_SOCKS5
		54	SQLITE_LIB_DEPENDS= libsqlite3.so:databases/sqlite3
		55	SQLITE_CMAKE_BOOL= LWS_WITH_SQLITE3
		56	WEBSERVER_CMAKE_BOOL= LWS_WITH_LWSWS
		57	WEBSERVER_IMPLIES= PEERLIMITS PLUGINS LIBUV
		58
		59	MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls
		60	MBEDTLS_CMAKE_BOOL= LWS_WITH_MBEDTLS
		61	OPENSSL_USES= ssl
		62	OPENSSL_CMAKE_BOOL= LWS_WITHOUT_BUILTIN_SHA1
		63	# WolfSSL need to be compiled with --enable-libwebsockets to be compatible
		64	# WOLFSSL_LIB_DEPENDS= libwolfssl.so:security/wolfssl
		65	# WOLFSSL_CMAKE_BOOL= LWS_WITH_SSL LWS_WITH_WOLFSSL
		66	# WOLFSSL_CMAKE_ON= -DLWS_WOLFSSL_INCLUDE_DIRS=${LOCALBASE}/include \
		67	# -DLWS_WOLFSSL_LIBRARIES=${LOCALBASE}/lib/libwolfssl.so
		68
		69	GLIB_USES= gnome
		70	GLIB_USE= GNOME=glib20
		71	GLIB_CMAKE_BOOL= LWS_WITH_GLIB
51	LIBEV_LIB_DEPENDS= libev.so:devel/libev	72	LIBEV_LIB_DEPENDS= libev.so:devel/libev
52		73	LIBEV_CMAKE_BOOL= LWS_WITH_LIBEV
53	LIBUV_CMAKE_ON= -DLWS_WITH_LIBUV=ON	74	LIBEVENT_LIB_DEPENDS= libevent.so:devel/libevent
		75	LIBEVENT_CMAKE_BOOL= LWS_WITH_LIBEVENT
54	LIBUV_LIB_DEPENDS= libuv.so:devel/libuv	76	LIBUV_LIB_DEPENDS= libuv.so:devel/libuv
55		77	LIBUV_CMAKE_BOOL= LWS_WITH_LIBUV
56	UNIX_SOCK_CMAKE_ON= -DLWS_UNIX_SOCK=ON
57
58	WEBSERVER_CMAKE_ON= -DLWS_WITH_LWSWS=ON
59	WEBSERVER_IMPLIES= LIBUV
60
61	PLUGINS_CMAKE_ON= -DLWS_WITH_PLUGINS=ON \
62	-DLWS_WITH_SERVER_STATUS=ON \
63	-DLWS_WITH_GENERIC_SESSIONS=ON
64	PLUGINS_LIB_DEPENDS= libsqlite3.so:databases/sqlite3
65
66	SOCKS5_CMAKE_ON= -DLWS_WITH_SOCKS5=ON
67
68	MQTT_CMAKE_ON= -DLWS_ROLE_MQTT=ON
69
70	SECURE_STREAMS_CMAKE_ON=-DLWS_WITH_SECURE_STREAMS=ON \
71	-DLWS_WITH_SECURE_STREAMS_PROXY_API=ON \
72	-DLWS_WITH_SECURE_STREAMS_SYS_AUTH_API_AMAZON_COM=ON
73		78
74	.include <bsd.port.mk>	79	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/net/libwebsockets/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1603959557	1	TIMESTAMP = 1607873825
2	SHA256 (warmcat-libwebsockets-v4.0.21_GH0.tar.gz) = 6ece1f422c6d38aabedec2476f2ac12e9aede8691b08137068ad85545ce3ff78	2	SHA256 (libwebsockets-v4.1.6.tar.xz) = d24b644bb1686c6dd6e3499b9407bb7e22f08f43da22ae7be435c74433a2641f
3	SIZE (warmcat-libwebsockets-v4.0.21_GH0.tar.gz) = 12342078	3	SIZE (libwebsockets-v4.1.6.tar.xz) = 8570880




--- CMakeLists.txt.orig	2018-03-08 10:28:37 UTC
+++ CMakeLists.txt
@@ -1739,7 +1739,7 @@ Cflags: -I\${includedir}"
 )
 
 	install(FILES "${PROJECT_BINARY_DIR}/libwebsockets.pc"
-		DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+		DESTINATION libdata/pkgconfig)
 
 file(WRITE "${PROJECT_BINARY_DIR}/libwebsockets_static.pc"
 "prefix=\"${CMAKE_INSTALL_PREFIX}\"
@@ -1757,7 +1757,7 @@ Cflags: -I\${includedir}"
 )
 
 	install(FILES "${PROJECT_BINARY_DIR}/libwebsockets_static.pc"
-		DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+		DESTINATION libdata/pkgconfig)
 
 
 endif(UNIX)

Lines 8-13 include/libwebsockets/abstract/transports/raw-skt.h Link Here

(-)b/net/libwebsockets/pkg-plist (-28 / +38 lines)
8	include/libwebsockets/abstract/transports/unit-test.h	8	include/libwebsockets/abstract/transports/unit-test.h
9	include/libwebsockets/lws-adopt.h	9	include/libwebsockets/lws-adopt.h
10	include/libwebsockets/lws-async-dns.h	10	include/libwebsockets/lws-async-dns.h
		11	include/libwebsockets/lws-bb-i2c.h
		12	include/libwebsockets/lws-bb-spi.h
		13	include/libwebsockets/lws-button.h
11	include/libwebsockets/lws-callbacks.h	14	include/libwebsockets/lws-callbacks.h
12	include/libwebsockets/lws-cgi.h	15	include/libwebsockets/lws-cgi.h
13	include/libwebsockets/lws-client.h	16	include/libwebsockets/lws-client.h
Lines 15-23 include/libwebsockets/lws-context-vhost.h Link Here
15	include/libwebsockets/lws-dbus.h	18	include/libwebsockets/lws-dbus.h
16	include/libwebsockets/lws-detailed-latency.h	19	include/libwebsockets/lws-detailed-latency.h
17	include/libwebsockets/lws-diskcache.h	20	include/libwebsockets/lws-diskcache.h
		21	include/libwebsockets/lws-display.h
18	include/libwebsockets/lws-dll2.h	22	include/libwebsockets/lws-dll2.h
19	include/libwebsockets/lws-dsh.h	23	include/libwebsockets/lws-dsh.h
20	include/libwebsockets/lws-esp32.h	24	include/libwebsockets/lws-eventlib-exports.h
21	include/libwebsockets/lws-freertos.h	25	include/libwebsockets/lws-freertos.h
22	include/libwebsockets/lws-fts.h	26	include/libwebsockets/lws-fts.h
23	include/libwebsockets/lws-genaes.h	27	include/libwebsockets/lws-genaes.h
Lines 25-45 include/libwebsockets/lws-gencrypto.h Link Here
25	include/libwebsockets/lws-genec.h	29	include/libwebsockets/lws-genec.h
26	include/libwebsockets/lws-genhash.h	30	include/libwebsockets/lws-genhash.h
27	include/libwebsockets/lws-genrsa.h	31	include/libwebsockets/lws-genrsa.h
		32	include/libwebsockets/lws-gpio.h
28	include/libwebsockets/lws-http.h	33	include/libwebsockets/lws-http.h
		34	include/libwebsockets/lws-i2c.h
		35	include/libwebsockets/lws-ili9341-spi.h
29	include/libwebsockets/lws-jose.h	36	include/libwebsockets/lws-jose.h
30	include/libwebsockets/lws-jwe.h	37	include/libwebsockets/lws-jwe.h
31	include/libwebsockets/lws-jwk.h	38	include/libwebsockets/lws-jwk.h
32	include/libwebsockets/lws-jws.h	39	include/libwebsockets/lws-jws.h
		40	include/libwebsockets/lws-led.h
33	include/libwebsockets/lws-lejp.h	41	include/libwebsockets/lws-lejp.h
34	include/libwebsockets/lws-logs.h	42	include/libwebsockets/lws-logs.h
35	include/libwebsockets/lws-lwsac.h	43	include/libwebsockets/lws-lwsac.h
36	include/libwebsockets/lws-misc.h	44	include/libwebsockets/lws-misc.h
37	include/libwebsockets/lws-mqtt.h	45	include/libwebsockets/lws-mqtt.h
		46	include/libwebsockets/lws-netdev.h
38	include/libwebsockets/lws-network-helper.h	47	include/libwebsockets/lws-network-helper.h
39	include/libwebsockets/lws-optee.h	48	include/libwebsockets/lws-optee.h
40	include/libwebsockets/lws-plugin-generic-sessions.h
41	include/libwebsockets/lws-protocols-plugins.h	49	include/libwebsockets/lws-protocols-plugins.h
42	include/libwebsockets/lws-purify.h	50	include/libwebsockets/lws-purify.h
		51	include/libwebsockets/lws-pwm.h
43	include/libwebsockets/lws-retry.h	52	include/libwebsockets/lws-retry.h
44	include/libwebsockets/lws-ring.h	53	include/libwebsockets/lws-ring.h
45	include/libwebsockets/lws-secure-streams-client.h	54	include/libwebsockets/lws-secure-streams-client.h
Lines 47-54 include/libwebsockets/lws-secure-streams-policy.h Link Here
47	include/libwebsockets/lws-secure-streams.h	56	include/libwebsockets/lws-secure-streams.h
48	include/libwebsockets/lws-sequencer.h	57	include/libwebsockets/lws-sequencer.h
49	include/libwebsockets/lws-service.h	58	include/libwebsockets/lws-service.h
		59	include/libwebsockets/lws-settings.h
50	include/libwebsockets/lws-sha1-base64.h	60	include/libwebsockets/lws-sha1-base64.h
		61	include/libwebsockets/lws-smd.h
51	include/libwebsockets/lws-spa.h	62	include/libwebsockets/lws-spa.h
		63	include/libwebsockets/lws-spi.h
		64	include/libwebsockets/lws-ssd1306-i2c.h
52	include/libwebsockets/lws-state.h	65	include/libwebsockets/lws-state.h
53	include/libwebsockets/lws-stats.h	66	include/libwebsockets/lws-stats.h
54	include/libwebsockets/lws-struct.h	67	include/libwebsockets/lws-struct.h
Lines 64-103 include/libwebsockets/lws-ws-close.h Link Here
64	include/libwebsockets/lws-ws-ext.h	77	include/libwebsockets/lws-ws-ext.h
65	include/libwebsockets/lws-ws-state.h	78	include/libwebsockets/lws-ws-state.h
66	include/libwebsockets/lws-x509.h	79	include/libwebsockets/lws-x509.h
67	include/lws-plugin-ssh.h
68	include/lws_config.h	80	include/lws_config.h
69	lib/cmake/libwebsockets/LibwebsocketsConfig.cmake
70	lib/cmake/libwebsockets/LibwebsocketsConfigVersion.cmake
71	lib/cmake/libwebsockets/LibwebsocketsTargets-%%CMAKE_BUILD_TYPE%%.cmake	81	lib/cmake/libwebsockets/LibwebsocketsTargets-%%CMAKE_BUILD_TYPE%%.cmake
72	lib/cmake/libwebsockets/LibwebsocketsTargets.cmake	82	lib/cmake/libwebsockets/LibwebsocketsTargets.cmake
		83	lib/cmake/libwebsockets/LwsCheckRequirements.cmake
		84	lib/cmake/libwebsockets/libwebsockets-config-version.cmake
		85	lib/cmake/libwebsockets/libwebsockets-config.cmake
		86	%%GLIB%%lib/libwebsockets-evlib_glib.so
		87	%%LIBEV%%lib/libwebsockets-evlib_ev.so
		88	%%LIBEVENT%%lib/libwebsockets-evlib_event.so
		89	%%LIBUV%%lib/libwebsockets-evlib_uv.so
73	lib/libwebsockets.a	90	lib/libwebsockets.a
74	lib/libwebsockets.so	91	lib/libwebsockets.so
75	lib/libwebsockets.so.16	92	lib/libwebsockets.so.17
76	libdata/pkgconfig/libwebsockets.pc	93	libdata/pkgconfig/libwebsockets.pc
77	libdata/pkgconfig/libwebsockets_static.pc	94	libdata/pkgconfig/libwebsockets_static.pc
78	%%PLUGINS%%%%DATADIR%%-test-server/deaddrop/deaddrop.css	95	%%PLUGINS%%%%DATADIR%%-test-server/deaddrop/deaddrop.css
79	%%PLUGINS%%%%DATADIR%%-test-server/deaddrop/deaddrop.js	96	%%PLUGINS%%%%DATADIR%%-test-server/deaddrop/deaddrop.js
80	%%PLUGINS%%%%DATADIR%%-test-server/deaddrop/drop.svg	97	%%PLUGINS%%%%DATADIR%%-test-server/deaddrop/drop.svg
81	%%PLUGINS%%%%DATADIR%%-test-server/deaddrop/index.html	98	%%PLUGINS%%%%DATADIR%%-test-server/deaddrop/index.html
82	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/failed-login.html	99	%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_client_loopback_test.so
83	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/index.html	100	%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_deaddrop.so
84	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/lwsgs-logo.png	101	%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_dumb_increment.so
85	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/lwsgs.css	102	%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_mirror.so
86	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/lwsgs.js	103	%%WEBSERVER%%%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_raw_proxy.so
87	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/needadmin/admin-login.html	104	%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_raw_test.so
88	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/needauth/successful-login.html	105	%%WEBSERVER%%%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_server_status.so
89	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-forgot-fail.html	106	%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_ssh_base.so
90	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-forgot-ok.html	107	%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_sshd_demo.so
91	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-register-fail.html	108	%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_status.so
92	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-register-ok.html	109	%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_post_demo.so
93	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-verify-fail.html	110	%%WEBSERVER%%%%PLUGINS%%%%DATADIR%%-test-server/server-status/lwsws-logo.png
94	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-verify-ok.html	111	%%WEBSERVER%%%%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.css
95	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/seats.jpg	112	%%WEBSERVER%%%%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.html
96	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/sent-forgot-fail.html	113	%%WEBSERVER%%%%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.js
97	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/sent-forgot-ok.html
98	%%PLUGINS%%%%DATADIR%%-test-server/generic-table/index.html
99	%%PLUGINS%%%%DATADIR%%-test-server/generic-table/lwsgt.js
100	%%PLUGINS%%%%DATADIR%%-test-server/server-status/lwsws-logo.png
101	%%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.css
102	%%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.html
103	%%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.js

Return to bug 251835

Removed Link Here

(-)a/net/libwebsockets/files/patch-CMakeLists.txt (-20 lines)
1	--- CMakeLists.txt.orig 2018-03-08 10:28:37 UTC
2	+++ CMakeLists.txt
3	@@ -1739,7 +1739,7 @@ Cflags: -I\${includedir}"
4	)
5
6	install(FILES "${PROJECT_BINARY_DIR}/libwebsockets.pc"
7	- DESTINATION lib${LIB_SUFFIX}/pkgconfig)
8	+ DESTINATION libdata/pkgconfig)
9
10	file(WRITE "${PROJECT_BINARY_DIR}/libwebsockets_static.pc"
11	"prefix=\"${CMAKE_INSTALL_PREFIX}\"
12	@@ -1757,7 +1757,7 @@ Cflags: -I\${includedir}"
13	)
14
15	install(FILES "${PROJECT_BINARY_DIR}/libwebsockets_static.pc"
16	- DESTINATION lib${LIB_SUFFIX}/pkgconfig)
17	+ DESTINATION libdata/pkgconfig)
18
19
20	endif(UNIX)