merge of 2653a4b40327fa4b9850b64660c0b840a53b9e4d

     and 7d7a212e875a69547a4ab175f18225661a30c5ce

92 files changed, 2463 insertions, 2462 deletions

diff --git a/packages/hdparm/hdparm-5.4/.mtn2git_empty b/packages/bwmon/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/hdparm/hdparm-5.4/.mtn2git_empty
+++ b/packages/bwmon/.mtn2git_empty
diff --git a/packages/bwmon/bwmon_1.3.bb b/packages/bwmon/bwmon_1.3.bb
new file mode 100644
index 0000000000..26c620e013
--- /dev/null
+++ b/packages/bwmon/bwmon_1.3.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "The Linux bandwidth monitor"
+MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org"
+DEPENDS = "ncurses"
+
+LICENSE = "Unspecified"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/bwmon/${P}.tar.gz \
+	   file://makefile.patch;patch=1"
+EXTRA_OEMAKE = "LDFLAGS=-L${STAGING_LIBDIR}"
+
+inherit autotools
+
+do_install () {
+	install -d ${D}${bindir}
+	install ${S}/bwmon ${D}${bindir}/bwmon
+}
diff --git a/packages/hdparm/hdparm-5.8/.mtn2git_empty b/packages/bwmon/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/hdparm/hdparm-5.8/.mtn2git_empty
+++ b/packages/bwmon/files/.mtn2git_empty
diff --git a/packages/bwmon/files/makefile.patch b/packages/bwmon/files/makefile.patch
new file mode 100644
index 0000000000..b8e2b7abdc
--- /dev/null
+++ b/packages/bwmon/files/makefile.patch
@@ -0,0 +1,18 @@
+--- bwmon-1.3/src/Makefile	2002-05-03 12:11:52.000000000 +0200
++++ /home/repvik/Makefile	2005-08-02 04:17:43.021622816 +0200
+@@ -6,12 +6,12 @@
+ # I used to provide a version for non-curses
+ # but I do not anymore
+ 
+-CC = gcc
++#CC = gcc
+ RM = /bin/rm
+-INSTALL = install
++#INSTALL = install
+ 
+ CFLAGS = -I../include -Wall -D__THREADS
+-LDFLAGS = -lpthread -lncurses 
++LDFLAGS += -lpthread -lncurses
+ 
+ SRC = bwmon.c
+ OBJS = $(SRC:.c=.o)
diff --git a/packages/ccxstream/ccxstream_1.0.15.bb b/packages/ccxstream/ccxstream_1.0.15.bb
index 751e0412c5..cc42d895ca 100644
--- a/packages/ccxstream/ccxstream_1.0.15.bb
+++ b/packages/ccxstream/ccxstream_1.0.15.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "XStream Server"
-
+DEPENDS = "readline"
 LICENSE = "GPL-2"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://surfnet.dl.sourceforge.net/sourceforge/xbplayer/${P}.tar.gz \
 	file://ccxstream-termcap.patch;patch=1 \
diff --git a/packages/dbus/dbus_0.23.4.bb b/packages/dbus/dbus_0.23.4.bb
index 30e694f08e..dc3f6f2e72 100644
--- a/packages/dbus/dbus_0.23.4.bb
+++ b/packages/dbus/dbus_0.23.4.bb
@@ -1,5 +1,5 @@
 SECTION = "base"
-PR = "r0"
+PR = "r1"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
diff --git a/packages/dhclient/dhclient_2.0pl5.bb b/packages/dhclient/dhclient_2.0pl5.bb
index cee9cdece2..20b0dfc440 100644
--- a/packages/dhclient/dhclient_2.0pl5.bb
+++ b/packages/dhclient/dhclient_2.0pl5.bb
@@ -2,7 +2,7 @@ SECTION = "console/network"
 DESCRIPTION = "ISC DHCP Distribution (client and server)."
 LICENSE = "BSD"
 
-SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-${PV}.tar.gz \
+SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-2.0-history/dhcp-${PV}.tar.gz \
 	   file://make.patch;patch=1"
 S = "${WORKDIR}/dhcp-${PV}"
 
diff --git a/packages/dhcp/dhcp_3.0.2.bb b/packages/dhcp/dhcp_3.0.2.bb
index 3dbf803106..c734af1534 100644
--- a/packages/dhcp/dhcp_3.0.2.bb
+++ b/packages/dhcp/dhcp_3.0.2.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.isc.org/"
 MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "BSD"
 PR = "r1"
-SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-${PV}.tar.gz \
+SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-${PV}.tar.gz \
 	   file://noattrmode.patch;patch=1 \
 	   file://init-relay file://default-relay \
 	   file://init-server file://default-server \
diff --git a/packages/dpkg/dpkg_1.10.23.bb b/packages/dpkg/dpkg_1.10.23.bb
deleted file mode 100644
index 21d2a9b2b3..0000000000
--- a/packages/dpkg/dpkg_1.10.23.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-include dpkg.inc
-
-SRC_URI += "file://autofoo.patch;patch=1"
-
-inherit autotools gettext
-
-EXTRA_OECONF = "--without-static-progs \
-		--without-dselect \
-		--with-start-stop-daemon \
-		--with-zlib \
-		--without-sgml-doc"
diff --git a/packages/dpkg/dpkg_1.10.27.bb b/packages/dpkg/dpkg_1.10.28.bb
index ec8a887300..ec8a887300 100644
--- a/packages/dpkg/dpkg_1.10.27.bb
+++ b/packages/dpkg/dpkg_1.10.28.bb
diff --git a/packages/fbvncserver/fbvncserver_0.9.4.bb b/packages/fbvncserver/fbvncserver_0.9.4.bb
index bc66c5c8ac..fd2a1e6138 100644
--- a/packages/fbvncserver/fbvncserver_0.9.4.bb
+++ b/packages/fbvncserver/fbvncserver_0.9.4.bb
@@ -9,6 +9,7 @@ SRC_URI = "http://sdgsystems.com/download/fbvncserver-${PV}.tar.gz \
            file://libvncs0.6.patch;patch=1 \
            file://paths.patch;patch=1 \
            file://kernelinclude.patch;patch=1 \
+	   file://buildfix.patch;patch=1 \
            file://zaurus_panel.jpg \
            file://init"
 	  
diff --git a/packages/fbvncserver/files/buildfix.patch b/packages/fbvncserver/files/buildfix.patch
new file mode 100644
index 0000000000..302dbd9e8e
--- /dev/null
+++ b/packages/fbvncserver/files/buildfix.patch
@@ -0,0 +1,31 @@
+--- fbvncserver-0.9.4/fbvncserver.c.orig	2005-07-31 15:01:32.552177176 +0200
++++ fbvncserver-0.9.4/fbvncserver.c	2005-07-31 15:02:47.287366483 +0200
+@@ -574,7 +574,6 @@
+   rfbScreen                  = rfbGetScreen(&argc,argv,rfb_width,rfb_height,5,2,2);
+   rfbScreen->desktopName     = DESKTOP_NAME;
+   rfbScreen->frameBuffer     = (char *)rfbbuf;
+-  rfbScreen->rfbAlwaysShared = TRUE;
+   rfbScreen->ptrAddEvent     = ptrevent;
+   rfbScreen->kbdAddEvent     = keyevent;
+   rfbScreen->newClientHook   = newclient;
+@@ -595,18 +594,12 @@
+   varblock.b_offset = vscrinfo.blue.offset+vscrinfo.blue.length-5;
+   varblock.rfb_xres = vscrinfo.yres;
+   varblock.rfb_maxy = vscrinfo.xres-1;
+-  while(1)
++  while(1) 
+   {
+-      /* If no clients are connected, just wait for events and don't bother
+-         updating the rfb, to save CPU */
+-      while(rfbScreen->rfbClientHead==NULL) {
+-          rfbProcessEvents(rfbScreen,100000);       /* We still run a tight loop
+-                                                       so http clients don't wait */
+-      }
+       /* Process events for a while */
+       do
+       {
+-          got_event=0;
++          got_event=0; 
+           rfbProcessEvents(rfbScreen,30000);
+       }
+       while(got_event);
diff --git a/packages/nonworking/tetex/.mtn2git_empty b/packages/flex/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/nonworking/tetex/.mtn2git_empty
+++ b/packages/flex/files/.mtn2git_empty
diff --git a/packages/flex/files/fix-gen.patch b/packages/flex/files/fix-gen.patch
new file mode 100644
index 0000000000..55f4f6fdf5
--- /dev/null
+++ b/packages/flex/files/fix-gen.patch
@@ -0,0 +1,17 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- flex-2.5.31/gen.c~fix-gen
++++ flex-2.5.31/gen.c
+@@ -1812,8 +1812,7 @@
+ 			if (yytext_is_array) {
+ 				if (!reentrant){
+     				indent_puts ("static int yy_more_offset = 0;");
+-                }else{
+-                    indent_puts ("static int yy_prev_more_offset = 0;");
++                                indent_puts ("static int yy_prev_more_offset = 0;");
+                 }
+ 			}
+ 			else if (!reentrant) {
diff --git a/packages/flex/flex-native_2.5.31.bb b/packages/flex/flex-native_2.5.31.bb
index fa125d6be7..ff8a42772b 100644
--- a/packages/flex/flex-native_2.5.31.bb
+++ b/packages/flex/flex-native_2.5.31.bb
@@ -1,7 +1,6 @@
 include flex.inc
 inherit native
-
-PR = "r1"
+PR = "r2"
 
 do_stage () {
 	install -m 0755 flex ${STAGING_BINDIR}
diff --git a/packages/flex/flex.inc b/packages/flex/flex.inc
index b28ad9e055..6e605ac9be 100644
--- a/packages/flex/flex.inc
+++ b/packages/flex/flex.inc
@@ -2,7 +2,8 @@ DESCRIPTION = "Flex is a tool for generating programs that recognize lexical pat
 SECTION = "devel"
 LICENSE = "BSD"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/lex/flex-2.5.31.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/lex/flex-2.5.31.tar.bz2 \
+           file://fix-gen.patch;patch=1"
 S = "${WORKDIR}/flex-${PV}"
 
 inherit autotools
diff --git a/packages/flex/flex_2.5.31.bb b/packages/flex/flex_2.5.31.bb
index 2263d8f7c1..b96c645136 100644
--- a/packages/flex/flex_2.5.31.bb
+++ b/packages/flex/flex_2.5.31.bb
@@ -1,5 +1,5 @@
 include flex.inc
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://include.patch;patch=1"
 
diff --git a/packages/nonworking/tetex/tetex-2.0.2/.mtn2git_empty b/packages/gcc/gcc-cross-kernel-3.4.4/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/nonworking/tetex/tetex-2.0.2/.mtn2git_empty
+++ b/packages/gcc/gcc-cross-kernel-3.4.4/.mtn2git_empty
diff --git a/packages/gcc/gcc-cross-kernel-3.4.4/gcc-3.4.4-makefile-fix.patch b/packages/gcc/gcc-cross-kernel-3.4