merge of 6b9aad33efbe7d42956463905d36b5d886340224

     and c9370fe0b51a1422478e89483290e5776597d26c

90 files changed, 2489 insertions, 50 deletions

diff --git a/packages/busybox/busybox_1.01.bb b/packages/busybox/busybox_1.01.bb
index 2ef3068f6e..cbef98d992 100644
--- a/packages/busybox/busybox_1.01.bb
+++ b/packages/busybox/busybox_1.01.bb
@@ -29,6 +29,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 	   file://udhcpscript.patch;patch=1 \
 	   file://thumb-bsdlabel.patch;patch=1 \
            file://uclibc_posix.patch;patch=1 \
+           file://glibc2.4-icmp6.patch;patch=1 \
            file://defconfig \
            file://busybox-cron \
 	   file://busybox-httpd \
diff --git a/packages/busybox/files/glibc2.4-icmp6.patch b/packages/busybox/files/glibc2.4-icmp6.patch
new file mode 100644
index 0000000000..3cec1dd31a
--- /dev/null
+++ b/packages/busybox/files/glibc2.4-icmp6.patch
@@ -0,0 +1,15 @@
+--- busybox-1.01/networking/ping6.c.orig	2006-03-15 15:43:21.000000000 +0100
++++ busybox-1.01/networking/ping6.c	2006-03-15 15:49:29.000000000 +0100
+@@ -56,6 +56,12 @@
+ #include <stddef.h>				/* offsetof */
+ #include "busybox.h"
+ 
++#ifndef ICMP6_MEMBERSHIP_QUERY			/* glibc >= 2.4 */
++#define ICMP6_MEMBERSHIP_QUERY     MLD_LISTENER_QUERY	
++#define ICMP6_MEMBERSHIP_REPORT    MLD_LISTENER_REPORT	
++#define ICMP6_MEMBERSHIP_REDUCTION MLD_LISTENER_REDUCTION
++#endif
++
+ static const int DEFDATALEN = 56;
+ static const int MAXIPLEN = 60;
+ static const int MAXICMPLEN = 76;
diff --git a/packages/cairo/cairo_1.0.2.bb b/packages/cairo/cairo_1.0.2.bb
index 51116b3757..e15073ec0b 100644
--- a/packages/cairo/cairo_1.0.2.bb
+++ b/packages/cairo/cairo_1.0.2.bb
@@ -5,7 +5,8 @@ DESCRIPTION = "Cairo graphics library"
 LICENSE = "MPL LGPL"
 PR = "r0"
 
-SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
+SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
+	   file://gcc4-fix.patch;patch=1"
 
 inherit autotools pkgconfig 
 
diff --git a/packages/cairo/cairo_1.0.4.bb b/packages/cairo/cairo_1.0.4.bb
new file mode 100644
index 0000000000..61aefa91f5
--- /dev/null
+++ b/packages/cairo/cairo_1.0.4.bb
@@ -0,0 +1,13 @@
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "libx11 libpng fontconfig libxrender"
+DESCRIPTION = "Cairo graphics library"
+LICENSE = "MPL LGPL"
+
+SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
+
+inherit autotools pkgconfig 
+
+do_stage () {
+autotools_stage_all
+}
diff --git a/packages/cpio/cpio_2.5.bb b/packages/cpio/cpio_2.5.bb
index e7ee85e001..a625dd7fd5 100644
--- a/packages/cpio/cpio_2.5.bb
+++ b/packages/cpio/cpio_2.5.bb
@@ -5,6 +5,8 @@ LICENSE = "GPL"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 PR = "r3"
 
+DEPENDS += " texinfo-native "
+
 SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \
 	   file://install.patch;patch=1"
 S = "${WORKDIR}/cpio-${PV}"
diff --git a/packages/davfs2/davfs2-0.2.7/.mtn2git_empty b/packages/davfs2/davfs2-0.2.7/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/davfs2/davfs2-0.2.7/.mtn2git_empty
diff --git a/packages/davfs2/files/Makefile.in.patch b/packages/davfs2/davfs2-0.2.7/Makefile.in.patch
index 16b4425f14..16b4425f14 100644
--- a/packages/davfs2/files/Makefile.in.patch
+++ b/packages/davfs2/davfs2-0.2.7/Makefile.in.patch
diff --git a/packages/davfs2/files/no-func-checks.patch b/packages/davfs2/davfs2-0.2.7/no-func-checks.patch
index 46ca24398e..46ca24398e 100644
--- a/packages/davfs2/files/no-func-checks.patch
+++ b/packages/davfs2/davfs2-0.2.7/no-func-checks.patch
diff --git a/packages/davfs2/files/no-neon-version-test.patch b/packages/davfs2/davfs2-0.2.7/no-neon-version-test.patch
index 67b2055584..67b2055584 100644
--- a/packages/davfs2/files/no-neon-version-test.patch
+++ b/packages/davfs2/davfs2-0.2.7/no-neon-version-test.patch
diff --git a/packages/davfs2/davfs2-0.2.8/.mtn2git_empty b/packages/davfs2/davfs2-0.2.8/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/davfs2/davfs2-0.2.8/.mtn2git_empty
diff --git a/packages/davfs2/davfs2-0.2.8/Makefile.in.patch b/packages/davfs2/davfs2-0.2.8/Makefile.in.patch
new file mode 100644
index 0000000000..1f1b13f198
--- /dev/null
+++ b/packages/davfs2/davfs2-0.2.8/Makefile.in.patch
@@ -0,0 +1,23 @@
+--- davfs2-0.2.8/Makefile.in.old	2006-03-15 23:30:50.000000000 +0100
++++ davfs2-0.2.8/Makefile.in	2006-03-15 23:39:08.000000000 +0100
+@@ -50,7 +50,7 @@
+ 
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -m 4755
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_SECRETS = @INSTALL_DATA@ -b -m 600
++INSTALL_SECRETS = @INSTALL_DATA@ -m 600
+ INSTALL_DIR = @INSTALL@ -d -m 755
+ INSTALL = @INSTALL@
+ 
+@@ -80,11 +80,6 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(mandir)
+ 	for t in $(MANS); do \
+           $(INSTALL_DATA) $(top_builddir)/$$t $(DESTDIR)$(mandir)/$$t;done
+-	if [ -n "$(DESTDIR)" -a "$(DESTDIR)" != "/" ]; then \
+-	        $(INSTALL_DIR) $(DESTDIR)/sbin; \
+-	        ln -sf ..$(sbindir)/$(PROGRAM_NAME) \
+-	               $(DESTDIR)/sbin/$(PROGRAM_NAME) 2> /dev/null; \
+-	else ln -sf $(sbindir)/$(PROGRAM_NAME) /sbin/$(PROGRAM_NAME) 2> /dev/null;	fi
+ 
+ 	@echo ""
+ 	@echo "----------------------------------------------------"
diff --git a/packages/davfs2/davfs2_0.2.7.bb b/packages/davfs2/davfs2_0.2.7.bb
index 00db8bfd55..509671a229 100644
--- a/packages/davfs2/davfs2_0.2.7.bb
+++ b/packages/davfs2/davfs2_0.2.7.bb
@@ -3,8 +3,8 @@ SECTION = "network"
 PRIORITY = "optional"
 MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
 HOMEPAGE = "http://dav.sourceforge.net"
-DEPENDS = "neon (0.24.7)"
-RDEPENDS_${PN} = "libneon (0.24.7) kernel-module-coda"
+DEPENDS = "neon-0.24.7"
+RDEPENDS_${PN} = "kernel-module-coda"
 LICENSE = "GPL"
 
 PR = "r0"
@@ -22,7 +22,7 @@ ALTERNATIVE_PATH = "${sbindir}/${ALTERNATIVE_NAME}"
 ALTERNATIVE_PRIORITY = "90"
 ALTERNATIVE_LINK = "${base_sbindir}/${ALTERNATIVE_NAME}" 
 
-EXTRA_OECONF = "--with-ssl --with-neon"
+EXTRA_OECONF = "--with-neon"
 
 CONFFILES_${PN} = "${sysconfdir}/davfs2/davfs2.conf ${sysconfdir}/davfs2/secrets"
 
diff --git a/packages/davfs2/davfs2_0.2.8.bb b/packages/davfs2/davfs2_0.2.8.bb
new file mode 100644
index 0000000000..a00486f3cc
--- /dev/null
+++ b/packages/davfs2/davfs2_0.2.8.bb
@@ -0,0 +1,44 @@
+DESCRIPTION = "A Linux file system driver that allows you to mount a WebDAV server as a disk drive."
+SECTION = "network"
+PRIORITY = "optional"
+MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
+HOMEPAGE = "http://dav.sourceforge.net"
+DEPENDS = "neon-0.25.5"
+RDEPENDS_${PN} = "kernel-module-coda"
+LICENSE = "GPL"
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/dav/${P}.tar.gz \
+           file://Makefile.in.patch;patch=1 \
+           file://volatiles"
+
+inherit autotools
+
+ALTERNATIVE_NAME = "mount.davfs"
+ALTERNATIVE_PATH = "${sbindir}/${ALTERNATIVE_NAME}"
+ALTERNATIVE_PRIORITY = "90"
+ALTERNATIVE_LINK = "${base_sbindir}/${ALTERNATIVE_NAME}" 
+
+EXTRA_OECONF = "--with-neon"
+
+CONFFILES_${PN} = "${sysconfdir}/davfs2/davfs2.conf ${sysconfdir}/davfs2/secrets"
+
+do_configure_prepend () {
+        autoconf
+}
+
+do_install_append () {
+        mkdir -p ${D}${sysconfdir}/default/volatiles
+        install -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/10_davfs2
+}
+
+pkg_postinst () {
+	update-alternatives --install ${ALTERNATIVE_LINK} ${ALTERNATIVE_NAME} \
+		${ALTERNATIVE_PATH} ${ALTERNATIVE_PRIORITY}
+	/etc/init.d/populate-volatile.sh
+}
+
+pkg_prerm () {
+	update-alternatives --remove ${ALTERNATIVE_NAME} ${ALTERNATIVE_PATH}
+}
diff --git a/packages/display-brightness/.mtn2git_empty b/packages/display-brightness/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/display-brightness/.mtn2git_empty
diff --git a/packages/display-brightness/display-brightness.sh b/packages/display-brightness/display-brightness.sh
new file mode 100644
index 0000000000..8141866858
--- /dev/null
+++ b/packages/display-brightness/display-brightness.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+# display-brightness.sh
+# simple script to set display-brightness for zaurus clamshell
+# author: patrick steiner <patrick.steiner@a1.net>
+# version: 1.00 | 22.02.2005 23:20
+
+
+STEP=5
+MAX_BRIGHTNESS=`cat /sys/class/backlight/*/max_brightness`
+ACTUAL_BRIGHTNESS=`cat /sys/class/backlight/*/actual_brightness`
+BRIGHTNESS_FILE="/sys/class/backlight/*/brightness"
+
+if [ ! -n "$1" ]; then
+    exit 0
+fi
+
+if [ "$1" = "up" ]; then
+    if [ $ACTUAL_BRIGHTNESS -eq $MAX_BRIGHTNESS ]; then
+        exit 0
+    else
+        let CURRENT_BRIGHTNESS=$ACTUAL_BRIGHTNESS+$STEP
+        echo $CURRENT_BRIGHTNESS >> $BRIGHTNESS_FILE
+        exit 0
+    fi
+fi
+
+if [ "$1" = "down" ]; then
+    if [ $ACTUAL_BRIGHTNESS -eq 0 ]; then
+        exit 0
+    elif [ $ACTUAL_BRIGHTNESS -lt $STEP ]; then
+        STEP=1
+        let CURRENT_BRIGHTNESS=$ACTUAL_BRIGHTNESS-$STEP
+        echo $CURRENT_BRIGHTNESS >> $BRIGHTNESS_FILE
+        exit 0
+    else
+        let CURRENT_BRIGHTNESS=$ACTUAL_BRIGHTNESS-$STEP
+        echo $CURRENT_BRIGHTNESS >> $BRIGHTNESS_FILE
+        exit 0
+    fi
+fi
diff --git a/packages/display-brightness/display-brightness_1.0.0.bb b/packages/display-brightness/display-brightness_1.0.0.bb
new file mode 100644
index 0000000000..e275b3f8bc
--- /dev/null
+++ b/packages/display-brightness/display-brightness_1.0.0.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "display brightness utility"
+AUTHOR = "Patrick Steiner <patrick.steiner@a1.net>"
+MAINTAINER = "Patrick Steiner <patrick.steiner@a1.net>"
+DEPENDS = ""
+PRIORITY = "optional"
+PR = "r0"
+LICENSE = "GPLv2"
+
+SRC_URI = "file://display-brightness.sh"
+
+do_install() {
+        install -d ${D}${bindir}
+        install -m 0755 ${WORKDIR}/display-brightness.sh ${D}${bindir}/
+}
diff --git a/packages/fakeroot/fakeroot-nativ