[arch-commits] Commit in udev/trunk (PKGBUILD bluetooth.patch)

[Tom Gundersen]

    Date: Wednesday, October 19, 2011 @ 17:50:08
  Author: tomegun
Revision: 140823

upgpkg: udev 174-1

upstream release

Modified:
  udev/trunk/PKGBUILD
Deleted:
  udev/trunk/bluetooth.patch

-----------------+
 PKGBUILD        |   19 +++++++++----------
 bluetooth.patch |   36 ------------------------------------
 2 files changed, 9 insertions(+), 46 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-10-19 21:36:39 UTC (rev 140822)
+++ PKGBUILD	2011-10-19 21:50:08 UTC (rev 140823)
@@ -6,24 +6,21 @@
 
 pkgbase="udev"
 pkgname=('udev' 'udev-compat')
-pkgver=173
-pkgrel=3
+pkgver=174
+pkgrel=1
 arch=(i686 x86_64)
 url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
 license=('GPL')
 groups=('base')
 options=(!makeflags !libtool)
 makedepends=('gobject-introspection' 'gperf')
-source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2
-	bluetooth.patch
+#source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2
+source=(http://people.freedesktop.org/~kay/$pkgbase-$pkgver.tar.bz2
         81-arch.rules)
 
 build() {
   cd $srcdir/$pkgbase-$pkgver
 
-  # fix https://bugs.archlinux.org/task/25356 (submitted upstream)
-  patch -Np1 -i ../bluetooth.patch
-
   ./configure --sysconfdir=/etc\
               --with-rootlibdir=/lib\
               --libexecdir=/lib/udev\
@@ -59,6 +56,9 @@
   mknod -m 0660 ${pkgdir}/lib/udev/devices/loop0 b 7 0
   chgrp disk ${pkgdir}/lib/udev/devices/loop0
 
+  # udevd moved, symlink to make life easy for restarting udevd manually
+  ln -s /lib/udev/udevd ${pkgdir}/sbin/udevd
+
   # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
   for i in $pkgdir/lib/udev/rules.d/*.rules; do
     sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g;
@@ -97,6 +97,5 @@
   # /dev/ppp
   mknod -m 0600 ${pkgdir}/lib/udev/devices/ppp c 108 0
 }
-md5sums=('91a88a359b60bbd074b024883cc0dbde'
-         '36cb9bfb55a8d931b7498d2e46730745'
-         'ec529eb1ddaabb70c61b38f80bb8462a')
+md5sums=('3b84706046a33d7a7e00491a1136804d'
+         '3da2bb9891592f9438a07bd641465531')

Deleted: bluetooth.patch
===================================================================
--- bluetooth.patch	2011-10-19 21:36:39 UTC (rev 140822)
+++ bluetooth.patch	2011-10-19 21:50:08 UTC (rev 140823)
@@ -1,36 +0,0 @@
-From 7462d61442f606cc118722e0572ac8db48fa2540 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas at archlinux.org>
-Date: Tue, 2 Aug 2011 10:56:33 +0200
-Subject: [PATCH] rules: input - fix detection of bluetooth hid devices in
- Xorg
-
-Commit c49df20758e0f22778cfc93b598f2929f4c86272 prevented udev from
-creating broken symlinks for bluetooth hid devices. Unfortunately,
-it also removed the ID_INPUT=1 and ID_INPUT_{KEY,MOUSE}=1 properties
-from those devices. Xorg relies on these properties for cold- and
-hotplugging of input devices.
-
-With this patch, udev still omits the broken symlinks, but also
-imports the input_id properties again.
----
- rules/rules.d/60-persistent-input.rules |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/rules/rules.d/60-persistent-input.rules b/rules/rules.d/60-persistent-input.rules
-index 65a6381..28d50d2 100644
---- a/rules/rules.d/60-persistent-input.rules
-+++ b/rules/rules.d/60-persistent-input.rules
-@@ -2,9 +2,9 @@
- 
- ACTION=="remove", GOTO="persistent_input_end"
- SUBSYSTEM!="input", GOTO="persistent_input_end"
--SUBSYSTEMS=="bluetooth", GOTO="persistent_input_end"
- 
- ENV{ID_INPUT}=="", IMPORT{program}="input_id %p"
-+SUBSYSTEMS=="bluetooth", GOTO="persistent_input_end"
- SUBSYSTEMS=="usb", ENV{ID_BUS}=="", IMPORT{program}="usb_id --export %p"
- 
- # determine class name for persistent symlinks
--- 
-1.7.6
-