From 79cb57993df5a4e07a4a7ba97b2c2ef1324a3460 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 14 Aug 2015 14:35:27 -0400 Subject: [PATCH] Link libdbus with -z now --- dbus-1.9.20-ldflags.patch | 13 +++++++++++++ dbus.spec | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 dbus-1.9.20-ldflags.patch diff --git a/dbus-1.9.20-ldflags.patch b/dbus-1.9.20-ldflags.patch new file mode 100644 index 0000000..c49bca4 --- /dev/null +++ b/dbus-1.9.20-ldflags.patch @@ -0,0 +1,13 @@ +I have no idea why autoblah isn't getting this right automatically. + +diff -up dbus-1.9.20/dbus/Makefile.am.jx dbus-1.9.20/dbus/Makefile.am +--- dbus-1.9.20/dbus/Makefile.am.jx 2015-07-21 12:46:00.000000000 -0400 ++++ dbus-1.9.20/dbus/Makefile.am 2015-08-14 14:30:32.413052818 -0400 +@@ -297,6 +297,7 @@ libdbus_1_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + $(SYMBOL_EXPORT_LDFLAGS) \ + -no-undefined \ ++ -Wl,-z,now \ + $(NULL) + + libdbus_internal_la_LIBADD=$(LIBDBUS_LIBS) libdbus-1.la diff --git a/dbus.spec b/dbus.spec index 7a5d10b..7875681 100644 --- a/dbus.spec +++ b/dbus.spec @@ -18,7 +18,7 @@ Name: dbus Epoch: 1 Version: 1.9.20 -Release: 1%{?dist} +Release: 2%{?dist} Summary: D-BUS message bus Group: System Environment/Libraries @@ -30,6 +30,8 @@ URL: http://www.freedesktop.org/Software/dbus/ Source0: http://dbus.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz Source1: 00-start-message-bus.sh +Patch0: dbus-1.9.20-ldflags.patch + BuildRequires: libtool BuildRequires: expat-devel >= %{expat_version} BuildRequires: libselinux-devel >= %{libselinux_version} @@ -119,6 +121,7 @@ in this separate package so server systems need not install X. %prep %setup -q -n %{name}-%{version} +%patch0 -p1 -b .ldflags %build @@ -333,6 +336,9 @@ popd %changelog +* Fri Aug 14 2015 Adam Jackson 1:1.9.20-2 +- Link libdbus with -z now + * Tue Aug 11 2015 David King - 1:1.9.20-1 - Update to 1.9.20