Hi,
This updates usockets, uwebsockets and purritobin.
Previous patch can be discarded.
Thanks,
Aisha
---
net/usockets/Makefile | 4 +--
net/usockets/distinfo | 4 +--
net/usockets/patches/patch-Makefile | 49 +++++++++++++----------------
www/purritobin/Makefile | 4 +--
www/purritobin/distinfo | 4 +--
www/uwebsockets/Makefile | 2 +-
www/uwebsockets/distinfo | 4 +--
7 files changed, 31 insertions(+), 40 deletions(-)
diff --git a/net/usockets/Makefile b/net/usockets/Makefile
index 7e544a0459a..0c55d785c18 100644
--- a/net/usockets/Makefile
+++ b/net/usockets/Makefile
@@ -4,11 +4,11 @@ COMMENT = eventing, networking & crypto for async
applications
PKGNAME = ${DISTNAME:L}
CATEGORIES = net
-SHARED_LIBS = usockets 0.1
+SHARED_LIBS = usockets 1.0
GH_ACCOUNT = uNetworking
GH_PROJECT = uSockets
-GH_TAGNAME = v0.4.1
+GH_TAGNAME = v0.6.0
MAINTAINER = Aisha Tammy <[email protected]>
diff --git a/net/usockets/distinfo b/net/usockets/distinfo
index d2274543c1d..8058bc795ab 100644
--- a/net/usockets/distinfo
+++ b/net/usockets/distinfo
@@ -1,2 +1,2 @@
-SHA256 (uSockets-0.4.1.tar.gz) = IPj38LIjXztH8e/zyRgZIAA/HLyN9hcg2rpsui0Toa4=
-SIZE (uSockets-0.4.1.tar.gz) = 49955
+SHA256 (uSockets-0.6.0.tar.gz) = mZOH02U7K8Zjw0qn6XM1isTEiX3M1kRVOlyquEOpeKE=
+SIZE (uSockets-0.6.0.tar.gz) = 57590
diff --git a/net/usockets/patches/patch-Makefile
b/net/usockets/patches/patch-Makefile
index 1a54aa5a606..2ebcb279b7f 100644
--- a/net/usockets/patches/patch-Makefile
+++ b/net/usockets/patches/patch-Makefile
@@ -6,52 +6,49 @@ remove -flto -O3
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -1,3 +1,14 @@
+@@ -1,3 +1,13 @@
+DESTDIR ?=
+
-+prefix ?= "/usr/local"
-+exec_prefix ?= "$(prefix)"
-+libdir ?= "$(exec_prefix)/lib"
-+includedir?= "$(exec_prefix)/include/uSockets"
++prefix ?= "/usr/local"
++exec_prefix ?= "$(prefix)"
++libdir ?= "$(exec_prefix)/lib"
++includedir?= "$(exec_prefix)/include/uSockets"
+
+# OpenBSD specific library version
-+LIBTARGET = libusockets.so.$(LIBusockets_VERSION)
++LIBTARGET = libusockets.so.$(LIBusockets_VERSION)
+
-+
- # WITH_OPENSSL=1 enables OpenSSL 1.1+ support
+ # 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)
- override CFLAGS += -DLIBUS_USE_OPENSSL
-@@ -33,18 +44,38 @@ ifeq ($(WITH_ASAN),1)
+@@ -34,18 +44,29 @@ ifeq ($(WITH_ASAN),1)
endif
override CFLAGS += -std=c11 -Isrc
-override LDFLAGS += uSockets.a
-# By default we build the uSockets.a static library
--default:
-+static:
++
+ default:
rm -f *.o
- $(CC) $(CFLAGS) -flto -O3 -c src/*.c src/eventing/*.c src/crypto/*.c
+-# For now we do rely on C++17 for OpenSSL support but we will be porting this
work to C11
+-ifeq ($(WITH_OPENSSL),1)
+- $(CXX) $(CXXFLAGS) -std=c++17 -flto -O3 -c src/crypto/*.cpp
+-endif
- $(AR) rvs uSockets.a *.o
-+ $(CC) $(CFLAGS) -c src/*.c src/eventing/*.c src/crypto/*.c
-+ $(AR) rvs libusockets.a *.o
-
-+dynamic:
-+ rm -f *.o
+ $(CC) -fPIC -c src/*.c src/eventing/*.c src/crypto/*.c $(CFLAGS)
++ $(AR) rvs libusockets.a *.o
+ $(CC) -shared -fPIC -Wl,-soname,$(LIBTARGET) $(CFLAGS) -o $(LIBTARGET)
*.o $(LDFLAGS)
-+
-+default: static dynamic
-+
+
+install:
+ # install the folders needed (making sure that the exist)
+ install -d "$(DESTDIR)$(libdir)" \
+ "$(DESTDIR)$(includedir)/internal/eventing" \
+ "$(DESTDIR)$(includedir)/internal/networking"
+ # OpenBSD specific library version
-+ install -m 644 $(LIBTARGET) "$(DESTDIR)$(libdir)/"
++ install -m 755 $(LIBTARGET) "$(DESTDIR)$(libdir)/"
+ # install static library
-+ install -m 644 libusockets.a "$(DESTDIR)$(libdir)/"
++ install -m 755 libusockets.a "$(DESTDIR)$(libdir)/"
+ # we also install all the header files
+ install src/*.h "$(DESTDIR)$(includedir)/"
+ install -m 644 src/internal/*.h "$(DESTDIR)$(includedir)/internal/"
@@ -61,14 +58,10 @@ Index: Makefile
# Builds all examples
.PHONY: examples
examples: default
-- for f in examples/*.c; do $(CC) -flto -O3 $(CFLAGS) -o $$(basename
"$$f" ".c") "$$f" $(LDFLAGS); done
-+ for f in examples/*.c; do $(CC) $(CFLAGS) -o $$(basename "$$f" ".c")
"$$f" $(LDFLAGS); done
-
- swift_examples:
- swiftc -O -I . examples/swift_http_server/main.swift uSockets.a -o
swift_http_server
-@@ -52,4 +83,5 @@ swift_examples:
+@@ -57,4 +78,6 @@ swift_examples:
clean:
rm -f *.o
rm -f *.a
+ rm -f *.so
rm -rf .certs
++
diff --git a/www/purritobin/Makefile b/www/purritobin/Makefile
index 7db99bce399..9f41118b4e7 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.2.3
+GH_TAGNAME = 0.2.4
HOMEPAGE = https://bsd.ac/
MAINTAINER = Aisha Tammy <[email protected]>
@@ -26,8 +26,6 @@ LIB_DEPENDS = net/usockets
NO_TEST = Yes
-MAKE_FLAGS = -DUSE_LIBUV
-
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/purritobin
${INSTALL_DATA} ${WRKSRC}/frontend/paste.html \
diff --git a/www/purritobin/distinfo b/www/purritobin/distinfo
index 342a3df77d4..33c301930ff 100644
--- a/www/purritobin/distinfo
+++ b/www/purritobin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (PurritoBin-0.2.3.tar.gz) = cZJDC1I42U8ZlWA6OuYHhg97aS2hnRhYpWnFVQtUfSk=
-SIZE (PurritoBin-0.2.3.tar.gz) = 11243
+SHA256 (PurritoBin-0.2.4.tar.gz) = 5G3GYiaoE5MzhSZ8jrncitBY1lw0FH8aCNAkahKZfbs=
+SIZE (PurritoBin-0.2.4.tar.gz) = 11356
diff --git a/www/uwebsockets/Makefile b/www/uwebsockets/Makefile
index eff11b90171..c4085298279 100644
--- a/www/uwebsockets/Makefile
+++ b/www/uwebsockets/Makefile
@@ -6,7 +6,7 @@ CATEGORIES = www
GH_ACCOUNT = uNetworking
GH_PROJECT = uWebSockets
-GH_TAGNAME = v18.6.0
+GH_TAGNAME = v18.13.0
MAINTAINER = Aisha Tammy <[email protected]>
diff --git a/www/uwebsockets/distinfo b/www/uwebsockets/distinfo
index 9b39396f50c..74f77a0d285 100644
--- a/www/uwebsockets/distinfo
+++ b/www/uwebsockets/distinfo
@@ -1,2 +1,2 @@
-SHA256 (uWebSockets-18.6.0.tar.gz) =
XwrkPmmqPFj8OgV/c4ESuOSn0h3wP5C7C0nGkN15npo=
-SIZE (uWebSockets-18.6.0.tar.gz) = 264309
+SHA256 (uWebSockets-18.13.0.tar.gz) =
FpfJml/99xSoLNvhBUlC3HxB5LqyhdmX/c7a0UFRVqQ=
+SIZE (uWebSockets-18.13.0.tar.gz) = 270125
--
2.28.0
