From 71a4de34de707ff88bbc2f7cbc2388d9356a01094186d93f6dfc8a81c501b8aa Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Mon, 11 Dec 2017 22:13:07 +0000 Subject: [PATCH 1/2] Accepting request 556306 from home:seife:testing add 0001-obexd-use-AM_LDFLAGS-for-linking.patch OBS-URL: https://build.opensuse.org/request/show/556306 OBS-URL: https://build.opensuse.org/package/show/Base:System/bluez?expand=0&rev=237 --- 0001-obexd-use-AM_LDFLAGS-for-linking.patch | 26 +++++++++++++++++++++ bluez.changes | 6 +++++ bluez.spec | 9 +++++-- 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 0001-obexd-use-AM_LDFLAGS-for-linking.patch diff --git a/0001-obexd-use-AM_LDFLAGS-for-linking.patch b/0001-obexd-use-AM_LDFLAGS-for-linking.patch new file mode 100644 index 0000000..d723ffc --- /dev/null +++ b/0001-obexd-use-AM_LDFLAGS-for-linking.patch @@ -0,0 +1,26 @@ +From b912306ae756eaf75caa1ab7e04e3112fac4a01c Mon Sep 17 00:00:00 2001 +From: Stefan Seyfried +Date: Mon, 11 Dec 2017 22:52:28 +0100 +Subject: [PATCH] obexd: use AM_LDFLAGS for linking + +without this, --enable-pie does not work for obexd +--- + Makefile.obexd | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.obexd b/Makefile.obexd +index 2e33cbc72..86c395305 100644 +--- a/Makefile.obexd ++++ b/Makefile.obexd +@@ -83,7 +83,7 @@ obexd_src_obexd_LDADD = lib/libbluetooth-internal.la \ + gdbus/libgdbus-internal.la \ + @ICAL_LIBS@ @DBUS_LIBS@ @GLIB_LIBS@ -ldl + +-obexd_src_obexd_LDFLAGS = -Wl,--export-dynamic ++obexd_src_obexd_LDFLAGS = $(AM_LDFLAGS) -Wl,--export-dynamic + + obexd_src_obexd_CFLAGS = $(AM_CFLAGS) @GLIB_CFLAGS@ @DBUS_CFLAGS@ \ + @ICAL_CFLAGS@ -DOBEX_PLUGIN_BUILTIN \ +-- +2.15.1 + diff --git a/bluez.changes b/bluez.changes index 6d41934..4d17caf 100644 --- a/bluez.changes +++ b/bluez.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 11 21:54:32 UTC 2017 - seife+obs@b1-systems.com + +- add 0001-obexd-use-AM_LDFLAGS-for-linking.patch +- avoid systemd dependency during %post + ------------------------------------------------------------------- Sun Sep 17 22:34:07 UTC 2017 - seife+obs@b1-systems.com diff --git a/bluez.spec b/bluez.spec index 6ed0969..95b462a 100644 --- a/bluez.spec +++ b/bluez.spec @@ -34,6 +34,8 @@ Patch2: bluez-sdp-unix-path.patch Patch3: bluez-cups-libexec.patch # workaround for broken tests (reported upstream but not yet fixed) Patch4: bluez-5.45-disable-broken-tests.diff +# PATCH-FIX-UPSTREAM: obexd not compiled with -fpie -- seife+obs@b1-systems.com +Patch5: 0001-obexd-use-AM_LDFLAGS-for-linking.patch BuildRequires: automake BuildRequires: flex BuildRequires: libtool @@ -51,6 +53,7 @@ BuildRequires: pkgconfig(libical) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(sndfile) BuildRequires: pkgconfig(udev) +Requires(post): coreutils Recommends: sbc Provides: bluez-utils = 3.36 Obsoletes: bluez-utils <= 3.36 @@ -136,6 +139,7 @@ desktop specific applets like blueman or GNOME or KDE applets). %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 mkdir dbus-apis cp -a doc/*.txt dbus-apis/ # FIXME: Change the dbus service to be a real service, not systemd launched @@ -207,8 +211,9 @@ make check V=0 %{fillup_only -n bluetooth} # We need the bluez systemd service enabled at any time. It won't start up # on it's own, as it is triggered by udev in the end (bnc#796671) -/bin/systemctl enable bluetooth.service 2>&1 || : -/bin/systemctl daemon-reload >/dev/null 2>&1 || : +install -d /etc/systemd/system/bluetooth.target.wants +ln -sf /usr/lib/systemd/system/bluetooth.service /etc/systemd/system/bluetooth.target.wants/bluetooth.service +ln -sf /usr/lib/systemd/system/bluetooth.service /etc/systemd/system/dbus-org.bluez.service %preun %service_del_preun bluetooth.service From 1cd5bc1f78fb058cb8cb3f81fb9a3ded9ea268b910ec3fda60a28e61e71d904a Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Tue, 12 Dec 2017 08:24:25 +0000 Subject: [PATCH 2/2] Accepting request 556389 from home:seife:testing document systemd dependency during %post OBS-URL: https://build.opensuse.org/request/show/556389 OBS-URL: https://build.opensuse.org/package/show/Base:System/bluez?expand=0&rev=238 --- bluez.changes | 4 ++-- bluez.spec | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/bluez.changes b/bluez.changes index 4d17caf..daf2518 100644 --- a/bluez.changes +++ b/bluez.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- -Mon Dec 11 21:54:32 UTC 2017 - seife+obs@b1-systems.com +Tue Dec 12 08:23:07 UTC 2017 - seife+obs@b1-systems.com - add 0001-obexd-use-AM_LDFLAGS-for-linking.patch -- avoid systemd dependency during %post +- document systemd dependency during %post ------------------------------------------------------------------- Sun Sep 17 22:34:07 UTC 2017 - seife+obs@b1-systems.com diff --git a/bluez.spec b/bluez.spec index 95b462a..1c1d2dd 100644 --- a/bluez.spec +++ b/bluez.spec @@ -53,7 +53,7 @@ BuildRequires: pkgconfig(libical) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(sndfile) BuildRequires: pkgconfig(udev) -Requires(post): coreutils +Requires(post): systemd Recommends: sbc Provides: bluez-utils = 3.36 Obsoletes: bluez-utils <= 3.36 @@ -211,9 +211,8 @@ make check V=0 %{fillup_only -n bluetooth} # We need the bluez systemd service enabled at any time. It won't start up # on it's own, as it is triggered by udev in the end (bnc#796671) -install -d /etc/systemd/system/bluetooth.target.wants -ln -sf /usr/lib/systemd/system/bluetooth.service /etc/systemd/system/bluetooth.target.wants/bluetooth.service -ln -sf /usr/lib/systemd/system/bluetooth.service /etc/systemd/system/dbus-org.bluez.service +/bin/systemctl enable bluetooth.service 2>&1 || : +/bin/systemctl daemon-reload >/dev/null 2>&1 || : %preun %service_del_preun bluetooth.service