From ccc6ad4b21b65dccbb627245c912660a37f40d4b Mon Sep 17 00:00:00 2001
From: Erik Hovland <erik@hovland.org>
Date: Tue, 10 Oct 2006 20:49:51 +0000
Subject: glibc * Formatting change to the SRC_URI list. Zecke's patch used
 spaces instead   of tabs and spaces.

---
 packages/glibc/glibc_2.3.5+cvs20050627.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb
index e723b2febd..51039fd3c0 100644
--- a/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@ -54,7 +54,7 @@ SRC_URI = "http://familiar.handhelds.org/source/v0.8.3/stash_libc_sources.redhat
 	   file://ldsocache-varrun.patch;patch=1 \
 	   file://5090_all_stubs-rule-fix.patch;patch=1 \
 	   file://raise.patch;patch=1 \
-       file://zecke-sane-readelf.patch;patch=1 \
+	   file://zecke-sane-readelf.patch;patch=1 \
 	   file://glibc-2.3.5-fix-weak-alias-arm.patch;patch=1 \
 	   file://glibc-2.3.5-fix-weak-alias-arm-2.patch;patch=1 \
            file://etc/ld.so.conf \
-- 
cgit v1.2.3


From 0ff2ceb8ace04f65a79b234d1c10f111349c4ffe Mon Sep 17 00:00:00 2001
From: Erik Hovland <erik@hovland.org>
Date: Tue, 10 Oct 2006 20:52:37 +0000
Subject: handhelds-sa 2.4.19-rmk6-pxa1-hh42 * The defconfig-h3600 file was
 missing a few import options, specifically:   + The hidp bluez stack piece
 built as a module   + The jffs2 zlib support built into the kernel

  These problems ended up exhibiting themselves as half-built but still
  bootable kernels (go figure). Most notably the zlib_deflate object code
  would not be in the kernel and the ppp_deflate module would fail loading.
  This bug was reported to me by Rene Wagner (rw AT handhelds DOT org). Thanks
  Rene!
---
 packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh42/defconfig-h3600 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh42/defconfig-h3600 b/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh42/defconfig-h3600
index ad30591336..67cde5e0e4 100644
--- a/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh42/defconfig-h3600
+++ b/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh42/defconfig-h3600
@@ -1108,6 +1108,11 @@ CONFIG_VFAT_FS=m
 # CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+CONFIG_JFFS2_CMODE_PRIORITY=y
+CONFIG_JFFS2_PROC=y
 # CONFIG_JFFS2_FS_NAND is not set
 CONFIG_CRAMFS=y
 CONFIG_TMPFS=y
@@ -1432,6 +1437,7 @@ CONFIG_BLUEZ_RFCOMM_TTY=y
 CONFIG_BLUEZ_BNEP=m
 CONFIG_BLUEZ_BNEP_MC_FILTER=y
 CONFIG_BLUEZ_BNEP_PROTO_FILTER=y
+CONFIG_BLUEZ_HIDP=m
 # CONFIG_BLUEZ_CMTP is not set
 
 #
-- 
cgit v1.2.3


From 26b1fd3d708ab07beb8006208497770306dc9331 Mon Sep 17 00:00:00 2001
From: Erik Hovland <erik@hovland.org>
Date: Tue, 10 Oct 2006 21:12:14 +0000
Subject: ntp 4.2.2p3 * There is a newer minor release of ntp. This commit
 provides the bb and   patches to provide that package.

---
 packages/ntp/ntp-4.2.2p3/.mtn2git_empty            |  0
 packages/ntp/ntp-4.2.2p3/ipv6only-workaround.patch | 13 +++++
 packages/ntp/ntp_4.2.2p3.bb                        | 64 ++++++++++++++++++++++
 3 files changed, 77 insertions(+)
 create mode 100644 packages/ntp/ntp-4.2.2p3/.mtn2git_empty
 create mode 100644 packages/ntp/ntp-4.2.2p3/ipv6only-workaround.patch
 create mode 100644 packages/ntp/ntp_4.2.2p3.bb

diff --git a/packages/ntp/ntp-4.2.2p3/.mtn2git_empty b/packages/ntp/ntp-4.2.2p3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/ntp/ntp-4.2.2p3/ipv6only-workaround.patch b/packages/ntp/ntp-4.2.2p3/ipv6only-workaround.patch
new file mode 100644
index 0000000000..5301621dc2
--- /dev/null
+++ b/packages/ntp/ntp-4.2.2p3/ipv6only-workaround.patch
@@ -0,0 +1,13 @@
+Index: ntp-4.2.2p3/ntpdate/ntpdate.c
+===================================================================
+--- ntp-4.2.2p3.orig/ntpdate/ntpdate.c
++++ ntp-4.2.2p3/ntpdate/ntpdate.c
+@@ -1777,8 +1777,6 @@ init_io(void)
+ 	   if (res->ai_family == AF_INET6)
+ 		if (setsockopt(fd[nbsock], IPPROTO_IPV6, IPV6_V6ONLY, (void*) &optval, sizeof(optval)) < 0) {
+ 			   netsyslog(LOG_ERR, "setsockopt() IPV6_V6ONLY failed: %m");
+-			   exit(1);
+-			   /*NOTREACHED*/
+ 		}
+ #endif
+ 
diff --git a/packages/ntp/ntp_4.2.2p3.bb b/packages/ntp/ntp_4.2.2p3.bb
new file mode 100644
index 0000000000..cb6aff272e
--- /dev/null
+++ b/packages/ntp/ntp_4.2.2p3.bb
@@ -0,0 +1,64 @@
+DESCRIPTION = "The Network Time Protocol (NTP) is used to \
+synchronize the time of a computer client or server to \
+another server or reference time source, such as a radio \
+or satellite receiver or modem."
+HOMEPAGE = "http://ntp.isc.org/bin/view/Main/WebHome"
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "ntp"
+
+SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/${P}.tar.gz \
+	file://ipv6only-workaround.patch;patch=1 \
+	file://ntpd \
+	file://ntp.conf \
+	file://ntpdate"
+
+
+INITSCRIPT_NAME = "ntpd"
+# No dependencies, so just go in at the standard level (20)
+INITSCRIPT_PARAMS = "defaults"
+
+inherit autotools update-rc.d
+
+# The ac_cv_header_readline_history is to stop ntpdc depending on either
+# readline or curses
+EXTRA_OECONF = "--without-openssl --without-crypto ac_cv_header_readline_history_h=no"
+CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
+
+PACKAGES = "ntpdate ntp-bin ntp ntp-tickadj"
+# NOTE: you don't need ntpdate, use "ntpdc -q -g -x"
+PROVIDES = "ntpdate-${PV} ntpdate-${PV}-${PR} ntpdate"
+
+# This should use rc.update
+FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/init.d/ntpdate"
+#This is too painful - perl is only needed for ntp-wait and ntptrace, which are
+#perl scripts, and installing perl is an enormous overhead for a user who only
+#needs ntpq
+#RDEPENDS_ntp-bin = perl
+# ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms 
+# with wonky clocks (e.g. OpenSlug)
+RDEPENDS_${PN} = ${PN}-tickadj
+FILES_${PN}-bin = "${bindir}/ntp-wait ${bindir}/ntpdc ${bindir}/ntpq ${bindir}/ntptime ${bindir}/ntptrace"
+FILES_${PN} = "${bindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd"
+FILES_${PN}-tickadj = "${bindir}/tickadj"
+
+do_install_append() {
+	install -d ${D}/${sysconfdir}/init.d
+	install -m 644 ${WORKDIR}/ntp.conf ${D}/${sysconfdir}
+	install -m 755 ${WORKDIR}/ntpdate ${D}/${sysconfdir}/init.d
+	install -m 755 ${WORKDIR}/ntpd ${D}/${sysconfdir}/init.d
+}
+
+pkg_postinst_ntpdate_nylon() {
+if test "x$D" != "x"; then
+	exit 1
+else
+	if ! grep -q ntpdate /etc/cron/crontabs/root; then
+		echo "adding crontab"
+		test -d /etc/cron/crontabs || mkdir -p /etc/cron/crontabs
+		echo "30 * * * *    /usr/bin/ntpdate -s -u pool.ntp.org" >> /etc/cron/crontabs/root
+	fi
+	update-rc.d -s busybox-cron defaults
+	update-rc.d -s ntpdate defaults 30
+fi
+}
-- 
cgit v1.2.3


From cf799ae1fa268a365d5030d02a8a36f2e52788c4 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 10 Oct 2006 21:34:12 +0000
Subject: ntp: fixes * don't use PACKAGES = "foo", that breaks debug packages *
 removed bogus looking nylon override * we have an scm, so no need to comment
 lines * please conform to the styleguide when adding recipes

---
 packages/ntp/ntp_4.2.2p3.bb | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/ntp/ntp_4.2.2p3.bb b/packages/ntp/ntp_4.2.2p3.bb
index cb6aff272e..886f36253a 100644
--- a/packages/ntp/ntp_4.2.2p3.bb
+++ b/packages/ntp/ntp_4.2.2p3.bb
@@ -25,22 +25,19 @@ inherit autotools update-rc.d
 EXTRA_OECONF = "--without-openssl --without-crypto ac_cv_header_readline_history_h=no"
 CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
 
-PACKAGES = "ntpdate ntp-bin ntp ntp-tickadj"
+PACKAGES += "ntpdate ntp-bin ntp-tickadj ntp-utils"
 # NOTE: you don't need ntpdate, use "ntpdc -q -g -x"
-PROVIDES = "ntpdate-${PV} ntpdate-${PV}-${PR} ntpdate"
 
 # This should use rc.update
 FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/init.d/ntpdate"
-#This is too painful - perl is only needed for ntp-wait and ntptrace, which are
-#perl scripts, and installing perl is an enormous overhead for a user who only
-#needs ntpq
-#RDEPENDS_ntp-bin = perl
+
 # ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms 
 # with wonky clocks (e.g. OpenSlug)
 RDEPENDS_${PN} = ${PN}-tickadj
 FILES_${PN}-bin = "${bindir}/ntp-wait ${bindir}/ntpdc ${bindir}/ntpq ${bindir}/ntptime ${bindir}/ntptrace"
 FILES_${PN} = "${bindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd"
 FILES_${PN}-tickadj = "${bindir}/tickadj"
+FILES_ntp-utils = "${bindir}/*"
 
 do_install_append() {
 	install -d ${D}/${sysconfdir}/init.d
@@ -49,7 +46,7 @@ do_install_append() {
 	install -m 755 ${WORKDIR}/ntpd ${D}/${sysconfdir}/init.d
 }
 
-pkg_postinst_ntpdate_nylon() {
+pkg_postinst_ntpdate() {
 if test "x$D" != "x"; then
 	exit 1
 else
-- 
cgit v1.2.3


From 7624978966ae9b70ef1138c0f4729692c4cf4345 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 10 Oct 2006 22:44:27 +0000
Subject: psplash: add psplash from poky sane-srcdates: lock down psplash to
 today

---
 conf/distro/include/sane-srcdates.inc |  1 +
 packages/psplash/.mtn2git_empty       |  0
 packages/psplash/files/.mtn2git_empty |  0
 packages/psplash/files/psplash-init   |  6 ++++++
 packages/psplash/psplash_svn.bb       | 23 +++++++++++++++++++++++
 5 files changed, 30 insertions(+)
 create mode 100644 packages/psplash/.mtn2git_empty
 create mode 100644 packages/psplash/files/.mtn2git_empty
 create mode 100644 packages/psplash/files/psplash-init
 create mode 100644 packages/psplash/psplash_svn.bb

diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index fb753dc85e..a1132209ad 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -34,6 +34,7 @@ SRCDATE_matchbox-themes-extra ?= "20060612"
 SRCDATE_matchbox-wm ?= "20060612"
 SRCDATE_libmatchbox ?= "20060612"
 SRCDATE_libfakekey ?= "20051101"
+SRCDATE_psplash ?= "20061011"
 SRCDATE_zaurusd ?= "20060628"
 
 # GPE
diff --git a/packages/psplash/.mtn2git_empty b/packages/psplash/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/psplash/files/.mtn2git_empty b/packages/psplash/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/psplash/files/psplash-init b/packages/psplash/files/psplash-init
new file mode 100644
index 0000000000..3a5cb653aa
--- /dev/null
+++ b/packages/psplash/files/psplash-init
@@ -0,0 +1,6 @@
+#!/bin/sh 
+
+export TMPDIR=/mnt/.psplash
+mount tmpfs -t tmpfs $TMPDIR -o,size=40k
+
+/usr/bin/psplash &
diff --git a/packages/psplash/psplash_svn.bb b/packages/psplash/psplash_svn.bb
new file mode 100644
index 0000000000..f5e2195e82
--- /dev/null
+++ b/packages/psplash/psplash_svn.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Userspace framebuffer boot logo based on usplash."
+SECTION = "base"
+LICENSE = "GPL"
+
+PV = "0.0+svn${SRCDATE}"
+
+SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \
+           file://psplash-init"
+
+S = "${WORKDIR}/psplash"
+
+inherit autotools pkgconfig update-rc.d
+
+FILES_${PN} += "/mnt/.psplash"
+
+do_install_prepend() {
+	install -d ${D}/mnt/.psplash/
+	install -d ${D}${sysconfdir}/init.d/
+	install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash
+}
+
+INITSCRIPT_NAME = "psplash"
+INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ."
-- 
cgit v1.2.3


From 4a940b2baf7f24544c6ec47efa0b5fe37b6e3c77 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 10 Oct 2006 23:03:11 +0000
Subject: angstrom: add psplash to images sysvinit: add rc and rcS from poky to
 enable psplash

---
 packages/angstrom/task-angstrom.bb                 |   3 +-
 packages/sysvinit/sysvinit/angstrom/.mtn2git_empty |   0
 packages/sysvinit/sysvinit/angstrom/rc             | 171 +++++++++++++++++++++
 packages/sysvinit/sysvinit/angstrom/rcS            |  56 +++++++
 packages/sysvinit/sysvinit_2.86.bb                 |   2 +-
 5 files changed, 230 insertions(+), 2 deletions(-)
 create mode 100644 packages/sysvinit/sysvinit/angstrom/.mtn2git_empty
 create mode 100755 packages/sysvinit/sysvinit/angstrom/rc
 create mode 100755 packages/sysvinit/sysvinit/angstrom/rcS

diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb
index ba6339e8b0..3ad70e2129 100644
--- a/packages/angstrom/task-angstrom.bb
+++ b/packages/angstrom/task-angstrom.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r22"
+PR = "r23"
 ALLOW_EMPTY = "1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -17,6 +17,7 @@ PACKAGES = "\
 RDEPENDS_angstrom-base-depends = "\
     update-modules module-init-tools modutils-initscripts \
     sysvinit initscripts sysvinit-pidof \
+    psplash \
     netbase dropbear \
     angstrom-version \
     ipkg ipkg-collateral \
diff --git a/packages/sysvinit/sysvinit/angstrom/.mtn2git_empty b/packages/sysvinit/sysvinit/angstrom/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/sysvinit/sysvinit/angstrom/rc b/packages/sysvinit/sysvinit/angstrom/rc
new file mode 100755
index 0000000000..a355ea05cc
--- /dev/null
+++ b/packages/sysvinit/sysvinit/angstrom/rc
@@ -0,0 +1,171 @@
+#!/bin/sh
+#
+# rc		This file is responsible for starting/stopping
+#		services when the runlevel changes.
+#
+#		Optimization feature:
+#		A startup script is _not_ run when the service was
+#		running in the previous runlevel and it wasn't stopped
+#		in the runlevel transition (most Debian services don't
+#		have K?? links in rc{1,2,3,4,5} )
+#
+# Author:	Miquel van Smoorenburg <miquels@cistron.nl>
+#		Bruce Perens <Bruce@Pixar.com>
+#
+# Version:	@(#)rc  2.78  07-Nov-1999  miquels@cistron.nl
+#
+
+. /etc/default/rcS
+export VERBOSE
+
+startup_progress() {
+    step=$(($step + $step_change))
+    progress=$(($step * $progress_size / $num_steps + $first_step))
+    if type psplash-write >/dev/null 2>&1; then
+        TMPDIR=/mnt/.psplash psplash-write "PROGRESS $progress" || true
+    fi
+}
+
+
+#
+# Start script or program.
+#
+startup() {
+  # Handle verbosity
+  [ "$VERBOSE" = very ] && echo "INIT: Running $@..."
+
+  case "$1" in
+	*.sh)
+		# Source shell script for speed.
+		(
+			trap - INT QUIT TSTP
+			scriptname=$1
+			shift
+			. $scriptname
+		)
+		;;
+	*)
+		"$@"
+		;;
+  esac
+  startup_progress
+}
+
+  # Ignore CTRL-C only in this shell, so we can interrupt subprocesses.
+  trap ":" INT QUIT TSTP
+
+  # Set onlcr to avoid staircase effect.
+  stty onlcr 0>&1
+
+  # Now find out what the current and what the previous runlevel are.
+
+  runlevel=$RUNLEVEL
+  # Get first argument. Set new runlevel to this argument.
+  [ "$1" != "" ] && runlevel=$1
+  if [ "$runlevel" = "" ]
+  then
+	echo "Usage: $0 <runlevel>" >&2
+	exit 1
+  fi
+  previous=$PREVLEVEL
+  [ "$previous" = "" ] && previous=N
+
+  export runlevel previous
+
+  # Is there an rc directory for this new runlevel?
+  if [ -d /etc/rc$runlevel.d ]
+  then
+	# Find out where in the progress bar the initramfs got to.
+	PROGRESS_STATE=0
+	#if [ -f /dev/.initramfs/progress_state ]; then
+	#    . /dev/.initramfs/progress_state
+	#fi
+
+	# Split the remaining portion of the progress bar into thirds
+	progress_size=$(((100 - $PROGRESS_STATE) / 3))
+
+	case "$runlevel" in
+		0|6)
+			# Count down from 0 to -100 and use the entire bar
+			first_step=0
+			progress_size=100
+			step_change=-1
+			;;
+	        S)
+			# Begin where the initramfs left off and use 2/3
+			# of the remaining space
+			first_step=$PROGRESS_STATE
+			progress_size=$(($progress_size * 2))
+			step_change=1
+			;;
+		*)
+			# Begin where rcS left off and use the final 1/3 of
+			# the space (by leaving progress_size unchanged)
+			first_step=$(($progress_size * 2 + $PROGRESS_STATE))
+			step_change=1
+			;;
+	esac
+
+	# First, run the KILL scripts.
+	if [ $previous != N ]
+	then
+		for i in /etc/rc$runlevel.d/K[0-9][0-9]*
+		do
+			# Check if the script is there.
+			[ ! -f $i ] && continue
+
+			# Stop the service.
+			startup $i stop
+		done
+	fi
+
+	num_steps=0
+	for s in /etc/rc$runlevel.d/[SK]*; do
+            case "${s##/etc/rc$runlevel.d/S??}" in
+                gdm|xdm|kdm|reboot|halt)
+                    break
+                    ;;
+            esac
+            num_steps=$(($num_steps + 1))
+        done
+
+        step=0
+
+	# Now run the START scripts for this runlevel.
+	for i in /etc/rc$runlevel.d/S*
+	do
+		[ ! -f $i ] && continue
+
+		if [ $previous != N ] && [ $previous != S ]
+		then
+			#
+			# Find start script in previous runlevel and
+			# stop script in this runlevel.
+			#
+			suffix=${i#/etc/rc$runlevel.d/S[0-9][0-9]}
+			stop=/etc/rc$runlevel.d/K[0-9][0-9]$suffix
+			previous_start=/etc/rc$previous.d/S[0-9][0-9]$suffix
+			#
+			# If there is a start script in the previous level
+			# and _no_ stop script in this level, we don't
+			# have to re-start the service.
+			#
+			[ -f $previous_start ] && [ ! -f $stop ] && continue
+		fi
+		case "$runlevel" in
+			0|6)
+				startup $i stop
+				;;
+			*)
+				startup $i start
+				;;
+		esac
+	done
+  fi
+
+if [ "x$runlevel" != "xS" ]; then
+    if type psplash-write >/dev/null 2>&1; then
+        TMPDIR=/mnt/.psplash psplash-write "QUIT" || true
+    	umount /mnt/.psplash
+    fi
+fi
diff --git a/packages/sysvinit/sysvinit/angstrom/rcS b/packages/sysvinit/sysvinit/angstrom/rcS
new file mode 100755
index 0000000000..90af4149e4
--- /dev/null
+++ b/packages/sysvinit/sysvinit/angstrom/rcS
@@ -0,0 +1,56 @@
+#!/bin/sh
+#
+# rcS		Call all S??* scripts in /etc/rcS.d in
+#		numerical/alphabetical order.
+#
+# Version:	@(#)/etc/init.d/rcS  2.76  19-Apr-1999  miquels@cistron.nl
+#
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+runlevel=S
+prevlevel=N
+umask 022
+export PATH runlevel prevlevel
+
+#	Make sure proc is mounted
+#
+[ -d "/proc/1" ] || mount /proc
+
+#
+#	See if system needs to be setup. This is ONLY meant to
+#	be used for the initial setup after a fresh installation!
+#
+if [ -x /sbin/unconfigured.sh ]
+then
+  /sbin/unconfigured.sh
+fi
+
+#
+#	Source defaults.
+#
+. /etc/default/rcS
+
+#
+#	Trap CTRL-C &c only in this shell so we can interrupt subprocesses.
+#
+trap ":" INT QUIT TSTP
+
+#
+#	Call all parts in order.
+#
+exec /etc/init.d/rc S
+
+#
+#	For compatibility, run the files in /etc/rc.boot too.
+#
+[ -d /etc/rc.boot ] && run-parts /etc/rc.boot
+
+#
+#	Finish setup if needed. The comment above about
+#	/sbin/unconfigured.sh applies here as well!
+#
+if [ -x /sbin/setup.sh ]
+then
+  /sbin/setup.sh
+fi
+
diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb
index 40f0840374..d9cfaff2cb 100644
--- a/packages/sysvinit/sysvinit_2.86.bb
+++ b/packages/sysvinit/sysvinit_2.86.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "System-V like init."
 SECTION = "base"
 LICENSE = "GPL"
 HOMEPAGE = "http://freshmeat.net/projects/sysvinit/"
-PR = "r28"
+PR = "r29"
 
 # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
 # Set PACKAGE_ARCH appropriately.
-- 
cgit v1.2.3


From 0ca6d1bb315165ca220269e8f346e331a77e7c57 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 10 Oct 2006 23:10:06 +0000
Subject: glibc 2.5: add version that builds, not tested on device yet *
 zecke-sane-readelf needs refreshing * other non-applying patches seen to have
 been applied, but references have been left in for further inspection

---
 packages/glibc/glibc_2.5.bb | 207 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 207 insertions(+)
 create mode 100644 packages/glibc/glibc_2.5.bb

diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb
new file mode 100644
index 0000000000..0bfcc7f83b
--- /dev/null
+++ b/packages/glibc/glibc_2.5.bb
@@ -0,0 +1,207 @@
+DESCRIPTION = "GNU C Library"
+HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
+LICENSE = "LGPL"
+SECTION = "libs"
+PRIORITY = "required"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+# the -isystem in bitbake.conf screws up glibc do_stage
+BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
+TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
+
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"
+
+GLIBC_ADDONS ?= "ports,nptl,libidn"
+GLIBC_EXTRA_OECONF ?= ""
+
+GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN"
+
+#
+# For now, we will skip building of a gcc package if it is a uclibc one
+# and our build is not a uclibc one, and we skip a glibc one if our build
+# is a uclibc build.
+#
+# See the note in gcc/gcc_3.4.0.oe
+#
+
+python __anonymous () {
+    import bb, re
+    uc_os = (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None)
+    if uc_os:
+        raise bb.parse.SkipPackage("incompatible with target %s" %
+                                   bb.data.getVar('TARGET_OS', d, 1))
+}
+
+# nptl needs unwind support in gcc, which can't be built without glibc.
+PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}"
+PROVIDES += "virtual/libintl virtual/libiconv"
+DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers"
+RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
+INHIBIT_DEFAULT_DEPS = "1"
+
+#	   file://noinfo.patch;patch=1
+#	   file://ldconfig.patch;patch=1;pnum=0
+#	   file://arm-machine-gmon.patch;patch=1;pnum=0 \
+#	   \
+#	   file://arm-ioperm.patch;patch=1;pnum=0 \
+#	   file://ldd.patch;patch=1;pnum=0 \
+SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-2.5.tar.bz2 \
+	   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-2.5.tar.bz2 \
+	   ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-2.5.tar.bz2 \
+           file://arm-memcpy.patch;patch=1 \
+           file://arm-longlong.patch;patch=1 \
+           file://fhs-linux-paths.patch;patch=1 \
+           file://dl-cache-libcmp.patch;patch=1 \
+           file://ldsocache-varrun.patch;patch=1 \
+           file://nptl-crosscompile.patch;patch=1 \
+#	   file://glibc-2.4-compile.patch;patch=1 \
+#	   file://glibc-2.4-openat-3.patch;patch=1 \
+#	   file://fixup-aeabi-syscalls.patch;patch=1 \
+#	   file://zecke-sane-readelf.patch;patch=1 \
+	   file://generic-bits_select.h \
+	   file://generic-bits_types.h \
+	   file://generic-bits_typesizes.h \
+	   file://generic-bits_time.h \
+           file://etc/ld.so.conf \
+           file://generate-supported.mk"
+
+
+# Build fails on sh3 and sh4 without additional patches
+SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1"
+SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1"
+
+S = "${WORKDIR}/glibc-2.5"
+B = "${WORKDIR}/build-${TARGET_SYS}"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
+	        --without-cvs --disable-profile --disable-debug --without-gd \
+		--enable-clocale=gnu \
+	        --enable-add-ons=${GLIBC_ADDONS} \
+		--with-headers=${STAGING_INCDIR} \
+		--without-selinux \
+		${GLIBC_EXTRA_OECONF}"
+
+EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}"
+
+def get_glibc_fpu_setting(bb, d):
+	if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+		return "--without-fp"
+	return ""
+
+do_munge() {
+	# Integrate ports and libidn into tree
+	mv ${WORKDIR}/glibc-ports-${PV} ${S}/ports
+	mv ${WORKDIR}/glibc-libidn-${PV} ${S}/libidn
+
+	# Ports isn't really working... Fix it
+	# Some of this is rather dirty, but it seems to be the only
+	# quick way to get this cruft to compile
+	rm -rf ${S}/ports/sysdeps/unix/sysv/linux/arm/linuxthreads
+	ln -s nptl ${S}/ports/sysdeps/unix/sysv/linux/arm/linuxthreads
+	cp ${S}/sysdeps/unix/sysv/linux/i386/bits/wchar.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/
+	cp ${S}/sysdeps/wordsize-32/bits/wordsize.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/
+	cp ${WORKDIR}/generic-bits_select.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/select.h
+	cp ${WORKDIR}/generic-bits_types.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/types.h
+	cp ${WORKDIR}/generic-bits_typesizes.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/typesizes.h
+	cp ${WORKDIR}/generic-bits_time.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/time.h
+	# Copy in generic stuff for not yet implemented headers
+	for i in ${S}/bits/*.h; do
+		F=`basename $i`
+		[ "$F" = "local_lim.h" ] && continue
+		[ "$F" = "errno.h" ] && continue
+		test -e ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/$F || test -e ${S}/ports/sysdeps/arm/bits/$F || test -e ${S}/sysdeps/unix/sysv/linux/bits/$F || test -e ${S}/sysdeps/ieee754/bits/$F || cp $i ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/
+	done
+	# This is harmful; we need to get the one from nptl/sysdeps/pthreads
+	rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/libc-lock.h
+	# Obsoleted by sysdeps/arm/{fpu,eabi}/bits/fenv.h
+	rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/fenv.h
+	# Obsoleted by sysdeps/gnu/bits/utmp.h
+	rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/utmp.h
+}
+
+addtask munge before do_patch after do_unpack
+
+
+do_configure () {
+# override this function to avoid the autoconf/automake/aclocal/autoheader
+# calls for now
+# don't pass CPPFLAGS into configure, since it upsets the kernel-headers
+# version check and doesn't really help with anything
+	if [ -z "`which rpcgen`" ]; then
+		echo "rpcgen not found.  Install glibc-devel."
+		exit 1
+	fi
+	(cd ${S} && gnu-configize) || die "failure in running gnu-configize"
+	CPPFLAGS="" oe_runconf
+}
+
+rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \
+	  yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \
+	  rusers.x spray.x nfs_prot.x rquota.x key_prot.x"
+
+do_compile () {
+	# -Wl,-rpath-link <staging>/lib in LDFLAGS can cause breakage if another glibc is in staging
+	unset LDFLAGS
+	base_do_compile
+	(
+		cd ${S}/sunrpc/rpcsvc
+		for r in ${rpcsvc}; do
+			h=`echo $r|sed -e's,\.x$,.h,'`
+			rpcgen -h $r -o $h || oewarn "unable to generate header for $r"
+		done
+	)
+}
+
+do_stage() {
+	rm -f ${STAGING_LIBDIR}/libc.so.6
+	oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
+		   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
+		   '${STAGING_LIBDIR}/libc.so.6' \
+		   install-headers install-lib
+
+	install -d ${STAGING_INCDIR}/gnu \
+		   ${STAGING_INCDIR}/bits \
+		   ${STAGING_INCDIR}/rpcsvc
+	install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
+	install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
+	install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
+	for r in ${rpcsvc}; do
+		h=`echo $r|sed -e's,\.x$,.h,'`
+		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
+	done
+	for i in libc.a libc_pic.a libc_nonshared.a; do
+		install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i"
+	done
+	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
+	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
+
+	rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
+	oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
+		   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
+		   '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
+		   install-headers install-lib
+
+	install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
+		   ${CROSS_DIR}/${TARGET_SYS}/include/bits \
+		   ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
+	install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
+	install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
+	install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
+	for r in ${rpcsvc}; do
+		h=`echo $r|sed -e's,\.x$,.h,'`
+		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
+	done
+
+	for i in libc.a libc_pic.a libc_nonshared.a; do
+		install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
+	done
+	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
+	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
+}
+
+require glibc-package.bbclass
-- 
cgit v1.2.3


From b5540015f3f5f6b1b7e56d29a433399d13c95a1e Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Tue, 10 Oct 2006 23:38:16 +0000
Subject: uim: fix apparent typo, pkconfig => pkgconfig

---
 packages/uim/uim-native_1.1.0.bb | 2 +-
 packages/uim/uim_1.1.0.bb        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/uim/uim-native_1.1.0.bb b/packages/uim/uim-native_1.1.0.bb
index 7856a67b15..5249ac6394 100644
--- a/packages/uim/uim-native_1.1.0.bb
+++ b/packages/uim/uim-native_1.1.0.bb
@@ -1,3 +1,3 @@
 require uim.inc
 DEPENDS = "gtk+ anthy intltool-native"
-inherit native autotools pkconfig
+inherit native autotools pkgconfig
diff --git a/packages/uim/uim_1.1.0.bb b/packages/uim/uim_1.1.0.bb
index 2b6fb5c089..669475339b 100644
--- a/packages/uim/uim_1.1.0.bb
+++ b/packages/uim/uim_1.1.0.bb
@@ -9,7 +9,7 @@ do_stage() {
 	autotools_stage_all
 }
 
-inherit autotools pkconfig
+inherit autotools pkgconfig
 
 PACKAGES = "uim-xim uim-utils uim-skk uim-gtk2.0 uim-fep uim-common uim-anthy libuim0 libuim-dev"
 
-- 
cgit v1.2.3


From 5bcecf82b1b20206879da6dc41c59968eea898d6 Mon Sep 17 00:00:00 2001
From: Jamie Lenehan <lenehan@twibble.org>
Date: Wed, 11 Oct 2006 07:37:07 +0000
Subject: havp 0.82: Inherit update-rc.d so that the initscripts actually get
 registered. Fix up the naming of initscript variables now that they are
 actually getting used.

---
 packages/havp/havp_0.82.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/havp/havp_0.82.bb b/packages/havp/havp_0.82.bb
index a0e1a00d64..91d25485ef 100644
--- a/packages/havp/havp_0.82.bb
+++ b/packages/havp/havp_0.82.bb
@@ -8,7 +8,7 @@ SECTION = "network"
 LICENSE = "GPLv2"
 DEPENDS = "clamav"
 RDEPENDS_${PN} += "${PN}-templates-css2 ${PN}-templates-en"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.server-side.de/download/havp-${PV}.tar.gz \
            file://sysconfdir-is-etc.patch;patch=1 \
@@ -16,7 +16,7 @@ SRC_URI = "http://www.server-side.de/download/havp-${PV}.tar.gz \
            file://doc.configure.txt \
            file://volatiles.05_havp"
 
-inherit autotools
+inherit autotools update-rc.d
 
 EXTRA_OECONF = "--with-scanner=libclamav"
 
@@ -85,5 +85,5 @@ pkg_postinst_${PN} () {
 CONFFILES_${PN} = "${sysconfdir}/havp/havp.config \
                    ${sysconfdir}/havp/blacklist ${sysconfdir}/havp/whitelist"
 
-INITSCRIPT_NAME_${PN} = "havp"
-INITSCRIPT_PARAMS_${PN} = "defaults 55 45"
+INITSCRIPT_NAME = "havp"
+INITSCRIPT_PARAMS = "defaults 55 45"
-- 
cgit v1.2.3


From 50b7db3705352b328ab5b947a9448739ed8a4cff Mon Sep 17 00:00:00 2001
From: Jamie Lenehan <lenehan@twibble.org>
Date: Wed, 11 Oct 2006 07:43:14 +0000
Subject: clamsmtp 1.8: Add clamsmtp, an smtp proxy with virus scanning support
 cia clamav (clamad-daemon). It has optional support transparent proxying as
 well.

---
 packages/clamsmtp/.mtn2git_empty            |  0
 packages/clamsmtp/clamsmtp_1.8.bb           | 40 +++++++++++++++++++++++++++++
 packages/clamsmtp/files/.mtn2git_empty      |  0
 packages/clamsmtp/files/clamsmtp.init       | 33 ++++++++++++++++++++++++
 packages/clamsmtp/files/doc.configure.txt   | 15 +++++++++++
 packages/clamsmtp/files/update-config.patch | 23 +++++++++++++++++
 6 files changed, 111 insertions(+)
 create mode 100644 packages/clamsmtp/.mtn2git_empty
 create mode 100644 packages/clamsmtp/clamsmtp_1.8.bb
 create mode 100644 packages/clamsmtp/files/.mtn2git_empty
 create mode 100644 packages/clamsmtp/files/clamsmtp.init
 create mode 100644 packages/clamsmtp/files/doc.configure.txt
 create mode 100644 packages/clamsmtp/files/update-config.patch

diff --git a/packages/clamsmtp/.mtn2git_empty b/packages/clamsmtp/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/clamsmtp/clamsmtp_1.8.bb b/packages/clamsmtp/clamsmtp_1.8.bb
new file mode 100644
index 0000000000..38103de033
--- /dev/null
+++ b/packages/clamsmtp/clamsmtp_1.8.bb
@@ -0,0 +1,40 @@
+DESCRIPTION = "ClamSMTP is an SMTP filter that allows you to check for \
+viruses using the ClamAV anti-virus software. It accepts SMTP connections \
+and forwards the SMTP commands and responses to another SMTP server. The \
+'DATA' email body is intercepted and scanned before forwarding. ClamSMTP \
+has an optional transparent proxy mode."
+HOMEPAGE = "http://memberwebs.com/nielsen/software/clamsmtp/"
+SECTION = "network"
+LICENSE = "BSD"
+DEPENDS = "clamav"
+RDEPENDS_${PN} = "clamav-daemon"
+PR = "r1"
+
+SRC_URI = "http://memberwebs.com/nielsen/software/clamsmtp/clamsmtp-${PV}.tar.gz \
+           file://update-config.patch;patch=1 \
+           file://clamsmtp.init \
+           file://doc.configure.txt"
+
+inherit autotools update-rc.d
+
+do_configure () {
+        # no autoreconf please
+        aclocal
+        autoconf
+        libtoolize --force
+        oe_runconf
+}
+do_install_append () {
+        install -m 0755 -d ${D}${sysconfdir}/init.d \
+                           ${D}${docdir}/clamsmtp
+        install -m 755 ${WORKDIR}/clamsmtp.init ${D}${sysconfdir}/init.d/clamsmtpd
+        install -m 644 doc/clamsmtpd.conf ${D}${sysconfdir}/clamsmtpd.conf
+        install -m 644 README ${D}${docdir}/clamsmtp
+        install -m 644 ${WORKDIR}/doc.configure.txt ${D}${docdir}/clamsmtp/configure.txt
+        install -m 644 scripts/virus_action.sh ${D}${docdir}/clamsmtp
+}
+
+CONFFILES_${PN} = "${sysconfdir}/clamsmtpd.conf"
+
+INITSCRIPT_NAME = "clamsmtpd"
+INITSCRIPT_PARAMS = "defaults 65 35"
diff --git a/packages/clamsmtp/files/.mtn2git_empty b/packages/clamsmtp/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/clamsmtp/files/clamsmtp.init b/packages/clamsmtp/files/clamsmtp.init
new file mode 100644
index 0000000000..7f30d1f724
--- /dev/null
+++ b/packages/clamsmtp/files/clamsmtp.init
@@ -0,0 +1,33 @@
+#!/bin/sh
+DAEMON=/usr/sbin/clamsmtpd
+CLAMSMTPD_CONFIG=/etc/clamsmtpd.conf
+PIDFILE=/var/run/clamav/clamsmtpd.pid
+NAME="clamsmtpd"
+DESC="ClamSMTPD"
+
+test -r /etc/default/$NAME && . /etc/default/$NAME
+test -x "$DAEMON" || exit 0
+test ! -r "$CLAMSMTPD_CONFIG" && exit 0
+        
+case "$1" in
+  start)
+    echo "Starting $DESC: "
+    start-stop-daemon --oknodo -S -x $DAEMON -- -p $PIDFILE -f $CLAMSMTPD_CONFIG
+    echo "$NAME."
+    ;;
+
+  stop)
+    echo "Stopping $DESC:"
+    start-stop-daemon -K -p $PIDFILE
+    ;;
+
+  restart)
+    $0 stop >/dev/null 2>&1
+    $0 start
+    ;;
+
+  *)
+    echo "Usage: $0 {start|stop|restart}"
+    exit 0
+    ;;
+esac
diff --git a/packages/clamsmtp/files/doc.configure.txt b/packages/clamsmtp/files/doc.configure.txt
new file mode 100644
index 0000000000..b06487f31a
--- /dev/null
+++ b/packages/clamsmtp/files/doc.configure.txt
@@ -0,0 +1,15 @@
+The following items needs to be considered when using clamsmtp:
+
+1. Scanning is done via clamd (clamav-daemon)
+
+   The clamd daemon must be running for scanning to take place.
+
+2. Transparent proxy
+
+   For transparent proxying you need an IP tables rule such as:
+
+     iptables -t nat -A PREROUTING -i eth0 -p tcp -m tcp --dport 25 -j REDIRECT --to-ports 10025
+
+   where eth0 is the incomming port, and 10025 is the port that clamsmtpd
+   is running on. Also remember to enable transparent proxy support in the
+   configuration file.
diff --git a/packages/clamsmtp/files/update-config.patch b/packages/clamsmtp/files/update-config.patch
new file mode 100644
index 0000000000..dd67c39e19
--- /dev/null
+++ b/packages/clamsmtp/files/update-config.patch
@@ -0,0 +1,23 @@
+Run as the clamav user.
+Use the sock that clamd actually creates.
+
+--- clamsmtp-1.8/doc/clamsmtpd.conf	2006/10/11 06:43:31	1.1
++++ clamsmtp-1.8/doc/clamsmtpd.conf	2006/10/11 06:44:04
+@@ -29,7 +29,7 @@
+ #Listen: 0.0.0.0:10025
+ 
+ # The address clamd is listening on
+-#ClamAddress: /var/run/clamav/clamd
++ClamAddress: /var/run/clamav/clamd.ctl
+ 
+ # A header to add to all scanned email
+ #Header: X-Virus-Scanned: ClamAV using ClamSMTP
+@@ -47,7 +47,7 @@
+ #TransparentProxy: off
+ 
+ # User to switch to
+-#User: clamav
++User: clamav
+ 
+ # Virus actions: There's an option to run a script every time a virus is found. 
+ # !IMPORTANT! This can open a hole in your server's security big enough to drive
-- 
cgit v1.2.3


From e7c4f984c42927483224c6db2ea64a84bc8508db Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 11 Oct 2006 08:53:11 +0000
Subject: glibc 2.5: re-enable zecke-sane-readelf

---
 packages/glibc/glibc_2.5.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb
index 0bfcc7f83b..4308d6956d 100644
--- a/packages/glibc/glibc_2.5.bb
+++ b/packages/glibc/glibc_2.5.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
 LICENSE = "LGPL"
 SECTION = "libs"
 PRIORITY = "required"
-PR = "r0"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -60,7 +60,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-2.5.tar.bz2 \
 #	   file://glibc-2.4-compile.patch;patch=1 \
 #	   file://glibc-2.4-openat-3.patch;patch=1 \
 #	   file://fixup-aeabi-syscalls.patch;patch=1 \
-#	   file://zecke-sane-readelf.patch;patch=1 \
+	   file://zecke-sane-readelf.patch;patch=1 \
 	   file://generic-bits_select.h \
 	   file://generic-bits_types.h \
 	   file://generic-bits_typesizes.h \
-- 
cgit v1.2.3


From 41675b96250b3b40a20bfe56c68d184bfd046a93 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 11 Oct 2006 12:50:09 +0000
Subject: zaurus-updater: add c3200 support * please keep fixes from your
 private branches in sync with .dev...

---
 packages/zaurus-updater/spitz/updater.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/zaurus-updater/spitz/updater.sh b/packages/zaurus-updater/spitz/updater.sh
index 07d81b1bda..a748334cc7 100755
--- a/packages/zaurus-updater/spitz/updater.sh
+++ b/packages/zaurus-updater/spitz/updater.sh
@@ -81,7 +81,7 @@ fi
 ### Check model ###
 /sbin/writerominfo
 MODEL=`cat /proc/deviceinfo/product`
-if [ "$MODEL" != "SL-C3000" ] && [ "$MODEL" != "SL-C3100" ]
+if [ "$MODEL" != "SL-C3000" ] && [ "$MODEL" != "SL-C3100" ] && [ "$MODEL" != "SL-C3200" ]
 then
 	echo 'MODEL:'$MODEL
 	echo 'ERROR:Invalid model!'
-- 
cgit v1.2.3