Commit db53e81c authored by abveritas's avatar abveritas
Browse files

more krb5 changes, hal, avahi, hal-cups-utils

parent e464399d
......@@ -8,8 +8,8 @@
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=avahi
pkgver=0.6.30
pkgrel=6
pkgver=0.6.31
pkgrel=1
pkgdesc="A multicast/unicast DNS-SD framework"
arch=('i686' 'x86_64')
url="http://www.avahi.org/"
......@@ -27,7 +27,7 @@ provides=('howl' 'mdnsresponder')
replaces=('howl' 'mdnsresponder')
options=('!libtool')
source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz gnome-nettool.png avahi-daemon-dbus.patch)
sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06'
sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684'
'cf56387c88aed246b9f435efc182ef44de4d52f3'
'd81f472ebb5b6635f5b2621933e7eae45878ca14')
......
......@@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=hal-cups-utils
pkgver=0.6.19
pkgrel=1
pkgrel=2
pkgdesc="Cups management via HAL UDIs"
url="http://packages.ubuntu.com/gutsy/admin/hal-cups-utils"
arch=('i686' 'x86_64')
......@@ -23,7 +23,7 @@ build() {
./configure --prefix=/usr --libexecdir=/usr/lib/hal/scripts/
make || return 1
make
}
package() {
......
# $Id: PKGBUILD 71483 2010-03-07 13:42:44Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Link Dupont <link@subpop.net>
pkgname=hal
pkgver=0.5.14
pkgrel=2
pkgrel=3
pkgdesc="Hardware Abstraction Layer"
arch=(i686 x86_64)
license=('GPL' 'custom')
url="http://www.freedesktop.org/wiki/Software/hal"
depends=('dbus-glib>=0.82' 'libusb>=0.1.12' 'udev>=146' 'filesystem>=0.7.1-5' 'hal-info>=0.20090716' 'eject' 'dmidecode' 'pciutils>=3.0.2' 'usbutils>=0.73-5' 'pm-utils>=1.2.5' 'consolekit>=0.4.1' 'util-linux-ng>=2.16')
depends=('dbus-glib>=0.82' 'libusb-compat' 'udev>=146' 'filesystem>=0.7.1-5' 'hal-info>=0.20090716' 'eject' 'dmidecode' 'pciutils>=3.0.2' 'usbutils>=0.73-5' 'pm-utils>=1.2.5' 'consolekit>=0.4.1' 'util-linux-ng>=2.16' 'v4l-utils')
makedepends=('pkgconfig' 'gperf')
options=('!libtool' '!makeflags')
install=hal.install
source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
hal
cryptsetup_location.patch
hal-0.5.9-hide-diagnostic.patch
hal-remove-dell-killswitch.patch
hal-KVM-evdev.patch
hal-HDAPS-blacklist.patch
hal-xen-unignore-axes.patch
hal-use-at-console.patch
fix-libusb-detection.patch
dbus-error-init.patch
path-max.patch
handle-input-touchpad.patch
macbook-fix-ioperm.patch)
hald
hal.patch
udev-update.patch)
# patches/hal-0.5.9-hide-diagnostic.patch
# patches/hal-remove-dell-killswitch.patch
# patches/hal-KVM-evdev.patch
# patches/hal-HDAPS-blacklist.patch
# patches/hal-xen-unignore-axes.patch
# patches/hal-use-at-console.patch
# patches/fix-libusb-detection.patch
# patches/dbus-error-init.patch
# patches/path-max.patch
# patches/handle-input-touchpad.patch
# patches/macbook-fix-ioperm.patch
# patches/hal-ignore-internal-dm-devices.patch
md5sums=('e9163df591a6f38f59fdbfe33e73bf20'
'277e96ac130d7bfce0b30f0b80db8782'
'c688a3c6574699365926f4fef7441545'
'4d4b6801a1cedca22b8bdd9db73b16fb'
'6d87c3e63184ae3a69caafc846f538a3'
'6507e5091ee2d11a87ae738a8e2caecb'
'1171c2d83b76059f2da7a3538e08fa4e'
'52bd305299aa22ae07f1a862c22d30fa'
'3f11234fb5e5044fbfc5199ec65b182c'
'da088f12cfc2d190bbf95b747e19ab9e'
'634f4ec2203eff7de8fa2ed2c6b9cbe0'
'f8c9b3a40d03907b498feef571d42466'
'0575677614db0632b17b1a719798c7e0'
'46a5db3ff896ee37762aa8d7e70942c4')
'4cdfc673ad65ddb51919f5a757f62145'
'185dd5d6ffc703ec8395b4eb3a1ae498'
'cad3564de1708603c7a1e0facf6b1921')
# '4d4b6801a1cedca22b8bdd9db73b16fb'
# '6d87c3e63184ae3a69caafc846f538a3'
# '6507e5091ee2d11a87ae738a8e2caecb'
# '1171c2d83b76059f2da7a3538e08fa4e'
# '52bd305299aa22ae07f1a862c22d30fa'
# '3f11234fb5e5044fbfc5199ec65b182c'
# 'da088f12cfc2d190bbf95b747e19ab9e'
# '634f4ec2203eff7de8fa2ed2c6b9cbe0'
# 'f8c9b3a40d03907b498feef571d42466'
# '0575677614db0632b17b1a719798c7e0'
# '46a5db3ff896ee37762aa8d7e70942c4'
# '17bc2b911f245cef4a1d98769d5c4d14'
build() {
cd $srcdir
patch -Np1 -d ${srcdir} < hal.patch
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np1 -i "${srcdir}/cryptsetup_location.patch" || return 1
patch -Np1 -i "${srcdir}/hal-0.5.9-hide-diagnostic.patch" || return 1
patch -Np1 -i "${srcdir}/hal-remove-dell-killswitch.patch" || return 1
patch -Np1 -i "${srcdir}/hal-KVM-evdev.patch" || return 1
patch -Np1 -i "${srcdir}/hal-HDAPS-blacklist.patch" || return 1
patch -Np1 -i "${srcdir}/hal-xen-unignore-axes.patch" || return 1
patch -Np1 -i "${srcdir}/hal-use-at-console.patch" || return 1
patch -Np1 -i "${srcdir}/fix-libusb-detection.patch" || return 1
patch -Np1 -i "${srcdir}/dbus-error-init.patch" || return 1
patch -Np1 -i "${srcdir}/path-max.patch" || return 1
patch -Np1 -i "${srcdir}/handle-input-touchpad.patch" || return 1
patch -Np1 -i "${srcdir}/macbook-fix-ioperm.patch" || return 1
patch -Np1 -i "${srcdir}/udev-update.patch"
# patch -Np1 -i "${srcdir}/hal-remove-dell-killswitch.patch"
# patch -Np1 -i "${srcdir}/hal-KVM-evdev.patch"
# patch -Np1 -i "${srcdir}/hal-HDAPS-blacklist.patch"
# patch -Np1 -i "${srcdir}/hal-xen-unignore-axes.patch"
# patch -Np1 -i "${srcdir}/hal-use-at-console.patch"
# patch -Np1 -i "${srcdir}/fix-libusb-detection.patch"
# patch -Np1 -i "${srcdir}/dbus-error-init.patch"
# patch -Np1 -i "${srcdir}/path-max.patch"
# patch -Np1 -i "${srcdir}/handle-input-touchpad.patch"
# patch -Np1 -i "${srcdir}/macbook-fix-ioperm.patch"
# patch -Np1 -i "${srcdir}/hal-ignore-internal-dm-devices.patch"
libtoolize --force || return 1
aclocal || return 1
autoconf || return 1
automake || return 1
libtoolize --force
aclocal
autoconf
automake
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--libexecdir=/usr/lib/hal --with-udev-prefix=/etc \
......@@ -70,13 +74,22 @@ build() {
--enable-umount-helper --disable-smbios \
--with-hal-user=hal --with-hal-group=hal \
--with-pid-file=/var/run/hald.pid \
--disable-gtk-doc || return 1
make || return 1
make DESTDIR="${pkgdir}" install || return 1
--disable-gtk-doc
make
}
package() {
cd $srcdir/${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/etc/rc.d"
install -m755 -d "${pkgdir}/media" || return 1
install -m755 "${srcdir}/hal" "${pkgdir}/etc/rc.d/" || return 1
install -m755 -d "${pkgdir}/media"
install -m755 "${srcdir}/hald" "${pkgdir}/etc/rc.d/hal"
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
# Fix udev rule location
install -d -m755 "${pkgdir}/lib"
mv "${pkgdir}/etc/udev" "${pkgdir}/lib/"
}
This diff is collapsed.
#!/bin/bash
# general config
. /etc/rc.conf
. /etc/rc.d/functions
case "$1" in
start)
#Check for running dbus, start when not running
ck_daemon dbus && /etc/rc.d/dbus start
if [ -x /etc/rc.d/acpid ]; then
ck_daemon acpid && /etc/rc.d/acpid start
fi
stat_busy "Starting Hardware Abstraction Layer"
if [ ! -x /var/cache/hald ] ; then
install -m755 -g 82 -o 82 -d /var/cache/hald
fi
if [ ! -x /var/run/hald ]; then
install -m755 -g 82 -o 82 -d /var/run/hald
fi
if [ ! -x /var/run/hald/hald-local ]; then
install -m755 -g 0 -o 0 -d /var/run/hald/hald-local
fi
if [ ! -x /var/run/hald/hald-runner ]; then
install -m755 -g 0 -o 0 -d /var/run/hald/hald-runner
fi
/usr/sbin/hald
if [ $? -gt 0 ]; then
stat_fail
else
add_daemon hald
stat_done
fi
;;
stop)
stat_busy "Stopping Hardware Abstraction Layer"
[ -f /var/run/hald.pid ] && kill `cat /var/run/hald.pid` &> /dev/null
if [ $? -gt 0 ]; then
stat_fail
else
rm_daemon hald
stat_done
fi
;;
restart)
$0 stop
sleep 1
$0 start
;;
*)
echo "usage: $0 {start|stop|restart}"
;;
esac
exit 0
diff -ur hal-0.5.14_origin/hald/linux/blockdev.c hal-0.5.14/hald/linux/blockdev.c
--- hal-0.5.14_origin/hald/linux/blockdev.c 2012-02-15 01:44:51.000000000 +0100
+++ hal-0.5.14/hald/linux/blockdev.c 2012-02-15 01:45:12.000000000 +0100
@@ -1864,7 +1864,7 @@
char *ret;
char *u_stdout;
int u_exit_status;
- const char *argv[] = {"/sbin/udevadm", "info", "--root", "--query", "name", "--path", NULL, NULL};
+ const char *argv[] = {"/usr/bin/udevadm", "info", "--root", "--query", "name", "--path", NULL, NULL};
GError *g_error;
ret = NULL;
diff -ur hal-0.5.14_origin/hald/linux/coldplug.c hal-0.5.14/hald/linux/coldplug.c
--- hal-0.5.14_origin/hald/linux/coldplug.c 2012-02-15 01:44:51.000000000 +0100
+++ hal-0.5.14/hald/linux/coldplug.c 2012-02-15 01:45:08.000000000 +0100
@@ -154,8 +154,8 @@
static gboolean
hal_util_init_sysfs_to_udev_map (void)
{
- char *udevdb_export_argv[] = { "/sbin/udevadm", "info", "-e", NULL };
- char *udevroot_argv[] = { "/sbin/udevadm", "info", "-r", NULL };
+ char *udevdb_export_argv[] = { "/usr/bin/udevadm", "info", "-e", NULL };
+ char *udevroot_argv[] = { "/usr/bin/udevadm", "info", "-r", NULL };
int udevinfo_exitcode;
UdevInfo *info = NULL;
char *p;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment