merge of 72da6517a613608cf82abf0dfaac25e03fbf478b

     and 81310a82efd8fa4b4ce7bd707ed734f3ce153c46

56 files changed, 45393 insertions, 855 deletions

diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf
index 467b472db8..28b85cd57e 100644
--- a/conf/distro/slugos-packages.conf
+++ b/conf/distro/slugos-packages.conf
@@ -91,6 +91,8 @@ ${PKGDIR}/packages/libaal/*.bb \
 ${PKGDIR}/packages/libao/*.bb \
 ${PKGDIR}/packages/libdvb/*.bb \
 ${PKGDIR}/packages/libexif/*.bb \
+${PKGDIR}/packages/libgcrypt/*.bb \
+${PKGDIR}/packages/libgpg-error/*.bb \
 ${PKGDIR}/packages/libgphoto2/*.bb \
 ${PKGDIR}/packages/libgsm/*.bb \
 ${PKGDIR}/packages/libiconv/*.bb \
@@ -218,6 +220,7 @@ ${PKGDIR}/packages/usbutils/*.bb \
 ${PKGDIR}/packages/util-linux/*.bb \
 ${PKGDIR}/packages/vim/*.bb \
 ${PKGDIR}/packages/vlan/*.bb \
+${PKGDIR}/packages/vpnc/*.bb \
 ${PKGDIR}/packages/vsftpd/*.bb \
 ${PKGDIR}/packages/wakelan/*.bb \
 ${PKGDIR}/packages/wget/*.bb \
diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf
new file mode 100644
index 0000000000..7eed2b3748
--- /dev/null
+++ b/conf/machine/ep93xx.conf
@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@Name: Cirrus Logic EP-93xx Development Platform
+#@DESCRIPTION: Machine configuration for Cirrus Logic EP-93xx Development Platform
+
+TARGET_ARCH = "arm"
+
+IPKG_ARCHS = "all arm armv5te ${MACHINE}"
+
+PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
+
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0"
+
+# used by some images
+ROOT_FLASH_SIZE = "8"
+
+
diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.conf
index 7239d59076..639bf4a74e 100644
--- a/conf/machine/include/ixp4xx.conf
+++ b/conf/machine/include/ixp4xx.conf
@@ -161,7 +161,7 @@ SRCDATE_irssi ?= "20050930"
 CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
 INHERIT += "nslu2-mirrors"
 
-PREFERRED_VERSION_ipkg ?= "0.99.155"
+PREFERRED_VERSION_ipkg ?= "0.99.154"
 PREFERRED_VERSION_ipkg-native ?= "0.99.154"
 
 #-------------------------------------------------------------------------------
diff --git a/packages/altboot/altboot.bb b/packages/altboot/altboot.bb
index b0639e9251..ef87e880c9 100644
--- a/packages/altboot/altboot.bb
+++ b/packages/altboot/altboot.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges  <oe@hentges.net>"
 LICENSE = "GPL"
 IGNORE_STRIP_ERRORS = "1"
 
-PR = "r18"
+PR = "r19"
 
 
 SRC_URI = "file://altboot-menu \
diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func
index 5651ef9f9d..6dfad21374 100644
--- a/packages/altboot/files/altboot.func
+++ b/packages/altboot/files/altboot.func
@@ -120,6 +120,7 @@ pivot_image() {
 	losetup /dev/loop0 $1/$IMAGE_PATH/$IMAGE_NAME || die "losetup /dev/loop0 $1/$IMAGE_PATH/$IMAGE_NAME failed!"
 	check_fs /dev/loop0 $IMAGE_TYPE
 
+	losetup -d /dev/loop0
 	echo -e "\n* * * Booting rootfs image * * *\n"
 
 
@@ -130,7 +131,7 @@ pivot_image() {
 	fi
 	# If mount fails it has the tendency to spew out a _lot_ of error messages.
 	# We direct the output to /dev/null so the user can see which step actually failed.
-	mount -t $IMAGE_TYPE /dev/loop0 /media/image >/dev/null 2>&1 || die "mount -t $IMAGE_TYPE /dev/loop0 /media/image failed!"
+	mount -o loop -t $IMAGE_TYPE $1/$IMAGE_PATH/$IMAGE_NAME /media/image >/dev/null 2>&1 || die "mount -t $IMAGE_TYPE /dev/loop0 /media/image failed!"
 
 	mkdir -p /media/image/media/ROM || die "mkdir -p /media/image/media/ROM failed"
 
diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot
index 2ef804d99c..eb321ad456 100644
--- a/packages/altboot/files/init.altboot
+++ b/packages/altboot/files/init.altboot
@@ -297,10 +297,16 @@ else
 	set_password >/dev/tty0 
 	
 	test "$ASK_PW_ON_BOOT" = "yes" && verify_master_pw >/dev/tty0 
+
+
+	# When started with -force, always print the menu
+	echo "$*" | grep -q "-force" && TIMEOUT=0
+
 	
 	# This timeout works by reading /proc/interrupts to see if the keyboard interrupt
 	# increases while the timer is running. A TIMEOUT of 0 will always launch altboot.	
 	run_timer >/dev/tty1 2>&1
+
 		
 	echo "" >/dev/tty0
 	
diff --git a/packages/busybox/busybox-1.00/uclibc_posix.patch b/packages/busybox/busybox-1.00/uclibc_posix.patch
new file mode 100644
index 0000000000..aefb994068
--- /dev/null
+++ b/packages/busybox/busybox-1.00/uclibc_posix.patch
@@ -0,0 +1,20 @@
+see http://www.busybox.net/lists/busybox/2004-December/013276.html
+
+--- busybox-old/libbb/loop.c	2004-08-16 04:36:28.000000000 -0400
++++ busybox/libbb/loop.c	2004-12-04 23:45:58.000000000 -0500
+@@ -19,6 +19,7 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+  */
+ 
++#include <asm/posix_types.h>
+ #include <stdio.h>
+ #include <errno.h>
+ #include <fcntl.h>
+@@ -30,7 +31,6 @@
+ /* Grumble...  The 2.6.x kernel breaks asm/posix_types.h
+  * so we get to try and cope as best we can... */
+ #include <linux/version.h>
+-#include <asm/posix_types.h>
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+ #define __bb_kernel_dev_t   __kernel_old_dev_t
diff --git a/packages/busybox/busybox-1.01/uclibc_posix.patch b/packages/busybox/busybox-1.01/uclibc_posix.patch
new file mode 100644
index 0000000000..aefb994068
--- /dev/null
+++ b/packages/busybox/busybox-1.01/uclibc_posix.patch
@@ -0,0 +1,20 @@
+see http://www.busybox.net/lists/busybox/2004-December/013276.html
+
+--- busybox-old/libbb/loop.c	2004-08-16 04:36:28.000000000 -0400
++++ busybox/libbb/loop.c	2004-12-04 23:45:58.000000000 -0500
+@@ -19,6 +19,7 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+  */
+ 
++#include <asm/posix_types.h>
+ #include <stdio.h>
+ #include <errno.h>
+ #include <fcntl.h>
+@@ -30,7 +31,6 @@
+ /* Grumble...  The 2.6.x kernel breaks asm/posix_types.h
+  * so we get to try and cope as best we can... */
+ #include <linux/version.h>
+-#include <asm/posix_types.h>
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+ #define __bb_kernel_dev_t   __kernel_old_dev_t
diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb
index f1ea81a7b8..5b770669c1 100644
--- a/packages/busybox/busybox_1.00.bb
+++ b/packages/busybox/busybox_1.00.bb
@@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r31"
+PR = "r32"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://add-getkey-applet.patch;patch=1 \
@@ -28,6 +28,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 	   file://dhcp-hostname.patch;patch=1 \
 	   file://gzip-spurious-const.patch;patch=1 \
 	   file://ifupdown-spurious-environ.patch;patch=1 \
+           file://uclibc_posix.patch;patch=1 \
            file://defconfig \
            file://busybox-cron \
 	   file://busybox-httpd \
diff --git a/packages/busybox/busybox_1.01.bb b/packages/busybox/busybox_1.01.bb
index 4b6101b8bf..3173294398 100644
--- a/packages/busybox/busybox_1.01.bb
+++ b/packages/busybox/busybox_1.01.bb
@@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 	   file://udhcppidfile.patch;patch=1 \
@@ -28,6 +28,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 	   file://rmmod.patch;patch=1 \
 	   file://udhcpscript.patch;patch=1 \
 	   file://thumb-bsdlabel.patch;patch=1 \
+           file://uclibc_posix.patch;patch=1 \
            file://defconfig \
            file://busybox-cron \
 	   file://busybox-httpd \
diff --git a/packages/gnome/libbonobo-2.6.0/.mtn2git_empty b/packages/gnome/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gnome/libbonobo-2.6.0/.mtn2git_empty
+++ b/packages/gnome/files/.mtn2git_empty
diff --git a/packages/gnome/libbonobo-2.6.0/gtk-doc.m4 b/packages/gnome/files/gtk-doc.m4
index 3ec41666b2..3ec41666b2 100644
--- a/packages/gnome/libbonobo-2.6.0/gtk-doc.m4
+++ b/packages/gnome/files/gtk-doc.m4
diff --git a/packages/gnome/libbonobo-2.6.0/gtk-doc.make b/packages/gnome/files/gtk-doc.make
index c319e7ad7c..c319e7ad7c 100644
--- a/packages/gnome/libbonobo-2.6.0/gtk-doc.make
+++ b/packages/gnome/files/gtk-doc.make
diff --git a/packages/gnome/gnome-vfs-dbus/glib-after-nameser.patch b/packages/gnome/gnome-vfs-dbus/glib-after-nameser.patch
new file mode 100644
index 0000000000..87bf7c3939
--- /dev/null
+++ b/packages/gnome/gnome-vfs-dbus/glib-after-nameser.patch
@@ -0,0 +1,18 @@
+--- trunk/libgnomevfs/gnome-vfs-resolve.c.orig	2006-02-08 19:18:43.000000000 +0100
++++ trunk/libgnomevfs/gnome-vfs-resolve.c	2006-02-08 19:21:42.000000000 +0100
+@@ -23,7 +23,6 @@
+ 
+ #include <errno.h>
+ #include <string.h>
+-#include <glib.h>
+ #ifndef G_OS_WIN32
+ /* Keep <sys/types.h> above the network includes for FreeBSD. */
+ #include <sys/types.h>
+@@ -48,6 +47,7 @@
+ #define RELOAD_TIMEVAL 2
+ #endif
+ 
++#include <glib.h>
+ #include <glib-object.h>
+ 
+ #include <libgnomevfs/gnome-vfs-resolve.h>
diff --git a/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb b/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb
index 4f2a861eb2..5717115ebc 100644
--- a/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb
+++ b/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb
@@ -81,7 +81,7 @@ do_install() {
 	oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
 }
 
-PACKAGES_DYNAMIC = "gnome=vfs-plugin-*"
+PACKAGES_DYNAMIC = "gnome-vfs-plugin-*"
 
 python populate_packages_prepend () {
 	print bb.data.getVar('FILES_gnome-vfs', d, 1)
diff --git a/packages/gnome/gnome-vfs-dbus_svn.bb b/packages/gnome/gnome-vfs-dbus_svn.bb
index 2cde0552b9..c4612808ed 100644
--- a/packages/gnome/gnome-vfs-dbus_svn.bb
+++ b/packages/gnome/gnome-vfs-dbus_svn.bb
@@ -15,9 +15,11 @@ RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info"
 SRC_URI = "svn://developer.imendio.com/svn/gnome-vfs-dbus;module=trunk;proto=http \
            file://gssapi.patch;patch=1;pnum=1 \
            file://gconftool-lossage.patch;patch=1;pnum=1 \
-	   file://werror_compile.patch;patch=1;pnum=1 \
+           file://glib-after-nameser.patch;patch=1;pnum=1 \
 	   file://gtk-doc.m4 \
 	   file://gtk-doc.make"
+# Missing patch
+#	   file://werror_compile.patch;patch=1;pnum=1
 
 EXTRA_OECONF = "--with-ipc=dbus --disable-gtk-doc"
 S = "${WORKDIR}/trunk"
@@ -94,7 +96,7 @@ do_install() {
 	oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
 }
 
-PACKAGES_DYNAMIC = "gnome=vfs-plugin-*"
+PACKAGES_DYNAMIC = "gnome-vfs-plugin-*"
 
 python populate_packages_prepend () {
 	print bb.data.getVar('FILES_gnome-vfs', d, 1)
diff --git a/packages/gnome/libbonobo-2.6.2/.mtn2git_empty b/packages/gnome/libart-lgpl/i586/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gnome/libbonobo-2.6.2/.mtn2git_empty
+++ b/packages/gnome/libart-lgpl/i586/.mtn2git_empty
diff --git a/packages/gnome/libart-lgpl/i586/art_config.h b/packages/gnome/libart-lgpl/i586/art_config.h
new file mode 100644
index 0000000000..b0e74ad6ae
--- /dev/null
+++ b/packages/gnome/libart-lgpl/i586/art_config.h
@@ -0,0 +1,10 @@
+/* Automatically generated by gen_art_config.c */
+
+#define ART_SIZEOF_CHAR 1
+#define ART_SIZEOF_SHORT 2
+#define ART_SIZEOF_INT 4
+#define ART_SIZEOF_LONG 4
+
+typedef unsigned char art_u8;
+typedef unsigned short art_u16;
+typedef unsigned int art_u32;
diff --git a/packages/gnome/libbonobo-2.6.2/gtk-doc.m4 b/packages/gnome/libbonobo-2.6.2/gtk-doc.m4
deleted file mode 100644
index 3ec41666b2..0000000000
--- a/packages/gnome/libbonobo-2.6.2/gtk-doc.m4
+++ /dev/null
@@ -1,53 +0,0 @@
-dnl -*- mode: autoconf -*-
-
-# serial 1
-
-dnl Usage:
-dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
-AC_DEFUN([GTK_DOC_CHECK],
-[
-  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-  dnl for overriding the documentation installation directory
-  AC_ARG_WITH(html-dir,
-    AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-    [with_html_dir='${datadir}/gtk-doc/html'])
-  HTML_DIR="$with_html_dir"
-  AC_SUBST(HTML_DIR)
-
-  dnl enable/disable documentation building
-  AC_ARG_ENABLE(gtk-doc,
-    AC_HELP_STRING([--enable-gtk-doc],
-                   [use gtk-doc to build documentation [default=no]]),,
-    enable_gtk_doc=no)
-
-  have_gtk_doc=no
-  if test -z "$PKG_CONFIG"; then
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-  fi
-  if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
-    have_gtk_doc=yes
-  fi
-
-  dnl do we want to do a version check?
-ifelse([$1],[],,
-  [gtk_doc_min_version=$1
-  if test "$have_gtk_doc" = yes; then
-    AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
-    if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
-      AC_MSG_RESULT(yes)
-    else
-      AC_MSG_RESULT(no)
-      have_gtk_doc=no
-    fi
-  fi
-])
-  if test x$enable_gtk_doc = xyes; then
-    if test "$have_gtk_doc" != yes; then
-      enable_gtk_doc=no
-    fi
-  fi
-
-  AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
-])
diff --git a/packages/gnome/libbonobo-2.6.2/gtk-doc.make b/packages/gnome/libbonobo-2.6.2/gtk-doc.make
deleted file mode 100644
index c319e7ad7c..0000000000
--- a/packages/gnome/libbonobo-2.6.2/gtk-doc.make
+++ /dev/null
@@ -1,148 +0,0 @@
-# -*- mode: makefile -*-
-
-####################################
-# Everything below here is generic #
-####################################
-
-if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
-else
-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
-endif
-
-# We set GPATH here; this gives us semantics for GNU make
-# which are more like other make's VPATH, when it comes to
-# whether a source that is a target of one rule is then
-# searched for in VPATH/GPATH.
-#
-GPATH = $(srcdir)
-
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-
-EXTRA_DIST = 				\
-	$(content_files)		\
-	$(HTML_IMAGES)			\
-	$(DOC_MAIN_SGML_FILE)		\
-	$(DOC_MODULE).types		\
-	$(DOC_MODULE)-sections.txt	\
-	$(DOC_MODULE)-overrides.txt
-
-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
-
-SCANOBJ_FILES = 		 \
-	$(DOC_MODULE).args 	 \
-	$(DOC_MODULE).hierarchy  \
-	$(DOC_MODULE).interfaces \
-	$(DOC_MODULE).prerequisites \
-	$(DOC_MODULE).signals
-
-CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-scan.o $(DOC_MODULE)-unused.txt $(DOC_STAMPS)
-
-if ENABLE_GTK_DOC
-all-local: html-build.stamp
-
-#### scan ####
-
-scan-build.stamp: $(HFILE_GLOB)
-	@echo '*** Scanning header files ***'
-	@-chmod -R u+w $(srcdir)
-	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
-	else \
-	    cd $(srcdir) ; \
-	    for i in $(SCANOBJ_FILES) ; do \
-               test -f $$i || touch $$i ; \
-	    done \
-	fi
-	cd $(srcdir) && \
-	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
-	touch scan-build.stamp
-
-$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
-	@true
-
-#### templates ####
-
-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	@echo '*** Rebuilding template files ***'
-	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
-	touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
-	@true
-
-#### xml ####
-
-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
-	@echo '*** Building XML ***'
-	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && \
-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml $(MKDB_OPTIONS)
-	touch sgml-build.stamp
-
-sgml.stamp: sgml-build.stamp
-	@true
-
-#### html ####
-
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo '*** Building HTML ***'
-	@-chmod -R u+w $(srcdir)
-	rm -rf $(srcdir)/html 
-	mkdir $(srcdir)/html
-	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-	@echo '-- Fixing Crossreferences' 
-	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-	touch html-build.stamp
-endif
-
-##############
-
-clean-local:
-	rm -f *~ *.bak
-
-maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt