From 73a7e4615dd56b69ab6cf5810806b50fed28e9e7 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay@vrfy.org>
Date: Wed, 17 Jun 2015 15:53:56 +0200
Subject: [PATCH] libsystemd: remove list of symbols to export only in the
 future

---
 Makefile.am                                   | 10 +----
 src/libsystemd/.gitignore                     |  1 -
 .../{libsystemd.sym.m4 => libsystemd.sym}     | 38 -------------------
 3 files changed, 2 insertions(+), 47 deletions(-)
 rename src/libsystemd/{libsystemd.sym.m4 => libsystemd.sym} (93%)

diff --git a/Makefile.am b/Makefile.am
index 2a79a2a6833..9f74cc7b27c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2841,6 +2841,7 @@ libsystemd_internal_la_SOURCES = \
 	src/systemd/sd-network.h \
 	src/systemd/sd-hwdb.h \
 	src/systemd/sd-device.h \
+	src/libsystemd/libsystemd.sym \
 	src/libsystemd/sd-bus/sd-bus.c \
 	src/libsystemd/sd-bus/bus-control.c \
 	src/libsystemd/sd-bus/bus-control.h \
@@ -2917,9 +2918,6 @@ libsystemd_internal_la_SOURCES = \
 	src/libsystemd/sd-resolve/sd-resolve.c \
 	src/libsystemd/sd-resolve/resolve-util.h
 
-nodist_libsystemd_internal_la_SOURCES = \
-	src/libsystemd/libsystemd.sym
-
 libsystemd_internal_la_LIBADD = \
 	libbasic.la \
 	-lresolv
@@ -2928,14 +2926,10 @@ noinst_LTLIBRARIES += \
 	libsystemd-internal.la
 
 EXTRA_DIST += \
-	src/libsystemd/libsystemd.sym.m4 \
 	src/libsystemd/libsystemd.pc.in \
 	src/libsystemd/sd-bus/DIFFERENCES \
 	src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
 
-BUILT_SOURCES += \
-	src/libsystemd/libsystemd.sym
-
 libsystemd_la_SOURCES = \
 	$(libsystemd_internal_la_SOURCES) \
 	$(libsystemd_journal_internal_la_SOURCES)
@@ -2950,7 +2944,7 @@ libsystemd_la_CFLAGS = \
 libsystemd_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	-version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \
-	-Wl,--version-script=$(top_builddir)/src/libsystemd/libsystemd.sym
+	-Wl,--version-script=$(top_srcdir)/src/libsystemd/libsystemd.sym
 
 libsystemd_la_LIBADD = \
 	$(libsystemd_internal_la_LIBADD) \
diff --git a/src/libsystemd/.gitignore b/src/libsystemd/.gitignore
index d48e1cdd136..50a16923745 100644
--- a/src/libsystemd/.gitignore
+++ b/src/libsystemd/.gitignore
@@ -1,2 +1 @@
-/libsystemd.sym
 /libsystemd.pc
diff --git a/src/libsystemd/libsystemd.sym.m4 b/src/libsystemd/libsystemd.sym
similarity index 93%
rename from src/libsystemd/libsystemd.sym.m4
rename to src/libsystemd/libsystemd.sym
index 3121e712825..809db1f6cc3 100644
--- a/src/libsystemd/libsystemd.sym.m4
+++ b/src/libsystemd/libsystemd.sym
@@ -459,41 +459,3 @@ global:
         sd_event_source_get_signal;
         sd_event_source_get_child_pid;
 } LIBSYSTEMD_220;
-
-m4_ifdef(`ENABLE_KDBUS',
-LIBSYSTEMD_FUTURE {
-global:
-        /* sd-utf8 */
-        sd_utf8_is_valid;
-        sd_ascii_is_valid;
-
-        /* sd-resolve */
-        sd_resolve_default;
-        sd_resolve_new;
-        sd_resolve_ref;
-        sd_resolve_unref;
-        sd_resolve_get_fd;
-        sd_resolve_get_events;
-        sd_resolve_get_timeout;
-        sd_resolve_process;
-        sd_resolve_wait;
-        sd_resolve_get_tid;
-        sd_resolve_attach_event;
-        sd_resolve_detach_event;
-        sd_resolve_get_event;
-        sd_resolve_getaddrinfo;
-        sd_resolve_getnameinfo;
-        sd_resolve_res_query;
-        sd_resolve_res_search;
-        sd_resolve_query_ref;
-        sd_resolve_query_unref;
-        sd_resolve_query_is_done;
-        sd_resolve_query_get_userdata;
-        sd_resolve_query_set_userdata;
-        sd_resolve_query_get_resolve;
-
-        /* sd-path */
-        sd_path_home;
-        sd_path_search;
-} LIBSYSTEMD_220;
-)