diff -Nru protobuf-3.0.0/debian/changelog protobuf-3.0.0/debian/changelog --- protobuf-3.0.0/debian/changelog 2016-12-10 10:09:06.000000000 +0200 +++ protobuf-3.0.0/debian/changelog 2017-03-16 12:10:45.000000000 +0200 @@ -1,3 +1,13 @@ +protobuf (3.0.0-9ubuntu2) zesty; urgency=low + + * debian/patches/Hide-unnecessary-exported-library-symbols.patch: + - Backport upstream fix to hide unnecessary exported symbols + (LP: #1667352) + * debian/patches/fix-reload.diff: + - Removed, not needed anymore. + + -- Alexandros Frantzis Thu, 16 Mar 2017 12:10:45 +0200 + protobuf (3.0.0-9ubuntu1) zesty; urgency=low * Merge from Debian unstable. Remaining changes: diff -Nru protobuf-3.0.0/debian/patches/fix-reload.diff protobuf-3.0.0/debian/patches/fix-reload.diff --- protobuf-3.0.0/debian/patches/fix-reload.diff 2016-09-08 15:18:58.000000000 +0300 +++ protobuf-3.0.0/debian/patches/fix-reload.diff 1970-01-01 02:00:00.000000000 +0200 @@ -1,30 +0,0 @@ -Index: b/src/google/protobuf/stubs/common.cc -=================================================================== ---- a/src/google/protobuf/stubs/common.cc -+++ b/src/google/protobuf/stubs/common.cc -@@ -412,7 +412,6 @@ Mutex* shutdown_functions_mutex = NULL; - GOOGLE_PROTOBUF_DECLARE_ONCE(shutdown_functions_init); - - void InitShutdownFunctions() { -- shutdown_functions = new vector; - shutdown_functions_mutex = new Mutex; - } - -@@ -423,6 +422,8 @@ inline void InitShutdownFunctionsOnce() - void OnShutdown(void (*func)()) { - InitShutdownFunctionsOnce(); - MutexLock lock(shutdown_functions_mutex); -+ if (internal::shutdown_functions == NULL) -+ shutdown_functions = new vector; - shutdown_functions->push_back(func); - } - -@@ -443,8 +444,6 @@ void ShutdownProtobufLibrary() { - } - delete internal::shutdown_functions; - internal::shutdown_functions = NULL; -- delete internal::shutdown_functions_mutex; -- internal::shutdown_functions_mutex = NULL; - } - - #if PROTOBUF_USE_EXCEPTIONS diff -Nru protobuf-3.0.0/debian/patches/Hide-unnecessary-exported-library-symbols.patch protobuf-3.0.0/debian/patches/Hide-unnecessary-exported-library-symbols.patch --- protobuf-3.0.0/debian/patches/Hide-unnecessary-exported-library-symbols.patch 1970-01-01 02:00:00.000000000 +0200 +++ protobuf-3.0.0/debian/patches/Hide-unnecessary-exported-library-symbols.patch 2017-03-16 12:00:26.000000000 +0200 @@ -0,0 +1,125 @@ +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/protobuf/+bug/1667352 +Origin: backport, https://github.com/google/protobuf/commit/c57c77b4b7b065a0f14c757f5b8983e136511067 +Author: Alexandros Frantzis +Description: Hide unnecessary exported library symbols + +--- a/configure.ac ++++ b/configure.ac +@@ -92,6 +92,25 @@ ACX_CHECK_SUNCC + # to the link + AC_PROG_LIBTOOL + ++# Check whether the linker supports version scripts ++AC_MSG_CHECKING([whether the linker supports version scripts]) ++save_LDFLAGS=$LDFLAGS ++LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map" ++cat > conftest.map <