From 9c8ed5e61498f7c5537c345d92e5b2da9fd6af3d Mon Sep 17 00:00:00 2001
From: ccsmart <ccsmart@smartpal.de>
Date: Wed, 6 Jul 2005 18:01:33 +0000
Subject: Adding local HW clock and default security.

---
 packages/ntp/files/ntp.conf | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/ntp/files/ntp.conf b/packages/ntp/files/ntp.conf
index 4cb3ae176e..02a44b0d01 100644
--- a/packages/ntp/files/ntp.conf
+++ b/packages/ntp/files/ntp.conf
@@ -6,3 +6,8 @@ driftfile /etc/ntp.drift
 # (in IP terms) to the machine.  Add other servers
 # as required, or change this.
 server pool.ntp.org
+# Using local hardware clock as fallback
+server 127.127.1.0
+fudge 127.127.1.0 stratum 14
+# Defining a default security setting
+restrict default nomodify nopeer
-- 
cgit v1.2.3


From 0bbcf278b7c50748f97f4a12f4c4330ed53daeeb Mon Sep 17 00:00:00 2001
From: ccsmart <ccsmart@smartpal.de>
Date: Fri, 8 Jul 2005 18:13:48 +0000
Subject: Removed snmp support.

---
 packages/cyrus-imapd/cyrus-imapd_2.2.12.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
index 2d385ec154..4a0a457c35 100644
--- a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
+++ b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
@@ -10,7 +10,8 @@ SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz \
 inherit autotools
 
 EXTRA_OECONF = "--with-auth=unix \
-		--without-perl"
+		--without-perl \
+		--without-snmp"
 
 FILES_${PN} += "${prefix}/cyrus/bin"
 
-- 
cgit v1.2.3


From ce85bae0ffbca430dd50976c0b5397b3a822b6f7 Mon Sep 17 00:00:00 2001
From: ccsmart <ccsmart@smartpal.de>
Date: Fri, 8 Jul 2005 18:45:08 +0000
Subject: Make rmrecovery permanent active per default.

---
 packages/openslug-init/openslug-init-0.10/turnup | 19 +------------------
 packages/openslug-init/openslug-init_0.10.bb     |  1 +
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/packages/openslug-init/openslug-init-0.10/turnup b/packages/openslug-init/openslug-init-0.10/turnup
index 14756fc661..86c573a93b 100644
--- a/packages/openslug-init/openslug-init-0.10/turnup
+++ b/packages/openslug-init/openslug-init-0.10/turnup
@@ -194,20 +194,6 @@ setup_var() {
 	return 0
 }
 
-#
-# setup_files new
-#  At present just puts the rmrecovery links in.
-setup_files() {
-	test -n "$1" -a -d "$1"/etc || {
-		echo "turnup: setup_files($1): expected a directory" >&2
-		return 1
-	}
-	#
-	# add the script to remove .recovery
-	update-rc.d -r "$1" rmrecovery start 99 1 2 3 4 5 .
-	return 0
-}
-
 #
 # setup_syslog new
 #  Moves the syslog to a file - appropriate for disk and nfs types, not
@@ -258,14 +244,11 @@ setup_rootfs() {
 	flash)	return 0;;
 	disk)	setup_dev "$new" "$table" &&
 		setup_var "$new" disk &&
-		setup_files "$new" &&
 		setup_syslog "$new";;
 	memstick)
-		setup_bootdev "$new" "$table" &&
-		setup_files "$new";;
+		setup_bootdev "$new" "$table" ;;
 	nfs)	setup_dev "$new" "$table" &&
 		setup_var "$new" nfs &&
-		setup_files "$new" &&
 		setup_syslog "$new";;
 	*)	echo "turnup: setup_rootfs: $type: unknown rootfs type" >&2
 		return 1;;
diff --git a/packages/openslug-init/openslug-init_0.10.bb b/packages/openslug-init/openslug-init_0.10.bb
index f0af1aa9fb..c9af6e2a46 100644
--- a/packages/openslug-init/openslug-init_0.10.bb
+++ b/packages/openslug-init/openslug-init_0.10.bb
@@ -121,6 +121,7 @@ pkg_postinst_openslug-init() {
 	update-rc.d $opt syslog.file		start 39 S . start 47 0 6 .
 	update-rc.d $opt syslog.network		start 44 S . start 39 0 6 .
 	update-rc.d $opt zleds			start 99 S 1 2 3 4 5 . stop  5 0 1 2 3 4 5 6 .
+	update-rc.d $opt rmrecovery             start 99 1 2 3 4 5 .
 	# bug fix for startup
 	update-rc.d $opt leds_startup		start  1 1 2 3 4 5 .
 }
-- 
cgit v1.2.3


From bc8c837b6f6c14501b9f7ef607df99622120b48a Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sat, 9 Jul 2005 18:23:31 +0000
Subject: Set PREFERRED_VERSION for kernel to 2.6.11.2 until mtd issue is
 resolved

---
 conf/distro/openslug.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 22e835e257..847959bcc2 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -95,6 +95,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "nslu2-kernel"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
 PREFERRED_VERSION_openslug-kernel ?= "2.6.11.2"
+PREFERRED_VERSION_nslu2-kernel ?= "2.6.11.2"
 # The nslu2-kernel version is currently tracking the latest
 # Change before release!
 #PREFERRED_VERSION_nslu2-kernel ?= "2.6.12.2"
-- 
cgit v1.2.3


From dd3b76271f8e237bc36dc7ba7e45ab403d2e5019 Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sat, 9 Jul 2005 21:50:02 +0000
Subject: Updated bb. (DaKa2)

---
 packages/sane-backends/sane-backends_1.0.15.bb | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/packages/sane-backends/sane-backends_1.0.15.bb b/packages/sane-backends/sane-backends_1.0.15.bb
index 6897aef141..2e45e4cbd6 100644
--- a/packages/sane-backends/sane-backends_1.0.15.bb
+++ b/packages/sane-backends/sane-backends_1.0.15.bb
@@ -1,6 +1,6 @@
 MAINTAINER="Oyvind Repvik <nail@nslu2-linux.org>"
 DESCRIPTION="Scanner drivers for SANE"
-PR="r0"
+PR="r1"
 DEPENDS="jpeg libusb"
 
 SRC_URI="ftp://ftp.sane-project.org/pub/sane/sane-backends-${PV}/sane-backends-${PV}.tar.gz \
@@ -11,4 +11,21 @@ EXTRA_OECONF="--prefix=/usr --sysconfdir=/etc --disable-translations"
 
 inherit autotools
 
+do_install_append() {
+	install -m 755 "${S}/tools/.libs/sane-find-scanner" "${D}/${bindir}"
+}
+
+PACKAGES = "libsane saned sane-utils"
+
+FILES_libsane = "/usr/lib/sane/*.so.* /usr/lib/lib*.so.* /etc"
+PKG_libsane = "libsane"
+RCONFLICTS = "sane-backends"
+RRECOMMENDS_libsane = "saned sane-utils"
+
+RDEPENDS_saned = "libsane"
+FILES_saned = "/usr/sbin/saned"
+
+RDEPENDS_sane-utils = "libsane"
+FILES_sane-utils = "/usr/bin"
+
 
-- 
cgit v1.2.3


From 84ab65ba0145c917000f382fe693d26cd74ff09f Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 10 Jul 2005 00:30:29 +0000
Subject: Updated install part (DaKa2)

---
 packages/libgphoto2/libgphoto2_2.1.6.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/libgphoto2/libgphoto2_2.1.6.bb b/packages/libgphoto2/libgphoto2_2.1.6.bb
index 67efc38785..b835da6f84 100644
--- a/packages/libgphoto2/libgphoto2_2.1.6.bb
+++ b/packages/libgphoto2/libgphoto2_2.1.6.bb
@@ -30,3 +30,7 @@ do_stage() {
                 install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X
         done
 }
+PACKAGES =+ "libgphoto2-camlibs"
+FILES_libgphoto2-camlibs = "/usr/lib/gphoto2_port/ /usr/lib/gphoto2/"
+RDEPENDS_libgphoto2 = "libgphoto2-camlibs"
+
-- 
cgit v1.2.3


From bb28f5cd5cd7fc357f839ba9fcd73734ceb9343b Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 10 Jul 2005 01:05:49 +0000
Subject: Bumped revisions

---
 packages/gphoto2/gphoto2_2.1.6.bb              | 1 +
 packages/libgphoto2/libgphoto2_2.1.6.bb        | 2 +-
 packages/sane-backends/sane-backends_1.0.15.bb | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/gphoto2/gphoto2_2.1.6.bb b/packages/gphoto2/gphoto2_2.1.6.bb
index 51dacccd0f..4340335d50 100644
--- a/packages/gphoto2/gphoto2_2.1.6.bb
+++ b/packages/gphoto2/gphoto2_2.1.6.bb
@@ -2,6 +2,7 @@ LICENSE = GPL
 SECTION = "console/utils"
 DEPENDS = "libgphoto2 popt"
 DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras"
+PR="r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.gz"
 
diff --git a/packages/libgphoto2/libgphoto2_2.1.6.bb b/packages/libgphoto2/libgphoto2_2.1.6.bb
index b835da6f84..b814f9a469 100644
--- a/packages/libgphoto2/libgphoto2_2.1.6.bb
+++ b/packages/libgphoto2/libgphoto2_2.1.6.bb
@@ -2,7 +2,7 @@ SECTION = "libs"
 DEPENDS = "jpeg libusb libexif"
 RPEDENDS = "libusb"
 DESCRIPTION = "libgphoto2 allows you to access digital cameras"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz"
 
diff --git a/packages/sane-backends/sane-backends_1.0.15.bb b/packages/sane-backends/sane-backends_1.0.15.bb
index 2e45e4cbd6..30c4c75b2e 100644
--- a/packages/sane-backends/sane-backends_1.0.15.bb
+++ b/packages/sane-backends/sane-backends_1.0.15.bb
@@ -1,6 +1,6 @@
 MAINTAINER="Oyvind Repvik <nail@nslu2-linux.org>"
 DESCRIPTION="Scanner drivers for SANE"
-PR="r1"
+PR="r2"
 DEPENDS="jpeg libusb"
 
 SRC_URI="ftp://ftp.sane-project.org/pub/sane/sane-backends-${PV}/sane-backends-${PV}.tar.gz \
-- 
cgit v1.2.3


From 216f6c091c7b6c01d5d5cbabfd1a71afb1d1e717 Mon Sep 17 00:00:00 2001
From: Derek Young <dyoung@nslu2-linux.org>
Date: Sun, 10 Jul 2005 02:04:03 +0000
Subject: ctrlproxy

---
 packages/ctrlproxy/.mtn2git_empty     |  0
 packages/ctrlproxy/ctrlproxy_2.6.2.bb | 28 ++++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 packages/ctrlproxy/.mtn2git_empty
 create mode 100644 packages/ctrlproxy/ctrlproxy_2.6.2.bb

diff --git a/packages/ctrlproxy/.mtn2git_empty b/packages/ctrlproxy/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/ctrlproxy/ctrlproxy_2.6.2.bb b/packages/ctrlproxy/ctrlproxy_2.6.2.bb
new file mode 100644
index 0000000000..3eb809edb0
--- /dev/null
+++ b/packages/ctrlproxy/ctrlproxy_2.6.2.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "ctrlproxy is an IRC server with multiserver support."
+SECTION = "console/network"
+PRIORITY = "optional"
+MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
+DEPENDS = "glib-2.0 libxml2 popt pcre openssl"
+PR = "r0"
+LICENSE = "GPL"
+
+SRC_URI = "http://ctrlproxy.vernstok.nl/releases/ctrlproxy-2.6.2.tar.gz"
+S = "${WORKDIR}/ctrlproxy-2.6.2/"
+
+inherit autotools
+# update-rc.d
+
+#INITSCRIPT_NAME = "ctrlproxy"
+#INITSCRIPT_PARAMS = "defaults 84"
+# CONFFILES_${PN} = "${sysconfdir}/foo.conf" 
+
+CFLAGS += "-L${STAGING_LIBDIR}"
+
+#do_install() {
+#	autotools_do_install
+#	install -d ${D}${sysconfdir}
+#	install -d ${D}${sysconfdir}/init.d
+#	install -m 0644 ${S}contrib/foo.conf ${D}${sysconfdir}
+#	install -m 0755 ${WORKDIR}/foo.init ${D}${sysconfdir}/init.d/foo
+#}
+
-- 
cgit v1.2.3


From 2f95043c7a1f6bad0fddcd93653eb59feea32302 Mon Sep 17 00:00:00 2001
From: John Bowler <jbowler@nslu2-linux.org>
Date: Sun, 10 Jul 2005 05:42:42 +0000
Subject: This is a sufficient startup script to get a disk-full nfs server
 working. On a flash based server or any (user) configuration where /var is in
 tmpfs or ramfs (so is not populated on boot) the script will not work because
 it must create the /var/lib/nfs directory and contents.  Consequently at
 present the script is not in the build.

---
 packages/nfs-utils/files/.mtn2git_empty |   0
 packages/nfs-utils/files/nfsserver      | 106 ++++++++++++++++++++++++++++++++
 2 files changed, 106 insertions(+)
 create mode 100644 packages/nfs-utils/files/.mtn2git_empty
 create mode 100644 packages/nfs-utils/files/nfsserver

diff --git a/packages/nfs-utils/files/.mtn2git_empty b/packages/nfs-utils/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/nfs-utils/files/nfsserver b/packages/nfs-utils/files/nfsserver
new file mode 100644
index 0000000000..3536f0db12
--- /dev/null
+++ b/packages/nfs-utils/files/nfsserver
@@ -0,0 +1,106 @@
+#!/bin/sh
+#
+# Startup script for nfs-utils
+#
+# The nfsd kernel module must exist along with its dependencies
+modprobe -n nfsd || exit 0
+#
+# The environment variable NFS_SERVERS may be set in /etc/default/nfsd
+# Other control variables may be overridden here too
+test -r /etc/default/nfsd && . /etc/default/nfsd
+#
+# Location of exectuables:
+test -x "$NFS_MOUNTD" || NFS_MOUNTD=/usr/sbin/mountd
+test -x "$NFS_NFSD" || NFS_NFSD=/usr/sbin/nfsd
+#
+# The user mode program must also exist (it just starts the kernel
+# threads using the kernel module code).
+test -x "$NFS_MOUNTD" || exit 0
+test -x "$NFS_NFSD" || exit 0
+#
+# Default is 8 threads, value is settable between 1 and the truely
+# ridiculous 99
+test "$NFS_SERVERS" -gt 0 && "$NFS_SERVERS" -lt 100 || NFS_SERVERS=8
+#
+#----------------------------------------------------------------------
+# Startup and shutdown functions.
+#  Actual startup/shutdown is at the end of this file.
+#mountd
+start_mountd(){
+	echo -n 'starting mountd: '
+	start-stop-daemon --start --exec "$NFS_MOUNTD" -- "$@"
+	echo done
+}
+stop_mountd(){
+	echo -n 'stopping mountd: '
+	start-stop-daemon --stop --quiet --exec "$NFS_MOUNTD"
+	echo done
+}
+#
+#nfsd
+start_nfsd(){
+	echo -n 'starting $1 nfsd kernel threads: '
+	start-stop-daemon --start --exec "$NFS_NFSD" -- "$@"
+	echo done
+}
+delay_nfsd(){
+	for delay in 0 1 2 3 4 5 6 7 8 9 
+	do
+		if pidof nfsd >/dev/null
+		then
+			echo -n .
+			sleep 1
+		else
+			return 0
+		fi
+	done
+	return 1
+}
+stop_nfsd(){
+	# WARNING: this kills any process with the executable
+	# name 'nfsd'.
+	echo -n 'stopping nfsd: '
+	start-stop-daemon --stop --quiet --signal 1 --name nfsd
+	if delay_nfsd || {
+		echo failed
+		echo ' using signal 9: '
+		start-stop-daemon --stop --quiet --signal 9 --name nfsd
+		delay_nfsd
+	}
+	then
+		echo done
+		# This will remove, recursively, dependencies
+		echo -n 'removing nfsd kernel module: '
+		if modprobe -r nfsd
+		then
+			echo done
+		else
+			echo failed
+		fi
+	else
+		echo failed
+	fi
+}
+#----------------------------------------------------------------------
+#
+# supported options:
+#  start
+#  stop
+#  reload: reloads the exports file
+#  restart: stops and starts mountd
+#FIXME: need to create the /var/lib/nfs/... directories
+case "$1" in
+start)	start_nfsd "$NFS_SERVERS"
+	start_mountd
+	test -r /etc/exports && exportfs -a;;
+stop)	exportfs -ua
+	stop_mountd
+	stop_nfsd;;
+reload)	test -r /etc/exports && exportfs -r;;
+restart)exportfs -ua
+	stop_mountd
+	# restart does not restart the kernel threads,
+	# only the user mode processes
+	start_mountd
+	test -r /etc/exports && exportfs -a;;
+esac
-- 
cgit v1.2.3


From 6192d03272f2a940e803cc00d4989949953e03f9 Mon Sep 17 00:00:00 2001
From: ccsmart <ccsmart@smartpal.de>
Date: Sun, 10 Jul 2005 08:38:37 +0000
Subject: Adding missing plugin libraries to package.

---
 packages/cyrus-sasl/cyrus-sasl_2.1.19.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
index 37c8292595..7109a54812 100644
--- a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
+++ b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
@@ -14,6 +14,8 @@ EXTRA_OECONF = "--enable-shared --enable-static --with-dblib=berkeley \
 	        --with-bdb-incdir=${STAGING_INCDIR} \
 		--without-opie --without-des"
 
+FILES_${PN} += "${prefix}/lib/sasl2/*.so*"
+
 do_configure_prepend () {
 	rm -f acinclude.m4 config/libtool.m4
 }
-- 
cgit v1.2.3


From 44deec998e21fb36ada17da670edd6afe138451f Mon Sep 17 00:00:00 2001
From: ccsmart <ccsmart@smartpal.de>
Date: Sun, 10 Jul 2005 10:20:58 +0000
Subject: Update staging dir for plugin libs.

---
 packages/cyrus-sasl/cyrus-sasl_2.1.19.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
index 7109a54812..7e29f8082b 100644
--- a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
+++ b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
@@ -29,7 +29,7 @@ do_compile_prepend () {
 
 do_stage () {
 	oe_libinstall -so -a -C lib libsasl2 ${STAGING_LIBDIR}
-	install -d ${STAGING_LIBDIR}/sasl
+	install -d ${STAGING_LIBDIR}/sasl2
 	install -d ${STAGING_INCDIR}/sasl
 	install -m 0644 ${S}/include/hmac-md5.h ${STAGING_INCDIR}/sasl/
 	install -m 0644 ${S}/include/md5.h ${STAGING_INCDIR}/sasl/
-- 
cgit v1.2.3


From 89027227a484061647e511c9d1f0405bab4426eb Mon Sep 17 00:00:00 2001
From: John Bowler <jbowler@nslu2-linux.org>
Date: Sun, 10 Jul 2005 16:26:42 +0000
Subject: Working, tested, nfs-utils.  This now pulls in all the dependencies
 on ipkg install and has a working startup script.

---
 packages/nfs-utils/files/nfsserver    | 30 ++++++++++++++++++++++++++++--
 packages/nfs-utils/nfs-utils_1.0.6.bb | 33 +++++++++++++++------------------
 2 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/packages/nfs-utils/files/nfsserver b/packages/nfs-utils/files/nfsserver
index 3536f0db12..36391ee85a 100644
--- a/packages/nfs-utils/files/nfsserver
+++ b/packages/nfs-utils/files/nfsserver
@@ -22,9 +22,34 @@ test -x "$NFS_NFSD" || exit 0
 # ridiculous 99
 test "$NFS_SERVERS" -gt 0 && "$NFS_SERVERS" -lt 100 || NFS_SERVERS=8
 #
+# The default state directory is /var/lib/nfs
+test -n "$NFS_STATEDIR" || NFS_STATEDIR=/var/lib/nfs
+#
 #----------------------------------------------------------------------
 # Startup and shutdown functions.
 #  Actual startup/shutdown is at the end of this file.
+#directories
+create_directories(){
+	echo -n 'creating NFS state directory: '
+	mkdir -p "$NFS_STATEDIR"
+	(	cd "$NFS_STATEDIR"
+		umask 077
+		mkdir -p sm sm.bak
+		test -w sm/state || {
+			rm -f sm/state
+			:>sm/state
+		}
+		umask 022
+		for file in xtab etab smtab rmtab
+		do
+			test -w "$file" || {
+				rm -f "$file"
+				:>"$file"
+			}
+		done
+	)
+	echo done
+}
 #mountd
 start_mountd(){
 	echo -n 'starting mountd: '
@@ -39,7 +64,7 @@ stop_mountd(){
 #
 #nfsd
 start_nfsd(){
-	echo -n 'starting $1 nfsd kernel threads: '
+	echo -n "starting $1 nfsd kernel threads: "
 	start-stop-daemon --start --exec "$NFS_NFSD" -- "$@"
 	echo done
 }
@@ -90,7 +115,8 @@ stop_nfsd(){
 #  restart: stops and starts mountd
 #FIXME: need to create the /var/lib/nfs/... directories
 case "$1" in
-start)	start_nfsd "$NFS_SERVERS"
+start)	create_directories
+	start_nfsd "$NFS_SERVERS"
 	start_mountd
 	test -r /etc/exports && exportfs -a;;
 stop)	exportfs -ua
diff --git a/packages/nfs-utils/nfs-utils_1.0.6.bb b/packages/nfs-utils/nfs-utils_1.0.6.bb
index 068fb315ad..f72b7226f4 100644
--- a/packages/nfs-utils/nfs-utils_1.0.6.bb
+++ b/packages/nfs-utils/nfs-utils_1.0.6.bb
@@ -3,20 +3,31 @@ PRIORITY = "optional"
 SECTION = "console/networking"
 MAINTAINER = "dyoung <dyoung@thestuffguy.com>"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \
 	file://acinclude-lossage.patch;patch=1 \
 	file://rpcgen-lossage.patch;patch=1 \
 	file://stat-include.patch;patch=1 \
+	file://nfsserver \
 	file://forgotten-defines"
 S = ${WORKDIR}/nfs-utils-${PV}/
 
+# Only kernel-module-nfsd is required here - the nfsd module will
+# pull in the remainder of the dependencies.
+RDEPENDS = "portmap kernel-module-nfsd"
+
+INITSCRIPT_NAME = "nfsserver"
+# The server has no dependencies at the user run levels, so just put
+# it in at the default levels.  It must be terminated before the network
+# in the shutdown levels, but that works fine.
+INITSCRIPT_PARAMS = "defaults"
+
 inherit autotools
 
 EXTRA_OECONF = "--with-statduser=nobody \
 		--enable-nfsv3 \
-		--with-statedir=${localstatedir}/lib/nfs"
+		--with-statedir=/var/lib/nfs"
 
 do_compile() {
 	# UGLY HACK ALERT
@@ -25,21 +36,8 @@ do_compile() {
 }
 
 do_install() {
-	mkdir -p ${D}${localstatedir}/lib/nfs
-	touch ${D}${localstatedir}/lib/nfs/xtab; chmod 644 ${D}${localstatedir}/lib/nfs/xtab
-	touch ${D}${localstatedir}/lib/nfs/etab; chmod 644 ${D}${localstatedir}/lib/nfs/etab
-	touch ${D}${localstatedir}/lib/nfs/smtab; chmod 644 ${D}${localstatedir}/lib/nfs/smtab
-	touch ${D}${localstatedir}/lib/nfs/rmtab; chmod 644 ${D}${localstatedir}/lib/nfs/rmtab
-
-	mkdir -p ${D}${localstatedir}/lib/nfs/sm
-	mkdir -p ${D}${localstatedir}/lib/nfs/sm.bak
-
-	touch ${D}${localstatedir}/lib/nfs/state
-
-	chmod go-rwx ${D}${localstatedir}/lib/nfs/sm
-	chmod go-rwx ${D}${localstatedir}/lib/nfs/sm.bak
-	chmod go-rwx ${D}${localstatedir}/lib/nfs/state
-	# they should be owned by statduser, how to do that..
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver
 
 	install -d ${D}${sbindir}
 	install -m 0755 ${S}/utils/exportfs/exportfs ${D}${sbindir}/exportfs
@@ -69,4 +67,3 @@ do_install() {
 	install -m 0644 ${S}/utils/showmount/showmount.man ${D}${mandir}/man8/showmount.8
 	install -m 0644 ${S}/utils/statd/statd.man ${D}${mandir}/man8/statd.8
 }
-
-- 
cgit v1.2.3


From 8df9d33f3227b2fa3715f8ac7513cfa16ab6b01b Mon Sep 17 00:00:00 2001
From: ccsmart <ccsmart@smartpal.de>
Date: Sun, 10 Jul 2005 16:58:16 +0000
Subject: Upped rev to r3.

---
 packages/ntp/ntp_4.2.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ntp/ntp_4.2.0.bb b/packages/ntp/ntp_4.2.0.bb
index aece4dd8e1..ee1794de44 100644
--- a/packages/ntp/ntp_4.2.0.bb
+++ b/packages/ntp/ntp_4.2.0.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://ntp.isc.org/bin/view/Main/WebHome"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "ntp"
-PR = "r2"
+PR = "r3"
 # OE core: this is here to prevent this version of ntp from
 # changing OE distros other than openslug.  This code has
 # only been tested on openslug.  Feel free to remove these lines!
-- 
cgit v1.2.3


From 5be93d487cfacfd05b813000c35fd58a3a467df3 Mon Sep 17 00:00:00 2001
From: ccsmart <ccsmart@smartpal.de>
Date: Sun, 10 Jul 2005 17:02:47 +0000
Subject: Upped rev. to r34.

---
 packages/openslug-init/openslug-init_0.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/openslug-init/openslug-init_0.10.bb b/packages/openslug-init/openslug-init_0.10.bb
index c9af6e2a46..b5801e252c 100644
--- a/packages/openslug-init/openslug-init_0.10.bb
+++ b/packages/openslug-init/openslug-init_0.10.bb
@@ -3,7 +3,7 @@ SECTION = "console/network"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r33"
+PR = "r34"
 
 SRC_URI = "file://linuxrc \
 	   file://boot/flash \
-- 
cgit v1.2.3


From e0527481dc88b70316d4b53074b587117720f13b Mon Sep 17 00:00:00 2001
From: ccsmart <ccsmart@smartpal.de>
Date: Sun, 10 Jul 2005 17:30:42 +0000
Subject: Upped rev. to r1.

---
 packages/cyrus-sasl/cyrus-sasl_2.1.19.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
index 7e29f8082b..ca34acbfc7 100644
--- a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
+++ b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
@@ -2,6 +2,7 @@ SECTION = "console/network"
 DEPENDS = "db3"
 DESCRIPTION = "Generic client/server library for SASL authentication."
 LICENSE = "BSD"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${PV}.tar.gz"
 
-- 
cgit v1.2.3


From 0ea069f0f1bdb77120be119b9c494e943aacd010 Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 10 Jul 2005 18:48:02 +0000
Subject: Cosmetic change to OPENSLUG_PACKAGES. Makes it easier to read

---
 packages/meta/openslug-packages.bb | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index fe766bca8e..69c7267f87 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -43,21 +43,29 @@ OPENSLUG_DEVELOPMENT_append_linux = "\
 
 OPENSLUG_PACKAGES = "\
 	bash \
-	bluez-utils-nodbus bridge-utils \
-	coreutils cron \
+	bluez-utils-nodbus \
+	bridge-utils \
+	coreutils \
+	cron \
 	cvs\
 	dnsmasq \
 	expat \
 	ftpd-topfield \
 	gphoto2 \
 	less libusb \
-	miau microcom mt-daapd mysql \
+	miau \ 
+	microcom \
+	mt-daapd \
+	mysql \
 	nail \
 	openssh \
 	openvpn \
-	ppp puppy pwc \
+	ppp \
+	puppy \
+	pwc \
 	rsync \
-	sudo sysfsutils \
+	sudo \
+	sysfsutils \
 	thttpd \
 	db4 \
 	openldap \
-- 
cgit v1.2.3


From 75b18bf35cc1f32fac7d7543008d09c87b23c190 Mon Sep 17 00:00:00 2001
From: John Bowler <jbowler@nslu2-linux.org>
Date: Sun, 10 Jul 2005 19:09:28 +0000
Subject: Build reliably against db 4.3 Fix the install so that the strip works

---
 packages/cyrus-imapd/cyrus-imapd-2.2.12/install-sh | 323 +++++++++++++++++++++
 packages/cyrus-imapd/cyrus-imapd_2.2.12.bb         |  28 +-
 2 files changed, 338 insertions(+), 13 deletions(-)
 create mode 100644 packages/cyrus-imapd/cyrus-imapd-2.2.12/install-sh

diff --git a/packages/cyrus-imapd/cyrus-imapd-2.2.12/install-sh b/packages/cyrus-imapd/cyrus-imapd-2.2.12/install-sh
new file mode 100644
index 0000000000..0b65ee871d
--- /dev/null
+++ b/packages/cyrus-imapd/cyrus-imapd-2.2.12/install-sh
@@ -0,0 +1,323 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2004-10-22.00
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+chmodcmd="$chmodprog 0755"
+chowncmd=
+chgrpcmd=
+stripcmd=
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=
+dst=
+dir_arg=
+dstarg=
+no_target_directory=
+
+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+-c         (ignored)
+-d         create directories instead of installing files.
+-g GROUP   $chgrpprog installed files to GROUP.
+-m MODE    $chmodprog installed files to MODE.
+-o USER    $chownprog installed files to USER.
+-s         $stripprog installed files.
+-t DIRECTORY  install into DIRECTORY.
+-T         report an error if DSTFILE is a directory.
+--help     display this help and exit.
+--version  display version info and exit.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+"
+
+while test -n "$1"; do
+  case $1 in
+    -c) shift
+        continue;;
+
+    -d) dir_arg=true
+        shift
+        continue;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+        shift
+        shift
+        continue;;
+
+    --help) echo "$usage"; exit 0;;
+
+    -m) chmodcmd="$chmodprog $2"
+        shift
+        shift
+        continue;;
+
+    -o) chowncmd="$chownprog $2"
+        shift
+        shift
+        continue;;
+
+    -s) stripcmd=$stripprog
+        shift
+        continue;;
+
+    -t) dstarg=$2
+	shift
+	shift
+	continue;;
+
+    -T) no_target_directory=true
+	shift
+	continue;;
+
+    --version) echo "$0 $scriptversion"; exit 0;;
+
+    *)  # When -d is used, all remaining arguments are directories to create.
+	# When -t is used, the destination is already specified.
+	test -n "$dir_arg$dstarg" && break
+        # Otherwise, the last argument is the destination.  Remove it from $@.
+	for arg
+	do
+          if test -n "$dstarg"; then
+	    # $@ is not empty: it contains at least $arg.
+	    set fnord "$@" "$dstarg"
+	    shift # fnord
+	  fi
+	  shift # arg
+	  dstarg=$arg
+	done
+	break;;
+  esac
+done
+
+if test -z "$1"; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call `install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+for src
+do
+  # Protect names starting with `-'.
+  case $src in
+    -*) src=./$src ;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    src=
+
+    if test -d "$dst"; then
+      mkdircmd=:
+      chmodcmd=
+    else
+      mkdircmd=$mkdirprog
+    fi
+  else
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dstarg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+
+    dst=$dstarg
+    # Protect names starting with `-'.
+    case $dst in
+      -*) dst=./$dst ;;
+    esac
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dstarg: Is a directory" >&2
+	exit 1
+      fi
+      dst=$dst/`basename "$src"`
+    fi
+  fi
+
+  # This sed command emulates the dirname command.
+  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+
+  # Make sure that the destination directory exists.
+
+  # Skip lots of stat calls in the usual case.
+  if test ! -d "$dstdir"; then
+    defaultIFS='
+	 '
+    IFS="${IFS-$defaultIFS}"
+
+    oIFS=$IFS
+    # Some sh's can't handle IFS=/ for some reason.
+    IFS='%'
+    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    shift
+    IFS=$oIFS
+
+    pathcomp=
+
+    while test $# -ne 0 ; do
+      pathcomp=$pathcomp$1
+      shift
+      if test ! -d "$pathcomp"; then
+        $mkdirprog "$pathcomp"
+	# mkdir can fail with a `File exist' error in case several
+	# install-sh are creating the directory concurrently.  This
+	# is OK.
+	test -d "$pathcomp" || exit
+      fi
+      pathcomp=$pathcomp/
+    done
+  fi
+
+  if test -n "$dir_arg"; then
+    $doit $mkdircmd "$dst" \
+      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+
+  else
+    dstfile=`basename "$dst"`
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+    trap '(exit $?); exit' 1 2 13 15
+
+    # Copy the file name to the temp name.
+    $doit $cpprog "$src" "$dsttmp" &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+
+    # Now rename the file to the real destination.
+    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+      || {
+	   # The rename failed, perhaps because mv can't rename something else
+	   # to itself, or perhaps because mv is so ancient that it does not
+	   # support -f.
+
+	   # Now remove or move aside any old file at destination location.
+	   # We try this two ways since rm can't unlink itself on some
+	   # systems and the destination file might be busy for other
+	   # reasons.  In this case, the final cleanup might fail but the new
+	   # file should still install successfully.
+	   {
+	     if test -f "$dstdir/$dstfile"; then
+	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+	       || {
+		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		 (exit 1); exit
+	       }
+	     else
+	       :
+	     fi
+	   } &&
+
+	   # Now rename the file to the real destination.
+	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+	 }
+    }
+  fi || { (exit 1); exit; }
+done
+
+# The final little trick to "correctly" pass the exit status to the exit trap.
+{
+  (exit 0); exit
+}
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
index b1e6b8a257..468561d40d 100644
--- a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
+++ b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
@@ -1,9 +1,10 @@
 SECTION = "console/network"
-DEPENDS = "cyrus-sasl db3"
-PR = "r0"
+DEPENDS = "cyrus-sasl db"
 LICENSE = "BSD"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz \
+	   file://install-sh \
            file://autotools.patch;patch=1 \
            file://tail.patch;patch=1"
 
@@ -15,15 +16,16 @@ EXTRA_OECONF = "--with-auth=unix \
 
 FILES_${PN} += "${prefix}/cyrus/bin"
 
-BUILD_CFLAGS += " -I${S} -I${S}/et"
-#do_compile_prepend () {
-#	cd lib
-#	ccache arm-linux-gcc -L/home/kergoth/code/build-arm/tmp/staging/arm-linux/lib -Wl,-rpath-link,/home/kergoth/code/build-arm/tmp/staging/arm-linux/lib -o mkchartable mkchartable.o xmalloc.o assert.o
-#	${BUILD_CC} ${BUILD_CFLAGS} mkchartable.c -c -o mkchartable.o
-#	${BUILD_CC} ${BUILD_CFLAGS} xmalloc.c -c -o xmalloc.o
-#	${BUILD_CC} ${BUILD_CFLAGS} assert.c -c -o assert.o
-#	${BUILD_CC} ${BUILD_LDFLAGS} -o mkchartable mkchartable.o xmalloc.o assert.o
-#	rm -f xmalloc.o assert.o mkchartable.o
-#	cd ..
-#}
+# Target only, the db4 headers are in include/db4, so *prepend* this
+# directory to the search path
+TARGET_CPPFLAGS =+ "-I${STAGING_DIR}/${TARGET_SYS}/include/db4"
 
+# All, lib/foo.c includes <config.h> from the top level directory and
+# is natively compiled
+BUILD_CPPFLAGS += " -I${S} -I${S}/et"
+
+do_install () {
+	# This will make the -s option work somewhat portably cross
+	# platform
+	STRIPPROG="$STRIP" oe_runmake 'DESTDIR=${D}' INSTALL='sh ${WORKDIR}/install-sh' install
+}
-- 
cgit v1.2.3


From 373ad7a4bf7ee75d374ec0db146e7c93fbabd3ae Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 10 Jul 2005 21:49:29 +0000
Subject: Added ISC BIND (DaKa2)

---
 packages/bind/.mtn2git_empty                       |   0
 packages/bind/bind-9.3.1/.mtn2git_empty            |   0
 packages/bind/bind-9.3.1/conf.patch                | 301 +++++++++++++++++++++
 packages/bind/bind-9.3.1/configure.in.patch        |  14 +
 packages/bind/bind-9.3.1/lib_dns_Makefile.in.patch |  11 +
 packages/bind/bind_9.3.1.bb                        |  28 ++
 packages/meta/openslug-packages.bb                 |   1 +
 7 files changed, 355 insertions(+)
 create mode 100644 packages/bind/.mtn2git_empty
 create mode 100644 packages/bind/bind-9.3.1/.mtn2git_empty
 create mode 100644 packages/bind/bind-9.3.1/conf.patch
 create mode 100644 packages/bind/bind-9.3.1/configure.in.patch
 create mode 100644 packages/bind/bind-9.3.1/lib_dns_Makefile.in.patch
 create mode 100644 packages/bind/bind_9.3.1.bb

diff --git a/packages/bind/.mtn2git_empty b/packages/bind/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/bind/bind-9.3.1/.mtn2git_empty b/packages/bind/bind-9.3.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/bind/bind-9.3.1/conf.patch b/packages/bind/bind-9.3.1/conf.patch
new file mode 100644
index 0000000000..202c5319e1
--- /dev/null
+++ b/packages/bind/bind-9.3.1/conf.patch
@@ -0,0 +1,301 @@
+diff -urN bind-9.3.1.orig/conf/db.0 bind-9.3.1/conf/db.0
+--- bind-9.3.1.orig/conf/db.0	1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.0	2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,12 @@
++;
++; BIND reverse data file for broadcast zone
++;
++$TTL	604800
++@	IN	SOA	localhost. root.localhost. (
++			      1		; Serial
++			 604800		; Refresh
++			  86400		; Retry
++			2419200		; Expire
++			 604800 )	; Negative Cache TTL
++;
++@	IN	NS	localhost.
+diff -urN bind-9.3.1.orig/conf/db.127 bind-9.3.1/conf/db.127
+--- bind-9.3.1.orig/conf/db.127	1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.127	2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,13 @@
++;
++; BIND reverse data file for local loopback interface
++;
++$TTL	604800
++@	IN	SOA	localhost. root.localhost. (
++			      1		; Serial
++			 604800		; Refresh
++			  86400		; Retry
++			2419200		; Expire
++			 604800 )	; Negative Cache TTL
++;
++@	IN	NS	localhost.
++1.0.0	IN	PTR	localhost.
+diff -urN bind-9.3.1.orig/conf/db.empty bind-9.3.1/conf/db.empty
+--- bind-9.3.1.orig/conf/db.empty	1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.empty	2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,14 @@
++; BIND reverse data file for empty rfc1918 zone
++;
++; DO NOT EDIT THIS FILE - it is used for multiple zones.
++; Instead, copy it, edit named.conf, and use that copy.
++;
++$TTL	86400
++@	IN	SOA	localhost. root.localhost. (
++			      1		; Serial
++			 604800		; Refresh
++			  86400		; Retry
++			2419200		; Expire
++			  86400 )	; Negative Cache TTL
++;
++@	IN	NS	localhost.
+diff -urN bind-9.3.1.orig/conf/db.local bind-9.3.1/conf/db.local
+--- bind-9.3.1.orig/conf/db.local	1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.local	2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,13 @@
++;
++; BIND data file for local loopback interface
++;
++$TTL	604800
++@	IN	SOA	localhost. root.localhost. (
++			      1		; Serial
++			 604800		; Refresh
++			  86400		; Retry
++			2419200		; Expire
++			 604800 )	; Negative Cache TTL
++;
++@	IN	NS	localhost.
++@	IN	A	127.0.0.1
+diff -urN bind-9.3.1.orig/conf/db.root bind-9.3.1/conf/db.root
+--- bind-9.3.1.orig/conf/db.root	1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.root	2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,45 @@
++
++; <<>> DiG 9.2.3 <<>> ns . @a.root-servers.net.
++;; global options:  printcmd
++;; Got answer:
++;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 18944
++;; flags: qr aa rd; QUERY: 1, ANSWER: 13, AUTHORITY: 0, ADDITIONAL: 13
++
++;; QUESTION SECTION:
++;.				IN	NS
++
++;; ANSWER SECTION:
++.			518400	IN	NS	A.ROOT-SERVERS.NET.
++.			518400	IN	NS	B.ROOT-SERVERS.NET.
++.			518400	IN	NS	C.ROOT-SERVERS.NET.
++.			518400	IN	NS	D.ROOT-SERVERS.NET.
++.			518400	IN	NS	E.ROOT-SERVERS.NET.
++.			518400	IN	NS	F.ROOT-SERVERS.NET.
++.			518400	IN	NS	G.ROOT-SERVERS.NET.
++.			518400	IN	NS	H.ROOT-SERVERS.NET.
++.			518400	IN	NS	I.ROOT-SERVERS.NET.
++.			518400	IN	NS	J.ROOT-SERVERS.NET.
++.			518400	IN	NS	K.ROOT-SERVERS.NET.
++.			518400	IN	NS	L.ROOT-SERVERS.NET.
++.			518400	IN	NS	M.ROOT-SERVERS.NET.
++
++;; ADDITIONAL SECTION:
++A.ROOT-SERVERS.NET.	3600000	IN	A	198.41.0.4
++B.ROOT-SERVERS.NET.	3600000	IN	A	192.228.79.201
++C.ROOT-SERVERS.NET.	3600000	IN	A	192.33.4.12
++D.ROOT-SERVERS.NET.	3600000	IN	A	128.8.10.90
++E.ROOT-SERVERS.NET.	3600000	IN	A	192.203.230.10
++F.ROOT-SERVERS.NET.	3600000	IN	A	192.5.5.241
++G.ROOT-SERVERS.NET.	3600000	IN	A	192.112.36.4
++H.ROOT-SERVERS.NET.	3600000	IN	A	128.63.2.53
++I.ROOT-SERVERS.NET.	3600000	IN	A	192.36.148.17
++J.ROOT-SERVERS.NET.	3600000	IN	A	192.58.128.30
++K.ROOT-SERVERS.NET.	3600000	IN	A	193.0.14.129
++L.ROOT-SERVERS.NET.	3600000	IN	A	198.32.64.12
++M.ROOT-SERVERS.NET.	3600000	IN	A	202.12.27.33
++
++;; Query time: 81 msec
++;; SERVER: 198.41.0.4#53(a.root-servers.net.)
++;; WHEN: Sun Feb  1 11:27:14 2004
++;; MSG SIZE  rcvd: 436
++
+diff -urN bind-9.3.1.orig/conf/named.conf bind-9.3.1/conf/named.conf
+--- bind-9.3.1.orig/conf/named.conf	1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/named.conf	2005-07-10 22:33:46.000000000 +0200
+@@ -0,0 +1,49 @@
++// This is the primary configuration file for the BIND DNS server named.
++//
++// If you are just adding zones, please do that in /etc/bind/named.conf.local
++
++include "/etc/bind/named.conf.options";
++
++// prime the server with knowledge of the root servers
++zone "." {
++	type hint;
++	file "/etc/bind/db.root";
++};
++
++// be authoritative for the localhost forward and reverse zones, and for
++// broadcast zones as per RFC 1912
++
++zone "localhost" {
++	type master;
++	file "/etc/bind/db.local";
++};
++
++zone "127.in-addr.arpa" {
++	type master;
++	file "/etc/bind/db.127";
++};
++
++zone "0.in-addr.arpa" {
++	type master;
++	file "/etc/bind/db.0";
++};
++
++zone "255.in-addr.arpa" {
++	type master;
++	file "/etc/bind/db.255";
++};
++
++// zone "com" { type delegation-only; };
++// zone "net" { type delegation-only; };
++
++// From the release notes:
++//  Because many of our users are uncomfortable receiving undelegated answers
++//  from root or top level domains, other than a few for whom that behaviour
++//  has been trusted and expected for quite some length of time, we have now
++//  introduced the "root-delegations-only" feature which applies delegation-only
++//  logic to all top level domains, and to the root domain.  An exception list
++//  should be specified, including "MUSEUM" and "DE", and any other top level
++//  domains from whom undelegated responses are expected and trusted.
++// root-delegation-only exclude { "DE"; "MUSEUM"; };
++
++include "/etc/bind/named.conf.local";
+diff -urN bind-9.3.1.orig/conf/named.conf.local bind-9.3.1/conf/named.conf.local
+--- bind-9.3.1.orig/conf/named.conf.local	1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/named.conf.local	2005-07-10 22:14:06.000000000 +0200
+@@ -0,0 +1,8 @@
++//
++// Do any local configuration here
++//
++
++// Consider adding the 1918 zones here, if they are not used in your
++// organization
++//include "/etc/bind/zones.rfc1918";
++
+diff -urN bind-9.3.1.orig/conf/named.conf.options bind-9.3.1/conf/named.conf.options
+--- bind-9.3.1.orig/conf/named.conf.options	1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/named.conf.options	2005-07-10 22:14:06.000000000 +0200
+@@ -0,0 +1,24 @@
++options {
++	directory "/var/cache/bind";
++
++	// If there is a firewall between you and nameservers you want
++	// to talk to, you might need to uncomment the query-source
++	// directive below.  Previous versions of BIND always asked
++	// questions using port 53, but BIND 8.1 and later use an unprivileged
++	// port by default.
++
++	// query-source address * port 53;
++
++	// If your ISP provided one or more IP addresses for stable 
++	// nameservers, you probably want to use them as forwarders.  
++	// Uncomment the following block, and insert the addresses replacing 
++	// the all-0's placeholder.
++
++	// forwarders {
++	// 	0.0.0.0;
++	// };
++
++	auth-nxdomain no;    # conform to RFC1035
++
++};
++
+diff -urN bind-9.3.1.orig/conf/zones.rfc1918 bind-9.3.1/conf/zones.rfc1918
+--- bind-9.3.1.orig/conf/zones.rfc1918	1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/zones.rfc1918	2005-07-10 22:14:10.000000000 +0200
+@@ -0,0 +1,20 @@
++zone "10.in-addr.arpa"      { type master; file "/etc/bind/db.empty"; };
++ 
++zone "16.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "17.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "18.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "19.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "20.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "21.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "22.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "23.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "24.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "25.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "26.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "27.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "28.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "29.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "30.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++zone "31.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
++
++zone "168.192.in-addr.arpa" { type master; file "/etc/bind/db.empty"; };
+diff -urN bind-9.3.1.orig/init.d bind-9.3.1/init.d
+--- bind-9.3.1.orig/init.d	1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/init.d	2005-07-10 23:09:58.000000000 +0200
+@@ -0,0 +1,63 @@
++#!/bin/sh
++
++PATH=/sbin:/bin:/usr/sbin:/usr/bin
++
++# for a chrooted server: "-u bind -t /var/lib/named"
++# Don't modify this line, change or create /etc/default/bind9.
++OPTIONS=""
++
++test -f /etc/default/bind9 && . /etc/default/bind9
++
++test -x /usr/sbin/rndc || exit 0
++
++case "$1" in
++    start)
++	echo -n "Starting domain name service: named"
++
++	modprobe capability >/dev/null 2>&1 || true
++
++	# dirs under /var/run can go away on reboots.
++	mkdir -p /var/run/bind/run
++	mkdir -p /var/cache/bind
++	chmod 775 /var/run/bind/run
++	chown root:bind /var/run/bind/run >/dev/null 2>&1 || true
++
++	if [ ! -x /usr/sbin/named ]; then
++	    echo "named binary missing - not starting"
++	    exit 1
++	fi
++	if start-stop-daemon --start --quiet --exec /usr/sbin/named \
++		--pidfile /var/run/bind/run/named.pid -- $OPTIONS; then
++	    if [ -x /sbin/resolvconf ] ; then
++		echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo
++	    fi
++	fi
++	echo "."	
++    ;;
++
++    stop)
++	echo -n "Stopping domain name service: named"
++	if [ -x /sbin/resolvconf ]; then
++	    /sbin/resolvconf -d lo
++	fi
++	/usr/sbin/rndc stop
++	echo "."	
++    ;;
++
++    reload)
++	/usr/sbin/rndc reload
++    ;;
++
++    restart|force-reload)
++	$0 stop
++	sleep 2
++	$0 start
++    ;;
++    
++    *)
++	echo "Usage: /etc/init.d/bind {start|stop|reload|restart|force-reload}" >&2
++	exit 1
++    ;;
++esac
++
++exit 0
diff --git a/packages/bind/bind-9.3.1/configure.in.patch b/packages/bind/bind-9.3.1/configure.in.patch
new file mode 100644
index 0000000000..78ae9271c6
--- /dev/null
+++ b/packages/bind/bind-9.3.1/configure.in.patch
@@ -0,0 +1,14 @@
+--- bind-9.3.1/configure.in.orig	2005-07-10 21:21:18.000000000 +0200
++++ bind-9.3.1/configure.in	2005-07-10 21:24:31.000000000 +0200
+@@ -1414,7 +1414,10 @@
+         [AC_MSG_RESULT(no)
+         ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS inet_ntop.$O"
+         ISC_EXTRA_SRCS="$ISC_EXTRA_SRCS inet_ntop.c"
+-        ISC_PLATFORM_NEEDNTOP="#define ISC_PLATFORM_NEEDNTOP 1"])
++        ISC_PLATFORM_NEEDNTOP="#define ISC_PLATFORM_NEEDNTOP 1"],
++
++	[AC_MSG_RESULT(assuming target platform has working inet_ntop)
++	ISC_PLATFORM_NEEDNTOP="#undef ISC_PLATFORM_NEEDNTOP"])
+ 
+ 
+ # On NetBSD 1.4.2 and maybe others, inet_pton() incorrectly accepts
diff --git a/packages/bind/bind-9.3.1/lib_dns_Makefile.in.patch b/packages/bind/bind-9.3.1/lib_dns_Makefile.in.patch
new file mode 100644
index 0000000000..e8b6ba59b5
--- /dev/null
+++ b/packages/bind/bind-9.3.1/lib_dns_Makefile.in.patch
@@ -0,0 +1,11 @@
+--- bind-9.3.1/lib/dns/Makefile.in.orig	2005-07-10 21:30:16.000000000 +0200
++++ bind-9.3.1/lib/dns/Makefile.in	2005-07-10 21:31:00.000000000 +0200
+@@ -156,7 +156,7 @@
+ 	./gen -s ${srcdir} > code.h
+ 
+ gen: gen.c
+-	${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
++	cc ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
+ 
+ rbtdb64.@O@: rbtdb.c
+ 
diff --git a/packages/bind/bind_9.3.1.bb b/packages/bind/bind_9.3.1.bb
new file mode 100644
index 0000000000..c2783381e9
--- /dev/null
+++ b/packages/bind/bind_9.3.1.bb
@@ -0,0 +1,28 @@
+DEPENDS = ""
+RPEDENDS = ""
+DESCRIPTION = "ISC Internet Domain Name Server"
+MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
+PR = "r1"
+
+SRC_URI = "ftp://ftp.isc.org/isc/bind9/9.3.1/bind-9.3.1.tar.gz \
+           file://lib_dns_Makefile.in.patch;patch=1 \
+	   file://configure.in.patch;patch=1 \
+	   file://conf.patch;patch=1 \
+	   "
+
+EXTRA_OECONF = " --enable-ipv6=no --with-randomdev=/dev/random --disable-threads --sysconfdir=/etc/bind --localstatedir=/var --prefix=/usr"
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "bind"
+INITSCRIPT_PARAMS = "defaults"
+
+
+do_install_append() {
+	rm "${D}/usr/bin/nslookup"
+	install -d "${D}/etc/bind"
+	install -d "${D}/etc/init.d"
+	install -m 644 ${S}/conf/* "${D}/etc/bind"
+	install -m 755 "${S}/init.d" "${D}/etc/init.d/bind"
+}
+
+CONFFILES_${PN} = "${sysconfdir}/bind/named.conf ${sysconfdir}/bind/named.conf.local ${sysconfdir}/bind/named.conf.options ${sysconfdir}/bind/db.0 ${sysconfdir}/bind/db.127 ${sysconfdir}/bind/db.empty ${sysconfdir}/bind/db.local ${sysconfdir}/bind/db.root"
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index 69c7267f87..ca9cc8e58f 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -43,6 +43,7 @@ OPENSLUG_DEVELOPMENT_append_linux = "\
 
 OPENSLUG_PACKAGES = "\
 	bash \
+	bind \
 	bluez-utils-nodbus \
 	bridge-utils \
 	coreutils \
-- 
cgit v1.2.3


From 3573493362867d757c95f7ffdbe2635af855f9a1 Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 10 Jul 2005 21:56:47 +0000
Subject: Set bind MAINTAINER to nslu2-linux

---
 packages/bind/bind_9.3.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/bind/bind_9.3.1.bb b/packages/bind/bind_9.3.1.bb
index c2783381e9..b4142242ee 100644
--- a/packages/bind/bind_9.3.1.bb
+++ b/packages/bind/bind_9.3.1.bb
@@ -1,7 +1,7 @@
 DEPENDS = ""
 RPEDENDS = ""
 DESCRIPTION = "ISC Internet Domain Name Server"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
+MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.isc.org/isc/bind9/9.3.1/bind-9.3.1.tar.gz \
-- 
cgit v1.2.3


From c7a4df48a2685da437396665873e9088cc37b729 Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 10 Jul 2005 22:10:03 +0000
Subject: Back out ntpd/mysql users. Add them in the .bb instead

---
 packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch | 7 -------
 packages/base-passwd/base-passwd-3.5.9/root-home.patch          | 7 -------
 2 files changed, 14 deletions(-)

diff --git a/packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch b/packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch
index 346f144193..e91dead23f 100644
--- a/packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch
+++ b/packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch
@@ -6,10 +6,3 @@
  daemon:*:1:1:daemon:/usr/sbin:/bin/sh
  bin:*:2:2:bin:/bin:/bin/sh
  sys:*:3:3:sys:/dev:/bin/sh
-@@ -15,4 +15,6 @@
- list:*:38:38:Mailing List Manager:/var/list:/bin/sh
- irc:*:39:39:ircd:/var/run/ircd:/bin/sh
- gnats:*:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-+ntpd:*:47:65534:OpenNTPd daemon:/var/shared/empty:/dev/null
-+mysql:*:64001:64001:MySQL daemon:/var/mysql:/dev/null
- nobody:*:65534:65534:nobody:/nonexistent:/bin/sh
diff --git a/packages/base-passwd/base-passwd-3.5.9/root-home.patch b/packages/base-passwd/base-passwd-3.5.9/root-home.patch
index dd439efb18..85d96b6185 100644
--- a/packages/base-passwd/base-passwd-3.5.9/root-home.patch
+++ b/packages/base-passwd/base-passwd-3.5.9/root-home.patch
@@ -6,10 +6,3 @@
  daemon:*:1:1:daemon:/usr/sbin:/bin/sh
  bin:*:2:2:bin:/bin:/bin/sh
  sys:*:3:3:sys:/dev:/bin/sh
-@@ -15,4 +15,6 @@
- list:*:38:38:Mailing List Manager:/var/list:/bin/sh
- irc:*:39:39:ircd:/var/run/ircd:/bin/sh
- gnats:*:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-+ntpd:*:47:65534:OpenNTPd daemon:/var/shared/empty:/dev/null
-+mysql:*:64001:64001:MySQL daemon:/var/mysql:/dev/null
- nobody:*:65534:65534:nobody:/nonexistent:/bin/sh
-- 
cgit v1.2.3


From 083848853788fa15c89cf3de01775edd76f7037d Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 10 Jul 2005 23:27:06 +0000
Subject: Make MySQL & openntpd create users on install

---
 packages/mysql/mysql_4.1.12.bb      | 10 +++++++++-
 packages/openntpd/openntpd_3.7p1.bb | 11 ++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/packages/mysql/mysql_4.1.12.bb b/packages/mysql/mysql_4.1.12.bb
index 9805936670..13c2cd3a3e 100644
--- a/packages/mysql/mysql_4.1.12.bb
+++ b/packages/mysql/mysql_4.1.12.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The MySQL Open Source Database System"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 SECTION = "libs"
 DEPENDS += "ncurses mysql-native"
-PR = "r2"
+PR = "r3"
 LICENSE = "GPL"
 SRC_URI = "http://mirrors.develooper.com/mysql/Downloads/MySQL-4.1/mysql-${PV}.tar.gz \
            file://autofoo.patch;patch=1 \
@@ -29,6 +29,14 @@ do_install() {
 	rmdir ${D}${libdir}/mysql
 }
 
+pkg_postinst () {
+	grep mysql /etc/passwd || adduser --disabled-password --home=/var/mysql --ingroup nogroup mysql
+}
+
+pkg_postrm () {
+	grep mysql /etc/passwd && deluser mysql
+}
+
 PACKAGES =+ "libmysqlclient libmysqlclient-dev"
 
 FILES_libmysqlclient = "${libdir}/libmysqlclient*.so.*"
diff --git a/packages/openntpd/openntpd_3.7p1.bb b/packages/openntpd/openntpd_3.7p1.bb
index 37173e58c7..0c2091160f 100644
--- a/packages/openntpd/openntpd_3.7p1.bb
+++ b/packages/openntpd/openntpd_3.7p1.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.openntpd.org/"
 LICENSE = "BSD"
 SECTION = "console/network"
 MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
-PR="r1"
+PR="r2"
 
 SRC_URI = "http://www.zip.com.au/~dtucker/openntpd/release/openntpd-${PV}.tar.gz \
 	   file://autofoo.patch;patch=1 \
@@ -28,3 +28,12 @@ do_install_append() {
 	install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/openntpd
 	install -d ${D}${localstatedir}/shared/empty
 }
+
+pkg_postrm () {
+	grep ntpd /etc/passwd && deluser ntpd 
+}
+
+pkg_postinst () {
+	grep ntpd /etc/passwd || adduser --disabled-password --home=/var/shared/empty --ingroup nogroup ntpd
+}
+	
-- 
cgit v1.2.3


From 33d6e8198c9e7ad812097a766c54ee18cb1396a5 Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 10 Jul 2005 23:31:52 +0000
Subject: added glib-2.0, gtk-doc, libxml, pcre

---
 packages/meta/openslug-packages.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index ca9cc8e58f..c5d506859d 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -53,6 +53,9 @@ OPENSLUG_PACKAGES = "\
 	expat \
 	ftpd-topfield \
 	gphoto2 \
+	glib-2.0 \
+	gtk-doc \
+	libxml \ 
 	less libusb \
 	miau \ 
 	microcom \
@@ -61,6 +64,7 @@ OPENSLUG_PACKAGES = "\
 	nail \
 	openssh \
 	openvpn \
+	pcre \
 	ppp \
 	puppy \
 	pwc \
-- 
cgit v1.2.3


From 3398fb6a9ef9eeab706ed49978d73cf0cc341c1f Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Mon, 11 Jul 2005 00:28:27 +0000
Subject: Added vlan-package (DaKa2)

---
 packages/vlan/.mtn2git_empty |  0
 packages/vlan/vlan_1.8.bb    | 17 +++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 packages/vlan/.mtn2git_empty
 create mode 100644 packages/vlan/vlan_1.8.bb

diff --git a/packages/vlan/.mtn2git_empty b/packages/vlan/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/vlan/vlan_1.8.bb b/packages/vlan/vlan_1.8.bb
new file mode 100644
index 0000000000..01ae798240
--- /dev/null
+++ b/packages/vlan/vlan_1.8.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "802.1q vlan support program"
+RRECOMMENDS = "kernel-module-8021q"
+MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
+PR = "r1"
+
+S = "${WORKDIR}/vlan/"
+
+SRC_URI = "http://scry.wanfear.com/~greear/vlan/vlan.1.8.tar.gz \
+	   "
+
+inherit base
+
+do_install() {
+	install -d "${D}/usr/sbin"
+	install -m 755 "${S}/vconfig" "${D}/usr/sbin/vconfig"
+}
+
-- 
cgit v1.2.3


From f44a40979b47674ea361e8c50e9ff99ca67dee30 Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Mon, 11 Jul 2005 00:28:55 +0000
Subject: Added vlan-package to openslug-packages

---
 packages/meta/openslug-packages.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index c5d506859d..eef8cb0174 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -52,11 +52,11 @@ OPENSLUG_PACKAGES = "\
 	dnsmasq \
 	expat \
 	ftpd-topfield \
-	gphoto2 \
 	glib-2.0 \
+	gphoto2 \
 	gtk-doc \
-	libxml \ 
 	less libusb \
+	libxml \
 	miau \ 
 	microcom \
 	mt-daapd \
@@ -80,6 +80,7 @@ OPENSLUG_PACKAGES = "\
 	python \
 	samba \
 	sane-backends \
+	vlan \
 	wget \
 	unionfs-modules unionfs-utils \
 	"
-- 
cgit v1.2.3


From b7aa35672939e624e495445d98b5165e01728174 Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Mon, 11 Jul 2005 00:29:31 +0000
Subject: Postfix Now adds user when installed

---
 packages/postfix/postfix_2.0.20.bb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/postfix/postfix_2.0.20.bb b/packages/postfix/postfix_2.0.20.bb
index 483e95f19c..c826dc5469 100644
--- a/packages/postfix/postfix_2.0.20.bb
+++ b/packages/postfix/postfix_2.0.20.bb
@@ -21,3 +21,12 @@ do_compile () {
 do_install () {
 	sh ./postfix-install 'install_root=${D}' -non-interactive
 }
+
+pkg_postinst () {
+        grep postfix /etc/passwd || adduser --disabled-password --home=/var/spool/mail --ingroup nogroup postfix
+}
+
+pkg_postrm () {
+        grep postfix /etc/passwd && deluser postfix
+}
+		
-- 
cgit v1.2.3


From e3e59183c6a863c22550db2bba5f5c4aeb169fef Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Mon, 11 Jul 2005 00:40:21 +0000
Subject: Add CONFIG_VLAN

---
 packages/linux/nslu2-kernel/2.6.12/defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/linux/nslu2-kernel/2.6.12/defconfig b/packages/linux/nslu2-kernel/2.6.12/defconfig
index 5985a29ee3..9397245b99 100644
--- a/packages/linux/nslu2-kernel/2.6.12/defconfig
+++ b/packages/linux/nslu2-kernel/2.6.12/defconfig
@@ -438,7 +438,7 @@ CONFIG_XFRM=y
 # CONFIG_IP_SCTP is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
+CONFIG_VLAN_8021Q=m
 # CONFIG_DECNET is not set
 CONFIG_LLC=m
 # CONFIG_LLC2 is not set
-- 
cgit v1.2.3


From 65707f35ea8f9a7c716621638d033a335ed7c455 Mon Sep 17 00:00:00 2001
From: John Bowler <jbowler@nslu2-linux.org>
Date: Mon, 11 Jul 2005 05:38:02 +0000
Subject: Fix build break - bind apparently requires openssl for the configure
 step to succeed, this breaks the osuclibc build (at least) because openssl is
 not built (before bind).

---
 packages/bind/bind_9.3.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/bind/bind_9.3.1.bb b/packages/bind/bind_9.3.1.bb
index b4142242ee..1853d392b1 100644
--- a/packages/bind/bind_9.3.1.bb
+++ b/packages/bind/bind_9.3.1.bb
@@ -1,4 +1,4 @@
-DEPENDS = ""
+DEPENDS = "openssl"
 RPEDENDS = ""
 DESCRIPTION = "ISC Internet Domain Name Server"
 MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
-- 
cgit v1.2.3


From 0bcd91eb462f38f1f0e0df324fda1ca41c823202 Mon Sep 17 00:00:00 2001
From: John Bowler <jbowler@nslu2-linux.org>
Date: Mon, 11 Jul 2005 05:41:53 +0000
Subject: Official openslug-kernel_2.6.12 This is simply a copy of the
 nslu2-kernel_2.6.12 with one (minor) change to the defconfig to include the
 ACM kernel module (lost in the nslu2-kernel defconfig).

---
 conf/distro/openslug.conf                          |   11 +-
 .../linux/openslug-kernel-2.6.12/.mtn2git_empty    |    0
 packages/linux/openslug-kernel-2.6.12/README       |   10 +
 packages/linux/openslug-kernel-2.6.12/defconfig    | 1226 ++++++++++++++++++++
 packages/linux/openslug-kernel_2.6.12.bb           |    5 +
 packages/meta/openslug-packages.bb                 |    2 +-
 6 files changed, 1247 insertions(+), 7 deletions(-)
 create mode 100644 packages/linux/openslug-kernel-2.6.12/.mtn2git_empty
 create mode 100644 packages/linux/openslug-kernel-2.6.12/README
 create mode 100644 packages/linux/openslug-kernel-2.6.12/defconfig
 create mode 100644 packages/linux/openslug-kernel_2.6.12.bb

diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 847959bcc2..7a02e71f1a 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -91,13 +91,12 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 
 # Select the correct versions of the kernel and modules
-PREFERRED_PROVIDER_virtual/kernel ?= "nslu2-kernel"
+PREFERRED_PROVIDER_virtual/kernel ?= "openslug-kernel"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
-PREFERRED_VERSION_openslug-kernel ?= "2.6.11.2"
-PREFERRED_VERSION_nslu2-kernel ?= "2.6.11.2"
-# The nslu2-kernel version is currently tracking the latest
-# Change before release!
-#PREFERRED_VERSION_nslu2-kernel ?= "2.6.12.2"
+# Tracking the latest version, so the following is commented out.
+# Uncomment it before release!
+#PREFERRED_VERSION_openslug-kernel ?= "2.6.12.2"
+
 PREFERRED_VERSION_ixp4xx-csr ?= "1.4"
 PREFERRED_VERSION_ixp425-eth ?= "1.1"
diff --git a/packages/linux/openslug-kernel-2.6.12/.mtn2git_empty b/packages/linux/openslug-kernel-2.6.12/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/linux/openslug-kernel-2.6.12/README b/packages/linux/openslug-kernel-2.6.12/README
new file mode 100644
index 0000000000..45bc76579e
--- /dev/null
+++ b/packages/linux/openslug-kernel-2.6.12/README
@@ -0,0 +1,10 @@
+This directory contains *ONLY* the configuration for an openslug variant of
+nslu2-kernel.
+
+If patches are needed to the kernel they should go into a sub-directory of
+nslu2-kernel and they should also almost certainly be added to the nslu2-kernel
+.bb files.
+
+See nslu2-kernel.inc for more information about where things come from,
+there is a tree of directories for the patches and files to avoid duplicating
+files!
diff --git a/packages/linux/openslug-kernel-2.6.12/defconfig b/packages/linux/openslug-kernel-2.6.12/defconfig
new file mode 100644
index 0000000000..1669d90a96
--- /dev/null
+++ b/packages/linux/openslug-kernel-2.6.12/defconfig
@@ -0,0 +1,1226 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.12.2
+# Sun Jul 10 19:53:31 2005
+#
+CONFIG_ARM=y
+CONFIG_MMU=y
+CONFIG_UID16=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_IOMAP=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_CLEAN_COMPILE=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+CONFIG_HOTPLUG=y
+CONFIG_KOBJECT_UEVENT=y
+# CONFIG_IKCONFIG is not set
+CONFIG_EMBEDDED=y
+# CONFIG_KALLSYMS is not set
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+# CONFIG_BASE_FULL is not set
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SHMEM=y
+CONFIG_CC_ALIGN_FUNCTIONS=0
+CONFIG_CC_ALIGN_LABELS=0
+CONFIG_CC_ALIGN_LOOPS=0
+CONFIG_CC_ALIGN_JUMPS=0
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=1
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_OBSOLETE_MODPARM=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+
+#
+# System Type
+#
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is n