google-protobuf 3.2.0-x86-linux → 3.2.0.1-x86-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cc0bb6a8565671d21ece06111e67b946fc5654a
-  data.tar.gz: ef9708bad40f0b2f0fc8e18d39f26608aa43ef6e
+  metadata.gz: 26b43b556fe74bd830eb9f87b35722a443eeb635
+  data.tar.gz: 241c9188cf49ec6ba541d2ddde53b4e809de5b11
 SHA512:
-  metadata.gz: 166119228c8683d2b09a68ae614e9a535662bf7c81a0e2e92b59c1e364a10b6ef31b5845f27a0b8d8c8bdcdadddb97662af484e8a3401652bd30573529c6cf96
-  data.tar.gz: c7349bd2a8e90420ea093ca0b9977c928c3dbb53e121437b2901978649ceecf3de6c933b6c296b6b1c9055c721d4040cb19f03e6533fd3e973c28371efe38505
+  metadata.gz: e1310067d1850dffbcb5fc7667949d1affc312d874e8defbeb414b5e2126a094235201c5924df86f5de4b58fb1eda880d5280a73e6e1de0ab788180e2ca41761
+  data.tar.gz: 8ce9f6daca93874481d3f22b6c074ee93803b1eb96066e8a2c37269589b6a561129d61869b2eedd23d6a0393962281018012e2ce0392298b3ff8a0e00fe393ba

data/ext/google/protobuf_c/extconf.rb

@@ -4,7 +4,14 @@ require 'mkmf'
 
 $CFLAGS += " -std=c99 -O3 -DNDEBUG"
 
+
+if RUBY_PLATFORM =~ /linux/
+  # Instruct the linker to point memcpy calls at our __wrap_memcpy wrapper.
+  $LDFLAGS += " -Wl,-wrap,memcpy"
+end
+
 $objs = ["protobuf.o", "defs.o", "storage.o", "message.o",
-         "repeated_field.o", "map.o", "encode_decode.o", "upb.o"]
+         "repeated_field.o", "map.o", "encode_decode.o", "upb.o",
+         "wrap_memcpy.o"]
 
 create_makefile("google/protobuf_c")

data/ext/google/protobuf_c/wrap_memcpy.c

@@ -0,0 +1,51 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2017 Google Inc.  All rights reserved.
+// 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
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include <string.h>
+
+// On x86-64 Linux, we link against the 2.2.5 version of memcpy so that we
+// avoid depending on the 2.14 version of the symbol. This way, distributions
+// that are using pre-2.14 versions of glibc can successfully use the gem we
+// distribute (https://github.com/google/protobuf/issues/2783).
+//
+// This wrapper is enabled by passing the linker flags -Wl,-wrap,memcpy in
+// extconf.rb.
+#ifdef __linux__
+#ifdef __x86_64__
+__asm__(".symver memcpy,memcpy@GLIBC_2.2.5");
+void *__wrap_memcpy(void *dest, const void *src, size_t n) {
+    return memcpy(dest, src, n);
+}
+#else
+void *__wrap_memcpy(void *dest, const void *src, size_t n) {
+    return memmove(dest, src, n);
+}
+#endif
+#endif

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-protobuf
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.0.1
 platform: x86-linux
 authors:
 - Protobuf Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2017-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
@@ -89,6 +89,7 @@ files:
 - ext/google/protobuf_c/storage.c
 - ext/google/protobuf_c/upb.c
 - ext/google/protobuf_c/upb.h
+- ext/google/protobuf_c/wrap_memcpy.c
 - lib/google/2.0/protobuf_c.so
 - lib/google/2.1/protobuf_c.so
 - lib/google/2.2/protobuf_c.so