merge of 3337830555cb6398337a599f4649e61cac2ae122

     and a96120ae4432f090395e5fa91129bb55062af8ee

11 files changed, 293 insertions, 6 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 0634492615..33e2f8b4f6 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,3 +6,9 @@
  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,5 @@
+ 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
+ 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 be2d9ec6a9..d223d49193 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,3 +6,9 @@
  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,5 @@
+ 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
+ nobody:*:65534:65534:nobody:/nonexistent:/bin/sh
diff --git a/packages/base-passwd/base-passwd_3.5.9.bb b/packages/base-passwd/base-passwd_3.5.9.bb
index 1afae5b0ef..4ebb5749dd 100644
--- a/packages/base-passwd/base-passwd_3.5.9.bb
+++ b/packages/base-passwd/base-passwd_3.5.9.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Base system password/group files."
 SECTION = "base"
-PR = "r0"
+PR = "r1"
 LICENSE = "GPL"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \
diff --git a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-tosa b/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-tosa
index 319fc1edfb..c7eba4a337 100644
--- a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-tosa
+++ b/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-tosa
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-rc6-mm1
-# Wed Jun 15 22:40:11 2005
+# Linux kernel version: 2.6.12-mm1
+# Mon Jul  4 15:43:10 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -719,7 +719,7 @@ CONFIG_NET_PCMCIA=y
 # CONFIG_PCMCIA_3C589 is not set
 # CONFIG_PCMCIA_3C574 is not set
 # CONFIG_PCMCIA_FMVJ18X is not set
-CONFIG_PCMCIA_PCNET=y
+CONFIG_PCMCIA_PCNET=m
 # CONFIG_PCMCIA_NMCLAN is not set
 # CONFIG_PCMCIA_SMC91C92 is not set
 # CONFIG_PCMCIA_XIRC2PS is not set
@@ -908,10 +908,13 @@ CONFIG_I2C_PXA=y
 # Other I2C Chip support
 #
 # CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_RTC8564 is not set
+# CONFIG_SENSORS_MAX6875 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -983,11 +986,13 @@ CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
 # CONFIG_FONT_8x16 is not set
 # CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
 # CONFIG_FONT_PEARL_8x8 is not set
 # CONFIG_FONT_ACORN_8x8 is not set
 # CONFIG_FONT_MINI_4x6 is not set
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
 
 #
 # Logo configuration
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index ee5f080460..bccabb8184 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -61,6 +61,7 @@ OPENSLUG_PACKAGES = "\
 	db4 \
 	openldap \
 	ntp \
+	openntpd \
 	reiserfsprogs reiser4progs \
 	python \
 	samba \
diff --git a/packages/openntpd/files/adjtimex-3.7p1.patch b/packages/openntpd/files/adjtimex-3.7p1.patch
new file mode 100644
index 0000000000..12a4184443
--- /dev/null
+++ b/packages/openntpd/files/adjtimex-3.7p1.patch
@@ -0,0 +1,172 @@
+diff -u -p -r1.46 client.c
+--- openntpd-3.7p1/client.c	13 Mar 2005 12:36:43 -0000	1.46
++++ openntpd-3.7p1/client.c	26 Jun 2005 03:15:54 -0000
+@@ -306,7 +306,7 @@ client_update(struct ntp_peer *p)
+ 	priv_adjtime();
+ 
+ 	for (i = 0; i < OFFSET_ARRAY_SIZE; i++)
+-		if (p->reply[i].rcvd <= p->reply[best].rcvd)
++		/* if (p->reply[i].rcvd <= p->reply[best].rcvd) */
+ 			p->reply[i].good = 0;
+ 
+ 	return (0);
+--- openntpd-3.7p1/configure.ac	23 May 2005 11:10:34 -0000	1.62
++++ openntpd-3.7p1/configure.ac	26 Jun 2005 03:15:54 -0000
+@@ -466,6 +466,11 @@ AC_ARG_WITH(builtin-arc4random,
+ 	[ builtin_arc4random=$withval ]
+ )
+ 
++AC_ARG_WITH(adjtimex,
++	[  --with-adjtimex         Use adjtimex to adjust kernel skew],
++	[ AC_DEFINE(USE_ADJTIMEX, [], [Use adjust skew with adjtimex (experimental)]) ]
++)
++
+ # Search for OpenSSL if required.
+ if test "$ac_cv_func_arc4random" != "yes" && test "x$builtin_arc4random" != "xyes"; then
+ saved_CPPFLAGS="$CPPFLAGS"
+--- openntpd-3.7p1/defines.h	23 May 2005 00:16:15 -0000	1.23
++++ openntpd-3.7p1/defines.h	26 Jun 2005 03:15:54 -0000
+@@ -20,6 +20,10 @@
+ # define setproctitle(x)
+ #endif
+ 
++#ifdef USE_ADJTIMEX
++# define adjtime(a,b)	(_compat_adjtime((a),(b)))
++#endif
++
+ #if !defined(SA_LEN)
+ # if defined(HAVE_STRUCT_SOCKADDR_SA_LEN)
+ #  define SA_LEN(x)	((x)->sa_len)
+--- openntpd-3.7p1/openbsd-compat/Makefile.in	19 Dec 2004 23:41:28 -0000	1.10
++++ openntpd-3.7p1/openbsd-compat/Makefile.in	26 Jun 2005 03:17:15 -0000
+@@ -9,7 +9,7 @@ all:	libopenbsd-compat.a
+ OPENBSD=	asprintf.o daemon.o inet_pton.o strlcpy.o
+ COMPAT=		atomicio.o bsd-arc4random.o bsd-misc.o bsd-poll.o \
+ 		bsd-snprintf.o fake-rfc2553.o uidswap.o
+-PORT=		port-qnx.o
++PORT=		port-linux.o port-qnx.o
+ 
+ VPATH=@srcdir@
+ CC=@CC@
+--- openntpd-3.7p1/openbsd-compat/openbsd-compat.h	19 Dec 2004 03:04:22 -0000	1.15
++++ openntpd-3.7p1/openbsd-compat/openbsd-compat.h	26 Jun 2005 03:15:54 -0000
+@@ -44,6 +44,11 @@ int      asprintf(char **, const char *,
+                 __attribute__((__format__ (printf, 2, 3)));
+ #endif
+ 
++#ifdef USE_ADJTIMEX
++# include <sys/time.h>
++int _compat_adjtime(const struct timeval *, struct timeval *);
++#endif
++
+ #ifndef HAVE_INET_PTON
+ int inet_pton(int, const char *, void *);
+ #endif
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ openntpd-3.7p1/openbsd-compat/port-linux.c	10 Dec 2004 01:10:30 -0000
+@@ -0,0 +1,105 @@
++/* $Id$ */
++
++/*
++ * Copyright (c) 2004 Darren Tucker <dtucker at zip com au>
++ *
++ * Permission to use, copy, modify, and distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++#include "includes.h"
++
++#ifdef USE_ADJTIMEX
++#include <sys/timex.h>
++#include <errno.h>
++#ifdef adjtime
++# undef adjtime
++#endif
++
++#include "ntpd.h"
++
++/* scale factor used by adjtimex freq param.  1 ppm = 65536 */
++#define ADJTIMEX_FREQ_SCALE 65536
++
++/* maximum change to skew per adjustment, in PPM */
++#define MAX_SKEW_DELTA 5.0
++
++int
++_compat_adjtime(const struct timeval *delta, struct timeval *olddelta)
++{
++	static struct timeval tlast = {0,0};
++	static double tskew = 0;
++	static int synced = -1;
++	struct timeval tnow, tdelta;
++	double skew = 0, newskew, deltaskew, adjust, interval = 0;
++	struct timex tmx;
++	int result, saved_errno;
++
++	gettimeofday(&tnow, NULL);
++	adjust = (double)delta->tv_sec;
++	adjust += (double)delta->tv_usec / 1000000;
++
++	/* Even if the caller doesn't care about the olddelta, we do */
++	if (olddelta == NULL)
++		olddelta = &tdelta;
++
++	result = adjtime(delta, olddelta);
++	saved_errno = errno;
++
++	if (olddelta->tv_sec == 0 && olddelta->tv_usec == 0 &&
++	    synced != INT_MAX)
++		synced++;
++	 else
++		synced = 0;
++
++	/*
++	 * do skew calculations if we have synced
++	 */
++	if (synced == 0 ) {
++		tmx.modes = 0;
++		if (adjtimex(&tmx) == -1)
++			log_warn("adjtimex get failed");
++		else
++			tskew = (double)tmx.freq / ADJTIMEX_FREQ_SCALE;
++	} else if (synced >= 1) {
++		interval = (double)(tnow.tv_sec - tlast.tv_sec);
++		interval += (double)(tnow.tv_usec - tlast.tv_usec) / 1000000;
++
++		skew = (adjust * 1000000) / interval;
++		newskew = ((tskew * synced) + skew) / synced;
++		deltaskew = newskew - tskew;
++
++		if (deltaskew > MAX_SKEW_DELTA) {
++			log_info("skew change %0.3lf exceeds limit", deltaskew);
++			tskew += MAX_SKEW_DELTA;
++		} else if (deltaskew < -MAX_SKEW_DELTA) {
++			log_info("skew change %0.3lf exceeds limit", deltaskew);
++			tskew -= MAX_SKEW_DELTA;
++		} else {
++			tskew = newskew;
++		}
++
++		/* Adjust the kernel skew.  */
++		tmx.freq = (long)(tskew * ADJTIMEX_FREQ_SCALE);
++		tmx.modes = ADJ_FREQUENCY;
++		if (adjtimex(&tmx) == -1)
++			log_warn("adjtimex set freq failed");
++	}
++
++	log_debug("interval %0.3lf skew %0.3lf total skew %0.3lf", interval,
++	    skew, tskew);
++
++	tlast = tnow;
++	errno = saved_errno;
++	return result;
++}
++#endif
diff --git a/packages/openntpd/files/init b/packages/openntpd/files/init
new file mode 100644
index 0000000000..768f8f1b8f
--- /dev/null
+++ b/packages/openntpd/files/init
@@ -0,0 +1,36 @@
+#! /bin/sh 
+#
+# This is an init script for openembedded
+# Copy it to /etc/init.d/samba and type
+# > update-rc.d init defaults 61
+#
+
+ntpd=/usr/sbin/ntpd
+test -x "$ntpd" || exit 0
+
+case "$1" in
+  start)
+    echo "Starting openntpd"
+    start-stop-daemon --start --quiet --exec $ntpd
+    ;;
+  stop)
+    echo "Stopping openntpd"
+    start-stop-daemon --stop --quiet --exec $ntpd
+    ;;
+  reload|force-reload)
+    echo "Reloading openntpd"
+    start-stop-daemon --stop --quiet --signal 1 --exec $ntpd
+    ;;
+  restart)
+    echo "Stopping openntpd"
+    start-stop-daemon --stop --quiet --exec $ntpd
+    sleep 1
+    echo "Starting openntpd"
+    start-stop-daemon --start --quiet --exec $ntpd
+    ;;
+  *)
+    echo "Usage: /etc/init.d/openntpd {start|stop|reload|restart|force-reload}"
+    exit 1
+esac
+
+exit 0
diff --git a/packages/openntpd/files/makefile-install.patch b/packages/openntpd/files/makefile-install.patch
new file mode 100644
index 0000000000..b11c1aedd3
--- /dev/null
+++ b/packages/openntpd/files/makefile-install.patch
@@ -0,0 +1,29 @@
+--- openntpd-3.7p1/Makefile.in.original	2005-07-02 06:08:47.795870784 +0200
++++ openntpd-3.7p1/Makefile.in	2005-07-02 06:15:34.768001616 +0200
+@@ -78,26 +78,6 @@
+ 	else \
+ 		echo "$(DESTDIR)$(sysconfdir)/ntpd.conf already exists, install will not overwrite"; \
+ 	fi
+-	@if [ ! -d $(DESTDIR)$(PRIVSEP_PATH) ]; then \
+-		mkdir -p $(DESTDIR)$(PRIVSEP_PATH) ;\
+-		chown 0 $(DESTDIR)$(PRIVSEP_PATH) ; \
+-		chgrp 0 $(DESTDIR)$(PRIVSEP_PATH) ; \
+-		chmod 0755 $(DESTDIR)$(PRIVSEP_PATH) ; \
+-	fi
+-	@if grep "$(PRIVSEP_USER):" /etc/group >/dev/null; then \
+-	  : ;\
+-	else \
+-	  echo "Please create a dedicated group for ntpd." ;\
+-	  echo "This is system-dependant, possibly:" ;\
+-	  echo "# groupadd $(PRIVSEP_USER)" ;\
+-	fi
+-	@if grep "$(PRIVSEP_USER):" /etc/passwd >/dev/null; then \
+-	  : ;\
+-	else \
+-	  echo "Please create a dedicated user for ntpd and ensure it can" ;\
+-	  echo "not be used to log in.  This is system-dependant, possibly:" ;\
+-	  echo "# useradd -g $(PRIVSEP_USER) -s /sbin/nologin -d $(PRIVSEP_PATH) -c 'OpenNTP daemon' $(PRIVSEP_USER)" ;\
+-	fi
+ 
+ diff:
+ 	-diff -x CVS -x Makefile -ru /usr/src/usr.sbin/ntpd ./ | \
diff --git a/packages/openntpd/openntpd_3.7p1.bb b/packages/openntpd/openntpd_3.7p1.bb
new file mode 100644
index 0000000000..033f959510
--- /dev/null
+++ b/packages/openntpd/openntpd_3.7p1.bb
@@ -0,0 +1,30 @@
+DEPENDS += "openssl"
+DESCRIPTION = "OpenNTPD is a FREE, easy to use implementation of the \
+Network Time Protocol."
+HOMEPAGE = "http://www.openntpd.org/"
+LICENSE = "BSD"
+SECTION = "console/network"
+MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
+PR="r1"
+
+SRC_URI = "http://www.zip.com.au/~dtucker/openntpd/release/openntpd-${PV}.tar.gz \
+	   file://autofoo.patch;patch=1 \
+	   file://adjtimex-${PV}.patch;patch=1 \
+	   file://makefile-install.patch;patch=1 \ 
+	   file://init"
+S = "${WORKDIR}/openntpd-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF += "CFLAGS=-DUSE_ADJTIMEX --disable-strip --prefix=/usr \
+		--sysconfdir=/etc  --with-privsep-path=/var/shared/empty \
+		--with-privsep-user=ntpd"
+
+do_install_prepend() {
+        install -d ${D}${sysconfdir}/init.d
+}
+
+do_install_append() {
+	install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/openntpd
+	install -d ${D}${localstatedir}/shared/empty
+}
diff --git a/packages/openslug-init/openslug-init-0.10/initscripts/sysconfsetup b/packages/openslug-init/openslug-init-0.10/initscripts/sysconfsetup
index 1940b00ff8..31ff38d7ee 100644
--- a/packages/openslug-init/openslug-init-0.10/initscripts/sysconfsetup
+++ b/packages/openslug-init/openslug-init-0.10/initscripts/sysconfsetup
@@ -60,9 +60,11 @@ then
 	# is removed (to be exact, the sed script selects only lines
 	# which match one of the two above).  The lan interface, which
 	# defaults to ixp0, is changed to the correct value for openslug,
-	# eth0
+	# eth0.  The bootproto, which LinkSys sets to static in manufacturing,
+	# is reset to dhcp if the IP is still the original (192.168.1.77)
 	devio "<<$sysdev" cpb fb1,10 | sed -n '/^\[[^][]*\]$/p;
 		s/^lan_interface=ixp0$/lan_interface=eth0/;
+		/^ip_addr=192\.168\.1\.77$/,/^bootproto/s/^bootproto=static$/bootproto=dhcp/;
 		/^[-a-zA-Z0-9_][-a-zA-Z0-9_]*=/p' >/etc/default/sysconf
 	#
 	# The SysConf must have a hardware id, if it doesn't it has
diff --git a/packages/openslug-init/openslug-init_0.10.bb b/packages/openslug-init/openslug-init_0.10.bb
index 76bd00754a..bf43759aa7 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 = "r31"
+PR = "r32"
 
 SRC_URI = "file://linuxrc \
 	   file://boot/flash \