Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

protobuf-all-3.12.3.tar.gz tarball differs from the v3.12.3 tag #7683

Closed
jschueller opened this issue Jul 6, 2020 · 1 comment
Closed

protobuf-all-3.12.3.tar.gz tarball differs from the v3.12.3 tag #7683

jschueller opened this issue Jul 6, 2020 · 1 comment

Comments

@jschueller
Copy link

jschueller commented Jul 6, 2020

the protobuf-all-3.12.3.tar.gz tarball content differs from the v3.12.3 tag (https://github.com/protocolbuffers/protobuf/releases/tag/v3.12.3)

I noticed because some declarations differ between the protobuf-all-3.12.3.tar.gz and the github-generated v3.12.3.tar.gz tarball:

$ curl -L https://github.com/protocolbuffers/protobuf/releases/download/v3.12.3/protobuf-all-3.12.3.tar.gz | tar xz
$ mv protobuf-3.12.3 protobuf-3.12.3.all
$ curl -L https://github.com/protocolbuffers/protobuf/archive/v3.12.3.tar.gz | tar xz
$ diff -ur ./protobuf-3.12.3.all/src/google/protobuf/generated_message_table_driven.h ./protobuf-3.12.3/src/google/protobuf/generated_message_table_driven.h
--- ./protobuf-3.12.3.all/src/google/protobuf/generated_message_table_driven.h  2020-06-02 22:17:08.000000000 +0200
+++ ./protobuf-3.12.3/src/google/protobuf/generated_message_table_driven.h      2020-06-03 00:12:47.000000000 +0200
@@ -120,7 +120,7 @@
 // ParseTableField is kept small to help simplify instructions for computing
 // offsets, as we will always need this information to parse a field.
 // Additional data, needed for some types, is stored in
-// AuxillaryParseTableField.
+// AuxiliaryParseTableField.
 struct ParseTableField {
   uint32 offset;
   // The presence_index ordinarily represents a has_bit index, but for fields
@@ -138,7 +138,7 @@
 
 struct ParseTable;
 
-union AuxillaryParseTableField {
+union AuxiliaryParseTableField {
   typedef bool (*EnumValidator)(int);
 
   // Enums
@@ -169,20 +169,20 @@
   };
   map_aux maps;
 
-  AuxillaryParseTableField() = default;
-  constexpr AuxillaryParseTableField(AuxillaryParseTableField::enum_aux e)
+  AuxiliaryParseTableField() = default;
+  constexpr AuxiliaryParseTableField(AuxiliaryParseTableField::enum_aux e)
       : enums(e) {}
-  constexpr AuxillaryParseTableField(AuxillaryParseTableField::message_aux m)
+  constexpr AuxiliaryParseTableField(AuxiliaryParseTableField::message_aux m)
       : messages(m) {}
-  constexpr AuxillaryParseTableField(AuxillaryParseTableField::string_aux s)
+  constexpr AuxiliaryParseTableField(AuxiliaryParseTableField::string_aux s)
       : strings(s) {}
-  constexpr AuxillaryParseTableField(AuxillaryParseTableField::map_aux m)
+  constexpr AuxiliaryParseTableField(AuxiliaryParseTableField::map_aux m)
       : maps(m) {}
 };
 
 struct ParseTable {
   const ParseTableField* fields;
-  const AuxillaryParseTableField* aux;
+  const AuxiliaryParseTableField* aux;
   int max_field_number;
   // TODO(ckennelly): Do something with this padding.
 
@@ -207,10 +207,10 @@
 // The tables must be composed of POD components to ensure link-time
 // initialization.
 static_assert(std::is_pod<ParseTableField>::value, "");
-static_assert(std::is_pod<AuxillaryParseTableField>::value, "");
-static_assert(std::is_pod<AuxillaryParseTableField::enum_aux>::value, "");
-static_assert(std::is_pod<AuxillaryParseTableField::message_aux>::value, "");
-static_assert(std::is_pod<AuxillaryParseTableField::string_aux>::value, "");
+static_assert(std::is_pod<AuxiliaryParseTableField>::value, "");
+static_assert(std::is_pod<AuxiliaryParseTableField::enum_aux>::value, "");
+static_assert(std::is_pod<AuxiliaryParseTableField::message_aux>::value, "");
+static_assert(std::is_pod<AuxiliaryParseTableField::string_aux>::value, "");
 static_assert(std::is_pod<ParseTable>::value, "");
 
 // TODO(ckennelly): Consolidate these implementations into a single one, using

This diffs seems to come from:
2ae7cf0
which is marked as included in the v3.12.3 tag
so it might be that protobuf-all-3.12.3.tar.gz is generated from a different commit/branch and not the v3.12.3 tag

@jschueller jschueller changed the title v3.12.3.tar.gz and protobuf-all-3.12.3.tar.gz tarballs differ protobuf-all-3.12.3.tar.gz tarball content differs from the v3.12.3 Jul 6, 2020
@jschueller jschueller changed the title protobuf-all-3.12.3.tar.gz tarball content differs from the v3.12.3 protobuf-all-3.12.3.tar.gz tarball content differs from the v3.12.3 tag Jul 6, 2020
@jschueller jschueller changed the title protobuf-all-3.12.3.tar.gz tarball content differs from the v3.12.3 tag protobuf-all-3.12.3.tar.gz tarball differs from the v3.12.3 tag Jul 6, 2020
@Arfrever
Copy link
Contributor

Arfrever commented Jul 6, 2020

Duplicate of #7632 and #7637.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants