Merge protobuf update.

Author: rsomla1

cdk/protobuf/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
 #
 # The MySQL Connector/C++ is licensed under the terms of the GPLv2
 # <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
@@ -20,14 +20,14 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
-# The files in protobuf-2.6.0/ are unmodified versions of google source files.
+# The files in protobuf-2.6.1/ are unmodified versions of google source files.
 # To save some space and time, we have remove directories which are not
 # needed by MySQL:
-#   protobuf-2.6.0/gtest/
-#   protobuf-2.6.0/java/
-#   protobuf-2.6.0/python/
-#   protobuf-2.6.0/m4/
-#   protobuf-2.6.0/vsprojects/
+#   protobuf-2.6.1/gtest/
+#   protobuf-2.6.1/java/
+#   protobuf-2.6.1/python/
+#   protobuf-2.6.1/m4/
+#   protobuf-2.6.1/vsprojects/
 
 cmake_minimum_required(VERSION 2.8)
 PROJECT(Protobuf)
@@ -37,7 +37,7 @@ PROJECT(Protobuf)
 # TODO: Put some meaningful configuration there.
 #
 
-file(WRITE ${PROJECT_BINARY_DIR}/config.h)
+file(WRITE ${PROJECT_BINARY_DIR}/config.h "\n")
 
 #
 # Do not export any symbols
@@ -49,6 +49,37 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   add_compile_options(-fvisibility=hidden)
 endif()
 
+
+#
+# Solaris compile and link settings
+#
+
+if(CMAKE_SYSTEM_NAME MATCHES "SunOS")
+
+  add_definitions(-DSOLARIS_64BIT_ENABLED)
+
+  if(CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
+    add_definitions(-DGOOGLE_PROTOBUF_ARCH_SPARC)
+  endif()
+
+  add_compile_options(
+    -m64 -std=c++11
+    -xbuiltin=%all
+    -xlibmil
+    -xatomic=studio
+  )
+
+  foreach(type EXE SHARED MODULE)
+
+    set(CMAKE_${type}_LINKER_FLAGS
+      "-m64 -std=c++11 -lstdc++ -xatomic=studio -lCrunG3 -lgcc_s -lc"
+    )
+
+  endforeach()
+
+endif()
+
+
 #
 # Configure static runtime library on Windows if requested
 #
@@ -99,6 +130,7 @@ IF(UNIX)
   list(APPEND warnings_list "-Wno-ignored-qualifiers")
   list(APPEND warnings_list "-Wno-return-type")
   list(APPEND warnings_list "-Wno-unused-function")
+  list(APPEND warnings_list "-Wno-unused-local-typedefs")
 
   if(APPLE)
 
@@ -110,11 +142,23 @@ IF(UNIX)
 
   endif()
 
-  IF(CMAKE_COMPILER_IS_GNUCXX)
+  if(CMAKE_COMPILER_IS_GNUCXX)
+
     list(APPEND warnings_list "-Wno-unused-local-typedefs")
     list(APPEND warnings_list "-Wno-maybe-uninitialized")
     list(APPEND warnings_list "-Wno-unused-but-set-parameter")
-  ENDIF()
+
+  elseif(CMAKE_SYSTEM_NAME MATCHES "SunOS")
+
+    # Option -erroff disables only warnings, actually. This option requires
+    # a warning tag, which is printed if -errtags option is enabled.
+
+    add_compile_options(
+      -errtags=yes
+      -erroff=anonnotype
+    )
+
+  endif()
 
 ELSE(WIN32)
 
@@ -129,8 +173,7 @@ ELSE(WIN32)
 
 ENDIF()
 
-string(REPLACE ";" " " warning_options "${warnings_list}")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${warning_options}")
+add_compile_options(${warnings_list})
 
 
 #
@@ -139,7 +182,7 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${warning_options}")
 
 
 SET(PROTO_SRC_DIR
-  "${PROJECT_SOURCE_DIR}/protobuf-2.6.0/src")
+  "${PROJECT_SOURCE_DIR}/protobuf-2.6.1/src")
 
 set(build_stamp "${PROJECT_BINARY_DIR}/build.stamp")
 

cdk/protobuf/protobuf-2.6.0/src/google/protobuf/testdata/golden_message

@@ -1,3 +1,21 @@
+2014-10-20 version 2.6.1:
+
+  C++
+  * Added atomicops support for Solaris.
+  * Released memory allocated by InitializeDefaultRepeatedFields() and
+    GetEmptyString(). Some memory sanitizers reported them as memory leaks.
+
+  Java
+  * Updated DynamicMessage.setField() to handle repeated enum values
+    correctly.
+  * Fixed a bug that caused NullPointerException to be thrown when
+    converting manually constructed FileDescriptorProto to
+    FileDescriptor.
+
+  Python
+  * Fixed WhichOneof() to work with de-serialized protobuf messages.
+  * Fixed a missing file problem of Python C++ implementation.
+
 2014-08-15 version 2.6.0:
 
   General

cdk/protobuf/protobuf-2.6.0/src/google/protobuf/testdata/golden_message_oneof_implemented

@@ -50,7 +50,7 @@ Patch contributors:
       text format.
   Brian Atkinson <[email protected]>
     * Added @Override annotation to generated Java code where appropriate.
-  Vincent Choini�re <[email protected]>
+  Vincent Choinière <[email protected]>
     * Tru64 support.
   Monty Taylor <[email protected]>
     * Solaris 10 + Sun Studio fixes.
@@ -88,3 +88,6 @@ Patch contributors:
     * Added CodedInputStream.getTotalBytesRead().
   Kacper Kowalik <[email protected]>
     * Fixed m4/acx_pthread.m4 problem for some Linux distributions.
+  William Orr <[email protected]>
+    * Fixed detection of sched_yield on Solaris.
+    * Added atomicops for Solaris

cdk/protobuf/protobuf-2.6.0/src/google/protobuf/testdata/golden_packed_fields_message

@@ -38,9 +38,9 @@ pkgconfig_DATA = protobuf.pc protobuf-lite.pc
 EXTRA_DIST =                                                                 \
   autogen.sh                                                                 \
   generate_descriptor_proto.sh                                               \
-  README.txt                                                                 \
+  README.md                                                                  \
   INSTALL.txt                                                                \
-  COPYING.txt                                                                \
+  LICENSE                                                                    \
   CONTRIBUTORS.txt                                                           \
   CHANGES.txt                                                                \
   editors/README.txt                                                         \

cdk/protobuf/protobuf-2.6.0/CHANGES.txt renamed to cdk/protobuf/protobuf-2.6.1/CHANGES.txt

@@ -1,17 +1,32 @@
 Protocol Buffers - Google's data interchange format
+===================================================
+
 Copyright 2008 Google Inc.
-http://code.google.com/apis/protocolbuffers/
+
+https://developers.google.com/protocol-buffers/
 
 C++ Installation - Unix
-=======================
+-----------------------
+
+If you get the source from github, you need to generate the configure script
+first:
+
+    $ ./autogen.sh
+
+This will download gtest source (which is used for C++ Protocol Buffer
+unit-tests) to the current directory and run automake, autoconf, etc.
+to generate the configure script and various template makefiles.
+
+You can skip this step if you are using a release package (which already
+contains gtest and the configure script).
 
 To build and install the C++ Protocol Buffer runtime and the Protocol
 Buffer compiler (protoc) execute the following:
 
-  $ ./configure
-  $ make
-  $ make check
-  $ make install
+    $ ./configure
+    $ make
+    $ make check
+    $ make install
 
 If "make check" fails, you can still install, but it is likely that
 some features of this library will not work correctly on your system.
@@ -21,7 +36,7 @@ Proceed at your own risk.
 
 For advanced usage information on configure and make, see INSTALL.txt.
 
-** Hint on install location **
+**Hint on install location**
 
   By default, the package will be installed to /usr/local.  However,
   on many platforms, /usr/local/lib is not part of LD_LIBRARY_PATH.
@@ -33,7 +48,7 @@ For advanced usage information on configure and make, see INSTALL.txt.
   If you already built the package with a different prefix, make sure
   to run "make clean" before building again.
 
-** Compiling dependent packages **
+**Compiling dependent packages**
 
   To compile a package that uses Protocol Buffers, you need to pass
   various flags to your compiler and linker.  As of version 2.2.0,
@@ -71,7 +86,7 @@ For advanced usage information on configure and make, see INSTALL.txt.
   If you only want protobuf-lite, substitute "protobuf-lite" in place
   of "protobuf" in these examples.
 
-** Note for cross-compiling **
+**Note for cross-compiling**
 
   The makefiles normally invoke the protoc executable that they just
   built in order to build tests.  When cross-compiling, the protoc
@@ -94,7 +109,7 @@ For advanced usage information on configure and make, see INSTALL.txt.
   has the same version as the protobuf source code you are trying to
   use it with.
 
-** Note for Solaris users **
+**Note for Solaris users**
 
   Solaris 10 x86 has a bug that will make linking fail, complaining
   about libstdc++.la being invalid.  We have included a work-around
@@ -104,7 +119,7 @@ For advanced usage information on configure and make, see INSTALL.txt.
 
   See src/solaris/libstdc++.la for more info on this bug.
 
-** Note for HP C++ Tru64 users **
+**Note for HP C++ Tru64 users**
 
   To compile invoke configure as follows:
 
@@ -113,15 +128,15 @@ For advanced usage information on configure and make, see INSTALL.txt.
   Also, you will need to use gmake instead of make.
 
 C++ Installation - Windows
-==========================
+--------------------------
 
 If you are using Microsoft Visual C++, see vsprojects/readme.txt.
 
 If you are using Cygwin or MinGW, follow the Unix installation
 instructions, above.
 
 Binary Compatibility Warning
-============================
+----------------------------
 
 Due to the nature of C++, it is unlikely that any two versions of the
 Protocol Buffers C++ runtime libraries will have compatible ABIs.
@@ -132,10 +147,10 @@ immediately on startup of your app.  Still, you may want to consider
 using static linkage.  You can configure this package to install
 static libraries only using:
 
-  ./configure --disable-shared
+    ./configure --disable-shared
 
 Java and Python Installation
-============================
+----------------------------
 
 The Java and Python runtime libraries for Protocol Buffers are located
 in the java and python directories.  See the README file in each
@@ -144,9 +159,9 @@ Note that both of them require you to first install the Protocol
 Buffer compiler (protoc), which is part of the C++ package.
 
 Usage
-=====
+-----
 
 The complete documentation for Protocol Buffers is available via the
 web at:
 
-  http://code.google.com/apis/protocolbuffers/
+    https://developers.google.com/protocol-buffers/

cdk/protobuf/protobuf-2.6.0/CONTRIBUTORS.txt renamed to cdk/protobuf/protobuf-2.6.1/CONTRIBUTORS.txt

@@ -12,7 +12,7 @@ AC_PREREQ(2.59)
 # In the SVN trunk, the version should always be the next anticipated release
 # version with the "-pre" suffix.  (We used to use "-SNAPSHOT" but this pushed
 # the size of one file name in the dist tarfile over the 99-char limit.)
-AC_INIT([Protocol Buffers],[2.6.0],[[email protected]],[protobuf])
+AC_INIT([Protocol Buffers],[2.6.1],[[email protected]],[protobuf])
 
 AM_MAINTAINER_MODE([enable])
 
@@ -139,6 +139,15 @@ AM_CONDITIONAL([USE_EXTERNAL_PROTOC], [test "$with_protoc" != "no"])
 ACX_PTHREAD
 AC_CXX_STL_HASH
 
+case "$target_os" in
+  mingw* | cygwin* | win*)
+    ;;
+  *)
+    # Need to link against rt on Solaris
+    AC_SEARCH_LIBS([sched_yield], [rt], [], [AC_MSG_FAILURE([sched_yield was not found on your system])])
+    ;;
+esac
+
 # HACK:  Make gtest's configure script pick up our copy of CFLAGS and CXXFLAGS,
 #   since the flags added by ACX_CHECK_SUNCC must be used when compiling gtest
 #   too.

cdk/protobuf/protobuf-2.6.0/INSTALL.txt renamed to cdk/protobuf/protobuf-2.6.1/INSTALL.txt

@@ -1,6 +1,6 @@
 " Protocol Buffers - Google's data interchange format
 " Copyright 2008 Google Inc.  All rights reserved.
-" http://code.google.com/p/protobuf/
+" https://developers.google.com/protocol-buffers/
 "
 " Redistribution and use in source and binary forms, with or without
 " modification, are permitted provided that the following conditions are

cdk/protobuf/protobuf-2.6.0/COPYING.txt renamed to cdk/protobuf/protobuf-2.6.1/LICENSE

@@ -22,7 +22,7 @@ All of these programs simply take an address book file as their parameter.
 The add_person programs will create the file if it doesn't already exist.
 
 These examples are part of the Protocol Buffers tutorial, located at:
-  http://code.google.com/apis/protocolbuffers/docs/tutorials.html
+  https://developers.google.com/protocol-buffers/docs/tutorials
 
 * Note that on some platforms you may have to edit the Makefile and remove
 "-lpthread" from the linker commands (perhaps replacing it with something else).

cdk/protobuf/protobuf-2.6.0/Makefile.am renamed to cdk/protobuf/protobuf-2.6.1/Makefile.am

@@ -4,7 +4,6 @@
 #include <fstream>
 #include <string>
 #include "addressbook.pb.h"
-#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
 using namespace std;
 
 // Iterates though all people in the AddressBook and prints info about them.

cdk/protobuf/protobuf-2.6.0/README.txt renamed to cdk/protobuf/protobuf-2.6.1/README.md

@@ -39,14 +39,15 @@ MAINTAINERCLEANFILES =   \
 
 nobase_include_HEADERS =                                        \
   google/protobuf/stubs/atomicops.h                             \
-  google/protobuf/stubs/atomicops_internals_arm_gcc.h           \
   google/protobuf/stubs/atomicops_internals_arm64_gcc.h         \
+  google/protobuf/stubs/atomicops_internals_arm_gcc.h           \
   google/protobuf/stubs/atomicops_internals_arm_qnx.h           \
   google/protobuf/stubs/atomicops_internals_atomicword_compat.h \
   google/protobuf/stubs/atomicops_internals_generic_gcc.h       \
   google/protobuf/stubs/atomicops_internals_macosx.h            \
   google/protobuf/stubs/atomicops_internals_mips_gcc.h          \
   google/protobuf/stubs/atomicops_internals_pnacl.h             \
+  google/protobuf/stubs/atomicops_internals_solaris.h           \
   google/protobuf/stubs/atomicops_internals_tsan.h              \
   google/protobuf/stubs/atomicops_internals_x86_gcc.h           \
   google/protobuf/stubs/atomicops_internals_x86_msvc.h          \
@@ -95,7 +96,7 @@ nobase_include_HEADERS =                                        \
 lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la
 
 libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS)
-libprotobuf_lite_la_LDFLAGS = -version-info 9:0:0 -export-dynamic -no-undefined
+libprotobuf_lite_la_LDFLAGS = -version-info 9:1:0 -export-dynamic -no-undefined
 libprotobuf_lite_la_SOURCES =                                  \
   google/protobuf/stubs/atomicops_internals_x86_gcc.cc         \
   google/protobuf/stubs/atomicops_internals_x86_msvc.cc        \
@@ -117,7 +118,7 @@ libprotobuf_lite_la_SOURCES =                                  \
   google/protobuf/io/zero_copy_stream_impl_lite.cc
 
 libprotobuf_la_LIBADD = $(PTHREAD_LIBS)
-libprotobuf_la_LDFLAGS = -version-info 9:0:0 -export-dynamic -no-undefined
+libprotobuf_la_LDFLAGS = -version-info 9:1:0 -export-dynamic -no-undefined
 libprotobuf_la_SOURCES =                                       \
   $(libprotobuf_lite_la_SOURCES)                               \
   google/protobuf/stubs/strutil.cc                             \
@@ -146,7 +147,7 @@ libprotobuf_la_SOURCES =                                       \
   google/protobuf/compiler/parser.cc
 
 libprotoc_la_LIBADD = $(PTHREAD_LIBS) libprotobuf.la
-libprotoc_la_LDFLAGS = -version-info 9:0:0 -export-dynamic -no-undefined
+libprotoc_la_LDFLAGS = -version-info 9:1:0 -export-dynamic -no-undefined
 libprotoc_la_SOURCES =                                         \
   google/protobuf/compiler/code_generator.cc                   \
   google/protobuf/compiler/command_line_interface.cc           \