hal: Branch 'master' - 8 commits
Danny Kukawka
dkukawka at kemper.freedesktop.org
Mon Aug 23 08:10:21 PDT 2010
Makefile.am | 2 +-
hald/linux/device.c | 7 ++++---
hald/linux/osspec.c | 5 +++++
policy/Makefile.am | 2 +-
4 files changed, 11 insertions(+), 5 deletions(-)
New commits:
commit 0763f4900a32ac01d4b259fe010ab8ebfc83ad0f
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Aug 23 17:06:05 2010 +0200
fix generation of Changelog
Fixed generation of Changelog from git: replaced git-log with
correct commando 'git log'.
diff --git a/Makefile.am b/Makefile.am
index 9dd69ec..748c55f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@ ChangeLog: $(srcdir)/ChangeLog
$(srcdir)/ChangeLog:
@if test -d "$(srcdir)/.git"; then \
(cd "$(srcdir)" && \
- ./missing --run git-log --stat) | fmt --split-only > $@.tmp \
+ ./missing --run git log) | fmt --split-only > $@.tmp \
&& mv -f $@.tmp $@ \
|| ($(RM) $@.tmp; \
echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
commit fc9571c07a81aba8a8fdaa8014d4034b6456d203
Author: Michael Schroeder <mls at novell.com>
Date: Mon Aug 23 16:13:13 2010 +0200
fix hal segfault
Fixed hal segfault. It crashes because strlen() gets called with a
NULL pointer (ppdev_compute_udi calls hal_util_get_last_element
with a NULL pointer).
bnc#556485
diff --git a/hald/linux/device.c b/hald/linux/device.c
index 8570d46..401dc44 100644
--- a/hald/linux/device.c
+++ b/hald/linux/device.c
@@ -2287,9 +2287,10 @@ ppdev_compute_udi (HalDevice *d)
gchar udi[256];
const char *name;
- name = hal_util_get_last_element( hal_device_property_get_string(d, "linux.device_file"));
+ name = hal_device_property_get_string (d, "linux.device_file");
if (name) {
+ name = hal_util_get_last_element (name);
hald_compute_udi (udi, sizeof (udi), "/org/freedesktop/Hal/devices/ppdev_%s", name);
} else {
hald_compute_udi (udi, sizeof (udi), "/org/freedesktop/Hal/devices/ppdev");
commit 6f16321da13f6a7cbd9c424ddba2e727e434fa25
Author: Milan Broz <mbroz at redhat.com>
Date: Tue Jul 13 16:07:32 2010 +0200
HAL: Ignore internal DM devices with new DM udev rules
With new device-mapper udev rules are /dev/mapper/* symlinks
to basic device name /dev/dm-X.
(Change requested by udev upstream.)
This change breaks temporary-cryptsetup workaround inside hal.
With new dm-udev rules (uncluded since device-mapper 1.02.39)
there is DM_UDEV_DISABLE_OTHER_RULES_FLAG variable
which controls that scan should be ignored for this device
(it is set for all internal devices, including temporary cryptsetup,
internal parts of lvm devices etc.)
Ignore device if this flag is set.
See bugs
https://bugzilla.redhat.com/show_bug.cgi?id=613909
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=586286
Signed-off-by: Milan Broz <mbroz at redhat.com>
diff --git a/hald/linux/osspec.c b/hald/linux/osspec.c
index a8233fd..6d616bc 100644
--- a/hald/linux/osspec.c
+++ b/hald/linux/osspec.c
@@ -215,6 +215,11 @@ hald_udev_data (GIOChannel *source, GIOCondition condition, gpointer user_data)
g_free (str);
}
g_free (dstr);
+ } else if (strncmp(key, "DM_UDEV_DISABLE_OTHER_RULES_FLAG=", 33) == 0) {
+ if (strtoul(&key[33], NULL, 10) == 1) {
+ HAL_INFO (("ignoring device requested by DM udev rules"));
+ goto invalid;
+ }
}
}
commit ce8422fc8ec4881c5e54b651af3ef4ce2ca96847
Author: Bernhard Rosenkraenzer <bero at arklinux.org>
Date: Mon Aug 23 14:50:40 2010 +0200
fix build with automake 1.11.1
Fixed build with automake 1.11.1: whitespace following trailing backslash.
fd.o#29085
diff --git a/policy/Makefile.am b/policy/Makefile.am
index b506a08..503e9f3 100644
--- a/policy/Makefile.am
+++ b/policy/Makefile.am
@@ -24,7 +24,7 @@ check:
then \
echo ok; \
else \
- echo failed; \
+ echo failed; \
exit 1; \
fi; \
done;
commit 6f1558bf77323d7649df0a4989000f484fbc9eb8
Merge: ba8eac2... 7523710...
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Aug 23 14:47:41 2010 +0200
Merge branch 'master' of ssh://git.freedesktop.org/git/hal
commit ba8eac2971c99eb1c20d8beadd9c037b734d97b8
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Jun 14 12:18:43 2010 +0200
fixed commit d5f236f3dad5e721f8c2105b49c963839f3ce549
Minor fix for d5f236f3dad5e721f8c2105b49c963839f3ce549.
diff --git a/hald/linux/device.c b/hald/linux/device.c
index ef58daa..8570d46 100644
--- a/hald/linux/device.c
+++ b/hald/linux/device.c
@@ -2219,7 +2219,7 @@ pnp_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_de
}
pnp_id = hal_device_property_get_string (d, "pnp.id");
if( !strncmp(pnp_id, "WACf", 4) || !strcmp(pnp_id, "FUJ02e5") || !strcmp(pnp_id, "FUJ02e6") ||
- !strcmp(pnp_id, "FUJ02e7") || !strcmp(pnp_id, "FUJ02e9") || !strcmp(pnp_id, "FPI2004") ||) {
+ !strcmp(pnp_id, "FUJ02e7") || !strcmp(pnp_id, "FUJ02e9") || !strcmp(pnp_id, "FPI2004")) {
/* a internal serial tablet --> this should be a tablet pc */
if ((computer = hal_device_store_find (hald_get_gdl (), "/org/freedesktop/Hal/devices/computer")) != NULL ||
(computer = hal_device_store_find (hald_get_tdl (), "/org/freedesktop/Hal/devices/computer")) != NULL) {
commit d3cdadc47168b1bc657a391903f176489f736b24
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Jun 14 12:12:07 2010 +0200
detect also serial tablets with pnp-id FUJ02e7/FUJ02e9
Detect also machines with serial (wacom?) tablets and pnp-id FUJ02e7/FUJ02e9
as TabletPCs. Reduce detection of Wacom PNP-id to 'WACf' to prevent future
changes.
diff --git a/hald/linux/device.c b/hald/linux/device.c
index ea5f50f..ef58daa 100644
--- a/hald/linux/device.c
+++ b/hald/linux/device.c
@@ -2218,8 +2218,8 @@ pnp_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_de
hal_device_property_set_string (d, "info.product", pnp_description);
}
pnp_id = hal_device_property_get_string (d, "pnp.id");
- if( !strncmp(pnp_id, "WACf0", 5) || !strcmp(pnp_id, "FUJ02e5") ||
- !strcmp(pnp_id, "FUJ02e6") || !strcmp(pnp_id, "FPI2004")) {
+ if( !strncmp(pnp_id, "WACf", 4) || !strcmp(pnp_id, "FUJ02e5") || !strcmp(pnp_id, "FUJ02e6") ||
+ !strcmp(pnp_id, "FUJ02e7") || !strcmp(pnp_id, "FUJ02e9") || !strcmp(pnp_id, "FPI2004") ||) {
/* a internal serial tablet --> this should be a tablet pc */
if ((computer = hal_device_store_find (hald_get_gdl (), "/org/freedesktop/Hal/devices/computer")) != NULL ||
(computer = hal_device_store_find (hald_get_tdl (), "/org/freedesktop/Hal/devices/computer")) != NULL) {
commit 8edf87fc636de25746c153bb3bf778e6e6ce6df3
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Jun 14 12:05:36 2010 +0200
detect also serial wacom tablets with pnp-id > WACf009
Detect also machines with serial wacom tablets and pnp-id > WACf009
as e.g. WACf010 as TabletPCs.
diff --git a/hald/linux/device.c b/hald/linux/device.c
index aafad71..ea5f50f 100644
--- a/hald/linux/device.c
+++ b/hald/linux/device.c
@@ -2218,7 +2218,7 @@ pnp_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_de
hal_device_property_set_string (d, "info.product", pnp_description);
}
pnp_id = hal_device_property_get_string (d, "pnp.id");
- if( !strncmp(pnp_id, "WACf00", 6) || !strcmp(pnp_id, "FUJ02e5") ||
+ if( !strncmp(pnp_id, "WACf0", 5) || !strcmp(pnp_id, "FUJ02e5") ||
!strcmp(pnp_id, "FUJ02e6") || !strcmp(pnp_id, "FPI2004")) {
/* a internal serial tablet --> this should be a tablet pc */
if ((computer = hal_device_store_find (hald_get_gdl (), "/org/freedesktop/Hal/devices/computer")) != NULL ||
More information about the hal-commit
mailing list