merge of '2c8930a5e3dfc1e355f0dede8fde6b887e2d33de'

     and 'cf2bb56e5f6bd283e65c7bf7c89c86e77dbd1fb0'

30 files changed, 242 insertions, 402 deletions

diff --git a/packages/cvs/cvs_1.12.8.bb b/packages/cvs/cvs_1.12.8.bb
index 51aa9de2fb..b472a451eb 100644
--- a/packages/cvs/cvs_1.12.8.bb
+++ b/packages/cvs/cvs_1.12.8.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 DEPENDS = ""
 LICENSE = "GPL"
 
-SRC_URI = "https://cvs.cvshome.org/files/documents/19/170/cvs-${PV}.tar.bz2 \
+SRC_URI = "http://musthave.sunbase.org/progs/ccvs/Old/cvs-${PV}/cvs-${PV}.tar.bz2 \
 	   file://m4.patch;patch=1"
 
 inherit autotools gettext
diff --git a/packages/ifupdown/ifupdown-0.6.4/gcc34-fix.patch b/packages/ifupdown/ifupdown-0.6.4/gcc34-fix.patch
deleted file mode 100644
index f90e312694..0000000000
--- a/packages/ifupdown/ifupdown-0.6.4/gcc34-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- ifupdown-0.6.4/execute.c~gcc34-fix	2004-04-28 00:16:45.000000000 +0200
-+++ ifupdown-0.6.4/execute.c	2004-04-28 00:17:11.000000000 +0200
-@@ -167,7 +167,7 @@
- 		    case 0: /* child */
- 			execle("/bin/sh", "/bin/sh", "-c", str, NULL, environ);
- 			exit(127);
--		    default: /* parent */
-+		    default:; /* parent */
- 		}
- 		waitpid(child, &status, 0);
- 		if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
\ No newline at end of file
diff --git a/packages/ifupdown/ifupdown-0.6.4/.mtn2git_empty b/packages/ifupdown/ifupdown-0.6.8/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/ifupdown/ifupdown-0.6.4/.mtn2git_empty
+++ b/packages/ifupdown/ifupdown-0.6.8/.mtn2git_empty
diff --git a/packages/ifupdown/ifupdown-0.6.4/busybox.patch b/packages/ifupdown/ifupdown-0.6.8/busybox.patch
index 5619ab7c0a..5619ab7c0a 100644
--- a/packages/ifupdown/ifupdown-0.6.4/busybox.patch
+++ b/packages/ifupdown/ifupdown-0.6.8/busybox.patch
diff --git a/packages/ifupdown/ifupdown-0.6.4/head-tail.patch b/packages/ifupdown/ifupdown-0.6.8/head-tail.patch
index a86a25d2fb..a86a25d2fb 100644
--- a/packages/ifupdown/ifupdown-0.6.4/head-tail.patch
+++ b/packages/ifupdown/ifupdown-0.6.8/head-tail.patch
diff --git a/packages/ifupdown/ifupdown-0.6.4/init b/packages/ifupdown/ifupdown-0.6.8/init
index d258d51ff4..d258d51ff4 100644
--- a/packages/ifupdown/ifupdown-0.6.4/init
+++ b/packages/ifupdown/ifupdown-0.6.8/init
diff --git a/packages/ifupdown/ifupdown-0.6.4/interfaces b/packages/ifupdown/ifupdown-0.6.8/interfaces
index f1bd92ed2b..f1bd92ed2b 100644
--- a/packages/ifupdown/ifupdown-0.6.4/interfaces
+++ b/packages/ifupdown/ifupdown-0.6.8/interfaces
diff --git a/packages/ifupdown/ifupdown-0.6.4/udhcpc.patch b/packages/ifupdown/ifupdown-0.6.8/udhcpc.patch
index 39a6b3349d..5b662e7988 100644
--- a/packages/ifupdown/ifupdown-0.6.4/udhcpc.patch
+++ b/packages/ifupdown/ifupdown-0.6.8/udhcpc.patch
@@ -1,18 +1,20 @@
---- ifupdown/inet.defn.orig	2004-04-29 20:16:07.000000000 +0200
-+++ ifupdown/inet.defn	2004-04-29 20:16:13.000000000 +0200
+Index: ifupdown-0.6.8/inet.defn
+===================================================================
+--- ifupdown-0.6.8.orig/inet.defn	2007-01-04 09:11:43.000000000 +0100
++++ ifupdown-0.6.8/inet.defn	2007-01-04 09:12:51.000000000 +0100
 @@ -81,8 +81,7 @@
          elsif (execable("/sbin/dhclient"))
      pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]] \
          elsif (execable("/sbin/pump") && mylinuxver() >= mylinux(2,1,100))
 -    udhcpc -n -p /var/run/udhcpc.%iface%.pid -i %iface% [[-H %hostname%]] \
--           [[-c %clientid%]] \
+-           [[-c %client%]] \
 +    udhcpc -b -p /var/run/udhcpc.%iface%.pid -i %iface% -H `cat /etc/hostname` \
          elsif (execable("/sbin/udhcpc") && mylinuxver() >= mylinux(2,2,0))
-     dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %clientid%]] \
+     dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
             [[-l %leasetime%]] %iface% \
 @@ -91,11 +90,11 @@
    down
-     dhclient3 -r -pf /var/run/dhclient.%iface%.pid -lf /var/run/dhclient.%iface%.leases %iface% \
+     dhclient3 -r -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp3/dhclient.%iface%.leases %iface% \
          if (execable("/sbin/dhclient3"))
 -    cat /var/run/dhclient.%iface%.pid | xargs -i kill -TERM {} \
 +    kill -TERM `cat /var/run/dhclient.%iface%.pid` \
@@ -23,4 +25,4 @@
 +    kill -TERM `cat /var/run/udhcpc.%iface%.pid` \
          elsif (execable("/sbin/udhcpc"))
      dhcpcd -k %iface% \
-         elsif (execable("/sbin/dhcpcd"))
\ No newline at end of file
+         elsif (execable("/sbin/dhcpcd"))
diff --git a/packages/ifupdown/ifupdown-0.6.4/zeroconf.patch b/packages/ifupdown/ifupdown-0.6.8/zeroconf.patch
index 33745db6ff..33745db6ff 100644
--- a/packages/ifupdown/ifupdown-0.6.4/zeroconf.patch
+++ b/packages/ifupdown/ifupdown-0.6.8/zeroconf.patch
diff --git a/packages/ifupdown/ifupdown_0.6.4.bb b/packages/ifupdown/ifupdown_0.6.8.bb
index bf0c82634f..53ccb5fe6c 100644
--- a/packages/ifupdown/ifupdown_0.6.4.bb
+++ b/packages/ifupdown/ifupdown_0.6.8.bb
@@ -1,6 +1,3 @@
-BROKEN = "1"
-# Debian moved to 0.6.7
-
 DESCRIPTION = "High level tools to configure network interfaces \
 This package provides the tools ifup and ifdown which may be used to \
 configure (or, respectively, deconfigure) network interfaces, based on \
@@ -9,12 +6,10 @@ LICENSE = "GPL"
 
 SECTION = "base"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/i/ifupdown/ifupdown_${PV}.orig.tar.gz \
-           ${DEBIAN_MIRROR}/main/i/ifupdown/ifupdown_${PV}-4.8.diff.gz;patch=1 \
+SRC_URI = "${DEBIAN_MIRROR}/main/i/ifupdown/ifupdown_${PV}.tar.gz \
            file://busybox.patch;patch=1 \
            file://udhcpc.patch;patch=1 \
            file://zeroconf.patch;patch=1 \
-           file://gcc34-fix.patch;patch=1 \
            file://init \
            file://interfaces"
 
@@ -28,9 +23,14 @@ do_compile () {
 do_install () {
 	install -d ${D}${sysconfdir}/init.d \
 		   ${D}${sysconfdir}/network \
+		   ${D}${mandir}/man8 \
+		   ${D}${mandir}/man5 \
 		   ${D}${base_sbindir}
 	install -m 0755 ifup ${D}${base_sbindir}/
 	ln ${D}${base_sbindir}/ifup ${D}${base_sbindir}/ifdown
 	install -m 0644 ${WORKDIR}/init ${D}${sysconfdir}/init.d/networking
 	install -m 0644 ${WORKDIR}/interfaces ${D}${sysconfdir}/network/interfaces
+	install -m 0644 ifup.8 ${D}${mandir}/man8
+	install -m 0644 interfaces.5 ${D}${mandir}/man5
+	cd ${D}${mandir}/man8 && ln -s ifup.8 ifdown.8
 }
diff --git a/packages/lftp/lftp_3.5.1.bb b/packages/lftp/lftp_3.5.1.bb
index a45b75fe35..df184ae9ca 100644
--- a/packages/lftp/lftp_3.5.1.bb
+++ b/packages/lftp/lftp_3.5.1.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://lftp.yar.ru"
 SECTION = "console/network"
 DEPENDS = "readline gnutls"
 
-SRC_URI = "http://www.ibiblio.org/pub/Linux/system/network/file-transfer/lftp-3.5.1.tar.gz"
+SRC_URI = "ftp://ftp.wiretapped.net/pub/mirrors/lftp/old/lftp-3.5.1.tar.bz2"
 
 EXTRA_OECONF = "--disable-largefile --disable-rpath --with-included-readline=no"
 
diff --git a/packages/libnet/libnet_1.0.2a.bb b/packages/libnet/libnet_1.0.2a.bb
index 6e6067cf8f..c4e4396e1a 100644
--- a/packages/libnet/libnet_1.0.2a.bb
+++ b/packages/libnet/libnet_1.0.2a.bb
@@ -9,11 +9,12 @@ PR = "r1"
 # There are major API changes beween libnet v1.0 and libnet v1.1
 PROVIDES = "libnet-1.0"
 
-SRC_URI = "http://www.packetfactory.net/libnet/dist/deprecated/libnet-${PV}.tar.gz \
+#SRC_URI = "http://www.packetfactory.net/libnet/dist/deprecated/libnet-${PV}.tar.gz \
+SRC_URI = "${DEBIAN_MIRROR}/main/libn/libnet0/libnet0_${PV}.orig.tar.gz \
 	   file://configure.patch;patch=1 \
 	   file://configure.uclibc.patch;patch=1 \
 	   "
-S = "${WORKDIR}/Libnet-${PV}"
+S = "${WORKDIR}/libnet-${PV}.orig"
 
 inherit autotools
 
diff --git a/packages/libnet/libnet_1.1.2.1.bb b/packages/libnet/libnet_1.1.2.1.bb
index 92457a8ff4..f9464ae8bb 100644
--- a/packages/libnet/libnet_1.1.2.1.bb
+++ b/packages/libnet/libnet_1.1.2.1.bb
@@ -8,7 +8,7 @@ DEPENDS = "libpcap"
 PROVIDES = "libnet-1.1"
 PR = "r1"
 
-SRC_URI = "http://www.packetfactory.net/libnet/dist/libnet-${PV}.tar.gz \
+SRC_URI = "${DEBIAN_MIRROR}/main/libn/libnet/libnet_${PV}.orig.tar.gz \
            file://support-uclibc.patch;patch=1 \
            file://fix-endianess-test.patch;patch=1"
 
@@ -31,6 +31,7 @@ do_stage () {
         oe_runmake -C include/libnet 'DESTDIR=${STAGING_INCDIR}' 'includedir=' install-libnetincludeHEADERS
 }
 
+#static build
 PACKAGES = "${PN}-dev ${PN}-doc"
 
 FILES_${PN}-dev += "${bindir}/libnet-config"
diff --git a/packages/libxml/libxml2-native_2.6.9.bb b/packages/libxml/libxml2-native_2.6.9.bb
index f83d974538..df3ab07460 100644
--- a/packages/libxml/libxml2-native_2.6.9.bb
+++ b/packages/libxml/libxml2-native_2.6.9.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "GNOME XML library"
 
-SRC_URI = "http://xmlsoft.org/sources/libxml2-${PV}.tar.gz"
+SRC_URI = "ftp://xmlsoft.org/libxml2/old/libxml2-${PV}.tar.gz"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxml2-${PV}"
 S = "${WORKDIR}/libxml2-${PV}"
diff --git a/packages/linux/linux-hackndev-2.6_svn.bb b/packages/linux/linux-hackndev-2.6_svn.bb
new file mode 100644
index 0000000000..32868b5570
--- /dev/null
+++ b/packages/linux/linux-hackndev-2.6_svn.bb
@@ -0,0 +1,78 @@
+DESCRIPTION = "Hack&Dev's Linux kernel for Palm devices."
+HOMEPAGE = "http://www.hackndev.com/"
+SECTION = "kernel"
+LICENSE = "GPL"
+
+COMPATIBLE_MACHINE = "(palmtx|palmld)"
+
+SRC_URI = "svn://svn.sourceforge.net/svnroot/hackndev/linux4palm/linux;module=trunk;proto=https \
+	   file://defconfig"
+
+SRC_URI_append_palmtx += "http://www.busybox.net/downloads/busybox-1.1.0.tar.bz2 \
+			  file://init \
+                          file://initramfs_list \
+                          file://busybox-config"
+
+S = "${WORKDIR}/trunk"
+
+K_MAJOR = "2"
+K_MINOR = "6"
+K_MICRO = "17"
+HHV="hnd0"
+PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-${HHV}"
+
+inherit kernel
+
+PACKAGE_ARCH_palmtx     = "palmtx"
+PACKAGE_ARCH_palmld	= "palmld"
+PACKAGE_ARCH_palmz72	= "palmz72"
+
+do_configure() {
+
+	if [ -f ${WORKDIR}/defconfig ]; then
+		install -m 0644 ${WORKDIR}/defconfig ${S}/.config || die "No configuration for ${MACHINE} available."
+	else
+		install -m 0644 ${S}/arch/arm/configs/${MACHINE}_defconfig ${S}/.config \
+			|| die "No default configuration for ${MACHINE} available."
+	fi
+
+	if [ "${TARGET_OS}" == "linux-gnueabi" -o  "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then
+                echo "CONFIG_AEABI=y"                   >> ${S}/.config
+                echo "CONFIG_OABI_COMPAT=y"             >> ${S}/.config
+        else
+                echo "# CONFIG_AEABI is not set"        >> ${S}/.config
+                echo "# CONFIG_OABI_COMPAT is not set"  >> ${S}/.config
+        fi
+
+	if [ -f ${WORKDIR}/initramfs_list ]; then
+		install -m 0644 ${WORKDIR}/busybox-config ${WORKDIR}/busybox-1.1.0/.config \
+                        || die "No busybox configuration available."
+
+	        echo "CROSS_COMPILER_PREFIX=\"${TARGET_PREFIX}\"" >> ${WORKDIR}/busybox-1.1.0/.config
+        	echo "USING_CROSS_COMPILER=y" >> ${WORKDIR}/busybox-1.1.0/.config
+
+                MY_UID=`id -u`
+                MY_GID=`id -g`
+
+		echo "CONFIG_INITRAMFS_SOURCE=\"../initramfs_list\"" >> ${S}/.config
+		echo "CONFIG_INITRAMFS_ROOT_UID=${MY_UID}" >> ${S}/.config
+		echo "CONFIG_INITRAMFS_ROOT_GID=${MY_GID}" >> ${S}/.config
+	else
+                echo "CONFIG_INITRAMFS_SOURCE=\"\"" >> ${S}/.config
+                echo "CONFIG_INITRAMFS_ROOT_UID=0" >> ${S}/.config
+                echo "CONFIG_INITRAMFS_ROOT_GID=0" >> ${S}/.config
+
+	fi
+
+        yes '' | oe_runmake oldconfig
+
+}
+
+
+do_compile_prepend() {
+	if [ -f ${WORKDIR}/initramfs_list ]; then
+                cd ${WORKDIR}/busybox-1.1.0
+                oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}'
+                cd -
+	fi
+}
diff --git a/packages/syslinux/syslinux-native_2.11.bb b/packages/syslinux/syslinux-native_2.11.bb
index 3d0c5e5ad8..a05728f0a5 100644
--- a/packages/syslinux/syslinux-native_2.11.bb
+++ b/packages/syslinux/syslinux-native_2.11.bb
@@ -1,38 +1,10 @@
-# syslinux-native OE build file
-# Copyright (C) 2004-2006, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-DESCRIPTION="A multi-purpose linux bootloader"
-HOMEPAGE="http://syslinux.zytor.com/"
-LICENSE="GPL"
-
 PR="r1"
 
 SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/Old/syslinux-${PV}.tar.bz2 \
-file://edx_assume_zero.patch;patch=1"
-
-S="${WORKDIR}/syslinux-${PV}"
-
-# If you really want to run syslinux, you need mtools.  We just want the
-# ldlinux.* stuff for now, so skip mtools-native
-
-DEPENDS="nasm-native"
+         file://edx_assume_zero.patch;patch=1"
 
-inherit native
+require syslinux.inc
 
 do_compile() {
 	oe_runmake syslinux
 }
-
-do_stage() {
-	install -d ${STAGING_BINDIR}
-	install -m 755 ${S}/syslinux ${STAGING_BINDIR}
-
-	# When building media, the syslinux binary isn't nearly as useful
-	# as the DOS data files, so we copy those into a special location
-	# for usage during a image build stage
-
-	install -d ${STAGING_DATADIR}/syslinux
-	install -m 644 ${S}/ldlinux.sys ${STAGING_DATADIR}/syslinux/ldlinux.sys
-	install -m 644 ${S}/ldlinux.bss ${STAGING_DATADIR}/syslinux/ldlinux.bss
-}
diff --git a/packages/syslinux/syslinux-native_3.11.bb b/packages/syslinux/syslinux-native_3.11.bb
index 90395a7ab2..28d750aab5 100644
--- a/packages/syslinux/syslinux-native_3.11.bb
+++ b/packages/syslinux/syslinux-native_3.11.bb
@@ -1,39 +1,5 @@
-# syslinux-native OE build file
-# Copyright (C) 2004-2006, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-DESCRIPTION="A multi-purpose linux bootloader"
-HOMEPAGE="http://syslinux.zytor.com/"
-LICENSE="GPL"
-
 PR="r1"
 
-SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 "
-
-S="${WORKDIR}/syslinux-${PV}"
-
-# If you really want to run syslinux, you need mtools.  We just want the
-# ldlinux.* stuff for now, so skip mtools-native
-
-DEPENDS="nasm-native"
-
-inherit native
-
-STAGE_TEMP="${WORKDIR}/stage_temp"
-
-do_stage() {
-	install -d ${STAGE_TEMP}
-	oe_runmake install INSTALLROOT="${STAGE_TEMP}"
-
-	install -d ${STAGING_BINDIR}
-	install -m 755 ${STAGE_TEMP}/usr/bin/syslinux ${STAGING_BINDIR}
-
-	# When building media, the syslinux binary isn't nearly as useful
-	# as the DOS data files, so we copy those into a special location
-	# for usage during a image build stage
+SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/Old/syslinux-${PV}.tar.bz2 "
 
-	install -d ${STAGING_DATADIR}/syslinux
-	install -m 0644 ${STAGE_TEMP}/usr/lib/syslinux/isolinux.bin ${STAGING_DATADIR}/syslinux/isolinux.bin
-	install -m 644 ${S}/ldlinux.sys ${STAGING_DATADIR}/syslinux/ldlinux.sys
-	install -m 644 ${S}/ldlinux.bss ${STAGING_DATADIR}/syslinux/ldlinux.bss
-}
+require syslinux3.inc
diff --git a/packages/syslinux/syslinux-native_3.31.bb b/packages/syslinux/syslinux-native_3.31.bb
new file mode 100644
index 0000000000..6971874ea3
--- /dev/null
+++ b/packages/syslinux/syslinux-native_3.31.bb
@@ -0,0 +1,3 @@
+SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 "
+
+require syslinux3.inc
diff --git a/packages/syslinux/syslinux.inc b/packages/syslinux/syslinux.inc
new file mode 100644
index 0000000000..41be168d12
--- /dev/null
+++ b/packages/syslinux/syslinux.inc
@@ -0,0 +1,29 @@
+# syslinux-native OE build file
+# Copyright (C) 2004-2006, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION="A multi-purpose linux bootloader"
+HOMEPAGE="http://syslinux.zytor.com/"
+LICENSE="GPL"
+
+# If you really want to run syslinux, you need mtools.  We just want the
+# ldlinux.* stuff for now, so skip mtools-native
+DEPENDS="nasm-native"
+
+S="${WORKDIR}/syslinux-${PV}"
+
+
+inherit native
+
+do_stage() {
+	install -d ${STAGING_BINDIR}
+	install -m 755 ${S}/syslinux ${STAGING_BINDIR}
+
+	# When building media, the syslinux binary isn't nearly as useful
+	# as the DOS data files, so we copy those into a special location
+	# for usage during a image build stage
+
+	install -d ${STAGING_DATADIR}/syslinux
+	install -m 644 ${S}/ldlinux.sys ${STAGING_DATADIR}/syslinux/ldlinux.sys
+	install -m 644 ${S}/ldlinux.bss ${STAGING_DATADIR}/syslinux/ldlinux.bss
+}
diff --git a/packages/syslinux/syslinux3.inc b/packages/syslinux/syslinux3.inc
new file mode 100644
index 0000000000..25942aab84
--- /dev/null
+++ b/packages/syslinux/syslinux3.inc
@@ -0,0 +1,20 @@
+require syslinux.inc
+
+STAGE_TEMP="${WORKDIR}/stage_temp"
+
+do_stage() {
+	install -d ${STAGE_TEMP}
+	oe_runmake install INSTALLROOT="${STAGE_TEMP}"
+
+	install -d ${STAGING_BINDIR}
+	install -m 755 ${STAGE_TEMP}/usr/bin/syslinux ${STAGING_BINDIR}
+
+	# When building media, the syslinux binary isn't nearly as useful
+	# as the DOS data files, so we copy those into a special location
+	# for usage during a image build stage
+
+	install -d ${STAGING_DATADIR}/syslinux
+	install -m 0644 ${STAGE_TEMP}/usr/lib/syslinux/isolinux.bin ${STAGING_DATADIR}/syslinux/isolinux.bin
+	install -m 644 ${S}/ldlinux.sys ${STAGING_DATADIR}/syslinux/ldlinux.sys
+	install -m 644 ${S}/ldlinux.bss ${STAGING_DATADIR}/syslinux/ldlinux.bss
+}
diff --git a/packages/tin/files/configure.patch b/packages/tin/files/configure.patch
deleted file mode 100644
index 4059fe086f..0000000000
--- a/packages/tin/files/configure.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- tin-1.7.3/configure.in~configure
-+++ tin-1.7.3/configure.in
-@@ -34,8 +34,9 @@
- dnl
- dnl Process this file with autoconf to produce a configure script.
- 
--AC_PREREQ(2.13.20020210)
--AC_INIT(include/tin.h)
-+AC_PREREQ(2.57)
-+AC_INIT
-+AC_CONFIG_SRCDIR([include/tin.h])
- AC_CONFIG_HEADER(include/autoconf.h:include/autoconf.hin)
- AC_PREFIX_DEFAULT(/usr/local)
- 
-@@ -406,7 +407,7 @@
- 		CF_NCURSES_LIBS(ncursesw)
- 		CF_NCURSES_VERSION
- 		CF_XOPEN_CURSES
--		test "$cf_cv_need_xopen_extension" = unknown && AC_ERROR(X/Open curses not found)
-+		test "$cf_cv_need_xopen_extension" = unknown && AC_MSG_ERROR([X/Open curses not found])
- 		;;
- 	curses) #(vi
- 		CF_CURSES_CPPFLAGS
-@@ -432,25 +433,25 @@
- fi
- 
- ## debugging libraries (do this after other libraries)
--AC_MSG_CHECKING(if you want dbmalloc library)
-+AC_MSG_CHECKING([if you want dbmalloc library])
- debug_malloc=none
--AC_ARG_WITH(dbmalloc,
-+AC_ARG_WITH([dbmalloc],
- 	[  --with-dbmalloc         use Conor Cahill's dbmalloc library],
--	[AC_MSG_RESULT(yes)
--	 AC_CHECK_LIB(dbmalloc,debug_malloc,
--	 AC_CHECK_HEADER(dbmalloc.h,debug_malloc=DBMALLOC))],
--	AC_MSG_RESULT(no))
-+	[AC_MSG_RESULT([yes])
-+	 AC_CHECK_LIB([dbmalloc],[debug_malloc],[
-+	 AC_CHECK_HEADER([dbmalloc.h],[debug_malloc=DBMALLOC])])],
-+	AC_MSG_RESULT([no]))
- 
--AC_MSG_CHECKING(if you want dmalloc library)
--AC_ARG_WITH(dmalloc,
-+AC_MSG_CHECKING([if you want dmalloc library])
-+AC_ARG_WITH([dmalloc],
- 	[  --with-dmalloc          use Gray Watson's dmalloc library],
- 	[AC_MSG_RESULT(yes)
--	 AC_CHECK_LIB(dmalloc,dmalloc_debug,
--	 AC_CHECK_HEADER(dmalloc.h,debug_malloc=DMALLOC))],
-+	 AC_CHECK_LIB([dmalloc],[dmalloc_debug],[
-+	 AC_CHECK_HEADER([dmalloc.h],[debug_malloc=DMALLOC])])],
- 	AC_MSG_RESULT(no))
- 
--AC_MSG_CHECKING(if you want debugging-trace)
--AC_ARG_WITH(trace,
-+AC_MSG_CHECKING([if you want debugging-trace])
-+AC_ARG_WITH([trace],
- 	[  --with-trace            use debugging/traces],
- 	[use_trace=yes],
- 	[use_trace=no])
-@@ -667,7 +668,7 @@
- 
- ### checks for compiler characteristics
- CF_MAKEFLAGS
--AC_LANG_C
-+AC_LANG([C])
- AC_C_CONST
- AC_C_INLINE
- CF_CPP_EXPANDS
-@@ -763,14 +764,13 @@
- 
- dnl test to see if quad_t is defined
- AC_MSG_CHECKING(for quad_t)
--AC_TRY_COMPILE([
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <sys/types.h>
- #if 0
- #include <stdlib.h>
- #include <stddef.h>
- #endif /* 0 */
--],[quad_t x; x = 0],
--ac_cv_quad_t=yes, ac_cv_quad_t=no)
-+]], [[quad_t x; x = 0]])],[ac_cv_quad_t=yes],[ac_cv_quad_t=no])
- AC_MSG_RESULT($ac_cv_quad_t)
- if test $ac_cv_quad_t = yes; then
- 	AC_DEFINE(HAVE_QUAD_T)
-@@ -778,10 +778,9 @@
- 
- dnl test to see if long long is defined
- AC_MSG_CHECKING(for long long)
--AC_TRY_COMPILE([
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <sys/types.h>
--],[long long x; x = 0],
--ac_cv_long_long=yes, ac_cv_long_long=no)
-+]], [[long long x; x = 0]])],[ac_cv_long_long=yes],[ac_cv_long_long=no])
- AC_MSG_RESULT($ac_cv_long_long)
- if test $ac_cv_long_long = yes; then
- 	AC_DEFINE(HAVE_LONG_LONG)
-@@ -789,7 +788,7 @@
- 
- dnl test to see if nl_item is defined
- AC_MSG_CHECKING(for nl_item)
--AC_TRY_COMPILE([
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #ifdef HAVE_LANGINFO_H
- #include <langinfo.h>
- #else
-@@ -797,8 +796,7 @@
- #include <nl_types.h>
- #endif
- #endif
--],[nl_item x; x = 0],
--ac_cv_nl_item=yes, ac_cv_nl_item=no)
-+]], [[nl_item x; x = 0]])],[ac_cv_nl_item=yes],[ac_cv_nl_item=no])
- AC_MSG_RESULT($ac_cv_nl_item)
- if test $ac_cv_nl_item = yes; then
-         AC_DEFINE(HAVE_NL_ITEM)
-@@ -845,14 +843,13 @@
- 		cf_save_LIBS="$LIBS"
- 		cf_try_icuuc="no"
- 		LIBS="$LIBS -licuuc"
--		AC_TRY_LINK([#include <unicode/unorm.h>], [
-+		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <unicode/unorm.h>]], [[
- 			int32_t needed, ustr = NULL;
-  			UErrorCode status;
--			needed = unorm_normalize(ustr, -1, UNORM_DEFAULT, 0, NULL, 0, &status);], [
-+			needed = unorm_normalize(ustr, -1, UNORM_DEFAULT, 0, NULL, 0, &status);]])],[
- 			AC_DEFINE(HAVE_LIBICUUC)
--			cf_try_icuuc="yes"],
--			LIBS=$cf_save_LIBS
--		)
-+			cf_try_icuuc="yes"],[LIBS=$cf_save_LIBS
-+		])
- 		AC_MSG_RESULT($cf_try_icuuc)
- 	])
- ])
-@@ -866,15 +863,13 @@
- 	AC_MSG_CHECKING(if we should include termcap.h)
- 	cf_save_CFLAGS="$CFLAGS"
- 	CFLAGS="$CFLAGS -I$srcdir/include"
--	AC_TRY_COMPILE([
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #define HAVE_TERMCAP_H 1
--#include <tcurses.h>],[
-+#include <tcurses.h>]], [[
- #ifdef NCURSES_VERSION
- make an error
- #endif
--],
--		[cf_result=yes],
--		[cf_result=no])
-+]])],[cf_result=yes],[cf_result=no])
- 	AC_MSG_RESULT($cf_result)
- 	CFLAGS="$cf_save_CFLAGS"
- 	test $cf_result = yes && AC_DEFINE(HAVE_TERMCAP_H)
-@@ -889,8 +884,7 @@
- 	cf_tc_externs="$cf_tc_funcs tgoto tigetstr tputs tigetflag"
- elif test ".$cf_cv_termlib" = .termcap ; then
- 	# BSD 'tputs()' may need 'PC' to be set.
--	AC_TRY_LINK([],[extern char PC; PC = 0],
--		[AC_DEFINE(HAVE_EXTERN_TCAP_PC)])
-+	AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[extern char PC; PC = 0]])],[AC_DEFINE(HAVE_EXTERN_TCAP_PC)],[])
- 	cf_tc_funcs="tgetint tgetnum tparam tparm"
- 	cf_tc_externs="$cf_tc_funcs tgoto tgetstr tputs tgetent tgetflag"
- fi
-@@ -1172,7 +1166,7 @@
- 
- CF_CHECK_HEADERS(iconv.h)
- AC_MSG_CHECKING(for iconv_open() //TRANSLIT extension)
--AC_TRY_RUN([
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #ifdef HAVE_ICONV_H
- #	include <iconv.h>
- #endif /* HAVE_ICONV_H */
-@@ -1185,11 +1179,8 @@
- 	if ((cd = iconv_open("US-ASCII//TRANSLIT", "ISO-8859-1")) == (iconv_t) (-1))
- 		exit(1);
- 	exit(0);
--}],
--	AC_DEFINE(HAVE_ICONV_OPEN_TRANSLIT) AC_MSG_RESULT(yes),
--	AC_MSG_RESULT(no),
--	AC_MSG_RESULT(unknown)
--)
-+}]])],[AC_DEFINE(HAVE_ICONV_OPEN_TRANSLIT) AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)],[AC_MSG_RESULT(unknown)
-+])
- 
- 
- # tin has mkdirs.sh instead of mkinstalldirs, overwrite the result of test
-@@ -1223,6 +1214,7 @@
- CF_DEFINE_STRING(TIN_LDFLAGS,  "$LDFLAGS")
- CF_DEFINE_STRING(TIN_LIBS,     "$LIBS")
- 
--AC_OUTPUT($PCRE_MAKEFILE
-+AC_CONFIG_FILES([$PCRE_MAKEFILE
- 	$SUB_MAKEFILE
--	src/Makefile)
-+	src/Makefile])
-+AC_OUTPUT
diff --git a/packages/tin/files/makecfg-buildcc.patch b/packages/tin/files/makecfg-buildcc.patch
deleted file mode 100644
index 2b3dba44f9..0000000000
--- a/packages/tin/files/makecfg-buildcc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- tin-1.7.3/src/Makefile.in~makecfg-buildcc
-+++ tin-1.7.3/src/Makefile.in
-@@ -462,7 +462,7 @@
- 	./makecfg $(SRCDIR)/tincfg.tbl tincfg.h
- 
- makecfg$(EXEEXT):		$(OBJDIR)/makecfg.o
--	$(LD) $(LDFLAGS) -o $@ $(OBJDIR)/makecfg.o @LIBS@
-+	$(BUILD_CC) $(BUILD_LDFLAGS) -o $@ $(OBJDIR)/makecfg.o
- 
- $(OBJDIR)/active.o:		$(SRCDIR)/active.c $(TIN_DEP)
- $(OBJDIR)/art.o:		$(SRCDIR)/art.c $(TIN_DEP) \
-@@ -519,6 +519,7 @@
- $(OBJDIR)/main.o:		$(SRCDIR)/main.c $(TIN_DEP) \
- 				$(INCDIR)/version.h
- $(OBJDIR)/makecfg.o:		$(SRCDIR)/makecfg.c $(TIN_DEP)
-+	$(BUILD_CC) $(BUILD_CFLAGS) -c -I../include -I../pcre -o $@ $(SRCDIR)/makecfg.c
- $(OBJDIR)/memory.o:		$(SRCDIR)/memory.c $(TIN_DEP) \
- 				$(INCDIR)/rfc2046.h
- $(OBJDIR)/mimetypes.o:		$(SRCDIR)/mimetypes.c $(TIN_DEP)
diff --git a/packages/tin/tin.inc b/packages/tin/tin.inc
new file mode 100644
index 0000000000..e66fe8c67a
--- /dev/null
+++ b/packages/tin/tin.inc
@@ -0,0 +1,8 @@
+DESCRIPTION = "Tin is a powerful text mode news reader."
+SECTION = "console/network"
+DEPENDS = "ncurses libpcre"
+LICENSE = "GPL"
+
+inherit autotools 
+
+EXTRA_OECONF = "--with-screen=ncurses --with-pcre=${STAGING_LIBDIR}/.."
diff --git a/packages/tin/tin_1.7.3.bb b/packages/tin/tin_1.7.3.bb
deleted file mode 100644
index 58726d7a27..0000000000
--- a/packages/tin/tin_1.7.3.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "Tin is a powerful text mode news reader."
-SECTION = "console/network"
-DEPENDS = "ncurses"
-LICENSE = "GPL"
-PR = "r3"
-
-SRC_URI = "ftp://ftp.tin.org/pub/news/clients/tin/unstable/tin-${PV}.tar.gz \
-	   file://makecfg-buildcc.patch;patch=1 \
-	   file://m4.patch;patch=1 \
-	   file://configure.patch;patch=1"
-
-inherit autotools
-
-EXTRA_OECONF = "--with-screen=ncurses"
-CFLAGS += "-DM_UNIX"
-
-do_compile() {
-        ${BUILD_CC} -DLINK_SIZE=2 -I${S}/include -c pcre/dftables.c
-        ${BUILD_CC} dftables.o -o pcre/dftables
-        oe_runmake build
-}
diff --git a/packages/tin/tin_1.9.1.bb b/packages/tin/tin_1.9.1.bb
index dcf53bd8b5..2b783b2a58 100644
--- a/packages/tin/tin_1.9.1.bb
+++ b/packages/tin/tin_1.9.1.bb
@@ -1,16 +1,11 @@
-DESCRIPTION = "Tin is a powerful text mode news reader."
-SECTION = "console/network"
-DEPENDS = "ncurses pcre"
-LICENSE = "GPL"
+require tin.inc
+
 PR = "r0"
 
-SRC_URI = "ftp://ftp.tin.org/pub/news/clients/tin/unstable/tin-${PV}.tar.gz \
+SRC_URI = "ftp://ftp.tin.org/pub/news/clients/tin/v1.9/tin-${PV}.tar.gz \
 	   file://m4.patch;patch=1"
 
-inherit autotools
-
 PARALLEL_MAKE = ""
-EXTRA_OECONF = "--with-screen=ncurses --with-pcre=${STAGING_LIBDIR}/.."
 
 export BUILD_CFLAGS += "-I${S}/include -DHAVE_CONFIG_H"
 
diff --git a/packages/uboot/u-boot_git.bb b/packages/uboot/u-boot_git.bb
new file mode 100644
index 0000000000..fa59bab085
--- /dev/null
+++ b/packages/uboot/u-boot_git.bb
@@ -0,0 +1,40 @@
+DESCRIPTION = "U-boot bootloader"
+PROVIDES = "virtual/bootloader"
+SECTION = "bootloader"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git "
+
+S = "${WORKDIR}/git"
+
+#EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CFLAGS="" CPPFLAGS="" LDFLAGS="""
+EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
+
+UBOOT_MACHINE ?= "${MACHINE}_config"
+UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+#inherit base
+
+do_compile () {
+	unset LDFLAGS
+	unset CFLAGS
+	unset CPPFLAGS
+	oe_runmake ${UBOOT_MACHINE}
+	oe_runmake all
+}
+
+do_stage() {
+	install -m 755 tools/mkimage ${STAGING_BINDIR_NATIVE}
+}
+
+do_deploy () {
+	install -d ${DEPLOY_DIR_IMAGE}
+	install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
+}
+do_deploy[dirs] = "${S}"
+addtask deploy before do_build after do_compile
diff --git a/packages/uboot/uboot-devkitidp-pxa255_cvs.bb b/packages/uboot/uboot-devkitidp-pxa255_cvs.bb
index a41d5d7082..4e50706087 100644
--- a/packages/uboot/uboot-devkitidp-pxa255_cvs.bb
+++ b/packages/uboot/uboot-devkitidp-pxa255_cvs.bb
@@ -1,4 +1,37 @@
-require uboot_cvs.bb
+BROKEN = "1"
+#not fetchable patch used
 
+DESCRIPTION = "U-boot bootloader"
+SECTION = "bootloader"
+PRIORITY = "optional"
+LICENSE = "GPL"
+SRCDATE = "20050818"
+PV = "0.0+cvs${SRCDATE}"
+PR = "r3"
+
+PROVIDES = "virtual/bootloader"
+
+S = "${WORKDIR}/u-boot"
+
+SRC_URI = "cvs://anonymous@u-boot.cvs.sourceforge.net/cvsroot/u-boot;module=u-boot \
+	   file://arm_flags.patch;patch=1 \
+	   ftp://ftp.accelent.com/pxa255_idp/uboot/u-boot-1.1.2-cvs20050818-r2-pxa255idp1.patch;patch=1"
+
+EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
+TARGET_LDFLAGS = ""
 UBOOT_MACHINE = "pxa255_idp_config"
-SRC_URI += "ftp://ftp.accelent.com/pxa255_idp/uboot/u-boot-1.1.2-cvs20050818-r2-pxa255idp1.patch;patch=1"
+
+inherit base
+
+do_compile () {
+	oe_runmake ${UBOOT_MACHINE}
+	oe_runmake all
+}
+
+do_deploy () {
+	install -d ${DEPLOY_DIR_IMAGE}
+	install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}-${DATETIME}.bin
+}
+do_deploy[dirs] = "${S}"
+addtask deploy before do_build after do_compile
+
diff --git a/packages/uboot/uboot_cvs.bb b/packages/uboot/uboot_cvs.bb
deleted file mode 100644
index 617babcf4a..0000000000
--- a/packages/uboot/uboot_cvs.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "U-boot bootloader"
-SECTION = "bootloader"
-PRIORITY = "optional"
-LICENSE = "GPL"
-PV = "0.0+cvs${SRCDATE}"
-PR = "r2"
-
-PROVIDES = "virtual/bootloader"
-
-S = "${WORKDIR}/u-boot"
-
-SRC_URI = "cvs://anonymous@u-boot.cvs.sourceforge.net/cvsroot/u-boot;module=u-boot \
-	   file://arm_flags.patch;patch=1"
-
-EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
-TARGET_LDFLAGS = ""
-UBOOT_MACHINE ?= "${MACHINE}"
-
-inherit base
-
-do_compile () {
-	oe_runmake ${UBOOT_MACHINE}
-	oe_runmake all
-}
-
-do_deploy () {
-	install -d ${DEPLOY_DIR_IMAGE}
-	install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}-${DATETIME}.bin
-}
-do_deploy[dirs] = "${S}"
-addtask deploy before do_build after do_compile
diff --git a/packages/zip/zip-native_2.31.bb b/packages/zip/zip-native_2.31.bb
deleted file mode 100644
index fde61efcb7..0000000000
--- a/packages/zip/zip-native_2.31.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-SECTION = "console/utils"
-inherit native
-require zip_${PV}.bb
-S = "${WORKDIR}/zip-${PV}"
-
-do_stage() {
-	install -d ${STAGING_BINDIR}
-	install zip zipnote zipsplit zipcloak ${STAGING_BINDIR}
-}
diff --git a/packages/zip/zip_2.31.bb b/packages/zip/zip_2.31.bb
deleted file mode 100644
index b8c4ae9da0..0000000000
--- a/packages/zip/zip_2.31.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require zip.inc
-PR="r0"