git: b346f732e4a7 - main - devel/capnproto: upgrade to 0.9.0

Mon Aug 23 16:23:09 UTC 2021

The branch main has been updated by fernape:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b346f732e4a79b40ff5b491fa0b661dd5ed43f55

commit b346f732e4a79b40ff5b491fa0b661dd5ed43f55
Author:     Maxim Sobolev <sobomax at FreeBSD.org>
AuthorDate: 2021-08-21 12:13:54 +0000
Commit:     Fernando Apesteguía <fernape at FreeBSD.org>
CommitDate: 2021-08-23 16:18:22 +0000

    devel/capnproto: upgrade to 0.9.0
    
    ChangeLog: https://capnproto.org/news/
    
    PR:     257919
    Reported by:    sobomax at FreeBSD.org
    Approved by:    felix at userspace.com.au (maintainer)
---
 devel/capnproto/Makefile                           | 12 ++++---
 devel/capnproto/distinfo                           |  6 ++--
 .../files/patch-src__kj__async-io-unix.c++         | 14 ++++++++
 devel/capnproto/pkg-plist                          | 37 ++++++++++++++++------
 4 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/devel/capnproto/Makefile b/devel/capnproto/Makefile
index ed3feb39e2e7..d04644bfc9a0 100644
--- a/devel/capnproto/Makefile
+++ b/devel/capnproto/Makefile
@@ -1,8 +1,7 @@
 # Created by: Felix Hanley
 
 PORTNAME=	capnproto
-PORTVERSION=	0.7.0
-PORTREVISION=	1
+PORTVERSION=	0.9.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
@@ -17,12 +16,15 @@ USES=		autoreconf compiler:c++14-lang gmake libtool ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	capnproto
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	ac_cv_lib_ssl_OPENSSL_init_ssl=yes
-
-WRKSRC_SUBDIR=	c++
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	ac_cv_lib_ssl_OPENSSL_init_ssl=yes
+
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
+WRKSRC_SUBDIR=	c++
+
+PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
+
 .include <bsd.port.mk>
diff --git a/devel/capnproto/distinfo b/devel/capnproto/distinfo
index 6a536df5e6d8..8ea188ba40e6 100644
--- a/devel/capnproto/distinfo
+++ b/devel/capnproto/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1537406699
-SHA256 (capnproto-capnproto-v0.7.0_GH0.tar.gz) = 76c7114a3d142ad08b7208b3964a26e72a6320ee81331d3f0b87569fc9c47a28
-SIZE (capnproto-capnproto-v0.7.0_GH0.tar.gz) = 1983172
+TIMESTAMP = 1629251120
+SHA256 (capnproto-capnproto-v0.9.0_GH0.tar.gz) = a156efe56b42957ea2d118340d96509af2e40c7ef8f3f8c136df48001a5eb2ac
+SIZE (capnproto-capnproto-v0.9.0_GH0.tar.gz) = 2238274
diff --git a/devel/capnproto/files/patch-src__kj__async-io-unix.c++ b/devel/capnproto/files/patch-src__kj__async-io-unix.c++
new file mode 100644
index 000000000000..b19787262b54
--- /dev/null
+++ b/devel/capnproto/files/patch-src__kj__async-io-unix.c++
@@ -0,0 +1,14 @@
+--- src/kj/async-io-unix.c++.orig	2021-08-14 23:27:30 UTC
++++ src/kj/async-io-unix.c++
+@@ -1486,7 +1486,11 @@ kj::Own<PeerIdentity> SocketAddress::getIdentity(kj::L
+       // MacOS / FreeBSD
+       struct xucred creds;
+       uint length = sizeof(creds);
++#if defined SOL_LOCAL
+       stream.getsockopt(SOL_LOCAL, LOCAL_PEERCRED, &creds, &length);
++#else
++      stream.getsockopt(0, LOCAL_PEERCRED, &creds, &length);
++#endif
+       KJ_ASSERT(length == sizeof(creds));
+       if (creds.cr_uid != static_cast<uid_t>(-1)) {
+         result.uid = creds.cr_uid;
diff --git a/devel/capnproto/pkg-plist b/devel/capnproto/pkg-plist
index c92ced23ec0e..9dc590376349 100644
--- a/devel/capnproto/pkg-plist
+++ b/devel/capnproto/pkg-plist
@@ -8,13 +8,15 @@ include/capnp/c++.capnp
 include/capnp/c++.capnp.h
 include/capnp/capability.h
 include/capnp/common.h
+include/capnp/compat/json.capnp
 include/capnp/compat/json.capnp.h
 include/capnp/compat/json.h
+include/capnp/compat/std-iterator.h
+include/capnp/compat/websocket-rpc.h
 include/capnp/dynamic.h
 include/capnp/endian.h
 include/capnp/ez-rpc.h
 include/capnp/generated-header-support.h
-include/capnp/json.capnp
 include/capnp/layout.h
 include/capnp/list.h
 include/capnp/membrane.h
@@ -42,11 +44,14 @@ include/capnp/serialize-async.h
 include/capnp/serialize-packed.h
 include/capnp/serialize-text.h
 include/capnp/serialize.h
+include/capnp/stream.capnp
+include/capnp/stream.capnp.h
 include/kj/arena.h
 include/kj/array.h
 include/kj/async-inl.h
 include/kj/async-io.h
 include/kj/async-prelude.h
+include/kj/async-queue.h
 include/kj/async-unix.h
 include/kj/async-win32.h
 include/kj/async.h
@@ -64,6 +69,7 @@ include/kj/filesystem.h
 include/kj/function.h
 include/kj/hash.h
 include/kj/io.h
+include/kj/list.h
 include/kj/main.h
 include/kj/map.h
 include/kj/memory.h
@@ -72,6 +78,7 @@ include/kj/one-of.h
 include/kj/parse/char.h
 include/kj/parse/common.h
 include/kj/refcount.h
+include/kj/source-location.h
 include/kj/std/iostream.h
 include/kj/string-tree.h
 include/kj/string.h
@@ -89,37 +96,47 @@ lib/cmake/CapnProto/CapnProtoConfig.cmake
 lib/cmake/CapnProto/CapnProtoConfigVersion.cmake
 lib/cmake/CapnProto/CapnProtoMacros.cmake
 lib/cmake/CapnProto/CapnProtoTargets.cmake
-lib/libcapnp-0.7.0.so
-lib/libcapnp-json-0.7.0.so
+lib/libcapnp-%%PORTVERSION%%.so
+lib/libcapnp-json-%%PORTVERSION%%.so
 lib/libcapnp-json.a
 lib/libcapnp-json.so
-lib/libcapnp-rpc-0.7.0.so
+lib/libcapnp-rpc-%%PORTVERSION%%.so
 lib/libcapnp-rpc.a
 lib/libcapnp-rpc.so
+lib/libcapnp-websocket-%%PORTVERSION%%.so
+lib/libcapnp-websocket.a
+lib/libcapnp-websocket.so
 lib/libcapnp.a
 lib/libcapnp.so
-lib/libcapnpc-0.7.0.so
+lib/libcapnpc-%%PORTVERSION%%.so
 lib/libcapnpc.a
 lib/libcapnpc.so
-lib/libkj-0.7.0.so
-lib/libkj-async-0.7.0.so
+lib/libkj-%%PORTVERSION%%.so
+lib/libkj-async-%%PORTVERSION%%.so
 lib/libkj-async.a
 lib/libkj-async.so
-lib/libkj-http-0.7.0.so
+lib/libkj-gzip-%%PORTVERSION%%.so
+lib/libkj-gzip.a
+lib/libkj-gzip.so
+lib/libkj-http-%%PORTVERSION%%.so
 lib/libkj-http.a
 lib/libkj-http.so
-lib/libkj-test-0.7.0.so
+lib/libkj-test-%%PORTVERSION%%.so
 lib/libkj-test.a
 lib/libkj-test.so
-lib/libkj-tls-0.7.0.so
+lib/libkj-tls-%%PORTVERSION%%.so
 lib/libkj-tls.a
 lib/libkj-tls.so
 lib/libkj.a
 lib/libkj.so
 libdata/pkgconfig/capnp-json.pc
 libdata/pkgconfig/capnp-rpc.pc
+libdata/pkgconfig/capnp-websocket.pc
 libdata/pkgconfig/capnp.pc
+libdata/pkgconfig/capnpc.pc
 libdata/pkgconfig/kj-async.pc
+libdata/pkgconfig/kj-gzip.pc
 libdata/pkgconfig/kj-http.pc
 libdata/pkgconfig/kj-test.pc
+libdata/pkgconfig/kj-tls.pc
 libdata/pkgconfig/kj.pc
