Fri Oct 20 23:02:25 2017 UTC ()
devel/{py-,}protobuf: Update to 3.4.1

Notable changes:

* C++
  - Proto3 messages are now able to preserve unknown fields.
  - Packable proto3 fields are now packed by default in serialization.

* Python
  - SerializeToString API is changed to SerializeToString(self, **kwargs).
  - Added sort_keys parameter in json format to make the output
    deterministic.


(minskim)
diff -r1.7 -r1.8 pkgsrc/devel/protobuf/Makefile.common
diff -r1.7 -r1.8 pkgsrc/devel/protobuf/PLIST
diff -r1.16 -r1.17 pkgsrc/devel/protobuf/distinfo
diff -r1.11 -r1.12 pkgsrc/devel/py-protobuf/Makefile
diff -r1.4 -r1.5 pkgsrc/devel/py-protobuf/PLIST
diff -r1.10 -r1.11 pkgsrc/devel/py-protobuf/distinfo

cvs diff -r1.7 -r1.8 pkgsrc/devel/protobuf/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/devel/protobuf/Attic/Makefile.common 2017/05/02 10:49:30 1.7
+++ pkgsrc/devel/protobuf/Attic/Makefile.common 2017/10/20 23:02:25 1.8
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile.common,v 1.7 2017/05/02 10:49:30 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.8 2017/10/20 23:02:25 minskim Exp $
2# 2#
3# used by devel/protobuf/Makefile 3# used by devel/protobuf/Makefile
4# used by devel/py-protobuf/Makefile 4# used by devel/py-protobuf/Makefile
5 5
6PROTOBUFVER= 3.3.0 6PROTOBUFVER= 3.4.1
7 7
8MASTER_SITES= ${MASTER_SITE_GITHUB:=google/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=google/}
9GITHUB_PROJECT= protobuf 9GITHUB_PROJECT= protobuf
10GITHUB_RELEASE= v${PKGVERSION_NOREV} 10GITHUB_RELEASE= v${PKGVERSION_NOREV}
11 11
12CATEGORIES= devel 12CATEGORIES= devel
13HOMEPAGE= https://github.com/google/protobuf 13HOMEPAGE= https://github.com/google/protobuf
14LICENSE= modified-bsd 14LICENSE= modified-bsd
15 15
16WRKSRC= ${WRKDIR}/protobuf-${PKGVERSION_NOREV} 16WRKSRC= ${WRKDIR}/protobuf-${PKGVERSION_NOREV}
17 17
18PATCHDIR= ${.CURDIR}/../../devel/protobuf/patches 18PATCHDIR= ${.CURDIR}/../../devel/protobuf/patches

cvs diff -r1.7 -r1.8 pkgsrc/devel/protobuf/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/protobuf/PLIST 2017/05/02 10:49:30 1.7
+++ pkgsrc/devel/protobuf/PLIST 2017/10/20 23:02:25 1.8
@@ -1,42 +1,41 @@ @@ -1,42 +1,41 @@
1@comment $NetBSD: PLIST,v 1.7 2017/05/02 10:49:30 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.8 2017/10/20 23:02:25 minskim Exp $
2bin/protoc 2bin/protoc
3include/google/protobuf/any.h 3include/google/protobuf/any.h
4include/google/protobuf/any.pb.h 4include/google/protobuf/any.pb.h
5include/google/protobuf/any.proto 5include/google/protobuf/any.proto
6include/google/protobuf/api.pb.h 6include/google/protobuf/api.pb.h
7include/google/protobuf/api.proto 7include/google/protobuf/api.proto
8include/google/protobuf/arena.h 8include/google/protobuf/arena.h
 9include/google/protobuf/arena_impl.h
9include/google/protobuf/arenastring.h 10include/google/protobuf/arenastring.h
10include/google/protobuf/compiler/code_generator.h 11include/google/protobuf/compiler/code_generator.h
11include/google/protobuf/compiler/command_line_interface.h 12include/google/protobuf/compiler/command_line_interface.h
12include/google/protobuf/compiler/cpp/cpp_generator.h 13include/google/protobuf/compiler/cpp/cpp_generator.h
13include/google/protobuf/compiler/csharp/csharp_generator.h 14include/google/protobuf/compiler/csharp/csharp_generator.h
14include/google/protobuf/compiler/csharp/csharp_names.h 15include/google/protobuf/compiler/csharp/csharp_names.h
15include/google/protobuf/compiler/importer.h 16include/google/protobuf/compiler/importer.h
16include/google/protobuf/compiler/java/java_generator.h 17include/google/protobuf/compiler/java/java_generator.h
17include/google/protobuf/compiler/java/java_names.h 18include/google/protobuf/compiler/java/java_names.h
18include/google/protobuf/compiler/javanano/javanano_generator.h 19include/google/protobuf/compiler/javanano/javanano_generator.h
19include/google/protobuf/compiler/js/js_generator.h 20include/google/protobuf/compiler/js/js_generator.h
20include/google/protobuf/compiler/js/well_known_types_embed.h 21include/google/protobuf/compiler/js/well_known_types_embed.h
21include/google/protobuf/compiler/objectivec/objectivec_generator.h 22include/google/protobuf/compiler/objectivec/objectivec_generator.h
22include/google/protobuf/compiler/objectivec/objectivec_helpers.h 23include/google/protobuf/compiler/objectivec/objectivec_helpers.h
23include/google/protobuf/compiler/parser.h 24include/google/protobuf/compiler/parser.h
24include/google/protobuf/compiler/php/php_generator.h 25include/google/protobuf/compiler/php/php_generator.h
25include/google/protobuf/compiler/plugin.h 26include/google/protobuf/compiler/plugin.h
26include/google/protobuf/compiler/plugin.pb.h 27include/google/protobuf/compiler/plugin.pb.h
27include/google/protobuf/compiler/plugin.proto 28include/google/protobuf/compiler/plugin.proto
28include/google/protobuf/compiler/profile.pb.h 
29include/google/protobuf/compiler/profile.proto 
30include/google/protobuf/compiler/python/python_generator.h 29include/google/protobuf/compiler/python/python_generator.h
31include/google/protobuf/compiler/ruby/ruby_generator.h 30include/google/protobuf/compiler/ruby/ruby_generator.h
32include/google/protobuf/descriptor.h 31include/google/protobuf/descriptor.h
33include/google/protobuf/descriptor.pb.h 32include/google/protobuf/descriptor.pb.h
34include/google/protobuf/descriptor.proto 33include/google/protobuf/descriptor.proto
35include/google/protobuf/descriptor_database.h 34include/google/protobuf/descriptor_database.h
36include/google/protobuf/duration.pb.h 35include/google/protobuf/duration.pb.h
37include/google/protobuf/duration.proto 36include/google/protobuf/duration.proto
38include/google/protobuf/dynamic_message.h 37include/google/protobuf/dynamic_message.h
39include/google/protobuf/empty.pb.h 38include/google/protobuf/empty.pb.h
40include/google/protobuf/empty.proto 39include/google/protobuf/empty.proto
41include/google/protobuf/extension_set.h 40include/google/protobuf/extension_set.h
42include/google/protobuf/field_mask.pb.h 41include/google/protobuf/field_mask.pb.h

cvs diff -r1.16 -r1.17 pkgsrc/devel/protobuf/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/protobuf/distinfo 2017/07/01 15:26:52 1.16
+++ pkgsrc/devel/protobuf/distinfo 2017/10/20 23:02:25 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.16 2017/07/01 15:26:52 jperkin Exp $ 1$NetBSD: distinfo,v 1.17 2017/10/20 23:02:25 minskim Exp $
2 2
3SHA1 (protobuf-cpp-3.3.0.tar.gz) = 886010a222d5d52bba137ce35da369949d0e8913 3SHA1 (protobuf-cpp-3.4.1.tar.gz) = f5a62fa19d590525aa4338df42da375ea8912091
4RMD160 (protobuf-cpp-3.3.0.tar.gz) = fd8611a77b5d70295ae925e3b66ff3091af3b109 4RMD160 (protobuf-cpp-3.4.1.tar.gz) = 79d4802e0362b01d7ae12719143d4311281d2413
5SHA512 (protobuf-cpp-3.3.0.tar.gz) = 3fbee5ebaf8aa83793af87ce593fb2511057e26251ff7276c0cb108edd8c4699cbe376e30679f23953900219d89cd13f5bf5232eb717e6ce6e702ed48dadfaa8 5SHA512 (protobuf-cpp-3.4.1.tar.gz) = 6189e23c7e381f62e971bd0e35ad9c3ed8effe584755357013887c6a582cb5a9a654c39affa2a073b658854138f31bfb70f89fa1df494e9386f1d64fd73d07d2
6Size (protobuf-cpp-3.3.0.tar.gz) = 4214662 bytes 6Size (protobuf-cpp-3.4.1.tar.gz) = 4274863 bytes
7SHA1 (patch-configure) = ec7003c29d2d3e9aeb9ea90921313e9eb68d3127 7SHA1 (patch-configure) = ec7003c29d2d3e9aeb9ea90921313e9eb68d3127
8SHA1 (patch-configure.ac) = 208a5ce72905aa95ad73ee0f751d4a58f0c37f5f 8SHA1 (patch-configure.ac) = 208a5ce72905aa95ad73ee0f751d4a58f0c37f5f
9SHA1 (patch-gmock_configure) = a39355c602366450e3cdb6bc7dbc0523fc194319 9SHA1 (patch-gmock_configure) = a39355c602366450e3cdb6bc7dbc0523fc194319
10SHA1 (patch-gmock_configure.ac) = cfd7b7c87eff4b06ce6ecb34dec046561bbdc113 10SHA1 (patch-gmock_configure.ac) = cfd7b7c87eff4b06ce6ecb34dec046561bbdc113
11SHA1 (patch-m4_acx__check__suncc.m4) = faf96ee5d305c08d30e7c7d3578896971983e1dd 11SHA1 (patch-m4_acx__check__suncc.m4) = faf96ee5d305c08d30e7c7d3578896971983e1dd
12SHA1 (patch-src_google_protobuf_message__lite.cc) = 8f2ffe07b2710de5365148153978ad6d9939f522 12SHA1 (patch-src_google_protobuf_message__lite.cc) = 8f2ffe07b2710de5365148153978ad6d9939f522
13SHA1 (patch-src_google_protobuf_stubs_atomicops.h) = 9ec851134da674980a49302e9582a432a47f7974 13SHA1 (patch-src_google_protobuf_stubs_atomicops.h) = 9ec851134da674980a49302e9582a432a47f7974
14SHA1 (patch-src_google_protobuf_stubs_atomicops__internals__arm__gcc.h) = d60c554be8ff7fc9370bb036eef9101f9a6433e3 14SHA1 (patch-src_google_protobuf_stubs_atomicops__internals__arm__gcc.h) = d60c554be8ff7fc9370bb036eef9101f9a6433e3

cvs diff -r1.11 -r1.12 pkgsrc/devel/py-protobuf/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/py-protobuf/Makefile 2017/05/12 20:11:39 1.11
+++ pkgsrc/devel/py-protobuf/Makefile 2017/10/20 23:02:25 1.12
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.11 2017/05/12 20:11:39 leot Exp $ 1# $NetBSD: Makefile,v 1.12 2017/10/20 23:02:25 minskim Exp $
2 2
3.include "../../devel/protobuf/Makefile.common" 3.include "../../devel/protobuf/Makefile.common"
4 4
5DISTNAME= protobuf-python-${PROTOBUFVER} 5DISTNAME= protobuf-python-${PROTOBUFVER}
6PKGREVISION= 1 
7PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-python//} 6PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-python//}
8CATEGORIES+= python 7CATEGORIES+= python
9 8
10MAINTAINER= khorben@defora.org 9MAINTAINER= khorben@defora.org
11COMMENT= Python bindings for protobuf 10COMMENT= Python bindings for protobuf
12 11
13PYSETUPSUBDIR= python 12PYSETUPSUBDIR= python
14 13
15DEPENDS+= ${PYPKGPREFIX}-six>=1.9:../../lang/py-six 14DEPENDS+= ${PYPKGPREFIX}-six>=1.9:../../lang/py-six
16 15
17EGG_NAME= protobuf-${PKGVERSION_NOREV} 16EGG_NAME= protobuf-${PKGVERSION_NOREV}
18 17
19.include "../../devel/protobuf/buildlink3.mk" 18.include "../../devel/protobuf/buildlink3.mk"

cvs diff -r1.4 -r1.5 pkgsrc/devel/py-protobuf/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/py-protobuf/PLIST 2016/10/19 12:16:34 1.4
+++ pkgsrc/devel/py-protobuf/PLIST 2017/10/20 23:02:25 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.4 2016/10/19 12:16:34 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.5 2017/10/20 23:02:25 minskim Exp $
2${PYSITELIB}/google/protobuf/__init__.py 2${PYSITELIB}/google/protobuf/__init__.py
3${PYSITELIB}/google/protobuf/__init__.pyc 3${PYSITELIB}/google/protobuf/__init__.pyc
4${PYSITELIB}/google/protobuf/__init__.pyo 4${PYSITELIB}/google/protobuf/__init__.pyo
5${PYSITELIB}/google/protobuf/any_pb2.py 5${PYSITELIB}/google/protobuf/any_pb2.py
6${PYSITELIB}/google/protobuf/any_pb2.pyc 6${PYSITELIB}/google/protobuf/any_pb2.pyc
7${PYSITELIB}/google/protobuf/any_pb2.pyo 7${PYSITELIB}/google/protobuf/any_pb2.pyo
8${PYSITELIB}/google/protobuf/any_test_pb2.py 8${PYSITELIB}/google/protobuf/any_test_pb2.py
9${PYSITELIB}/google/protobuf/any_test_pb2.pyc 9${PYSITELIB}/google/protobuf/any_test_pb2.pyc
10${PYSITELIB}/google/protobuf/any_test_pb2.pyo 10${PYSITELIB}/google/protobuf/any_test_pb2.pyo
11${PYSITELIB}/google/protobuf/api_pb2.py 11${PYSITELIB}/google/protobuf/api_pb2.py
12${PYSITELIB}/google/protobuf/api_pb2.pyc 12${PYSITELIB}/google/protobuf/api_pb2.pyc
13${PYSITELIB}/google/protobuf/api_pb2.pyo 13${PYSITELIB}/google/protobuf/api_pb2.pyo
14${PYSITELIB}/google/protobuf/compiler/__init__.py 14${PYSITELIB}/google/protobuf/compiler/__init__.py
@@ -208,26 +208,32 @@ ${PYSITELIB}/google/protobuf/service.pyc @@ -208,26 +208,32 @@ ${PYSITELIB}/google/protobuf/service.pyc
208${PYSITELIB}/google/protobuf/service.pyo 208${PYSITELIB}/google/protobuf/service.pyo
209${PYSITELIB}/google/protobuf/service_reflection.py 209${PYSITELIB}/google/protobuf/service_reflection.py
210${PYSITELIB}/google/protobuf/service_reflection.pyc 210${PYSITELIB}/google/protobuf/service_reflection.pyc
211${PYSITELIB}/google/protobuf/service_reflection.pyo 211${PYSITELIB}/google/protobuf/service_reflection.pyo
212${PYSITELIB}/google/protobuf/source_context_pb2.py 212${PYSITELIB}/google/protobuf/source_context_pb2.py
213${PYSITELIB}/google/protobuf/source_context_pb2.pyc 213${PYSITELIB}/google/protobuf/source_context_pb2.pyc
214${PYSITELIB}/google/protobuf/source_context_pb2.pyo 214${PYSITELIB}/google/protobuf/source_context_pb2.pyo
215${PYSITELIB}/google/protobuf/struct_pb2.py 215${PYSITELIB}/google/protobuf/struct_pb2.py
216${PYSITELIB}/google/protobuf/struct_pb2.pyc 216${PYSITELIB}/google/protobuf/struct_pb2.pyc
217${PYSITELIB}/google/protobuf/struct_pb2.pyo 217${PYSITELIB}/google/protobuf/struct_pb2.pyo
218${PYSITELIB}/google/protobuf/symbol_database.py 218${PYSITELIB}/google/protobuf/symbol_database.py
219${PYSITELIB}/google/protobuf/symbol_database.pyc 219${PYSITELIB}/google/protobuf/symbol_database.pyc
220${PYSITELIB}/google/protobuf/symbol_database.pyo 220${PYSITELIB}/google/protobuf/symbol_database.pyo
 221${PYSITELIB}/google/protobuf/test_messages_proto2_pb2.py
 222${PYSITELIB}/google/protobuf/test_messages_proto2_pb2.pyc
 223${PYSITELIB}/google/protobuf/test_messages_proto2_pb2.pyo
 224${PYSITELIB}/google/protobuf/test_messages_proto3_pb2.py
 225${PYSITELIB}/google/protobuf/test_messages_proto3_pb2.pyc
 226${PYSITELIB}/google/protobuf/test_messages_proto3_pb2.pyo
221${PYSITELIB}/google/protobuf/text_encoding.py 227${PYSITELIB}/google/protobuf/text_encoding.py
222${PYSITELIB}/google/protobuf/text_encoding.pyc 228${PYSITELIB}/google/protobuf/text_encoding.pyc
223${PYSITELIB}/google/protobuf/text_encoding.pyo 229${PYSITELIB}/google/protobuf/text_encoding.pyo
224${PYSITELIB}/google/protobuf/text_format.py 230${PYSITELIB}/google/protobuf/text_format.py
225${PYSITELIB}/google/protobuf/text_format.pyc 231${PYSITELIB}/google/protobuf/text_format.pyc
226${PYSITELIB}/google/protobuf/text_format.pyo 232${PYSITELIB}/google/protobuf/text_format.pyo
227${PYSITELIB}/google/protobuf/timestamp_pb2.py 233${PYSITELIB}/google/protobuf/timestamp_pb2.py
228${PYSITELIB}/google/protobuf/timestamp_pb2.pyc 234${PYSITELIB}/google/protobuf/timestamp_pb2.pyc
229${PYSITELIB}/google/protobuf/timestamp_pb2.pyo 235${PYSITELIB}/google/protobuf/timestamp_pb2.pyo
230${PYSITELIB}/google/protobuf/type_pb2.py 236${PYSITELIB}/google/protobuf/type_pb2.py
231${PYSITELIB}/google/protobuf/type_pb2.pyc 237${PYSITELIB}/google/protobuf/type_pb2.pyc
232${PYSITELIB}/google/protobuf/type_pb2.pyo 238${PYSITELIB}/google/protobuf/type_pb2.pyo
233${PYSITELIB}/google/protobuf/unittest_arena_pb2.py 239${PYSITELIB}/google/protobuf/unittest_arena_pb2.py

cvs diff -r1.10 -r1.11 pkgsrc/devel/py-protobuf/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/py-protobuf/distinfo 2017/07/20 07:25:00 1.10
+++ pkgsrc/devel/py-protobuf/distinfo 2017/10/20 23:02:25 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.10 2017/07/20 07:25:00 wiz Exp $ 1$NetBSD: distinfo,v 1.11 2017/10/20 23:02:25 minskim Exp $
2 2
3SHA1 (protobuf-python-3.3.0.tar.gz) = 01ccddc003234d11626422b8a8bc82723a5485b1 3SHA1 (protobuf-python-3.4.1.tar.gz) = 8ffff7abd3faaf282176dd45b19d39a7c6718262
4RMD160 (protobuf-python-3.3.0.tar.gz) = fe3ab218c8a580c50b057a36e5ab1e18d3087e0c 4RMD160 (protobuf-python-3.4.1.tar.gz) = 7d2c2876b7533da6c9cad8f9aa4dac71c9678494
5SHA512 (protobuf-python-3.3.0.tar.gz) = bf1cb12524b0008016714c129f0f8605ef66b484fbe4e527b4f364b8a56ba70b046ad3c945094553ed85941a4215a1041cb0797531de7f0a620267d966fed26e 5SHA512 (protobuf-python-3.4.1.tar.gz) = 571c7e08c3186c465e65b8dc441563de9d604571f8f9784e86a8c59359f5617d9903ae299950d1049feff8d4db9557c6bf193b1fd9bae8eabcd43e797b4c2581
6Size (protobuf-python-3.3.0.tar.gz) = 4492367 bytes 6Size (protobuf-python-3.4.1.tar.gz) = 4559061 bytes
7SHA1 (patch-configure) = ec7003c29d2d3e9aeb9ea90921313e9eb68d3127 7SHA1 (patch-configure) = ec7003c29d2d3e9aeb9ea90921313e9eb68d3127
8SHA1 (patch-configure.ac) = 208a5ce72905aa95ad73ee0f751d4a58f0c37f5f 8SHA1 (patch-configure.ac) = 208a5ce72905aa95ad73ee0f751d4a58f0c37f5f
9SHA1 (patch-gmock_configure) = a39355c602366450e3cdb6bc7dbc0523fc194319 9SHA1 (patch-gmock_configure) = a39355c602366450e3cdb6bc7dbc0523fc194319
10SHA1 (patch-gmock_configure.ac) = cfd7b7c87eff4b06ce6ecb34dec046561bbdc113 10SHA1 (patch-gmock_configure.ac) = cfd7b7c87eff4b06ce6ecb34dec046561bbdc113
11SHA1 (patch-m4_acx__check__suncc.m4) = faf96ee5d305c08d30e7c7d3578896971983e1dd 11SHA1 (patch-m4_acx__check__suncc.m4) = faf96ee5d305c08d30e7c7d3578896971983e1dd
12SHA1 (patch-src_google_protobuf_message__lite.cc) = 8f2ffe07b2710de5365148153978ad6d9939f522 12SHA1 (patch-src_google_protobuf_message__lite.cc) = 8f2ffe07b2710de5365148153978ad6d9939f522
13SHA1 (patch-src_google_protobuf_stubs_atomicops.h) = 9ec851134da674980a49302e9582a432a47f7974 13SHA1 (patch-src_google_protobuf_stubs_atomicops.h) = 9ec851134da674980a49302e9582a432a47f7974
14SHA1 (patch-src_google_protobuf_stubs_atomicops__internals__arm__gcc.h) = d60c554be8ff7fc9370bb036eef9101f9a6433e3 14SHA1 (patch-src_google_protobuf_stubs_atomicops__internals__arm__gcc.h) = d60c554be8ff7fc9370bb036eef9101f9a6433e3