summaryrefslogtreecommitdiff
path: root/source/l/hal
diff options
context:
space:
mode:
Diffstat (limited to 'source/l/hal')
-rw-r--r--source/l/hal/doinst.sh23
-rwxr-xr-xsource/l/hal/hal.SlackBuild177
-rw-r--r--source/l/hal/hal.conf69
-rw-r--r--source/l/hal/patches/10-keymap.fdi-restore_zap.diff67
-rw-r--r--source/l/hal/patches/fix-build-with-automake-1.11.1.patch27
-rw-r--r--source/l/hal/patches/fix-hal-segfault.patch33
-rw-r--r--source/l/hal/patches/fix_ioperm_arguments.patch40
-rw-r--r--source/l/hal/patches/fix_libusb_detection.diff65
-rw-r--r--source/l/hal/patches/fix_segfault-dbus_error_init.patch179
-rw-r--r--source/l/hal/patches/fix_segfault_in_LIBHAL_FREE_DBUS_ERROR.diff51
-rw-r--r--source/l/hal/patches/handle_input.touchpad_explicitly.diff75
-rw-r--r--source/l/hal/patches/ignore_internal_dm_devices.diff47
-rw-r--r--source/l/hal/patches/increase_HAL_PATH_MAX_to_4096.diff30
-rw-r--r--source/l/hal/rc.hald49
-rw-r--r--source/l/hal/slack-desc19
15 files changed, 0 insertions, 951 deletions
diff --git a/source/l/hal/doinst.sh b/source/l/hal/doinst.sh
deleted file mode 100644
index a1c86cf4..00000000
--- a/source/l/hal/doinst.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-config() {
- NEW="$1"
- OLD="$(dirname $NEW)/$(basename $NEW .new)"
- # If there's no config file by that name, mv it over:
- if [ ! -r $OLD ]; then
- mv $NEW $OLD
- elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
- # toss the redundant copy
- rm $NEW
- fi
- # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-# Keep same perms on rc.hald.new:
-if [ -e etc/rc.d/rc.hald ]; then
- cp -a etc/rc.d/rc.hald etc/rc.d/rc.hald.new.incoming
- cat etc/rc.d/rc.hald.new > etc/rc.d/rc.hald.new.incoming
- mv etc/rc.d/rc.hald.new.incoming etc/rc.d/rc.hald.new
-fi
-
-config etc/rc.d/rc.hald.new
-config etc/dbus-1/system.d/hal.conf.new
-
diff --git a/source/l/hal/hal.SlackBuild b/source/l/hal/hal.SlackBuild
deleted file mode 100755
index 57d9e3bc..00000000
--- a/source/l/hal/hal.SlackBuild
+++ /dev/null
@@ -1,177 +0,0 @@
-#!/bin/sh
-
-# Copyright 2007 Ole Andre Rodlie <olear@slackforge.net>
-# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PKGNAM=hal
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
-
-NUMJOBS=${NUMJOBS:--j7}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) export ARCH=i486 ;;
- arm*) export ARCH=arm ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
- *) export ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP || exit 1
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-$VERSION || exit 1
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Restore the DontZap defaults from lore
-zcat $CWD/patches/10-keymap.fdi-restore_zap.diff.gz | patch -p1 --verbose || exit 1
-
-# Oops, a freebsd-specific commit wasn't :-)
-zcat $CWD/patches/fix_libusb_detection.diff.gz | patch -p1 --verbose || exit 1
-
-# Fix a segfault -- http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=562068
-zcat $CWD/patches/fix_segfault_in_LIBHAL_FREE_DBUS_ERROR.diff.gz | patch -p1 --verbose || exit 1
-
-# Increase PATH_HAL_MAX to 4096 to avoid crashes
-# https://bugs.freedesktop.org/show_bug.cgi?id=25888
-zcat $CWD/patches/increase_HAL_PATH_MAX_to_4096.diff.gz | patch -p1 --verbose || exit 1
-
-# Handle input.touchpad explicitly (needed due to kernel changes)
-zcat $CWD/patches/handle_input.touchpad_explicitly.diff.gz | patch -p1 --verbose || exit 1
-
-# Fix incorrect arguments to ioperm()
-zcat $CWD/patches/fix_ioperm_arguments.patch.gz | patch -p1 --verbose || exit 1
-
-# Fix segfaults from not calling dbus_error_init() early enough
-zcat $CWD/patches/fix_segfault-dbus_error_init.patch.gz | patch -p1 --verbose || exit 1
-
-# Ignore internal DM devices with new DM udev rules
-# https://bugzilla.redhat.com/show_bug.cgi?id=613909
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=586286
-zcat $CWD/patches/ignore_internal_dm_devices.diff.gz | patch -p1 --verbose || exit 1
-
-# Fix build with automake 1.11.1
-zcat $CWD/patches/fix-build-with-automake-1.11.1.patch | patch -p1 --verbose || exit 1
-
-# Fix segfault in hald/linux/device.c
-zcat $CWD/patches/fix-hal-segfault.patch | patch -p1 --verbose || exit 1
-
-autoconf
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --libexecdir=/usr/libexec \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --with-udev-prefix=/lib \
- --disable-static \
- --enable-docbook-docs \
- --docdir=/usr/doc/$PKGNAM-$VERSION \
- --with-pid-file=/var/run/hald/pid \
- --enable-parted \
- --disable-policy-kit \
- --enable-console-kit \
- --disable-acl-management \
- --enable-umount-helper \
- --enable-sonypic \
- --build=$ARCH-slackware-linux \
- || exit 1
-# These were merged into the 2.6.22 kernels
-# --enable-acpi-ibm --enable-acpi-toshiba
-# Use these instead of the corresponding --disable lines for PolicyKit support
-# --enable-policy-kit \
-# --enable-console-kit \
-# --enable-acl-management \
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
-
-# Install init script for hal
-mkdir -p $PKG/etc/rc.d
-zcat $CWD/rc.hald.gz > $PKG/etc/rc.d/rc.hald.new
-# Make HAL run by default:
-chmod 0755 $PKG/etc/rc.d/rc.hald.new
-
-# /* remove everything between the C-style comments if using PK
-# Make the HAL access controls suitable for us
-# Big thanks to Richard Hughes for feedback on this :-)
-# First, move the one installed by the system to the docs directory
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-mv $PKG/etc/dbus-1/system.d/hal.conf \
- $PKG/usr/doc/$PKGNAM-$VERSION/hal.conf.orig
-# end removal */
-# Don't clobber an existing config file in case custom changes have been made
-zcat $CWD/hal.conf.gz > $PKG/etc/dbus-1/system.d/hal.conf.new
-
-# Install docs (directory was created above)
-cp -a \
- AUTHORS COPYING* HACKING INSTALL NEWS README* \
- $PKG/usr/doc/$PKGNAM-$VERSION
-( cd $PKG/usr/doc/$PKGNAM-$VERSION
- ln -s ../../share/gtk-doc/html/libhal libhal
- ln -s ../../share/gtk-doc/html/libhal-storage libhal-storage
-)
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/l/hal/hal.conf b/source/l/hal/hal.conf
deleted file mode 100644
index 03c75353..00000000
--- a/source/l/hal/hal.conf
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
- <!-- Only root or user haldaemon can own the HAL service -->
- <policy user="haldaemon">
- <allow own="org.freedesktop.Hal"/>
- </policy>
- <policy user="root">
- <allow own="org.freedesktop.Hal"/>
- </policy>
-
- <policy context="default">
- <!-- Allow anyone to invoke methods on the Introspectable interface -->
- <allow send_destination="org.freedesktop.Hal"
- send_interface="org.freedesktop.DBus.Introspectable"/>
- <!-- Allow anyone to invoke methods on the Properties interface -->
- <allow send_destination="org.freedesktop.Hal"
- send_interface="org.freedesktop.DBus.Properties" />
- <!-- Allow anyone to invoke methods on the Manager interface -->
- <allow send_destination="org.freedesktop.Hal"
- send_interface="org.freedesktop.Hal.Manager"/>
- <!-- Allow anyone to invoke methods on the Device interface -->
- <allow send_destination="org.freedesktop.Hal"
- send_interface="org.freedesktop.Hal.Device"/>
- </policy>
-
- <!-- Allow members of 'power' group to do power management stuff -->
- <policy group="power">
- <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.CPUFreq"/>
- <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.KeyboardBacklight"/>
- <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.DockStation"/>
- <allow send_destination="org.freedesktop.Hal"
- send_interface="org.freedesktop.Hal.Device.Leds"/>
- </policy>
-
- <!-- Allow members of 'plugdev' group to mount/unmount volumes -->
- <policy group="plugdev">
- <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.Volume"/>
- <allow send_destination="org.freedesktop.Hal"
- send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
- </policy>
-
- <!-- Allow members of netdev group to en/disable wake-on-lan in NICs
- and to turn radios on and off -->
- <policy group="netdev">
- <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.WakeOnLan"/>
- </policy>
-
-</busconfig>
-
diff --git a/source/l/hal/patches/10-keymap.fdi-restore_zap.diff b/source/l/hal/patches/10-keymap.fdi-restore_zap.diff
deleted file mode 100644
index 12e21ba7..00000000
--- a/source/l/hal/patches/10-keymap.fdi-restore_zap.diff
+++ /dev/null
@@ -1,67 +0,0 @@
-We're going to make it clearer to users that they should NOT edit
- this file (as installed to /usr/share/hal/fdi/... and also let
- them know where to copy it and how to edit that copy for an
- alternate keymap and such... --rworkman @ 20091211
-
-diff -Nur hal-0.5.11.orig/fdi/policy/10osvendor/10-keymap.fdi hal-0.5.11/fdi/policy/10osvendor/10-keymap.fdi
---- hal-0.5.11.orig/fdi/policy/10osvendor/10-keymap.fdi 2008-05-07 18:21:16.000000000 -0500
-+++ hal-0.5.11/fdi/policy/10osvendor/10-keymap.fdi 2009-07-21 00:06:11.779152226 -0500
-@@ -1,4 +1,8 @@
- <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
-+
-+<!-- DO NOT EDIT THIS FILE - IT WILL BE OVERWRITTEN ON UPGRADES.
-+ SEE THE "READ THIS" NOTE BELOW FOR INSTRUCTIONS -->
-+
- <deviceinfo version="0.2">
- <device>
- <match key="info.capabilities" contains="input.keymap">
-@@ -6,18 +10,41 @@
- </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>
-+ <!-- Restore Ctrl-Alt-Bksp Xserver Zapping -->
-+ <merge key="input.xkb.options" type="string">terminate:ctrl_alt_bksp</merge>
-
-+ <!-- Edit (as needed) these four lines in the copied fdi file -->
-+ <merge key="input.xkb.rules" type="string">base</merge>
-+ <merge key="input.xkb.model" type="string">evdev</merge>
- <merge key="input.xkb.layout" type="string">us</merge>
- <merge key="input.xkb.variant" type="string" />
-+
- </match>
- </device>
- </deviceinfo>
-+
-+<!-- READ THIS FOR CUSTOM KEYBOARD INFORMATION
-+
-+ If you want to add a custom model/layout/variant to X, you will need to COPY
-+ this file to /etc/hal/fdi/policy/ and edit that copy. After editing it to
-+ suit, you will need to leave X, restart the HAL daemon, and start X again.
-+
-+ Here's an example of the four lines from above:
-+ <merge key="input.xkb.rules" type="string">base</merge>
-+ <merge key="input.xkb.model" type="string">evdev</merge>
-+ <merge key="input.xkb.layout" type="string">us</merge>
-+ <merge key="input.xkb.variant" type="string">intl</merge>
-+
-+ Many desktop environments, including KDE and Xfce, have their own methods to
-+ configure keyboard layouts and such if you'd like to use them.
-+
-+ If you prefer to use the "old" way of configuring keyboards (without HAL's
-+ input device hotplugging), then you'll need to add the following lines to
-+ the ServerFlags section of /etc/X11/xorg.conf:
-+ Option "AllowEmptyInput" "false"
-+ Option "AutoAddDevices" "false"
-+ Option "AutoEnableDevices" "false"
-+ You can now edit the Keyboard section of xorg.conf as usual.
-+-->
-+
diff --git a/source/l/hal/patches/fix-build-with-automake-1.11.1.patch b/source/l/hal/patches/fix-build-with-automake-1.11.1.patch
deleted file mode 100644
index 13d1817c..00000000
--- a/source/l/hal/patches/fix-build-with-automake-1.11.1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From ce8422fc8ec4881c5e54b651af3ef4ce2ca96847 Mon Sep 17 00:00:00 2001
-From: Bernhard Rosenkraenzer <bero@arklinux.org>
-Date: Mon, 23 Aug 2010 14:50:40 +0200
-Subject: [PATCH] fix build with automake 1.11.1
-
-Fixed build with automake 1.11.1: whitespace following trailing backslash.
-fd.o#29085
----
- policy/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/policy/Makefile.am b/policy/Makefile.am
-index b506a08..503e9f3 100644
---- a/policy/Makefile.am
-+++ b/policy/Makefile.am
-@@ -24,7 +24,7 @@ check:
- then \
- echo ok; \
- else \
-- echo failed; \
-+ echo failed; \
- exit 1; \
- fi; \
- done;
---
-1.7.3.2
-
diff --git a/source/l/hal/patches/fix-hal-segfault.patch b/source/l/hal/patches/fix-hal-segfault.patch
deleted file mode 100644
index 4e409e31..00000000
--- a/source/l/hal/patches/fix-hal-segfault.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From fc9571c07a81aba8a8fdaa8014d4034b6456d203 Mon Sep 17 00:00:00 2001
-From: Michael Schroeder <mls@novell.com>
-Date: Mon, 23 Aug 2010 16:13:13 +0200
-Subject: [PATCH] fix hal segfault
-
-Fixed hal segfault. It crashes because strlen() gets called with a
-NULL pointer (ppdev_compute_udi calls hal_util_get_last_element
-with a NULL pointer).
-
-bnc#556485
----
- hald/linux/device.c | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/hald/linux/device.c b/hald/linux/device.c
-index 8570d46..401dc44 100644
---- a/hald/linux/device.c
-+++ b/hald/linux/device.c
-@@ -2287,9 +2287,10 @@ ppdev_compute_udi (HalDevice *d)
- gchar udi[256];
- const char *name;
-
-- name = hal_util_get_last_element( hal_device_property_get_string(d, "linux.device_file"));
-+ name = hal_device_property_get_string (d, "linux.device_file");
-
- if (name) {
-+ name = hal_util_get_last_element (name);
- hald_compute_udi (udi, sizeof (udi), "/org/freedesktop/Hal/devices/ppdev_%s", name);
- } else {
- hald_compute_udi (udi, sizeof (udi), "/org/freedesktop/Hal/devices/ppdev");
---
-1.7.3.2
-
diff --git a/source/l/hal/patches/fix_ioperm_arguments.patch b/source/l/hal/patches/fix_ioperm_arguments.patch
deleted file mode 100644
index 833e0756..00000000
--- a/source/l/hal/patches/fix_ioperm_arguments.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit 597c1ffffd61a15a334ce42f2a569c59f0270bcb
-Author: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Date: Thu Feb 25 02:25:18 2010 -0800
-
- Fix incorrect arguments to ioperm() call
-
- The second argument of ioperm() is not the last port to be accessed
- but rather length of the port range [port, port + len).
-
- Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
- Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
-
-diff --git a/hald/linux/addons/addon-imac-backlight.c b/hald/linux/addons/addon-imac-backlight.c
-index e869192..54e4ea3 100644
---- a/hald/linux/addons/addon-imac-backlight.c
-+++ b/hald/linux/addons/addon-imac-backlight.c
-@@ -158,7 +158,8 @@ main (int argc, char **argv)
- goto out;
- }
-
-- if (ioperm(0xB2, 0xB3, 1) < 0)
-+ /* Allow access to ports 0xB2 and 0xB3 */
-+ if (ioperm(0xB2, 2, 1) < 0)
- {
- HAL_ERROR (("ioperm failed (you should be root)."));
- exit(1);
-diff --git a/hald/linux/addons/addon-macbookpro-backlight.c b/hald/linux/addons/addon-macbookpro-backlight.c
-index 2a6fef6..c1bbbac 100644
---- a/hald/linux/addons/addon-macbookpro-backlight.c
-+++ b/hald/linux/addons/addon-macbookpro-backlight.c
-@@ -507,7 +507,8 @@ main (int argc, char *argv[])
- state = INREG(0x7ae4);
- OUTREG(0x7ae4, state);
-
-- if (ioperm (0x300, 0x304, 1) < 0) {
-+ /* Allow access to porta 0x300 through 0x304 */
-+ if (ioperm (0x300, 5, 1) < 0) {
- HAL_ERROR (("ioperm failed (you should be root)."));
- exit(1);
- }
diff --git a/source/l/hal/patches/fix_libusb_detection.diff b/source/l/hal/patches/fix_libusb_detection.diff
deleted file mode 100644
index 8a4637d4..00000000
--- a/source/l/hal/patches/fix_libusb_detection.diff
+++ /dev/null
@@ -1,65 +0,0 @@
-commit fce91df8ba7f305c624baf1f06961c040b088ecc
-Author: Joe Marcus Clarke <marcus@FreeBSD.org>
-Date: Mon Dec 7 19:05:27 2009 -0500
-
- Fix libusb detection on Linux
-
- Adjust the FreeBSD libusb20 code so that it does not interfere with the
- Linux libusb detection.
-
- Reported by: Robby Workman <rw@rlworkman.net>
-
-diff --git a/configure.in b/configure.in
-index a8fda51..8363595 100644
---- a/configure.in
-+++ b/configure.in
-@@ -479,9 +479,6 @@ if test "x$with_libpci" != xno ; then
- fi
- AM_CONDITIONAL([HAVE_LIBPCI], [test "x$USE_LIBPCI" = "xyes"])
-
--USE_LIBUSB20=no
--USE_LIBUSB=no
--LIBUSB20_LIBS=""
- AC_ARG_WITH([backend],
- AS_HELP_STRING([--with-backend=<name>],
- [backend to use (linux/solaris/freebsd/dummy)]),
-@@ -510,21 +507,25 @@ AM_CONDITIONAL(HALD_COMPILE_FREEBSD, [test x$HALD_BACKEND = xfreebsd], [Compilin
- AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris])
- AC_SUBST(HALD_BACKEND)
- if test "x$HALD_BACKEND" = "xfreebsd"; then
-- AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_LIBUSB20=yes], [USE_LIBUSB20=no])
--fi
--if test "x$USE_LIBUSB20" = "xno"; then
-- AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_LIBUSB=yes], [USE_LIBUSB=no])
--fi
--AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB20" = "xyes"])
--AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB" = "xyes"])
--if test "x$USE_LIBUSB20" = "xyes"; then
-- AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20])
-- LIBUSB20_LIBS="-lusb20"
--elif test "x$USE_LIBUSB" = "xyes"; then
-- AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20])
-- LIBUSB20_LIBS="-lusb"
-+ 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])
diff --git a/source/l/hal/patches/fix_segfault-dbus_error_init.patch b/source/l/hal/patches/fix_segfault-dbus_error_init.patch
deleted file mode 100644
index f01eefca..00000000
--- a/source/l/hal/patches/fix_segfault-dbus_error_init.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-commit baa61a879985d63f549854518ef14efd40e62e8c
-Author: Peter Jones <pjones@redhat.com>
-Date: Wed Feb 24 11:19:28 2010 -0500
-
- Make sure dbus_error_init() is called before LIBHAL_FREE_DBUS_ERROR()
-
- If dbus_error_init() is not called before LIBHAL_FREE_DBUS_ERROR() is
- called on that error, then it is uninitialized and may segfault. This
- means that dbus_error_init() must be called before any "goto out" if
- "out:" calls LIBHAL_FREE_DBUS_ERROR().
-
- Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
-
-diff --git a/hald/linux/probing/probe-hiddev.c b/hald/linux/probing/probe-hiddev.c
-index 45d2084..bffc040 100644
---- a/hald/linux/probing/probe-hiddev.c
-+++ b/hald/linux/probing/probe-hiddev.c
-@@ -57,11 +57,12 @@ main (int argc, char *argv[])
- /* assume failure */
- ret = 1;
-
-+ dbus_error_init (&error);
-+
- udi = getenv ("UDI");
- if (udi == NULL)
- goto out;
-
-- dbus_error_init (&error);
- if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
- goto out;
-
-diff --git a/hald/linux/probing/probe-ieee1394-unit.c b/hald/linux/probing/probe-ieee1394-unit.c
-index 70b0f86..aaa92e2 100644
---- a/hald/linux/probing/probe-ieee1394-unit.c
-+++ b/hald/linux/probing/probe-ieee1394-unit.c
-@@ -388,6 +388,8 @@ int main (int argc, char *argv[])
-
- setup_logger ();
-
-+ dbus_error_init (&error);
-+
- udi = getenv ("UDI");
- if (udi == NULL)
- goto out;
-@@ -396,7 +398,6 @@ int main (int argc, char *argv[])
- if (ieee1394_udi == NULL)
- goto out;
-
-- dbus_error_init (&error);
- if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
- goto out;
-
-diff --git a/hald/linux/probing/probe-net-bluetooth.c b/hald/linux/probing/probe-net-bluetooth.c
-index 0b1b912..e911eea 100644
---- a/hald/linux/probing/probe-net-bluetooth.c
-+++ b/hald/linux/probing/probe-net-bluetooth.c
-@@ -141,6 +141,8 @@ main (int argc, char *argv[])
- DBusMessage *reply = NULL;
- DBusError error;
-
-+ dbus_error_init (&error);
-+
- udi = getenv ("UDI");
- if (udi == NULL)
- goto out;
-@@ -151,8 +153,6 @@ main (int argc, char *argv[])
-
- HAL_INFO (("Investigating '%s'", iface));
-
-- dbus_error_init (&error);
--
- if ((conn = dbus_bus_get (DBUS_BUS_SYSTEM, &error)) == NULL)
- goto out;
-
-diff --git a/hald/linux/probing/probe-printer.c b/hald/linux/probing/probe-printer.c
-index 91ed7bc..7c6d1c6 100644
---- a/hald/linux/probing/probe-printer.c
-+++ b/hald/linux/probing/probe-printer.c
-@@ -66,6 +66,8 @@ main (int argc, char *argv[])
- ret = 1;
-
- setup_logger ();
-+
-+ dbus_error_init (&error);
-
- udi = getenv ("UDI");
- if (udi == NULL) {
-@@ -73,7 +75,6 @@ main (int argc, char *argv[])
- goto out;
- }
-
-- dbus_error_init (&error);
- if ((ctx = libhal_ctx_init_direct (&error)) == NULL) {
- HAL_ERROR (("ctx init failed"));
- goto out;
-diff --git a/hald/linux/probing/probe-smbios.c b/hald/linux/probing/probe-smbios.c
-index 0bc9689..15c0d4f 100644
---- a/hald/linux/probing/probe-smbios.c
-+++ b/hald/linux/probing/probe-smbios.c
-@@ -129,6 +129,8 @@ main (int argc, char *argv[])
- ret = 1;
-
- setup_logger ();
-+
-+ dbus_error_init (&error);
-
- udi = getenv ("UDI");
- if (udi == NULL) {
-@@ -136,7 +138,6 @@ main (int argc, char *argv[])
- goto out;
- }
-
-- dbus_error_init (&error);
- if ((ctx = libhal_ctx_init_direct (&error)) == NULL) {
- HAL_ERROR (("ctx init failed"));
- goto out;
-diff --git a/hald/linux/probing/probe-storage.c b/hald/linux/probing/probe-storage.c
-index 824a82e..dd524ca 100644
---- a/hald/linux/probing/probe-storage.c
-+++ b/hald/linux/probing/probe-storage.c
-@@ -109,6 +109,8 @@ main (int argc, char *argv[])
- /* assume failure */
- ret = 1;
-
-+ dbus_error_init (&error);
-+
- if ((udi = getenv ("UDI")) == NULL)
- goto out;
- if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL)
-@@ -127,7 +129,6 @@ main (int argc, char *argv[])
- else
- only_check_for_fs = FALSE;
-
-- dbus_error_init (&error);
- if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
- goto out;
-
-diff --git a/hald/linux/probing/probe-video4linux.c b/hald/linux/probing/probe-video4linux.c
-index cf913c0..7bc13e8 100644
---- a/hald/linux/probing/probe-video4linux.c
-+++ b/hald/linux/probing/probe-video4linux.c
-@@ -58,6 +58,8 @@ main (int argc, char *argv[])
-
- setup_logger ();
-
-+ dbus_error_init (&error);
-+
- device_file = getenv ("HAL_PROP_VIDEO4LINUX_DEVICE");
- if (device_file == NULL)
- goto out;
-@@ -66,7 +68,6 @@ main (int argc, char *argv[])
- if (udi == NULL)
- goto out;
-
-- dbus_error_init (&error);
- ctx = libhal_ctx_init_direct (&error);
- if (ctx == NULL)
- goto out;
-diff --git a/hald/linux/probing/probe-volume.c b/hald/linux/probing/probe-volume.c
-index 0de1b91..7268fff 100644
---- a/hald/linux/probing/probe-volume.c
-+++ b/hald/linux/probing/probe-volume.c
-@@ -318,6 +318,8 @@ main (int argc, char *argv[])
- /* assume failure */
- ret = 1;
-
-+ dbus_error_init (&error);
-+
- if ((udi = getenv ("UDI")) == NULL)
- goto out;
- if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL)
-@@ -346,7 +348,6 @@ main (int argc, char *argv[])
-
- fsusage = getenv ("HAL_PROP_VOLUME_FSUSAGE");
-
-- dbus_error_init (&error);
- if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
- goto out;
-
diff --git a/source/l/hal/patches/fix_segfault_in_LIBHAL_FREE_DBUS_ERROR.diff b/source/l/hal/patches/fix_segfault_in_LIBHAL_FREE_DBUS_ERROR.diff
deleted file mode 100644
index b5bfdec6..00000000
--- a/source/l/hal/patches/fix_segfault_in_LIBHAL_FREE_DBUS_ERROR.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-commit dcb2829b8eff61463b0869614ddb07b1c86cecaa
-Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Date: Wed Dec 30 12:42:52 2009 +0100
-
- linux/probe-input: don't use error prio init
-
- it may happen in the out: case that LIBHAL_FREE_DBUS_ERROR (&error) is
- called before the error structure is initialized via
- dbus_error_init (&error). This could lead to a segfault during startup
- as seen in dmesg:
-
- |Intel AES-NI instructions are not detected.
- |padlock: VIA PadLock not detected.
- |hald-probe-inpu[1793]: segfault at 2 ip 00007f656fb68969 sp 00007fff39eeb950 error 4 in libc-2.10.2.so[7f656faf3000+14a000]
- |hald-probe-inpu[1796]: segfault at 2 ip 00007fa2c3293969 sp 00007fffd92a5dd0 error 4 in libc-2.10.2.so[7fa2c321e000+14a000]
- |hald-probe-inpu[1797]: segfault at 2 ip 00007f1d08ba2969 sp 00007fff34244e30 error 4 in libc-2.10.2.so[7f1d08b2d000+14a000]
- |hald-probe-inpu[1799]: segfault at 2 ip 00007f35c0e3d969 sp 00007fffe5ec7ee0 error 4 in libc-2.10.2.so[7f35c0dc8000+14a000]
- |hald-probe-inpu[1800]: segfault at 2 ip 00007f931c556969 sp 00007fffe1825b60 error 4 in libc-2.10.2.so[7f931c4e1000+14a000]
- |hald-probe-inpu[1801]: segfault at 2 ip 00007f5156d9a969 sp 00007fff4e620af0 error 4 in libc-2.10.2.so[7f5156d25000+14a000]
- |RPC: Registered udp transport module.
- |RPC: Registered tcp transport module.
-
- What I run into seems to be reported as Debian #562068 [0]. This patch
- makes the segfault go away on my machine.
-
- [0] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=562068
-
- Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
- Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
-
-
-diff --git a/hald/linux/probing/probe-input.c b/hald/linux/probing/probe-input.c
-index 94e9929..cad47d3 100644
---- a/hald/linux/probing/probe-input.c
-+++ b/hald/linux/probing/probe-input.c
-@@ -70,6 +70,7 @@ main (int argc, char *argv[])
- fd = -1;
-
- setup_logger ();
-+ dbus_error_init (&error);
-
- button_type = getenv ("HAL_PROP_BUTTON_TYPE");
- if (button_type == NULL)
-@@ -96,7 +97,6 @@ main (int argc, char *argv[])
- if (udi == NULL)
- goto out;
-
-- dbus_error_init (&error);
- if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
- goto out;
-
diff --git a/source/l/hal/patches/handle_input.touchpad_explicitly.diff b/source/l/hal/patches/handle_input.touchpad_explicitly.diff
deleted file mode 100644
index b1231d6d..00000000
--- a/source/l/hal/patches/handle_input.touchpad_explicitly.diff
+++ /dev/null
@@ -1,75 +0,0 @@
-commit 6dccf8e3ad181e8f56b1d2a994ec50a1953a1c2d
-Author: Michael Witten <mfwitten@gmail.com>
-Date: Tue Jan 5 18:53:17 2010 -0600
-
- Policy: handle `input.touchpad' explicitly
-
- This commit essentially duplicates the policy for:
-
- <match key="info.capabilities" contains="input.mouse">
-
- and then changes `input.mouse' to `input.touchpad'. This
- is necessary because in Linus Torvalds's Linux repo:
-
- git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
-
- the following commit:
-
- commit 7105d2ea73e1391b681d0e1212c42f561c64d429
- Author: Dmitry Torokhov <dmitry.torokhov@gmail.com>
- Date: Fri Dec 11 23:54:54 2009 -0800
-
- Input: ALPS - do not set REL_X/REL_Y capabilities on the touchpad
-
- Relative events are only reported via secondary device therefore device
- associated with the touchpad should not advertise these capabilities.
-
- Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-
- so that HAL no longer adds:
-
- input.mouse
-
- to an ALPS touchpad's:
-
- info.capabilities
-
- so that HAL no longer marks the ALPS touchpad with:
-
- input.x11_driver = 'evdev'
-
- because the policy file:
-
- fdi/policy/10osvendor/10-x11-input.fdi
-
- doesn't define the policy for:
-
- <match key="info.capabilities" contains="input.touchpad">
-
- which was previous unnecessary because everything used to
- be caught by the policy for:
-
- <match key="info.capabilities" contains="input.mouse">
-
- Signed-off-by: Michael Witten <mfwitten@gmail.com>
- Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
-
-diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi
-index cff8fc5..8bbe263 100644
---- a/fdi/policy/10osvendor/10-x11-input.fdi
-+++ b/fdi/policy/10osvendor/10-x11-input.fdi
-@@ -16,6 +16,14 @@
- </match>
- </match>
-
-+ <match key="info.capabilities" contains="input.touchpad">
-+ <merge key="input.x11_driver" type="string">mouse</merge>
-+ <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
-+ string="Linux">
-+ <merge key="input.x11_driver" type="string">evdev</merge>
-+ </match>
-+ </match>
-+
- <match key="info.capabilities" contains="input.tablet">
- <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
- string="Linux">
diff --git a/source/l/hal/patches/ignore_internal_dm_devices.diff b/source/l/hal/patches/ignore_internal_dm_devices.diff
deleted file mode 100644
index 735a45f3..00000000
--- a/source/l/hal/patches/ignore_internal_dm_devices.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-From 6f16321da13f6a7cbd9c424ddba2e727e434fa25 Mon Sep 17 00:00:00 2001
-From: Milan Broz <mbroz@redhat.com>
-Date: Tue, 13 Jul 2010 16:07:32 +0200
-Subject: [PATCH] HAL: Ignore internal DM devices with new DM udev rules
-
-With new device-mapper udev rules are /dev/mapper/* symlinks
-to basic device name /dev/dm-X.
-(Change requested by udev upstream.)
-
-This change breaks temporary-cryptsetup workaround inside hal.
-
-With new dm-udev rules (uncluded since device-mapper 1.02.39)
-there is DM_UDEV_DISABLE_OTHER_RULES_FLAG variable
-which controls that scan should be ignored for this device
-(it is set for all internal devices, including temporary cryptsetup,
-internal parts of lvm devices etc.)
-
-Ignore device if this flag is set.
-
-See bugs
-https://bugzilla.redhat.com/show_bug.cgi?id=613909
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=586286
-
-Signed-off-by: Milan Broz <mbroz@redhat.com>
----
- hald/linux/osspec.c | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/hald/linux/osspec.c b/hald/linux/osspec.c
-index a8233fd..6d616bc 100644
---- a/hald/linux/osspec.c
-+++ b/hald/linux/osspec.c
-@@ -215,6 +215,11 @@ hald_udev_data (GIOChannel *source, GIOCondition condition, gpointer user_data)
- g_free (str);
- }
- g_free (dstr);
-+ } else if (strncmp(key, "DM_UDEV_DISABLE_OTHER_RULES_FLAG=", 33) == 0) {
-+ if (strtoul(&key[33], NULL, 10) == 1) {
-+ HAL_INFO (("ignoring device requested by DM udev rules"));
-+ goto invalid;
-+ }
- }
- }
-
---
-1.7.3.2
-
diff --git a/source/l/hal/patches/increase_HAL_PATH_MAX_to_4096.diff b/source/l/hal/patches/increase_HAL_PATH_MAX_to_4096.diff
deleted file mode 100644
index b4c770ae..00000000
--- a/source/l/hal/patches/increase_HAL_PATH_MAX_to_4096.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-commit a2c3dd5a04d79265772c09c4280606d5c2ed72c6
-Author: Martin Pitt <martin.pitt@ubuntu.com>
-Date: Mon Jan 4 16:56:13 2010 +0100
-
- Bump HAL_PATH_MAX to 4096
-
- Some bits in the code use realpath() with destination paths of size
- HAL_PATH_MAX. This potentially breaks on systems where PATH_MAX is bigger than
- HAL_PATH_MAX (which was 512 until now).
-
- Since we can't use PATH_MAX directly (due to platforms like GNU/Hurd, which
- apparently don't have it), just bump HAL_PATH_MAX to 4096 (as PATH_MAX is on
- Linux), to avoid potential buffer overflows and also fix hal on Linux when
- enabling FORTIFY in gcc.
-
- https://bugs.freedesktop.org/show_bug.cgi?id=25888
-
-diff --git a/hald/util.h b/hald/util.h
-index c2a1584..7883333 100644
---- a/hald/util.h
-+++ b/hald/util.h
-@@ -38,7 +38,7 @@
- #endif
-
- #define HAL_NAME_MAX 256
--#define HAL_PATH_MAX 512
-+#define HAL_PATH_MAX 4096
-
- gboolean hal_util_remove_trailing_slash (gchar *path);
-
diff --git a/source/l/hal/rc.hald b/source/l/hal/rc.hald
deleted file mode 100644
index 7516de2b..00000000
--- a/source/l/hal/rc.hald
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-# Start/stop/restart the hal daemon:
-
-PIDFILE=/var/run/hald/pid
-
-hal_start() {
- if [ -x /usr/sbin/hald ]; then
- if ! ps axc | grep -q dbus-daemon ; then
- if [ -r /etc/rc.d/rc.messagebus ]; then
- sh /etc/rc.d/rc.messagebus start
- sleep 1
- else
- echo "FATAL: Can't start HAL daemon without dbus package."
- sleep 5
- exit 1
- fi
- fi
- echo "Starting HAL daemon: /usr/sbin/hald --daemon=yes"
- /usr/sbin/hald --daemon=yes
- fi
-}
-
-hal_stop() {
- if [ -e "$PIDFILE" ]; then
- kill $(cat $PIDFILE)
- rm -f $PIDFILE
- fi
- # Just in case:
- killall hald 1> /dev/null 2> /dev/null
-}
-
-# See how we were called.
-case "$1" in
- start)
- hal_start
- ;;
- stop)
- hal_stop
- ;;
- restart)
- hal_stop
- sleep 1
- hal_start
- ;;
- *)
- echo $"Usage: $0 {start|stop|restart}"
- ;;
-esac
-
diff --git a/source/l/hal/slack-desc b/source/l/hal/slack-desc
deleted file mode 100644
index 0145a5df..00000000
--- a/source/l/hal/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
- |-----handy-ruler------------------------------------------------------|
-hal: hal (The HAL Hardware Abstraction Layer)
-hal:
-hal: HAL is a piece of software that provides a view of the various
-hal: hardware attached to a system. HAL keeps detailed metadata for each
-hal: piece of hardware and provides hooks so that system and desktop
-hal: software can react to changes in the hardware configuration (such as
-hal: the insertion of a DVD, or a USB flash memory stick).
-hal:
-hal: For more info, see: http://hal.freedesktop.org/
-hal:
-hal:
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-15 10:48:05 +0000