Date: Wed, 10 Jan 2024 07:14:51 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 19de8c2835ba - main - net/usockets: update 0.8.1 =?utf-8?Q?=E2=86=92?= 0.8.7 Message-ID: <202401100714.40A7Epof025242@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=19de8c2835ba0e7be9a484b33d9136ea4fd13f2b commit 19de8c2835ba0e7be9a484b33d9136ea4fd13f2b Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2024-01-10 07:14:39 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2024-01-10 07:14:47 +0000 net/usockets: update 0.8.1 → 0.8.7 Reported by: portscout --- net/usockets/Makefile | 4 ++-- net/usockets/distinfo | 6 +++--- net/usockets/files/patch-Makefile | 33 ++++++++++++++------------------- 3 files changed, 19 insertions(+), 24 deletions(-) diff --git a/net/usockets/Makefile b/net/usockets/Makefile index fccbd803f33c..56edca8f7ce5 100644 --- a/net/usockets/Makefile +++ b/net/usockets/Makefile @@ -1,6 +1,6 @@ PORTNAME= usockets DISTVERSIONPREFIX= v -DISTVERSION= 0.8.1 +DISTVERSION= 0.8.7 CATEGORIES= net devel MAINTAINER= yuri@FreeBSD.org @@ -30,7 +30,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/src/libusockets.h ${STAGEDIR}${PREFIX}/include ${INSTALL_LIB} ${WRKSRC}/libuSockets.so ${STAGEDIR}${PREFIX}/lib -do-test: # tests fail to compile: https://github.com/uNetworking/uSockets/issues/160 +do-test: # tests fail to compile: https://github.com/uNetworking/uSockets/issues/213 cd ${WRKSRC} && \ ${CXX} -o test tests/sni_test.c ${STAGEDIR}${PREFIX}/lib/libuSockets.so && \ ./test diff --git a/net/usockets/distinfo b/net/usockets/distinfo index 5c3a60b6d8b7..0fdd12c25110 100644 --- a/net/usockets/distinfo +++ b/net/usockets/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1634421753 -SHA256 (uNetworking-uSockets-v0.8.1_GH0.tar.gz) = 3b33b5924a92577854e2326b3e2d393849ec00beb865a1271bf24c0f210cc1d6 -SIZE (uNetworking-uSockets-v0.8.1_GH0.tar.gz) = 65470 +TIMESTAMP = 1704868412 +SHA256 (uNetworking-uSockets-v0.8.7_GH0.tar.gz) = 920313a2ae42bbda17bded6fc83b3df635af24cc9abefc87905ad60fdc596edf +SIZE (uNetworking-uSockets-v0.8.7_GH0.tar.gz) = 90189 diff --git a/net/usockets/files/patch-Makefile b/net/usockets/files/patch-Makefile index 58682e358332..feba3bb79842 100644 --- a/net/usockets/files/patch-Makefile +++ b/net/usockets/files/patch-Makefile @@ -1,30 +1,25 @@ ---- Makefile.orig 2021-09-05 06:06:00 UTC +--- Makefile.orig 2023-12-28 02:58:25 UTC +++ Makefile -@@ -46,22 +46,22 @@ override LDFLAGS += uSockets.a - # By default we build the uSockets.a static library - default: - rm -f *.o -- $(CC) $(CFLAGS) -flto -O3 -c src/*.c src/eventing/*.c src/crypto/*.c -+ $(CC) $(CFLAGS) -fPIC -flto -c src/*.c src/eventing/*.c src/crypto/*.c +@@ -77,18 +77,18 @@ ifeq ($(WITH_ASIO),1) + $(CC) $(CFLAGS) -O3 -c src/*.c src/eventing/*.c src/crypto/*.c src/io_uring/*.c # Also link in Boost Asio support ifeq ($(WITH_ASIO),1) - $(CXX) $(CXXFLAGS) -Isrc -std=c++14 -flto -O3 -c src/eventing/asio.cpp -+ $(CXX) $(CXXFLAGS) -Isrc -fPIC -std=c++14 -flto -c src/eventing/asio.cpp ++ $(CXX) $(CXXFLAGS) -Isrc -fPIC -std=c++14 -flto -O3 -c src/eventing/asio.cpp endif # 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 -+ $(CXX) $(CXXFLAGS) -fPIC -std=c++17 -flto -c src/crypto/*.cpp ++ $(CXX) $(CXXFLAGS) -fPIC -std=c++17 -flto -O3 -c src/crypto/*.cpp endif -- $(AR) rvs uSockets.a *.o -+ $(CXX) -shared -o libuSockets.so *.o -lssl - - # 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) -fPIC -flto $(CFLAGS) -o $$(basename "$$f" ".c") "$$f" $(LDFLAGS); done + ifeq ($(WITH_BORINGSSL),1) +- $(CXX) $(CXXFLAGS) -std=c++17 -flto -O3 -c src/crypto/*.cpp ++ $(CXX) $(CXXFLAGS) -fPIC -std=c++17 -flto -O3 -c src/crypto/*.cpp + endif + # Create a static library (try windows, then unix) +- lib.exe /out:uSockets.a *.o || $(AR) rvs uSockets.a *.o ++ lib.exe /out:uSockets.a *.o || $(CXX) -shared -o libuSockets.so *.o -lssl - swift_examples: - swiftc -O -I . examples/swift_http_server/main.swift uSockets.a -o swift_http_server + # BoringSSL needs cmake and golang + .PHONY: boringssl
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401100714.40A7Epof025242>