Attachment 1344 Details for Bug 1574 – hal-0.5.15-ModernUdevSystemD

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] hal-0.5.15-ModernUdevSystemD

hal-0.5.15-ModernUdevSystemD.patch (text/plain), 96.95 KB, created by Roman Savochenko on 2013-07-15 03:08:45 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Roman Savochenko

Created: 2013-07-15 03:08:45 CDT

Size: 96.95 KB

patch

obsolete

>diff --git a/hald/linux/addons/addon-acpi-buttons-toshiba.c b/hald/linux/addons/addon-acpi-buttons-toshiba.c
>index 74d413a..ea962ae 100644
>--- a/hald/linux/addons/addon-acpi-buttons-toshiba.c
>+++ b/hald/linux/addons/addon-acpi-buttons-toshiba.c
>@@ -40,7 +40,7 @@ else
> #include <string.h>
> #include <unistd.h>
> 
>-#include <glib/gmain.h>
>+#include <glib.h>
> 
> #include "libhal/libhal.h"
> #include "../../logger.h"
>diff --git a/hald/linux/addons/addon-dell-backlight.cpp b/hald/linux/addons/addon-dell-backlight.cpp
>index b22de3b..d532659 100644
>--- a/hald/linux/addons/addon-dell-backlight.cpp
>+++ b/hald/linux/addons/addon-dell-backlight.cpp
>@@ -29,7 +29,7 @@
> 
> #include <string.h>
> 
>-#include <glib/gmain.h>
>+#include <glib.h>
> #include <dbus/dbus-glib.h>
> #include <dbus/dbus-glib-lowlevel.h>
> 
>diff --git a/hald/linux/addons/addon-generic-backlight.c b/hald/linux/addons/addon-generic-backlight.c
>index 8ab2b22..11cda39 100644
>--- a/hald/linux/addons/addon-generic-backlight.c
>+++ b/hald/linux/addons/addon-generic-backlight.c
>@@ -35,7 +35,7 @@
> #include <sys/stat.h>
> #include <unistd.h> 
> 
>-#include <glib/gmain.h>
>+#include <glib.h>
> #include <dbus/dbus-glib.h>
> #include <dbus/dbus-glib-lowlevel.h>
> 
>diff --git a/hald/linux/addons/addon-imac-backlight.c b/hald/linux/addons/addon-imac-backlight.c
>index 54e4ea3..2436659 100644
>--- a/hald/linux/addons/addon-imac-backlight.c
>+++ b/hald/linux/addons/addon-imac-backlight.c
>@@ -29,7 +29,7 @@
> #include <stdlib.h>
> #include <sys/io.h>
> 
>-#include <glib/gmain.h>
>+#include <glib.h>
> #include <dbus/dbus-glib.h>
> #include <dbus/dbus-glib-lowlevel.h>
> 
>diff --git a/hald/linux/addons/addon-input.c b/hald/linux/addons/addon-input.c
>index 0a433b1..e7053b9 100644
>--- a/hald/linux/addons/addon-input.c
>+++ b/hald/linux/addons/addon-input.c
>@@ -41,7 +41,7 @@
> #else
>   #include <linux/input.h>
> #endif
>-#include <glib/gmain.h>
>+#include <glib.h>
> #include <glib/gprintf.h>
> #include <dbus/dbus-glib-lowlevel.h>
> 
>diff --git a/hald/linux/addons/addon-ipw-killswitch.c b/hald/linux/addons/addon-ipw-killswitch.c
>index 7b408e3..10ce1a5 100644
>--- a/hald/linux/addons/addon-ipw-killswitch.c
>+++ b/hald/linux/addons/addon-ipw-killswitch.c
>@@ -36,7 +36,6 @@
> #include <unistd.h> 
> 
> #include <glib.h>
>-#include <glib/gmain.h>
> #include <glib/gstdio.h>
> #include <dbus/dbus-glib.h>
> #include <dbus/dbus-glib-lowlevel.h>
>diff --git a/hald/linux/addons/addon-leds.c b/hald/linux/addons/addon-leds.c
>index e3ab34f..6a32b19 100644
>--- a/hald/linux/addons/addon-leds.c
>+++ b/hald/linux/addons/addon-leds.c
>@@ -36,7 +36,6 @@
> #include <unistd.h> 
> 
> #include <glib.h>
>-#include <glib/gmain.h>
> #include <glib/gstdio.h>
> #include <dbus/dbus-glib.h>
> #include <dbus/dbus-glib-lowlevel.h>
>diff --git a/hald/linux/addons/addon-macbookpro-backlight.c b/hald/linux/addons/addon-macbookpro-backlight.c
>index c1bbbac..3ff76fc 100644
>--- a/hald/linux/addons/addon-macbookpro-backlight.c
>+++ b/hald/linux/addons/addon-macbookpro-backlight.c
>@@ -39,7 +39,7 @@
> #include <pci/pci.h>
> #include <unistd.h> 
> 
>-#include <glib/gmain.h>
>+#include <glib.h>
> #include <dbus/dbus-glib.h>
> #include <dbus/dbus-glib-lowlevel.h>
> 
>diff --git a/hald/linux/addons/addon-omap-backlight.c b/hald/linux/addons/addon-omap-backlight.c
>index 780d36d..44e99e1 100644
>--- a/hald/linux/addons/addon-omap-backlight.c
>+++ b/hald/linux/addons/addon-omap-backlight.c
>@@ -41,7 +41,7 @@
> #include <fcntl.h>
> #include <unistd.h> 
> 
>-#include <glib/gmain.h>
>+#include <glib.h>
> #include <dbus/dbus-glib.h>
> #include <dbus/dbus-glib-lowlevel.h>
> 
>diff --git a/hald/linux/addons/addon-rfkill-killswitch.c b/hald/linux/addons/addon-rfkill-killswitch.c
>index 9e6a551..030f2a7 100644
>--- a/hald/linux/addons/addon-rfkill-killswitch.c
>+++ b/hald/linux/addons/addon-rfkill-killswitch.c
>@@ -36,7 +36,6 @@
> #include <unistd.h> 
> 
> #include <glib.h>
>-#include <glib/gmain.h>
> #include <glib/gstdio.h>
> #include <dbus/dbus-glib.h>
> #include <dbus/dbus-glib-lowlevel.h>
>diff --git a/hald/linux/addons/addon-storage.c b/hald/linux/addons/addon-storage.c
>index 3acc963..f6561a5 100644
>--- a/hald/linux/addons/addon-storage.c
>+++ b/hald/linux/addons/addon-storage.c
>@@ -32,7 +32,6 @@
> #include <linux/cdrom.h>
> #include <linux/fs.h>
> #include <mntent.h>
>-#include <scsi/sg.h>
> #include <stdint.h>
> #include <stdio.h>
> #include <stdlib.h>
>@@ -39,7 +39,8 @@
> #include <string.h>
> #include <sys/ioctl.h>
> #include <unistd.h>
>-#include <glib/gmain.h>
>+#include <glib.h>
>+#include <scsi/sg.h>
> #include <dbus/dbus-glib.h>
> #include <dbus/dbus-glib-lowlevel.h>
> 
>diff --git a/hald/linux/addons/addon-usb-csr.c b/hald/linux/addons/addon-usb-csr.c
>index c43fa6d..0c96a2a 100644
>--- a/hald/linux/addons/addon-usb-csr.c
>+++ b/hald/linux/addons/addon-usb-csr.c
>@@ -29,7 +29,7 @@
> #include <string.h>
> #include <usb.h>
> 
>-#include <glib/gmain.h>
>+#include <glib.h>
> #include <dbus/dbus-glib.h>
> #include <dbus/dbus-glib-lowlevel.h>
> 
> 
>--- hal-0.5.14/fdi/policy/10osvendor/20-storage-methods.fdi~	2011-10-27 15:52:29.000000000 +0400
>+++ hal-0.5.14/fdi/policy/10osvendor/20-storage-methods.fdi	2011-10-27 15:53:23.000000000 +0400
>@@ -250,6 +250,7 @@
> 	  <append key="volume.mount.valid_options" type="strlist">gid=</append>
> 	  <append key="volume.mount.valid_options" type="strlist">umask=</append>
> 	  <append key="volume.mount.valid_options" type="strlist">utf8</append>
>+	  <append key="volume.mount.valid_options" type="strlist">locale=</append>
> 	</match>
> 	<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="FreeBSD">
> 	  <append key="volume.mount.valid_options" type="strlist">-u=</append>
>diff --git a/hald/linux/probing/probe-video4linux.c b/hald/linux/probing/probe-video4linux.c
>index 7bc13e8..3b96389 100644
>--- a/hald/linux/probing/probe-video4linux.c
>+++ b/hald/linux/probing/probe-video4linux.c
>@@ -30,7 +30,7 @@
> #include <sys/types.h>
> #include <sys/time.h>
> #include <sys/ioctl.h>
>-#include <linux/videodev.h>
>+#include <libv4l1-videodev.h>
> #include <linux/videodev2.h>
> #include <errno.h>
> #include <fcntl.h>
> .gear/rules                                        |    4 +
> .../tags/f669249b5b1092298ec27bc950c396f5f411596f  |   13 +
> .gear/tags/list                                    |    1 +
> NEWS                                               |   33 +
> altlinux/hal-0.5.14-alt-ntfs-options.patch         |   10 +
> altlinux/hal.spec                                  |  614 ++++++++++++++++++++
> configure.in                                       |   57 ++-
> doc/man/Makefile.am                                |    2 +-
> doc/spec/Makefile.am                               |    2 +-
> fdi/policy/10osvendor/10-keymap.fdi                |   15 -
> fdi/policy/10osvendor/10-x11-input.fdi             |   23 +-
> fdi/policy/10osvendor/20-storage-methods.fdi       |    2 +
> fdi/policy/20thirdparty/10-mac-mouse-emu.fdi       |   11 +
> fdi/policy/20thirdparty/10-x11-video.fdi           |   13 +
> fdi/policy/20thirdparty/Makefile.am                |    4 +-
> hal.conf.in                                        |   41 ++
> hald/Makefile.am                                   |    2 +-
> hald/freebsd/addons/addon-storage.c                |   29 +-
> hald/freebsd/hf-storage.c                          |   39 ++-
> hald/freebsd/hf-usb.c                              |    8 +-
> hald/freebsd/hf-usb2.c                             |   65 ++-
> hald/freebsd/hf-volume.c                           |    5 +-
> hald/freebsd/probing/Makefile.am                   |    2 +-
> hald/freebsd/probing/probe-hiddev.c                |    2 +-
> hald/freebsd/probing/probe-usb2-device.c           |    4 +-
> hald/freebsd/probing/probe-usb2-interface.c        |    6 +-
> hald/freebsd/probing/probe-volume.c                |   12 +-
> hald/haldaemon.in                                  |  113 ++--
> hald/linux/addons/addon-imac-backlight.c           |    3 +-
> hald/linux/addons/addon-macbookpro-backlight.c     |    3 +-
> hald/linux/probing/probe-hiddev.c                  |    3 +-
> hald/linux/probing/probe-ieee1394-unit.c           |    3 +-
> hald/linux/probing/probe-input.c                   |    2 +-
> hald/linux/probing/probe-net-bluetooth.c           |    4 +-
> hald/linux/probing/probe-printer.c                 |    3 +-
> hald/linux/probing/probe-smbios.c                  |    3 +-
> hald/linux/probing/probe-storage.c                 |    3 +-
> hald/linux/probing/probe-video4linux.c             |    3 +-
> hald/linux/probing/probe-volume.c                  |    3 +-
> hald/util.h                                        |    2 +-
> libhal-storage/Makefile.am                         |    2 +-
> libhal-storage/libhal-storage.map                  |    6 +
> libhal/Makefile.am                                 |    2 +-
> libhal/libhal.map                                  |    6 +
> tools/Makefile.am                                  |    4 +-
> tools/hal-storage-mount.c                          |    3 +-
> tools/linux/Makefile.am                            |    4 +-
> tools/linux/hal-luks-remove-linux                  |    2 +-
> tools/linux/hal-luks-setup-linux                   |    2 +-
> tools/linux/hal-luks-teardown-linux                |    2 +-
> tools/linux/hal-system-killswitch-get-power-linux  |   74 ---
> tools/linux/hal-system-killswitch-set-power-linux  |   79 ---
> tools/linux/hal-system-power-hibernate-linux       |    3 +
> tools/linux/hal-system-power-suspend-linux         |    3 +
> 54 files changed, 1006 insertions(+), 353 deletions(-)
>
>diff --git a/.gear/rules b/.gear/rules
>new file mode 100644
>index 0000000..06d9ff4
>--- /dev/null
>+++ b/.gear/rules
>@@ -0,0 +1,4 @@
>+tar: HAL_0_5_14:.
>+diff: HAL_0_5_14:. .
>+copy: altlinux/*
>+spec: altlinux/hal.spec
>diff --git a/.gear/tags/f669249b5b1092298ec27bc950c396f5f411596f b/.gear/tags/f669249b5b1092298ec27bc950c396f5f411596f
>new file mode 100644
>index 0000000..b8b2008
>--- /dev/null
>+++ b/.gear/tags/f669249b5b1092298ec27bc950c396f5f411596f
>@@ -0,0 +1,13 @@
>+object 17f24242b5739a27940e0cc164a856b9584481f7
>+type commit
>+tag HAL_0_5_14
>+tagger Martin Pitt <martin.pitt@ubuntu.com> 1259620324 +0100
>+
>+release 0.5.14
>+-----BEGIN PGP SIGNATURE-----
>+Version: GnuPG v1.4.9 (GNU/Linux)
>+
>+iEYEABECAAYFAksUR+cACgkQDecnbV4Fd/LmsACgtBQgUMqIbpqrAW/JMd/bGtxo
>+EQEAoNBPwYe7XilkYFcAyMZ+cjjL9zw2
>+=Tj+3
>+-----END PGP SIGNATURE-----
>diff --git a/.gear/tags/list b/.gear/tags/list
>new file mode 100644
>index 0000000..0c6ca80
>--- /dev/null
>+++ b/.gear/tags/list
>@@ -0,0 +1 @@
>+f669249b5b1092298ec27bc950c396f5f411596f HAL_0_5_14
>diff --git a/NEWS b/NEWS
>index 05b368d..779ceda 100644
>--- a/NEWS
>+++ b/NEWS
>@@ -1,4 +1,37 @@
> ==========
>+HAL 0.5.15
>+==========
>+
>+Released Month 00, 2009.
>+
>+Requirements for HAL 0.5.15:
>+
>+ - Linux kernel     >= 2.6.22    (CONFIG_SYSFS_DEPRECATED=n)
>+ - udev             >= 125       (Linux only)
>+ - util-linux-ng    >= 2.15
>+ - bash             >= 2.0
>+ - dbus             >= 0.61      (with glib bindings)
>+ - glib             >= 2.10.0
>+ - expat            >= 1.95.8
>+ - hal-info         >= 20080310  (older versions can work too)
>+ - libusb           >= 0.1.10a   (optional)
>+ - pciutils         >= 2.2.3     (optional)
>+ - dmidecode        >= 2.7       (optional)
>+ - parted           >= 1.7.1     (optional)
>+ - cryptsetup-luks  >= 1.0.1     (optional, needs LUKS patches)
>+ - libsmbios        >= 0.13.4    (optional, for DELL machines, Linux only,
>+                                  prefered version >= 2.0.3)
>+ - dellWirelessCtl  >= 0.13.4    (optional, for Dell machines, must live in
>+                                 /usr/bin/, Linux only, prefered version >= 2.0.3)
>+ - gperf            >= 3.0.3-2   (optional, for Re-map multimedia keys,
>+                                  Linux only)
>+ - PolicyKit        >= 0.5       (optional)
>+ - ConsoleKit       >= 0.2.0     (optional, needed if use PolicyKit)
>+ - pm-utils         >= 0.99.2    or newer (optional)
>+
>+Contributors to HAL 0.5.15:
>+
>+==========
> HAL 0.5.14 "Dave, this conversation can serve no purpose anymore. Goodbye."
> ==========
> 
>diff --git a/altlinux/hal-0.5.14-alt-ntfs-options.patch b/altlinux/hal-0.5.14-alt-ntfs-options.patch
>new file mode 100644
>index 0000000..42a5162
>--- /dev/null
>+++ b/altlinux/hal-0.5.14-alt-ntfs-options.patch
>@@ -0,0 +1,10 @@
>+--- hal-0.5.14/fdi/policy/10osvendor/20-storage-methods.fdi~	2011-10-27 15:52:29.000000000 +0400
>++++ hal-0.5.14/fdi/policy/10osvendor/20-storage-methods.fdi	2011-10-27 15:53:23.000000000 +0400
>+@@ -250,6 +250,7 @@
>+ 	  <append key="volume.mount.valid_options" type="strlist">gid=</append>
>+ 	  <append key="volume.mount.valid_options" type="strlist">umask=</append>
>+ 	  <append key="volume.mount.valid_options" type="strlist">utf8</append>
>++	  <append key="volume.mount.valid_options" type="strlist">locale=</append>
>+ 	</match>
>+ 	<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="FreeBSD">
>+ 	  <append key="volume.mount.valid_options" type="strlist">-u=</append>
>diff --git a/altlinux/hal.spec b/altlinux/hal.spec
>new file mode 100644
>index 0000000..0d6dfe0
>--- /dev/null
>+++ b/altlinux/hal.spec
>@@ -0,0 +1,614 @@
>+%define _libexecdir %_prefix/libexec/hal
>+%define _haldocdir  %_docdir/lib%name-devel-%version
>+
>+Name: hal
>+Version: 0.5.14
>+Release: alt7.M60P.1
>+Summary: Hardware Abstraction Layer
>+Group: System/Servers
>+License: AFL/GPL
>+Url: http://www.freedesktop.org/wiki/Software/hal
>+
>+PreReq: shadow-utils dbus udev
>+Requires: lib%name = %version-%release dmidecode hal-info >= 20081022-alt5
>+Conflicts: hal-fstab-sync < 0.0.1-alt7
>+
>+Source: %name-%version.tar
>+Patch: %name-%version-%release.patch
>+Patch1: hal-0.5.14-alt-ntfs-options.patch
>+
>+AutoReq: yes, noshell
>+BuildPreReq: libblkid-devel >= 1.43
>+BuildRequires: docbook-utils gcc-c++ gtk-doc intltool libdbus-glib-devel libexpat-devel libusb-compat-devel perl-XML-Parser
>+BuildRequires: python-devel gperf python-modules-compiler python-modules-encodings xmlto libConsoleKit-devel
>+%ifarch %ix86 x86_64
>+BuildRequires: libpci-devel zlib-devel
>+%endif
>+
>+%description
>+HAL is daemon for collection and maintaining information from several
>+sources about the hardware on the system. It provdes a live device
>+list through D-BUS
>+
>+%package -n lib%name
>+Summary: Shared libraries for HAL
>+Group: System/Libraries
>+Requires: pciids usbids
>+
>+%description -n lib%name
>+This package provides shared libraries for HAL
>+
>+%package -n lib%name-devel
>+Summary: Libraries and headers for HAL
>+Group: Development/C
>+Requires: lib%name = %version-%release
>+Obsoletes: %name-devel < %version-%release lib%name-devel-doc < %version-%release
>+Provides: %name-devel = %version-%release lib%name-devel-doc = %version-%release
>+
>+%description -n lib%name-devel
>+Headers for HAL
>+
>+%prep
>+%setup -q
>+%patch -p1
>+%patch1 -p1
>+
>+rm -f gtk-doc.make acinclude.m4
>+
>+%build
>+%autoreconf
>+%configure \
>+	--disable-static \
>+	--without-usb-csr \
>+	--with-cpufreq \
>+	--disable-docbook-docs \
>+	--disable-gtk-doc \
>+	--with-doc-dir=%_haldocdir \
>+	--with-html-dir=%_haldocdir/api \
>+	--disable-pmu \
>+	--disable-policy-kit \
>+	--with-hal-user=haldaemon \
>+	--with-hal-group=haldaemon \
>+	--with-udev-prefix=/lib \
>+	--with-hwdata=%_datadir/misc \
>+	--with-pid-file=%_var/run/hal.pid \
>+	--localstatedir=%_var
>+%make_build
>+
>+%install
>+%make DESTDIR=%buildroot install
>+
>+mkdir -p %buildroot%_var/{run,cache}/hald
>+mkdir -p %buildroot%_sysconfdir/hal/fdi/{information,policy,preprobe}
>+
>+%pre
>+%_sbindir/groupadd -r -f haldaemon >/dev/null 2>&1 || :
>+%_sbindir/useradd -r -g haldaemon -d '/' -s /sbin/nologin -c "HAL daemon" haldaemon >/dev/null 2>&1 ||:
>+
>+%post
>+%post_service haldaemon
>+
>+%preun
>+%preun_service haldaemon
>+
>+%files
>+%doc AUTHORS NEWS README doc/TODO
>+%_sysconfdir/dbus*/system.d/hal.conf
>+/lib/udev/rules.d/90-hal.rules
>+%_initdir/haldaemon
>+%dir %_sysconfdir/hal
>+%dir %_sysconfdir/hal/fdi
>+%dir %_sysconfdir/hal/fdi/information
>+%dir %_sysconfdir/hal/fdi/policy
>+%dir %_sysconfdir/hal/fdi/preprobe
>+%_sbindir/*
>+%_bindir/*
>+%_libexecdir
>+%dir %_datadir/hal
>+%_datadir/hal/fdi
>+%_datadir/hal/scripts
>+%_man1dir/*.1*
>+%_man8dir/*.8*
>+%attr(0775,root,haldaemon) %_var/*/hald
>+
>+%files -n lib%name
>+%_libdir/*.so.*
>+
>+%files -n lib%name-devel
>+%_includedir/*
>+%_libdir/*.so
>+%_pkgconfigdir/*
>+
>+%changelog
>+* Fri Oct 28 2011 Sergey V Turchin <zerg@altlinux.org> 0.5.14-alt7.M60P.1
>+- built for M60P
>+
>+* Thu Oct 27 2011 Sergey V Turchin <zerg@altlinux.org> 0.5.14-alt8
>+- fix ntfs mount options (ALT#26513)
>+
>+* Wed Mar 23 2011 Sergey V Turchin <zerg@altlinux.org> 0.5.14-alt7
>+- don't build docs
>+
>+* Wed Mar 23 2011 Sergey V Turchin <zerg@altlinux.org> 0.5.14-alt6
>+- revert 0.5.14-alt5 changes
>+
>+* Sun Mar 20 2011 Valery Inozemtsev <shrek@altlinux.ru> 0.5.14-alt5
>+- libhal: added conflicts to libudev
>+- libhal-devel is not packed. not be used to build!
>+
>+* Sat Sep 25 2010 Valery Inozemtsev <shrek@altlinux.ru> 0.5.14-alt4
>+- required pciids, usbids
>+
>+* Mon Mar 01 2010 Valery Inozemtsev <shrek@altlinux.ru> 0.5.14-alt3
>+- reenabled cpufreq (closes: #23048)
>+
>+* Mon Dec 28 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.5.14-alt2
>+- fixed build gtk doc
>+
>+* Tue Dec 01 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.5.14-alt1
>+- 0.5.14
>+
>+* Tue Nov 17 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.5.13-alt5
>+- allow gdm access to org.freedesktop.Hal.Device.LaptopPanel
>+
>+* Tue Oct 20 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.5.13-alt4
>+- moved from libvolume_id to libblkid
>+
>+* Tue Oct 20 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.5.13-alt3
>+- moved from libblkid to libvolume_id
>+- versioning conflict to hal-fstab-sync (closes: #20776)
>+
>+* Mon Aug 17 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.5.13-alt2
>+- don't compiled with csr, ibm or cpufreq options, this functionality is obsolete (closes: #21465)
>+- disabled ACL management, this is now handled by udev-extras
>+- disabled ConsoleKit/PolicyKit support and lock down most interfaces with at_console
>+
>+* Fri Jul 17 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.5.13-alt1
>+- 0.5.13
>+
>+* Mon Jun 29 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.5.12-alt19
>+- removed Dell killswitches support
>+
>+* Sun Jun 21 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.5.12-alt18
>+- merged fixes from hal-0_5_12-branch
>+
>+* Sat Jun 20 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.5.12-alt17
>+- fixed crash when assembling certain MD devices (closes: #20470)
>+
>+* Sat Apr 04 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.5.12-alt16
>+- fixed volume label parsing
>+
>+* Wed Mar 11 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.5.12-alt15
>+- changed chkconfig 345 34 91 -> 345 11 91
>+
>+* Sun Feb 22 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.5.12-alt14
>+- fixed previous commits
>+
>+* Sat Feb 21 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.5.12-alt13
>+- fixed some memory leaks
>+
>+* Wed Feb 04 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.5.12-alt11.M50.1
>+- build for branch 5.0
>+
>+* Wed Feb 04 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.5.12-alt12
>+- added org.freedesktop.DBus.Peer standard iterface
>+
>+* Wed Jan 28 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.5.12-alt11
>+- fixed HAL D-Bus config due to D-Bus changes caused by CVE-2008-4311
>+
>+* Thu Jan 15 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.5.12-alt10
>+- droped EeePC specific, used new eeepc-laptop
>+
>+* Tue Dec 30 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.12-alt9
>+- corrected EeePC check
>+
>+* Tue Dec 30 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.12-alt8
>+- addon-eeepc-killswitch: added support eeepc-laptop kernel driver
>+
>+* Tue Dec 30 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.12-alt7
>+- added EeePC wlan killswitch addon
>+
>+* Mon Dec 22 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.12-alt6
>+- added forward EeePC ACPI events
>+
>+* Sat Dec 13 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.12-alt5
>+- hal.conf: added interface "org.freedesktop.Hal.Device.Storage",
>+  "org.freedesktop.Hal.Device.WakeOnLan", "org.freedesktop.Hal.Device.DockStation"
>+
>+* Sat Dec 13 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.12-alt4
>+- hal.conf: added interface "org.freedesktop.Hal.Device.KillSwitch", "org.freedesktop.Hal.Device.Alsa"
>+- enabled proc acpi event
>+
>+* Wed Dec 10 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.12-alt3
>+- hal.conf: added interface "org.freedesktop.Hal.Device.CPUFreq"
>+
>+* Thu Dec 04 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.12-alt2
>+- libhal: introduced HAL_0.5.11 ABI for new functions
>+
>+* Thu Nov 27 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.12-alt1
>+- git snapshot 2008-11-26 (c3cf2b8b252dd593c4058b9688b5978e3e7ee7cc)
>+
>+* Mon Nov 24 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.11-alt21.M41.1
>+- build for branch 4.1
>+
>+* Mon Nov 24 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.11-alt22
>+- added new addons for the iwl killswitch interface
>+
>+* Sat Nov 22 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.11-alt20.M41.1
>+- build for branch 4.1
>+
>+* Sat Nov 22 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.11-alt21
>+- hald-addon-ipw-killswitch: fixed get/set status
>+
>+* Fri Nov 21 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.11-alt19.M41.1
>+- build for branch 4.1
>+
>+* Fri Nov 21 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.11-alt20
>+- hald-addon-ipw-killswitch: ignored 80211control iface
>+
>+* Thu Nov 20 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.11-alt19
>+- libhal: droped ldconfig call in post
>+- initscrips: added condstop
>+
>+* Wed Nov 19 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.11-alt18
>+- hald-addon-ipw-killswitch: fix potential segfault
>+
>+* Wed Nov 19 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.11-alt17
>+- fixed ipw killswith sysfs path
>+
>+* Mon Nov 17 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.11-alt16
>+- added new addons for the ipw killswitch interface
>+  and the generic sysfs backlight interface
>+
>+* Sat Nov 01 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.11-alt15
>+- added quiet,fmask=117 mount options for vfat
>+
>+* Wed Sep 10 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.11-alt14
>+- use udevadm instead of (deprecated) udevinfo
>+
>+* Tue Sep 09 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.11-alt13
>+- allow gid=/uid= for removable media volumes with ntfs-3g
>+
>+* Mon Sep 01 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.11-alt12
>+- rebuild with libvolume_id.so.1
>+
>+* Thu Aug 21 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.11-alt11
>+- volume.num_blocks can become larger than 2G
>+- make hal start a lot faster
>+
>+* Sat Aug 02 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.11-alt10
>+- API fixed in CK 0.3
>+
>+* Mon Jun 23 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.11-alt9
>+- 10-x11-input.fdi: added XkbRules & XkbModel
>+
>+* Sat Jun 21 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.11-alt8
>+- install 10-x11-input.fdi
>+
>+* Wed Jun 18 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.11-alt7
>+- skip "Macintosh mouse button emulation" from capability input.mouse
>+
>+* Thu May 08 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.11-alt6
>+- 0.5.11 release
>+
>+* Mon May 05 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.11-alt5
>+- hal-0_5_11-branch from 2008-04-29
>+- drop deprecated input.xkb.{rules,model,layout,variant}
>+
>+* Tue Apr 22 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.11-alt4
>+- hal-0_5_11-branch from 2008-04-21
>+- allow gid=/uid= for removable media volumes with subfs
>+- removed "Conflicts: submount", "Sometimes They Come Back"
>+
>+* Sun Apr 20 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.11-alt3
>+- hal-0_5_11-branch from 2008-04-18
>+- always enabled ConsoleKit/PolicyKit
>+- added conflicts: submount, rest in peace (close #15340)
>+- spec cleanup
>+
>+* Thu Apr 03 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.11-alt2.rc2
>+- added info.capabilities key for VGA capabilities controllers
>+- allow gid=/uid= for removable media volumes with hfsplus/ntfs filesystems
>+- drop 10-x11-input.fdi
>+
>+* Mon Mar 31 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.11-alt1.rc2
>+- 0.5.11 RC2
>+
>+* Fri Mar 14 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.11-alt1.rc1
>+- 0.5.11 RC1
>+
>+* Fri Feb 29 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.10-alt11.1
>+- rebuild for udev-118
>+- drop hal-0.5.9.1-alt-vfat-flush.patch, requires kernel > 2.6.20
>+
>+* Tue Jan 15 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.10-alt11
>+- close fd-leaks in hald-addon-input
>+- fix percentage for empty batteries
>+- don't set percentag if chargelevel is 0
>+
>+* Thu Jan 10 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.5.10-alt10
>+- fixes hal aborting on Fujitsu laptops because the fujitsu fdi contains an
>+  empty <match /> rule. (close #13959)
>+
>+* Mon Dec 17 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.10-alt8.M40.1
>+- build for branch 4.0
>+
>+* Mon Dec 17 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.10-alt9
>+- fix addon exiting on system bus restart
>+- returned hal-0.5.10-git-disc-type-detection.patch
>+
>+* Tue Dec 11 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.10-alt8
>+- drop hal-0.5.10-git-disc-type-detection.patch
>+
>+* Fri Dec 07 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.10-alt7
>+- add drm subsystem
>+- don't Eject() on dm-devices
>+- fix possible segfault on fdi-cache recreation
>+- prevent flood syslog if battery remaining time is above 60 hours
>+- fix normalised_rate if dis-/charging state is unknown
>+- fix the keyboard addon to not ignore key repeat events
>+- when initial disc type detection fails fall back to a alternate detection method
>+
>+* Wed Nov 28 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.10-alt6
>+- libhal: fixed  memory leaks after out of memory conditions
>+
>+* Thu Nov 22 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.10-alt4.M40.1
>+- build for branch 4.0
>+
>+* Mon Nov 19 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.10-alt5
>+- fix int_outof handling
>+
>+* Wed Oct 30 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.10-alt4
>+- add support for Wake On LAN
>+- drop hal-0.5.8-SuSE-hal-fix-storage-policy-fixed-drives.patch
>+
>+* Thu Oct 18 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.10-alt3
>+- enabled Macbook backlight support and Macbook Pro utils
>+
>+* Wed Oct 17 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.10-alt2
>+- hal-0.5.10-git-GSList-related-memleaks.patch: fixes several memory leaks
>+  caused by not free'd GSList objects.
>+
>+* Fri Oct 12 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.10-alt1
>+- 0.5.10
>+
>+* Tue Oct 09 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.9.1-alt6
>+- fixed build for ARM
>+
>+* Mon Oct 01 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.9.1-alt5
>+- change chkconfig 345 34 91 -> 345 35 91 (after acpid)
>+
>+* Sun Sep 30 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.9.1-alt4
>+- change chkconfig 345 48 02 -> 345 34 91
>+
>+* Fri Sep 07 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.9.1-alt3
>+- update hal-0.5.9.1-alt-crypt.patch
>+
>+* Mon Jul 30 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.9.1-alt2
>+- separate hal-info to hal-info package
>+
>+* Mon Jun 25 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.9.1-alt1
>+- 0.5.9.1
>+- hal-info-20070618
>+
>+* Sun Jun 17 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.9-alt14
>+- added conflicts: hal-fstab-sync
>+
>+* Thu May 24 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.9-alt13
>+- fixed luks-encrypted devices support, broken other stuff. thanks Sergey Bolshakov
>+
>+* Mon May 21 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.9-alt12
>+- hal-info-20070516
>+- added hal-0.5.9-git-property-changed.patch: fix problem with repeated
>+  property-changed signals
>+
>+* Wed Apr 04 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.9-alt11
>+- added create group haldaemon (close #11349)
>+
>+* Tue Apr 03 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.9-alt10
>+- hal-0.5.9 release
>+- hal-info-20070402
>+
>+* Mon Apr 02 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.9-alt9
>+- hal-0.5.9 GIT snapshot 2007-04-02 (9e04dee76ae5f46c1292dcea094b6fdcc38c68a5)
>+- fixed a bug with unauthorized reboot/shutdown. Now only privileged or console
>+   users can perform these operations. thanks Alexey Morozov
>+
>+* Sun Apr 01 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.9-alt8
>+- hal-0.5.9 GIT snapshot 2007-04-01 (e0d3327b68fc043e6ac8a1b0bdf97249476a3968)
>+- hal-info-20070328
>+
>+* Thu Mar 22 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.9-alt7
>+- hal-0.5.9 GIT snapshot 2007-03-22 (0cd8dccc8382f26d3b3f68f6131aefd08b134232)
>+- hal-info GIT snapshot 2007-03-22 (58917de0ae967c0fb7c52513521090de18599c24)
>+
>+* Wed Mar 14 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.9-alt6
>+- hal-0.5.9 GIT snapshot 2007-03-13 (c9cde9a767168fe9151695142baaae06d5e0827b)
>+- hal-info-20070313
>+- drop hal-0.5.3-alt-libhal-storage-mopts_collect-allow-string-options.patch
>+
>+* Sat Mar 10 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.9-alt5
>+- hal-0.5.9 GIT snapshot 2007-03-07 (b53fd153f48c55ac9fcb677f1ecaea47b6f9ca3a)
>+  + libhal: validate parameter to be != NULL
>+  + fix scsi_host parent relationship
>+  + make the fdi cache test stricter by not allowing skipped fdi files
>+- hal-info GIT snapshot 2007-03-07 (98b34973933fc6db1735ae94053ed369826226f7)
>+  + fix up vbestate_restore for display resuming
>+  + added iRiver T20 to USB musicplayers list
>+
>+* Tue Mar 06 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.9-alt4
>+- moved addon and policy for Dell backlight support to subpackge %name-dell-backlight
>+
>+* Tue Mar 06 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.9-alt3
>+- hal-0.5.9 GIT snapshot 2007-03-06 (c31c32b8b7c0fed9c871da947f35922e03ad6ed3)
>+- hal-info-20070304
>+- build with Dell backlight support
>+- disabled Macbook Pro utils
>+- disabled PMU support
>+
>+* Mon Mar 05 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.9-alt2
>+- hal-0.5.9 GIT snapshot 2007-03-05 (0c16761e61064979daa7b39ce0083f064676e578)
>+- added iocharset=utf8 to mount options for ntfs
>+- moved API doc to lib%name-devel
>+
>+* Thu Mar 01 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.9-alt1
>+- hal-0.5.9 GIT snapshot 2007-03-01 (f5b862f5690106bb3d5500b1091d12f089bae070)
>+- hal-info GIT snapshot 2007-02-28 (302840ec67441f55ba07cae9991538e6c91f7fdc)
>+- fixed requires for lib%name-devel
>+
>+* Wed Feb 28 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.8.1-alt4
>+- added to hide fixed storage devices
>+- added IBM Hotkey support
>+- fix syntax error in configure script
>+
>+* Tue Feb 27 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.8.1-alt3
>+- fixed requires for %name-gnome
>+
>+* Tue Feb 27 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.8.1-alt2
>+- fixed hibernate support
>+
>+* Sun Feb 25 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.8.1-alt1
>+- 0.5.8.1
>+- spec cleanup
>+- updated build dependencies
>+- drop lib%name-devel-doc subpackage
>+- renamed subpackage %name-manager to %name-gnome
>+
>+* Wed Jan 03 2007 Igor Zubkov <icesik@altlinux.org> 0.5.7-alt4.1.1.1.1
>+- NMU
>+- add python-module-pygnome-bonobo to requires of hal-manager subpackage (#8230)
>+
>+* Mon Dec 25 2006 Igor Zubkov <icesik@altlinux.org> 0.5.7-alt4.1.1.1
>+- NMU
>+- rebuild
>+- bump buildrequires libdbus-devel >= 0.94
>+
>+* Mon Dec 11 2006 Igor Zubkov <icesik@altlinux.org> 0.5.7-alt4.1.1
>+- NMU
>+- fix build with new dbus
>+
>+* Mon Jun 19 2006 Sergey A. Sukiyazov <corwin@altlinux.ru> 0.5.7-alt4.1
>+- Add patch that makes hald not stat nfs and autofs mounts
>+
>+* Fri May 26 2006 Anton Farygin <rider@altlinux.ru> 0.5.7-alt4
>+- fixed trigger
>+
>+* Mon Apr 17 2006 Anton Farygin <rider@altlinux.ru> 0.5.7-alt3
>+- service hal renamed to haldaemon
>+- removed obsoleted policy for charsets
>+- updated requires to new udev and dbus
>+
>+* Fri Apr 14 2006 Anton Farygin <rider@altlinux.ru> 0.5.7-alt2
>+- updated to new version
>+
>+* Wed Nov 16 2005 Anton Farygin <rider@altlinux.ru> 0.5.5.1-alt1
>+- updated to new version
>+- disabled shell requires searching
>+- added PalmOne Tungsten|T3 support (#8478)
>+- added Explay SD/MMC Carder (Realtek 2.0 Card Reader) supporrt (#8477)
>+- fixed ntfs mount options (#8494)
>+
>+* Thu Oct 20 2005 Anton Farygin <rider@altlinux.ru> 0.5.4-alt6
>+- added patches from HEAD and SuSE:
>+    hal-0.5.4-acpi_reconnect.patch
>+    hal-fix-seqfault_if_addon_missing.diff
>+- disabled acpi-proc by default (always use acpid socket)
>+- todo() function renamed to _todo() in hal-system-power-set-power-save 
>+    (workarond for rpm-build bug #8211)
>+
>+* Mon Oct 10 2005 Anton Farygin <rider@altlinux.ru> 0.5.4-alt5
>+- typo in storagepolicy fixed
>+
>+* Fri Sep 30 2005 Anton Farygin <rider@altlinux.ru> 0.5.4-alt4
>+- policy for floppy fixed
>+- charset for cdrom devices fixed (#8067)
>+- mount option "sync" removed for usb devices
>+
>+* Tue Sep 13 2005 Anton Farygin <rider@altlinux.ru> 0.5.4-alt3
>+- storage policy for floppy devices fixed (#7551)
>+- libhal-devel added requires to libdbus-devel (#7863)
>+
>+* Fri Sep 02 2005 Anton Farygin <rider@altlinux.ru> 0.5.4-alt2.1
>+- fix for previos fix
>+
>+* Wed Aug 31 2005 Anton Farygin <rider@altlinux.ru> 0.5.4-alt2
>+- requires fixed
>+
>+* Mon Aug 29 2005 Anton Farygin <rider@altlinux.ru> 0.5.4-alt1
>+- new version
>+
>+* Wed Aug 17 2005 Anton Farygin <rider@altlinux.ru> 0.5.3-alt9
>+- umask for iso9660 removed
>+
>+* Wed Aug 17 2005 Anton Farygin <rider@altlinux.ru> 0.5.3-alt8
>+- initscript priority changed from 98 to 47 (for running after dm)
>+- added default (for UTF-8) charset policy for fat filesystems
>+
>+* Mon Aug 08 2005 Anton Farygin <rider@altlinux.ru> 0.5.3-alt7
>+- more options for vfat and ntfs (#7551)
>+- fixed filelist (#7576)
>+
>+* Wed Aug 03 2005 Anton Farygin <rider@altlinux.ru> 0.5.3-alt6
>+- postun scriptlet removed (#7454)
>+
>+* Fri Jul 22 2005 Anton Farygin <rider@altlinux.ru> 0.5.3-alt5
>+- added key disable_force_umount for storage
>+
>+* Thu Jul 21 2005 Anton Farygin <rider@altlinux.ru> 0.5.3-alt4
>+- storage-policy: fixed managed key 
>+- storage-policy: revert back changes for subfs (moved to submountd package)
>+
>+* Sun Jul 17 2005 Anton Farygin <rider@altlinux.ru> 0.5.3-alt3
>+- added policy and scripts for mounting subfs
>+- renamed mountpoint for cd devices to cdrom
>+
>+* Thu Jul 14 2005 Anton Farygin <rider@altlinux.ru> 0.5.3-alt2
>+- --retain-privileges added to initscript (#7362)
>+
>+* Wed Jul 13 2005 Anton Farygin <rider@altlinux.ru> 0.5.3-alt1
>+- new version
>+- added patch for allowed sting type options for mount (like fs=cdfss)
>+
>+* Wed Mar 23 2005 Anton Farygin <rider@altlinux.ru> 0.4.7-alt3
>+- initscript stop/start fixed
>+
>+* Tue Feb 08 2005 Anton Farygin <rider@altlinux.ru> 0.4.7-alt2
>+- storage-policy: added comment=managed mount option
>+
>+* Wed Jan 26 2005 Anton Farygin <rider@altlinux.ru> 0.4.7-alt1
>+- 0.4.7
>+- added noexec, nosuid, nodev to default mount options
>+- don't use volume label for mount point names
>+- fixed pci.ids location (#6011)
>+- service haldaemon renamed to hal (#5995)
>+
>+* Wed Jan 26 2005 Anton Farygin <rider@altlinux.ru> 0.4.4-alt5
>+- added patch for build with kernel-headers-std26-up
>+- removed requires to gnome-common
>+
>+* Sun Jan 23 2005 Alexey Morozov <morozov@altlinux.org> 0.4.4-alt4
>+- Removed several reduntant dependencies, build- and installtime,
>+  made hal-manager be less demanding regarding python
>+- Replaced kernel-headers-std26-up w/ linux-libc-headers (from PLD)
>+
>+* Mon Jan 10 2005 Yuri N. Sedunov <aris@altlinux.ru> 0.4.4-alt3
>+- new libhal{,-devel{,-doc}} subpackages.
>+- gnome-common, kernel-headers-std26 required for build.
>+- rewrited haldaemon.
>+
>+* Mon Jan 10 2005 Vital Khilko <vk@altlinux.ru> 0.4.4-alt2
>+- minor changes
>+
>+* Mon Jan 10 2005 Vital Khilko <vk@altlinux.ru> 0.4.4-alt1
>+- 0.4.4
>+- added belarusian package description
>+
>+* Thu Jan 06 2005 Vital Khilko <vk@altlinux.ru> 0.4.2-alt1
>+- 0.4.2
>+- added *.desktop and icon file for hal-device-manager
>+- two specs merged
>+- added belarusian translation
>+- set textrel=relaxed
>+
>+* Tue Dec 14 2004 Alexey Morozov <morozov@altlinux.org> 0.4.1-alt1
>+- Initial build for ALTLinux (taken from PLD)
>diff --git a/configure.in b/configure.in
>index e8aa021..539fddd 100644
>--- a/configure.in
>+++ b/configure.in
>@@ -7,7 +7,7 @@ dnl Process this file with autoconf to produce a configure script.
> #
> 
> AC_PREREQ(2.59c)
>-AC_INIT(hal, 0.5.14, david@fubar.dk)
>+AC_INIT(hal, 0.5.15, david@fubar.dk)
> AM_INIT_AUTOMAKE([gnu 1.9])
> AM_MAINTAINER_MODE
> m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
>@@ -479,9 +479,6 @@ if test "x$with_libpci" != xno ; then
> fi 
> AM_CONDITIONAL([HAVE_LIBPCI], [test "x$USE_LIBPCI" = "xyes"])
> 
>-USE_LIBUSB20=no
>-USE_LIBUSB=no
>-LIBUSB20_LIBS=""
> AC_ARG_WITH([backend],
> 	    AS_HELP_STRING([--with-backend=<name>],
> 	                   [backend to use (linux/solaris/freebsd/dummy)]),
>@@ -510,21 +507,34 @@ AM_CONDITIONAL(HALD_COMPILE_FREEBSD, [test x$HALD_BACKEND = xfreebsd], [Compilin
> AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris])
> AC_SUBST(HALD_BACKEND)
> if test "x$HALD_BACKEND" = "xfreebsd"; then
>-    AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_LIBUSB20=yes], [USE_LIBUSB20=no])
>-fi
>-if test "x$USE_LIBUSB20" = "xno"; then
>-    AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_LIBUSB=yes], [USE_LIBUSB=no])
>-fi
>-AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB20" = "xyes"])
>-AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB" = "xyes"])
>-if test "x$USE_LIBUSB20" = "xyes"; then
>-    AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20])
>-    LIBUSB20_LIBS="-lusb20"
>-elif test "x$USE_LIBUSB" = "xyes"; then
>-    AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20])
>-    LIBUSB20_LIBS="-lusb"
>+    AC_SEARCH_LIBS([clock_gettime], [rt])
>+    LIBUFS_LIBS=""
>+    AC_CHECK_HEADERS([libufs.h],
>+		     [AC_CHECK_LIB([libufs], [ufs_disk_fillout], [USE_LIBUFS="yes"], [], [])])
>+    if test "x$USE_LIBUFS" = "xyes"; then
>+	AC_DEFINE(HAVE_LIBUFS, 1, [Set if we have libufs])
>+	LIBUFS_LIBS="-lufs"
>+	AC_SUBST(LIBUFS_LIBS)
>+    fi
>+    USE_BSDLIBUSB20=no
>+    USE_BSDLIBUSB=no
>+    LIBUSB20_LIBS=""
>+    AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_BSDLIBUSB20=yes], [USE_BSDLIBUSB20=no])
>+    if test "x$USE_BSDLIBUSB20" = "xno"; then
>+        AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_BSDLIBUSB=yes], [USE_BSDLIBUSB=no])
>+    fi
>+    AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_BSDLIBUSB20" = "xyes" -o "x$USE_BSDLIBUSB" = "xyes"])
>+    if test "x$USE_BSDLIBUSB20" = "xyes"; then
>+        AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20])
>+        LIBUSB20_LIBS="-lusb20"
>+    elif test "x$USE_BSDLIBUSB" = "xyes"; then
>+        AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20])
>+        LIBUSB20_LIBS="-lusb"
>+    fi
>+    AC_SUBST(LIBUSB20_LIBS)
>+else
>+    AM_CONDITIONAL([HAVE_LIBUSB20], [false])
> fi
>-AC_SUBST(LIBUSB20_LIBS)
> 
> dnl DBUS API is subject to changes
> AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, [], [DBUS API is subject to change])
>@@ -809,6 +819,15 @@ fi
> AM_CONDITIONAL(DOCBOOK_DOCS_ENABLED, [test x$enable_docbook_docs = xyes])
> AC_MSG_RESULT(yes)
> 
>+# documentation target
>+AC_ARG_WITH(doc-dir,   [  --with-doc-dir=[dirname]  directory to install documentation])
>+if ! test -z "$with_doc_dir"; then
>+   DOCDIR=$with_doc_dir
>+else
>+   DOCDIR="$DATADIR/doc/hal-$VERSION"
>+fi
>+
>+AC_SUBST(DOCDIR)
> 
> AC_ARG_WITH([dbus-sys],
> 	    AS_HELP_STRING([--with-dbus-sys=<dir>],
>@@ -1134,7 +1153,7 @@ echo "
>         datadir:                          ${datadir}
>         sysconfdir:                       ${sysconfdir}
>         localstatedir:                    ${localstatedir}
>-        docdir:                           ${docdir}
>+        docdir:                           ${DOCDIR}
>         dbus-1 system.d dir:              ${DBUS_SYS_DIR}
>         pci.ids dir:                      ${PCI_IDS_DIR}
>         usb.ids dir:                      ${USB_IDS_DIR}
>diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
>index 0461259..67b81b9 100644
>--- a/doc/man/Makefile.am
>+++ b/doc/man/Makefile.am
>@@ -20,7 +20,7 @@ clean-local:
> 	$(edit) $< >$@
> 
> edit = sed \
>-	-e 's|@docdir[@]|$(docdir)|g' \
>+	-e 's|@docdir[@]|$(DOCDIR)|g' \
> 	-e 's|@sbindir[@]|$(sbindir)|g' \
> 	-e 's|@sysconfdir[@]|$(sysconfdir)|g'
> 
>diff --git a/doc/spec/Makefile.am b/doc/spec/Makefile.am
>index 218766b..07ea5cb 100644
>--- a/doc/spec/Makefile.am
>+++ b/doc/spec/Makefile.am
>@@ -12,7 +12,7 @@ SPEC_XML_EXTRA_FILES =			\
> 
> if DOCBOOK_DOCS_ENABLED
> 
>-htmldocdir = $(docdir)/spec
>+htmldocdir = $(DOCDIR)/spec
> htmldoc_DATA = hal-spec.html $(FIGURE_FILES) docbook.css
> 
> hal-spec.html : hal-spec.xml.in $(FIGURE_FILES) $(SPEC_XML_EXTRA_FILES)
>diff --git a/fdi/policy/10osvendor/10-keymap.fdi b/fdi/policy/10osvendor/10-keymap.fdi
>index c9ad87c..0981f0e 100644
>--- a/fdi/policy/10osvendor/10-keymap.fdi
>+++ b/fdi/policy/10osvendor/10-keymap.fdi
>@@ -4,20 +4,5 @@
>     <match key="info.capabilities" contains="input.keymap">
>       <append key="info.callouts.add" type="strlist">hal-setup-keymap</append>
>     </match>
>-
>-    <match key="info.capabilities" contains="input.keys">
>-      <merge key="input.xkb.rules" type="string">base</merge>
>-
>-      
>-      <merge key="input.xkb.model" type="string">keyboard</merge>
>-      <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
>-             string="Linux">
>-        <merge key="input.xkb.model" type="string">evdev</merge>
>-      </match>
>-
>-      <merge key="input.xkb.layout" type="string">us</merge>
>-      <merge key="input.xkb.variant" type="string" />
>-    </match>
>   </device>
> </deviceinfo>
>diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi
>index cff8fc5..c1cf0dd 100644
>--- a/fdi/policy/10osvendor/10-x11-input.fdi
>+++ b/fdi/policy/10osvendor/10-x11-input.fdi
>@@ -9,28 +9,11 @@
> 
>     
>     <match key="info.capabilities" contains="input.mouse">
>-      <merge key="input.x11_driver" type="string">mouse</merge>
>-      <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
>-             string="Linux">
>-        <merge key="input.x11_driver" type="string">evdev</merge>
>-      </match>
>+      <merge key="input.x11_driver" type="string">evdev</merge>
>     </match>
> 
>-    <match key="info.capabilities" contains="input.tablet">
>-      <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
>-             string="Linux">
>-        <merge key="input.x11_driver" type="string">evdev</merge>
>-      </match>
>-    </match>
>-
>-    <match key="info.capabilities" contains="input.keys">
>-      
>-      <merge key="input.x11_driver" type="string">keyboard</merge>
>-      <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
>-             string="Linux">
>-        <merge key="input.x11_driver" type="string">evdev</merge>
>-      </match>
>+    <match key="info.capabilities" contains="input.keyboard">
>+      <merge key="input.x11_driver" type="string">evdev</merge>
>     </match>
>   </device>
> </deviceinfo>
>diff --git a/fdi/policy/10osvendor/20-storage-methods.fdi b/fdi/policy/10osvendor/20-storage-methods.fdi
>index b7e94d6..bd30c63 100644
>--- a/fdi/policy/10osvendor/20-storage-methods.fdi
>+++ b/fdi/policy/10osvendor/20-storage-methods.fdi
>@@ -213,6 +213,8 @@
> 	  <append key="volume.mount.valid_options" type="strlist">fmask=</append>
> 	  <append key="volume.mount.valid_options" type="strlist">uid=</append>
> 	  <append key="volume.mount.valid_options" type="strlist">flush</append>
>+	  <merge key="volume.policy.mount_option.fmask=117" type="bool">true</merge>
>+	  <merge key="volume.policy.mount_option.quiet" type="bool">true</merge>
> 	</match>
> 	<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="FreeBSD">
> 	  <append key="volume.mount.valid_options" type="strlist">longnames</append>
>diff --git a/fdi/policy/20thirdparty/10-mac-mouse-emu.fdi b/fdi/policy/20thirdparty/10-mac-mouse-emu.fdi
>new file mode 100644
>index 0000000..b415727
>--- /dev/null
>+++ b/fdi/policy/20thirdparty/10-mac-mouse-emu.fdi
>@@ -0,0 +1,11 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<deviceinfo version="0.2">
>+  <device>
>+
>+    <match key="input.product" contains="mouse button emulation">
>+      <remove key="info.capabilities" type="strlist">input.mouse</remove>
>+      <append key="info.capabilities" type="strlist">button</append>
>+    </match>
>+
>+  </device>
>+</deviceinfo>
>diff --git a/fdi/policy/20thirdparty/10-x11-video.fdi b/fdi/policy/20thirdparty/10-x11-video.fdi
>new file mode 100644
>index 0000000..9eb0dcb
>--- /dev/null
>+++ b/fdi/policy/20thirdparty/10-x11-video.fdi
>@@ -0,0 +1,13 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<deviceinfo version="0.2">
>+  <device>
>+
>+    <match key="pci.device_class" int="3">
>+      <match key="pci.device_subclass" int="0">
>+        <append key="info.capabilities" type="strlist">vga</append>
>+
>+      </match>
>+    </match>
>+
>+  </device>
>+</deviceinfo>
>diff --git a/fdi/policy/20thirdparty/Makefile.am b/fdi/policy/20thirdparty/Makefile.am
>index 509146a..1f4048e 100644
>--- a/fdi/policy/20thirdparty/Makefile.am
>+++ b/fdi/policy/20thirdparty/Makefile.am
>@@ -1,7 +1,9 @@
> 
> fdidir = $(datadir)/hal/fdi/policy/20thirdparty
> 
>-dist_fdi_DATA =
>+dist_fdi_DATA = \
>+	10-mac-mouse-emu.fdi \
>+	10-x11-video.fdi
> 
> 
> 
>diff --git a/hal.conf.in b/hal.conf.in
>index 403465e..659f13d 100644
>--- a/hal.conf.in
>+++ b/hal.conf.in
>@@ -20,12 +20,53 @@
>            send_interface="org.freedesktop.DBus.Introspectable"/>
>     <allow send_destination="org.freedesktop.Hal"
>            send_interface="org.freedesktop.DBus.Properties" />
>+    <allow send_destination="org.freedesktop.Hal"
>+           send_interface="org.freedesktop.DBus.Peer" />
> 
>     <allow send_destination="org.freedesktop.Hal"
>            send_interface="org.freedesktop.Hal.Device"/>
>     <allow send_destination="org.freedesktop.Hal"
>            send_interface="org.freedesktop.Hal.Manager"/>
> 
>+  </policy>
>+
>+  
>+  <policy at_console="true">
>+    <allow send_destination="org.freedesktop.Hal"
>+           send_interface="org.freedesktop.Hal.Device.CPUFreq"/>
>+    <allow send_destination="org.freedesktop.Hal"
>+    	   send_interface="org.freedesktop.Hal.Device.DockStation"/>
>+    <allow send_destination="org.freedesktop.Hal"
>+    	   send_interface="org.freedesktop.Hal.Device.KillSwitch"/>
>+    <allow send_destination="org.freedesktop.Hal"
>+    	   send_interface="org.freedesktop.Hal.Device.KeyboardBacklight"/>
>+    <allow send_destination="org.freedesktop.Hal"
>+    	   send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
>+    <allow send_destination="org.freedesktop.Hal"
>+    	   send_interface="org.freedesktop.Hal.Device.Leds"/>
>+    <allow send_destination="org.freedesktop.Hal"
>+    	   send_interface="org.freedesktop.Hal.Device.LightSensor"/>
>+    <allow send_destination="org.freedesktop.Hal"
>+    	   send_interface="org.freedesktop.Hal.Device.Storage"/>
>+    <allow send_destination="org.freedesktop.Hal"
>+    	   send_interface="org.freedesktop.Hal.Device.Storage.Removable"/>
>+    <allow send_destination="org.freedesktop.Hal"
>+    	   send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
>+    <allow send_destination="org.freedesktop.Hal"
>+    	   send_interface="org.freedesktop.Hal.Device.Volume"/>
>+    <allow send_destination="org.freedesktop.Hal"
>+    	   send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
>+    <allow send_destination="org.freedesktop.Hal"
>+    	   send_interface="org.freedesktop.Hal.Device.WakeOnLan"/>
>+
>+  </policy>
>+
>+  <policy user="gdm">
>+    <allow send_destination="org.freedesktop.Hal"
>+    	   send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
>+  </policy>
>+
>+  <policy user="root">
>     <allow send_destination="org.freedesktop.Hal"
>            send_interface="org.freedesktop.Hal.Device.CPUFreq"/>
>     <allow send_destination="org.freedesktop.Hal"
>diff --git a/hald/Makefile.am b/hald/Makefile.am
>index 5b16948..4ea2ead 100644
>--- a/hald/Makefile.am
>+++ b/hald/Makefile.am
>@@ -9,7 +9,7 @@ AM_CPPFLAGS = \
> 	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
> 	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
> 	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
>-	-DPACKAGE_SCRIPT_DIR=\""$(libexecdir)/scripts"\" \
>+	-DPACKAGE_SCRIPT_DIR=\""$(datadir)/hal/scripts"\" \
> 	-DHALD_SOCKET_DIR=\""$(HALD_SOCKET_DIR)"\" \
> 	-DHALD_PID_FILE=\""$(HALD_PID_FILE)"\" \
> 	-DPCI_IDS_DIR=\""$(PCI_IDS_DIR)"\" \
>diff --git a/hald/freebsd/addons/addon-storage.c b/hald/freebsd/addons/addon-storage.c
>index 3125037..cd28581 100644
>--- a/hald/freebsd/addons/addon-storage.c
>+++ b/hald/freebsd/addons/addon-storage.c
>@@ -107,8 +107,7 @@ hf_addon_storage_update (void)
> 
> 	  if (hf_addon_storage_cdrom_eject_pressed(cdrom))
> 	    {
>-	      libhal_device_emit_condition(hfp_ctx, hfp_udi, "EjectPressed", "", &hfp_error);
>-	      dbus_error_free(&hfp_error);
>+	      libhal_device_emit_condition(hfp_ctx, hfp_udi, "EjectPressed", "", NULL);
> 	    }
> 
> 	  hfp_cdrom_free(cdrom);
>@@ -164,19 +163,17 @@ unmount_volumes (void)
>                                                          "block.storage_device",
> 							 hfp_udi,
> 							 &num_volumes,
>-							 &hfp_error)) != NULL)
>+							 NULL)) != NULL)
>     {
>       int i;
> 
>-      dbus_error_free(&hfp_error);
>-
>       for (i = 0; i < num_volumes; i++)
>         {
>           char *vol_udi;
> 
> 	  vol_udi = volumes[i];
> 
>-	  if (libhal_device_get_property_bool(hfp_ctx, vol_udi, "volume.is_mounted", &hfp_error))
>+	  if (libhal_device_get_property_bool(hfp_ctx, vol_udi, "volume.is_mounted", NULL))
>             {
>               DBusMessage *msg = NULL;
> 	      DBusMessage *reply = NULL;
>@@ -185,7 +182,6 @@ unmount_volumes (void)
> 	      char **options = NULL;
> 	      char *devfile;
> 
>-	      dbus_error_free(&hfp_error);
>               hfp_info("Forcing unmount of volume '%s'", vol_udi);
> 
> 	      dbus_connection = libhal_ctx_get_dbus_connection(hfp_ctx);
>@@ -265,10 +261,9 @@ poll_for_media (boolean check_only, boolean force)
>       check_lock_state = FALSE;
> 
>       hfp_info("Checking whether device %s is locked by HAL", addon.device_file);
>-      if (libhal_device_is_locked_by_others(hfp_ctx, hfp_udi, "org.freedesktop.Hal.Device.Storage", &hfp_error))
>+      if (libhal_device_is_locked_by_others(hfp_ctx, hfp_udi, "org.freedesktop.Hal.Device.Storage", NULL))
>         {
>           hfp_info("... device %s is locked by HAL", addon.device_file);
>-	  dbus_error_free(&hfp_error);
> 	  is_locked_by_hal = TRUE;
> 	  update_proc_title(addon.device_file);
> 	  goto skip_check;
>@@ -278,10 +273,8 @@ poll_for_media (boolean check_only, boolean force)
>           hfp_info("... device %s is not locked by HAL", addon.device_file);
> 	  is_locked_by_hal = FALSE;
> 	}
>-      dbus_error_free(&hfp_error);
> 
>-      should_poll = libhal_device_get_property_bool(hfp_ctx, hfp_udi, "storage.media_check_enabled", &hfp_error);
>-      dbus_error_free(&hfp_error);
>+      should_poll = libhal_device_get_property_bool(hfp_ctx, hfp_udi, "storage.media_check_enabled", NULL);
>       polling_disabled = ! should_poll;
>       update_proc_title(addon.device_file);
>     }
>@@ -314,8 +307,7 @@ poll_for_media (boolean check_only, boolean force)
>       unmount_volumes();
> #endif
> 
>-      libhal_device_rescan(hfp_ctx, hfp_udi, &hfp_error);
>-      dbus_error_free(&hfp_error);
>+      libhal_device_rescan(hfp_ctx, hfp_udi, NULL);
>       addon.had_media = has_media;
> 
>       return TRUE;
>@@ -412,12 +404,10 @@ main (int argc, char **argv)
>     ! strcmp(driver, "cd")))) && ! strcmp(removable, "true");
>   addon.had_media = poll_for_media(TRUE, FALSE);
> 
>-  if (! libhal_device_addon_is_ready(hfp_ctx, hfp_udi, &hfp_error))
>+  if (! libhal_device_addon_is_ready(hfp_ctx, hfp_udi, NULL))
>     goto end;
>-  dbus_error_free(&hfp_error);
> 
>-  syscon = dbus_bus_get(DBUS_BUS_SYSTEM, &hfp_error);
>-  dbus_error_free(&hfp_error);
>+  syscon = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
>   assert(syscon != NULL);
>   dbus_connection_set_exit_on_disconnect(syscon, 0);
> 
>@@ -452,12 +442,11 @@ main (int argc, char **argv)
> 				      "    <method name=\"CheckForMedia\">\n"
> 				      "      <arg name=\"call_had_sideeffect\" direction=\"out\" type=\"b\"/>\n"
> 				      "    </method>\n",
>-				      &hfp_error))
>+				      NULL))
>     {
>       hfp_critical("Cannot claim interface 'org.freedesktop.Hal.Device.Storage.Removable'");
>       goto end;
>     }
>-  dbus_error_free(&hfp_error);
> 
>   while (TRUE)
>     {
>diff --git a/hald/freebsd/hf-storage.c b/hald/freebsd/hf-storage.c
>index 3bc5ab9..3833ec8 100644
>--- a/hald/freebsd/hf-storage.c
>+++ b/hald/freebsd/hf-storage.c
>@@ -30,6 +30,7 @@
> #include <limits.h>
> #include <inttypes.h>
> #include <string.h>
>+#include <unistd.h>
> #include <sys/param.h>
> #include <sys/types.h>
> #include <sys/disklabel.h>
>@@ -418,10 +419,39 @@ hf_storage_parse_conftxt (const char *conftxt)
> 	  continue;
> 	}
> 
>+      /* XXX This is a hack, but we need to ignore dynamic labels like
>+       * ufsids which are created and destroyed based on whether or not
>+       * the actual device is mounted or not.  If we don't then strange
>+       * things happen in applications like nautilus.
>+       */
>+      if ((! strcmp(fields[1], "LABEL") ||
>+          ! strcmp(fields[1], "BSD")) &&
>+          ! strncmp(fields[2], "ufsid/", strlen("ufsid/")))
>+        {
>+          g_strfreev(fields);
>+	  continue;
>+	}
>+
>       geom_obj = g_new0(Geom_Object, 1);
> 
>       geom_obj->class = g_strdup(fields[1]);
>       geom_obj->dev = g_strdup(fields[2]);
>+      /* Allow for spaces in label names. */
>+      if (! strcmp(fields[1], "LABEL"))
>+        {
>+          int j;
>+
>+	  for (j = 3; g_strv_length(fields) > (j + 2) &&
>+               strcmp(fields[j + 2], "i"); j++)
>+            {
>+              char *tmp;
>+
>+	      tmp = g_strdup_printf("%s %s", geom_obj->dev, fields[j]);
>+	      g_free(geom_obj->dev);
>+	      geom_obj->dev = tmp;
>+	    }
>+	}
>+
>       geom_obj->type = -1;	/* We use -1 here to denote a missing type. */
>       geom_obj->hash = hash;
> 
>@@ -589,11 +619,16 @@ hf_storage_devd_notify (const char *system,
>   char *conftxt;
>   GSList *new_disks;
> 
>-  if (strcmp(system, "DEVFS") || strcmp(subsystem, "CDEV") ||
>+  if (! data || strcmp(system, "DEVFS") || strcmp(subsystem, "CDEV") ||
>       (strcmp(type, "CREATE") && strcmp(type, "DESTROY")))
>     return FALSE;
> 
>+  if (! strcmp(type, "DESTROY"))
>+    g_usleep(G_USEC_PER_SEC/2);
>+
>   conftxt = hf_get_string_sysctl(NULL, "kern.geom.conftxt");
>+  if (! conftxt)
>+    return FALSE;
>   new_disks = hf_storage_parse_conftxt(conftxt);
>   g_free(conftxt);
> 
>@@ -669,7 +704,7 @@ hf_storage_conftxt_timeout_cb (gpointer data)
>   if (hf_is_waiting)
>     return TRUE;
> 
>-  hf_storage_devd_notify("DEVFS", "CDEV", "CREATE", NULL);
>+  hf_storage_devd_notify("DEVFS", "CDEV", "CREATE", "");
> 
>   return TRUE;
> }
>diff --git a/hald/freebsd/hf-usb.c b/hald/freebsd/hf-usb.c
>index 280e0db..3f36087 100644
>--- a/hald/freebsd/hf-usb.c
>+++ b/hald/freebsd/hf-usb.c
>@@ -32,8 +32,8 @@
> #include <fcntl.h>
> #include <sys/ioctl.h>
> #include <unistd.h>
>-#if __FreeBSD_version < 800092
>-#if __FreeBSD_version >= 800064
>+#if (__FreeBSD_version < 800092) || (__FreeBSD_kernel_version < 800092)
>+#if (__FreeBSD_version >= 800064) || (__FreeBSD_kernel_version >= 800064)
> #include <legacy/dev/usb/usb.h>
> #else
> #include <dev/usb/usb.h>
>@@ -47,9 +47,9 @@
> #include "hf-devtree.h"
> #include "hf-util.h"
> 
>-#if __FreeBSD_version < 800092
>+#if (__FreeBSD_version < 800092) || (__FreeBSD_kernel_version < 800092)
> #define HF_USB_DEVICE			"/dev/usb"
>-#if __FreeBSD_version < 800066
>+#if (__FreeBSD_version < 800066) || (__FreeBSD_kernel_version < 800066)
> #define HF_USB2_DEVICE			"/dev/usb "
> #else
> #define HF_USB2_DEVICE			"/dev/usbctl"
>diff --git a/hald/freebsd/hf-usb2.c b/hald/freebsd/hf-usb2.c
>index fff49e0..301846f 100644
>--- a/hald/freebsd/hf-usb2.c
>+++ b/hald/freebsd/hf-usb2.c
>@@ -42,22 +42,6 @@
> static struct libusb20_backend *hf_usb2_be = NULL;
> 
> static void
>-hf_usb2_copy_parent (HalDevice *parent,
>-		     const char *key,
>-		     gpointer user_data)
>-{
>-  HalDevice *device;
>-
>-  g_return_if_fail(HAL_IS_DEVICE(parent));
>-  g_return_if_fail(HAL_IS_DEVICE(user_data));
>-
>-  device = HAL_DEVICE(user_data);
>-
>-  if (! strncmp(key, "usb_device.", strlen("usb_device.")))
>-    hal_device_copy_property(parent, key, device, key);
>-}
>-
>-static void
> hf_usb2_probe_interfaces(HalDevice *parent)
> {
>   int num_interfaces;
>@@ -79,9 +63,9 @@ hf_usb2_probe_interfaces(HalDevice *parent)
> 
>       hal_device_property_set_string(device, "info.subsystem", "usb");
>       hal_device_property_set_int(device, "usb.interface.number", i);
>-      hal_device_property_foreach(parent, hf_usb2_copy_parent, device);
>       hal_device_copy_property(parent, "info.product", device, "info.product");
>       hal_device_copy_property(parent, "info.vendor", device, "info.vendor");
>+      hal_device_merge_with_rewrite(device, parent, "usb.", "usb_device.");
> 
>       if (hf_device_preprobe(device))
>         {
>@@ -98,10 +82,10 @@ hf_usb2_probe_interfaces(HalDevice *parent)
> 	  if (driver)
>             {
> 	      if (! strcmp(driver, "ukbd"))
>-                hf_device_set_input(device, "keyboard", NULL);
>-	      else if (! strcmp(driver, "ums"))
>+                hf_device_set_input(device, "keyboard", "keys", devname);
>+	      else if (! strcmp(driver, "ums") || ! strcmp(driver, "atp"))
>                 {
>-                  hf_device_set_input(device, "mouse", devname);
>+                  hf_device_set_input(device, "mouse", NULL, devname);
> 	          hf_runner_run_sync(device, 0, "hald-probe-mouse", NULL);
> 	        }
> 	      else if (! strcmp(driver, "uhid"))
>@@ -192,11 +176,12 @@ hf_usb2_probe (void)
>       addr = libusb20_dev_get_address(pdev);
> 
>       if (addr == 1)
>-        parent = hf_devtree_find_parent_from_info(hald_get_gdl(), "usbus", bus);
>+        parent = hf_devtree_find_from_info(hald_get_gdl(), "usbus", bus);
>       else
>         parent = hf_device_store_match(hald_get_gdl(), "usb_device.bus_number",
>           HAL_PROPERTY_TYPE_INT32, bus, "usb_device.port_number",
>-	  HAL_PROPERTY_TYPE_INT32, addr - 1, NULL);
>+	  HAL_PROPERTY_TYPE_INT32, addr - 1, "info.bus",
>+	  HAL_PROPERTY_TYPE_STRING, "usb_device", NULL);
>       if (! parent || hal_device_property_get_bool(parent, "info.ignore"))
>         continue;
> 
>@@ -216,7 +201,13 @@ hf_usb2_devd_add (const char *name,
>   HalDevice *parent_device;
>   int bus, addr, pbus, paddr;
> 
>-  if (strncmp(name, "ugen", strlen("ugen")))
>+  if (! parent)
>+    return FALSE;
>+
>+  if (strncmp(name, "ugen", strlen("ugen")) &&
>+      ! strncmp(parent, "uhub", strlen("uhub")))
>+    return TRUE;
>+  else if (strncmp(name, "ugen", strlen("ugen")))
>     return FALSE;
>   else if (strncmp(parent, "ugen", strlen("ugen")))
>     return TRUE;
>@@ -232,7 +223,8 @@ hf_usb2_devd_add (const char *name,
> 
>   parent_device = hf_device_store_match(hald_get_gdl(),
>     "usb_device.bus_number", HAL_PROPERTY_TYPE_INT32, pbus,
>-    "usb_device.port_number", HAL_PROPERTY_TYPE_INT32, paddr, NULL);
>+    "usb_device.port_number", HAL_PROPERTY_TYPE_INT32, paddr, "info.bus",
>+    HAL_PROPERTY_TYPE_STRING, "usb_device", NULL);
> 
>   if (parent_device && ! hal_device_property_get_bool(parent_device,
>       "info.ignore"))
>@@ -255,8 +247,6 @@ hf_usb2_devd_remove (const char *name,
> 
>   if (strncmp(name, "ugen", strlen("ugen")))
>     return FALSE;
>-  else if (strncmp(parent, "ugen", strlen("ugen")))
>-    return TRUE;
> 
>   if (sscanf(name, "ugen%i.%i", &bus, &addr) != 2)
>     return FALSE;
>@@ -265,7 +255,8 @@ hf_usb2_devd_remove (const char *name,
> 
>   device = hf_device_store_match(hald_get_gdl(), "usb_device.bus_number",
>     HAL_PROPERTY_TYPE_INT32, bus, "usb_device.port_number",
>-    HAL_PROPERTY_TYPE_INT32, addr, NULL);
>+    HAL_PROPERTY_TYPE_INT32, addr, "info.bus",
>+    HAL_PROPERTY_TYPE_STRING, "usb_device", NULL);
> 
>   if (device)
>     {
>@@ -276,6 +267,23 @@ hf_usb2_devd_remove (const char *name,
>   return FALSE;
> }
> 
>+static gboolean
>+hf_usb2_devd_notify (const char *system,
>+		     const char *subsystem,
>+		     const char *type,
>+		     const char *data)
>+{
>+  if (! data || strcmp(system, "DEVFS") || strcmp(subsystem, "CDEV") ||
>+      (strcmp(type, "CREATE") && strcmp(type, "DESTROY")))
>+    return FALSE;
>+
>+  if (! strncmp(data, "cdev=ugen", strlen("cdev=ugen")) ||
>+      ! strncmp(data, "cdev=usb", strlen("cdev=usb")))
>+    return TRUE;
>+
>+  return FALSE;
>+}
>+
> HFHandler hf_usb2_handler = {
>   .privileged_init	= hf_usb2_privileged_init,
>   .probe		= hf_usb2_probe
>@@ -283,5 +291,6 @@ HFHandler hf_usb2_handler = {
> 
> HFDevdHandler hf_usb2_devd_handler = {
>   .add =	hf_usb2_devd_add,
>-  .remove =	hf_usb2_devd_remove
>+  .remove =	hf_usb2_devd_remove,
>+  .notify =     hf_usb2_devd_notify
> };
>diff --git a/hald/freebsd/hf-volume.c b/hald/freebsd/hf-volume.c
>index 249d2bd..07cf805 100644
>--- a/hald/freebsd/hf-volume.c
>+++ b/hald/freebsd/hf-volume.c
>@@ -86,9 +86,12 @@ hf_volume_resolve_fuse (const char *special)
>         {
>           if (strcmp(fields[0], special) == 0)
> 	    {
>+	      char *ret;
>+
>+	      ret = g_strdup(fields[1]);
> 	      g_strfreev(fields);
> 	      g_strfreev(lines);
>-	      return g_strdup(fields[1]);
>+	      return ret;
> 	    }
> 	}
>       g_strfreev(fields);
>diff --git a/hald/freebsd/probing/Makefile.am b/hald/freebsd/probing/Makefile.am
>index 3e439b5..67b8dcf 100644
>--- a/hald/freebsd/probing/Makefile.am
>+++ b/hald/freebsd/probing/Makefile.am
>@@ -67,5 +67,5 @@ hald_probe_volume_CPPFLAGS = $(AM_CPPFLAGS) @GLIB_CFLAGS@ @VOLUME_ID_CFLAGS@
> hald_probe_volume_LDADD = \
> 	@GLIB_LIBS@							\
> 	@VOLUME_ID_LIBS@						\
>-	-lufs								\
>+	@LIBUFS_LIBS@							\
> 	$(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
>diff --git a/hald/freebsd/probing/probe-hiddev.c b/hald/freebsd/probing/probe-hiddev.c
>index f0c598b..054b159 100644
>--- a/hald/freebsd/probing/probe-hiddev.c
>+++ b/hald/freebsd/probing/probe-hiddev.c
>@@ -34,7 +34,7 @@
> #include <dev/usb/usb.h>
> #include <dev/usb/usbhid.h>
> #else
>-#if __FreeBSD_version >= 800064
>+#if (__FreeBSD_version >= 800064) || (__FreeBSD_kernel_version >= 800064)
> #include <dev/usb/usbhid.h>
> #else
> #include <dev/usb2/include/usb2_hid.h>
>diff --git a/hald/freebsd/probing/probe-usb2-device.c b/hald/freebsd/probing/probe-usb2-device.c
>index 129a1b1..8a3596a 100644
>--- a/hald/freebsd/probing/probe-usb2-device.c
>+++ b/hald/freebsd/probing/probe-usb2-device.c
>@@ -34,7 +34,7 @@
> 
> #include <libusb20_desc.h>
> #include <libusb20.h>
>-#if __FreeBSD_version >= 800064
>+#if (__FreeBSD_version >= 800064) || (__FreeBSD_kernel_version >= 800064)
> #include <dev/usb/usb_ioctl.h>
> #else
> #include <dev/usb2/include/usb2_standard.h>
>@@ -73,7 +73,7 @@ main(int argc, char **argv)
>     {
>       struct LIBUSB20_DEVICE_DESC_DECODED *ddesc;
>       struct LIBUSB20_CONFIG_DESC_DECODED *cdesc;
>-#if __FreeBSD_version >= 800092
>+#if (__FreeBSD_version >= 800092) || (__FreeBSD_kernel_version >= 800092)
>       struct usb_device_info di;
> #else
>       struct usb2_device_info di;
>diff --git a/hald/freebsd/probing/probe-usb2-interface.c b/hald/freebsd/probing/probe-usb2-interface.c
>index f57bb77..9c0523a 100644
>--- a/hald/freebsd/probing/probe-usb2-interface.c
>+++ b/hald/freebsd/probing/probe-usb2-interface.c
>@@ -34,7 +34,7 @@
> 
> #include <libusb20_desc.h>
> #include <libusb20.h>
>-#if __FreeBSD_version >= 800064
>+#if (__FreeBSD_version >= 800064) || (__FreeBSD_kernel_version >= 800064)
> #include <dev/usb/usb_ioctl.h>
> #else
> #include <dev/usb2/include/usb2_standard.h>
>@@ -58,11 +58,11 @@ main(int argc, char **argv)
>   if (pbe == NULL)
>     goto end;
> 
>-  busstr = getenv("HAL_PROP_USB_DEVICE_BUS_NUMBER");
>+  busstr = getenv("HAL_PROP_USB_BUS_NUMBER");
>   if (! busstr)
>     goto end;
> 
>-  addrstr = getenv("HAL_PROP_USB_DEVICE_PORT_NUMBER");
>+  addrstr = getenv("HAL_PROP_USB_PORT_NUMBER");
>   if (! addrstr)
>     goto end;
> 
>diff --git a/hald/freebsd/probing/probe-volume.c b/hald/freebsd/probing/probe-volume.c
>index 73e0318..9c8abde 100644
>--- a/hald/freebsd/probing/probe-volume.c
>+++ b/hald/freebsd/probing/probe-volume.c
>@@ -38,10 +38,12 @@
> #include <sys/param.h>
> #include <sys/mount.h>
> #include <sys/types.h>
>+#ifdef HAVE_LIBUFS
> #include <ufs/ufs/ufsmount.h>
> #include <ufs/ufs/dinode.h>
> #include <ufs/ffs/fs.h>
> #include <libufs.h>
>+#endif /* HAVE_LIBUFS */
> #include <isofs/cd9660/iso.h>
> #include <glib.h>
> #include <libvolume_id.h>
>@@ -561,6 +563,7 @@ main (int argc, char **argv)
> 
>   libhal_device_set_property_bool(hfp_ctx, hfp_udi, "volume.ignore", has_children || is_swap, &hfp_error);
> 
>+#ifdef HAVE_LIBUFS
>   if (vid && ! strcmp (vid->type, "ufs"))
>     {
>       struct uufsd ufsdisk;
>@@ -574,6 +577,7 @@ main (int argc, char **argv)
> 
> 	  snprintf(ufsid, sizeof(ufsid), "%08x%08x", ufsdisk.d_fs.fs_id[0], ufsdisk.d_fs.fs_id[1]);
> 	  libhal_device_set_property_string(hfp_ctx, hfp_udi, "volume.freebsd.ufsid", ufsid, &hfp_error);
>+	  dbus_error_free(&hfp_error);
> 	  ufs_devs = libhal_manager_find_device_string_match(hfp_ctx,
> 			  				     "volume.freebsd.ufsid",
> 							     ufsid,
>@@ -582,16 +586,17 @@ main (int argc, char **argv)
> 	  dbus_error_free(&hfp_error);
> 	  for (i = 0; i < num_udis; i++)
>             {
>-              if (ufs_devs[i] != NULL)
>+              if (ufs_devs[i] != NULL && strcmp(ufs_devs[i], hfp_udi))
>                 {
>                   gboolean mounted;
> 
> 		  mounted = libhal_device_get_property_bool(hfp_ctx, ufs_devs[i], "volume.is_mounted", &hfp_error);
>-		  dbus_error_free(&hfp_error);
>+	          dbus_error_free(&hfp_error);
> 		  if (mounted)
>-		    {
>+	            {
>                       libhal_device_set_property_bool(hfp_ctx, hfp_udi, "volume.ignore", TRUE, &hfp_error);
> 		      dbus_error_free(&hfp_error);
>+		      break;
> 		    }
> 		}
> 	    }
>@@ -600,6 +605,7 @@ main (int argc, char **argv)
> 	  ufs_disk_close(&ufsdisk);
> 	}
>     }
>+#endif /* HAVE_LIBUFS */
> 
>   if (has_children)
>     usage = "partitiontable";
>diff --git a/hald/haldaemon.in b/hald/haldaemon.in
>index cd6dfde..34b9f20 100755
>--- a/hald/haldaemon.in
>+++ b/hald/haldaemon.in
>@@ -1,74 +1,79 @@
> #!/bin/sh
> #
>-# haldaemon:   HAL daemon
>+# haldaemon:	HAL daemon
> #
>-# chkconfig: 345 98 02
>-# description:  This is a daemon for collecting and maintaing information \
>-#               about hardware from several sources. \
>-#               See http://www.freedesktop.org/Software/hal
>+# chkconfig:	345 11 91
> #
>-# processname: hald
>-# pidfile: @HALD_PID_FILE@
>+# description:	This is a daemon for collecting and maintaing information
>+#               about hardware from several sources.
>+#               See http://www.freedesktop.org/software/hal
> #
> 
>-# Sanity checks.
>-[ -x @sbindir@/hald ] || exit 0
>+# Do not load RH compatibility interface.
>+WITHOUT_RC_COMPAT=1
> 
>-# Source function library.
>+# Source function library
> . @sysconfdir@/rc.d/init.d/functions
> 
>-# so we can rearrange this easily
>-processname=hald
>-servicename=haldaemon
>-
>+DAEMON=@sbindir@/hald
>+LOCKFILE=@localstatedir@/lock/subsys/hal
>+PIDFILE=@HALD_PID_FILE@
> RETVAL=0
> 
>-start() {
>-    echo -n $"Starting HAL daemon: "
>-    daemon --check $servicename $processname
>-    RETVAL=$?
>-    echo
>-    [ $RETVAL -eq 0 ] && touch @localstatedir@/lock/subsys/$servicename
>+start()
>+{
>+	msg_starting $"HAL"
>+	start_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" --no-announce -- $DAEMON
>+	RETVAL=$?
>+	return $RETVAL
> }
> 
>-stop() {
>-    echo -n $"Stopping HAL daemon: "
>+stop()
>+{
>+	msg_stopping $"HAL"
>+	stop_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" --no-announce -- $DAEMON
>+	RETVAL=$?
>+	return $RETVAL
>+}
> 
>-    killproc $servicename -TERM
>-    RETVAL=$?
>-    echo
>-    if [ $RETVAL -eq 0 ]; then
>-        rm -f @localstatedir@/lock/subsys/$servicename
>-        rm -f @HALD_PID_FILE@
>-    fi
>+restart()
>+{
>+	stop
>+	start
> }
> 
> # See how we were called.
> case "$1" in
>-    start)
>-        start
>-        ;;
>-    stop)
>-        stop
>-        ;;
>-    status)
>-        status $processname
>-        RETVAL=$?
>-        ;;
>-    restart)
>-        stop
>-	sleep 3
>-        start
>-        ;;
>-    condrestart)
>-        if [ -f @localstatedir@/lock/subsys/$servicename ]; then
>-            stop
>-	    sleep 3
>-            start
>-        fi
>-        ;;
>-    *)
>-        echo $"Usage: $0 {start|stop|status|restart|condrestart}"
>-        ;;
>+  start)
>+	start
>+	;;
>+  stop)
>+	stop
>+	;;
>+  restart)
>+	restart
>+	;;
>+  reload)
>+	;;
>+  condrestart)
>+	if [ -e "$LOCKFILE" ]; then
>+	    restart
>+	fi
>+	;;
>+  condreload)
>+	;;
>+  condstop)
>+  	if [ -e "$LOCKFILE" ]; then
>+  	    stop
>+	fi
>+	;;
>+  status)
>+	status --pidfile "$PIDFILE" -- $DAEMON
>+	RETVAL=$?
>+	;;
>+  *)
>+	msg_usage "${0##*/} {start|stop|restart|reload|condrestart|condreload|condstop|status}"
>+	RETVAL=1
> esac
>+
> exit $RETVAL
>diff --git a/hald/linux/addons/addon-imac-backlight.c b/hald/linux/addons/addon-imac-backlight.c
>index e869192..54e4ea3 100644
>--- a/hald/linux/addons/addon-imac-backlight.c
>+++ b/hald/linux/addons/addon-imac-backlight.c
>@@ -158,7 +158,8 @@ main (int argc, char **argv)
> 		goto out;
> 	}
> 
>-	if (ioperm(0xB2, 0xB3, 1) < 0)
>+	/* Allow access to ports 0xB2 and 0xB3 */
>+	if (ioperm(0xB2, 2, 1) < 0)
> 	{
> 		HAL_ERROR (("ioperm failed (you should be root)."));
> 		exit(1);
>diff --git a/hald/linux/addons/addon-macbookpro-backlight.c b/hald/linux/addons/addon-macbookpro-backlight.c
>index 2a6fef6..c1bbbac 100644
>--- a/hald/linux/addons/addon-macbookpro-backlight.c
>+++ b/hald/linux/addons/addon-macbookpro-backlight.c
>@@ -507,7 +507,8 @@ main (int argc, char *argv[])
>  	state = INREG(0x7ae4);
>  	OUTREG(0x7ae4, state);
> 
>-	if (ioperm (0x300, 0x304, 1) < 0) {
>+	/* Allow access to porta 0x300 through 0x304 */
>+	if (ioperm (0x300, 5, 1) < 0) {
> 		HAL_ERROR (("ioperm failed (you should be root)."));
> 		exit(1);
> 	}
>diff --git a/hald/linux/probing/probe-hiddev.c b/hald/linux/probing/probe-hiddev.c
>index 45d2084..bffc040 100644
>--- a/hald/linux/probing/probe-hiddev.c
>+++ b/hald/linux/probing/probe-hiddev.c
>@@ -57,11 +57,12 @@ main (int argc, char *argv[])
> 	/* assume failure */
> 	ret = 1;
> 
>+	dbus_error_init (&error);
>+
> 	udi = getenv ("UDI");
> 	if (udi == NULL)
> 		goto out;
> 
>-	dbus_error_init (&error);
> 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
> 		goto out;
> 
>diff --git a/hald/linux/probing/probe-ieee1394-unit.c b/hald/linux/probing/probe-ieee1394-unit.c
>index 70b0f86..aaa92e2 100644
>--- a/hald/linux/probing/probe-ieee1394-unit.c
>+++ b/hald/linux/probing/probe-ieee1394-unit.c
>@@ -388,6 +388,8 @@ int main (int argc, char *argv[])
> 
> 	setup_logger ();
> 
>+	dbus_error_init (&error);
>+
> 	udi = getenv ("UDI");
> 	if (udi == NULL)
> 		goto out;
>@@ -396,7 +398,6 @@ int main (int argc, char *argv[])
> 	if (ieee1394_udi == NULL)
> 		goto out;
> 
>-	dbus_error_init (&error);
> 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
> 		goto out;
> 
>diff --git a/hald/linux/probing/probe-input.c b/hald/linux/probing/probe-input.c
>index 94e9929..cad47d3 100644
>--- a/hald/linux/probing/probe-input.c
>+++ b/hald/linux/probing/probe-input.c
>@@ -70,6 +70,7 @@ main (int argc, char *argv[])
> 	fd = -1;
> 
> 	setup_logger ();
>+	dbus_error_init (&error);
> 
> 	button_type = getenv ("HAL_PROP_BUTTON_TYPE");
> 	if (button_type == NULL)
>@@ -96,7 +97,6 @@ main (int argc, char *argv[])
> 	if (udi == NULL)
> 		goto out;
> 
>-	dbus_error_init (&error);
> 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
> 		goto out;
> 
>diff --git a/hald/linux/probing/probe-net-bluetooth.c b/hald/linux/probing/probe-net-bluetooth.c
>index 0b1b912..e911eea 100644
>--- a/hald/linux/probing/probe-net-bluetooth.c
>+++ b/hald/linux/probing/probe-net-bluetooth.c
>@@ -141,6 +141,8 @@ main (int argc, char *argv[])
> 	DBusMessage *reply = NULL;
> 	DBusError error;
> 
>+	dbus_error_init (&error);
>+
> 	udi = getenv ("UDI");
> 	if (udi == NULL)
> 		goto out;
>@@ -151,8 +153,6 @@ main (int argc, char *argv[])
> 
> 	HAL_INFO (("Investigating '%s'", iface));
> 
>-	dbus_error_init (&error);
>-
> 	if ((conn = dbus_bus_get (DBUS_BUS_SYSTEM, &error)) == NULL)
> 		goto out;
> 
>diff --git a/hald/linux/probing/probe-printer.c b/hald/linux/probing/probe-printer.c
>index 91ed7bc..7c6d1c6 100644
>--- a/hald/linux/probing/probe-printer.c
>+++ b/hald/linux/probing/probe-printer.c
>@@ -66,6 +66,8 @@ main (int argc, char *argv[])
> 	ret = 1;
> 
> 	setup_logger ();
>+
>+	dbus_error_init (&error);
> 	
> 	udi = getenv ("UDI");
> 	if (udi == NULL) {
>@@ -73,7 +75,6 @@ main (int argc, char *argv[])
> 		goto out;
> 	}
> 
>-	dbus_error_init (&error);
> 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL) {
> 		HAL_ERROR (("ctx init failed"));
> 		goto out;
>diff --git a/hald/linux/probing/probe-smbios.c b/hald/linux/probing/probe-smbios.c
>index 0bc9689..15c0d4f 100644
>--- a/hald/linux/probing/probe-smbios.c
>+++ b/hald/linux/probing/probe-smbios.c
>@@ -129,6 +129,8 @@ main (int argc, char *argv[])
> 	ret = 1;
> 
> 	setup_logger ();
>+
>+	dbus_error_init (&error);
> 	
> 	udi = getenv ("UDI");
> 	if (udi == NULL) {
>@@ -136,7 +138,6 @@ main (int argc, char *argv[])
> 		goto out;
> 	}
> 
>-	dbus_error_init (&error);
> 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL) {
> 		HAL_ERROR (("ctx init failed"));
> 		goto out;
>diff --git a/hald/linux/probing/probe-storage.c b/hald/linux/probing/probe-storage.c
>index 824a82e..dd524ca 100644
>--- a/hald/linux/probing/probe-storage.c
>+++ b/hald/linux/probing/probe-storage.c
>@@ -109,6 +109,8 @@ main (int argc, char *argv[])
> 	/* assume failure */
> 	ret = 1;
> 
>+	dbus_error_init (&error);
>+
> 	if ((udi = getenv ("UDI")) == NULL)
> 		goto out;
> 	if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL)
>@@ -127,7 +129,6 @@ main (int argc, char *argv[])
> 	else
> 		only_check_for_fs = FALSE;
> 
>-	dbus_error_init (&error);
> 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
> 		goto out;
> 
>diff --git a/hald/linux/probing/probe-video4linux.c b/hald/linux/probing/probe-video4linux.c
>index cf913c0..7bc13e8 100644
>--- a/hald/linux/probing/probe-video4linux.c
>+++ b/hald/linux/probing/probe-video4linux.c
>@@ -58,6 +58,8 @@ main (int argc, char *argv[])
> 
> 	setup_logger ();
> 
>+	dbus_error_init (&error);
>+
> 	device_file = getenv ("HAL_PROP_VIDEO4LINUX_DEVICE");
> 	if (device_file == NULL)
> 		goto out;
>@@ -66,7 +68,6 @@ main (int argc, char *argv[])
> 	if (udi == NULL)
> 		goto out;
> 
>-	dbus_error_init (&error);
> 	ctx = libhal_ctx_init_direct (&error);
> 	if (ctx == NULL)
> 		goto out;
>diff --git a/hald/linux/probing/probe-volume.c b/hald/linux/probing/probe-volume.c
>index 0de1b91..7268fff 100644
>--- a/hald/linux/probing/probe-volume.c
>+++ b/hald/linux/probing/probe-volume.c
>@@ -318,6 +318,8 @@ main (int argc, char *argv[])
> 	/* assume failure */
> 	ret = 1;
> 
>+	dbus_error_init (&error);
>+
> 	if ((udi = getenv ("UDI")) == NULL)
> 		goto out;
> 	if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL)
>@@ -346,7 +348,6 @@ main (int argc, char *argv[])
> 
> 	fsusage = getenv ("HAL_PROP_VOLUME_FSUSAGE");
> 
>-	dbus_error_init (&error);
> 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
> 		goto out;
> 
>diff --git a/hald/util.h b/hald/util.h
>index c2a1584..7883333 100644
>--- a/hald/util.h
>+++ b/hald/util.h
>@@ -38,7 +38,7 @@
> #endif
> 
> #define HAL_NAME_MAX 256
>-#define HAL_PATH_MAX 512
>+#define HAL_PATH_MAX 4096
> 
> gboolean hal_util_remove_trailing_slash (gchar *path);
> 
>diff --git a/libhal-storage/Makefile.am b/libhal-storage/Makefile.am
>index 3c7259b..c0b2c4f 100644
>--- a/libhal-storage/Makefile.am
>+++ b/libhal-storage/Makefile.am
>@@ -18,7 +18,7 @@ libhal_storage_la_SOURCES =                                       \
> 
> libhal_storage_la_LIBADD = @DBUS_LIBS@ $(top_builddir)/libhal/libhal.la
> 
>-libhal_storage_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
>+libhal_storage_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -Wl,--version-script=libhal-storage.map
> 
> 
> clean-local :
>diff --git a/libhal-storage/libhal-storage.map b/libhal-storage/libhal-storage.map
>new file mode 100644
>index 0000000..c00ca32
>--- /dev/null
>+++ b/libhal-storage/libhal-storage.map
>@@ -0,0 +1,6 @@
>+HAL_0.5.11 {
>+    global:
>+	libhal_drive_is_media_detection_automatic;
>+    local:
>+	[^l]*;
>+};
>diff --git a/libhal/Makefile.am b/libhal/Makefile.am
>index 12ae917..9bede22 100644
>--- a/libhal/Makefile.am
>+++ b/libhal/Makefile.am
>@@ -25,7 +25,7 @@ LIBGCOV =
> endif
> libhal_la_LIBADD = @DBUS_LIBS@ $(LIBGCOV) $(INTLLIBS)
> 
>-libhal_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
>+libhal_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -Wl,--version-script=libhal.map
> 
> clean-local :
> 	rm -f *~
>diff --git a/libhal/libhal.map b/libhal/libhal.map
>new file mode 100644
>index 0000000..bb0ac64
>--- /dev/null
>+++ b/libhal/libhal.map
>@@ -0,0 +1,6 @@
>+HAL_0.5.11 {
>+    global:
>+	libhal_get_all_devices_with_properties;
>+    local:
>+	[^l]*;
>+};
>diff --git a/tools/Makefile.am b/tools/Makefile.am
>index e7f029d..42c8e72 100644
>--- a/tools/Makefile.am
>+++ b/tools/Makefile.am
>@@ -17,7 +17,7 @@ AM_CPPFLAGS = \
> 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
> 	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
> 	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
>-	-DPACKAGE_SCRIPT_DIR=\""$(libexecdir)/scripts"\" \
>+	-DPACKAGE_SCRIPT_DIR=\""$(datadir)/hal/scripts"\" \
> 	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
> 	-I$(top_srcdir) -I$(top_srcdir)/libhal -I$(top_srcdir)/libhal-storage \
> 	@DBUS_CFLAGS@ @GLIB_CFLAGS@ @POLKIT_CFLAGS@
>@@ -156,7 +156,7 @@ hal_system_sonypic_SOURCES = hal-system-sonypic.c
> hal_system_sonypic_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ $(top_builddir)/libhal/libhal.la
> endif
> 
>-scriptdir = $(libexecdir)/scripts
>+scriptdir = $(datadir)/hal/scripts
> 
> script_SCRIPTS =				\
> 	hal-luks-setup                          \
>diff --git a/tools/hal-storage-mount.c b/tools/hal-storage-mount.c
>index 9471706..4a7a272 100644
>--- a/tools/hal-storage-mount.c
>+++ b/tools/hal-storage-mount.c
>@@ -792,7 +792,8 @@ handle_mount (LibHalContext *hal_ctx,
> 		if (v_fstype != NULL && 
> 		    strcmp (v_fstype, "vfat") != 0 && strcmp (v_fstype, "ntfs") != 0 &&
> 		    strcmp (v_fstype, "ntfs-3g") != 0 && strcmp (v_fstype, "iso9660") != 0 && 
>-		    strcmp (v_fstype, "hfs") != 0 && strcmp (v_fstype, "udf") != 0) {
>+		    strcmp (v_fstype, "hfs") != 0 && strcmp (v_fstype, "hfsplus") != 0 &&
>+		    strcmp (v_fstype, "subfs") != 0 && strcmp (v_fstype, "udf") != 0) {
> 			pol_change_uid = wants_to_change_uid;
> 		}
> 	}
>diff --git a/tools/linux/Makefile.am b/tools/linux/Makefile.am
>index 7f97c7d..b4ab98c 100644
>--- a/tools/linux/Makefile.am
>+++ b/tools/linux/Makefile.am
>@@ -10,14 +10,14 @@ AM_CPPFLAGS = \
> 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
> 	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
> 	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
>-	-DPACKAGE_SCRIPT_DIR=\""$(libexecdir)/scripts"\" \
>+	-DPACKAGE_SCRIPT_DIR=\""$(datadir)/hal/scripts"\" \
> 	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
> 	-I$(top_srcdir) -I$(top_srcdir)/libhal -I$(top_srcdir)/libhal-storage \
> 	@DBUS_CFLAGS@ @GLIB_CFLAGS@ @POLKIT_CFLAGS@
> 
> libexec_PROGRAMS =  
> 
>-scriptdir = $(libexecdir)/scripts/linux
>+scriptdir = $(datadir)/hal/scripts/linux
> 
> script_SCRIPTS =					\
> 	hal-luks-setup-linux                          	\
>diff --git a/tools/linux/hal-luks-remove-linux b/tools/linux/hal-luks-remove-linux
>index fc398e6..97628a9 100755
>--- a/tools/linux/hal-luks-remove-linux
>+++ b/tools/linux/hal-luks-remove-linux
>@@ -6,7 +6,7 @@
> # This program is free software; you can redistribute it and/or modify
> # it under the terms of the GNU General Public License version 2.
> 
>-CRYPTSETUP=/sbin/cryptsetup
>+CRYPTSETUP=/usr/sbin/cryptsetup
> 
> if [ ! -f $CRYPTSETUP ]; then
>     echo org.freedesktop.Hal.Device.Volume.Crypto.CryptSetupMissing >&2
>diff --git a/tools/linux/hal-luks-setup-linux b/tools/linux/hal-luks-setup-linux
>index 1f4ddb3..f071d01 100755
>--- a/tools/linux/hal-luks-setup-linux
>+++ b/tools/linux/hal-luks-setup-linux
>@@ -8,7 +8,7 @@
> 
> read PASSWORD 
> 
>-CRYPTSETUP=/sbin/cryptsetup
>+CRYPTSETUP=/usr/sbin/cryptsetup
> 
> if [ ! -f $CRYPTSETUP ]; then
>     echo org.freedesktop.Hal.Device.Volume.Crypto.CryptSetupMissing >&2
>diff --git a/tools/linux/hal-luks-teardown-linux b/tools/linux/hal-luks-teardown-linux
>index bf6c200..3f7153d 100755
>--- a/tools/linux/hal-luks-teardown-linux
>+++ b/tools/linux/hal-luks-teardown-linux
>@@ -6,7 +6,7 @@
> # This program is free software; you can redistribute it and/or modify
> # it under the terms of the GNU General Public License version 2.
> 
>-CRYPTSETUP=/sbin/cryptsetup
>+CRYPTSETUP=/usr/sbin/cryptsetup
> 
> if [ ! -f $CRYPTSETUP ]; then
> 	echo org.freedesktop.Hal.Device.Volume.Crypto.TeardownError >&2
>diff --git a/tools/linux/hal-system-killswitch-get-power-linux b/tools/linux/hal-system-killswitch-get-power-linux
>index 7892d0c..8a6ecdd 100755
>--- a/tools/linux/hal-system-killswitch-get-power-linux
>+++ b/tools/linux/hal-system-killswitch-get-power-linux
>@@ -8,11 +8,6 @@
> # the Free Software Foundation; either version 2 of the License, or
> # (at your option) any later version.
> 
>-DELL_WCTL=/usr/bin/dellWirelessCtl
>-if [ -x "/usr/sbin/dellWirelessCtl" ]; then
>-  DELL_WCTL=/usr/sbin/dellWirelessCtl
>-fi
>-
> if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
>     if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then
> 	value="`hal-system-sonypic getbluetooth`"
>@@ -22,25 +17,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
> 	    exit 1
> 	fi
> 	exit ${value}
>-    elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
>-	if [ -x "$DELL_WCTL" ]; then
>-	    # TODO: write our own binary that links with libsmbios?
>-	    $DELL_WCTL --st_bt
>-	    value=$?
>-	    if [ "$value" = "0" ]; then
>-	        exit 1
>-	    elif [ "$value" = "1" ]; then
>-	        exit 0
>-	    else
>-	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
>-	        echo "dellWirelessCtl returned $value" >&2
>-                exit 1
>-	    fi
>-        else
>-	    echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
>-	    echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
>-	    exit 1
>-	fi
>     elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -r "$HAL_PROP_LINUX_SYSFS_PATH" ]; then
> 	read value < $HAL_PROP_LINUX_SYSFS_PATH 2> /dev/null
> 	if [ $? -eq 0 ]; then
>@@ -55,56 +31,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
> 	echo "Access type not supported" >&2
> 	exit 1
>     fi
>-elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then
>-    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
>-	if [ -x "$DELL_WCTL" ]; then
>- 	    # TODO: write our own binary that links with libsmbios?
>-	    $DELL_WCTL --st_wlan
>-	    value=$?
>-	    if [ "$value" = "0" ]; then
>-	        exit 1
>-	    elif [ "$value" = "1" ]; then
>-	        exit 0
>-	    else
>-	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
>-	        echo "dellWirelessCtl returned $value" >&2
>-                exit 1
>-	    fi
>-	else 
>-	    echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
>-	    echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
>-	    exit 1
>-	fi
>-    else
>-	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
>-	echo "Access type not supported" >&2
>-	exit 1
>-    fi
>-elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then
>-    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
>-	if [ -x "$DELL_WCTL" ]; then
>-   	    # TODO: write our own binary that links with libsmbios?
>-	    $DELL_WCTL --st_wwan
>-	    value=$?
>-	    if [ "$value" = "0" ]; then
>-	        exit 1
>-	    elif [ "$value" = "1" ]; then
>-	        exit 0
>-	    else
>-	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
>-	        echo "dellWirelessCtl returned $value" >&2
>-                exit 1
>-	    fi
>-	else 
>-	    echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
>-	    echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
>-	    exit 1
>-	fi
>-    else
>-	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
>-	echo "Access type not supported" >&2
>-	exit 1
>-    fi
> else
>     echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
>     echo "Killswitch type not supported" >&2
>diff --git a/tools/linux/hal-system-killswitch-set-power-linux b/tools/linux/hal-system-killswitch-set-power-linux
>index 1420c69..fecaf7a 100755
>--- a/tools/linux/hal-system-killswitch-set-power-linux
>+++ b/tools/linux/hal-system-killswitch-set-power-linux
>@@ -8,11 +8,6 @@
> # the Free Software Foundation; either version 2 of the License, or
> # (at your option) any later version.
> 
>-DELL_WCTL=/usr/bin/dellWirelessCtl
>-if [ -x "/usr/sbin/dellWirelessCtl" ]; then
>-    DELL_WCTL=/usr/sbin/dellWirelessCtl
>-fi
>-
> if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
>     if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then
> 	hal-system-sonypic setbluetooth $value
>@@ -23,26 +18,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
> 	    exit 1
> 	fi
> 	exit 0
>-    elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
>-	if [ -x "$DELL_WCTL" ]; then
>-	    # TODO: write our own binary that links with libsmbios?
>-	    if [ "$value" = "true" ]; then
>-	        $DELL_WCTL --bt 1
>-	        ret=$?
>-	    else
>-	        $DELL_WCTL --bt 0
>-	        ret=$?
>-	    fi
>-	    if [ "$ret" != "0" ]; then
>-	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
>-	        echo "dellWirelessCtl returned $ret" >&2
>-	        exit 1
>-	    fi
>-        else
>-            echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
>-            echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
>-            exit 1
>-        fi
>     elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -w "$HAL_PROP_LINUX_SYSFS_PATH" ]; then
>         if [ "$value" = "true" ]; then 
> 	    bit=1; 
>@@ -61,60 +36,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
> 	echo "Access type not supported" >&2
> 	exit 1
>     fi
>-elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then
>-    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
>-	if [ -x "$DELL_WCTL" ]; then
>-	    # As a side effect we disable the physical kill switch
>-	    # TODO: write our own binary that links with libsmbios?
>-	    if [ "$value" = "true" ]; then
>-	        $DELL_WCTL --sw_wlan 0 --wlan 1
>-	        ret=$?
>-	    else
>-	        $DELL_WCTL --sw_wlan 0 --wlan 0
>-	        ret=$?
>-	    fi
>-	    if [ "$ret" != "0" ]; then
>-	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
>-	        echo "dellWirelessCtl returned $ret" >&2
>-                exit 1
>-	    fi
>-        else
>-            echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
>-            echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
>-            exit 1
>-        fi
>-    else
>-	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
>-	echo "Access type not supported" >&2
>-	exit 1
>-    fi
>-elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then
>-    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then 
>-	if [ -x "$DELL_WCTL" ]; then
>-	    # As a side effect we disable the physical kill switch
>-	    # TODO: write our own binary that links with libsmbios?
>-	    if [ "$value" = "true" ]; then
>-	        $DELL_WCTL --sw_wwan 0 --wwan 1
>-	        ret=$?
>-	    else
>-	        $DELL_WCTL --sw_wwan 0 --wwan 0
>-	        ret=$?
>-	    fi
>-	    if [ "$ret" != "0" ]; then
>-	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
>-	        echo "dellWirelessCtl returned $ret" >&2
>-                exit 1
>-	    fi
>-        else
>-            echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
>-            echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
>-            exit 1
>-        fi
>-    else
>-	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
>-	echo "Access type not supported" >&2
>-	exit 1
>-    fi
> else
>     echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
>     echo "Killswitch type not supported" >&2
>diff --git a/tools/linux/hal-system-power-hibernate-linux b/tools/linux/hal-system-power-hibernate-linux
>index 915e96e..6e53170 100755
>--- a/tools/linux/hal-system-power-hibernate-linux
>+++ b/tools/linux/hal-system-power-hibernate-linux
>@@ -26,6 +26,9 @@ QUIRKS=""
> if [ -x /usr/sbin/pm-hibernate ] ; then
> 	/usr/sbin/pm-hibernate $QUIRKS
> 	RET=$?
>+elif [ -x /usr/sbin/hibernate ]; then
>+	/usr/sbin/hibernate
>+	RET=$?
> else
> 	unsupported
> fi
>diff --git a/tools/linux/hal-system-power-suspend-linux b/tools/linux/hal-system-power-suspend-linux
>index 48ff1f5..0104a87 100755
>--- a/tools/linux/hal-system-power-suspend-linux
>+++ b/tools/linux/hal-system-power-suspend-linux
>@@ -36,6 +36,9 @@ if [ -x "/usr/sbin/pm-suspend" ] ; then
> 	export NUM_SECONDS_TO_SLEEP=$seconds_to_sleep
> 	/usr/sbin/pm-suspend $QUIRKS
> 	RET=$?
>+elif [ -x /usr/sbin/hibernate ] ; then
>+	/usr/sbin/hibernate -F /etc/hibernate/ram.conf
>+	RET=$?
> else
> 	# TODO: add support
> 	unsupported
>--- hal-0.5.14/hald/linux/osspec.c~	2009-12-01 00:19:48.000000000 +0200
>+++ hal-0.5.14/hald/linux/osspec.c	2013-04-06 22:22:18.877266584 +0300
>@@ -48,6 +48,8 @@
> #include <dbus/dbus.h>
> #include <dbus/dbus-glib.h>
> 
>+#include <libudev.h>
>+
> #include "../device_info.h"
> #include "../hald.h"
> #include "../hald_dbus.h"
>@@ -68,154 +70,59 @@
> #include "osspec_linux.h"
> 
> static gboolean hald_done_synthesizing_coldplug = FALSE;
>+struct udev *udev = NULL;
>+struct udev_monitor *mon = NULL;
> 
> static gboolean
> hald_udev_data (GIOChannel *source, GIOCondition condition, gpointer user_data)
> {
>-	int fd;
>-	int retval;
>-	struct msghdr smsg;
>-	struct cmsghdr *cmsg;
>-	struct iovec iov;
>-	struct ucred *cred;
>-	char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
>-
>-	char buf[4096];
>-	size_t bufpos = 0;
> 	const char *action = NULL;
> 	HotplugEvent *hotplug_event;
> 
>-	memset(buf, 0x00, sizeof (buf));
>-
>-	fd = g_io_channel_unix_get_fd (source);
>-
>-	iov.iov_base = &buf;
>-	iov.iov_len = sizeof (buf);
>-
>-	memset(&smsg, 0x00, sizeof (struct msghdr));
>-	smsg.msg_iov = &iov;
>-	smsg.msg_iovlen = 1;
>-	smsg.msg_control = cred_msg;
>-	smsg.msg_controllen = sizeof (cred_msg);
>-
>-	retval = recvmsg (fd, &smsg, 0);
>-	if (retval <  0) {
>-		if (errno != EINTR)
>-			HAL_INFO (("Unable to receive message, errno=%d", errno));
>-		goto out;
>-	}
>-	cmsg = CMSG_FIRSTHDR (&smsg);
>-	cred = (struct ucred *) CMSG_DATA (cmsg);
>-
>-	if (cmsg == NULL || cmsg->cmsg_type != SCM_CREDENTIALS) {
>-		HAL_INFO (("No sender credentials received, message ignored"));
>-		goto out;
>-	}
>-
>-	if (cred->uid != 0) {
>-		HAL_INFO (("Sender uid=%i, message ignored", cred->uid));
>-		goto out;
>-	}
>-
>-	if (!strstr(buf, "@/")) {
>-		HAL_INFO (("invalid message format"));
>-		goto out;
>-	}
>-
> 	hotplug_event = g_slice_new0 (HotplugEvent);
> 	hotplug_event->type = HOTPLUG_EVENT_SYSFS;
> 
>-	while (bufpos < sizeof (buf)) {
>-		size_t keylen;
>-		char *key;
>-		char *str, *dstr;
>-
>-		key = &buf[bufpos];
>-		keylen = strlen(key);
>-		if (keylen == 0)
>-			break;
>-		bufpos += keylen + 1;
>-
>-		if (strncmp(key, "ACTION=", 7) == 0)
>-			action = &key[7];
>-		else if (strncmp(key, "DEVPATH=", 8) == 0) {
>-
>-                        /* md devices are handled via looking at /proc/mdstat */
>-                        if (g_str_has_prefix (key + 8, "/block/md")) {
>-                                HAL_INFO (("skipping md event for %s", key + 8));
>-                                goto invalid;
>-                        }
>-
>-			g_snprintf (hotplug_event->sysfs.sysfs_path, sizeof (hotplug_event->sysfs.sysfs_path),
>-				    "/sys%s", &key[8]);
>-		} else if (strncmp(key, "DEVPATH_OLD=", 12) == 0) {
>-
>-                        /* md devices are handled via looking at /proc/mdstat */
>-                        if (g_str_has_prefix (key + 12, "/block/md")) {
>-                                HAL_INFO (("skipping md event for %s", key + 8));
>-                                goto invalid;
>-                        }
>-
>-			g_snprintf (hotplug_event->sysfs.sysfs_path_old, sizeof (hotplug_event->sysfs.sysfs_path_old),
>-				    "/sys%s", &key[12]);
>-		} else if (strncmp(key, "SUBSYSTEM=", 10) == 0)
>-			g_strlcpy (hotplug_event->sysfs.subsystem, &key[10], sizeof (hotplug_event->sysfs.subsystem));
>-		else if (strncmp(key, "DEVNAME=", 8) == 0)
>-			g_strlcpy (hotplug_event->sysfs.device_file, &key[8], sizeof (hotplug_event->sysfs.device_file));
>-		else if (strncmp(key, "SEQNUM=", 7) == 0)
>-			hotplug_event->sysfs.seqnum = strtoull(&key[7], NULL, 10);
>-		else if (strncmp(key, "IFINDEX=", 8) == 0)
>-			hotplug_event->sysfs.net_ifindex = strtoul(&key[8], NULL, 10);
>-		else if (strncmp(key, "ID_VENDOR=", 10) == 0) {
>-			if ((str = hal_util_strdup_valid_utf8(&key[10])) != NULL ) {
>-				g_strlcpy (hotplug_event->sysfs.vendor, str, sizeof(hotplug_event->sysfs.vendor));
>-				g_free (str);
>-			}
>-		} else if (strncmp(key, "ID_MODEL=", 9) == 0) {
>-			if ((str = hal_util_strdup_valid_utf8(&key[9])) != NULL ) {
>-				g_strlcpy (hotplug_event->sysfs.model, str, sizeof(hotplug_event->sysfs.model));
>-				g_free (str);
>-			}
>-		} else if (strncmp(key, "ID_REVISION=", 12) == 0) {
>-			if ((str = hal_util_strdup_valid_utf8(&key[12])) != NULL ) {
>-				g_strlcpy (hotplug_event->sysfs.revision, str, sizeof(hotplug_event->sysfs.revision));
>-				g_free (str);
>-			}
>-		} else if (strncmp(key, "ID_SERIAL=", 10) == 0) {
>-			if ((str = hal_util_strdup_valid_utf8(&key[10])) != NULL ) {
>-				g_strlcpy (hotplug_event->sysfs.serial, str, sizeof(hotplug_event->sysfs.serial));
>-				g_free (str);
>-			}
>-		} else if (strncmp(key, "ID_FS_USAGE=", 12) == 0) {
>-			if ((str = hal_util_strdup_valid_utf8(&key[12])) != NULL ) {
>-				g_strlcpy (hotplug_event->sysfs.fsusage, str, sizeof(hotplug_event->sysfs.fsusage));
>-				g_free (str);
>-			}
>-		} else if (strncmp(key, "ID_FS_TYPE=", 11) == 0) {
>-			if ((str = hal_util_strdup_valid_utf8(&key[11])) != NULL ) {
>-				g_strlcpy (hotplug_event->sysfs.fstype, str, sizeof(hotplug_event->sysfs.fstype));
>-				g_free (str);
>-			}
>-		} else if (strncmp(key, "ID_FS_VERSION=", 14) == 0) {
>-			if ((str = hal_util_strdup_valid_utf8(&key[14])) != NULL ) {
>-				g_strlcpy (hotplug_event->sysfs.fsversion, str, sizeof(hotplug_event->sysfs.fsversion));
>-				g_free (str);
>-			}
>-		} else if (strncmp(key, "ID_FS_UUID=", 11) == 0) {
>-			if ((str = hal_util_strdup_valid_utf8(&key[11])) != NULL ) {
>-				g_strlcpy (hotplug_event->sysfs.fsuuid, str, sizeof(hotplug_event->sysfs.fsuuid));
>-				g_free (str);
>-			}
>-		} else if (strncmp(key, "ID_FS_LABEL_ENC=", 16) == 0) {
>-			dstr = g_malloc0 (keylen - 15);
>-			hal_util_decode_escape (&key[16], dstr, sizeof(hotplug_event->sysfs.fslabel));
>-
>-			if ((str = hal_util_strdup_valid_utf8(dstr)) != NULL ) {
>-				g_strlcpy (hotplug_event->sysfs.fslabel, str, sizeof(hotplug_event->sysfs.fslabel));
>-				g_free (str);
>-			}
>-			g_free (dstr);
>-		}
>+	struct udev_device *dev = NULL;
>+        if((dev=udev_monitor_receive_device(mon)))
>+        {
>+	    char *str, *dstr;
>+	    action = udev_device_get_action(dev);
>+
>+            // md devices are handled via looking at /proc/mdstat
>+            if (g_str_has_prefix (udev_device_get_devpath(dev), "/block/md")) {
>+                HAL_INFO (("skipping md event for %s", udev_device_get_devpath(dev)));
>+                goto invalid;
>+            }
>+	    g_snprintf (hotplug_event->sysfs.sysfs_path, sizeof(hotplug_event->sysfs.sysfs_path), "/sys%s", udev_device_get_devpath(dev));
>+	    g_strlcpy (hotplug_event->sysfs.subsystem, udev_device_get_subsystem(dev), sizeof(hotplug_event->sysfs.subsystem));
>+	    g_strlcpy (hotplug_event->sysfs.device_file, udev_device_get_property_value(dev,"DEVNAME"), sizeof(hotplug_event->sysfs.device_file));
>+	    hotplug_event->sysfs.seqnum = udev_device_get_seqnum(dev);
>+	    if((str=udev_device_get_property_value(dev,"IFINDEX")))
>+		hotplug_event->sysfs.net_ifindex = strtoul(str, NULL, 10);
>+	    if((str=udev_device_get_property_value(dev,"ID_VENDOR")) && (str=hal_util_strdup_valid_utf8(str)))
>+	    { g_strlcpy (hotplug_event->sysfs.vendor, str, sizeof(hotplug_event->sysfs.vendor)); g_free (str); }
>+	    if((str=udev_device_get_property_value(dev,"ID_MODEL")) && (str=hal_util_strdup_valid_utf8(str)))
>+	    { g_strlcpy (hotplug_event->sysfs.model, str, sizeof(hotplug_event->sysfs.model)); g_free (str); }
>+	    if((str=udev_device_get_property_value(dev,"ID_REVISION")) && (str=hal_util_strdup_valid_utf8(str)))
>+	    { g_strlcpy (hotplug_event->sysfs.revision, str, sizeof(hotplug_event->sysfs.revision)); g_free (str); }
>+	    if((str=udev_device_get_property_value(dev,"ID_SERIAL")) && (str=hal_util_strdup_valid_utf8(str)))
>+	    { g_strlcpy (hotplug_event->sysfs.serial, str, sizeof(hotplug_event->sysfs.serial)); g_free (str); }
>+	    if((str=udev_device_get_property_value(dev,"ID_FS_USAGE")) && (str=hal_util_strdup_valid_utf8(str)))
>+	    { g_strlcpy (hotplug_event->sysfs.fsusage, str, sizeof(hotplug_event->sysfs.fsusage)); g_free (str); }
>+	    if((str=udev_device_get_property_value(dev,"ID_FS_TYPE")) && (str=hal_util_strdup_valid_utf8(str)))
>+	    { g_strlcpy (hotplug_event->sysfs.fstype, str, sizeof(hotplug_event->sysfs.fstype)); g_free (str); }
>+	    if((str=udev_device_get_property_value(dev,"ID_FS_VERSION")) && (str=hal_util_strdup_valid_utf8(str)))
>+	    { g_strlcpy (hotplug_event->sysfs.fsversion, str, sizeof(hotplug_event->sysfs.fsversion)); g_free (str); }
>+	    if((str=udev_device_get_property_value(dev,"ID_FS_UUID")) && (str=hal_util_strdup_valid_utf8(str)))
>+	    { g_strlcpy (hotplug_event->sysfs.fsuuid, str, sizeof(hotplug_event->sysfs.fsuuid)); g_free (str); }
>+	    if((str=udev_device_get_property_value(dev,"ID_FS_LABEL_ENC")))
>+	    {
>+		dstr = g_malloc0(strlen(str)+1);
>+		hal_util_decode_escape(str, dstr, sizeof(hotplug_event->sysfs.fslabel));
>+		if((str=hal_util_strdup_valid_utf8(dstr)))
>+		{ g_strlcpy (hotplug_event->sysfs.fslabel, str, sizeof(hotplug_event->sysfs.fslabel)); g_free (str); }
>+		g_free(dstr);
>+	    }
> 	}
> 
> 	if (!action) {
>@@ -284,7 +191,7 @@
> 
> invalid:
> 	g_slice_free (HotplugEvent, hotplug_event);
>-
>+	if(dev) udev_device_unref(dev);
> out:
> 	return TRUE;
> }
>@@ -430,9 +337,11 @@
> 		exit (1);
> 	}
> 	/* enable receiving of the sender credentials */
>-	setsockopt(udev_socket, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));
>+	udev = udev_new();
>+	mon = udev_monitor_new_from_netlink(udev, "udev");
>+	udev_monitor_enable_receiving(mon);
> 
>-	udev_channel = g_io_channel_unix_new (udev_socket);
>+	udev_channel = g_io_channel_unix_new (udev_monitor_get_fd(mon));
> 	g_io_add_watch (udev_channel, G_IO_IN, hald_udev_data, NULL);
> 	g_io_channel_unref (udev_channel);
> 
>--- hal-0.5.14/configure.in~	2013-04-06 22:41:10.824643391 +0300
>+++ hal-0.5.14/configure.in	2013-04-06 22:46:13.444945077 +0300
>@@ -14,6 +14,7 @@
> 
> glib_module="glib-2.0 >= 2.10.0 gobject-2.0 > 2.10.0 dbus-glib-1 >= 0.61"
> dbus_module="dbus-1 >= 0.61"
>+udev_module="libudev >= 168"
> blkid_module="blkid >= 2.15"
> volume_id_module="libvolume_id >= 0.77"
> polkit_module="polkit >= 0.5"
>@@ -692,6 +693,11 @@
> AC_SUBST(DBUS_CFLAGS)
> AC_SUBST(DBUS_LIBS)
> 
>+# udev libs
>+PKG_CHECK_MODULES(UDEVLIB, [$udev_module])
>+AC_SUBST(UDEVLIB_CFLAGS)
>+AC_SUBST(UDEVLIB_LIBS)
>+
> # glib libs
> PKG_CHECK_MODULES(GLIB, [$glib_module])
> AC_SUBST(GLIB_CFLAGS)
>--- hal-0.5.14/hald/Makefile.am~	2013-04-06 22:47:14.178613170 +0300
>+++ hal-0.5.14/hald/Makefile.am	2013-04-06 22:47:44.131436101 +0300
>@@ -74,7 +74,7 @@
> hald_SOURCES += ck-tracker.h ck-tracker.c
> endif
> 
>-hald_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ @POLKIT_LIBS@ -lm @HALD_OS_LIBS@ $(top_builddir)/hald/$(HALD_BACKEND)/libhald_$(HALD_BACKEND).la
>+hald_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ @POLKIT_LIBS@ -lm @HALD_OS_LIBS@ $(top_builddir)/hald/$(HALD_BACKEND)/libhald_$(HALD_BACKEND).la @UDEVLIB_LIBS@
> 
> #### Init scripts fun
> SCRIPT_IN_FILES=haldaemon.in

Actions: View | Diff

Attachments on bug 1574: 1344 | 1496