Hi,
I've attached update for net/usockets, www/uwebsockets, net/purritobin
uwebsockets has breaking API changes related to pub/sub model behaviour.
purritobin changes
- tiny inbuilt http server (allows setting headers, etc. like hsts and
CORS attributes)
- adds tests, all non-ssl tests are passing
SSL tests don't work, seems to be a problem with libressl and usockets,
am going to open bugs for that libressl/usockets
- possibly unbreak for non-clang archs, it no longer needs separate
filesystem library, but I don't have machines to check this
Would be nice to get this in 6.9.
OK?
Best,
Aisha
diff --git a/net/usockets/Makefile b/net/usockets/Makefile
index a484c23f93a..29a5240aea9 100644
--- a/net/usockets/Makefile
+++ b/net/usockets/Makefile
@@ -3,20 +3,18 @@
COMMENT = eventing, networking & crypto for async applications
CATEGORIES = net
-VERSION = 0.6.0
-REVISION = 1
+VERSION = 0.7.1
DISTNAME = usockets-${VERSION}
PKGNAME = ${DISTNAME:L}
-SHARED_LIBS = usockets 1.0
+SHARED_LIBS = usockets 1.1
GH_ACCOUNT = uNetworking
GH_PROJECT = uSockets
-#GH_TAGNAME = v0.6.0
-# cstdlib include error
-GH_COMMIT = 7683672d87067cd75b854f4e36b9820f4809a4be
-
+#GH_TAGNAME = v0.7.1
+# socket read/write error
+GH_COMMIT = 5440dbac79bd76444175b76ee95dfcade12a6aac
MAINTAINER = Aisha Tammy <[email protected]>
@@ -30,11 +28,10 @@ COMPILER = base-clang ports-gcc
LIB_DEPENDS = devel/libuv
-USE_GMAKE = Yes
-MAKE_FLAGS = CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
- CC="${CC}" CXX="${CXX}" \
- LIBusockets_VERSION="${LIBusockets_VERSION}"
+MAKE_ENV = LIBusockets_VERSION="${LIBusockets_VERSION}"
NO_TEST = Yes
+FAKE_FLAGS = PREFIX=${TRUEPREFIX}
+
.include <bsd.port.mk>
diff --git a/net/usockets/distinfo b/net/usockets/distinfo
index 964ba508e9e..ed3dd036b68 100644
--- a/net/usockets/distinfo
+++ b/net/usockets/distinfo
@@ -1,2 +1,2 @@
-SHA256 (usockets-0.6.0-7683672d.tar.gz) =
0OooGCHD8ezNIcaB1zDPK6RQLGGYGZJb24Vemjlat7c=
-SIZE (usockets-0.6.0-7683672d.tar.gz) = 57634
+SHA256 (usockets-0.7.1-5440dbac.tar.gz) =
+pfJ3z/KBnpJ3VNxcIvxpwPuQUsJjxIeODxidvn/G3c=
+SIZE (usockets-0.7.1-5440dbac.tar.gz) = 62372
diff --git a/net/usockets/patches/patch-Makefile
b/net/usockets/patches/patch-Makefile
index e718b65a265..08e00ebc3da 100644
--- a/net/usockets/patches/patch-Makefile
+++ b/net/usockets/patches/patch-Makefile
@@ -6,7 +6,7 @@ remove -flto -O3
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -1,60 +1,40 @@
+@@ -1,60 +1,39 @@
-# WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
-# For now we need to link with C++ for OpenSSL support, but should be removed
with time
-ifeq ($(WITH_OPENSSL),1)
@@ -30,7 +30,7 @@ Index: Makefile
- override CFLAGS += -DLIBUS_USE_LIBUV
- override LDFLAGS += -luv
-endif
-+PREFIX ?= "/usr/local"
++PREFIX ?= /usr/local
+LIBDIR ?= "$(PREFIX)/lib"
+INCLUDEDIR ?= "$(PREFIX)/include"
@@ -39,19 +39,19 @@ Index: Makefile
- override CFLAGS += -DLIBUS_USE_GCD
- override LDFLAGS += -framework CoreFoundation
-endif
-+# OpenBSD specific library version
-+LIBTARGET ?= libusockets.so.$(LIBusockets_VERSION)
++PKG_CONFIG ?= pkg-config
-# WITH_ASAN builds with sanitizers
-ifeq ($(WITH_ASAN),1)
- override CFLAGS += -fsanitize=address -g
-- override LDFLAGS += -lasan
+- override LDFLAGS += -fsanitize=address
-endif
-+PKG_CONFIG ?= pkg-config
++LIBTARGET = libusockets.so.$(LIBusockets_VERSION)
-override CFLAGS += -std=c11 -Isrc
-override LDFLAGS += uSockets.a
-+override LDFLAGS += -lstdc++ -lcrypto -lssl `$(PKG_CONFIG) --libs libuv`
++REQUIRES = libcrypto libssl libuv
++COMMON_FLAGS = -Isrc -DLIBUS_USE_OPENSSL -DLIBUS_USE_LIBUV
`$(PKG_CONFIG) --cflags $(REQUIRES)`
-# By default we build the uSockets.a static library
-default:
@@ -62,37 +62,35 @@ Index: Makefile
- $(CXX) $(CXXFLAGS) -std=c++17 -flto -O3 -c src/crypto/*.cpp
-endif
- $(AR) rvs uSockets.a *.o
-+COMMON_FLAGS = -DLIBUS_USE_OPENSSL -DLIBUS_USE_LIBUV -Isrc
`$(PKG_CONFIG) --cflags libuv`
-+override CFLAGS += $(COMMON_FLAGS)
-+override CXXFLAGS += $(COMMON_FLAGS)
++CFLAGS += -std=c11 $(COMMON_FLAGS)
++CXXFLAGS += -std=c++17 $(COMMON_FLAGS)
++LDFLAGS += `$(PKG_CONFIG) --libs $(REQUIRES)`
-# Builds all examples
-.PHONY: examples
-examples: default
- for f in examples/*.c; do $(CC) -flto -O3 $(CFLAGS) -o $$(basename "$$f" ".c")
"$$f" $(LDFLAGS); done
+all:
-+ $(CC) -std=c11 -fPIC $(CFLAGS) -c src/*.c src/eventing/*.c
src/crypto/*.c
-+ $(CXX) -std=c++17 -fPIC $(CXXFLAGS) -c src/crypto/*.cpp
++ $(CC) $(CFLAGS) -fPIC -c src/*.c src/eventing/*.c src/crypto/*.c
++ $(CXX) $(CXXFLAGS) -fPIC -c src/crypto/*.cpp
+ $(AR) rvs libusockets.a *.o
+ $(CC) -shared -o $(LIBTARGET) *.o -Wl,-soname,$(LIBTARGET) $(LDFLAGS)
-+ sed -e "s:@PREFIX@:$(PREFIX):" -e "s:@VERSION@:$(LIBusockets_VERSION):"
\
-+ libusockets.pc.in > libusockets.pc
++ sed -e "s:@PREFIX@:$(PREFIX):" -e "s:@VERSION@:$(LIBusockets_VERSION):"
libusockets.pc.in > libusockets.pc
-swift_examples:
- swiftc -O -I . examples/swift_http_server/main.swift uSockets.a -o
swift_http_server
-+install:
-+ install -d "$(LIBDIR)/pkgconfig" "$(INCLUDEDIR)"
-+ install -m 644 src/libusockets.h "$(INCLUDEDIR)"
-+ install -m 755 $(LIBTARGET) "$(LIBDIR)"
-+ install -m 755 libusockets.a "$(LIBDIR)"
-+ install -m 644 libusockets.pc "$(LIBDIR)/pkgconfig"
++install: all
++ install -d "$(DESTDIR)$(LIBDIR)/pkgconfig" "$(DESTDIR)$(INCLUDEDIR)"
++ install -m 644 src/libusockets.h "$(DESTDIR)$(INCLUDEDIR)/"
++ install -m 644 $(LIBTARGET) "$(DESTDIR)$(LIBDIR)"
++ install -m 644 libusockets.a "$(DESTDIR)$(LIBDIR)/"
++ install -m 644 libusockets.pc "$(DESTDIR)$(LIBDIR)/pkgconfig/"
clean:
rm -f *.o
rm -f *.a
-- rm -rf .certs
+ rm -f *.so
+ rm -rf .certs
+ rm -f libusockets.pc
+
-+.PHONY: all install clean
-+
++.PHONY: all clean default install
diff --git a/net/usockets/patches/patch-libusockets_pc_in
b/net/usockets/patches/patch-libusockets_pc_in
index 363646177e9..ab61a6f967a 100644
--- a/net/usockets/patches/patch-libusockets_pc_in
+++ b/net/usockets/patches/patch-libusockets_pc_in
@@ -3,7 +3,7 @@ $OpenBSD: patch-libusockets_pc_in,v 1.1 2020/12/11 22:34:51
sthen Exp $
Index: libusockets.pc.in
--- libusockets.pc.in.orig
+++ libusockets.pc.in
-@@ -0,0 +1,14 @@
+@@ -0,0 +1,13 @@
+prefix=@PREFIX@
+libdir=${prefix}/lib
+includedir=${prefix}/include
@@ -17,4 +17,3 @@ Index: libusockets.pc.in
+Libs: -L${libdir} -lusockets
+Libs.private: -lcrypto -lssl
+Requires.private: libuv
-+
diff --git a/www/purritobin/Makefile b/www/purritobin/Makefile
index 698ca75c722..a2ad05d1ffc 100644
--- a/www/purritobin/Makefile
+++ b/www/purritobin/Makefile
@@ -6,7 +6,7 @@ CATEGORIES = www net
GH_ACCOUNT = PurritoBin
GH_PROJECT = PurritoBin
-GH_TAGNAME = 0.3.3
+GH_TAGNAME = 0.5.2
HOMEPAGE = https://bsd.ac/
MAINTAINER = Aisha Tammy <[email protected]>
@@ -15,7 +15,7 @@ MAINTAINER = Aisha Tammy <[email protected]>
PERMIT_PACKAGE = Yes
# uses pledge()
-WANTLIB += ${COMPILER_LIBCXX} c m usockets
+WANTLIB += ${COMPILER_LIBCXX} c m pthread usockets
# C++2a
COMPILER = base-clang
@@ -24,15 +24,12 @@ BUILD_DEPENDS = www/uwebsockets
LIB_DEPENDS = net/usockets
-NO_TEST = Yes
+FAKE_FLAGS = PREFIX=${TRUEPREFIX}
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/purritobin
- ${INSTALL_DATA} ${WRKSRC}/frontend/paste.html \
- ${PREFIX}/share/purritobin
- ${INSTALL_DATA} ${WRKSRC}/clients/POSIX_shell_client.sh \
- ${PREFIX}/share/purritobin
+TEST_DEPENDS = sysutils/coreutils
-FAKE_FLAGS = PREFIX=${TRUEPREFIX}
+TEST_ENV = SHUF=gshuf SEQ=gseq
+
+TEST_FLAGS = TESTS="test_nossl*"
.include <bsd.port.mk>
diff --git a/www/purritobin/distinfo b/www/purritobin/distinfo
index 71fc842ca7f..6f716551ebc 100644
--- a/www/purritobin/distinfo
+++ b/www/purritobin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (PurritoBin-0.3.3.tar.gz) = lmjTCXskzvTd8eCKxlGfClbEfk6COuqh90nqHSeQ1wc=
-SIZE (PurritoBin-0.3.3.tar.gz) = 13155
+SHA256 (PurritoBin-0.5.2.tar.gz) = ip73WnIcMh69dI84wUkrGFs57WWoG3zP6bi9zWQRR+E=
+SIZE (PurritoBin-0.5.2.tar.gz) = 18272
diff --git a/www/uwebsockets/Makefile b/www/uwebsockets/Makefile
index 98d36ebdb9c..5f8adb252d3 100644
--- a/www/uwebsockets/Makefile
+++ b/www/uwebsockets/Makefile
@@ -6,7 +6,7 @@ CATEGORIES = www
GH_ACCOUNT = uNetworking
GH_PROJECT = uWebSockets
-GH_TAGNAME = v18.17.0
+GH_TAGNAME = v19.1.0
MAINTAINER = Aisha Tammy <[email protected]>
@@ -21,9 +21,7 @@ NO_BUILD = Yes
NO_TEST = Yes
do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/include/uWebSockets/f2
+ ${INSTALL_DATA_DIR} ${PREFIX}/include/uWebSockets
${INSTALL_DATA} ${WRKSRC}/src/*.h ${PREFIX}/include/uWebSockets
- ${INSTALL_DATA} ${WRKSRC}/src/f2/*.hpp \
- ${PREFIX}/include/uWebSockets/f2
.include <bsd.port.mk>
diff --git a/www/uwebsockets/distinfo b/www/uwebsockets/distinfo
index 0d9ebdb3b51..6229d177786 100644
--- a/www/uwebsockets/distinfo
+++ b/www/uwebsockets/distinfo
@@ -1,2 +1,2 @@
-SHA256 (uWebSockets-18.17.0.tar.gz) =
4tK9Dlm9a1RCcKo0gAP9SkI5EBW0vw61TgFhrRCPkT8=
-SIZE (uWebSockets-18.17.0.tar.gz) = 276629
+SHA256 (uWebSockets-19.1.0.tar.gz) =
Za+jKbDHaKdEPqJiHz83G8XODhw1GNWbsRuaLHrbZd0=
+SIZE (uWebSockets-19.1.0.tar.gz) = 296108
diff --git a/www/uwebsockets/pkg/PLIST b/www/uwebsockets/pkg/PLIST
index 93802815df0..80010cdaac8 100644
--- a/www/uwebsockets/pkg/PLIST
+++ b/www/uwebsockets/pkg/PLIST
@@ -13,6 +13,7 @@ include/uWebSockets/HttpRouter.h
include/uWebSockets/Loop.h
include/uWebSockets/LoopData.h
include/uWebSockets/MessageParser.h
+include/uWebSockets/MoveOnlyFunction.h
include/uWebSockets/Multipart.h
include/uWebSockets/PerMessageDeflate.h
include/uWebSockets/ProxyParser.h
@@ -26,5 +27,3 @@ include/uWebSockets/WebSocketData.h
include/uWebSockets/WebSocketExtensions.h
include/uWebSockets/WebSocketHandshake.h
include/uWebSockets/WebSocketProtocol.h
-include/uWebSockets/f2/
-include/uWebSockets/f2/function2.hpp
