merge of 44ef2a80f1407b2958e8f750892482362d9bb352

     and 4fb1223f75836093b262b92d3533307a1300b174

14 files changed, 176 insertions, 20 deletions

diff --git a/packages/ez-ipupdate/.mtn2git_empty b/packages/ez-ipupdate/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ez-ipupdate/.mtn2git_empty
diff --git a/packages/ez-ipupdate/ez-ipupdate_3.0.10.bb b/packages/ez-ipupdate/ez-ipupdate_3.0.10.bb
new file mode 100644
index 0000000000..62cd506d9f
--- /dev/null
+++ b/packages/ez-ipupdate/ez-ipupdate_3.0.10.bb
@@ -0,0 +1,32 @@
+# Angus Mackay's ez-ipupdate from www.ez-ipupdate.com
+DESCRIPTION = "A client for automatically updating your EZ-IP.net, justlinux.com, dhs.org, dyndns.org, ods.org, gnudip.cheapnet.net, tzo.com, easydns.com dynamic hostname parameters. Includes daemon support that only sends updates if your IP address changes."
+HOMEPAGE = "http://www.ez-ipupdate.com/"
+MAINTAINER = "John Bowler <jbowler@acm.org>"
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://www.ez-ipupdate.com/dist/ez-ipupdate-${PV}.tar.gz"
+SRC_URI += "file://configure.patch;patch=1"
+SRC_URI += "file://conffile.patch;patch=1"
+SRC_URI += "file://zoneedit.patch;patch=1"
+SRC_URI += "file://init"
+SRC_URI += "file://ipupdate.conf"
+
+INITSCRIPT_NAME = "ipupdate"
+# No dependencies, so just go in at the standard level (20)
+INITSCRIPT_PARAMS = "defaults"
+
+# The configuration file must be editted...
+CONFFILES_${PN} = "${sysconfdir}/ipupdate.conf"
+
+inherit autotools update-rc.d
+
+PACKAGES = "ez-ipupdate"
+
+do_install_append() {
+	install -d "${D}${sysconfdir}/init.d"
+	install -c -m 755 ${WORKDIR}/init "${D}${sysconfdir}/init.d/ipupdate"
+	install -c -m 644 ${WORKDIR}/ipupdate.conf "${D}${sysconfdir}/ipupdate.conf"
+}
diff --git a/packages/ez-ipupdate/files/.mtn2git_empty b/packages/ez-ipupdate/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ez-ipupdate/files/.mtn2git_empty
diff --git a/packages/ez-ipupdate/files/conffile.patch b/packages/ez-ipupdate/files/conffile.patch
new file mode 100644
index 0000000000..41f8a0e73b
--- /dev/null
+++ b/packages/ez-ipupdate/files/conffile.patch
@@ -0,0 +1,10 @@
+--- ez-ipupdate-3.0.10/conf_file.c.orig	2005-11-27 20:03:46.557322517 -0800
++++ ez-ipupdate-3.0.10/conf_file.c	2005-11-27 20:03:15.519369422 -0800
+@@ -34,6 +34,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <errno.h>
+ 
+ #include <conf_file.h>
+ 
diff --git a/packages/ez-ipupdate/files/configure.patch b/packages/ez-ipupdate/files/configure.patch
new file mode 100644
index 0000000000..e6a945e4b2
--- /dev/null
+++ b/packages/ez-ipupdate/files/configure.patch
@@ -0,0 +1,11 @@
+--- ez-ipupdate-3.0.10/Makefile.am.orig	2005-11-27 15:24:05.857379643 -0800
++++ ez-ipupdate-3.0.10/Makefile.am	2005-11-27 19:35:58.832379202 -0800
+@@ -1,7 +1,6 @@
+ 
+ bin_PROGRAMS = ez-ipupdate
+-ez_ipupdate_SOURCES = ez-ipupdate.c conf_file.c conf_file.h md5.c md5.h cache_file.c cache_file.h error.h pid_file.c pid_file.h dprintf.h @EXTRASRC@
+-ez_ipupdate_LDADD = @EXTRAOBJ@
++ez_ipupdate_SOURCES = ez-ipupdate.c conf_file.c conf_file.h md5.c md5.h cache_file.c cache_file.h error.h pid_file.c pid_file.h dprintf.h
+ 
+ EXTRA_DIST = getpass.c ez-ipupdate.lsm example.conf example-pgpow.conf example-dhs.conf example-dyndns.conf example-ods.conf example-tzo.conf example-gnudip.conf example-easydns.conf example-justlinux.conf example-dyns.conf CHANGELOG mkbinary
+ 
diff --git a/packages/ez-ipupdate/files/init b/packages/ez-ipupdate/files/init
new file mode 100644
index 0000000000..031c33c79b
--- /dev/null
+++ b/packages/ez-ipupdate/files/init
@@ -0,0 +1,44 @@
+#!/bin/sh
+#
+# ipupdate	init.d script for ez-ipupdate
+#
+# You *must* create or update the /etc/ipupdate.conf file for
+# this to work
+CONF=/etc/ipupdate.conf
+PIDFILE=/var/run/ipupdate.pid
+test -x /usr/bin/ez-ipupdate -a -r "${CONF}" || exit 0
+if egrep '^service-type=<type of service>$' "${CONF}" >/dev/null
+then
+	# conf file not editted
+	exit 0
+fi
+
+case "$1" in
+  start)
+	echo -n "Starting ez-ipupdate: "
+	start-stop-daemon --start -x /usr/bin/ez-ipupdate -- -c "${CONF}" -d -F "${PIDFILE}" "$@"
+	echo "done"
+	;;
+  stop)
+	echo -n "Stopping ez-ipupdate: "
+	start-stop-daemon --stop -s 3 -p "${PIDFILE}"
+	echo "done"
+	;;
+  restart)
+	echo -n "Restarting ez-ipupdate: "
+	start-stop-daemon --stop -s 3 -p "${PIDFILE}"
+	start-stop-daemon --start -x /usr/bin/ez-ipupdate -- -c "${CONF}" -d -F "${PIDFILE}" "$@"
+	echo "done"
+	;;
+  force-reload|reload)
+  	# HUP causes a reload, a simple TERM causes the daemon
+	# to wake up and re-update the IP address
+	start-stop-daemon --stop -s 1 -p "${PIDFILE}"
+  	;;
+  *)
+	echo "Usage: ipupdate { start | stop | restart | reload }" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/packages/ez-ipupdate/files/ipupdate.conf b/packages/ez-ipupdate/files/ipupdate.conf
new file mode 100644
index 0000000000..cbba491ef6
--- /dev/null
+++ b/packages/ez-ipupdate/files/ipupdate.conf
@@ -0,0 +1,36 @@
+#!/usr/bin/ez-ipupdate -c
+#
+# example config file for ez-ipupdate
+#
+# this file is actually executable!
+#
+#CHANGE this to the service name (ez-ipupdate --help for the list)
+service-type=<type of service>
+#CHANGE this to the user name and password on the service
+user=myuserid:mypassword
+#CHANGE this to the domain name to update
+host=mydomain.whatever.com
+#
+interface=eth0
+quiet
+#
+# other options:
+#address=<ip address>
+#cache-file=/etc/ez-ipupdate.cache.eth1
+#daemon
+#debug
+#foreground
+#host=<host>
+#interface=<interface>
+#mx=<mail exchanger>
+#retrys=<number of trys>
+#run-as-user=<user>
+#server=<server name>
+#timeout=<sec.millisec>
+#max-interval=<time in seconds>
+#notify-email=<email address>
+#period=<time between update attempts>
+#url=<url>
+#user=<user name>[:password]
+#wildcard
+#quiet
diff --git a/packages/ez-ipupdate/files/zoneedit.patch b/packages/ez-ipupdate/files/zoneedit.patch
new file mode 100644
index 0000000000..c9d4e4a2c1
--- /dev/null
+++ b/packages/ez-ipupdate/files/zoneedit.patch
@@ -0,0 +1,11 @@
+--- ez-ipupdate-3.0.10/ez-ipupdate.c.orig	2005-11-27 22:59:39.149355269 -0800
++++ ez-ipupdate-3.0.10/ez-ipupdate.c	2005-11-27 22:59:46.705830768 -0800
+@@ -3806,7 +3806,7 @@ int ZONEEDIT_update_entry(void)
+       break;
+ 
+     case 200:
+-      if(strstr(buf, "<SUCCESS\n") != NULL)
++      if(strstr(buf, "<SUCCESS ") != NULL)
+       {
+         if(!(options & OPT_QUIET))
+         {
diff --git a/packages/ghettotooth/ghettotooth.bb b/packages/ghettotooth/ghettotooth.bb
index f20f4580c7..02bf533e4f 100644
--- a/packages/ghettotooth/ghettotooth.bb
+++ b/packages/ghettotooth/ghettotooth.bb
@@ -1,6 +1,8 @@
 SECTION = "net/misc"
 DESCRIPTION = "Bluetooth scanner"
-MAINTAINER = "Bob Davies (tyggerbob@gmail.com)"
+MAINTAINER = "Bob Davies <tyggerbob@gmail.com>"
+LICENSE = "GPL"
+RDEPENDS = "perl"
 
 SRC_URI = "http://www.wardriving.ch/hpneu/blue/perl/ghettotooth.pl"
 
@@ -8,7 +10,6 @@ DEFAULT_PREFERENCE="-1"
 
 
 S = "${WORKDIR}"
-LICENSE = "GPL"
 do_install() {
 	install -d ${D}${bindir}
 	install -m 0755 ghettotooth.pl ${D}${bindir}/
diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc
index c95bc7396e..4bd71d7601 100644
--- a/packages/linux/linux-openzaurus.inc
+++ b/packages/linux/linux-openzaurus.inc
@@ -3,7 +3,7 @@ SECTION = "kernel"
 MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>, Michael 'Mickey' Lauer <mickey@vanille.de>"
 LICENSE = "GPL"
 
-DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
+DOSRC = "http://www.do13.de/openzaurus/patches"
 RPSRC = "http://www.rpsys.net/openzaurus/patches"
 JLSRC = "http://www.cs.wisc.edu/~lenz/zaurus/files"
 BASRC = "http://www.orca.cx/zaurus/patches"
diff --git a/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc2.bb b/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc2.bb
index 31797313e5..9687967d92 100644
--- a/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc2.bb
+++ b/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc2.bb
@@ -1,6 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r1"
+PR = "r2"
 
 #DEFAULT_PREFERENCE = "-1"
 
@@ -17,6 +17,7 @@ PR = "r1"
 SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.15-rc2.tar.bz2 \
            ${RPSRC}/pxa_ohci_platform-r5.patch;patch=1 \
            ${RPSRC}/pxa_ohci_suspend-r5.patch;patch=1 \
+           ${RPSRC}/pxa_ohci_fixes-r0.patch;patch=1 \
            ${RPSRC}/spitz_ohci-r0.patch;patch=1 \
            ${RPSRC}/enable_iwmmxt-r0.patch;patch=1 \
            ${RPSRC}/pxa_i2c_fixes-r4.patch;patch=1 \
@@ -31,6 +32,8 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.15-rc2.
            ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
            ${RPSRC}/pxa_rtc-r2.patch;patch=1 \
            ${RPSRC}/input_power-r4.patch;patch=1 \
+           ${RPSRC}/arm_apm_pm_legacy-r1.patch;patch=1 \
+           ${RPSRC}/collie_mtd_sharp-r0.patch;patch=1 \
            ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
            ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_base-r24.patch;patch=1 \
@@ -39,15 +42,23 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.15-rc2.
            ${RPSRC}/ipaq/pxa_keys-r5.patch;patch=1 \
            ${RPSRC}/ipaq/tsc2101-r12.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_test1-r3.patch;patch=1 \
-           ${DOSRC}/tc6393-device-r5.patch;patch=1 \
-           ${DOSRC}/tc6393_nand-r6.patch;patch=1 \
-           ${DOSRC}/tosa-keyboard-r6.patch;patch=1 \
+           ${DOSRC}/tosa-platform-device-r0.patch;patch=1 \
+           ${DOSRC}/tc6393-device-r8.patch;patch=1 \
+           ${DOSRC}/tc6393_nand-r7.patch;patch=1 \
+           ${DOSRC}/tosa-keyboard-r9.patch;patch=1 \
+           ${DOSRC}/tosa-pxaac97-r5.patch;patch=1 \
+           ${DOSRC}/tosa-tc6393-r1.patch;patch=1 \
+           ${DOSRC}/tosa-power-r9.patch;patch=1 \
+           ${DOSRC}/tc6393fb-r9.patch;patch=1 \
+           ${DOSRC}/tosa-lcd-r6.patch;patch=1 \
+           ${DOSRC}/tosa-bl-r9.patch;patch=1 \
+           ${DOSRC}/tosa-bluetooth-r2.patch;patch=1 \
            ${RPSRC}/pcmcia_dev_ids-r2.patch;patch=1 \
            ${RPSRC}/mmc_timeout-r0.patch;patch=1 \	   
            ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \
            ${RPSRC}/alsa/alsa-soc-0.7.patch;patch=1 \
-           ${RPSRC}/alsa_snd_corgi-r1.patch;patch=1 \
-           ${RPSRC}/soc_platform_upd-r0.patch;patch=1 \
+           ${RPSRC}/alsa_snd_corgi-r2.patch;patch=1 \
+           ${RPSRC}/soc_platform_upd-r1.patch;patch=1 \
            file://add-oz-release-string.patch;patch=1 \
            file://pxa-serial-hack.patch;patch=1 \
            ${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \
@@ -76,14 +87,8 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.15-rc2.
 # ${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \
 
 SRC_URI_append_tosa = "${DOSRC}/nand-readid-r1.patch;patch=1 \
-                       ${RPSRC}/temp/tc6393fb-r7.patch;patch=1 \
-                       ${DOSRC}/tosa-power-r6.patch;patch=1 \
-                       ${DOSRC}/tosa-lcd-r3.patch;patch=1 \
-                       ${RPSRC}/temp/tosa-bl-r7.patch;patch=1 \
-                       ${DOSRC}/pxa-ac97-suspend-r0.patch;patch=1 \
 		       ${DOSRC}/ac97codec-rename-revert-r0.patch;patch=1 \
-                       ${DOSRC}/wm9712-ts-r3.patch;patch=1 \
-                       ${DOSRC}/tosa-pxaac97-r4.patch;patch=1 \
-        	       ${DOSRC}/tosa-bluetooth-r0.patch;patch=1 "
+                       ${DOSRC}/wm97xx-touch-lg2-r0.patch;patch=1 \
+                       ${DOSRC}/wm9712-pm-r0.patch;patch=1 "
 
 S = "${WORKDIR}/linux-2.6.15-rc2"
diff --git a/packages/linux/nslu2-kernel_2.6.14.2.bb b/packages/linux/nslu2-kernel_2.6.14.3.bb
index 12b4bc7cb5..eca0862724 100644
--- a/packages/linux/nslu2-kernel_2.6.14.2.bb
+++ b/packages/linux/nslu2-kernel_2.6.14.3.bb
@@ -8,7 +8,7 @@ PR_CONFIG = "0"
 # Increment the number below (i.e. the digits after PR) when
 # making changes within this file or for changes to the patches
 # applied to the kernel.
-PR = "r1.${PR_CONFIG}"
+PR = "r0.${PR_CONFIG}"
 
 include nslu2-kernel.inc
 
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 6e98dc4ffa..7ce33122cb 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -49,6 +49,7 @@ SLUGOS_PACKAGES = "\
 	dnsmasq \
 	e2fsprogs \
 	expat \
+	ez-ipupdate \
 	file \
 	findutils \
 	flac \
diff --git a/packages/xserver/xserver-kdrive_20050207.bb b/packages/xserver/xserver-kdrive_20050207.bb
index 1fca483b61..2980e7762f 100644
--- a/packages/xserver/xserver-kdrive_20050207.bb
+++ b/packages/xserver/xserver-kdrive_20050207.bb
@@ -20,7 +20,7 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep
 DESCRIPTION_xserver-kdrive-fake = "Fake X server"
 DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
 
-PR = "r9"
+PR = "r10"
 
 FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
 FILES_xserver-kdrive-ati = "${bindir}/Xati"
@@ -38,13 +38,18 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;
 	file://disable-apm.patch;patch=1 \
 	file://fbdev-not-fix.patch;patch=1 "
 
+SRC_URI_h3600 = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDCVSDATE} \
+        file://kmode.patch;patch=1 \
+        file://faster-rotated.patch;patch=1 \
+        file://fbdev-not-fix.patch;patch=1 "
+
+
 SRC_URI_append_mnci   = 	" file://onlyfb.patch;patch=1 \
                          	  file://faster-rotated.patch;patch=1 \
 				  file://devfs.patch;patch=1"
 SRC_URI_append_collie = 	" file://faster-rotated.patch;patch=1"
 SRC_URI_append_poodle = 	" file://xserver-kdrive-poodle.patch;patch=1 \
 				  file://faster-rotated.patch;patch=1"
-SRC_URI_append_h3600 = 		" file://faster-rotated.patch;patch=1"
 SRC_URI_append_spitz =          " file://faster-rotated.patch;patch=1"
 SRC_URI_append_akita =          " file://faster-rotated.patch;patch=1"
 SRC_URI_append_borzoi =         " file://faster-rotated.patch;patch=1"