From ce0749ac07cc7e9e4d5f67d21445a8c11290cb93 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 29 Apr 2016 15:08:16 +0000 Subject: bluez: update to 5.39 --- ...obexd-without-systemd-in-the-user-session.patch | 59 ---------------------- abs/extra/bluez/PKGBUILD | 24 ++++----- abs/extra/bluez/bluez.install | 15 ------ 3 files changed, 9 insertions(+), 89 deletions(-) delete mode 100644 abs/extra/bluez/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch delete mode 100644 abs/extra/bluez/bluez.install diff --git a/abs/extra/bluez/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch b/abs/extra/bluez/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch deleted file mode 100644 index fe3c513..0000000 --- a/abs/extra/bluez/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001 -From: Giovanni Campagna -Date: Sat, 12 Oct 2013 17:45:25 +0200 -Subject: [PATCH] Allow using obexd without systemd in the user session - -Not all sessions run systemd --user (actually, the majority -doesn't), so the dbus daemon must be able to spawn obexd -directly, and to do so it needs the full path of the daemon. ---- - Makefile.obexd | 4 ++-- - obexd/src/org.bluez.obex.service | 4 ---- - obexd/src/org.bluez.obex.service.in | 4 ++++ - 3 files changed, 6 insertions(+), 6 deletions(-) - delete mode 100644 obexd/src/org.bluez.obex.service - create mode 100644 obexd/src/org.bluez.obex.service.in - -diff --git a/Makefile.obexd b/Makefile.obexd -index 3760867..142e7c3 100644 ---- a/Makefile.obexd -+++ b/Makefile.obexd -@@ -2,12 +2,12 @@ - if SYSTEMD - systemduserunitdir = @SYSTEMD_USERUNITDIR@ - systemduserunit_DATA = obexd/src/obex.service -+endif - - dbussessionbusdir = @DBUS_SESSIONBUSDIR@ - dbussessionbus_DATA = obexd/src/org.bluez.obex.service --endif - --EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service -+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in - - obex_plugindir = $(libdir)/obex/plugins - -diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service -deleted file mode 100644 -index a538088..0000000 ---- a/obexd/src/org.bluez.obex.service -+++ /dev/null -@@ -1,4 +0,0 @@ --[D-BUS Service] --Name=org.bluez.obex --Exec=/bin/false --SystemdService=dbus-org.bluez.obex.service -diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in -new file mode 100644 -index 0000000..9c815f2 ---- /dev/null -+++ b/obexd/src/org.bluez.obex.service.in -@@ -0,0 +1,4 @@ -+[D-BUS Service] -+Name=org.bluez.obex -+Exec=@libexecdir@/obexd -+SystemdService=dbus-org.bluez.obex.service --- -1.8.3.1 - - diff --git a/abs/extra/bluez/PKGBUILD b/abs/extra/bluez/PKGBUILD index 3ea45a0..db1044c 100644 --- a/abs/extra/bluez/PKGBUILD +++ b/abs/extra/bluez/PKGBUILD @@ -5,29 +5,20 @@ pkgbase=bluez pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins') -pkgver=5.27 +pkgver=5.39 pkgrel=1 url="http://www.bluez.org/" arch=('i686' 'x86_64') license=('GPL2') makedepends=('dbus' 'libical' 'systemd') -source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.xz - 0001-Allow-using-obexd-without-systemd-in-the-user-session.patch +source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign} bluetooth.modprobe) # see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc -sha256sums=('fbf33cebc76f8c81f28f0d67c71a8a1ec4b04b087460ec7353f7e0c207a1f981' - '896a1403d9b7258c4fb0d41f3a6f70fd51eaa1115ab3f4259f3dbbe02b55766b' +sha256sums=('21d1bc9150d3576296595217efb98a746b592389d25d5637e8bee5da7272593b' + 'SKIP' '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4') validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann -prepare() { - cd $pkgname-$pkgver - # patch not upstreamable for obex file transfer - FS#37773 taken from FC - # http://www.hadess.net/2013/11/bluetooth-file-sharing-obexpush-in.html - patch -Np1 -i ${srcdir}/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch - autoreconf -vfi -} - build() { cd ${pkgname}-${pkgver} ./configure \ @@ -44,7 +35,7 @@ build() { check() { cd $pkgname-$pkgver - #make check + make check } @@ -75,11 +66,14 @@ package_bluez() { # fix module loading errors install -dm755 ${pkgdir}/usr/lib/modprobe.d install -Dm644 ${srcdir}/bluetooth.modprobe ${pkgdir}/usr/lib/modprobe.d/bluetooth-usb.conf + + # fix obex file transfer - https://bugs.archlinux.org/task/45816 + ln -fs /usr/lib/systemd/user/obex.service ${pkgdir}/usr/lib/systemd/user/dbus-org.bluez.obex.service } package_bluez-utils() { pkgdesc="Development and debugging utilities for the bluetooth protocol stack" - depends=('dbus' 'systemd') + depends=('dbus' 'systemd' 'glib2') conflicts=('bluez-hcidump') provides=('bluez-hcidump') replaces=('bluez-hcidump' 'bluez<=4.101') diff --git a/abs/extra/bluez/bluez.install b/abs/extra/bluez/bluez.install deleted file mode 100644 index 9cfe793..0000000 --- a/abs/extra/bluez/bluez.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - add_service.sh bluetoothd - echo ">>> Only the bluetoothd daemon is started by default." - echo ">>> You can optionally add the following as required:" - echo ">>> hidd dund pand sdpd rfcomm hid2hci" - echo ">>> $ sudo add_service.sh " -} - -pre_remove() { - for d in { bluetoothd,hidd,dund,pand,sdpd,rfcomm,hid2hci } ; do - if [ -d /var/service/${d} ] ; then - remove_service.sh $d - fi - done -} -- cgit v0.12