Merge ~mir-team/protobuf/+git/protobuf-xenial:hide-unnecessary-symbols into ~mir-team/protobuf/+git/protobuf-xenial:bileto

[Alexandros Frantzis]

diff --git a/debian/changelog b/debian/changelog
index 3d1951c..01d2515 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+protobuf (2.6.1-1.3ubuntu1) UNRELEASED; urgency=medium
+
+  * debian/patches/Hide-unnecessary-exported-library-symbols.patch:
+    - Backport upstream fix to hide unnecessary exported symbols
+      (LP: #1667352)
+
+ -- Alexandros Frantzis <[e-mail]>  Thu, 16 Mar 2017 14:06:01 +0200
+
 protobuf (2.6.1-1.3) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/patches/Hide-unnecessary-exported-library-symbols.patch b/debian/patches/Hide-unnecessary-exported-library-symbols.patch
 new file mode 100644
index 0000000..49e9d17
--- /dev/null
+++ b/debian/patches/Hide-unnecessary-exported-library-symbols.patch
@@ -0,0 +1,114 @@
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/protobuf/+bug/1667352 
+Origin: backport, https://github.com/google/protobuf/commit/c57c77b4b7b065a0f14c757f5b8983e136511067
+Author: Alexandros Frantzis <[e-mail]>
+Description: Hide unnecessary exported library symbols
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -74,6 +74,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 <<EOF
++{
++  global:
++    main;
++  local:
++    *;
++};
++EOF
++AC_LINK_IFELSE(
++  [AC_LANG_SOURCE([int main() { return 0; }])],
++  [have_ld_version_script=yes; AC_MSG_RESULT(yes)],
++  [have_ld_version_script=no; AC_MSG_RESULT(no)])
++LDFLAGS=$save_LDFLAGS
++AM_CONDITIONAL([HAVE_LD_VERSION_SCRIPT], [test "$have_ld_version_script" == "yes"])
++
+ # Checks for header files.
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h stdlib.h unistd.h])
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -97,6 +97,10 @@ lib_LTLIBRARIES = libprotobuf-lite.la li
+ 
+ libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS)
+ libprotobuf_lite_la_LDFLAGS = -version-info 9:1:0 -export-dynamic -no-undefined
++if HAVE_LD_VERSION_SCRIPT
++libprotobuf_lite_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotobuf-lite.map
++EXTRA_libprotobuf_lite_la_DEPENDENCIES = libprotobuf-lite.map
++endif
+ libprotobuf_lite_la_SOURCES =                                  \
+   google/protobuf/stubs/atomicops_internals_x86_gcc.cc         \
+   google/protobuf/stubs/atomicops_internals_x86_msvc.cc        \
+@@ -119,6 +123,10 @@ libprotobuf_lite_la_SOURCES =
+ 
+ libprotobuf_la_LIBADD = $(PTHREAD_LIBS)
+ libprotobuf_la_LDFLAGS = -version-info 9:1:0 -export-dynamic -no-undefined
++if HAVE_LD_VERSION_SCRIPT
++libprotobuf_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotobuf.map
++EXTRA_libprotobuf_la_DEPENDENCIES = libprotobuf.map
++endif
+ libprotobuf_la_SOURCES =                                       \
+   $(libprotobuf_lite_la_SOURCES)                               \
+   google/protobuf/stubs/strutil.cc                             \
+@@ -148,6 +156,10 @@ libprotobuf_la_SOURCES =
+ 
+ libprotoc_la_LIBADD = $(PTHREAD_LIBS) libprotobuf.la
+ libprotoc_la_LDFLAGS = -version-info 9:1:0 -export-dynamic -no-undefined
++if HAVE_LD_VERSION_SCRIPT
++libprotoc_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotoc.map
++EXTRA_libprotoc_la_DEPENDENCIES = libprotoc.map
++endif
+ libprotoc_la_SOURCES =                                         \
+   google/protobuf/compiler/code_generator.cc                   \
+   google/protobuf/compiler/command_line_interface.cc           \
+@@ -259,6 +271,9 @@ EXTRA_DIST =
+   google/protobuf/io/package_info.h                            \
+   google/protobuf/compiler/package_info.h                      \
+   google/protobuf/compiler/zip_output_unittest.sh              \
++  libprotobuf-lite.map                                         \
++  libprotobuf.map                                              \
++  libprotoc.map                                                \
+   google/protobuf/unittest_enormous_descriptor.proto
+ 
+ protoc_lite_outputs =                                          \
+--- /dev/null
++++ b/src/libprotobuf-lite.map
+@@ -0,0 +1,9 @@
++{
++  global:
++    extern "C++" {
++      *google*;
++    };
++
++  local:
++    *;
++};
+--- /dev/null
++++ b/src/libprotobuf.map
+@@ -0,0 +1,9 @@
++{
++  global:
++    extern "C++" {
++      *google*;
++    };
++
++  local:
++    *;
++};
+--- /dev/null
++++ b/src/libprotoc.map
+@@ -0,0 +1,9 @@
++{
++  global:
++    extern "C++" {
++      *google*;
++    };
++
++  local:
++    *;
++};
diff --git a/debian/patches/series b/debian/patches/series
index 7bb8252..f4d82ca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 debian-changes
+Hide-unnecessary-exported-library-symbols.patch