From b3f419ab8816f125161fb6568f844f90c846ad6f Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 7 Apr 2016 14:41:58 -0400 Subject: [PATCH] pentoo-system: unfork bluez --- net-wireless/bluez/Manifest | 1 - net-wireless/bluez/bluez-5.35-r1.ebuild | 218 ------------------ ...d-without-systemd-in-the-user-sessio.patch | 58 ----- ...-helper-function-to-manipulate-paths.patch | 38 --- ...0002-autopair-Don-t-handle-the-iCade.patch | 47 ---- ...-agent-Assert-possible-infinite-loop.patch | 25 -- net-wireless/bluez/files/bluetooth-init.d-r3 | 21 -- net-wireless/bluez/files/bluez-plugdev.patch | 14 -- .../bluez/files/bluez-udevadm-path.patch | 10 - net-wireless/bluez/files/rfcomm-init.d-r2 | 35 --- net-wireless/bluez/metadata.xml | 21 -- ....ebuild => pentoo-system-2016.2-r1.ebuild} | 2 +- 12 files changed, 1 insertion(+), 489 deletions(-) delete mode 100644 net-wireless/bluez/Manifest delete mode 100644 net-wireless/bluez/bluez-5.35-r1.ebuild delete mode 100644 net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch delete mode 100644 net-wireless/bluez/files/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch delete mode 100644 net-wireless/bluez/files/0002-autopair-Don-t-handle-the-iCade.patch delete mode 100644 net-wireless/bluez/files/0004-agent-Assert-possible-infinite-loop.patch delete mode 100644 net-wireless/bluez/files/bluetooth-init.d-r3 delete mode 100644 net-wireless/bluez/files/bluez-plugdev.patch delete mode 100644 net-wireless/bluez/files/bluez-udevadm-path.patch delete mode 100644 net-wireless/bluez/files/rfcomm-init.d-r2 delete mode 100644 net-wireless/bluez/metadata.xml rename pentoo/pentoo-system/{pentoo-system-2016.2.ebuild => pentoo-system-2016.2-r1.ebuild} (99%) diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest deleted file mode 100644 index e18b44cde..000000000 --- a/net-wireless/bluez/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST bluez-5.35.tar.xz 1643068 SHA256 1afee054644a8b1753ac98d7ad5cd95681a38f5c4cbb1b4bb3ceaa078bf8f0e2 SHA512 33850a01e135f14015295f0eb9b578c515d180d24441b89dff545ec7c0ce8dad5fa321e20918ed6285edaa386375b4ed5688cb17bbfaf4db0742f6d6a72eec6d WHIRLPOOL e334e0e9b37f823eb348cf1679e010567893a73941533a5dc12b598f3b3c845d82f15b3b79e106a7fc4c4344a204a2205fa96509e61d7e61b6ec9f413d650356 diff --git a/net-wireless/bluez/bluez-5.35-r1.ebuild b/net-wireless/bluez/bluez-5.35-r1.ebuild deleted file mode 100644 index 4a95141a6..000000000 --- a/net-wireless/bluez/bluez-5.35-r1.ebuild +++ /dev/null @@ -1,218 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) - -inherit autotools eutils multilib python-single-r1 readme.gentoo systemd udev user multilib-minimal - -DESCRIPTION="Bluetooth Tools and System Daemons for Linux" -HOMEPAGE="http://www.bluez.org" -SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0/3" -KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86" -IUSE="cups doc debug +obex pentoo +readline selinux systemd test test-programs +udev" -REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} ) test-programs? ( ${PYTHON_REQUIRED_USE} )" - -CDEPEND=" - >=dev-libs/glib-2.28:2 - >=sys-apps/dbus-1.6:= - >=sys-apps/hwids-20121202.2 - cups? ( net-print/cups:= ) - obex? ( dev-libs/libical:= ) - readline? ( sys-libs/readline:= ) - systemd? ( sys-apps/systemd ) - udev? ( >=virtual/udev-172 ) - abi_x86_32? ( - ! -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/net-wireless/bluez/files/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch b/net-wireless/bluez/files/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch deleted file mode 100644 index 004a3895a..000000000 --- a/net-wireless/bluez/files/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch +++ /dev/null @@ -1,38 +0,0 @@ -From f7861d27fbcbc519f57d8496aa9486f487908821 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Sat, 9 Nov 2013 18:13:43 +0100 -Subject: [PATCH 1/5] obex: Use GLib helper function to manipulate paths - -Instead of trying to do it by hand. This also makes sure that -relative paths aren't used by the agent. ---- - obexd/src/manager.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/obexd/src/manager.c b/obexd/src/manager.c -index cec8a39..f18896e 100644 ---- a/obexd/src/manager.c -+++ b/obexd/src/manager.c -@@ -651,14 +651,14 @@ static void agent_reply(DBusPendingCall *call, void *user_data) - DBUS_TYPE_STRING, &name, - DBUS_TYPE_INVALID)) { - /* Splits folder and name */ -- const char *slash = strrchr(name, '/'); -+ gboolean is_relative = !g_path_is_absolute(name); - DBG("Agent replied with %s", name); -- if (!slash) { -- agent->new_name = g_strdup(name); -+ if (is_relative) { -+ agent->new_name = g_path_get_basename(name); - agent->new_folder = NULL; - } else { -- agent->new_name = g_strdup(slash + 1); -- agent->new_folder = g_strndup(name, slash - name); -+ agent->new_name = g_path_get_basename(name); -+ agent->new_folder = g_path_get_dirname(name); - } - } - --- -1.8.4.2 - diff --git a/net-wireless/bluez/files/0002-autopair-Don-t-handle-the-iCade.patch b/net-wireless/bluez/files/0002-autopair-Don-t-handle-the-iCade.patch deleted file mode 100644 index 68751ae7b..000000000 --- a/net-wireless/bluez/files/0002-autopair-Don-t-handle-the-iCade.patch +++ /dev/null @@ -1,47 +0,0 @@ -From c16ae7041c7511d8d1ed8441f696716fa6a9117e Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Tue, 19 Nov 2013 14:11:39 +0100 -Subject: [PATCH 2/5] autopair: Don't handle the iCade - -We can't easily enter digits other than 1 through 4 (inclusive) -so leave it up to the agent to figure out a good passcode -for the iCade. - -Note that we can not use the VID/PID of the device, as it is not -yet known at that point. ---- - plugins/autopair.c | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/plugins/autopair.c b/plugins/autopair.c -index 8c98c12..5d2f6f7 100644 ---- a/plugins/autopair.c -+++ b/plugins/autopair.c -@@ -57,13 +57,23 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter, - { - char addr[18]; - char pinstr[7]; -+ char name[25]; - uint32_t class; - - ba2str(device_get_address(device), addr); - - class = btd_device_get_class(device); - -- DBG("device %s 0x%x", addr, class); -+ device_get_name(device, name, sizeof(name)); -+ name[sizeof(name) - 1] = 0; -+ -+ DBG("device %s (%s) 0x%x", addr, name, class); -+ -+ g_message ("vendor 0x%X product: 0x%X", btd_device_get_vendor (device), btd_device_get_product (device)); -+ -+ /* The iCade shouldn't use random PINs like normal keyboards */ -+ if (name != NULL && strstr(name, "iCade") != NULL) -+ return 0; - - /* This is a class-based pincode guesser. Ignore devices with an - * unknown class. --- -1.8.4.2 - diff --git a/net-wireless/bluez/files/0004-agent-Assert-possible-infinite-loop.patch b/net-wireless/bluez/files/0004-agent-Assert-possible-infinite-loop.patch deleted file mode 100644 index 2746e0cdd..000000000 --- a/net-wireless/bluez/files/0004-agent-Assert-possible-infinite-loop.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 67e5477687a2753d3f7b300bcfdc74464d8ad41f Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 9 Dec 2013 18:04:56 +0100 -Subject: [PATCH 4/5] agent: Assert possible infinite loop - ---- - src/agent.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/agent.c b/src/agent.c -index bcba969..b292881 100644 ---- a/src/agent.c -+++ b/src/agent.c -@@ -203,6 +203,8 @@ void agent_unref(struct agent *agent) - if (agent->ref > 0) - return; - -+ g_assert (agent->ref == 0); -+ - if (agent->request) { - DBusError err; - agent_pincode_cb pincode_cb; --- -1.8.4.2 - diff --git a/net-wireless/bluez/files/bluetooth-init.d-r3 b/net-wireless/bluez/files/bluetooth-init.d-r3 deleted file mode 100644 index 3b9569ee7..000000000 --- a/net-wireless/bluez/files/bluetooth-init.d-r3 +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() { - after coldplug - need dbus localmount hostname -} - -start() { - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --background --exec /usr/libexec/bluetooth/bluetoothd - eend $? -} - -stop() { - ebegin "Shutting down ${SVCNAME}" - start-stop-daemon --stop --quiet --exec /usr/libexec/bluetooth/bluetoothd - eend $? -} diff --git a/net-wireless/bluez/files/bluez-plugdev.patch b/net-wireless/bluez/files/bluez-plugdev.patch deleted file mode 100644 index 726838a51..000000000 --- a/net-wireless/bluez/files/bluez-plugdev.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nurp bluez-4.39.orig/src/bluetooth.conf bluez-4.39/src/bluetooth.conf ---- bluez-4.39.orig/src/bluetooth.conf 2008-12-20 20:18:10.000000000 +0100 -+++ bluez-4.39/src/bluetooth.conf 2009-09-05 13:30:34.411581498 +0200 -@@ -17,6 +17,10 @@ - - - -+ -+ -+ -+ - - - diff --git a/net-wireless/bluez/files/bluez-udevadm-path.patch b/net-wireless/bluez/files/bluez-udevadm-path.patch deleted file mode 100644 index a29193ebb..000000000 --- a/net-wireless/bluez/files/bluez-udevadm-path.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- tools/hid2hci.rules~ 2012-12-24 18:46:55.000000000 +0100 -+++ tools/hid2hci.rules 2015-04-04 13:13:29.360300000 +0200 -@@ -20,6 +20,7 @@ - # Unfortunately the only event seen is the BT device disappearing, so the mouse - # device needs to be chased down on the USB bus. - ATTR{bDeviceClass}=="e0", ATTR{bDeviceSubClass}=="01", ATTR{bDeviceProtocol}=="01", ATTR{idVendor}=="413c", \ -+ ENV{REMOVE_CMD}="/usr/bin/udevadm trigger --action=change --subsystem-match=usb --property-match=HID2HCI_SWITCH=1" \ - ENV{REMOVE_CMD}="/sbin/udevadm trigger --action=change --subsystem-match=usb --property-match=HID2HCI_SWITCH=1" - - # CSR devices diff --git a/net-wireless/bluez/files/rfcomm-init.d-r2 b/net-wireless/bluez/files/rfcomm-init.d-r2 deleted file mode 100644 index 4a9191691..000000000 --- a/net-wireless/bluez/files/rfcomm-init.d-r2 +++ /dev/null @@ -1,35 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() { - need bluetooth -} - -checkconfig() { - if [ -z "${ADDRESS}" ]; then - eerror "ADDRESS must be set" - return 1 - fi - - return 0 -} - -start() { - local DEVICE=${RC_SVCNAME#*.} - - checkconfig || return 1 - - ebegin "Starting ${RC_SVCNAME}" - rfcomm bind "${DEVICE}" "${ADDRESS}" ${CHANNEL} - eend $? -} - -stop() { - local DEVICE=${RC_SVCNAME#*.} - - ebegin "Shutting down ${RC_SVCNAME}" - rfcomm release "${DEVICE}" - eend $? -} diff --git a/net-wireless/bluez/metadata.xml b/net-wireless/bluez/metadata.xml deleted file mode 100644 index 16795cb7e..000000000 --- a/net-wireless/bluez/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - zerochaos@gentoo.org - Zero_Chaos - - - Install tools for testing of - various Bluetooth functions - The HID proxying makes the keyboard / mouse show up - as regular USB HID devices, but needs them to be - paired before enabling this, otherwise they won't be - detected - Enable OBEX transfer support. - - - cpe:/a:bluez:bluez - cpe:/a:bluez:bluez-libs - - diff --git a/pentoo/pentoo-system/pentoo-system-2016.2.ebuild b/pentoo/pentoo-system/pentoo-system-2016.2-r1.ebuild similarity index 99% rename from pentoo/pentoo-system/pentoo-system-2016.2.ebuild rename to pentoo/pentoo-system/pentoo-system-2016.2-r1.ebuild index d26a96d15..cb78e155f 100644 --- a/pentoo/pentoo-system/pentoo-system-2016.2.ebuild +++ b/pentoo/pentoo-system/pentoo-system-2016.2-r1.ebuild @@ -101,7 +101,7 @@ PDEPEND="${PDEPEND} net-misc/dhcpcd net-misc/mosh net-misc/vconfig - net-wireless/bluez[pentoo(-)] + net-wireless/bluez net-wireless/wireless-tools net-wireless/wpa_supplicant net-wireless/iw