CVS commit: pkgsrc/devel

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Aug 16 06:37:37 UTC 2025

Modified Files:
        pkgsrc/devel/protobuf: Makefile PLIST distinfo
        pkgsrc/devel/py-protobuf: Makefile distinfo
Removed Files:
        pkgsrc/devel/py-protobuf/patches: patch-google_____init____.py

Log Message:
protobuf py-protobuf: updated to [6.]32.0

32.0

Bazel

Migrates some Java test protos using java_features.proto to edition 2024 (6f4a990)
Add generated message reflection unittest for import option and option_deps test proto in edition 2024. (c51df73)
Replace the usage of cc_info.debug_context with _debug_context (776c5f2)
Generate .pyi files in py_proto_library
Introduce denylisted_protos as a preferred replacement for blacklisted_protos attribute. (795ab9d)
Use native.proto_library for Bazel 7 and explicitly error for Bazel 6 which is incompatible and out of support. (da0077e)
Require ProtoInfo provider instead of proto_library rule for bazel cc_proto_library deps. (639f1c9)

Compiler

Strip extensions from option imports that are known in CollectExtensions due to polluted pool from protoc parse when used with protoc full + java built in generator. (ef3f9ca)
Deprecate google.protobuf.Method.syntax and google.protobuf.Method.edition (9ec241e)
Enable edition 2024 support in protoc and language generators for cpp, hpb, java, kotlin, objectivec, php, python, pyi, rust. (26843b3)
Ban import weak and weak field option in edition 2024 in protoc (parser and c++ runtime). (a2a0511)

C++

Strip extensions from option imports that are known in CollectExtensions due to polluted pool from protoc parse when used with protoc full + java built in generator. (ef3f9ca)
Manually migrate top-level protobuf unittest protos from edition 2023 to edition 2024. (7359f75)
Add generated message reflection unittest for import option and option_deps test proto in edition 2024. (c51df73)
Remove the flag requirement for Bazel+MSVC users. (c6ba697)
Enable edition 2024 support in protoc and language generators for cpp, hpb, java, kotlin, objectivec, php, python, pyi, rust. (26843b3)
Cast GetCachedTID() to unsigned to prevent left-shifting a negative number. (3e935cf)
Update comment at the top of message.h and message_lite.h to document that it should only be extended by gencode and not user code. (6a6ba52)
Treat warnings encountered in chromium builds as errors. (21c3c53)
Ban import weak and weak field option in edition 2024 in protoc (parser and c++ runtime). (a2a0511)

Java

Strip extensions from option imports that are known in CollectExtensions due to polluted pool from protoc parse when used with protoc full + java built in generator. (ef3f9ca)
Remove CollectExtensions check banning unknown custom options since unknown custom options are now expected when using import option and option_deps which exclude the options from the "builder" pool 
(aka "import" pool). (694eedd)
Manually migrate top-level protobuf unittest protos from edition 2023 to edition 2024. (7359f75)
Migrates some Java test protos using java_features.proto to edition 2024 (6f4a990)
Restore compatibility of runtime with pre-3.22.x gencode impacted by CVE-2022-3171 (adf556f)
Update our compiled_edition_default's maximum_edition to 2024
Restore the long-deprecated static functions on TextFormat. (5777d3b)
Add Kotlin class name helpers to names.h (527b2ab)
Enable edition 2024 support in protoc and language generators for cpp, hpb, java, kotlin, objectivec, php, python, pyi, rust. (26843b3)
Update Java gencode base class documentation to clarify that it is not supported to extend them. (c3177fb)
Add a FieldMaskUtil#trim overload that accepts TrimOptions and allows retaining unset primitive field state. (84c5b63)

Csharp

Update staleness (0014173)
Manually migrate top-level protobuf unittest protos from edition 2023 to edition 2024. (7359f75)
Update our compiled_edition_default's maximum_edition to 2024
Enable edition 2024 support in protoc and language generators for cpp, hpb, java, kotlin, objectivec, php, python, pyi, rust. (26843b3)
Include also ARM build of protoc in nuget package
Improve C# handling of Any JSON serialization/deserialization (dc4e429)

Objective-C

Enable edition 2024 support in protoc and language generators for cpp, hpb, java, kotlin, objectivec, php, python, pyi, rust. (26843b3)

Rust

Rust: remove DEP_UPB_VERSION check in codegen crate
Enable edition 2024 support in protoc and language generators for cpp, hpb, java, kotlin, objectivec, php, python, pyi, rust. (26843b3)
Update Rust generator to output minidescriptors instead of C minitables (1b4b5fc)
Add [clear_and_]parse_dont_enforce_required() to Rust protobuf. (e2fd7a0)
Add #[non_exhaustive] on the oneof-case enum (aba2075)
Impl Clone for RepeatedIter (aca1ed5)
See also UPB changes below, which may affect Rust.

Python

Strip extensions from option imports that are known in CollectExtensions due to polluted pool from protoc parse when used with protoc full + java built in generator. (ef3f9ca)
Manually migrate top-level protobuf unittest protos from edition 2023 to edition 2024. (7359f75)
Raise warnings for float_precision from python json_format.
Raise warnings when assign bool to int/enum
Update python edition default maximum edition to 2024
Make protobuf codebase compatible with --incompatible_config_setting_private_default_visibility
Add Python deprecation warnings for Descriptor Label. (64a76e6)
Updating setuptools to patch CVE-2025-47273
Enable edition 2024 support in protoc and language generators for cpp, hpb, java, kotlin, objectivec, php, python, pyi, rust. (26843b3)
Extend gencode compatibility support back to 3.20.0 (1af7fd4)
Change proto_api work with custom pool for upb and pure python. (49d9e2d)
Python pyi print "import datetime" for Duration/Timestamp field (f59b84a)
Add reference leak check to Python well_known_types_test. Fix two refleak bugs. (e5f9ab4)
Add reference leak check to Python timestamp_test and duration_test. Fix a refleak bug when assign datetime/duration to Timestamp/Duration (e004c8b)
Add recursion depth limits to pure python (17838be)
Remove calls to Label within Protobuf Python. (f69180a)
Change Python .pyi stubs to generated _Optional[] for bool fields same with (6972464)
Remove internal/api_implementation.Version() (cbad456)
Fix python proto_api to work with messages that required fields are not set. (f63ed55)
Fix python upb crashes on map/repeated reference stub destructor (4274909)
Mark Py JSON float_precision deprecated. (727a8ed)

PHP

Enable edition 2024 support in protoc and language generators for cpp, hpb, java, kotlin, objectivec, php, python, pyi, rust. (26843b3)
Fix(php): use count instead of ->count() to avoid bug in c-extension (9fbce62)
[php][compiler][ext] - Add missing has* methods and other well known types
Fix PHP 8.4 deprecation in GPBDecodeException

PHP C-Extension

Update our compiled_edition_default's maximum_edition to 2024
Change 'getLabel is deprecated' to E_USER_DEPRECATED (158d8ac)
[php][compiler][ext] - Add missing has* methods and other well known types
See also UPB changes below, which may affect PHP C-Extension.

Ruby

Make protobuf codebase compatible with --incompatible_config_setting_private_default_visibility
Enable edition 2024 support in protoc and language generators for cpp, hpb, java, kotlin, objectivec, php, python, pyi, rust. (26843b3)
Fix silent failure of rb_test rules to run test

Ruby C-Extension

Update our compiled_edition_default's maximum_edition to 2024
Removed wrap_memcpy.c compatibility shim for pre-2.14 glibc (4ba9733)
See also UPB changes below, which may affect Ruby C-Extension.

UPB (Python/PHP/Ruby C-Extension)

Update our compiled_edition_default's maximum_edition to 2024
Make protobuf codebase compatible with --incompatible_config_setting_private_default_visibility
Add upb_Message_SetExtensionMessage as a helper for setting a extension field that is a message. This is the extension equivalent of upb_Message_SetBaseFieldMessage. (f15d28a)

Other

Update github major version tags to be formatted v..- for clarity (e001d57)
Upgrade Abseil dependency to 20250512.1 (ee68ed1)
Patch rules_ruby to apply neverlink = True to the jars rule


To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 pkgsrc/devel/protobuf/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/devel/protobuf/PLIST
cvs rdiff -u -r1.89 -r1.90 pkgsrc/devel/protobuf/distinfo
cvs rdiff -u -r1.87 -r1.88 pkgsrc/devel/py-protobuf/Makefile
cvs rdiff -u -r1.78 -r1.79 pkgsrc/devel/py-protobuf/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/py-protobuf/patches/patch-google_____init____.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/protobuf/Makefile
diff -u pkgsrc/devel/protobuf/Makefile:1.91 pkgsrc/devel/protobuf/Makefile:1.92
--- pkgsrc/devel/protobuf/Makefile:1.91 Thu Jul  3 06:28:31 2025
+++ pkgsrc/devel/protobuf/Makefile      Sat Aug 16 06:37:36 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2025/07/03 06:28:31 wiz Exp $
+# $NetBSD: Makefile,v 1.92 2025/08/16 06:37:36 adam Exp $
 #
 # When updating this, please also update devel/py-protobuf.
 #
@@ -8,8 +8,7 @@
 # likely that any upstream release, even if apparently minor, will
 # require a recursive revbump.
 
-DISTNAME=      protobuf-31.1
-PKGREVISION=   1
+DISTNAME=      protobuf-32.0
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=protocolbuffers/}
 GITHUB_PROJECT=        protobuf

Index: pkgsrc/devel/protobuf/PLIST
diff -u pkgsrc/devel/protobuf/PLIST:1.31 pkgsrc/devel/protobuf/PLIST:1.32
--- pkgsrc/devel/protobuf/PLIST:1.31    Mon Jun 30 14:47:47 2025
+++ pkgsrc/devel/protobuf/PLIST Sat Aug 16 06:37:36 2025
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.31 2025/06/30 14:47:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.32 2025/08/16 06:37:36 adam Exp $
 bin/protoc
 bin/protoc-${PKGVERSION}.0
 bin/protoc-gen-upb
 bin/protoc-gen-upb-${PKGVERSION}.0
+bin/protoc-gen-upb_minitable
+bin/protoc-gen-upb_minitable-${PKGVERSION}.0
 bin/protoc-gen-upbdefs
 bin/protoc-gen-upbdefs-${PKGVERSION}.0
 include/google/protobuf/any.h
@@ -26,7 +28,6 @@ include/google/protobuf/compiler/cpp/opt
 include/google/protobuf/compiler/csharp/csharp_generator.h
 include/google/protobuf/compiler/csharp/names.h
 include/google/protobuf/compiler/importer.h
-include/google/protobuf/compiler/java/context.h
 include/google/protobuf/compiler/java/doc_comment.h
 include/google/protobuf/compiler/java/generator.h
 include/google/protobuf/compiler/java/helpers.h
@@ -161,6 +162,7 @@ include/google/protobuf/unknown_field_se
 include/google/protobuf/util/delimited_message_util.h
 include/google/protobuf/util/field_comparator.h
 include/google/protobuf/util/field_mask_util.h
+include/google/protobuf/util/internal_timeval.h
 include/google/protobuf/util/json_util.h
 include/google/protobuf/util/message_differencer.h
 include/google/protobuf/util/time_util.h
@@ -239,6 +241,7 @@ include/upb/mini_table/message.h
 include/upb/mini_table/sub.h
 include/upb/port/atomic.h
 include/upb/port/def.inc
+include/upb/port/sanitizers.h
 include/upb/port/undef.inc
 include/upb/port/vsnprintf_compat.h
 include/upb/reflection/common.h
@@ -282,11 +285,16 @@ include/upb/util/def_to_proto.h
 include/upb/util/required_fields.h
 include/upb/wire/byte_size.h
 include/upb/wire/decode.h
+include/upb/wire/decode_fast/combinations.h
+include/upb/wire/decode_fast/data.h
+include/upb/wire/decode_fast/select.h
 include/upb/wire/encode.h
 include/upb/wire/eps_copy_input_stream.h
-include/upb/wire/internal/decode_fast.h
+include/upb/wire/internal/decoder.h
+include/upb/wire/internal/reader.h
 include/upb/wire/reader.h
 include/upb/wire/types.h
+include/upb/wire/writer.h
 include/utf8_range.h
 include/utf8_validity.h
 lib/cmake/protobuf/protobuf-config-version.cmake

Index: pkgsrc/devel/protobuf/distinfo
diff -u pkgsrc/devel/protobuf/distinfo:1.89 pkgsrc/devel/protobuf/distinfo:1.90
--- pkgsrc/devel/protobuf/distinfo:1.89 Mon Jun 30 14:47:47 2025
+++ pkgsrc/devel/protobuf/distinfo      Sat Aug 16 06:37:36 2025
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.89 2025/06/30 14:47:47 adam Exp $
+$NetBSD: distinfo,v 1.90 2025/08/16 06:37:36 adam Exp $
 
-BLAKE2s (protobuf-31.1.tar.gz) = 5c630b9b137e0a086ce4f81b543a58cbc2b7e9f1c158087bbc56cb634fb0c952
-SHA512 (protobuf-31.1.tar.gz) = 5bf730e37183defcb29cf4831128f536ad8bcdce2b2b46b297d95f3de4a037b9ff3b6c57df66a039256dcefd828ba9d43c32b01a7a82aa5c881a9ae12cadb643
-Size (protobuf-31.1.tar.gz) = 9583956 bytes
+BLAKE2s (protobuf-32.0.tar.gz) = 4aad651e2033b1f176e8707b5a983fb273f2d7c8c91e9995f4c6556e8872d68f
+SHA512 (protobuf-32.0.tar.gz) = 2de6e86f439fc2e042eb8a1e704df63c344a88772c75be75e923e6989d66534e230eb7619eaeed92a951be999410c7216451fbb5199c911e1c19fad58f3a9f9e
+Size (protobuf-32.0.tar.gz) = 9672432 bytes

Index: pkgsrc/devel/py-protobuf/Makefile
diff -u pkgsrc/devel/py-protobuf/Makefile:1.87 pkgsrc/devel/py-protobuf/Makefile:1.88
--- pkgsrc/devel/py-protobuf/Makefile:1.87      Sun Aug  3 16:35:00 2025
+++ pkgsrc/devel/py-protobuf/Makefile   Sat Aug 16 06:37:36 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.87 2025/08/03 16:35:00 ryoon Exp $
+# $NetBSD: Makefile,v 1.88 2025/08/16 06:37:36 adam Exp $
 
-DISTNAME=      protobuf-6.31.1
-PKGREVISION=   1
+DISTNAME=      protobuf-6.32.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/protobuf/}

Index: pkgsrc/devel/py-protobuf/distinfo
diff -u pkgsrc/devel/py-protobuf/distinfo:1.78 pkgsrc/devel/py-protobuf/distinfo:1.79
--- pkgsrc/devel/py-protobuf/distinfo:1.78      Sun Aug  3 16:35:00 2025
+++ pkgsrc/devel/py-protobuf/distinfo   Sat Aug 16 06:37:36 2025
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.78 2025/08/03 16:35:00 ryoon Exp $
+$NetBSD: distinfo,v 1.79 2025/08/16 06:37:36 adam Exp $
 
-BLAKE2s (protobuf-6.31.1.tar.gz) = 62bc544d5332108a1e8429937aa0d1b18b075fa047446f99c1cacf96de3e7eb2
-SHA512 (protobuf-6.31.1.tar.gz) = 595c125a116020344d5706adf444e1a3259eae5bce3ca61b92c1ab4cb63c167f97210c71e5e24b8c49c6489777ca6de95abdd398125ba3925313ad5ebe09cc18
-Size (protobuf-6.31.1.tar.gz) = 441797 bytes
-SHA1 (patch-google_____init____.py) = f1a8d2e6c2720dd915882c426b3c61f8028edd4f
+BLAKE2s (protobuf-6.32.0.tar.gz) = fe4b3a063a25321d8bb2b18e6194d7e707de9505257b3e355157e99af624caa6
+SHA512 (protobuf-6.32.0.tar.gz) = c29d1b01984e0cc204bffa5c757e4df4eb8ee696b6f5557414e65310b15956192fc73db5daae176f2b4db03e98c36a46cc74ca8b377df193bc9461142c8269cf
+Size (protobuf-6.32.0.tar.gz) = 440614 bytes