diff options
| author | Ladislav Hagara | 2009-12-05 10:48:02 +0100 |
|---|---|---|
| committer | Ladislav Hagara | 2009-12-05 10:48:02 +0100 |
| commit | 4b3b29fb81fe82c0d6cf18a74e86461c752e4a70 (patch) | |
| tree | 71fe36d7211a5f70110b4b39f0637c084d760c54 | |
| parent | 052ccd5d522ce7d495abec655fff1da3e3d33bc0 (diff) | |
udev 149
| -rwxr-xr-x | disk/udev/DETAILS | 4 | ||||
| -rw-r--r-- | disk/udev/HISTORY | 4 | ||||
| -rwxr-xr-x | disk/udev/PRE_BUILD | 2 | ||||
| -rw-r--r-- | disk/udev/mice.diff | 29 |
4 files changed, 6 insertions, 33 deletions
diff --git a/disk/udev/DETAILS b/disk/udev/DETAILS index ee90f3d04b..d175db66f7 100755 --- a/disk/udev/DETAILS +++ b/disk/udev/DETAILS @@ -1,6 +1,6 @@ SPELL=udev - VERSION=148 - PATCHLEVEL=1 + VERSION=149 + PATCHLEVEL=0 SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE2=$SOURCE.sign SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY index 53d2271c41..c6a7612722 100644 --- a/disk/udev/HISTORY +++ b/disk/udev/HISTORY @@ -1,3 +1,7 @@ +2009-12-05 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 149 + * PRE_BUILD, mice.diff: removed patch + 2009-12-03 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: PATCHLEVEL++ * mice.diff: added, upstream patch diff --git a/disk/udev/PRE_BUILD b/disk/udev/PRE_BUILD index a0cf0973e3..a91dd92f02 100755 --- a/disk/udev/PRE_BUILD +++ b/disk/udev/PRE_BUILD @@ -15,6 +15,4 @@ else default_pre_build && cd "$SOURCE_DIRECTORY" fi && -# -patch -p1 < $SPELL_DIRECTORY/mice.diff && sed -i "s:install-dist_udevconfDATA::g" Makefile.in diff --git a/disk/udev/mice.diff b/disk/udev/mice.diff deleted file mode 100644 index c3c390f1e7..0000000000 --- a/disk/udev/mice.diff +++ /dev/null @@ -1,29 +0,0 @@ -From 22f9cb51c39a6fef1109bfd24e97d2fdda327a9e Mon Sep 17 00:00:00 2001 -From: Martin Pitt <martin.pitt@ubuntu.com> -Date: Thu, 3 Dec 2009 10:16:49 +0100 -Subject: [PATCH] input_id: Fix endless loop for non-input devices - -When being called on a device which is not in the "input" subsystem, or doesn't -have an "input" parent, it got stuck in an endless loop. Unfortunately this -includes the virtual/input/mice multiplexer, which exposes this bug on just -about every system. ---- - extras/input_id/input_id.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/extras/input_id/input_id.c b/extras/input_id/input_id.c -index 3754cde..fededa3 100644 ---- a/extras/input_id/input_id.c -+++ b/extras/input_id/input_id.c -@@ -143,7 +143,7 @@ int main (int argc, char** argv) - - /* walk up the parental chain until we find the real input device; the - * argument is very likely a subdevice of this, like eventN */ -- while (udev_device_get_sysattr_value(dev, "capabilities/key") == NULL) -+ while (dev != NULL && udev_device_get_sysattr_value(dev, "capabilities/key") == NULL) - dev = udev_device_get_parent(dev); - - /* Use this as a flag that input devices were detected, so that this --- -1.6.5.1 - |