Attachment #1344 for bug #1574

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. View | Details | Raw Unified | Return to bug 1574
Collapse All | Expand All

Lines 40-46 else Link Here

(-)a/hald/linux/addons/addon-acpi-buttons-toshiba.c (-1 / +1 lines)
40	#include <string.h>	40	#include <string.h>
41	#include <unistd.h>	41	#include <unistd.h>
42		42
43	#include <glib/gmain.h>	43	#include <glib.h>
44		44
45	#include "libhal/libhal.h"	45	#include "libhal/libhal.h"
46	#include "../../logger.h"	46	#include "../../logger.h"

Lines 29-35 Link Here

(-)a/hald/linux/addons/addon-dell-backlight.cpp (-1 / +1 lines)
29		29
30	#include <string.h>	30	#include <string.h>
31		31
32	#include <glib/gmain.h>	32	#include <glib.h>
33	#include <dbus/dbus-glib.h>	33	#include <dbus/dbus-glib.h>
34	#include <dbus/dbus-glib-lowlevel.h>	34	#include <dbus/dbus-glib-lowlevel.h>
35		35

Lines 35-41 Link Here

(-)a/hald/linux/addons/addon-generic-backlight.c (-1 / +1 lines)
35	#include <sys/stat.h>	35	#include <sys/stat.h>
36	#include <unistd.h>	36	#include <unistd.h>
37		37
38	#include <glib/gmain.h>	38	#include <glib.h>
39	#include <dbus/dbus-glib.h>	39	#include <dbus/dbus-glib.h>
40	#include <dbus/dbus-glib-lowlevel.h>	40	#include <dbus/dbus-glib-lowlevel.h>
41		41

Lines 29-35 Link Here

(-)a/hald/linux/addons/addon-imac-backlight.c (-1 / +1 lines)
29	#include <stdlib.h>	29	#include <stdlib.h>
30	#include <sys/io.h>	30	#include <sys/io.h>
31		31
32	#include <glib/gmain.h>	32	#include <glib.h>
33	#include <dbus/dbus-glib.h>	33	#include <dbus/dbus-glib.h>
34	#include <dbus/dbus-glib-lowlevel.h>	34	#include <dbus/dbus-glib-lowlevel.h>
35		35

Lines 41-47 Link Here

(-)a/hald/linux/addons/addon-input.c (-1 / +1 lines)
41	#else	41	#else
42	#include <linux/input.h>	42	#include <linux/input.h>
43	#endif	43	#endif
44	#include <glib/gmain.h>	44	#include <glib.h>
45	#include <glib/gprintf.h>	45	#include <glib/gprintf.h>
46	#include <dbus/dbus-glib-lowlevel.h>	46	#include <dbus/dbus-glib-lowlevel.h>
47		47

Lines 36-42 Link Here

(-)a/hald/linux/addons/addon-ipw-killswitch.c (-1 lines)
36	#include <unistd.h>	36	#include <unistd.h>
37		37
38	#include <glib.h>	38	#include <glib.h>
39	#include <glib/gmain.h>
40	#include <glib/gstdio.h>	39	#include <glib/gstdio.h>
41	#include <dbus/dbus-glib.h>	40	#include <dbus/dbus-glib.h>
42	#include <dbus/dbus-glib-lowlevel.h>	41	#include <dbus/dbus-glib-lowlevel.h>

Lines 36-42 Link Here

(-)a/hald/linux/addons/addon-leds.c (-1 lines)
36	#include <unistd.h>	36	#include <unistd.h>
37		37
38	#include <glib.h>	38	#include <glib.h>
39	#include <glib/gmain.h>
40	#include <glib/gstdio.h>	39	#include <glib/gstdio.h>
41	#include <dbus/dbus-glib.h>	40	#include <dbus/dbus-glib.h>
42	#include <dbus/dbus-glib-lowlevel.h>	41	#include <dbus/dbus-glib-lowlevel.h>

Lines 39-45 Link Here

(-)a/hald/linux/addons/addon-macbookpro-backlight.c (-1 / +1 lines)
39	#include <pci/pci.h>	39	#include <pci/pci.h>
40	#include <unistd.h>	40	#include <unistd.h>
41		41
42	#include <glib/gmain.h>	42	#include <glib.h>
43	#include <dbus/dbus-glib.h>	43	#include <dbus/dbus-glib.h>
44	#include <dbus/dbus-glib-lowlevel.h>	44	#include <dbus/dbus-glib-lowlevel.h>
45		45

Lines 41-47 Link Here

(-)a/hald/linux/addons/addon-omap-backlight.c (-1 / +1 lines)
41	#include <fcntl.h>	41	#include <fcntl.h>
42	#include <unistd.h>	42	#include <unistd.h>
43		43
44	#include <glib/gmain.h>	44	#include <glib.h>
45	#include <dbus/dbus-glib.h>	45	#include <dbus/dbus-glib.h>
46	#include <dbus/dbus-glib-lowlevel.h>	46	#include <dbus/dbus-glib-lowlevel.h>
47		47

Lines 36-42 Link Here

(-)a/hald/linux/addons/addon-rfkill-killswitch.c (-1 lines)
36	#include <unistd.h>	36	#include <unistd.h>
37		37
38	#include <glib.h>	38	#include <glib.h>
39	#include <glib/gmain.h>
40	#include <glib/gstdio.h>	39	#include <glib/gstdio.h>
41	#include <dbus/dbus-glib.h>	40	#include <dbus/dbus-glib.h>
42	#include <dbus/dbus-glib-lowlevel.h>	41	#include <dbus/dbus-glib-lowlevel.h>

Lines 32-38 Link Here

(-)a/hald/linux/addons/addon-storage.c (-2 / +2 lines)
32	#include <linux/cdrom.h>	32	#include <linux/cdrom.h>
33	#include <linux/fs.h>	33	#include <linux/fs.h>
34	#include <mntent.h>	34	#include <mntent.h>
35	#include <scsi/sg.h>
36	#include <stdint.h>	35	#include <stdint.h>
37	#include <stdio.h>	36	#include <stdio.h>
38	#include <stdlib.h>	37	#include <stdlib.h>
Lines 39-45 Link Here
39	#include <string.h>	39	#include <string.h>
40	#include <sys/ioctl.h>	40	#include <sys/ioctl.h>
41	#include <unistd.h>	41	#include <unistd.h>
42	#include <glib/gmain.h>	42	#include <glib.h>
		43	#include <scsi/sg.h>
43	#include <dbus/dbus-glib.h>	44	#include <dbus/dbus-glib.h>
44	#include <dbus/dbus-glib-lowlevel.h>	45	#include <dbus/dbus-glib-lowlevel.h>
45		46

Lines 29-35 Link Here

(-)a/hald/linux/addons/addon-usb-csr.c (-1 / +1 lines)
29	#include <string.h>	29	#include <string.h>
30	#include <usb.h>	30	#include <usb.h>
31		31
32	#include <glib/gmain.h>	32	#include <glib.h>
33	#include <dbus/dbus-glib.h>	33	#include <dbus/dbus-glib.h>
34	#include <dbus/dbus-glib-lowlevel.h>	34	#include <dbus/dbus-glib-lowlevel.h>
35		35
36		36

Lines 250-255 Link Here

(-)hal-0.5.14/fdi/policy/10osvendor/20-storage-methods.fdi~ (+1 lines)
250	<append key="volume.mount.valid_options" type="strlist">gid=</append>	250	<append key="volume.mount.valid_options" type="strlist">gid=</append>
251	<append key="volume.mount.valid_options" type="strlist">umask=</append>	251	<append key="volume.mount.valid_options" type="strlist">umask=</append>
252	<append key="volume.mount.valid_options" type="strlist">utf8</append>	252	<append key="volume.mount.valid_options" type="strlist">utf8</append>
		253	<append key="volume.mount.valid_options" type="strlist">locale=</append>
253	</match>	254	</match>
254	<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="FreeBSD">	255	<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="FreeBSD">
255	<append key="volume.mount.valid_options" type="strlist">-u=</append>	256	<append key="volume.mount.valid_options" type="strlist">-u=</append>




#include <sys/types.h>
#include <sys/time.h>
#include <sys/ioctl.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(-)

Line 0 Link Here

(-)a/.gear/rules (+4 lines)
	1	tar: HAL_0_5_14:.
	2	diff: HAL_0_5_14:. .
	3	copy: altlinux/*
	4	spec: altlinux/hal.spec




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-----

Line 0 Link Here

(-)a/.gear/tags/list (+1 lines)
	1	f669249b5b1092298ec27bc950c396f5f411596f HAL_0_5_14




==========
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."
==========





--- hal-0.5.14/fdi/policy/10osvendor/20-storage-methods.fdi~	2011-10-27 15:52:29.000000000 +0400

%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)




#

AC_PREREQ(2.59c)
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])])

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)]),

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_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])

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>],

        datadir:                          ${datadir}
        sysconfdir:                       ${sysconfdir}
        localstatedir:                    ${localstatedir}
        docdir:                           ${DOCDIR}
        dbus-1 system.d dir:              ${DBUS_SYS_DIR}
        pci.ids dir:                      ${PCI_IDS_DIR}
        usb.ids dir:                      ${USB_IDS_DIR}

Lines 20-26 clean-local: Link Here

(-)a/doc/man/Makefile.am (-1 / +1 lines)
20	$(edit) $< >$@	20	$(edit) $< >$@
21		21
22	edit = sed \	22	edit = sed \
23	-e 's\|@docdir[@]\|$(docdir)\|g' \	23	-e 's\|@docdir[@]\|$(DOCDIR)\|g' \
24	-e 's\|@sbindir[@]\|$(sbindir)\|g' \	24	-e 's\|@sbindir[@]\|$(sbindir)\|g' \
25	-e 's\|@sysconfdir[@]\|$(sysconfdir)\|g'	25	-e 's\|@sysconfdir[@]\|$(sysconfdir)\|g'
26		26

Lines 12-18 SPEC_XML_EXTRA_FILES = \ Link Here

(-)a/doc/spec/Makefile.am (-1 / +1 lines)
12		12
13	if DOCBOOK_DOCS_ENABLED	13	if DOCBOOK_DOCS_ENABLED
14		14
15	htmldocdir = $(docdir)/spec	15	htmldocdir = $(DOCDIR)/spec
16	htmldoc_DATA = hal-spec.html $(FIGURE_FILES) docbook.css	16	htmldoc_DATA = hal-spec.html $(FIGURE_FILES) docbook.css
17		17
18	hal-spec.html : hal-spec.xml.in $(FIGURE_FILES) $(SPEC_XML_EXTRA_FILES)	18	hal-spec.html : hal-spec.xml.in $(FIGURE_FILES) $(SPEC_XML_EXTRA_FILES)




    <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>

      <!-- If we're using Linux, we use evdev by default (falling back to
           keyboard otherwise). -->
      <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>





    <!-- FIXME: Support tablets too. -->
    <match key="info.capabilities" contains="input.mouse">
      <merge key="input.x11_driver" type="string">evdev</merge>
      <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.keyboard">
      <merge key="input.x11_driver" type="string">evdev</merge>
             string="Linux">
        <merge key="input.x11_driver" type="string">evdev</merge>
      </match>
    </match>

    <match key="info.capabilities" contains="input.keys">
      <!-- If we're using Linux, we use evdev by default (falling back to
           keyboard otherwise). -->
      <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>
  </device>
</deviceinfo>

Lines 213-218 Link Here

(-)a/fdi/policy/10osvendor/20-storage-methods.fdi (+2 lines)
213	<append key="volume.mount.valid_options" type="strlist">fmask=</append>	213	<append key="volume.mount.valid_options" type="strlist">fmask=</append>
214	<append key="volume.mount.valid_options" type="strlist">uid=</append>	214	<append key="volume.mount.valid_options" type="strlist">uid=</append>
215	<append key="volume.mount.valid_options" type="strlist">flush</append>	215	<append key="volume.mount.valid_options" type="strlist">flush</append>
		216	<merge key="volume.policy.mount_option.fmask=117" type="bool">true</merge>
		217	<merge key="volume.policy.mount_option.quiet" type="bool">true</merge>
216	</match>	218	</match>
217	<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="FreeBSD">	219	<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="FreeBSD">
218	<append key="volume.mount.valid_options" type="strlist">longnames</append>	220	<append key="volume.mount.valid_options" type="strlist">longnames</append>

Line 0 Link Here

(-)a/fdi/policy/20thirdparty/10-mac-mouse-emu.fdi (+11 lines)
	1	<?xml version="1.0" encoding="UTF-8"?>
	2	<deviceinfo version="0.2">
	3	<device>
	4
	5	<match key="input.product" contains="mouse button emulation">
	6	<remove key="info.capabilities" type="strlist">input.mouse</remove>
	7	<append key="info.capabilities" type="strlist">button</append>
	8	</match>
	9
	10	</device>
	11	</deviceinfo>




<?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>
<!--	<append key="video.x11_driver" type="strlist">vesa</append> -->
      </match>
    </match>

  </device>
</deviceinfo>

Lines 1-7 Link Here

(-)a/fdi/policy/20thirdparty/Makefile.am (-1 / +3 lines)
1		1
2	fdidir = $(datadir)/hal/fdi/policy/20thirdparty	2	fdidir = $(datadir)/hal/fdi/policy/20thirdparty
3		3
4	dist_fdi_DATA =	4	dist_fdi_DATA = \
		5	10-mac-mouse-emu.fdi \
		6	10-x11-video.fdi
5		7
6		8
7		9




           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>

  <!-- Only allow users at the local console to manipulate devices -->
  <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"

Lines 9-15 AM_CPPFLAGS = \ Link Here

(-)a/hald/Makefile.am (-1 / +1 lines)
9	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \	9	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
10	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \	10	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
11	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \	11	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
12	-DPACKAGE_SCRIPT_DIR=\""$(libexecdir)/scripts"\" \	12	-DPACKAGE_SCRIPT_DIR=\""$(datadir)/hal/scripts"\" \
13	-DHALD_SOCKET_DIR=\""$(HALD_SOCKET_DIR)"\" \	13	-DHALD_SOCKET_DIR=\""$(HALD_SOCKET_DIR)"\" \
14	-DHALD_PID_FILE=\""$(HALD_PID_FILE)"\" \	14	-DHALD_PID_FILE=\""$(HALD_PID_FILE)"\" \
15	-DPCI_IDS_DIR=\""$(PCI_IDS_DIR)"\" \	15	-DPCI_IDS_DIR=\""$(PCI_IDS_DIR)"\" \





	  if (hf_addon_storage_cdrom_eject_pressed(cdrom))
	    {
	      libhal_device_emit_condition(hfp_ctx, hfp_udi, "EjectPressed", "", NULL);
	      dbus_error_free(&hfp_error);
	    }

	  hfp_cdrom_free(cdrom);

                                                         "block.storage_device",
							 hfp_udi,
							 &num_volumes,
							 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", NULL))
            {
              DBusMessage *msg = NULL;
	      DBusMessage *reply = NULL;

	      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);

      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", 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;

          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", NULL);
      dbus_error_free(&hfp_error);
      polling_disabled = ! should_poll;
      update_proc_title(addon.device_file);
    }

      unmount_volumes();
#endif

      libhal_device_rescan(hfp_ctx, hfp_udi, NULL);
      dbus_error_free(&hfp_error);
      addon.had_media = has_media;

      return TRUE;

    ! strcmp(driver, "cd")))) && ! strcmp(removable, "true");
  addon.had_media = poll_for_media(TRUE, FALSE);

  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, NULL);
  dbus_error_free(&hfp_error);
  assert(syscon != NULL);
  dbus_connection_set_exit_on_disconnect(syscon, 0);


				      "    <method name=\"CheckForMedia\">\n"
				      "      <arg name=\"call_had_sideeffect\" direction=\"out\" type=\"b\"/>\n"
				      "    </method>\n",
				      NULL))
    {
      hfp_critical("Cannot claim interface 'org.freedesktop.Hal.Device.Storage.Removable'");
      goto end;
    }
  dbus_error_free(&hfp_error);

  while (TRUE)
    {




#include <limits.h>
#include <inttypes.h>
#include <string.h>
#include <unistd.h>
#include <sys/param.h>
#include <sys/types.h>
#include <sys/disklabel.h>

	  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;


  char *conftxt;
  GSList *new_disks;

  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);


  if (hf_is_waiting)
    return TRUE;

  hf_storage_devd_notify("DEVFS", "CDEV", "CREATE", "");

  return TRUE;
}




#include <fcntl.h>
#include <sys/ioctl.h>
#include <unistd.h>
#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>

#include "hf-devtree.h"
#include "hf-util.h"

#if (__FreeBSD_version < 800092) || (__FreeBSD_kernel_version < 800092)
#define HF_USB_DEVICE			"/dev/usb"
#if (__FreeBSD_version < 800066) || (__FreeBSD_kernel_version < 800066)
#define HF_USB2_DEVICE			"/dev/usb "
#else
#define HF_USB2_DEVICE			"/dev/usbctl"




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;


      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))
        {

	  if (driver)
            {
	      if (! strcmp(driver, "ukbd"))
                hf_device_set_input(device, "keyboard", "keys", devname);
	      else if (! strcmp(driver, "ums") || ! strcmp(driver, "atp"))
                {
                  hf_device_set_input(device, "mouse", NULL, devname);
	          hf_runner_run_sync(device, 0, "hald-probe-mouse", NULL);
	        }
	      else if (! strcmp(driver, "uhid"))

      addr = libusb20_dev_get_address(pdev);

      if (addr == 1)
        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, "info.bus",
	  HAL_PROPERTY_TYPE_STRING, "usb_device", NULL);
      if (! parent || hal_device_property_get_bool(parent, "info.ignore"))
        continue;


  HalDevice *parent_device;
  int bus, addr, pbus, paddr;

  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;


  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, "info.bus",
    HAL_PROPERTY_TYPE_STRING, "usb_device", NULL);

  if (parent_device && ! hal_device_property_get_bool(parent_device,
      "info.ignore"))


  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;


  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, "info.bus",
    HAL_PROPERTY_TYPE_STRING, "usb_device", NULL);

  if (device)
    {

  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


HFDevdHandler hf_usb2_devd_handler = {
  .add =	hf_usb2_devd_add,
  .remove =	hf_usb2_devd_remove,
  .notify =     hf_usb2_devd_notify
};

Lines 86-94 hf_volume_resolve_fuse (const char *special) Link Here

(-)a/hald/freebsd/hf-volume.c (-1 / +4 lines)
86	{	86	{
87	if (strcmp(fields[0], special) == 0)	87	if (strcmp(fields[0], special) == 0)
88	{	88	{
		89	char *ret;
		90
		91	ret = g_strdup(fields[1]);
89	g_strfreev(fields);	92	g_strfreev(fields);
90	g_strfreev(lines);	93	g_strfreev(lines);
91	return g_strdup(fields[1]);	94	return ret;
92	}	95	}
93	}	96	}
94	g_strfreev(fields);	97	g_strfreev(fields);

Lines 67-71 hald_probe_volume_CPPFLAGS = $(AM_CPPFLAGS) @GLIB_CFLAGS@ @VOLUME_ID_CFLAGS@ Link Here

(-)a/hald/freebsd/probing/Makefile.am (-1 / +1 lines)
67	hald_probe_volume_LDADD = \	67	hald_probe_volume_LDADD = \
68	@GLIB_LIBS@ \	68	@GLIB_LIBS@ \
69	@VOLUME_ID_LIBS@ \	69	@VOLUME_ID_LIBS@ \
70	-lufs \	70	@LIBUFS_LIBS@ \
71	$(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la	71	$(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la

Lines 34-40 Link Here

(-)a/hald/freebsd/probing/probe-hiddev.c (-1 / +1 lines)
34	#include <dev/usb/usb.h>	34	#include <dev/usb/usb.h>
35	#include <dev/usb/usbhid.h>	35	#include <dev/usb/usbhid.h>
36	#else	36	#else
37	#if __FreeBSD_version >= 800064	37	#if (__FreeBSD_version >= 800064) \|\| (__FreeBSD_kernel_version >= 800064)
38	#include <dev/usb/usbhid.h>	38	#include <dev/usb/usbhid.h>
39	#else	39	#else
40	#include <dev/usb2/include/usb2_hid.h>	40	#include <dev/usb2/include/usb2_hid.h>

Lines 34-40 Link Here

(-)a/hald/freebsd/probing/probe-usb2-device.c (-2 / +2 lines)
34		34
35	#include <libusb20_desc.h>	35	#include <libusb20_desc.h>
36	#include <libusb20.h>	36	#include <libusb20.h>
37	#if __FreeBSD_version >= 800064	37	#if (__FreeBSD_version >= 800064) \|\| (__FreeBSD_kernel_version >= 800064)
38	#include <dev/usb/usb_ioctl.h>	38	#include <dev/usb/usb_ioctl.h>
39	#else	39	#else
40	#include <dev/usb2/include/usb2_standard.h>	40	#include <dev/usb2/include/usb2_standard.h>
Lines 73-79 main(int argc, char **argv) Link Here
73	{	73	{
74	struct LIBUSB20_DEVICE_DESC_DECODED *ddesc;	74	struct LIBUSB20_DEVICE_DESC_DECODED *ddesc;
75	struct LIBUSB20_CONFIG_DESC_DECODED *cdesc;	75	struct LIBUSB20_CONFIG_DESC_DECODED *cdesc;
76	#if __FreeBSD_version >= 800092	76	#if (__FreeBSD_version >= 800092) \|\| (__FreeBSD_kernel_version >= 800092)
77	struct usb_device_info di;	77	struct usb_device_info di;
78	#else	78	#else
79	struct usb2_device_info di;	79	struct usb2_device_info di;





#include <libusb20_desc.h>
#include <libusb20.h>
#if (__FreeBSD_version >= 800064) || (__FreeBSD_kernel_version >= 800064)
#include <dev/usb/usb_ioctl.h>
#else
#include <dev/usb2/include/usb2_standard.h>

  if (pbe == NULL)
    goto end;

  busstr = getenv("HAL_PROP_USB_BUS_NUMBER");
  if (! busstr)
    goto end;

  addrstr = getenv("HAL_PROP_USB_PORT_NUMBER");
  if (! addrstr)
    goto end;





#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>


  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;


	  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,

	  dbus_error_free(&hfp_error);
	  for (i = 0; i < num_udis; i++)
            {
              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);
		  if (mounted)
	            {
                      libhal_device_set_property_bool(hfp_ctx, hfp_udi, "volume.ignore", TRUE, &hfp_error);
		      dbus_error_free(&hfp_error);
		      break;
		    }
		}
	    }

	  ufs_disk_close(&ufsdisk);
	}
    }
#endif /* HAVE_LIBUFS */

  if (has_children)
    usage = "partitiontable";




#!/bin/sh
#
# haldaemon:	HAL daemon
#
# chkconfig:	345 11 91
# description:  This is a daemon for collecting and maintaing information \
#               about hardware from several sources. \
#               See http://www.freedesktop.org/Software/hal
#
# description:	This is a daemon for collecting and maintaing information
#               about hardware from several sources.
#               See http://www.freedesktop.org/software/hal
#

# Do not load RH compatibility interface.
WITHOUT_RC_COMPAT=1

# Source function library
. @sysconfdir@/rc.d/init.d/functions

DAEMON=@sbindir@/hald
LOCKFILE=@localstatedir@/lock/subsys/hal
PIDFILE=@HALD_PID_FILE@

RETVAL=0

start()
{
	msg_starting $"HAL"
	start_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" --no-announce -- $DAEMON
	RETVAL=$?
	return $RETVAL
}

stop()
{
	msg_stopping $"HAL"
	stop_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" --no-announce -- $DAEMON
	RETVAL=$?
	return $RETVAL
}

restart()
{
	stop
	start
        rm -f @localstatedir@/lock/subsys/$servicename
        rm -f @HALD_PID_FILE@
    fi
}

# See how we were called.
case "$1" in
  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

Lines 158-164 main (int argc, char **argv) Link Here

(-)a/hald/linux/addons/addon-imac-backlight.c (-1 / +2 lines)
158	goto out;	158	goto out;
159	}	159	}
160		160
161	if (ioperm(0xB2, 0xB3, 1) < 0)	161	/* Allow access to ports 0xB2 and 0xB3 */
		162	if (ioperm(0xB2, 2, 1) < 0)
162	{	163	{
163	HAL_ERROR (("ioperm failed (you should be root)."));	164	HAL_ERROR (("ioperm failed (you should be root)."));
164	exit(1);	165	exit(1);

Lines 507-513 main (int argc, char *argv[]) Link Here

(-)a/hald/linux/addons/addon-macbookpro-backlight.c (-1 / +2 lines)
507	state = INREG(0x7ae4);	507	state = INREG(0x7ae4);
508	OUTREG(0x7ae4, state);	508	OUTREG(0x7ae4, state);
509		509
510	if (ioperm (0x300, 0x304, 1) < 0) {	510	/* Allow access to porta 0x300 through 0x304 */
		511	if (ioperm (0x300, 5, 1) < 0) {
511	HAL_ERROR (("ioperm failed (you should be root)."));	512	HAL_ERROR (("ioperm failed (you should be root)."));
512	exit(1);	513	exit(1);
513	}	514	}

Lines 57-67 main (int argc, char *argv[]) Link Here

(-)a/hald/linux/probing/probe-hiddev.c (-1 / +2 lines)
57	/* assume failure */	57	/* assume failure */
58	ret = 1;	58	ret = 1;
59		59
		60	dbus_error_init (&error);
		61
60	udi = getenv ("UDI");	62	udi = getenv ("UDI");
61	if (udi == NULL)	63	if (udi == NULL)
62	goto out;	64	goto out;
63		65
64	dbus_error_init (&error);
65	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)	66	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
66	goto out;	67	goto out;
67		68

Lines 388-393 int main (int argc, char *argv[]) Link Here

(-)a/hald/linux/probing/probe-ieee1394-unit.c (-1 / +2 lines)
388		388
389	setup_logger ();	389	setup_logger ();
390		390
		391	dbus_error_init (&error);
		392
391	udi = getenv ("UDI");	393	udi = getenv ("UDI");
392	if (udi == NULL)	394	if (udi == NULL)
393	goto out;	395	goto out;
Lines 396-402 int main (int argc, char *argv[]) Link Here
396	if (ieee1394_udi == NULL)	398	if (ieee1394_udi == NULL)
397	goto out;	399	goto out;
398		400
399	dbus_error_init (&error);
400	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)	401	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
401	goto out;	402	goto out;
402		403

Lines 70-75 main (int argc, char *argv[]) Link Here

(-)a/hald/linux/probing/probe-input.c (-1 / +1 lines)
70	fd = -1;	70	fd = -1;
71		71
72	setup_logger ();	72	setup_logger ();
		73	dbus_error_init (&error);
73		74
74	button_type = getenv ("HAL_PROP_BUTTON_TYPE");	75	button_type = getenv ("HAL_PROP_BUTTON_TYPE");
75	if (button_type == NULL)	76	if (button_type == NULL)
Lines 96-102 main (int argc, char *argv[]) Link Here
96	if (udi == NULL)	97	if (udi == NULL)
97	goto out;	98	goto out;
98		99
99	dbus_error_init (&error);
100	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)	100	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
101	goto out;	101	goto out;
102		102

Lines 141-146 main (int argc, char *argv[]) Link Here

(-)a/hald/linux/probing/probe-net-bluetooth.c (-2 / +2 lines)
141	DBusMessage *reply = NULL;	141	DBusMessage *reply = NULL;
142	DBusError error;	142	DBusError error;
143		143
		144	dbus_error_init (&error);
		145
144	udi = getenv ("UDI");	146	udi = getenv ("UDI");
145	if (udi == NULL)	147	if (udi == NULL)
146	goto out;	148	goto out;
Lines 151-158 main (int argc, char *argv[]) Link Here
151		153
152	HAL_INFO (("Investigating '%s'", iface));	154	HAL_INFO (("Investigating '%s'", iface));
153		155
154	dbus_error_init (&error);
155
156	if ((conn = dbus_bus_get (DBUS_BUS_SYSTEM, &error)) == NULL)	156	if ((conn = dbus_bus_get (DBUS_BUS_SYSTEM, &error)) == NULL)
157	goto out;	157	goto out;
158		158

Lines 66-71 main (int argc, char *argv[]) Link Here

(-)a/hald/linux/probing/probe-printer.c (-1 / +2 lines)
66	ret = 1;	66	ret = 1;
67		67
68	setup_logger ();	68	setup_logger ();
		69
		70	dbus_error_init (&error);
69		71
70	udi = getenv ("UDI");	72	udi = getenv ("UDI");
71	if (udi == NULL) {	73	if (udi == NULL) {
Lines 73-79 main (int argc, char *argv[]) Link Here
73	goto out;	75	goto out;
74	}	76	}
75		77
76	dbus_error_init (&error);
77	if ((ctx = libhal_ctx_init_direct (&error)) == NULL) {	78	if ((ctx = libhal_ctx_init_direct (&error)) == NULL) {
78	HAL_ERROR (("ctx init failed"));	79	HAL_ERROR (("ctx init failed"));
79	goto out;	80	goto out;

Lines 129-134 main (int argc, char *argv[]) Link Here

(-)a/hald/linux/probing/probe-smbios.c (-1 / +2 lines)
129	ret = 1;	129	ret = 1;
130		130
131	setup_logger ();	131	setup_logger ();
		132
		133	dbus_error_init (&error);
132		134
133	udi = getenv ("UDI");	135	udi = getenv ("UDI");
134	if (udi == NULL) {	136	if (udi == NULL) {
Lines 136-142 main (int argc, char *argv[]) Link Here
136	goto out;	138	goto out;
137	}	139	}
138		140
139	dbus_error_init (&error);
140	if ((ctx = libhal_ctx_init_direct (&error)) == NULL) {	141	if ((ctx = libhal_ctx_init_direct (&error)) == NULL) {
141	HAL_ERROR (("ctx init failed"));	142	HAL_ERROR (("ctx init failed"));
142	goto out;	143	goto out;

Lines 109-114 main (int argc, char *argv[]) Link Here

(-)a/hald/linux/probing/probe-storage.c (-1 / +2 lines)
109	/* assume failure */	109	/* assume failure */
110	ret = 1;	110	ret = 1;
111		111
		112	dbus_error_init (&error);
		113
112	if ((udi = getenv ("UDI")) == NULL)	114	if ((udi = getenv ("UDI")) == NULL)
113	goto out;	115	goto out;
114	if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL)	116	if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL)
Lines 127-133 main (int argc, char *argv[]) Link Here
127	else	129	else
128	only_check_for_fs = FALSE;	130	only_check_for_fs = FALSE;
129		131
130	dbus_error_init (&error);
131	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)	132	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
132	goto out;	133	goto out;
133		134

Lines 58-63 main (int argc, char *argv[]) Link Here

(-)a/hald/linux/probing/probe-video4linux.c (-1 / +2 lines)
58		58
59	setup_logger ();	59	setup_logger ();
60		60
		61	dbus_error_init (&error);
		62
61	device_file = getenv ("HAL_PROP_VIDEO4LINUX_DEVICE");	63	device_file = getenv ("HAL_PROP_VIDEO4LINUX_DEVICE");
62	if (device_file == NULL)	64	if (device_file == NULL)
63	goto out;	65	goto out;
Lines 66-72 main (int argc, char *argv[]) Link Here
66	if (udi == NULL)	68	if (udi == NULL)
67	goto out;	69	goto out;
68		70
69	dbus_error_init (&error);
70	ctx = libhal_ctx_init_direct (&error);	71	ctx = libhal_ctx_init_direct (&error);
71	if (ctx == NULL)	72	if (ctx == NULL)
72	goto out;	73	goto out;

Lines 318-323 main (int argc, char *argv[]) Link Here

(-)a/hald/linux/probing/probe-volume.c (-1 / +2 lines)
318	/* assume failure */	318	/* assume failure */
319	ret = 1;	319	ret = 1;
320		320
		321	dbus_error_init (&error);
		322
321	if ((udi = getenv ("UDI")) == NULL)	323	if ((udi = getenv ("UDI")) == NULL)
322	goto out;	324	goto out;
323	if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL)	325	if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL)
Lines 346-352 main (int argc, char *argv[]) Link Here
346		348
347	fsusage = getenv ("HAL_PROP_VOLUME_FSUSAGE");	349	fsusage = getenv ("HAL_PROP_VOLUME_FSUSAGE");
348		350
349	dbus_error_init (&error);
350	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)	351	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
351	goto out;	352	goto out;
352		353

Lines 38-44 Link Here

(-)a/hald/util.h (-1 / +1 lines)
38	#endif	38	#endif
39		39
40	#define HAL_NAME_MAX 256	40	#define HAL_NAME_MAX 256
41	#define HAL_PATH_MAX 512	41	#define HAL_PATH_MAX 4096
42		42
43	gboolean hal_util_remove_trailing_slash (gchar *path);	43	gboolean hal_util_remove_trailing_slash (gchar *path);
44		44

Lines 18-24 libhal_storage_la_SOURCES = \ Link Here

(-)a/libhal-storage/Makefile.am (-1 / +1 lines)
18		18
19	libhal_storage_la_LIBADD = @DBUS_LIBS@ $(top_builddir)/libhal/libhal.la	19	libhal_storage_la_LIBADD = @DBUS_LIBS@ $(top_builddir)/libhal/libhal.la
20		20
21	libhal_storage_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	21	libhal_storage_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -Wl,--version-script=libhal-storage.map
22		22
23		23
24	clean-local :	24	clean-local :

Line 0 Link Here

(-)a/libhal-storage/libhal-storage.map (+6 lines)
	1	HAL_0.5.11 {
	2	global:
	3	libhal_drive_is_media_detection_automatic;
	4	local:
	5	[^l]*;
	6	};

Lines 25-31 LIBGCOV = Link Here

(-)a/libhal/Makefile.am (-1 / +1 lines)
25	endif	25	endif
26	libhal_la_LIBADD = @DBUS_LIBS@ $(LIBGCOV) $(INTLLIBS)	26	libhal_la_LIBADD = @DBUS_LIBS@ $(LIBGCOV) $(INTLLIBS)
27		27
28	libhal_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	28	libhal_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -Wl,--version-script=libhal.map
29		29
30	clean-local :	30	clean-local :
31	rm -f *~	31	rm -f *~

Line 0 Link Here

(-)a/libhal/libhal.map (+6 lines)
	1	HAL_0.5.11 {
	2	global:
	3	libhal_get_all_devices_with_properties;
	4	local:
	5	[^l]*;
	6	};

Lines 17-23 AM_CPPFLAGS = \ Link Here

(-)a/tools/Makefile.am (-2 / +2 lines)
17	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \	17	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
18	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \	18	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
19	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \	19	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
20	-DPACKAGE_SCRIPT_DIR=\""$(libexecdir)/scripts"\" \	20	-DPACKAGE_SCRIPT_DIR=\""$(datadir)/hal/scripts"\" \
21	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \	21	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
22	-I$(top_srcdir) -I$(top_srcdir)/libhal -I$(top_srcdir)/libhal-storage \	22	-I$(top_srcdir) -I$(top_srcdir)/libhal -I$(top_srcdir)/libhal-storage \
23	@DBUS_CFLAGS@ @GLIB_CFLAGS@ @POLKIT_CFLAGS@	23	@DBUS_CFLAGS@ @GLIB_CFLAGS@ @POLKIT_CFLAGS@
Lines 156-162 hal_system_sonypic_SOURCES = hal-system-sonypic.c Link Here
156	hal_system_sonypic_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ $(top_builddir)/libhal/libhal.la	156	hal_system_sonypic_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ $(top_builddir)/libhal/libhal.la
157	endif	157	endif
158		158
159	scriptdir = $(libexecdir)/scripts	159	scriptdir = $(datadir)/hal/scripts
160		160
161	script_SCRIPTS = \	161	script_SCRIPTS = \
162	hal-luks-setup \	162	hal-luks-setup \

Lines 792-798 handle_mount (LibHalContext *hal_ctx, Link Here

(-)a/tools/hal-storage-mount.c (-1 / +2 lines)
792	if (v_fstype != NULL &&	792	if (v_fstype != NULL &&
793	strcmp (v_fstype, "vfat") != 0 && strcmp (v_fstype, "ntfs") != 0 &&	793	strcmp (v_fstype, "vfat") != 0 && strcmp (v_fstype, "ntfs") != 0 &&
794	strcmp (v_fstype, "ntfs-3g") != 0 && strcmp (v_fstype, "iso9660") != 0 &&	794	strcmp (v_fstype, "ntfs-3g") != 0 && strcmp (v_fstype, "iso9660") != 0 &&
795	strcmp (v_fstype, "hfs") != 0 && strcmp (v_fstype, "udf") != 0) {	795	strcmp (v_fstype, "hfs") != 0 && strcmp (v_fstype, "hfsplus") != 0 &&
		796	strcmp (v_fstype, "subfs") != 0 && strcmp (v_fstype, "udf") != 0) {
796	pol_change_uid = wants_to_change_uid;	797	pol_change_uid = wants_to_change_uid;
797	}	798	}
798	}	799	}




	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
	-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 = $(datadir)/hal/scripts/linux

script_SCRIPTS =					\
	hal-luks-setup-linux                          	\

Lines 6-12 Link Here

(-)a/tools/linux/hal-luks-remove-linux (-1 / +1 lines)
6	# This program is free software; you can redistribute it and/or modify	6	# This program is free software; you can redistribute it and/or modify
7	# it under the terms of the GNU General Public License version 2.	7	# it under the terms of the GNU General Public License version 2.
8		8
9	CRYPTSETUP=/sbin/cryptsetup	9	CRYPTSETUP=/usr/sbin/cryptsetup
10		10
11	if [ ! -f $CRYPTSETUP ]; then	11	if [ ! -f $CRYPTSETUP ]; then
12	echo org.freedesktop.Hal.Device.Volume.Crypto.CryptSetupMissing >&2	12	echo org.freedesktop.Hal.Device.Volume.Crypto.CryptSetupMissing >&2

Lines 8-14 Link Here

(-)a/tools/linux/hal-luks-setup-linux (-1 / +1 lines)
8		8
9	read PASSWORD	9	read PASSWORD
10		10
11	CRYPTSETUP=/sbin/cryptsetup	11	CRYPTSETUP=/usr/sbin/cryptsetup
12		12
13	if [ ! -f $CRYPTSETUP ]; then	13	if [ ! -f $CRYPTSETUP ]; then
14	echo org.freedesktop.Hal.Device.Volume.Crypto.CryptSetupMissing >&2	14	echo org.freedesktop.Hal.Device.Volume.Crypto.CryptSetupMissing >&2

Lines 6-12 Link Here

(-)a/tools/linux/hal-luks-teardown-linux (-1 / +1 lines)
6	# This program is free software; you can redistribute it and/or modify	6	# This program is free software; you can redistribute it and/or modify
7	# it under the terms of the GNU General Public License version 2.	7	# it under the terms of the GNU General Public License version 2.
8		8
9	CRYPTSETUP=/sbin/cryptsetup	9	CRYPTSETUP=/usr/sbin/cryptsetup
10		10
11	if [ ! -f $CRYPTSETUP ]; then	11	if [ ! -f $CRYPTSETUP ]; then
12	echo org.freedesktop.Hal.Device.Volume.Crypto.TeardownError >&2	12	echo org.freedesktop.Hal.Device.Volume.Crypto.TeardownError >&2




# 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`"

	    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

	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




# 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

	    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; 

	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

Lines 26-31 QUIRKS="" Link Here

(-)a/tools/linux/hal-system-power-hibernate-linux (+3 lines)
26	if [ -x /usr/sbin/pm-hibernate ] ; then	26	if [ -x /usr/sbin/pm-hibernate ] ; then
27	/usr/sbin/pm-hibernate $QUIRKS	27	/usr/sbin/pm-hibernate $QUIRKS
28	RET=$?	28	RET=$?
		29	elif [ -x /usr/sbin/hibernate ]; then
		30	/usr/sbin/hibernate
		31	RET=$?
29	else	32	else
30	unsupported	33	unsupported
31	fi	34	fi

Lines 36-41 if [ -x "/usr/sbin/pm-suspend" ] ; then Link Here

(-)a/tools/linux/hal-system-power-suspend-linux (+3 lines)
36	export NUM_SECONDS_TO_SLEEP=$seconds_to_sleep	36	export NUM_SECONDS_TO_SLEEP=$seconds_to_sleep
37	/usr/sbin/pm-suspend $QUIRKS	37	/usr/sbin/pm-suspend $QUIRKS
38	RET=$?	38	RET=$?
		39	elif [ -x /usr/sbin/hibernate ] ; then
		40	/usr/sbin/hibernate -F /etc/hibernate/ram.conf
		41	RET=$?
39	else	42	else
40	# TODO: add support	43	# TODO: add support
41	unsupported	44	unsupported

Lines 48-53 Link Here

(-)hal-0.5.14/hald/linux/osspec.c~ (-141 / +50 lines)
48	#include <dbus/dbus.h>	48	#include <dbus/dbus.h>
49	#include <dbus/dbus-glib.h>	49	#include <dbus/dbus-glib.h>
50		50
		51	#include <libudev.h>
		52
51	#include "../device_info.h"	53	#include "../device_info.h"
52	#include "../hald.h"	54	#include "../hald.h"
53	#include "../hald_dbus.h"	55	#include "../hald_dbus.h"
Lines 68-221 Link Here
68	#include "osspec_linux.h"	70	#include "osspec_linux.h"
69		71
70	static gboolean hald_done_synthesizing_coldplug = FALSE;	72	static gboolean hald_done_synthesizing_coldplug = FALSE;
		73	struct udev *udev = NULL;
		74	struct udev_monitor *mon = NULL;
71		75
72	static gboolean	76	static gboolean
73	hald_udev_data (GIOChannel *source, GIOCondition condition, gpointer user_data)	77	hald_udev_data (GIOChannel *source, GIOCondition condition, gpointer user_data)
74	{	78	{
75	int fd;
76	int retval;
77	struct msghdr smsg;
78	struct cmsghdr *cmsg;
79	struct iovec iov;
80	struct ucred *cred;
81	char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
82
83	char buf[4096];
84	size_t bufpos = 0;
85	const char *action = NULL;	79	const char *action = NULL;
86	HotplugEvent *hotplug_event;	80	HotplugEvent *hotplug_event;
87		81
88	memset(buf, 0x00, sizeof (buf));
89
90	fd = g_io_channel_unix_get_fd (source);
91
92	iov.iov_base = &buf;
93	iov.iov_len = sizeof (buf);
94
95	memset(&smsg, 0x00, sizeof (struct msghdr));
96	smsg.msg_iov = &iov;
97	smsg.msg_iovlen = 1;
98	smsg.msg_control = cred_msg;
99	smsg.msg_controllen = sizeof (cred_msg);
100
101	retval = recvmsg (fd, &smsg, 0);
102	if (retval < 0) {
103	if (errno != EINTR)
104	HAL_INFO (("Unable to receive message, errno=%d", errno));
105	goto out;
106	}
107	cmsg = CMSG_FIRSTHDR (&smsg);
108	cred = (struct ucred *) CMSG_DATA (cmsg);
109
110	if (cmsg == NULL \|\| cmsg->cmsg_type != SCM_CREDENTIALS) {
111	HAL_INFO (("No sender credentials received, message ignored"));
112	goto out;
113	}
114
115	if (cred->uid != 0) {
116	HAL_INFO (("Sender uid=%i, message ignored", cred->uid));
117	goto out;
118	}
119
120	if (!strstr(buf, "@/")) {
121	HAL_INFO (("invalid message format"));
122	goto out;
123	}
124
125	hotplug_event = g_slice_new0 (HotplugEvent);	82	hotplug_event = g_slice_new0 (HotplugEvent);
126	hotplug_event->type = HOTPLUG_EVENT_SYSFS;	83	hotplug_event->type = HOTPLUG_EVENT_SYSFS;
127		84
128	while (bufpos < sizeof (buf)) {	85	struct udev_device *dev = NULL;
129	size_t keylen;	86	if((dev=udev_monitor_receive_device(mon)))
130	char *key;	87	{
131	char str, dstr;	88	char str, dstr;
132		89	action = udev_device_get_action(dev);
133	key = &buf[bufpos];	90
134	keylen = strlen(key);	91	// md devices are handled via looking at /proc/mdstat
135	if (keylen == 0)	92	if (g_str_has_prefix (udev_device_get_devpath(dev), "/block/md")) {
136	break;	93	HAL_INFO (("skipping md event for %s", udev_device_get_devpath(dev)));
137	bufpos += keylen + 1;	94	goto invalid;
138		95	}
139	if (strncmp(key, "ACTION=", 7) == 0)	96	g_snprintf (hotplug_event->sysfs.sysfs_path, sizeof(hotplug_event->sysfs.sysfs_path), "/sys%s", udev_device_get_devpath(dev));
140	action = &key[7];	97	g_strlcpy (hotplug_event->sysfs.subsystem, udev_device_get_subsystem(dev), sizeof(hotplug_event->sysfs.subsystem));
141	else if (strncmp(key, "DEVPATH=", 8) == 0) {	98	g_strlcpy (hotplug_event->sysfs.device_file, udev_device_get_property_value(dev,"DEVNAME"), sizeof(hotplug_event->sysfs.device_file));
142		99	hotplug_event->sysfs.seqnum = udev_device_get_seqnum(dev);
143	/* md devices are handled via looking at /proc/mdstat */	100	if((str=udev_device_get_property_value(dev,"IFINDEX")))
144	if (g_str_has_prefix (key + 8, "/block/md")) {	101	hotplug_event->sysfs.net_ifindex = strtoul(str, NULL, 10);
145	HAL_INFO (("skipping md event for %s", key + 8));	102	if((str=udev_device_get_property_value(dev,"ID_VENDOR")) && (str=hal_util_strdup_valid_utf8(str)))
146	goto invalid;	103	{ g_strlcpy (hotplug_event->sysfs.vendor, str, sizeof(hotplug_event->sysfs.vendor)); g_free (str); }
147	}	104	if((str=udev_device_get_property_value(dev,"ID_MODEL")) && (str=hal_util_strdup_valid_utf8(str)))
148		105	{ g_strlcpy (hotplug_event->sysfs.model, str, sizeof(hotplug_event->sysfs.model)); g_free (str); }
149	g_snprintf (hotplug_event->sysfs.sysfs_path, sizeof (hotplug_event->sysfs.sysfs_path),	106	if((str=udev_device_get_property_value(dev,"ID_REVISION")) && (str=hal_util_strdup_valid_utf8(str)))
150	"/sys%s", &key[8]);	107	{ g_strlcpy (hotplug_event->sysfs.revision, str, sizeof(hotplug_event->sysfs.revision)); g_free (str); }
151	} else if (strncmp(key, "DEVPATH_OLD=", 12) == 0) {	108	if((str=udev_device_get_property_value(dev,"ID_SERIAL")) && (str=hal_util_strdup_valid_utf8(str)))
152		109	{ g_strlcpy (hotplug_event->sysfs.serial, str, sizeof(hotplug_event->sysfs.serial)); g_free (str); }
153	/* md devices are handled via looking at /proc/mdstat */	110	if((str=udev_device_get_property_value(dev,"ID_FS_USAGE")) && (str=hal_util_strdup_valid_utf8(str)))
154	if (g_str_has_prefix (key + 12, "/block/md")) {	111	{ g_strlcpy (hotplug_event->sysfs.fsusage, str, sizeof(hotplug_event->sysfs.fsusage)); g_free (str); }
155	HAL_INFO (("skipping md event for %s", key + 8));	112	if((str=udev_device_get_property_value(dev,"ID_FS_TYPE")) && (str=hal_util_strdup_valid_utf8(str)))
156	goto invalid;	113	{ g_strlcpy (hotplug_event->sysfs.fstype, str, sizeof(hotplug_event->sysfs.fstype)); g_free (str); }
157	}	114	if((str=udev_device_get_property_value(dev,"ID_FS_VERSION")) && (str=hal_util_strdup_valid_utf8(str)))
158		115	{ g_strlcpy (hotplug_event->sysfs.fsversion, str, sizeof(hotplug_event->sysfs.fsversion)); g_free (str); }
159	g_snprintf (hotplug_event->sysfs.sysfs_path_old, sizeof (hotplug_event->sysfs.sysfs_path_old),	116	if((str=udev_device_get_property_value(dev,"ID_FS_UUID")) && (str=hal_util_strdup_valid_utf8(str)))
160	"/sys%s", &key[12]);	117	{ g_strlcpy (hotplug_event->sysfs.fsuuid, str, sizeof(hotplug_event->sysfs.fsuuid)); g_free (str); }
161	} else if (strncmp(key, "SUBSYSTEM=", 10) == 0)	118	if((str=udev_device_get_property_value(dev,"ID_FS_LABEL_ENC")))
162	g_strlcpy (hotplug_event->sysfs.subsystem, &key[10], sizeof (hotplug_event->sysfs.subsystem));	119	{
163	else if (strncmp(key, "DEVNAME=", 8) == 0)	120	dstr = g_malloc0(strlen(str)+1);
164	g_strlcpy (hotplug_event->sysfs.device_file, &key[8], sizeof (hotplug_event->sysfs.device_file));	121	hal_util_decode_escape(str, dstr, sizeof(hotplug_event->sysfs.fslabel));
165	else if (strncmp(key, "SEQNUM=", 7) == 0)	122	if((str=hal_util_strdup_valid_utf8(dstr)))
166	hotplug_event->sysfs.seqnum = strtoull(&key[7], NULL, 10);	123	{ g_strlcpy (hotplug_event->sysfs.fslabel, str, sizeof(hotplug_event->sysfs.fslabel)); g_free (str); }
167	else if (strncmp(key, "IFINDEX=", 8) == 0)	124	g_free(dstr);
168	hotplug_event->sysfs.net_ifindex = strtoul(&key[8], NULL, 10);	125	}
169	else if (strncmp(key, "ID_VENDOR=", 10) == 0) {
170	if ((str = hal_util_strdup_valid_utf8(&key[10])) != NULL ) {
171	g_strlcpy (hotplug_event->sysfs.vendor, str, sizeof(hotplug_event->sysfs.vendor));
172	g_free (str);
173	}
174	} else if (strncmp(key, "ID_MODEL=", 9) == 0) {
175	if ((str = hal_util_strdup_valid_utf8(&key[9])) != NULL ) {
176	g_strlcpy (hotplug_event->sysfs.model, str, sizeof(hotplug_event->sysfs.model));
177	g_free (str);
178	}
179	} else if (strncmp(key, "ID_REVISION=", 12) == 0) {
180	if ((str = hal_util_strdup_valid_utf8(&key[12])) != NULL ) {
181	g_strlcpy (hotplug_event->sysfs.revision, str, sizeof(hotplug_event->sysfs.revision));
182	g_free (str);
183	}
184	} else if (strncmp(key, "ID_SERIAL=", 10) == 0) {
185	if ((str = hal_util_strdup_valid_utf8(&key[10])) != NULL ) {
186	g_strlcpy (hotplug_event->sysfs.serial, str, sizeof(hotplug_event->sysfs.serial));
187	g_free (str);
188	}
189	} else if (strncmp(key, "ID_FS_USAGE=", 12) == 0) {
190	if ((str = hal_util_strdup_valid_utf8(&key[12])) != NULL ) {
191	g_strlcpy (hotplug_event->sysfs.fsusage, str, sizeof(hotplug_event->sysfs.fsusage));
192	g_free (str);
193	}
194	} else if (strncmp(key, "ID_FS_TYPE=", 11) == 0) {
195	if ((str = hal_util_strdup_valid_utf8(&key[11])) != NULL ) {
196	g_strlcpy (hotplug_event->sysfs.fstype, str, sizeof(hotplug_event->sysfs.fstype));
197	g_free (str);
198	}
199	} else if (strncmp(key, "ID_FS_VERSION=", 14) == 0) {
200	if ((str = hal_util_strdup_valid_utf8(&key[14])) != NULL ) {
201	g_strlcpy (hotplug_event->sysfs.fsversion, str, sizeof(hotplug_event->sysfs.fsversion));
202	g_free (str);
203	}
204	} else if (strncmp(key, "ID_FS_UUID=", 11) == 0) {
205	if ((str = hal_util_strdup_valid_utf8(&key[11])) != NULL ) {
206	g_strlcpy (hotplug_event->sysfs.fsuuid, str, sizeof(hotplug_event->sysfs.fsuuid));
207	g_free (str);
208	}
209	} else if (strncmp(key, "ID_FS_LABEL_ENC=", 16) == 0) {
210	dstr = g_malloc0 (keylen - 15);
211	hal_util_decode_escape (&key[16], dstr, sizeof(hotplug_event->sysfs.fslabel));
212
213	if ((str = hal_util_strdup_valid_utf8(dstr)) != NULL ) {
214	g_strlcpy (hotplug_event->sysfs.fslabel, str, sizeof(hotplug_event->sysfs.fslabel));
215	g_free (str);
216	}
217	g_free (dstr);
218	}
219	}	126	}
220		127
221	if (!action) {	128	if (!action) {
Lines 284-290 Link Here
284		191
285	invalid:	192	invalid:
286	g_slice_free (HotplugEvent, hotplug_event);	193	g_slice_free (HotplugEvent, hotplug_event);
287		194	if(dev) udev_device_unref(dev);
288	out:	195	out:
289	return TRUE;	196	return TRUE;
290	}	197	}
Lines 430-438 Link Here
430	exit (1);	337	exit (1);
431	}	338	}
432	/* enable receiving of the sender credentials */	339	/* enable receiving of the sender credentials */
433	setsockopt(udev_socket, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));	340	udev = udev_new();
		341	mon = udev_monitor_new_from_netlink(udev, "udev");
		342	udev_monitor_enable_receiving(mon);
434		343
435	udev_channel = g_io_channel_unix_new (udev_socket);	344	udev_channel = g_io_channel_unix_new (udev_monitor_get_fd(mon));
436	g_io_add_watch (udev_channel, G_IO_IN, hald_udev_data, NULL);	345	g_io_add_watch (udev_channel, G_IO_IN, hald_udev_data, NULL);
437	g_io_channel_unref (udev_channel);	346	g_io_channel_unref (udev_channel);
438		347

Lines 14-19 Link Here

(-)hal-0.5.14/configure.in~ (+6 lines)
14		14
15	glib_module="glib-2.0 >= 2.10.0 gobject-2.0 > 2.10.0 dbus-glib-1 >= 0.61"	15	glib_module="glib-2.0 >= 2.10.0 gobject-2.0 > 2.10.0 dbus-glib-1 >= 0.61"
16	dbus_module="dbus-1 >= 0.61"	16	dbus_module="dbus-1 >= 0.61"
		17	udev_module="libudev >= 168"
17	blkid_module="blkid >= 2.15"	18	blkid_module="blkid >= 2.15"
18	volume_id_module="libvolume_id >= 0.77"	19	volume_id_module="libvolume_id >= 0.77"
19	polkit_module="polkit >= 0.5"	20	polkit_module="polkit >= 0.5"
Lines 692-697 Link Here
692	AC_SUBST(DBUS_CFLAGS)	693	AC_SUBST(DBUS_CFLAGS)
693	AC_SUBST(DBUS_LIBS)	694	AC_SUBST(DBUS_LIBS)
694		695
		696	# udev libs
		697	PKG_CHECK_MODULES(UDEVLIB, [$udev_module])
		698	AC_SUBST(UDEVLIB_CFLAGS)
		699	AC_SUBST(UDEVLIB_LIBS)
		700
695	# glib libs	701	# glib libs
696	PKG_CHECK_MODULES(GLIB, [$glib_module])	702	PKG_CHECK_MODULES(GLIB, [$glib_module])
697	AC_SUBST(GLIB_CFLAGS)	703	AC_SUBST(GLIB_CFLAGS)

Lines 74-80 Link Here

(-)hal-0.5.14/hald/Makefile.am~ (-1 / +1 lines)
74	hald_SOURCES += ck-tracker.h ck-tracker.c	74	hald_SOURCES += ck-tracker.h ck-tracker.c
75	endif	75	endif
76		76
77	hald_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ @POLKIT_LIBS@ -lm @HALD_OS_LIBS@ $(top_builddir)/hald/$(HALD_BACKEND)/libhald_$(HALD_BACKEND).la	77	hald_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ @POLKIT_LIBS@ -lm @HALD_OS_LIBS@ $(top_builddir)/hald/$(HALD_BACKEND)/libhald_$(HALD_BACKEND).la @UDEVLIB_LIBS@
78		78
79	#### Init scripts fun	79	#### Init scripts fun
80	SCRIPT_IN_FILES=haldaemon.in	80	SCRIPT_IN_FILES=haldaemon.in

Return to bug 1574

Lines 30-36 Link Here

(-)a/hald/linux/probing/probe-video4linux.c (-1 / +1 lines)
30	#include <sys/types.h>	30	#include <sys/types.h>
31	#include <sys/time.h>	31	#include <sys/time.h>
32	#include <sys/ioctl.h>	32	#include <sys/ioctl.h>
33	#include <linux/videodev.h>	33	#include <libv4l1-videodev.h>
34	#include <linux/videodev2.h>	34	#include <linux/videodev2.h>
35	#include <errno.h>	35	#include <errno.h>
36	#include <fcntl.h>	36	#include <fcntl.h>
37	.gear/rules \| 4 +	37	.gear/rules \| 4 +
38	.../tags/f669249b5b1092298ec27bc950c396f5f411596f \| 13 +	38	.../tags/f669249b5b1092298ec27bc950c396f5f411596f \| 13 +
39	.gear/tags/list \| 1 +	39	.gear/tags/list \| 1 +
40	NEWS \| 33 +	40	NEWS \| 33 +
41	altlinux/hal-0.5.14-alt-ntfs-options.patch \| 10 +	41	altlinux/hal-0.5.14-alt-ntfs-options.patch \| 10 +
42	altlinux/hal.spec \| 614 ++++++++++++++++++++	42	altlinux/hal.spec \| 614 ++++++++++++++++++++
43	configure.in \| 57 ++-	43	configure.in \| 57 ++-
44	doc/man/Makefile.am \| 2 +-	44	doc/man/Makefile.am \| 2 +-
45	doc/spec/Makefile.am \| 2 +-	45	doc/spec/Makefile.am \| 2 +-
46	fdi/policy/10osvendor/10-keymap.fdi \| 15 -	46	fdi/policy/10osvendor/10-keymap.fdi \| 15 -
47	fdi/policy/10osvendor/10-x11-input.fdi \| 23 +-	47	fdi/policy/10osvendor/10-x11-input.fdi \| 23 +-
48	fdi/policy/10osvendor/20-storage-methods.fdi \| 2 +	48	fdi/policy/10osvendor/20-storage-methods.fdi \| 2 +
49	fdi/policy/20thirdparty/10-mac-mouse-emu.fdi \| 11 +	49	fdi/policy/20thirdparty/10-mac-mouse-emu.fdi \| 11 +
50	fdi/policy/20thirdparty/10-x11-video.fdi \| 13 +	50	fdi/policy/20thirdparty/10-x11-video.fdi \| 13 +
51	fdi/policy/20thirdparty/Makefile.am \| 4 +-	51	fdi/policy/20thirdparty/Makefile.am \| 4 +-
52	hal.conf.in \| 41 ++	52	hal.conf.in \| 41 ++
53	hald/Makefile.am \| 2 +-	53	hald/Makefile.am \| 2 +-
54	hald/freebsd/addons/addon-storage.c \| 29 +-	54	hald/freebsd/addons/addon-storage.c \| 29 +-
55	hald/freebsd/hf-storage.c \| 39 ++-	55	hald/freebsd/hf-storage.c \| 39 ++-
56	hald/freebsd/hf-usb.c \| 8 +-	56	hald/freebsd/hf-usb.c \| 8 +-
57	hald/freebsd/hf-usb2.c \| 65 ++-	57	hald/freebsd/hf-usb2.c \| 65 ++-
58	hald/freebsd/hf-volume.c \| 5 +-	58	hald/freebsd/hf-volume.c \| 5 +-
59	hald/freebsd/probing/Makefile.am \| 2 +-	59	hald/freebsd/probing/Makefile.am \| 2 +-
60	hald/freebsd/probing/probe-hiddev.c \| 2 +-	60	hald/freebsd/probing/probe-hiddev.c \| 2 +-
61	hald/freebsd/probing/probe-usb2-device.c \| 4 +-	61	hald/freebsd/probing/probe-usb2-device.c \| 4 +-
62	hald/freebsd/probing/probe-usb2-interface.c \| 6 +-	62	hald/freebsd/probing/probe-usb2-interface.c \| 6 +-
63	hald/freebsd/probing/probe-volume.c \| 12 +-	63	hald/freebsd/probing/probe-volume.c \| 12 +-
64	hald/haldaemon.in \| 113 ++--	64	hald/haldaemon.in \| 113 ++--
65	hald/linux/addons/addon-imac-backlight.c \| 3 +-	65	hald/linux/addons/addon-imac-backlight.c \| 3 +-
66	hald/linux/addons/addon-macbookpro-backlight.c \| 3 +-	66	hald/linux/addons/addon-macbookpro-backlight.c \| 3 +-
67	hald/linux/probing/probe-hiddev.c \| 3 +-	67	hald/linux/probing/probe-hiddev.c \| 3 +-
68	hald/linux/probing/probe-ieee1394-unit.c \| 3 +-	68	hald/linux/probing/probe-ieee1394-unit.c \| 3 +-
69	hald/linux/probing/probe-input.c \| 2 +-	69	hald/linux/probing/probe-input.c \| 2 +-
70	hald/linux/probing/probe-net-bluetooth.c \| 4 +-	70	hald/linux/probing/probe-net-bluetooth.c \| 4 +-
71	hald/linux/probing/probe-printer.c \| 3 +-	71	hald/linux/probing/probe-printer.c \| 3 +-
72	hald/linux/probing/probe-smbios.c \| 3 +-	72	hald/linux/probing/probe-smbios.c \| 3 +-
73	hald/linux/probing/probe-storage.c \| 3 +-	73	hald/linux/probing/probe-storage.c \| 3 +-
74	hald/linux/probing/probe-video4linux.c \| 3 +-	74	hald/linux/probing/probe-video4linux.c \| 3 +-
75	hald/linux/probing/probe-volume.c \| 3 +-	75	hald/linux/probing/probe-volume.c \| 3 +-
76	hald/util.h \| 2 +-	76	hald/util.h \| 2 +-
77	libhal-storage/Makefile.am \| 2 +-	77	libhal-storage/Makefile.am \| 2 +-
78	libhal-storage/libhal-storage.map \| 6 +	78	libhal-storage/libhal-storage.map \| 6 +
79	libhal/Makefile.am \| 2 +-	79	libhal/Makefile.am \| 2 +-
80	libhal/libhal.map \| 6 +	80	libhal/libhal.map \| 6 +
81	tools/Makefile.am \| 4 +-	81	tools/Makefile.am \| 4 +-
82	tools/hal-storage-mount.c \| 3 +-	82	tools/hal-storage-mount.c \| 3 +-
83	tools/linux/Makefile.am \| 4 +-	83	tools/linux/Makefile.am \| 4 +-
84	tools/linux/hal-luks-remove-linux \| 2 +-	84	tools/linux/hal-luks-remove-linux \| 2 +-
85	tools/linux/hal-luks-setup-linux \| 2 +-	85	tools/linux/hal-luks-setup-linux \| 2 +-
86	tools/linux/hal-luks-teardown-linux \| 2 +-	86	tools/linux/hal-luks-teardown-linux \| 2 +-
87	tools/linux/hal-system-killswitch-get-power-linux \| 74 ---	87	tools/linux/hal-system-killswitch-get-power-linux \| 74 ---
88	tools/linux/hal-system-killswitch-set-power-linux \| 79 ---	88	tools/linux/hal-system-killswitch-set-power-linux \| 79 ---
89	tools/linux/hal-system-power-hibernate-linux \| 3 +	89	tools/linux/hal-system-power-hibernate-linux \| 3 +
90	tools/linux/hal-system-power-suspend-linux \| 3 +	90	tools/linux/hal-system-power-suspend-linux \| 3 +
91	54 files changed, 1006 insertions(+), 353 deletions(-)	91	54 files changed, 1006 insertions(+), 353 deletions(-)

Line 0 Link Here

(-)a/.gear/tags/f669249b5b1092298ec27bc950c396f5f411596f (+13 lines)
	1	object 17f24242b5739a27940e0cc164a856b9584481f7
	2	type commit
	3	tag HAL_0_5_14
	4	tagger Martin Pitt <martin.pitt@ubuntu.com> 1259620324 +0100
	5
	6	release 0.5.14
	7	-----BEGIN PGP SIGNATURE-----
	8	Version: GnuPG v1.4.9 (GNU/Linux)
	9
	10	iEYEABECAAYFAksUR+cACgkQDecnbV4Fd/LmsACgtBQgUMqIbpqrAW/JMd/bGtxo
	11	EQEAoNBPwYe7XilkYFcAyMZ+cjjL9zw2
	12	=Tj+3
	13	-----END PGP SIGNATURE-----

Lines 1-4 Link Here

(-)a/NEWS (+33 lines)
1	==========	1	==========
		2	HAL 0.5.15
		3	==========
		4
		5	Released Month 00, 2009.
		6
		7	Requirements for HAL 0.5.15:
		8
		9	- Linux kernel >= 2.6.22 (CONFIG_SYSFS_DEPRECATED=n)
		10	- udev >= 125 (Linux only)
		11	- util-linux-ng >= 2.15
		12	- bash >= 2.0
		13	- dbus >= 0.61 (with glib bindings)
		14	- glib >= 2.10.0
		15	- expat >= 1.95.8
		16	- hal-info >= 20080310 (older versions can work too)
		17	- libusb >= 0.1.10a (optional)
		18	- pciutils >= 2.2.3 (optional)
		19	- dmidecode >= 2.7 (optional)
		20	- parted >= 1.7.1 (optional)
		21	- cryptsetup-luks >= 1.0.1 (optional, needs LUKS patches)
		22	- libsmbios >= 0.13.4 (optional, for DELL machines, Linux only,
		23	prefered version >= 2.0.3)
		24	- dellWirelessCtl >= 0.13.4 (optional, for Dell machines, must live in
		25	/usr/bin/, Linux only, prefered version >= 2.0.3)
		26	- gperf >= 3.0.3-2 (optional, for Re-map multimedia keys,
		27	Linux only)
		28	- PolicyKit >= 0.5 (optional)
		29	- ConsoleKit >= 0.2.0 (optional, needed if use PolicyKit)
		30	- pm-utils >= 0.99.2 or newer (optional)
		31
		32	Contributors to HAL 0.5.15:
		33
		34	==========
2	HAL 0.5.14 "Dave, this conversation can serve no purpose anymore. Goodbye."	35	HAL 0.5.14 "Dave, this conversation can serve no purpose anymore. Goodbye."
3	==========	36	==========
4		37

Lines 7-13 dnl Process this file with autoconf to produce a configure script. Link Here

(-)a/configure.in (-19 / +38 lines)
7	#	7	#
8		8
9	AC_PREREQ(2.59c)	9	AC_PREREQ(2.59c)
10	AC_INIT(hal, 0.5.14, david@fubar.dk)	10	AC_INIT(hal, 0.5.15, david@fubar.dk)
11	AM_INIT_AUTOMAKE([gnu 1.9])	11	AM_INIT_AUTOMAKE([gnu 1.9])
12	AM_MAINTAINER_MODE	12	AM_MAINTAINER_MODE
13	m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])	13	m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
Lines 479-487 if test "x$with_libpci" != xno ; then Link Here
479	fi	479	fi
480	AM_CONDITIONAL([HAVE_LIBPCI], [test "x$USE_LIBPCI" = "xyes"])	480	AM_CONDITIONAL([HAVE_LIBPCI], [test "x$USE_LIBPCI" = "xyes"])
481		481
482	USE_LIBUSB20=no
483	USE_LIBUSB=no
484	LIBUSB20_LIBS=""
485	AC_ARG_WITH([backend],	482	AC_ARG_WITH([backend],
486	AS_HELP_STRING([--with-backend=<name>],	483	AS_HELP_STRING([--with-backend=<name>],
487	[backend to use (linux/solaris/freebsd/dummy)]),	484	[backend to use (linux/solaris/freebsd/dummy)]),
Lines 510-530 AM_CONDITIONAL(HALD_COMPILE_FREEBSD, [test x$HALD_BACKEND = xfreebsd], [Compilin Link Here
510	AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris])	507	AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris])
511	AC_SUBST(HALD_BACKEND)	508	AC_SUBST(HALD_BACKEND)
512	if test "x$HALD_BACKEND" = "xfreebsd"; then	509	if test "x$HALD_BACKEND" = "xfreebsd"; then
513	AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_LIBUSB20=yes], [USE_LIBUSB20=no])	510	AC_SEARCH_LIBS([clock_gettime], [rt])
514	fi	511	LIBUFS_LIBS=""
515	if test "x$USE_LIBUSB20" = "xno"; then	512	AC_CHECK_HEADERS([libufs.h],
516	AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_LIBUSB=yes], [USE_LIBUSB=no])	513	[AC_CHECK_LIB([libufs], [ufs_disk_fillout], [USE_LIBUFS="yes"], [], [])])
517	fi	514	if test "x$USE_LIBUFS" = "xyes"; then
518	AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB20" = "xyes"])	515	AC_DEFINE(HAVE_LIBUFS, 1, [Set if we have libufs])
519	AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB" = "xyes"])	516	LIBUFS_LIBS="-lufs"
520	if test "x$USE_LIBUSB20" = "xyes"; then	517	AC_SUBST(LIBUFS_LIBS)
521	AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20])	518	fi
522	LIBUSB20_LIBS="-lusb20"	519	USE_BSDLIBUSB20=no
523	elif test "x$USE_LIBUSB" = "xyes"; then	520	USE_BSDLIBUSB=no
524	AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20])	521	LIBUSB20_LIBS=""
525	LIBUSB20_LIBS="-lusb"	522	AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_BSDLIBUSB20=yes], [USE_BSDLIBUSB20=no])
		523	if test "x$USE_BSDLIBUSB20" = "xno"; then
		524	AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_BSDLIBUSB=yes], [USE_BSDLIBUSB=no])
		525	fi
		526	AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_BSDLIBUSB20" = "xyes" -o "x$USE_BSDLIBUSB" = "xyes"])
		527	if test "x$USE_BSDLIBUSB20" = "xyes"; then
		528	AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20])
		529	LIBUSB20_LIBS="-lusb20"
		530	elif test "x$USE_BSDLIBUSB" = "xyes"; then
		531	AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20])
		532	LIBUSB20_LIBS="-lusb"
		533	fi
		534	AC_SUBST(LIBUSB20_LIBS)
		535	else
		536	AM_CONDITIONAL([HAVE_LIBUSB20], [false])
526	fi	537	fi
527	AC_SUBST(LIBUSB20_LIBS)
528		538
529	dnl DBUS API is subject to changes	539	dnl DBUS API is subject to changes
530	AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, [], [DBUS API is subject to change])	540	AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, [], [DBUS API is subject to change])
Lines 809-814 fi Link Here
809	AM_CONDITIONAL(DOCBOOK_DOCS_ENABLED, [test x$enable_docbook_docs = xyes])	819	AM_CONDITIONAL(DOCBOOK_DOCS_ENABLED, [test x$enable_docbook_docs = xyes])
810	AC_MSG_RESULT(yes)	820	AC_MSG_RESULT(yes)
811		821
		822	# documentation target
		823	AC_ARG_WITH(doc-dir, [ --with-doc-dir=[dirname] directory to install documentation])
		824	if ! test -z "$with_doc_dir"; then
		825	DOCDIR=$with_doc_dir
		826	else
		827	DOCDIR="$DATADIR/doc/hal-$VERSION"
		828	fi
		829
		830	AC_SUBST(DOCDIR)
812		831
813	AC_ARG_WITH([dbus-sys],	832	AC_ARG_WITH([dbus-sys],
814	AS_HELP_STRING([--with-dbus-sys=<dir>],	833	AS_HELP_STRING([--with-dbus-sys=<dir>],
Lines 1134-1140 echo " Link Here
1134	datadir: ${datadir}	1153	datadir: ${datadir}
1135	sysconfdir: ${sysconfdir}	1154	sysconfdir: ${sysconfdir}
1136	localstatedir: ${localstatedir}	1155	localstatedir: ${localstatedir}
1137	docdir: ${docdir}	1156	docdir: ${DOCDIR}
1138	dbus-1 system.d dir: ${DBUS_SYS_DIR}	1157	dbus-1 system.d dir: ${DBUS_SYS_DIR}
1139	pci.ids dir: ${PCI_IDS_DIR}	1158	pci.ids dir: ${PCI_IDS_DIR}
1140	usb.ids dir: ${USB_IDS_DIR}	1159	usb.ids dir: ${USB_IDS_DIR}

Lines 4-23 Link Here

(-)a/fdi/policy/10osvendor/10-keymap.fdi (-15 lines)
4	<match key="info.capabilities" contains="input.keymap">	4	<match key="info.capabilities" contains="input.keymap">
5	<append key="info.callouts.add" type="strlist">hal-setup-keymap</append>	5	<append key="info.callouts.add" type="strlist">hal-setup-keymap</append>
6	</match>	6	</match>
7
8	<match key="info.capabilities" contains="input.keys">
9	<merge key="input.xkb.rules" type="string">base</merge>
10
11	<!-- If we're using Linux, we use evdev by default (falling back to
12	keyboard otherwise). -->
13	<merge key="input.xkb.model" type="string">keyboard</merge>
14	<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
15	string="Linux">
16	<merge key="input.xkb.model" type="string">evdev</merge>
17	</match>
18
19	<merge key="input.xkb.layout" type="string">us</merge>
20	<merge key="input.xkb.variant" type="string" />
21	</match>
22	</device>	7	</device>
23	</deviceinfo>	8	</deviceinfo>

Lines 9-36 Link Here

(-)a/fdi/policy/10osvendor/10-x11-input.fdi (-20 / +3 lines)
9		9
10	<!-- FIXME: Support tablets too. -->	10	<!-- FIXME: Support tablets too. -->
11	<match key="info.capabilities" contains="input.mouse">	11	<match key="info.capabilities" contains="input.mouse">
12	<merge key="input.x11_driver" type="string">mouse</merge>	12	<merge key="input.x11_driver" type="string">evdev</merge>
13	<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
14	string="Linux">
15	<merge key="input.x11_driver" type="string">evdev</merge>
16	</match>
17	</match>	13	</match>
18		14
19	<match key="info.capabilities" contains="input.tablet">	15	<match key="info.capabilities" contains="input.keyboard">
20	<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"	16	<merge key="input.x11_driver" type="string">evdev</merge>
21	string="Linux">
22	<merge key="input.x11_driver" type="string">evdev</merge>
23	</match>
24	</match>
25
26	<match key="info.capabilities" contains="input.keys">
27	<!-- If we're using Linux, we use evdev by default (falling back to
28	keyboard otherwise). -->
29	<merge key="input.x11_driver" type="string">keyboard</merge>
30	<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
31	string="Linux">
32	<merge key="input.x11_driver" type="string">evdev</merge>
33	</match>
34	</match>	17	</match>
35	</device>	18	</device>
36	</deviceinfo>	19	</deviceinfo>

Line 0 Link Here

(-)a/fdi/policy/20thirdparty/10-x11-video.fdi (+13 lines)
	1	<?xml version="1.0" encoding="UTF-8"?>
	2	<deviceinfo version="0.2">
	3	<device>
	4
	5	<match key="pci.device_class" int="3">
	6	<match key="pci.device_subclass" int="0">
	7	<append key="info.capabilities" type="strlist">vga</append>
	8	<!-- <append key="video.x11_driver" type="strlist">vesa</append> -->
	9	</match>
	10	</match>
	11
	12	</device>
	13	</deviceinfo>

Lines 20-31 Link Here

(-)a/hal.conf.in (+41 lines)
20	send_interface="org.freedesktop.DBus.Introspectable"/>	20	send_interface="org.freedesktop.DBus.Introspectable"/>
21	<allow send_destination="org.freedesktop.Hal"	21	<allow send_destination="org.freedesktop.Hal"
22	send_interface="org.freedesktop.DBus.Properties" />	22	send_interface="org.freedesktop.DBus.Properties" />
		23	<allow send_destination="org.freedesktop.Hal"
		24	send_interface="org.freedesktop.DBus.Peer" />
23		25
24	<allow send_destination="org.freedesktop.Hal"	26	<allow send_destination="org.freedesktop.Hal"
25	send_interface="org.freedesktop.Hal.Device"/>	27	send_interface="org.freedesktop.Hal.Device"/>
26	<allow send_destination="org.freedesktop.Hal"	28	<allow send_destination="org.freedesktop.Hal"
27	send_interface="org.freedesktop.Hal.Manager"/>	29	send_interface="org.freedesktop.Hal.Manager"/>
28		30
		31	</policy>
		32
		33	<!-- Only allow users at the local console to manipulate devices -->
		34	<policy at_console="true">
		35	<allow send_destination="org.freedesktop.Hal"
		36	send_interface="org.freedesktop.Hal.Device.CPUFreq"/>
		37	<allow send_destination="org.freedesktop.Hal"
		38	send_interface="org.freedesktop.Hal.Device.DockStation"/>
		39	<allow send_destination="org.freedesktop.Hal"
		40	send_interface="org.freedesktop.Hal.Device.KillSwitch"/>
		41	<allow send_destination="org.freedesktop.Hal"
		42	send_interface="org.freedesktop.Hal.Device.KeyboardBacklight"/>
		43	<allow send_destination="org.freedesktop.Hal"
		44	send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
		45	<allow send_destination="org.freedesktop.Hal"
		46	send_interface="org.freedesktop.Hal.Device.Leds"/>
		47	<allow send_destination="org.freedesktop.Hal"
		48	send_interface="org.freedesktop.Hal.Device.LightSensor"/>
		49	<allow send_destination="org.freedesktop.Hal"
		50	send_interface="org.freedesktop.Hal.Device.Storage"/>
		51	<allow send_destination="org.freedesktop.Hal"
		52	send_interface="org.freedesktop.Hal.Device.Storage.Removable"/>
		53	<allow send_destination="org.freedesktop.Hal"
		54	send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
		55	<allow send_destination="org.freedesktop.Hal"
		56	send_interface="org.freedesktop.Hal.Device.Volume"/>
		57	<allow send_destination="org.freedesktop.Hal"
		58	send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
		59	<allow send_destination="org.freedesktop.Hal"
		60	send_interface="org.freedesktop.Hal.Device.WakeOnLan"/>
		61
		62	</policy>
		63
		64	<policy user="gdm">
		65	<allow send_destination="org.freedesktop.Hal"
		66	send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
		67	</policy>
		68
		69	<policy user="root">
29	<allow send_destination="org.freedesktop.Hal"	70	<allow send_destination="org.freedesktop.Hal"
30	send_interface="org.freedesktop.Hal.Device.CPUFreq"/>	71	send_interface="org.freedesktop.Hal.Device.CPUFreq"/>
31	<allow send_destination="org.freedesktop.Hal"	72	<allow send_destination="org.freedesktop.Hal"

Lines 107-114 hf_addon_storage_update (void) Link Here

(-)a/hald/freebsd/addons/addon-storage.c (-20 / +9 lines)
107		107
108	if (hf_addon_storage_cdrom_eject_pressed(cdrom))	108	if (hf_addon_storage_cdrom_eject_pressed(cdrom))
109	{	109	{
110	libhal_device_emit_condition(hfp_ctx, hfp_udi, "EjectPressed", "", &hfp_error);	110	libhal_device_emit_condition(hfp_ctx, hfp_udi, "EjectPressed", "", NULL);
111	dbus_error_free(&hfp_error);
112	}	111	}
113		112
114	hfp_cdrom_free(cdrom);	113	hfp_cdrom_free(cdrom);
Lines 164-182 unmount_volumes (void) Link Here
164	"block.storage_device",	163	"block.storage_device",
165	hfp_udi,	164	hfp_udi,
166	&num_volumes,	165	&num_volumes,
167	&hfp_error)) != NULL)	166	NULL)) != NULL)
168	{	167	{
169	int i;	168	int i;
170		169
171	dbus_error_free(&hfp_error);
172
173	for (i = 0; i < num_volumes; i++)	170	for (i = 0; i < num_volumes; i++)
174	{	171	{
175	char *vol_udi;	172	char *vol_udi;
176		173
177	vol_udi = volumes[i];	174	vol_udi = volumes[i];
178		175
179	if (libhal_device_get_property_bool(hfp_ctx, vol_udi, "volume.is_mounted", &hfp_error))	176	if (libhal_device_get_property_bool(hfp_ctx, vol_udi, "volume.is_mounted", NULL))
180	{	177	{
181	DBusMessage *msg = NULL;	178	DBusMessage *msg = NULL;
182	DBusMessage *reply = NULL;	179	DBusMessage *reply = NULL;
Lines 185-191 unmount_volumes (void) Link Here
185	char **options = NULL;	182	char **options = NULL;
186	char *devfile;	183	char *devfile;
187		184
188	dbus_error_free(&hfp_error);
189	hfp_info("Forcing unmount of volume '%s'", vol_udi);	185	hfp_info("Forcing unmount of volume '%s'", vol_udi);
190		186
191	dbus_connection = libhal_ctx_get_dbus_connection(hfp_ctx);	187	dbus_connection = libhal_ctx_get_dbus_connection(hfp_ctx);
Lines 265-274 poll_for_media (boolean check_only, boolean force) Link Here
265	check_lock_state = FALSE;	261	check_lock_state = FALSE;
266		262
267	hfp_info("Checking whether device %s is locked by HAL", addon.device_file);	263	hfp_info("Checking whether device %s is locked by HAL", addon.device_file);
268	if (libhal_device_is_locked_by_others(hfp_ctx, hfp_udi, "org.freedesktop.Hal.Device.Storage", &hfp_error))	264	if (libhal_device_is_locked_by_others(hfp_ctx, hfp_udi, "org.freedesktop.Hal.Device.Storage", NULL))
269	{	265	{
270	hfp_info("... device %s is locked by HAL", addon.device_file);	266	hfp_info("... device %s is locked by HAL", addon.device_file);
271	dbus_error_free(&hfp_error);
272	is_locked_by_hal = TRUE;	267	is_locked_by_hal = TRUE;
273	update_proc_title(addon.device_file);	268	update_proc_title(addon.device_file);
274	goto skip_check;	269	goto skip_check;
Lines 278-287 poll_for_media (boolean check_only, boolean force) Link Here
278	hfp_info("... device %s is not locked by HAL", addon.device_file);	273	hfp_info("... device %s is not locked by HAL", addon.device_file);
279	is_locked_by_hal = FALSE;	274	is_locked_by_hal = FALSE;
280	}	275	}
281	dbus_error_free(&hfp_error);
282		276
283	should_poll = libhal_device_get_property_bool(hfp_ctx, hfp_udi, "storage.media_check_enabled", &hfp_error);	277	should_poll = libhal_device_get_property_bool(hfp_ctx, hfp_udi, "storage.media_check_enabled", NULL);
284	dbus_error_free(&hfp_error);
285	polling_disabled = ! should_poll;	278	polling_disabled = ! should_poll;
286	update_proc_title(addon.device_file);	279	update_proc_title(addon.device_file);
287	}	280	}
Lines 314-321 poll_for_media (boolean check_only, boolean force) Link Here
314	unmount_volumes();	307	unmount_volumes();
315	#endif	308	#endif
316		309
317	libhal_device_rescan(hfp_ctx, hfp_udi, &hfp_error);	310	libhal_device_rescan(hfp_ctx, hfp_udi, NULL);
318	dbus_error_free(&hfp_error);
319	addon.had_media = has_media;	311	addon.had_media = has_media;
320		312
321	return TRUE;	313	return TRUE;
Lines 412-423 main (int argc, char **argv) Link Here
412	! strcmp(driver, "cd")))) && ! strcmp(removable, "true");	404	! strcmp(driver, "cd")))) && ! strcmp(removable, "true");
413	addon.had_media = poll_for_media(TRUE, FALSE);	405	addon.had_media = poll_for_media(TRUE, FALSE);
414		406
415	if (! libhal_device_addon_is_ready(hfp_ctx, hfp_udi, &hfp_error))	407	if (! libhal_device_addon_is_ready(hfp_ctx, hfp_udi, NULL))
416	goto end;	408	goto end;
417	dbus_error_free(&hfp_error);
418		409
419	syscon = dbus_bus_get(DBUS_BUS_SYSTEM, &hfp_error);	410	syscon = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
420	dbus_error_free(&hfp_error);
421	assert(syscon != NULL);	411	assert(syscon != NULL);
422	dbus_connection_set_exit_on_disconnect(syscon, 0);	412	dbus_connection_set_exit_on_disconnect(syscon, 0);
423		413
Lines 452-463 main (int argc, char **argv) Link Here
452	" <method name=\"CheckForMedia\">\n"	442	" <method name=\"CheckForMedia\">\n"
453	" <arg name=\"call_had_sideeffect\" direction=\"out\" type=\"b\"/>\n"	443	" <arg name=\"call_had_sideeffect\" direction=\"out\" type=\"b\"/>\n"
454	" </method>\n",	444	" </method>\n",
455	&hfp_error))	445	NULL))
456	{	446	{
457	hfp_critical("Cannot claim interface 'org.freedesktop.Hal.Device.Storage.Removable'");	447	hfp_critical("Cannot claim interface 'org.freedesktop.Hal.Device.Storage.Removable'");
458	goto end;	448	goto end;
459	}	449	}
460	dbus_error_free(&hfp_error);
461		450
462	while (TRUE)	451	while (TRUE)
463	{	452	{

Lines 30-35 Link Here

(-)a/hald/freebsd/hf-storage.c (-2 / +37 lines)
30	#include <limits.h>	30	#include <limits.h>
31	#include <inttypes.h>	31	#include <inttypes.h>
32	#include <string.h>	32	#include <string.h>
		33	#include <unistd.h>
33	#include <sys/param.h>	34	#include <sys/param.h>
34	#include <sys/types.h>	35	#include <sys/types.h>
35	#include <sys/disklabel.h>	36	#include <sys/disklabel.h>
Lines 418-427 hf_storage_parse_conftxt (const char *conftxt) Link Here
418	continue;	419	continue;
419	}	420	}
420		421
		422	/* XXX This is a hack, but we need to ignore dynamic labels like
		423	* ufsids which are created and destroyed based on whether or not
		424	* the actual device is mounted or not. If we don't then strange
		425	* things happen in applications like nautilus.
		426	*/
		427	if ((! strcmp(fields[1], "LABEL") \|\|
		428	! strcmp(fields[1], "BSD")) &&
		429	! strncmp(fields[2], "ufsid/", strlen("ufsid/")))
		430	{
		431	g_strfreev(fields);
		432	continue;
		433	}
		434
421	geom_obj = g_new0(Geom_Object, 1);	435	geom_obj = g_new0(Geom_Object, 1);
422		436
423	geom_obj->class = g_strdup(fields[1]);	437	geom_obj->class = g_strdup(fields[1]);
424	geom_obj->dev = g_strdup(fields[2]);	438	geom_obj->dev = g_strdup(fields[2]);
		439	/* Allow for spaces in label names. */
		440	if (! strcmp(fields[1], "LABEL"))
		441	{
		442	int j;
		443
		444	for (j = 3; g_strv_length(fields) > (j + 2) &&
		445	strcmp(fields[j + 2], "i"); j++)
		446	{
		447	char *tmp;
		448
		449	tmp = g_strdup_printf("%s %s", geom_obj->dev, fields[j]);
		450	g_free(geom_obj->dev);
		451	geom_obj->dev = tmp;
		452	}
		453	}
		454
425	geom_obj->type = -1; /* We use -1 here to denote a missing type. */	455	geom_obj->type = -1; /* We use -1 here to denote a missing type. */
426	geom_obj->hash = hash;	456	geom_obj->hash = hash;
427		457
Lines 589-599 hf_storage_devd_notify (const char *system, Link Here
589	char *conftxt;	619	char *conftxt;
590	GSList *new_disks;	620	GSList *new_disks;
591		621
592	if (strcmp(system, "DEVFS") \|\| strcmp(subsystem, "CDEV") \|\|	622	if (! data \|\| strcmp(system, "DEVFS") \|\| strcmp(subsystem, "CDEV") \|\|
593	(strcmp(type, "CREATE") && strcmp(type, "DESTROY")))	623	(strcmp(type, "CREATE") && strcmp(type, "DESTROY")))
594	return FALSE;	624	return FALSE;
595		625
		626	if (! strcmp(type, "DESTROY"))
		627	g_usleep(G_USEC_PER_SEC/2);
		628
596	conftxt = hf_get_string_sysctl(NULL, "kern.geom.conftxt");	629	conftxt = hf_get_string_sysctl(NULL, "kern.geom.conftxt");
		630	if (! conftxt)
		631	return FALSE;
597	new_disks = hf_storage_parse_conftxt(conftxt);	632	new_disks = hf_storage_parse_conftxt(conftxt);
598	g_free(conftxt);	633	g_free(conftxt);
599		634
Lines 669-675 hf_storage_conftxt_timeout_cb (gpointer data) Link Here
669	if (hf_is_waiting)	704	if (hf_is_waiting)
670	return TRUE;	705	return TRUE;
671		706
672	hf_storage_devd_notify("DEVFS", "CDEV", "CREATE", NULL);	707	hf_storage_devd_notify("DEVFS", "CDEV", "CREATE", "");
673		708
674	return TRUE;	709	return TRUE;
675	}	710	}

Lines 32-39 Link Here

(-)a/hald/freebsd/hf-usb.c (-4 / +4 lines)
32	#include <fcntl.h>	32	#include <fcntl.h>
33	#include <sys/ioctl.h>	33	#include <sys/ioctl.h>
34	#include <unistd.h>	34	#include <unistd.h>
35	#if __FreeBSD_version < 800092	35	#if (__FreeBSD_version < 800092) \|\| (__FreeBSD_kernel_version < 800092)
36	#if __FreeBSD_version >= 800064	36	#if (__FreeBSD_version >= 800064) \|\| (__FreeBSD_kernel_version >= 800064)
37	#include <legacy/dev/usb/usb.h>	37	#include <legacy/dev/usb/usb.h>
38	#else	38	#else
39	#include <dev/usb/usb.h>	39	#include <dev/usb/usb.h>
Lines 47-55 Link Here
47	#include "hf-devtree.h"	47	#include "hf-devtree.h"
48	#include "hf-util.h"	48	#include "hf-util.h"
49		49
50	#if __FreeBSD_version < 800092	50	#if (__FreeBSD_version < 800092) \|\| (__FreeBSD_kernel_version < 800092)
51	#define HF_USB_DEVICE "/dev/usb"	51	#define HF_USB_DEVICE "/dev/usb"
52	#if __FreeBSD_version < 800066	52	#if (__FreeBSD_version < 800066) \|\| (__FreeBSD_kernel_version < 800066)
53	#define HF_USB2_DEVICE "/dev/usb "	53	#define HF_USB2_DEVICE "/dev/usb "
54	#else	54	#else
55	#define HF_USB2_DEVICE "/dev/usbctl"	55	#define HF_USB2_DEVICE "/dev/usbctl"

Lines 42-63 Link Here

(-)a/hald/freebsd/hf-usb2.c (-28 / +37 lines)
42	static struct libusb20_backend *hf_usb2_be = NULL;	42	static struct libusb20_backend *hf_usb2_be = NULL;
43		43
44	static void	44	static void
45	hf_usb2_copy_parent (HalDevice *parent,
46	const char *key,
47	gpointer user_data)
48	{
49	HalDevice *device;
50
51	g_return_if_fail(HAL_IS_DEVICE(parent));
52	g_return_if_fail(HAL_IS_DEVICE(user_data));
53
54	device = HAL_DEVICE(user_data);
55
56	if (! strncmp(key, "usb_device.", strlen("usb_device.")))
57	hal_device_copy_property(parent, key, device, key);
58	}
59
60	static void
61	hf_usb2_probe_interfaces(HalDevice *parent)	45	hf_usb2_probe_interfaces(HalDevice *parent)
62	{	46	{
63	int num_interfaces;	47	int num_interfaces;
Lines 79-87 hf_usb2_probe_interfaces(HalDevice *parent) Link Here
79		63
80	hal_device_property_set_string(device, "info.subsystem", "usb");	64	hal_device_property_set_string(device, "info.subsystem", "usb");
81	hal_device_property_set_int(device, "usb.interface.number", i);	65	hal_device_property_set_int(device, "usb.interface.number", i);
82	hal_device_property_foreach(parent, hf_usb2_copy_parent, device);
83	hal_device_copy_property(parent, "info.product", device, "info.product");	66	hal_device_copy_property(parent, "info.product", device, "info.product");
84	hal_device_copy_property(parent, "info.vendor", device, "info.vendor");	67	hal_device_copy_property(parent, "info.vendor", device, "info.vendor");
		68	hal_device_merge_with_rewrite(device, parent, "usb.", "usb_device.");
85		69
86	if (hf_device_preprobe(device))	70	if (hf_device_preprobe(device))
87	{	71	{
Lines 98-107 hf_usb2_probe_interfaces(HalDevice *parent) Link Here
98	if (driver)	82	if (driver)
99	{	83	{
100	if (! strcmp(driver, "ukbd"))	84	if (! strcmp(driver, "ukbd"))
101	hf_device_set_input(device, "keyboard", NULL);	85	hf_device_set_input(device, "keyboard", "keys", devname);
102	else if (! strcmp(driver, "ums"))	86	else if (! strcmp(driver, "ums") \|\| ! strcmp(driver, "atp"))
103	{	87	{
104	hf_device_set_input(device, "mouse", devname);	88	hf_device_set_input(device, "mouse", NULL, devname);
105	hf_runner_run_sync(device, 0, "hald-probe-mouse", NULL);	89	hf_runner_run_sync(device, 0, "hald-probe-mouse", NULL);
106	}	90	}
107	else if (! strcmp(driver, "uhid"))	91	else if (! strcmp(driver, "uhid"))
Lines 192-202 hf_usb2_probe (void) Link Here
192	addr = libusb20_dev_get_address(pdev);	176	addr = libusb20_dev_get_address(pdev);
193		177
194	if (addr == 1)	178	if (addr == 1)
195	parent = hf_devtree_find_parent_from_info(hald_get_gdl(), "usbus", bus);	179	parent = hf_devtree_find_from_info(hald_get_gdl(), "usbus", bus);
196	else	180	else
197	parent = hf_device_store_match(hald_get_gdl(), "usb_device.bus_number",	181	parent = hf_device_store_match(hald_get_gdl(), "usb_device.bus_number",
198	HAL_PROPERTY_TYPE_INT32, bus, "usb_device.port_number",	182	HAL_PROPERTY_TYPE_INT32, bus, "usb_device.port_number",
199	HAL_PROPERTY_TYPE_INT32, addr - 1, NULL);	183	HAL_PROPERTY_TYPE_INT32, addr - 1, "info.bus",
		184	HAL_PROPERTY_TYPE_STRING, "usb_device", NULL);
200	if (! parent \|\| hal_device_property_get_bool(parent, "info.ignore"))	185	if (! parent \|\| hal_device_property_get_bool(parent, "info.ignore"))
201	continue;	186	continue;
202		187
Lines 216-222 hf_usb2_devd_add (const char *name, Link Here
216	HalDevice *parent_device;	201	HalDevice *parent_device;
217	int bus, addr, pbus, paddr;	202	int bus, addr, pbus, paddr;
218		203
219	if (strncmp(name, "ugen", strlen("ugen")))	204	if (! parent)
		205	return FALSE;
		206
		207	if (strncmp(name, "ugen", strlen("ugen")) &&
		208	! strncmp(parent, "uhub", strlen("uhub")))
		209	return TRUE;
		210	else if (strncmp(name, "ugen", strlen("ugen")))
220	return FALSE;	211	return FALSE;
221	else if (strncmp(parent, "ugen", strlen("ugen")))	212	else if (strncmp(parent, "ugen", strlen("ugen")))
222	return TRUE;	213	return TRUE;
Lines 232-238 hf_usb2_devd_add (const char *name, Link Here
232		223
233	parent_device = hf_device_store_match(hald_get_gdl(),	224	parent_device = hf_device_store_match(hald_get_gdl(),
234	"usb_device.bus_number", HAL_PROPERTY_TYPE_INT32, pbus,	225	"usb_device.bus_number", HAL_PROPERTY_TYPE_INT32, pbus,
235	"usb_device.port_number", HAL_PROPERTY_TYPE_INT32, paddr, NULL);	226	"usb_device.port_number", HAL_PROPERTY_TYPE_INT32, paddr, "info.bus",
		227	HAL_PROPERTY_TYPE_STRING, "usb_device", NULL);
236		228
237	if (parent_device && ! hal_device_property_get_bool(parent_device,	229	if (parent_device && ! hal_device_property_get_bool(parent_device,
238	"info.ignore"))	230	"info.ignore"))
Lines 255-262 hf_usb2_devd_remove (const char *name, Link Here
255		247
256	if (strncmp(name, "ugen", strlen("ugen")))	248	if (strncmp(name, "ugen", strlen("ugen")))
257	return FALSE;	249	return FALSE;
258	else if (strncmp(parent, "ugen", strlen("ugen")))
259	return TRUE;
260		250
261	if (sscanf(name, "ugen%i.%i", &bus, &addr) != 2)	251	if (sscanf(name, "ugen%i.%i", &bus, &addr) != 2)
262	return FALSE;	252	return FALSE;
Lines 265-271 hf_usb2_devd_remove (const char *name, Link Here
265		255
266	device = hf_device_store_match(hald_get_gdl(), "usb_device.bus_number",	256	device = hf_device_store_match(hald_get_gdl(), "usb_device.bus_number",
267	HAL_PROPERTY_TYPE_INT32, bus, "usb_device.port_number",	257	HAL_PROPERTY_TYPE_INT32, bus, "usb_device.port_number",
268	HAL_PROPERTY_TYPE_INT32, addr, NULL);	258	HAL_PROPERTY_TYPE_INT32, addr, "info.bus",
		259	HAL_PROPERTY_TYPE_STRING, "usb_device", NULL);
269		260
270	if (device)	261	if (device)
271	{	262	{
Lines 276-281 hf_usb2_devd_remove (const char *name, Link Here
276	return FALSE;	267	return FALSE;
277	}	268	}
278		269
		270	static gboolean
		271	hf_usb2_devd_notify (const char *system,
		272	const char *subsystem,
		273	const char *type,
		274	const char *data)
		275	{
		276	if (! data \|\| strcmp(system, "DEVFS") \|\| strcmp(subsystem, "CDEV") \|\|
		277	(strcmp(type, "CREATE") && strcmp(type, "DESTROY")))
		278	return FALSE;
		279
		280	if (! strncmp(data, "cdev=ugen", strlen("cdev=ugen")) \|\|
		281	! strncmp(data, "cdev=usb", strlen("cdev=usb")))
		282	return TRUE;
		283
		284	return FALSE;
		285	}
		286
279	HFHandler hf_usb2_handler = {	287	HFHandler hf_usb2_handler = {
280	.privileged_init = hf_usb2_privileged_init,	288	.privileged_init = hf_usb2_privileged_init,
281	.probe = hf_usb2_probe	289	.probe = hf_usb2_probe
Lines 283-287 HFHandler hf_usb2_handler = { Link Here
283		291
284	HFDevdHandler hf_usb2_devd_handler = {	292	HFDevdHandler hf_usb2_devd_handler = {
285	.add = hf_usb2_devd_add,	293	.add = hf_usb2_devd_add,
286	.remove = hf_usb2_devd_remove	294	.remove = hf_usb2_devd_remove,
		295	.notify = hf_usb2_devd_notify
287	};	296	};

Lines 34-40 Link Here

(-)a/hald/freebsd/probing/probe-usb2-interface.c (-3 / +3 lines)
34		34
35	#include <libusb20_desc.h>	35	#include <libusb20_desc.h>
36	#include <libusb20.h>	36	#include <libusb20.h>
37	#if __FreeBSD_version >= 800064	37	#if (__FreeBSD_version >= 800064) \|\| (__FreeBSD_kernel_version >= 800064)
38	#include <dev/usb/usb_ioctl.h>	38	#include <dev/usb/usb_ioctl.h>
39	#else	39	#else
40	#include <dev/usb2/include/usb2_standard.h>	40	#include <dev/usb2/include/usb2_standard.h>
Lines 58-68 main(int argc, char **argv) Link Here
58	if (pbe == NULL)	58	if (pbe == NULL)
59	goto end;	59	goto end;
60		60
61	busstr = getenv("HAL_PROP_USB_DEVICE_BUS_NUMBER");	61	busstr = getenv("HAL_PROP_USB_BUS_NUMBER");
62	if (! busstr)	62	if (! busstr)
63	goto end;	63	goto end;
64		64
65	addrstr = getenv("HAL_PROP_USB_DEVICE_PORT_NUMBER");	65	addrstr = getenv("HAL_PROP_USB_PORT_NUMBER");
66	if (! addrstr)	66	if (! addrstr)
67	goto end;	67	goto end;
68		68

Lines 38-47 Link Here

(-)a/hald/freebsd/probing/probe-volume.c (-3 / +9 lines)
38	#include <sys/param.h>	38	#include <sys/param.h>
39	#include <sys/mount.h>	39	#include <sys/mount.h>
40	#include <sys/types.h>	40	#include <sys/types.h>
		41	#ifdef HAVE_LIBUFS
41	#include <ufs/ufs/ufsmount.h>	42	#include <ufs/ufs/ufsmount.h>
42	#include <ufs/ufs/dinode.h>	43	#include <ufs/ufs/dinode.h>
43	#include <ufs/ffs/fs.h>	44	#include <ufs/ffs/fs.h>
44	#include <libufs.h>	45	#include <libufs.h>
		46	#endif /* HAVE_LIBUFS */
45	#include <isofs/cd9660/iso.h>	47	#include <isofs/cd9660/iso.h>
46	#include <glib.h>	48	#include <glib.h>
47	#include <libvolume_id.h>	49	#include <libvolume_id.h>
Lines 561-566 main (int argc, char **argv) Link Here
561		563
562	libhal_device_set_property_bool(hfp_ctx, hfp_udi, "volume.ignore", has_children \|\| is_swap, &hfp_error);	564	libhal_device_set_property_bool(hfp_ctx, hfp_udi, "volume.ignore", has_children \|\| is_swap, &hfp_error);
563		565
		566	#ifdef HAVE_LIBUFS
564	if (vid && ! strcmp (vid->type, "ufs"))	567	if (vid && ! strcmp (vid->type, "ufs"))
565	{	568	{
566	struct uufsd ufsdisk;	569	struct uufsd ufsdisk;
Lines 574-579 main (int argc, char **argv) Link Here
574		577
575	snprintf(ufsid, sizeof(ufsid), "%08x%08x", ufsdisk.d_fs.fs_id[0], ufsdisk.d_fs.fs_id[1]);	578	snprintf(ufsid, sizeof(ufsid), "%08x%08x", ufsdisk.d_fs.fs_id[0], ufsdisk.d_fs.fs_id[1]);
576	libhal_device_set_property_string(hfp_ctx, hfp_udi, "volume.freebsd.ufsid", ufsid, &hfp_error);	579	libhal_device_set_property_string(hfp_ctx, hfp_udi, "volume.freebsd.ufsid", ufsid, &hfp_error);
		580	dbus_error_free(&hfp_error);
577	ufs_devs = libhal_manager_find_device_string_match(hfp_ctx,	581	ufs_devs = libhal_manager_find_device_string_match(hfp_ctx,
578	"volume.freebsd.ufsid",	582	"volume.freebsd.ufsid",
579	ufsid,	583	ufsid,
Lines 582-597 main (int argc, char **argv) Link Here
582	dbus_error_free(&hfp_error);	586	dbus_error_free(&hfp_error);
583	for (i = 0; i < num_udis; i++)	587	for (i = 0; i < num_udis; i++)
584	{	588	{
585	if (ufs_devs[i] != NULL)	589	if (ufs_devs[i] != NULL && strcmp(ufs_devs[i], hfp_udi))
586	{	590	{
587	gboolean mounted;	591	gboolean mounted;
588		592
589	mounted = libhal_device_get_property_bool(hfp_ctx, ufs_devs[i], "volume.is_mounted", &hfp_error);	593	mounted = libhal_device_get_property_bool(hfp_ctx, ufs_devs[i], "volume.is_mounted", &hfp_error);
590	dbus_error_free(&hfp_error);	594	dbus_error_free(&hfp_error);
591	if (mounted)	595	if (mounted)
592	{	596	{
593	libhal_device_set_property_bool(hfp_ctx, hfp_udi, "volume.ignore", TRUE, &hfp_error);	597	libhal_device_set_property_bool(hfp_ctx, hfp_udi, "volume.ignore", TRUE, &hfp_error);
594	dbus_error_free(&hfp_error);	598	dbus_error_free(&hfp_error);
		599	break;
595	}	600	}
596	}	601	}
597	}	602	}
Lines 600-605 main (int argc, char **argv) Link Here
600	ufs_disk_close(&ufsdisk);	605	ufs_disk_close(&ufsdisk);
601	}	606	}
602	}	607	}
		608	#endif /* HAVE_LIBUFS */
603		609
604	if (has_children)	610	if (has_children)
605	usage = "partitiontable";	611	usage = "partitiontable";

Lines 1-74 Link Here

(-)a/hald/haldaemon.in (-54 / +59 lines)
1	#!/bin/sh	1	#!/bin/sh
2	#	2	#
3	# haldaemon: HAL daemon	3	# haldaemon: HAL daemon
4	#	4	#
5	# chkconfig: 345 98 02	5	# chkconfig: 345 11 91
6	# description: This is a daemon for collecting and maintaing information \
7	# about hardware from several sources. \
8	# See http://www.freedesktop.org/Software/hal
9	#	6	#
10	# processname: hald	7	# description: This is a daemon for collecting and maintaing information
11	# pidfile: @HALD_PID_FILE@	8	# about hardware from several sources.
		9	# See http://www.freedesktop.org/software/hal
12	#	10	#
13		11
14	# Sanity checks.	12	# Do not load RH compatibility interface.
15	[ -x @sbindir@/hald ] \|\| exit 0	13	WITHOUT_RC_COMPAT=1
16		14
17	# Source function library.	15	# Source function library
18	. @sysconfdir@/rc.d/init.d/functions	16	. @sysconfdir@/rc.d/init.d/functions
19		17
20	# so we can rearrange this easily	18	DAEMON=@sbindir@/hald
21	processname=hald	19	LOCKFILE=@localstatedir@/lock/subsys/hal
22	servicename=haldaemon	20	PIDFILE=@HALD_PID_FILE@
23
24	RETVAL=0	21	RETVAL=0
25		22
26	start() {	23	start()
27	echo -n $"Starting HAL daemon: "	24	{
28	daemon --check $servicename $processname	25	msg_starting $"HAL"
29	RETVAL=$?	26	start_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" --no-announce -- $DAEMON
30	echo	27	RETVAL=$?
31	[ $RETVAL -eq 0 ] && touch @localstatedir@/lock/subsys/$servicename	28	return $RETVAL
32	}	29	}
33		30
34	stop() {	31	stop()
35	echo -n $"Stopping HAL daemon: "	32	{
		33	msg_stopping $"HAL"
		34	stop_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" --no-announce -- $DAEMON
		35	RETVAL=$?
		36	return $RETVAL
		37	}
36		38
37	killproc $servicename -TERM	39	restart()
38	RETVAL=$?	40	{
39	echo	41	stop
40	if [ $RETVAL -eq 0 ]; then	42	start
41	rm -f @localstatedir@/lock/subsys/$servicename
42	rm -f @HALD_PID_FILE@
43	fi
44	}	43	}
45		44
46	# See how we were called.	45	# See how we were called.
47	case "$1" in	46	case "$1" in
48	start)	47	start)
49	start	48	start
50	;;	49	;;
51	stop)	50	stop)
52	stop	51	stop
53	;;	52	;;
54	status)	53	restart)
55	status $processname	54	restart
56	RETVAL=$?	55	;;
57	;;	56	reload)
58	restart)	57	;;
59	stop	58	condrestart)
60	sleep 3	59	if [ -e "$LOCKFILE" ]; then
61	start	60	restart
62	;;	61	fi
63	condrestart)	62	;;
64	if [ -f @localstatedir@/lock/subsys/$servicename ]; then	63	condreload)
65	stop	64	;;
66	sleep 3	65	condstop)
67	start	66	if [ -e "$LOCKFILE" ]; then
68	fi	67	stop
69	;;	68	fi
70	*)	69	;;
71	echo $"Usage: $0 {start\|stop\|status\|restart\|condrestart}"	70	status)
72	;;	71	status --pidfile "$PIDFILE" -- $DAEMON
		72	RETVAL=$?
		73	;;
		74	*)
		75	msg_usage "${0##*/} {start\|stop\|restart\|reload\|condrestart\|condreload\|condstop\|status}"
		76	RETVAL=1
73	esac	77	esac
		78
74	exit $RETVAL	79	exit $RETVAL

Lines 10-23 AM_CPPFLAGS = \ Link Here

(-)a/tools/linux/Makefile.am (-2 / +2 lines)
10	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \	10	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
11	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \	11	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
12	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \	12	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
13	-DPACKAGE_SCRIPT_DIR=\""$(libexecdir)/scripts"\" \	13	-DPACKAGE_SCRIPT_DIR=\""$(datadir)/hal/scripts"\" \
14	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \	14	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
15	-I$(top_srcdir) -I$(top_srcdir)/libhal -I$(top_srcdir)/libhal-storage \	15	-I$(top_srcdir) -I$(top_srcdir)/libhal -I$(top_srcdir)/libhal-storage \
16	@DBUS_CFLAGS@ @GLIB_CFLAGS@ @POLKIT_CFLAGS@	16	@DBUS_CFLAGS@ @GLIB_CFLAGS@ @POLKIT_CFLAGS@
17		17
18	libexec_PROGRAMS =	18	libexec_PROGRAMS =
19		19
20	scriptdir = $(libexecdir)/scripts/linux	20	scriptdir = $(datadir)/hal/scripts/linux
21		21
22	script_SCRIPTS = \	22	script_SCRIPTS = \
23	hal-luks-setup-linux \	23	hal-luks-setup-linux \

Lines 8-18 Link Here

(-)a/tools/linux/hal-system-killswitch-get-power-linux (-74 lines)
8	# the Free Software Foundation; either version 2 of the License, or	8	# the Free Software Foundation; either version 2 of the License, or
9	# (at your option) any later version.	9	# (at your option) any later version.
10		10
11	DELL_WCTL=/usr/bin/dellWirelessCtl
12	if [ -x "/usr/sbin/dellWirelessCtl" ]; then
13	DELL_WCTL=/usr/sbin/dellWirelessCtl
14	fi
15
16	if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then	11	if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
17	if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then	12	if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then
18	value="`hal-system-sonypic getbluetooth`"	13	value="`hal-system-sonypic getbluetooth`"
Lines 22-46 if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then Link Here
22	exit 1	17	exit 1
23	fi	18	fi
24	exit ${value}	19	exit ${value}
25	elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
26	if [ -x "$DELL_WCTL" ]; then
27	# TODO: write our own binary that links with libsmbios?
28	$DELL_WCTL --st_bt
29	value=$?
30	if [ "$value" = "0" ]; then
31	exit 1
32	elif [ "$value" = "1" ]; then
33	exit 0
34	else
35	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
36	echo "dellWirelessCtl returned $value" >&2
37	exit 1
38	fi
39	else
40	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
41	echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
42	exit 1
43	fi
44	elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -r "$HAL_PROP_LINUX_SYSFS_PATH" ]; then	20	elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -r "$HAL_PROP_LINUX_SYSFS_PATH" ]; then
45	read value < $HAL_PROP_LINUX_SYSFS_PATH 2> /dev/null	21	read value < $HAL_PROP_LINUX_SYSFS_PATH 2> /dev/null
46	if [ $? -eq 0 ]; then	22	if [ $? -eq 0 ]; then
Lines 55-110 if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then Link Here
55	echo "Access type not supported" >&2	31	echo "Access type not supported" >&2
56	exit 1	32	exit 1
57	fi	33	fi
58	elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then
59	if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
60	if [ -x "$DELL_WCTL" ]; then
61	# TODO: write our own binary that links with libsmbios?
62	$DELL_WCTL --st_wlan
63	value=$?
64	if [ "$value" = "0" ]; then
65	exit 1
66	elif [ "$value" = "1" ]; then
67	exit 0
68	else
69	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
70	echo "dellWirelessCtl returned $value" >&2
71	exit 1
72	fi
73	else
74	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
75	echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
76	exit 1
77	fi
78	else
79	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
80	echo "Access type not supported" >&2
81	exit 1
82	fi
83	elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then
84	if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
85	if [ -x "$DELL_WCTL" ]; then
86	# TODO: write our own binary that links with libsmbios?
87	$DELL_WCTL --st_wwan
88	value=$?
89	if [ "$value" = "0" ]; then
90	exit 1
91	elif [ "$value" = "1" ]; then
92	exit 0
93	else
94	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
95	echo "dellWirelessCtl returned $value" >&2
96	exit 1
97	fi
98	else
99	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
100	echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
101	exit 1
102	fi
103	else
104	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
105	echo "Access type not supported" >&2
106	exit 1
107	fi
108	else	34	else
109	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2	35	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
110	echo "Killswitch type not supported" >&2	36	echo "Killswitch type not supported" >&2

Lines 8-18 Link Here

(-)a/tools/linux/hal-system-killswitch-set-power-linux (-79 lines)
8	# the Free Software Foundation; either version 2 of the License, or	8	# the Free Software Foundation; either version 2 of the License, or
9	# (at your option) any later version.	9	# (at your option) any later version.
10		10
11	DELL_WCTL=/usr/bin/dellWirelessCtl
12	if [ -x "/usr/sbin/dellWirelessCtl" ]; then
13	DELL_WCTL=/usr/sbin/dellWirelessCtl
14	fi
15
16	if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then	11	if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
17	if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then	12	if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then
18	hal-system-sonypic setbluetooth $value	13	hal-system-sonypic setbluetooth $value
Lines 23-48 if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then Link Here
23	exit 1	18	exit 1
24	fi	19	fi
25	exit 0	20	exit 0
26	elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
27	if [ -x "$DELL_WCTL" ]; then
28	# TODO: write our own binary that links with libsmbios?
29	if [ "$value" = "true" ]; then
30	$DELL_WCTL --bt 1
31	ret=$?
32	else
33	$DELL_WCTL --bt 0
34	ret=$?
35	fi
36	if [ "$ret" != "0" ]; then
37	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
38	echo "dellWirelessCtl returned $ret" >&2
39	exit 1
40	fi
41	else
42	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
43	echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
44	exit 1
45	fi
46	elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -w "$HAL_PROP_LINUX_SYSFS_PATH" ]; then	21	elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -w "$HAL_PROP_LINUX_SYSFS_PATH" ]; then
47	if [ "$value" = "true" ]; then	22	if [ "$value" = "true" ]; then
48	bit=1;	23	bit=1;
Lines 61-120 if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then Link Here
61	echo "Access type not supported" >&2	36	echo "Access type not supported" >&2
62	exit 1	37	exit 1
63	fi	38	fi
64	elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then
65	if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
66	if [ -x "$DELL_WCTL" ]; then
67	# As a side effect we disable the physical kill switch
68	# TODO: write our own binary that links with libsmbios?
69	if [ "$value" = "true" ]; then
70	$DELL_WCTL --sw_wlan 0 --wlan 1
71	ret=$?
72	else
73	$DELL_WCTL --sw_wlan 0 --wlan 0
74	ret=$?
75	fi
76	if [ "$ret" != "0" ]; then
77	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
78	echo "dellWirelessCtl returned $ret" >&2
79	exit 1
80	fi
81	else
82	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
83	echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
84	exit 1
85	fi
86	else
87	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
88	echo "Access type not supported" >&2
89	exit 1
90	fi
91	elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then
92	if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
93	if [ -x "$DELL_WCTL" ]; then
94	# As a side effect we disable the physical kill switch
95	# TODO: write our own binary that links with libsmbios?
96	if [ "$value" = "true" ]; then
97	$DELL_WCTL --sw_wwan 0 --wwan 1
98	ret=$?
99	else
100	$DELL_WCTL --sw_wwan 0 --wwan 0
101	ret=$?
102	fi
103	if [ "$ret" != "0" ]; then
104	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
105	echo "dellWirelessCtl returned $ret" >&2
106	exit 1
107	fi
108	else
109	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
110	echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
111	exit 1
112	fi
113	else
114	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
115	echo "Access type not supported" >&2
116	exit 1
117	fi
118	else	39	else
119	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2	40	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
120	echo "Killswitch type not supported" >&2	41	echo "Killswitch type not supported" >&2