protobuf py-protobuf: updated to 3.18.0

Protocol Buffers v3.18.0

C++

Fix warnings raised by clang 11
Make StringPiece constructible from std::string_view
Add missing capability attributes for LLVM 12
Stop using std::iterator (deprecated in C++17).
Move field_access_listener from libprotobuf-lite to libprotobuf
Fix 7047 Safely handle setlocale
Remove deprecated version of SetTotalBytesLimit()
Support arena allocation of google::protobuf::AnyMetadata
Fix undefined symbol error around SharedCtor()
Fix default value of enum(int) in json_util with proto2
Better Smaller ByteSizeLong
Introduce event filters for inject_field_listener_events
Reduce memory usage of DescriptorPool
For lazy fields copy serialized form when allowed.
Re-introduce the InlinedStringField class
v2 access listener
Reduce padding in the proto's ExtensionRegistry map.
GetExtension performance optimizations
Make tracker a static variable rather than call static functions
Support extensions in field access listener
Annotate MergeFrom for field access listener
Fix incomplete types for field access listener
Add map_entry/new_map_entry to SpecificField in MessageDifferencer. They
record the map items which are different in MessageDifferencer's reporter.
Reduce binary size due to fieldless proto messages
TextFormat: ParseInfoTree supports getting field end location in addition to
start.
Fix repeated enum extension size in field listener
Enable Any Text Expansion for Descriptors::DebugString()
Switch from int{8,16,32,64} to int{8,16,32,64}_t

Python

Drops support for 2.7 and 3.5.

6 files changed, 21 insertions, 24 deletions

diff --git a/devel/protobuf/Makefile b/devel/protobuf/Makefile
index 2343814be66..18f9ef8bf4f 100644
--- a/devel/protobuf/Makefile
+++ b/devel/protobuf/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.46 2021/06/09 04:57:10 adam Exp $
+# $NetBSD: Makefile,v 1.47 2021/09/30 18:59:47 adam Exp $
 
-DISTNAME=	protobuf-cpp-3.17.3
+DISTNAME=	protobuf-cpp-3.18.0
 PKGNAME=	${DISTNAME:S/-cpp//}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=protocolbuffers/}
diff --git a/devel/protobuf/PLIST b/devel/protobuf/PLIST
index 4f5f2838fa1..c91cb7fb231 100644
--- a/devel/protobuf/PLIST
+++ b/devel/protobuf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2021/06/09 04:57:10 adam Exp $
+@comment $NetBSD: PLIST,v 1.17 2021/09/30 18:59:47 adam Exp $
 bin/protoc
 include/google/protobuf/any.h
 include/google/protobuf/any.pb.h
@@ -44,6 +44,7 @@ include/google/protobuf/field_mask.pb.h
 include/google/protobuf/field_mask.proto
 include/google/protobuf/generated_enum_reflection.h
 include/google/protobuf/generated_enum_util.h
+include/google/protobuf/generated_message_bases.h
 include/google/protobuf/generated_message_reflection.h
 include/google/protobuf/generated_message_table_driven.h
 include/google/protobuf/generated_message_tctable_decl.h
@@ -52,6 +53,7 @@ include/google/protobuf/generated_message_tctable_impl.inc
 include/google/protobuf/generated_message_util.h
 include/google/protobuf/has_bits.h
 include/google/protobuf/implicit_weak_message.h
+include/google/protobuf/inlined_string_field.h
 include/google/protobuf/io/coded_stream.h
 include/google/protobuf/io/gzip_stream.h
 include/google/protobuf/io/io_win32.h
@@ -82,6 +84,7 @@ include/google/protobuf/repeated_field.h
 include/google/protobuf/service.h
 include/google/protobuf/source_context.pb.h
 include/google/protobuf/source_context.proto
+include/google/protobuf/string_member_robber.h
 include/google/protobuf/struct.pb.h
 include/google/protobuf/struct.proto
 include/google/protobuf/stubs/bytestream.h
diff --git a/devel/protobuf/distinfo b/devel/protobuf/distinfo
index 2a28ce4bf50..e9bf9c44a51 100644
--- a/devel/protobuf/distinfo
+++ b/devel/protobuf/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.54 2021/06/09 04:57:10 adam Exp $
+$NetBSD: distinfo,v 1.55 2021/09/30 18:59:47 adam Exp $
 
-SHA1 (protobuf-cpp-3.17.3.tar.gz) = 2adf8fc488302f054a1391855c9e7aced8a3c8c0
-RMD160 (protobuf-cpp-3.17.3.tar.gz) = 745ca2105f22a1f3b5a81eb1af4241128805ac61
-SHA512 (protobuf-cpp-3.17.3.tar.gz) = efad397f5cdda6639d5e9980fe6eeadc1ef768bf1d96b1e528a1d7ba1d81ceb49e22cbd78d9b4ab3518236055140568342ff138204b4a47234fb2957a89d2db8
-Size (protobuf-cpp-3.17.3.tar.gz) = 4710418 bytes
+SHA1 (protobuf-cpp-3.18.0.tar.gz) = 95fe11069dec2cfa0db93000ae2729a54dffb373
+RMD160 (protobuf-cpp-3.18.0.tar.gz) = 1a5644d9736e42c21b02f6fe276d077a6b706c0a
+SHA512 (protobuf-cpp-3.18.0.tar.gz) = be0a537efb911259cdb33f51683fd3768d20af99df0e7c7a65b43d32ccb14caa28c88bbb1a23d23b7b0795d039e5a9e5228ecbcfb34375de38e425e8bb513040
+Size (protobuf-cpp-3.18.0.tar.gz) = 4743005 bytes
 SHA1 (patch-configure) = e9953648e5b3df015be007c1c424a564d1eb2bef
 SHA1 (patch-src_google_protobuf_port__def.inc) = b9af7b28ebca182f1e23b5db8899005d38c7837c
 SHA1 (patch-third__party_googletest_googlemock_configure) = fe3b812e819130d87d99316144507d2454461cd1
diff --git a/devel/py-protobuf/Makefile b/devel/py-protobuf/Makefile
index 274ebb70f57..b928f1cfefc 100644
--- a/devel/py-protobuf/Makefile
+++ b/devel/py-protobuf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2021/06/09 04:57:10 adam Exp $
+# $NetBSD: Makefile,v 1.44 2021/09/30 18:59:47 adam Exp $
 
-DISTNAME=	protobuf-3.17.3
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/-python//}
+DISTNAME=	protobuf-3.18.0
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/protobuf/}
 
@@ -10,13 +10,9 @@ HOMEPAGE=	https://developers.google.com/protocol-buffers/
 COMMENT=	Python bindings for protobuf
 LICENSE=	modified-bsd
 
-TOOL_DEPENDS+=	${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip
-DEPENDS+=	${PYPKGPREFIX}-six>=1.9:../../lang/py-six
-TOOL_DEPENDS+=	${PYPKGPREFIX}-wheel>=0.32.0:../../devel/py-wheel
-
 USE_LANGUAGES+=	c c++11
 
-PYTHON_VERSIONED_DEPENDENCIES+=	setuptools
+PYTHON_VERSIONS_INCOMPATIBLE=   27
 
 MAKE_ENV+=		PROTOC=${PREFIX}/bin/protoc
 PYSETUPBUILDARGS=	--cpp_implementation
@@ -24,5 +20,4 @@ PYSETUPINSTALLARGS=	--cpp_implementation
 
 .include "../../devel/protobuf/buildlink3.mk"
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-protobuf/PLIST b/devel/py-protobuf/PLIST
index ed16578e99d..8a874fdc924 100644
--- a/devel/py-protobuf/PLIST
+++ b/devel/py-protobuf/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.15 2020/11/14 14:08:16 adam Exp $
+@comment $NetBSD: PLIST,v 1.16 2021/09/30 18:59:47 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
 ${PYSITELIB}/${EGG_INFODIR}/namespace_packages.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/${EGG_NAME}-nspkg.pth
 ${PYSITELIB}/google/protobuf/__init__.py
diff --git a/devel/py-protobuf/distinfo b/devel/py-protobuf/distinfo
index a6025fccec3..fd170b696a7 100644
--- a/devel/py-protobuf/distinfo
+++ b/devel/py-protobuf/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.40 2021/06/09 04:57:10 adam Exp $
+$NetBSD: distinfo,v 1.41 2021/09/30 18:59:47 adam Exp $
 
-SHA1 (protobuf-3.17.3.tar.gz) = 62f27d8042bc22d07b2df22beb85e0c8d3dad4ce
-RMD160 (protobuf-3.17.3.tar.gz) = db4f62ffebdc89d250272f8b2f5af66652cf090f
-SHA512 (protobuf-3.17.3.tar.gz) = 7ac0e788672c4c6429a257715411a5c4092fc15ee4f05abca8a327b0631471d94abdc27250f500cea37ba0b8c788ec61cbecc8d5db246bfa3f053036662977cd
-Size (protobuf-3.17.3.tar.gz) = 228448 bytes
+SHA1 (protobuf-3.18.0.tar.gz) = c05fc2fb5ed0b4de7fa2be344ef663ad5efc0e1d
+RMD160 (protobuf-3.18.0.tar.gz) = 824b8152629d7f1be5a72693a95bb7f6f72721f3
+SHA512 (protobuf-3.18.0.tar.gz) = 62aeb337b4328dbdf7081225f5b341d34aab1bd1484bf5230000ad80d3ac2f904efd65ec49763dc0968bfbdff41b02d3b87a049f77028673989d141ad8b8f7db
+Size (protobuf-3.18.0.tar.gz) = 229136 bytes