Re: NEW: VHS-0.1.0

Let's move it to v0.1.1

On Mon, 31 Oct 2022 at 11:00:29 +0100, Gonzalo L. Rodriguez wrote:
> Hi,
>
> I made a port for VHS:
>
> https://github.com/charmbracelet/vhs
>
> Unfortunately we have to update libwebsockets (diff attached, and I emailed
> awolk@) and ttyd (someone wants to do it?:).
>
> Cheers.-
>
> --
>
> %gonzalo


> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/www/libwebsockets/Makefile,v
> retrieving revision 1.19
> diff -u -p -r1.19 Makefile
> --- Makefile 11 Mar 2022 20:10:03 -0000 1.19
> +++ Makefile 28 Oct 2022 11:52:14 -0000
> @@ -2,8 +2,7 @@ COMMENT = lightweight C library for fas
>
> GH_ACCOUNT = warmcat
> GH_PROJECT = libwebsockets
> -GH_TAGNAME = v2.4.2
> -REVISION = 0
> +GH_TAGNAME = v4.3.2
>
> SHARED_LIBS = websockets 9.0 # 12
>
> @@ -16,7 +15,7 @@ MAINTAINER = Adam Wolk <awolk@openbsd.o
> # LGPL2 + static link exception
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += crypto m ssl z
> +WANTLIB += crypto m pthread ssl z
>
> MODULES = devel/cmake
>
> @@ -24,8 +23,5 @@ CONFIGURE_ARGS += -DLWS_WITHOUT_TESTAPPS
> -DLWS_WITHOUT_TEST_SERVER=ON
>
> NO_TEST = Yes
> -
> -post-install:
> - @rm -r ${WRKINST}/usr/local/share/libwebsockets-test-server
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/www/libwebsockets/distinfo,v
> retrieving revision 1.14
> diff -u -p -r1.14 distinfo
> --- distinfo 26 Apr 2018 20:19:58 -0000 1.14
> +++ distinfo 28 Oct 2022 11:52:14 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (libwebsockets-2.4.2.tar.gz) = cwEtf89Cje3MyBboOmOgFGLieBnVU3uODQxyZL+s+tY=
> -SIZE (libwebsockets-2.4.2.tar.gz) = 3777160
> +SHA256 (libwebsockets-4.3.2.tar.gz) = aoWhvM8lrMfo5Tg+STTJsyoQKIDR5MN8cLJ64qQkBuE=
> +SIZE (libwebsockets-4.3.2.tar.gz) = 15616264
> Index: patches/patch-lib_misc_base64-decode_c
> ===================================================================
> RCS file: patches/patch-lib_misc_base64-decode_c
> diff -N patches/patch-lib_misc_base64-decode_c
> --- patches/patch-lib_misc_base64-decode_c 11 Mar 2022 20:10:04 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,22 +0,0 @@
> -Fix the build with Clang 13.
> -
> -Upstream commit 0bfd39135e970ed1273f2f935c581f213543c7ef.
> -
> -Index: lib/misc/base64-decode.c
> ---- lib/misc/base64-decode.c.orig
> -+++ lib/misc/base64-decode.c
> -@@ -53,7 +53,6 @@ lws_b64_encode_string(const char *in, int in_len, char
> - unsigned char triple[3];
> - int i;
> - int len;
> -- int line = 0;
> - int done = 0;
> -
> - while (in_len) {
> -@@ -78,7 +77,6 @@ lws_b64_encode_string(const char *in, int in_len, char
> - *out++ = (len > 2 ? encode[triple[2] & 0x3f] : '=');
> -
> - done += 4;
> -- line += 4;
> - }
> -
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/www/libwebsockets/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST
> --- pkg/PLIST 11 Mar 2022 20:10:04 -0000 1.4
> +++ pkg/PLIST 28 Oct 2022 11:52:14 -0000
> @@ -1,13 +1,100 @@
> +include/libwebsockets/
> include/libwebsockets.h
> -include/lws-plugin-ssh.h
> +include/libwebsockets/abstract/
> +include/libwebsockets/abstract/abstract.h
> +include/libwebsockets/abstract/protocols/
> +include/libwebsockets/abstract/protocols.h
> +include/libwebsockets/abstract/protocols/smtp.h
> +include/libwebsockets/abstract/transports/
> +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-async-dns.h
> +include/libwebsockets/lws-bb-i2c.h
> +include/libwebsockets/lws-bb-spi.h
> +include/libwebsockets/lws-button.h
> +include/libwebsockets/lws-cache-ttl.h
> +include/libwebsockets/lws-callbacks.h
> +include/libwebsockets/lws-cgi.h
> +include/libwebsockets/lws-client.h
> +include/libwebsockets/lws-conmon.h
> +include/libwebsockets/lws-context-vhost.h
> +include/libwebsockets/lws-cose.h
> +include/libwebsockets/lws-dbus.h
> +include/libwebsockets/lws-diskcache.h
> +include/libwebsockets/lws-display.h
> +include/libwebsockets/lws-dll2.h
> +include/libwebsockets/lws-dsh.h
> +include/libwebsockets/lws-eventlib-exports.h
> +include/libwebsockets/lws-fault-injection.h
> +include/libwebsockets/lws-freertos.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-gpio.h
> +include/libwebsockets/lws-http.h
> +include/libwebsockets/lws-i2c.h
> +include/libwebsockets/lws-ili9341-spi.h
> +include/libwebsockets/lws-jose.h
> +include/libwebsockets/lws-jwe.h
> +include/libwebsockets/lws-jwk.h
> +include/libwebsockets/lws-jws.h
> +include/libwebsockets/lws-lecp.h
> +include/libwebsockets/lws-led.h
> +include/libwebsockets/lws-lejp.h
> +include/libwebsockets/lws-logs.h
> +include/libwebsockets/lws-lwsac.h
> +include/libwebsockets/lws-map.h
> +include/libwebsockets/lws-metrics.h
> +include/libwebsockets/lws-misc.h
> +include/libwebsockets/lws-mqtt.h
> +include/libwebsockets/lws-netdev.h
> +include/libwebsockets/lws-network-helper.h
> +include/libwebsockets/lws-optee.h
> +include/libwebsockets/lws-protocols-plugins.h
> +include/libwebsockets/lws-purify.h
> +include/libwebsockets/lws-pwm.h
> +include/libwebsockets/lws-retry.h
> +include/libwebsockets/lws-ring.h
> +include/libwebsockets/lws-secure-streams-client.h
> +include/libwebsockets/lws-secure-streams-policy.h
> +include/libwebsockets/lws-secure-streams.h
> +include/libwebsockets/lws-sequencer.h
> +include/libwebsockets/lws-service.h
> +include/libwebsockets/lws-settings.h
> +include/libwebsockets/lws-sha1-base64.h
> +include/libwebsockets/lws-smd.h
> +include/libwebsockets/lws-spa.h
> +include/libwebsockets/lws-spi.h
> +include/libwebsockets/lws-ssd1306-i2c.h
> +include/libwebsockets/lws-state.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-tls-sessions.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_config.h
> lib/cmake/
> lib/cmake/libwebsockets/
> -lib/cmake/libwebsockets/LibwebsocketsConfig.cmake
> -lib/cmake/libwebsockets/LibwebsocketsConfigVersion.cmake
> lib/cmake/libwebsockets/LibwebsocketsTargets${MODCMAKE_BUILD_SUFFIX}
> lib/cmake/libwebsockets/LibwebsocketsTargets.cmake
> -lib/libwebsockets.a
> +lib/cmake/libwebsockets/LwsCheckRequirements.cmake
> +lib/cmake/libwebsockets/libwebsockets-config-version.cmake
> +lib/cmake/libwebsockets/libwebsockets-config.cmake
> +@static-lib lib/libwebsockets.a
> @lib lib/libwebsockets.so.${LIBwebsockets_VERSION}
> lib/pkgconfig/libwebsockets.pc
> lib/pkgconfig/libwebsockets_static.pc


--

%gonzalo