Attachment 177433 Details for Bug 214869 – patch v2

[patch] patch v2

libwebsockets.patch (text/plain), 5.63 KB, created by Iblis Lin on 2016-11-27 06:23:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Iblis Lin

Created: 2016-11-27 06:23:22 UTC

Size: 5.63 KB

patch

obsolete

>diff --git a/net/libwebsockets/Makefile b/net/libwebsockets/Makefile
>index d667b0a..402458c 100644
>--- a/net/libwebsockets/Makefile
>+++ b/net/libwebsockets/Makefile
>@@ -2,9 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	libwebsockets
>-PORTVERSION=	2.0.2
>+PORTVERSION=	2.1.0
> DISTVERSIONPREFIX=	v
>-CATEGORIES=	net
>+CATEGORIES=	net devel
> MASTER_SITES=	GITHUB
> 
> MAINTAINER=	iblis@hs.ntnu.edu.tw
>@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> USE_GITHUB=	yes
> GH_ACCOUNT=	warmcat
> 
>-PORTSCOUT=	limit:^v\d+\.
>+PORTSCOUT=	limit:^v\d+\.*
> 
> USES=		cmake pkgconfig ssl
> USE_LDCONFIG=	yes
>@@ -29,7 +29,7 @@ CMAKE_ARGS=	-DLWS_WITHOUT_TESTAPPS=ON \
> 		-DLWS_WITHOUT_TEST_CLIENT=ON \
> 		-DLWS_WITHOUT_TEST_FRAGGLE=ON
> 
>-OPTIONS_DEFINE=	HTTP2 HTTP_PROXY IPV6 LIBEV LIBUV UNIX_SOCK WEBSERVER
>+OPTIONS_DEFINE=	HTTP2 HTTP_PROXY IPV6 LIBEV LIBUV UNIX_SOCK WEBSERVER PLUGINS
> OPTIONS_SUB=	yes
> 
> HTTP_PROXY_DESC=	HTTP proxy support
>@@ -54,4 +54,9 @@ UNIX_SOCK_CMAKE_ON=	-DLWS_UNIX_SOCK=ON
> WEBSERVER_CMAKE_ON=	-DLWS_WITH_LWSWS=ON
> WEBSERVER_LIB_DEPENDS=	libuv.so:devel/libuv
> 
>+PLUGINS_CMAKE_ON=	-DLWS_WITH_PLUGINS=ON \
>+			-DLWS_WITH_SERVER_STATUS=ON \
>+			-DLWS_WITH_GENERIC_SESSIONS=ON
>+PLUGINS_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
>+
> .include <bsd.port.mk>
>diff --git a/net/libwebsockets/distinfo b/net/libwebsockets/distinfo
>index 2651957..a9da6a9 100644
>--- a/net/libwebsockets/distinfo
>+++ b/net/libwebsockets/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1468814124
>-SHA256 (warmcat-libwebsockets-v2.0.2_GH0.tar.gz) = 43865604debd06686ac4d8d0783976c4e10dd519ccd5c94e1b53878ec6178a59
>-SIZE (warmcat-libwebsockets-v2.0.2_GH0.tar.gz) = 2998706
>+TIMESTAMP = 1479903723
>+SHA256 (warmcat-libwebsockets-v2.1.0_GH0.tar.gz) = bcc96aaa609daae4d3f7ab1ee480126709ef4f6a8bf9c85de40aae48e38cce66
>+SIZE (warmcat-libwebsockets-v2.1.0_GH0.tar.gz) = 3721679
>diff --git a/net/libwebsockets/files/patch-CMakeLists.txt b/net/libwebsockets/files/patch-CMakeLists.txt
>index 38d66b1..22e72e4 100644
>--- a/net/libwebsockets/files/patch-CMakeLists.txt
>+++ b/net/libwebsockets/files/patch-CMakeLists.txt
>@@ -1,15 +1,15 @@
>---- CMakeLists.txt.orig	2016-06-06 11:59:30 UTC
>+--- CMakeLists.txt.orig	2016-10-06 19:19:50 UTC
> +++ CMakeLists.txt
>-@@ -602,7 +602,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COM
>+@@ -682,7 +682,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COM
>                  set(VISIBILITY_FLAG -fvisibility=hidden)
>      endif()
>-     if (UNIX)
>+     if (UNIX OR LWS_WITH_ESP8266)
> -               set(CMAKE_C_FLAGS "-Wall -Werror ${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" )
> +               set(CMAKE_C_FLAGS "-Wall ${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" )
>-     else(UNIX)
>+     else()
>                 set(CMAKE_C_FLAGS "-Wall ${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" )
>-     endif(UNIX)
>-@@ -1316,7 +1316,7 @@ Cflags: -I\${includedir}"
>+     endif()
>+@@ -1416,7 +1416,7 @@ Cflags: -I\${includedir}"
>  )
>  
>  	install(FILES "${PROJECT_BINARY_DIR}/libwebsockets.pc"
>diff --git a/net/libwebsockets/files/patch-lib_server.c b/net/libwebsockets/files/patch-lib_server.c
>new file mode 100644
>index 0000000..5ccf6c5
>--- /dev/null
>+++ b/net/libwebsockets/files/patch-lib_server.c
>@@ -0,0 +1,11 @@
>+--- lib/server.c.orig	2016-11-23 13:04:24 UTC
>++++ lib/server.c
>+@@ -110,7 +110,7 @@ lws_context_init_server(struct lws_conte
>+ 	if (LWS_IPV6_ENABLED(vhost)) {
>+ 		if (vhost->options & LWS_SERVER_OPTION_IPV6_V6ONLY_MODIFY) {
>+ 			int value = (vhost->options & LWS_SERVER_OPTION_IPV6_V6ONLY_VALUE) ? 1 : 0;
>+-			if (setsockopt(sockfd, SOL_IPV6, IPV6_V6ONLY,
>++			if (setsockopt(sockfd, IPPROTO_IPV6, IPV6_V6ONLY,
>+ 					(const void*)&value, sizeof(value)) < 0) {
>+ 				compatible_close(sockfd);
>+ 				return 1;
>diff --git a/net/libwebsockets/pkg-plist b/net/libwebsockets/pkg-plist
>index 379c12e..54b70ee 100644
>--- a/net/libwebsockets/pkg-plist
>+++ b/net/libwebsockets/pkg-plist
>@@ -1,5 +1,6 @@
> @comment $FreeBSD$
> %%WEBSERVER%%bin/lwsws
>+%%WEBSERVER%%include/lejp.h
> include/libwebsockets.h
> include/lws_config.h
> lib/cmake/libwebsockets/LibwebsocketsConfig.cmake
>@@ -8,7 +9,24 @@ lib/cmake/libwebsockets/LibwebsocketsTargets-%%CMAKE_BUILD_TYPE%%.cmake
> lib/cmake/libwebsockets/LibwebsocketsTargets.cmake
> lib/libwebsockets.a
> lib/libwebsockets.so
>-lib/libwebsockets.so.8
>+lib/libwebsockets.so.9
> libdata/pkgconfig/libwebsockets.pc
>-%%WEBSERVER%%%%DATADIR%%-test-server/server-status/lwsws-logo.png
>-%%WEBSERVER%%%%DATADIR%%-test-server/server-status/server-status.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.js
>+%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/needadmin/admin-login.html
>+%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/needauth/successful-login.html
>+%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-forgot-fail.html
>+%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-forgot-ok.html
>+%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-register-fail.html
>+%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-register-ok.html
>+%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-verify-fail.html
>+%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-verify-ok.html
>+%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/seats.jpg
>+%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/sent-forgot-fail.html
>+%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/sent-forgot-ok.html
>+%%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.html

Flags:

iblis.dif01: maintainer-approval+

Actions: View | Diff

Attachments on bug 214869: 177432 | 177433