From 792da457dba40190aabd3903c51d10c41349968d Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 13 Apr 2015 21:25:05 -0400
Subject: [PATCH] build: Use -fvisibility=hidden and explicit exports

This avoids symbol leakage.  Previously we were at risk of exporting
other random API from libpriv, as well as libglnx.
---
 Makefile-lib.am        |  3 ++-
 Makefile.am            |  3 ++-
 src/lib/rpmostree-db.h | 18 +++++++++---------
 src/lib/rpmostree.h    |  4 ++++
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/Makefile-lib.am b/Makefile-lib.am
index 2e09912a..0a0874f7 100644
--- a/Makefile-lib.am
+++ b/Makefile-lib.am
@@ -29,8 +29,9 @@ librpmostree_1_la_SOURCES = \
 	$(NULL)
 
 librpmostree_1_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/libglnx -I$(srcdir)/src/libpriv -I$(srcdir)/src/lib \
+	-fvisibility=hidden '-D_RPMOSTREE_EXTERN=__attribute((visibility("default"))) extern' \
 	$(PKGDEP_RPMOSTREE_CFLAGS)
-librpmostree_1_la_LDFLAGS = -version-number 1:0:0 -Bsymbolic-functions -export-symbols-regex '^rpm_ostree_'
+librpmostree_1_la_LDFLAGS = -version-number 1:0:0 -Bsymbolic-functions
 librpmostree_1_la_LIBADD = libglnx.la $(PKGDEP_RPMOSTREE_LIBS)
 
 if BUILDOPT_INTROSPECTION
diff --git a/Makefile.am b/Makefile.am
index 339c192a..0c3c4fa9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,8 @@ AM_CFLAGS += $(WARN_CFLAGS)
 EXTRA_DIST += autogen.sh COPYING
 
 libglnx_srcpath := $(srcdir)/libglnx
-libglnx_cflags := $(PKGDEP_GIO_UNIX_CFLAGS) -I$(libglnx_srcpath)
+libglnx_cflags := $(PKGDEP_GIO_UNIX_CFLAGS) -I$(libglnx_srcpath) -fvisibility=hidden
+libglnx_ldflags := 
 libglnx_libs := $(PKGDEP_GIO_UNIX_LIBS)
 
 include $(INTROSPECTION_MAKEFILE)
diff --git a/src/lib/rpmostree-db.h b/src/lib/rpmostree-db.h
index efaf684a..7ef76bb5 100644
--- a/src/lib/rpmostree-db.h
+++ b/src/lib/rpmostree-db.h
@@ -26,16 +26,16 @@ G_BEGIN_DECLS
 
 typedef struct RpmOstreeDbQueryResult RpmOstreeDbQueryResult;
 
-GType rpm_ostree_db_query_result_get_type (void);
-const char *const *rpm_ostree_db_query_result_get_packages (RpmOstreeDbQueryResult *queryresult);
+_RPMOSTREE_EXTERN GType rpm_ostree_db_query_result_get_type (void);
+_RPMOSTREE_EXTERN const char *const *rpm_ostree_db_query_result_get_packages (RpmOstreeDbQueryResult *queryresult);
 
-RpmOstreeDbQueryResult *rpm_ostree_db_query_ref (RpmOstreeDbQueryResult *result);
-void rpm_ostree_db_query_unref (RpmOstreeDbQueryResult *result);
+_RPMOSTREE_EXTERN RpmOstreeDbQueryResult *rpm_ostree_db_query_ref (RpmOstreeDbQueryResult *result);
+_RPMOSTREE_EXTERN void rpm_ostree_db_query_unref (RpmOstreeDbQueryResult *result);
 
-RpmOstreeDbQueryResult *rpm_ostree_db_query (OstreeRepo               *repo,
-                                             const char               *ref,
-                                             GVariant                 *query,
-                                             GCancellable             *cancellable,
-                                             GError                  **error);
+_RPMOSTREE_EXTERN RpmOstreeDbQueryResult *rpm_ostree_db_query (OstreeRepo               *repo,
+                                                               const char               *ref,
+                                                               GVariant                 *query,
+                                                               GCancellable             *cancellable,
+                                                               GError                  **error);
 
 G_END_DECLS
diff --git a/src/lib/rpmostree.h b/src/lib/rpmostree.h
index 7ff23614..abbfccc4 100644
--- a/src/lib/rpmostree.h
+++ b/src/lib/rpmostree.h
@@ -20,4 +20,8 @@
 
 #pragma once
 
+#ifndef _RPMOSTREE_EXTERN
+#define _RPMOSTREE_EXTERN extern
+#endif
+
 #include <rpmostree-db.h>