From 72915f093d9868c69e7145aab9c54d73bda1c92e Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Tue, 13 Oct 2020 21:12:25 +0200 Subject: [PATCH 1/3] fix: remove reference to deprecated ping_pong_interval --- lib/webfuse/impl/server.c | 1 - test/webfuse/test_util/server_protocol.cc | 1 - test/webfuse/test_util/ws_server.cc | 1 - 3 files changed, 3 deletions(-) diff --git a/lib/webfuse/impl/server.c b/lib/webfuse/impl/server.c index 3f3fe8c..9242d08 100644 --- a/lib/webfuse/impl/server.c +++ b/lib/webfuse/impl/server.c @@ -54,7 +54,6 @@ static struct lws_context * wf_impl_server_context_create( server->info.mounts = &server->mount; server->info.protocols = server->ws_protocols; server->info.vhost_name = server->config.vhost_name; - server->info.ws_ping_pong_interval = 10; server->info.options = LWS_SERVER_OPTION_HTTP_HEADERS_SECURITY_BEST_PRACTICES_ENFORCE; server->info.options |= LWS_SERVER_OPTION_EXPLICIT_VHOSTS; diff --git a/test/webfuse/test_util/server_protocol.cc b/test/webfuse/test_util/server_protocol.cc index 0f2a655..27de227 100644 --- a/test/webfuse/test_util/server_protocol.cc +++ b/test/webfuse/test_util/server_protocol.cc @@ -85,7 +85,6 @@ ServerProtocol::Private::Private() info.port = 0; info.protocols = protocols; info.vhost_name = "localhost"; - info.ws_ping_pong_interval = 10; info.options = LWS_SERVER_OPTION_HTTP_HEADERS_SECURITY_BEST_PRACTICES_ENFORCE; info.options |= LWS_SERVER_OPTION_EXPLICIT_VHOSTS; diff --git a/test/webfuse/test_util/ws_server.cc b/test/webfuse/test_util/ws_server.cc index 2e50a35..90a0b99 100644 --- a/test/webfuse/test_util/ws_server.cc +++ b/test/webfuse/test_util/ws_server.cc @@ -153,7 +153,6 @@ WsServer::Private::Private( info.mounts = NULL; info.protocols =ws_protocols; info.vhost_name = "localhost"; - info.ws_ping_pong_interval = 10; info.options = LWS_SERVER_OPTION_HTTP_HEADERS_SECURITY_BEST_PRACTICES_ENFORCE; info.options |= LWS_SERVER_OPTION_EXPLICIT_VHOSTS; From dffdfc8345af592e473b7b1b1434d1f4db69b367 Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Tue, 13 Oct 2020 21:12:56 +0200 Subject: [PATCH 2/3] updated libfuse to 3.10.0, libwebsockets to 4.1.3 --- Makefile | 10 ++++++++-- build/arm32v7-alpine-builder.dockerfile | 13 ++++++++++++- build/arm32v7-ubuntu-builder.dockerfile | 13 ++++++++++++- build/x86_64-alpine-builder.dockerfile | 13 ++++++++++++- build/x86_64-ubuntu-builder.dockerfile | 13 ++++++++++++- meson.build | 10 ++-------- subprojects/fuse3.wrap | 7 ------- subprojects/libwebsockets.wrap | 6 ------ 8 files changed, 58 insertions(+), 27 deletions(-) delete mode 100644 subprojects/fuse3.wrap delete mode 100644 subprojects/libwebsockets.wrap diff --git a/Makefile b/Makefile index 19d2188..b081011 100644 --- a/Makefile +++ b/Makefile @@ -41,11 +41,17 @@ FETCH_TARGETS += $(FETCHDIR)/dumb-init-$(DUMB_INIT_VERSION).tar.gz $(FETCHDIR)/dumb-init-$(DUMB_INIT_VERSION).tar.gz: URL := https://github.com/Yelp/dumb-init/archive/v${DUMB_INIT_VERSION}.tar.gz $(SKIP_MD5SUM)$(FETCHDIR)/dumb-init-$(DUMB_INIT_VERSION).tar.gz: MD5 := 6166084b05772cdcf615a762c6f3b32e -FUSE_VERSION ?= 3.9.2 +FUSE_VERSION ?= 3.10.0 IMAGE_BUILDARGS += FUSE_VERSION=$(FUSE_VERSION) FETCH_TARGETS += $(FETCHDIR)/libfuse-fuse-$(FUSE_VERSION).tar.gz $(FETCHDIR)/libfuse-fuse-$(FUSE_VERSION).tar.gz: URL := https://github.com/libfuse/libfuse/archive/fuse-$(FUSE_VERSION).tar.gz -$(SKIP_MD5SUM)$(FETCHDIR)/libfuse-fuse-$(FUSE_VERSION).tar.gz: MD5 := 5a829d2fcaa19580adc56633721d323c +$(SKIP_MD5SUM)$(FETCHDIR)/libfuse-fuse-$(FUSE_VERSION).tar.gz: MD5 := 22aec9bc9008eea6b17e203653d1b938 + +LWS_VERSION ?= 4.1.3 +IMAGE_BUILDARGS += LWS_VERSION=$(LWS_VERSION) +FETCH_TARGETS += $(FETCHDIR)/libwebsockets-$(LWS_VERSION).tar.gz +$(FETCHDIR)/libwebsockets-$(LWS_VERSION).tar.gz: URL := https://github.com/warmcat/libwebsockets/archive/v$(LWS_VERSION).tar.gz +$(SKIP_MD5SUM)$(FETCHDIR)/libwebsockets-$(LWS_VERSION).tar.gz: MD5 := 413cbe790ccb089001f53b2ee167b9c2 QEMU_VERSION ?= v4.1.0-1 IMAGE_BUILDARGS += QEMU_VERSION_=$(QEMU_VERSION) diff --git a/build/arm32v7-alpine-builder.dockerfile b/build/arm32v7-alpine-builder.dockerfile index 80810c8..0df16d6 100644 --- a/build/arm32v7-alpine-builder.dockerfile +++ b/build/arm32v7-alpine-builder.dockerfile @@ -51,7 +51,7 @@ RUN set -x \ && rm -rf "$builddir" \ && apk del .build-deps -ARG FUSE_VERSION=3.9.2 +ARG FUSE_VERSION=3.10.0 RUN set -x \ && builddeps="eudev-dev" \ @@ -63,6 +63,17 @@ RUN set -x \ && rm -rf "$builddir" \ && apk del .build-deps +ARG LWS_VERSION=4.1.3 + +RUN set -x \ + && builddir="/tmp/out" \ + && mkdir -p "$builddir" \ + && cd "$builddir" \ + && cmake "/usr/local/src/libwebsockets-$LWS_VERSION" \ + && make \ + && make install \ + && rm -rf "$builddir" + ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib" ENV PKG_CONFIG_PATH=/usr/local/lib32/pkgconfig diff --git a/build/arm32v7-ubuntu-builder.dockerfile b/build/arm32v7-ubuntu-builder.dockerfile index d63e4d5..c0b9f12 100644 --- a/build/arm32v7-ubuntu-builder.dockerfile +++ b/build/arm32v7-ubuntu-builder.dockerfile @@ -49,7 +49,7 @@ RUN set -x \ && rm -rf "$builddir" \ && apt purge -y $builddeps -ARG FUSE_VERSION=3.9.2 +ARG FUSE_VERSION=3.10.0 RUN set -x \ && builddeps="udev gettext" \ @@ -61,6 +61,17 @@ RUN set -x \ && rm -rf "$builddir" \ && apt purge -y $builddeps +ARG LWS_VERSION=4.1.3 + +RUN set -x \ + && builddir="/tmp/out" \ + && mkdir -p "$builddir" \ + && cd "$builddir" \ + && cmake "/usr/local/src/libwebsockets-$LWS_VERSION" \ + && make \ + && make install \ + && rm -rf "$builddir" + ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib" ARG USERID=1000 diff --git a/build/x86_64-alpine-builder.dockerfile b/build/x86_64-alpine-builder.dockerfile index f257d94..a6193ca 100644 --- a/build/x86_64-alpine-builder.dockerfile +++ b/build/x86_64-alpine-builder.dockerfile @@ -48,7 +48,7 @@ RUN set -x \ && rm -rf "$builddir" \ && apk del .build-deps -ARG FUSE_VERSION=3.9.2 +ARG FUSE_VERSION=3.10.0 RUN set -x \ && builddeps="eudev-dev" \ @@ -60,6 +60,17 @@ RUN set -x \ && rm -rf "$builddir" \ && apk del .build-deps +ARG LWS_VERSION=4.1.3 + +RUN set -x \ + && builddir="/tmp/out" \ + && mkdir -p "$builddir" \ + && cd "$builddir" \ + && cmake "/usr/local/src/libwebsockets-$LWS_VERSION" \ + && make \ + && make install \ + && rm -rf "$builddir" + ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib" ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig diff --git a/build/x86_64-ubuntu-builder.dockerfile b/build/x86_64-ubuntu-builder.dockerfile index b3c045a..62a2cbc 100644 --- a/build/x86_64-ubuntu-builder.dockerfile +++ b/build/x86_64-ubuntu-builder.dockerfile @@ -46,7 +46,7 @@ RUN set -x \ && rm -rf "$builddir" \ && apt purge -y $builddeps -ARG FUSE_VERSION=3.9.2 +ARG FUSE_VERSION=3.10.0 RUN set -x \ && builddeps="udev gettext" \ @@ -58,6 +58,17 @@ RUN set -x \ && rm -rf "$builddir" \ && apt purge -y $builddeps +ARG LWS_VERSION=4.1.3 + +RUN set -x \ + && builddir="/tmp/out" \ + && mkdir -p "$builddir" \ + && cd "$builddir" \ + && cmake "/usr/local/src/libwebsockets-$LWS_VERSION" \ + && make \ + && make install \ + && rm -rf "$builddir" + ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib" ARG USERID=1000 diff --git a/meson.build b/meson.build index 4c39688..baef3cf 100644 --- a/meson.build +++ b/meson.build @@ -2,14 +2,8 @@ project('webfuse', 'c', 'cpp', version: '0.6.0', license: 'LGPL-3.0+') without_tests = get_option('without_tests') -libwebsockets_dep = dependency('libwebsockets', version: '>=4.0.0', required: false) -if not libwebsockets_dep.found() - cmake = import('cmake') - libwebsockets = cmake.subproject('libwebsockets') - libwebsockets_dep = libwebsockets.dependency('websockets_shared') -endif - -libfuse_dep = dependency('fuse3', version: '>=3.8.0', fallback: ['fuse3', 'libfuse_dep']) +libwebsockets_dep = dependency('libwebsockets', version: '>=4.0.0') +libfuse_dep = dependency('fuse3', version: '>=3.8.0') pkg_config = import('pkgconfig') diff --git a/subprojects/fuse3.wrap b/subprojects/fuse3.wrap deleted file mode 100644 index fc64c1b..0000000 --- a/subprojects/fuse3.wrap +++ /dev/null @@ -1,7 +0,0 @@ -[wrap-file] -directory = libfuse-fuse-3.9.2 - -source_url = https://github.com/libfuse/libfuse/archive/fuse-3.9.2.tar.gz -source_filename = fuse-3.9.2.tar.gz -source_hash = b4409255cbda6f6975ca330f5b04cb335b823a95ddd8c812c3d224ec53478fc0 - diff --git a/subprojects/libwebsockets.wrap b/subprojects/libwebsockets.wrap deleted file mode 100644 index da72f53..0000000 --- a/subprojects/libwebsockets.wrap +++ /dev/null @@ -1,6 +0,0 @@ -[wrap-file] -directory = libwebsockets-4.0.13 - -source_url = https://github.com/warmcat/libwebsockets/archive/v4.0.13.zip -source_filename = v4.0.13.zip -source_hash = 0914ea3fdec496daf6b6a5c00f7ba1b52eb8cc3d55b66685df92920b232fd7a5 From 69b4df05edb0817cb997358a0855d3630eb93938 Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Tue, 13 Oct 2020 21:28:51 +0200 Subject: [PATCH 3/3] updated libfuse to 3.10.0 --- doc/build.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/build.md b/doc/build.md index 78e2ff3..a15e66b 100644 --- a/doc/build.md +++ b/doc/build.md @@ -45,9 +45,9 @@ After that, you will find the API documentation in the doc/api subdirectory. #### libfuse - wget -O fuse-3.9.2.tar.gz https://github.com/libfuse/libfuse/archive/fuse-3.9.2.tar.gz - tar -xf fuse-3.9.2.tar.gz - cd libfuse-fuse-3.9.2 + wget -O fuse-3.10.0.tar.gz https://github.com/libfuse/libfuse/archive/fuse-3.10.0.tar.gz + tar -xf fuse-3.10.0.tar.gz + cd libfuse-fuse-3.10.0 mkdir .build cd .build meson .. @@ -56,9 +56,9 @@ After that, you will find the API documentation in the doc/api subdirectory. #### libwebsockets - wget -O libwebsockets-4.0.10.tar.gz https://github.com/warmcat/libwebsockets/archive/v4.0.10.tar.gz - tar -xf libwebsockets-4.0.10.tar.gz - cd libwebsockets-4.0.10 + wget -O libwebsockets-4.1.3.tar.gz https://github.com/warmcat/libwebsockets/archive/v4.1.3.tar.gz + tar -xf libwebsockets-4.1.3.tar.gz + cd libwebsockets-4.1.3 mkdir .build cd .build cmake ..