From nobody Wed Jan 10 07:14:51 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T8zZg3cXmz56DRF; Wed, 10 Jan 2024 07:14:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T8zZg2FpKz4lTK; Wed, 10 Jan 2024 07:14:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704870891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lPVet7SGr7TCpOfgPO6jfOL979wenCJf/t4bscWDHTQ=; b=kFrDy+LS69XNBbJhkVAKuUQv9wD9sZHSi6dmwKjl0j4La3N7O9OgSaMdQ4J3rzLjH2iSxR msu8cixoMT6Kak62KwJusxFKJb8rC8oTsnXQhFRxtpZ+WIM3Osby9aRpM8QM7Gc3hj0GwZ vE3kJVD6ipOSMYlivqCed3ee/Pc0ydhTGq3ft23OBNOOWoFiWOs814w0Zk0/WZJ4HRna7A LmmzqxqnK2arkYn7JVF8ofiGGJDg2WHmz2PhjhhZ6xWU3U3R74hyKvcJxF+Lbr6vU58u89 pjQMO5OVipTbeat5x7oZxQCx1o6Sdpkoo5wEZK4huca9HXtdf5NGmScNFQKVjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704870891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lPVet7SGr7TCpOfgPO6jfOL979wenCJf/t4bscWDHTQ=; b=DZ4zaSuJTXxQiPhBdw91GRMwcHSSFySMR2ngRmIkGrjtqnNT9IxPdRw43aZ3QoSOSWUjan dMGdQZ1UvvAM9Vj9b1Xw8vMeY7stFeT1zNPekTH6QMbOKIaVkUbIxG3iMgDU4SIcm7m5wg XuMMziry+ke5rm4Q79Wwfh2KFYGnz3WvEl86iCJdT443nHd/L6cyomq2Rwq+2umXe8DOjE ZsaJL3ri84Lh1Zy40xfgrZ/EyELMEOcxbdfbBmQmbdhoSryAGSm/Nm8iAkN0BTJUFKbpZt CLTW/hHDL8cq3tv9vqDsU7z4DDk4h6aQc17QuGnAfMLmT0Pv1M0AwgK3aDD4BQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704870891; a=rsa-sha256; cv=none; b=dRXYyzdyyTauu+GclT8mZHLua7Sj4mQxjNdP4dn9yvmhK4vk9Yj4tHzrl7mt5U04WT/mIw YJ1E2+bVCkfj9OoJD6oLOR4t2xTuTseBSP/HoIge8A7utZRQ7+OL9ObfjlMYup6xfpJCXt U2JhbYUkK7KyxyuUQak5ZVWf18rvkyLk9jkGqI3ZI3v3KlCCaV/uDn7oT9LUUvZC/oZyhK 8bGRdGWw9sveSLBJpAXYx29v1o0keCB2mrSXrmhYUFNU4XTUtBT27uPgBXhh5Y3W83wf/G DcuM4uc9ND0NO/9/w6rtbJCEPEZS2fQJwpNfZ8HklfGaXfg3vGr0JL+kY+5z4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T8zZg1Ls9zQPB; Wed, 10 Jan 2024 07:14:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40A7EpY8025245; Wed, 10 Jan 2024 07:14:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40A7Epof025242; Wed, 10 Jan 2024 07:14:51 GMT (envelope-from git) Date: Wed, 10 Jan 2024 07:14:51 GMT Message-Id: <202401100714.40A7Epof025242@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 19de8c2835ba - main - net/usockets: update 0.8.1 =?utf-8?Q?=E2=86=92?= 0.8.7 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 19de8c2835ba0e7be9a484b33d9136ea4fd13f2b Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=19de8c2835ba0e7be9a484b33d9136ea4fd13f2b commit 19de8c2835ba0e7be9a484b33d9136ea4fd13f2b Author: Yuri Victorovich AuthorDate: 2024-01-10 07:14:39 +0000 Commit: Yuri Victorovich 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