merge of '0c08620c82f3631ac19e82f411d1eb63f02fd4f5'

     and 'af497374bb680be4e77a17c0fe994be8572e3004'

18 files changed, 396 insertions, 187 deletions

diff --git a/packages/base-files/base-files/akita/fstab b/packages/base-files/base-files/akita/fstab
index 8a2b07a089..46b778600e 100644
--- a/packages/base-files/base-files/akita/fstab
+++ b/packages/base-files/base-files/akita/fstab
@@ -8,12 +8,12 @@ tmpfs		/media/ram	tmpfs	defaults	0  0
 tmpfs                /dev/shm             tmpfs      mode=0777             0  0
 
 # SD/MMC in kernel 2.4
-/dev/mmcda1	/media/card	auto	defaults,sync,noauto	0  0
+#/dev/mmcda1	/media/card	auto	defaults,sync,noauto	0  0
 # SD/MMC in kernel 2.6
 /dev/mmcblk0p1	/media/card	auto	defaults,sync,noauto	0  0
 
 # USB Storage
 /dev/sda1 /media/usbhdd		vfat	noauto,umask=000,noatime,iocharset=utf8,codepage=932	0	0
-usbfs     /proc/bus/usb   	usbf    defaults                0  0
+usbfs     /proc/bus/usb   	usbfs    defaults                0  0
 
 
diff --git a/packages/base-files/base-files/c7x0/fstab b/packages/base-files/base-files/c7x0/fstab
index c3de8d28dc..54fe556905 100644
--- a/packages/base-files/base-files/c7x0/fstab
+++ b/packages/base-files/base-files/c7x0/fstab
@@ -8,6 +8,6 @@ tmpfs		/media/ram	tmpfs	defaults	0  0
 tmpfs                /dev/shm             tmpfs      mode=0777             0  0
 
 # SD/MMC in kernel 2.4
-/dev/mmcda1	/media/card	auto	defaults,sync,noauto	0  0
+#/dev/mmcda1	/media/card	auto	defaults,sync,noauto	0  0
 # SD/MMC in kernel 2.6
 /dev/mmcblk0p1	/media/card	auto	defaults,sync,noauto	0  0
diff --git a/packages/base-files/base-files/collie/fstab b/packages/base-files/base-files/collie/fstab
index a3a9ea2df1..c2e3f3c189 100644
--- a/packages/base-files/base-files/collie/fstab
+++ b/packages/base-files/base-files/collie/fstab
@@ -1,9 +1,13 @@
 /dev/mtdblock4	/ 	jffs2	defaults	1  1 
 proc            /proc   proc    defaults        0  0
 /dev/hda1	/media/cf	auto	defaults,sync,noauto,noatime,user,exec,suid,gid=100,umask=0002	0  0
-/dev/mmcda1	/media/card	auto	defaults,sync,noauto,noatime,user,exec,suid	0  0
 tmpfs		/var/volatile	tmpfs	mode=0755	0  0
 tmpfs                /dev/shm             tmpfs      mode=0777             0  0
 
 # we use a non-volatile ramdisk, see /etc/init.d/ramdisk
 #tmpfs		/media/ram	tmpfs	defaults	0  0
+
+# SD/MMC in kernel 2.4
+#/dev/mmcda1	/media/card	auto	defaults,sync,noauto	0  0
+# SD/MMC in kernel 2.6
+/dev/mmcblk0p1	/media/card	auto	defaults,sync,noauto	0  0
diff --git a/packages/base-files/base-files/poodle/fstab b/packages/base-files/base-files/poodle/fstab
index 9f87b91155..64076fa181 100644
--- a/packages/base-files/base-files/poodle/fstab
+++ b/packages/base-files/base-files/poodle/fstab
@@ -7,7 +7,7 @@ proc		/proc	proc	defaults	0  0
 /dev/mmcblk0p1	/media/card	auto	defaults,sync,noauto	0  0
 
 # SD/MMC in kernel 2.4
-/dev/mmcda1	/media/card	auto	defaults,sync,noauto	0  0
+#/dev/mmcda1	/media/card	auto	defaults,sync,noauto	0  0
 
 tmpfs                /dev/shm             tmpfs      mode=0777             0  0
 tmpfs		/var/volatile	tmpfs	mode=0755	0  0
diff --git a/packages/base-files/base-files/spitz/fstab b/packages/base-files/base-files/spitz/fstab
index f266212135..dc419e62be 100644
--- a/packages/base-files/base-files/spitz/fstab
+++ b/packages/base-files/base-files/spitz/fstab
@@ -12,7 +12,7 @@ tmpfs                /dev/shm             tmpfs      mode=0777             0  0
 # Compact Flash memory cards
 /dev/hdc1       /media/cf       auto    defaults,sync,noauto    0  0
 # SD/MMC in kernel 2.4
-/dev/mmcda1     /media/card     auto    defaults,sync,noauto    0  0
+#/dev/mmcda1     /media/card     auto    defaults,sync,noauto    0  0
 # SD/MMC in kernel 2.6
 /dev/mmcblk0p1  /media/card     auto    defaults,sync,noauto    0  0
 
diff --git a/packages/base-files/base-files/tosa/fstab b/packages/base-files/base-files/tosa/fstab
index 8607c79be8..badbebe1f7 100644
--- a/packages/base-files/base-files/tosa/fstab
+++ b/packages/base-files/base-files/tosa/fstab
@@ -10,6 +10,6 @@ tmpfs                /dev/shm             tmpfs      mode=0777             0  0
 usbfs                /proc/bus/usb        usbfs      auto                0 0
 
 # SD/MMC in kernel 2.4
-/dev/mmcda1	/media/card	auto	defaults,sync,noauto	0  0
+#/dev/mmcda1	/media/card	auto	defaults,sync,noauto	0  0
 # SD/MMC in kernel 2.6
 /dev/mmcblk0p1	/media/card	auto	defaults,sync,noauto	0  0
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index 7ccd26b5cf..98b522c1bd 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r74"
+PR = "r75"
 LICENSE = "GPL"
 
 SRC_URI = " \
diff --git a/packages/ettercap/ettercap-0.6.b/configure.patch b/packages/ettercap/ettercap-0.6.b/configure.patch
deleted file mode 100644
index 89132125b8..0000000000
--- a/packages/ettercap/ettercap-0.6.b/configure.patch
+++ /dev/null
@@ -1,165 +0,0 @@
---- tmp/base/ettercap-0.6.b-r0/ettercap-0.6.b/acinclude.m4	Thu Jul 10 03:25:31 2003
-+++ ettercap-0.6.b/acinclude.m4	Thu Nov  6 18:25:39 2003
-@@ -182,9 +182,11 @@
- dnl     HAVE_SOCKLEN_T
- dnl
- 
--AC_DEFUN(EC_SOCKLEN_CHECK,
--   [AC_MSG_CHECKING(for socklen_t in sys/socket.h)
-+samba_cv_socklen_t
- 
-+AC_DEFUN(EC_SOCKLEN_CHECK,
-+   [AC_CACHE_CHECK([for socklen_t in sys/socket.h],
-+		   [ettercap_cv_type_socklen_t],
-    AC_TRY_RUN([
-       #include <sys/types.h>
-       #include <sys/socket.h>
-@@ -197,14 +199,12 @@
-          return 0;
-       }
-    ],
--   [  AC_MSG_RESULT(yes)
--      AC_DEFINE(HAVE_SOCKLEN_T)
--      ],
--      AC_MSG_RESULT(no);
--      ,
--      AC_MSG_RESULT(unkown when cross-compiling)
--   )
-+   [ettercap_cv_type_socklen_t=yes],
-+   [ettercap_cv_type_socklen_t=no]))
- 
-+   if test X$ettercap_cv_type_socklen_t = Xyes; then
-+     AC_DEFINE(HAVE_SOCKLEN_T)
-+   fi
- ])
- 
- 
-@@ -377,24 +377,78 @@
- 
- AC_DEFUN(EC_NS_GET,[
- 
--   AC_MSG_CHECKING(for NS_GET32)
--   AC_TRY_RUN([
--      #include <arpa/nameser.h>
-+AC_CACHE_CHECK([for NS_GET32],
-+		ec_cv_func_ns_get32,
-+		[AC_TRY_LINK([
-+		 #include <arpa/nameser.h>
-+		 ],
-+		 [
-+                  int i;
-+                  char *p = "\x01\x02\x03\x04";
-+                  NS_GET32(i, p);
-+		 ],
-+		 ec_cv_func_ns_get32=yes,
-+		 ec_cv_func_ns_get32=no)
-+   if test X$ec_cv_func_ns_get32 = Xyes; then
-+     AC_DEFINE(HAVE_NS_GET,1)
-+   fi])
-+])
- 
--      int main()
--      {
--         int i;
--         char *p = "\x01\x02\x03\x04";
--         NS_GET32(i, p);
-+dnl vim:ts=3:expandtab
- 
--         return 0;
--      }
--   ],
--   [  AC_MSG_RESULT(yes)
--      AC_DEFINE(HAVE_NS_GET,1) ],
--   [  AC_MSG_RESULT(no); ]
--   )
-+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-+dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-+dnl also defines GSTUFF_PKG_ERRORS on error
-+AC_DEFUN(PKG_CHECK_MODULES, [
-+  succeeded=no
-+
-+  if test -z "$PKG_CONFIG"; then
-+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+  fi
-+
-+  if test "$PKG_CONFIG" = "no" ; then
-+     echo "*** The pkg-config script could not be found. Make sure it is"
-+     echo "*** in your path, or set the PKG_CONFIG environment variable"
-+     echo "*** to the full path to pkg-config."
-+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-+  else
-+     PKG_CONFIG_MIN_VERSION=0.9.0
-+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-+        AC_MSG_CHECKING(for $2)
-+
-+        if $PKG_CONFIG --exists "$2" ; then
-+            AC_MSG_RESULT(yes)
-+            succeeded=yes
-+
-+            AC_MSG_CHECKING($1_CFLAGS)
-+            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
-+            AC_MSG_RESULT($$1_CFLAGS)
-+
-+            AC_MSG_CHECKING($1_LIBS)
-+            $1_LIBS=`$PKG_CONFIG --libs "$2"`
-+            AC_MSG_RESULT($$1_LIBS)
-+        else
-+            $1_CFLAGS=""
-+            $1_LIBS=""
-+            ## If we have a custom action on failure, don't print errors, but 
-+            ## do set a variable so people can do so.
-+            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-+            ifelse([$4], ,echo $$1_PKG_ERRORS,)
-+        fi
-+
-+        AC_SUBST($1_CFLAGS)
-+        AC_SUBST($1_LIBS)
-+     else
-+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-+     fi
-+  fi
- 
-+  if test $succeeded = yes; then
-+     ifelse([$3], , :, [$3])
-+  else
-+     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
-+  fi
- ])
- 
--dnl vim:ts=3:expandtab
-+
---- tmp/base/ettercap-0.6.b-r0/ettercap-0.6.b/configure.in	Thu Jul 10 03:25:31 2003
-+++ ettercap-0.6.b/configure.in	Thu Nov  6 18:13:44 2003
-@@ -20,9 +20,10 @@
- dnl    $Id: configure.in,v 1.69 2003/06/30 19:57:41 alor Exp $
- dnl
- 
--AC_PREREQ([2.50])
-+AC_PREREQ(2.57)
- 
--AC_INIT(src/ec_main.c)
-+AC_INIT
-+AC_CONFIG_SRCDIR([src/ec_main.c])
- AC_CONFIG_HEADER(config.h)
- 
- echo "char configure_line[[]] = \"$0 $*\";" > ./src/include/ec_debug_info.h
-@@ -77,7 +78,7 @@
- dnl   Check the OS
- dnl ================
- 
--AC_CANONICAL_SYSTEM
-+AC_CANONICAL_TARGET([])
- case "$target_os" in
- *linux*)
-    EC_LINUX_KERNEL()
-@@ -868,7 +869,8 @@
- 
- AC_SUBST(MAKEPLUG)
- 
--AC_OUTPUT(ettercap.spec ettercap.8 Makefile $makeplug win32/ettercap.nsi)
-+AC_CONFIG_FILES([ettercap.spec ettercap.8 Makefile $makeplug win32/ettercap.nsi])
-+AC_OUTPUT
- 
- dnl ============================
- dnl   FOR DEBUGING INFORMATIONS
diff --git a/packages/ettercap/ettercap-ng_0.7.3.bb b/packages/ettercap/ettercap-ng_0.7.3.bb
new file mode 100644
index 0000000000..c9e73d9ea0
--- /dev/null
+++ b/packages/ettercap/ettercap-ng_0.7.3.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "network sniffer/interceptor/logger for ethernet LANs. It \
+supports active and passive dissection of many protocols (even ciphered ones, \
+like SSH and HTTPS)."
+SECTION = "console/network"
+DEPENDS = "virtual/libiconv libnet libpcap openssl libpcre ncurses zlib libtool"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/ettercap/ettercap-NG-${PV}.tar.gz \
+           file://autotools.patch;patch=1"
+
+S = "${WORKDIR}/ettercap-NG-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF += "--disable-gtk"
+
+FILES_${PN} += "${datadir} ${libdir}/ettercap/*.so"
+FILES_${PN}-dbg += "${libdir}/ettercap/.debug"
diff --git a/packages/ettercap/ettercap_0.6.b.bb b/packages/ettercap/ettercap_0.6.b.bb
deleted file mode 100644
index d5983d4481..0000000000
--- a/packages/ettercap/ettercap_0.6.b.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-SECTION = "console/network"
-DEPENDS = "ncurses openssl"
-LICENSE = "GPL"
-DESCRIPTION = "Ettercap is a network sniffer/interceptor/logger \
-for ethernet LANs. It supports active and passive dissection of \
-many protocols (even ciphered ones, like SSH and HTTPS)."
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/ettercap/ettercap-${PV}.tar.gz \
-	   file://configure.patch;patch=1"
-
-inherit autotools
-
-EXTRA_OECONF = "--disable-gtk \
-	        --with-openssl=${STAGING_LIBDIR}/.."
diff --git a/packages/ettercap/ettercap-0.6.b/.mtn2git_empty b/packages/ettercap/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/ettercap/ettercap-0.6.b/.mtn2git_empty
+++ b/packages/ettercap/files/.mtn2git_empty
diff --git a/packages/ettercap/files/autotools.patch b/packages/ettercap/files/autotools.patch
new file mode 100644
index 0000000000..b6024c48c7
--- /dev/null
+++ b/packages/ettercap/files/autotools.patch
@@ -0,0 +1,173 @@
+diff -ur ettercap-NG-0.7.3/configure.in ettercap-NG-0.7.3-changed/configure.in
+--- ettercap-NG-0.7.3/configure.in	2005-01-13 10:24:28.000000000 +0100
++++ ettercap-NG-0.7.3-changed/configure.in	2007-11-07 11:42:25.000000000 +0100
+@@ -178,6 +178,7 @@
+ 
+ AC_PROG_CC
+ AM_PROG_CC_STDC
++AM_PROG_CC_C_O
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ AC_PROG_GCC_TRADITIONAL
+@@ -236,7 +237,7 @@
+ AC_CHECK_HEADERS(sys/poll.h poll.h sys/select.h)
+ AC_CHECK_HEADERS(sys/cdefs.h)
+ dnl nameser NS_GET32 and so on...
+-EC_NS_GET()
++dnl EC_NS_GET()
+ 
+ dnl ==================================================================
+ dnl   Checks for typedefs, structures, and compiler characteristics.
+@@ -379,129 +380,6 @@
+ dnl ==================
+ 
+ 
+-dnl ---------
+-dnl  libpcap
+-dnl ---------
+-ac_ec_libpcap=default
+-
+-AC_MSG_CHECKING(for libpcap)
+-AC_ARG_WITH(libpcap, AC_HELP_STRING(--with-libpcap=DIR,use libpcap in DIR),
+-[ case "$withval" in
+-  no)
+-     AC_MSG_RESULT(no)
+-     AC_MSG_ERROR(["*** ettercap cannot operate without libpcap. ***"])
+-     ;;
+-  *)
+-     if test -f $withval/pcap.h; then
+-        owd=`pwd`
+-        if cd $withval; then withval=`pwd`; cd $owd; fi
+-        PCAPINC="-I$withval"
+-        if test "$OS" = "WINDOWS"; then
+-           PCAPLIB="-L$withval -lwpcap -lpacket"
+-        else
+-           PCAPLIB="-L$withval -lpcap"
+-        fi
+-        ac_ec_libpcap=$withval
+-        AC_MSG_RESULT($withval)
+-     elif test -f $withval/include/pcap.h; then
+-        owd=`pwd`
+-        if cd $withval; then withval=`pwd`; cd $owd; fi
+-        PCAPINC="-I$withval/include"
+-        if test "$OS" = "WINDOWS"; then
+-           PCAPLIB="-L$withval/lib -lwpcap -lpacket"
+-        else
+-           PCAPLIB="-L$withval/lib -lpcap"
+-        fi
+-        ac_ec_libpcap=$withval
+-        AC_MSG_RESULT($withval)
+-     else
+-        AC_MSG_RESULT(no)
+-        AC_MSG_ERROR([pcap.h not found in $withval])
+-     fi
+-     ;;
+-  esac ],
+-[ if test -f /usr/include/pcap/pcap.h; then
+-     PCAPINC="-I/usr/include/pcap"
+-     if test "$OS" = "WINDOWS"; then
+-        PCAPLIB="-lwpcap -lpacket"
+-     else
+-        PCAPLIB="-lpcap"
+-     fi
+-  elif test -f /usr/include/pcap.h; then
+-     if test "$OS" = "WINDOWS"; then
+-        PCAPLIB="-lwpcap -lpacket"
+-     else
+-        PCAPLIB="-lpcap"
+-     fi
+-  elif test -f /usr/local/include/pcap.h; then
+-     PCAPINC="-I/usr/local/include"
+-     if test "$OS" = "WINDOWS"; then
+-        PCAPLIB="-lwpcap -lpacket"
+-     else
+-        PCAPLIB="-lpcap"
+-     fi
+-  else
+-     AC_MSG_RESULT(no)
+-     AC_MSG_ERROR([libpcap not found])
+-  fi
+-  AC_MSG_RESULT(yes) ]
+-)
+-
+-if test "$OS" = "WINDOWS"; then
+-   EC_CHECK_FUNC(wpcap, pcap_datalink_val_to_description, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required]))
+-   EC_CHECK_FUNC(packet, PacketInitPacket, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required]))
+-   AC_CHECK_LIB(ws2_32, ntohs,, AC_MSG_ERROR([Incorrect ws2_32 version.]))
+-   AC_CHECK_LIB(iphlpapi, main)
+-else
+-   EC_CHECK_FUNC(pcap, pcap_datalink_val_to_description, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required]))
+-fi
+-
+-dnl ---------
+-dnl  libnet
+-dnl ---------
+-ac_ec_libnet=default
+-
+-AC_MSG_CHECKING(for libnet)
+-AC_ARG_WITH(libnet, AC_HELP_STRING(--with-libnet=DIR,use libnet in DIR),
+-[ case "$withval" in
+-  no)
+-     AC_MSG_RESULT(no)
+-     AC_MSG_ERROR(["*** ettercap cannot operate without libnet. ***"])
+-     ;;
+-  *)
+-     if test -f $withval/lnet.h; then
+-        owd=`pwd`
+-        if cd $withval; then withval=`pwd`; cd $owd; fi
+-        LNETINC="-I$withval"
+-        LNETLIB="-L$withval -lnet"
+-        ac_ec_libnet=$withval
+-        AC_MSG_RESULT($withval)
+-     elif test -f $withval/include/libnet.h; then
+-        owd=`pwd`
+-        if cd $withval; then withval=`pwd`; cd $owd; fi
+-        LNETINC="-I$withval/include"
+-        LNETLIB="-L$withval/lib -L$withval/src -lnet"
+-        ac_ec_libnet=$withval
+-        AC_MSG_RESULT($withval)
+-     else
+-        AC_MSG_RESULT(no)
+-        AC_MSG_ERROR([libnet.h not found in $withval])
+-     fi
+-     ;;
+-  esac ],
+-[ if test -f /usr/include/libnet.h; then
+-     AC_MSG_RESULT(yes)
+-     LNETINC=""
+-     LNETLIB="-lnet"
+-  else
+-     AC_MSG_RESULT(no)
+-     AC_MSG_ERROR([libnet >= 1.1.2.1 not found])
+-  fi
+-]
+-)
+-
+-EC_CHECK_FUNC(net, libnet_adv_free_packet, $LNETLIB, $LIBS,, AC_MSG_ERROR([Incorrect libnet version. libnet >= 1.1.2.1 required]))
+-
+ dnl ------------------
+ dnl Checks for openssl
+ dnl ------------------
+@@ -794,7 +672,8 @@
+ dnl  set up the final vars
+ dnl -----------------------
+ EC_CFLAGS="$DEBUG_FLAGS $PCAPINC $LNETINC $SSLINC $PCREINC $ICONVINC"
+-EC_LIBS="$LIBS $PCAPLIB $LNETLIB $SSLLIB $PCRELIB $NCURSLIB $GTK_LIBS $ICONVLIB"
++dnl EC_LIBS="$LIBS $PCAPLIB $LNETLIB $SSLLIB $PCRELIB $NCURSLIB $GTK_LIBS $ICONVLIB"
++EC_LIBS="$LIBS $PCAPLIB $LNETLIB $SSLLIB $PCRELIB $NCURSLIB $GTK_LIBS $ICONVLIB -lpcap -lnet"
+ 
+ AC_SUBST(EC_CFLAGS)
+ AC_SUBST(EC_LIBS)
+diff -ur ettercap-NG-0.7.3/src/Makefile.am ettercap-NG-0.7.3-changed/src/Makefile.am
+--- ettercap-NG-0.7.3/src/Makefile.am	2005-01-13 10:18:48.000000000 +0100
++++ ettercap-NG-0.7.3-changed/src/Makefile.am	2007-11-06 20:15:12.000000000 +0100
+@@ -127,8 +127,7 @@
+ 
+ ettercap_CFLAGS = @EC_CFLAGS@
+ 
+-ettercap_LDADD = @LIBOBJS@ \
+-                 os/libec_os.a \
++ettercap_LDADD = missing/strlcpy.o os/libec_os.a \
+                  interfaces/daemon/libec_daemon.a \
+                  interfaces/text/libec_text.a 
+
diff --git a/packages/glibc/glibc-intermediate_2.7.bb b/packages/glibc/glibc-intermediate_2.7.bb
new file mode 100644
index 0000000000..05d6250783
--- /dev/null
+++ b/packages/glibc/glibc-intermediate_2.7.bb
@@ -0,0 +1,8 @@
+require glibc_${PV}.bb
+require glibc-intermediate.inc
+
+# gcc uses -Werror which break on a "you have no thumb interwork" _warning_
+do_configure_prepend() {
+	sed -i s:-Werror:: ${S}/configure
+}
+
diff --git a/packages/sqlite/sqlite3/.mtn2git_empty b/packages/sqlite/sqlite3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/sqlite/sqlite3/.mtn2git_empty
diff --git a/packages/sqlite/sqlite3/cross-compile.patch b/packages/sqlite/sqlite3/cross-compile.patch
new file mode 100644
index 0000000000..31d4f0d162
--- /dev/null
+++ b/packages/sqlite/sqlite3/cross-compile.patch
@@ -0,0 +1,92 @@
+--- sqlite-3.3.7/configure.ac.orig	2006-08-21 00:20:50.000000000 +0200
++++ sqlite-3.3.7/configure.ac	2006-08-21 00:22:35.000000000 +0200
+@@ -187,10 +187,11 @@
+ default_build_cflags="-g"
+ if test "$config_BUILD_CC" = ""; then
+   AC_PROG_CC
+-  if test "$cross_compiling" = "yes"; then
+-    AC_MSG_ERROR([unable to find a compiler for building build tools])
+-  fi
+-  BUILD_CC=$CC
++#  if test "$cross_compiling" = "yes"; then
++#    AC_MSG_ERROR([unable to find a compiler for building build tools])
++#  fi
++#  BUILD_CC=$CC
++BUILD_CC=gcc
+   default_build_cflags=$CFLAGS
+ else
+   BUILD_CC=$config_BUILD_CC
+@@ -238,6 +239,12 @@
+   TARGET_LINK=$config_TARGET_LINK
+ fi
+ AC_MSG_RESULT($TARGET_LINK)
++if test "$config_TARGET_LFLAGS" != ""; then
++  TARGET_LFLAGS=$config_TARGET_LFLAGS
++  else
++    TARGET_LFLAGS=$BUILD_LFLAGS
++  fi
++AC_MSG_RESULT($TARGET_LFLAGS)
+ AC_MSG_CHECKING([switches on the target compiler])
+ if test "$config_TARGET_TFLAGS" != ""; then
+   TARGET_TFLAGS=$config_TARGET_TFLAGS
+@@ -592,15 +599,7 @@
+ # Figure out what C libraries are required to compile programs
+ # that use "readline()" library.
+ #
+-if test "$config_TARGET_READLINE_LIBS" != ""; then
+-  TARGET_READLINE_LIBS="$config_TARGET_READLINE_LIBS"
+-else
+-  CC=$TARGET_CC
+-  LIBS=""
+-  AC_SEARCH_LIBS(tgetent, [readline ncurses curses termcap])
+-  AC_CHECK_LIB([readline], [readline])
+-  TARGET_READLINE_LIBS="$LIBS"
+-fi
++TARGET_READLINE_LIBS="-lreadline"
+ AC_SUBST(TARGET_READLINE_LIBS)
+ 
+ ##########
+@@ -615,41 +614,8 @@
+ ##########
+ # Figure out where to get the READLINE header files.
+ #
+-AC_MSG_CHECKING([readline header files])
+-found=no
+-if test "$config_TARGET_READLINE_INC" != ""; then
+-  TARGET_READLINE_INC=$config_TARGET_READLINE_INC
+-  found=yes
+-fi
+-if test "$found" = "yes"; then
+-  AC_MSG_RESULT($TARGET_READLINE_INC)
+-else
+-  AC_MSG_RESULT(not specified: still searching...)
+-  AC_CHECK_HEADER(readline.h, [found=yes])
+-fi
+-if test "$found" = "no"; then
+-  for dir in /usr /usr/local /usr/local/readline /usr/contrib /mingw; do
+-    AC_CHECK_FILE($dir/include/readline.h, found=yes)
+-    if test "$found" = "yes"; then
+-      TARGET_READLINE_INC="-I$dir/include"
+-      break
+-    fi
+-    AC_CHECK_FILE($dir/include/readline/readline.h, found=yes)
+-    if test "$found" = "yes"; then
+-      TARGET_READLINE_INC="-I$dir/include/readline"
+-      break
+-    fi
+-  done
+-fi
+-if test "$found" = "yes"; then
+-  if test "$TARGET_READLINE_LIBS" = ""; then
+-    TARGET_HAVE_READLINE=0
+-  else
+-    TARGET_HAVE_READLINE=1
+-  fi
+-else
+-  TARGET_HAVE_READLINE=0
+-fi
++TARGET_READLINE_INC=""
++TARGET_HAVE_READLINE=1
+ AC_SUBST(TARGET_READLINE_INC)
+ AC_SUBST(TARGET_HAVE_READLINE)
+ 
diff --git a/packages/sqlite/sqlite3/ldflags.patch b/packages/sqlite/sqlite3/ldflags.patch
new file mode 100644
index 0000000000..ee5105ffff
--- /dev/null
+++ b/packages/sqlite/sqlite3/ldflags.patch
@@ -0,0 +1,67 @@
+--- sqlite-3.3.7/Makefile.in.orig	2006-08-20 23:05:36.000000000 +0200
++++ sqlite-3.3.7/Makefile.in	2006-08-20 23:42:49.000000000 +0200
+@@ -31,6 +31,10 @@
+ #
+ TCC = @TARGET_CC@ @TARGET_CFLAGS@ -I. -I${TOP}/src
+ 
++# OE overrides
++#
++TARGET_LFLAGS = @TARGET_LFLAGS@
++
+ # Define -DNDEBUG to compile without debugging (i.e., for production usage)
+ # Omitting the define will cause extra debugging code to be inserted and
+ # includes extra comments when "EXPLAIN stmt" is used.
+@@ -257,17 +261,17 @@
+           | $(NAWK) '{print $$5,$$6}' >last_change
+ 
+ libsqlite3.la:	$(LIBOBJ)
+-	$(LTLINK) -o libsqlite3.la $(LIBOBJ) $(LIBPTHREAD) \
++	$(LTLINK) -o libsqlite3.la $(LIBOBJ) $(TARGET_LFLAGS) $(LIBPTHREAD) \
+ 		${ALLOWRELEASE} -rpath $(libdir) -version-info "8:6:8"
+ 
+ libtclsqlite3.la:	tclsqlite.lo libsqlite3.la
+ 	$(LTLINK) -o libtclsqlite3.la tclsqlite.lo \
+-		$(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(LIBPTHREAD) \
++		$(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(TARGET_LFLAGS) $(LIBPTHREAD) \
+                 -rpath $(libdir)/sqlite \
+ 		-version-info "8:6:8"
+ 
+ sqlite3$(TEXE):	$(TOP)/src/shell.c libsqlite3.la sqlite3.h
+-	$(LTLINK) $(READLINE_FLAGS) $(LIBPTHREAD) \
++	$(LTLINK) $(TARGET_LFLAGS) $(READLINE_FLAGS) $(LIBPTHREAD) \
+ 		-o $@ $(TOP)/src/shell.c libsqlite3.la \
+ 		$(LIBREADLINE) $(TLIBS)
+ 
+@@ -456,12 +460,12 @@
+ 
+ tclsqlite3:	tclsqlite-shell.lo libsqlite3.la
+ 	$(LTLINK) -o tclsqlite3 tclsqlite-shell.lo \
+-		 libsqlite3.la $(LIBTCL)
++		 libsqlite3.la $(TARGET_LFLAGS) $(LIBTCL)
+ 
+ testfixture$(TEXE):	$(TOP)/src/tclsqlite.c libsqlite3.la $(TESTSRC)
+ 	$(LTLINK) -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1 \
+ 		$(TEMP_STORE) -o testfixture $(TESTSRC) $(TOP)/src/tclsqlite.c \
+-		libsqlite3.la $(LIBTCL)
++		libsqlite3.la $(TARGET_LFLAGS) $(LIBTCL)
+ 
+ 
+ fulltest:	testfixture$(TEXE) sqlite3$(TEXE)
+@@ -471,7 +475,7 @@
+ 	./testfixture $(TOP)/test/quick.test
+ 
+ sqlite3_analyzer$(TEXE):	$(TOP)/src/tclsqlite.c libtclsqlite3.la \
+-				$(TESTSRC) $(TOP)/tool/spaceanal.tcl
++				$(TARGET_LFLAGS) $(TESTSRC) $(TOP)/tool/spaceanal.tcl
+ 	sed \
+ 	  -e '/^#/d' \
+ 	  -e 's,\\,\\\\,g' \
+@@ -481,7 +485,7 @@
+ 	  $(TOP)/tool/spaceanal.tcl >spaceanal_tcl.h
+ 	$(LTLINK) -DTCLSH=2 -DSQLITE_TEST=1 $(TEMP_STORE)\
+                 -o sqlite3_analyzer$(EXE) $(TESTSRC) $(TOP)/src/tclsqlite.c \
+-		libtclsqlite3.la $(LIBTCL)
++		libtclsqlite3.la $(TARGET_LFLAGS) $(LIBTCL)
+ 
+ # Rules used to build documentation
+ #
diff --git a/packages/sqlite/sqlite3/libtool.patch b/packages/sqlite/sqlite3/libtool.patch
new file mode 100644
index 0000000000..ccf9993ed2
--- /dev/null
+++ b/packages/sqlite/sqlite3/libtool.patch
@@ -0,0 +1,25 @@
+Index: sqlite-3.2.1/Makefile.in
+===================================================================
+--- sqlite-3.2.1.orig/Makefile.in	2005-03-23 17:09:39.000000000 +0100
++++ sqlite-3.2.1/Makefile.in	2005-04-25 23:11:20.000000000 +0200
+@@ -15,7 +15,10 @@
+ # The toplevel directory of the source tree.  This is the directory
+ # that contains this "Makefile.in" and the "configure.in" script.
+ #
+-TOP = @srcdir@
++TOP = $(srcdir)
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++top_builddir = .
+ 
+ # C Compiler and options for use in building executables that
+ # will run on the platform that is doing the build.
+@@ -96,7 +99,7 @@
+ exec_prefix = @exec_prefix@
+ libdir = @libdir@
+ INSTALL = @INSTALL@
+-LIBTOOL = ./libtool
++LIBTOOL = @LIBTOOL@
+ ALLOWRELEASE = @ALLOWRELEASE@
+ 
+ # libtool compile/link/install
diff --git a/packages/sqlite/sqlite3_3.5.2.bb b/packages/sqlite/sqlite3_3.5.2.bb
new file mode 100644
index 0000000000..53fd96c705
--- /dev/null
+++ b/packages/sqlite/sqlite3_3.5.2.bb
@@ -0,0 +1 @@
+require sqlite3.inc