merge of '5369901ff675d4c926113d856ce9da4c8c12fed0'

     and '71b1cbe678cd91cfaf67632c7cbe2a37cb593a48'

21 files changed, 215 insertions, 514 deletions

diff --git a/packages/appweb/appweb.inc b/packages/appweb/appweb.inc
new file mode 100644
index 0000000000..0f602f70d3
--- /dev/null
+++ b/packages/appweb/appweb.inc
@@ -0,0 +1,4 @@
+def get_appweb_host(d, bb):
+    host = bb.data.getVar('HOST_SYS', d, 1)
+    return host.replace('-linux-uclibc', '-linux')
+
diff --git a/packages/appweb/appweb_1.2.0.bb b/packages/appweb/appweb_1.2.0.bb
index 8cf506af2c..8bd6d778f0 100644
--- a/packages/appweb/appweb_1.2.0.bb
+++ b/packages/appweb/appweb_1.2.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "AppWeb is an embedded HTTP Web server that has been designed with security in mind."
 SECTION = "console/network"
-LICENSE="GPL"
+LICENSE = "GPL"
 SRC_URI = "http://www.mbedthis.com/software/appWeb-src-1.2.0-1.tar.gz \
 	   file://makerules.patch;patch=1 \
 	   file://nonrootinstall.patch;patch=1"
@@ -9,10 +9,7 @@ S = "${WORKDIR}/appWeb-1.2.0"
 APPWEB_HOST = "${@get_appweb_host(d, bb)}"
 APPWEB_BUILD = "${BUILD_SYS}"
 
-def get_appweb_host(d, bb):
-    host = bb.data.getVar('HOST_SYS', d, 1)
-    return host.replace('-linux-uclibc', '-linux')
-    
+require appweb.inc
 
 #  --buildNumber=NUMBER     Set the build number part of the version (1.0.0.X).
 #  --name=NAME              Set the full product name (BLD_NAME define).
diff --git a/packages/appweb/appweb_2.0.4.bb b/packages/appweb/appweb_2.0.4.bb
index f740876acd..7f7941012a 100644
--- a/packages/appweb/appweb_2.0.4.bb
+++ b/packages/appweb/appweb_2.0.4.bb
@@ -10,10 +10,7 @@ S = "${WORKDIR}/appWeb-${PV}"
 APPWEB_HOST = "${@get_appweb_host(d, bb)}"
 APPWEB_BUILD = "${BUILD_SYS}"
 
-def get_appweb_host(d, bb):
-    host = bb.data.getVar('HOST_SYS', d, 1)
-    return host.replace('-linux-uclibc', '-linux')
-    
+require appweb.inc
 
 #  --buildNumber=NUMBER     Set the build number part of the version (1.0.0.X).
 #  --name=NAME              Set the full product name (BLD_NAME define).
diff --git a/packages/clamav/clamav_0.88.4.bb b/packages/clamav/clamav_0.88.4.bb
index 1395253019..9cb432d579 100644
--- a/packages/clamav/clamav_0.88.4.bb
+++ b/packages/clamav/clamav_0.88.4.bb
@@ -15,7 +15,7 @@ RDEPENDS_${PN} = "${PN}-data"
 RDEPENDS_${PN}-daemon = "${PN}-data"
 RRECOMMENDS_${PN} = "${PN}-freshclam"
 RRECOMMENDS_${PN}-daemon = "${PN}-freshclam"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/clamav/clamav-${PV}.tar.gz \
           file://cross-compile-fix.patch;patch=1 \
@@ -66,6 +66,7 @@ do_install_append() {
 }
 do_stage () {
         oe_libinstall -a -so libclamav ${STAGING_LIBDIR}
+        rm -f ${STAGING_LIBDIR}/libclamav.la
         install -m 0644 libclamav/clamav.h ${STAGING_INCDIR}
 }
 
diff --git a/packages/kbdd/kbdd-patched-20040904/fellowes.patch b/packages/kbdd/kbdd-patched-20040904/fellowes.patch
deleted file mode 100644
index f40ea0f31e..0000000000
--- a/packages/kbdd/kbdd-patched-20040904/fellowes.patch
+++ /dev/null
@@ -1,425 +0,0 @@
---- kbd.c	2004-07-06 08:07:38.000000000 -0700
-+++ ../kbdd.works/kbd.c	2005-01-01 07:59:00.000000000 -0800
-@@ -21,12 +21,14 @@
- #include <stdlib.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/ioctl.h>
- #include <fcntl.h>
- #include <termios.h>
- #include <unistd.h>
- #include <string.h>
- #include <errno.h>
- #include <limits.h>
-+#include <signal.h>
- 
- #include "keyboards.h"
- #include "dev_uinput.h"
-@@ -37,6 +39,7 @@
- 
- char debug=0;
- int uindev=0;
-+static int reinit=0;
- char TTY_PORT[PATH_MAX];
- 
- int open_serial(char *port, speed_t  baud)
-@@ -122,6 +125,250 @@
- return 0;
- }
- 
-+int stowaway_init(int fd)
-+{
-+int status;
-+unsigned char buf[16];
-+fd_set fds;
-+struct timeval tv;
-+	
-+	ioctl(fd, TIOCMGET, &status);
-+	status |= TIOCM_DTR;  /* Set DTR */
-+	status &= ~TIOCM_RTS; /* Clear RTS */
-+	ioctl(fd, TIOCMSET, &status);
-+	
-+	/* Unfortunately, DCD seems to be high all of the time on H3900, so the following can't be used */
-+	/* ioctl(fd, TIOCMIWAIT, TIOCM_CAR */
-+	/* So we just wait instead */
-+	usleep(1000000);
-+	
-+	ioctl(fd, TIOCMGET, &status);
-+	status |= TIOCM_RTS;  /* Set RTS */
-+	ioctl(fd, TIOCMSET, &status);
-+	/* Stowaway will send back 0xFA 0xFD indicating successful init */
-+	tv.tv_sec = 2;
-+	tv.tv_usec = 0;
-+	FD_ZERO(&fds);
-+	FD_SET(fd, &fds);
-+	if(select(fd+1, &fds, NULL, NULL, &tv)) {
-+		read(fd, buf, 2);
-+		if((buf[0] = 0xFA) && (buf[0] = 0xFD))
-+			if (debug) fprintf(stderr, "keyboard initialised\n");
-+	}
-+	
-+	return 0;
-+}
-+
-+void stowaway_sig(int sig) {
-+	reinit = 1;
-+}
-+
-+int stowaway(void)
-+{
-+int fd;
-+unsigned char buf[16];
-+char fn=0;
-+struct sigaction act;
-+int rc;
-+
-+	fd = open_serial(TTY_PORT, B9600);
-+	if (fd <= 0)
-+		return (-1);
-+	
-+	/* Make SIGHUP cause a reinit of the keyboard */
-+	act.sa_handler = stowaway_sig;
-+	sigemptyset(&act.sa_mask);
-+	act.sa_flags = 0;
-+	sigaction(SIGHUP, &act, NULL);
-+
-+	while (fd > 0) {
-+		
-+		stowaway_init(fd);
-+			
-+		while (fd > 0) {
-+			rc = read (fd, buf, 1);
-+			if(rc == -1) {
-+				if(reinit) {
-+					reinit = 0;
-+					break;
-+				}
-+				else {
-+					perror("read");
-+					return 1;
-+				}
-+			}
-+			
-+			if ( ((unsigned char)buf[0] & (unsigned char)0x80) == 0 ) {
-+				if (debug) fprintf(stderr, "press: %d\n", buf[0]);
-+				if (buf[0] == 0x08) {
-+					fn=1;
-+					continue;
-+				}
-+				if (fn)
-+					buf[0]=stowaway_function[buf[0]];
-+				else
-+					buf[0]=stowaway_normal[buf[0]];
-+				if (debug) fprintf(stderr,"= 0x%02x\n", buf[0]);
-+				if (buf[0] > 0)
-+					dev_uinput_key(uindev, (unsigned short)buf[0], KEY_PRESSED);
-+			} else {
-+				if (debug) fprintf(stderr, "rel. : %d\n", buf[0] & ~0x80);
-+				if ((buf[0] & ~0x80) == 0x08) {
-+					fn = 0;
-+					continue;
-+				}
-+				if (fn)
-+					buf[0]=stowaway_function[(unsigned char)buf[0] & (unsigned char)~0x80];
-+				else
-+					buf[0]=stowaway_normal[(unsigned char)buf[0] & (unsigned char)~0x80];
-+				if (debug) fprintf(stderr,"= 0x%02x\n", buf[0]);
-+				if (buf[0] > 0)
-+					dev_uinput_key(uindev, (unsigned short)buf[0], KEY_RELEASED);
-+			}
-+		}
-+	}
-+
-+return 0;
-+}
-+
-+
-+int fellowes(void)
-+{
-+#define FELLOWES_GR_FN 33
-+#define FELLOWES_BL_FN 34
-+
-+
-+  int fd;
-+  unsigned char buf[16];
-+  char bluefn=0,greenfn=0;
-+  struct sigaction act;
-+  int rc;
-+
-+
-+  fd = open_serial(TTY_PORT, B9600);
-+  if (fd <= 0)
-+    return (-1);
-+  
-+  /* Make SIGHUP cause a reinit of the keyboard */
-+  act.sa_handler = stowaway_sig;
-+  sigemptyset(&act.sa_mask);
-+  act.sa_flags = 0;
-+  sigaction(SIGHUP, &act, NULL);
-+  
-+  while (fd > 0) {
-+    stowaway_init(fd);
-+    
-+    while (fd > 0) {
-+      rc = read (fd, buf, 1);
-+      if(rc == -1) {
-+	if(reinit) {
-+	  reinit = 0;
-+	  break;
-+	}
-+	else {
-+	  perror("read");
-+	  return 1;
-+	}
-+      }
-+      
-+
-+
-+      if ( ((unsigned char)buf[0] & (unsigned char)0x80) == 0 ) {
-+	/* KEY PRESSED */
-+	if (debug) fprintf(stderr, "press: %d\n", buf[0]);
-+	if (buf[0] == FELLOWES_BL_FN) {
-+	  bluefn=1;
-+	  continue;
-+	}
-+
-+	if (buf[0] == FELLOWES_GR_FN)  {
-+	  greenfn=1;
-+	  dev_uinput_key(uindev,42,KEY_PRESSED);
-+	  continue;
-+	}
-+
-+	if (bluefn)
-+	  buf[0]=fellowes_function[buf[0]];
-+	else if (greenfn) {
-+	  buf[0]=fellowes_function[buf[0]];
-+
-+	  /* fixup where green function is not shift blue function */
-+	  switch(buf[0]) {
-+	  case KEY_UP:
-+	    buf[0]=KEY_PAGEUP;
-+	    break;
-+	  case KEY_LEFT:
-+	    buf[0]=KEY_HOME;
-+	    break;
-+	  case KEY_DOWN:
-+	    buf[0]=KEY_PAGEDOWN;
-+	    break;
-+	  case KEY_RIGHT:
-+	    buf[0]=KEY_END;
-+	    break;
-+	  case KEY_INTL2:
-+	    buf[0]=KEY_INTL3;
-+	    break;
-+	    
-+	  }
-+	} else
-+	  buf[0]=fellowes_normal[buf[0]];
-+
-+	if (debug) fprintf(stderr,"= 0x%02x\n", buf[0]);
-+	if (buf[0] != KEY_RESERVED)
-+	  dev_uinput_key(uindev, (unsigned short)buf[0], KEY_PRESSED);
-+
-+      } else {
-+	/* KEY RELEASED */
-+	if (debug) fprintf(stderr, "rel. : %d\n", buf[0] & ~0x80);
-+
-+	if ((buf[0] & ~0x80) == FELLOWES_BL_FN) {
-+	  bluefn = 0;
-+	  continue;
-+	}
-+
-+	if ((buf[0] & ~0x80) == FELLOWES_GR_FN) {
-+	  greenfn = 0;
-+	  dev_uinput_key(uindev,42,KEY_RELEASED);
-+	  continue;
-+	}
-+
-+	if (bluefn)
-+	  buf[0]=fellowes_function[(unsigned char)buf[0] & (unsigned char)~0x80];
-+	else if (greenfn) {
-+	  buf[0]=fellowes_function[(unsigned char)buf[0] & (unsigned char)~0x80];
-+
-+	  /* fixup where green function is not shift blue function */
-+	  switch(buf[0]) {
-+	  case KEY_UP:
-+	    buf[0]=KEY_PAGEUP;
-+	    break;
-+	  case KEY_LEFT:
-+	    buf[0]=KEY_HOME;
-+	    break;
-+	  case KEY_DOWN:
-+	    buf[0]=KEY_PAGEDOWN;
-+	    break;
-+	  case KEY_RIGHT:
-+	    buf[0]=KEY_END;
-+	    break;
-+	  case KEY_INTL2:
-+	    buf[0]=KEY_INTL3;
-+	    break;
-+	  }
-+	} else
-+	  buf[0]=fellowes_normal[(unsigned char)buf[0] & (unsigned char)~0x80];
-+
-+	if (debug) fprintf(stderr,"= 0x%02x\n", buf[0]);
-+	if (buf[0] != KEY_RESERVED)
-+	  dev_uinput_key(uindev, (unsigned short)buf[0], KEY_RELEASED);
-+      }
-+    }
-+  }
-+  
-+  return 0;
-+}
-+
- 
- int snapntype(void)
- {
-@@ -177,6 +424,8 @@
- 	fprintf (stderr, "-t <kbd type>\n");
- 	fprintf (stderr, "\tspecify the serial keyboard type, supported are:\n");
- 	fprintf (stderr, "\tfoldable - Compaq/HP foldable keyboard\n");
-+	fprintf (stderr, "\tstowaway - Targus Stowaway keyboard\n");
-+	fprintf (stderr, "\tfellowes - fellowes serial keyboard\n");
- 	fprintf (stderr, "\tsnapntype- Snap'n'Type\n\n");
- 	fprintf (stderr, "Example:\n\t%s -t foldable\n", arg0);
- }
-@@ -184,6 +433,8 @@
- #define KBD_TYPE_NONE		0
- #define KBD_TYPE_FOLDABLE	1
- #define KBD_TYPE_SNAPNTYPE	2
-+#define KBD_TYPE_STOWAWAY	3
-+#define KBD_TYPE_FELLOWES	4
- 
- int main(int argc, char **argv)
- {
-@@ -204,7 +455,13 @@
- 					kbdtype = KBD_TYPE_FOLDABLE;
- 				} else if (strncmp("snapntype", optarg, 9) == 0) {
- 					kbdtype = KBD_TYPE_SNAPNTYPE;
-+				} else if (strncmp("stowaway", optarg, 8) == 0) {
-+					kbdtype = KBD_TYPE_STOWAWAY;
-+				} else if (strncmp("fellowes", optarg, 8) == 0) {
-+					kbdtype = KBD_TYPE_FELLOWES;
- 				}
-+				else
-+					fprintf(stderr, "unrecognised keyboard type %s\n", optarg);
- 				break;
- 			case 'p':
- 				strcpy(TTY_PORT, optarg);
-@@ -226,6 +483,10 @@
- 		compaq_foldable();
- 	else if (kbdtype == KBD_TYPE_SNAPNTYPE)
- 		snapntype();
-+	else if (kbdtype == KBD_TYPE_STOWAWAY)
-+		stowaway();
-+	else if (kbdtype == KBD_TYPE_FELLOWES)
-+		fellowes();
- 
- return 0;
- }
---- keyboards.h	2004-07-09 17:15:52.000000000 -0700
-+++ ../kbdd.works/keyboards.h	2005-01-01 07:58:19.000000000 -0800
-@@ -24,6 +24,7 @@
- 
- #include "uinput.h"
- 
-+
- /***********************************************************************************
-  *   iConcepts
-  * 
-@@ -139,6 +140,95 @@
-         108, 0, 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  };
- 
-+/***********************************************************************************
-+ *   Targus Stowaway keyboard                                                     
-+ *
-+ * 9600 baud, 8N1
-+ *
-+ * Initialisation: raise DTR and drop RTS, wait for DCD pulse, then raise RTS
-+ *   keyboard will then send back 0xFA 0xFD
-+ *
-+ * Key down sends one byte
-+ * Key up sends one byte & 0x80, and if the key up is the last key up (ie, no more
-+ *   keys held down), then the key code & 0x80 is repeated
-+ ***********************************************************************************/
-+
-+static unsigned char stowaway_normal[128] = {
-+      /*   0, 001, 002, 003, 004, 005, 006, 007, 008, 009 */
-+/*000*/    2,   3,   4,  44,   5,   6,   7,   8,   0,  16,
-+/*010*/   17,  18,  19,  20,  21,  41,  45,  30,  31,  32,
-+/*020*/   33,  34,  35,  57,  58,  15,  29,   0,   0,   0,
-+/*030*/    0,   0,   0,   0,   0,  56,   0,   0,   0,   0,
-+/*040*/    0,   0,   0,   0,  46,  47,  48,  49,  12,  13,
-+/*050*/   14,  87,   9,  10,  11,  57,  26,  27,  43, 220,
-+/*060*/   22,  23,  24,  25,  40,  28, 219,   0,  36,  37,
-+/*070*/   38,  39,  53, 144, 183,   0,  50,  51,  52,   0,
-+/*080*/  111, 146, 155, 151,   0,   0,   0,   0,  42,  54,
-+/*090*/    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-+/*100*/    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-+/*110*/    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-+/*120*/    0,   0,   0,   0,   0,   0,   0,   0,  };
-+
-+static unsigned char stowaway_function[128] = {
-+      /*   0, 001, 002, 003, 004, 005, 006, 007, 008, 009 */
-+/*000*/   59,  60,  61,   0,  62,  63,  64,  65,   0,   0,
-+/*010*/    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-+/*020*/    0,   0,   0,   0,   0,   1,   0,   0,   0,   0,
-+/*030*/    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-+/*040*/    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-+/*050*/   92,   0,  66,  67,  68,   0,   0,   0,   0,   0,
-+/*060*/    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-+/*070*/    0,   0,   0, 104,   0,   0,   0,   0,   0,   0,
-+/*080*/    0, 102, 109, 107,   0,   0,   0,   0,   0,   0,
-+/*090*/    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-+/*100*/    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-+/*110*/    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-+/*120*/    0,   0,   0,   0,   0,   0,   0,   0,  };
-+
-+
-+
-+/***********************************************************************************
-+ *   ThinkOutside / Fellowes Stowaway XT
-+ *
-+ *  9600 baud, 8N1
-+ *
-+ *  Notes:
-+ *   the green function key is basically shift + scancode - handled elsewhere
-+ *
-+ ***********************************************************************************/
-+unsigned char fellowes_normal[128] = {
-+  /* 000 */ 0, 0, 0, KEY_Z, 0, 0, 0, 0, KEY_LEFTMETA, KEY_Q,
-+  /* 010 */ KEY_W, KEY_E, KEY_R, KEY_T, KEY_Y, 0,KEY_X, KEY_A, KEY_S, KEY_D,
-+  /* 020 */ KEY_F, KEY_G, KEY_H, KEY_SPACE, KEY_CAPSLOCK, KEY_TAB, KEY_LEFTCTRL, 0, 0, 0,
-+  /* 030 */ 0, 0, 0, 0, 0, KEY_LEFTALT, 0, 0, 0, 0,
-+  /* 040 */ 0, 0, 0, 0, KEY_C, KEY_V, KEY_B, KEY_N, 0, 0,
-+  /* 050 */ KEY_BACKSPACE, 0, 0, 0, 0, KEY_SPACE, KEY_MINUS, KEY_EQUAL, KEY_SLASH, 0,
-+  /* 060 */ KEY_U, KEY_I, KEY_O, KEY_P, KEY_APOSTROPHE, KEY_ENTER, 0, 0, KEY_J, KEY_K,
-+  /* 070 */ KEY_L, KEY_SEMICOLON, KEY_UP, 0, 0, 0, KEY_M, KEY_COMMA, KEY_DOT, 0,
-+  /* 080 */ KEY_DELETE, KEY_LEFT, KEY_DOWN, KEY_RIGHT, 0, 0, 0, 0, KEY_LEFTSHIFT, KEY_RIGHTSHIFT,
-+  /* 090 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+  /* 100 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+  /* 110 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+  /* 120 */ 0, 0, 0, 0, 0, 0, 0, 0
-+};
-+
-+unsigned fellowes_function[128] = {
-+  /* 000 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_1,
-+  /* 010 */ KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, 0, 0, KEY_F9, KEY_F10, KEY_F11,
-+  /* 020 */ KEY_F12, 0, 0, 0, KEY_NUMLOCK, KEY_ESC, 0, 0, 0, 0,
-+  /* 030 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+  /* 040 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+  /* 050 */ 0, 0, 0, 0, 0, 0, KEY_LEFTBRACE, KEY_RIGHTBRACE, KEY_BACKSLASH, 0,
-+  /* 060 */ KEY_7, KEY_8, KEY_9, KEY_0, 0, 0, 0, 0, 0, 0,
-+  /* 070 */ 0, KEY_WWW, KEY_UP, 0, 0, 0, 0, KEY_INTL1, KEY_INTL2, 0,
-+  /* 080 */ 0, KEY_LEFT, KEY_DOWN, KEY_RIGHT, 0, 0, 0, 0, 0, 0,
-+  /* 090 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+  /* 100 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+  /* 110 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+  /* 120 */ 0, 0, 0, 0, 0, 0, 0, 0
-+};
-+
-+ 
- 
- /***********************************************************************************
-  *   HP foldable keyboard                                                     
diff --git a/packages/kbdd/kbdd_20040904.bb b/packages/kbdd/kbdd_20040904.bb
deleted file mode 100644
index 55461b2454..0000000000
--- a/packages/kbdd/kbdd_20040904.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SECTION = "unknown"
-SRC_URI = "${HANDHELDS_CVS};module=apps/kbdd;date=${PV}"
-DEFAULT_PREFERENCE="-1"
-
-
-S = "${WORKDIR}/kbdd"
-LICENSE = "GPL"
-do_compile() {
-	oe_runmake
-}
-
-do_install() {
-	install -d ${D}${bindir}
-	install -d ${D}${docdir}/kbdd/
-	install -m 0755 kbdd ${D}${bindir}/
-	install -m 0644 README ${D}${docdir}/kbdd/
-}
diff --git a/packages/kbdd/kbdd_cvs.bb b/packages/kbdd/kbdd_cvs.bb
index 18d8bf6391..51056dc50b 100644
--- a/packages/kbdd/kbdd_cvs.bb
+++ b/packages/kbdd/kbdd_cvs.bb
@@ -1,21 +1,20 @@
-SECTION = "console/utils"
 DESCRIPTION = "User-space keyboard daemon for external keyboards"
 HOMEPAGE = "http://handhelds.org/moin/moin.cgi/kbdd"
+SECTION = "console/utils"
 LICENSE = "GPLv2"
 DEPENDS = "virtual/kernel"
 RRECOMMENDS_${PN} = "${@linux_module_packages('keybdev uinput', d)}"
+PV = "0.10+cvs${SRCDATE}"
+PR = "r5"
+
 SRC_URI = "${HANDHELDS_CVS};module=apps/kbdd;date=${SRCDATE} \
            file://kbdd.init \
            file://kbdd.conf \
            file://kbdd-modules"
+S = "${WORKDIR}/kbdd"
 
-#Remove the dash below when 0.8 changes in PV
-PV="0.10+cvs${SRCDATE}"
-PR="r5"
-
-inherit update-rc.d linux_modules
+inherit update-rc.d linux-kernel-base
 
-S = "${WORKDIR}/kbdd"
 INITSCRIPT_NAME = "kbdd"
 INITSCRIPT_PARAMS = "defaults"
 
diff --git a/packages/matrixssl/matrixssl-1.0-beta/cross.patch b/packages/matrixssl/matrixssl-1.0-beta/cross.patch
deleted file mode 100644
index b4c9634949..0000000000
--- a/packages/matrixssl/matrixssl-1.0-beta/cross.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/Makefile~cross	2004-03-01 19:12:37.000000000 -0500
-+++ src/Makefile	2004-06-04 21:59:55.527364588 -0400
-@@ -12,14 +12,14 @@
- #
- #   Debug flags and C flags
- #
--DFLAGS	= -O3
-+CFLAGS	= -O3
- #
- # To build a debug version of the MatrixSSL library, uncomment the DFLAGS line
- # below and remove the strip command in the .so target below.
- #
--#DFLAGS	= -g -DDEBUG
-+#CFLAGS	= -g -DDEBUG
- 
--CFLAGS  = -DLINUX $(DFLAGS)
-+override CFLAGS += -DLINUX
- LDFLAGS = -Wl -lc -lpthread
- 
- all: compile
-@@ -56,7 +56,6 @@
- #
- libmatrixssl.so: $(OBJECTS)
- 	$(CC) -shared -nostdlib -o $@ $^ $(LDFLAGS)
--	strip $(LIBRARIES)
- 
- #
- #	Clean up workspace
diff --git a/packages/matrixssl/matrixssl.inc b/packages/matrixssl/matrixssl.inc
new file mode 100644
index 0000000000..5f6bf43a9e
--- /dev/null
+++ b/packages/matrixssl/matrixssl.inc
@@ -0,0 +1,5 @@
+def define_os (d):
+	import bb
+	if bb.data.getVar('TARGET_OS', d).startswith('linux'):
+		return "-DLINUX"
+	return ""
diff --git a/packages/matrixssl/matrixssl_1.0-beta.bb b/packages/matrixssl/matrixssl_1.0-beta.bb
deleted file mode 100644
index 3dfd02448d..0000000000
--- a/packages/matrixssl/matrixssl_1.0-beta.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SECTION = "unknown"
-SRC_URI = "http://openembedded.org/dl/matrixssl-1-0-beta2-r2.tar.gz \
-	   file://cross.patch;patch=1"
-S = "${WORKDIR}/matrixssl/src"
-LICENSE = "GPL"
-def define_os (d):
-	import bb
-	if bb.data.getVar('TARGET_OS', d).startswith('linux'):
-		return "-DLINUX"
-	return ""
-
-CFLAGS += " ${@define_os(d)}"
-
-do_install () {
-	install -d ${D}${includedir}
-	install -m 0644 ${S}/../matrixSsl.h ${D}${includedir}/
-	oe_libinstall -so libmatrixssl ${D}${libdir}/
-}
diff --git a/packages/matrixssl/matrixssl_1.1.1.bb b/packages/matrixssl/matrixssl_1.1.1.bb
index 674e4b4509..09df504a8b 100644
--- a/packages/matrixssl/matrixssl_1.1.1.bb
+++ b/packages/matrixssl/matrixssl_1.1.1.bb
@@ -1,14 +1,12 @@
-SECTION = "unknown"
+DESCRIPTION = "A secure sockets library"
+SECTION = "libs"
+LICENSE = "GPL"
+
 SRC_URI = "http://openembedded.org/dl/matrixssl-1-1-1.tar.gz \
 	   file://cross.patch;patch=1"
 S = "${WORKDIR}/matrixssl/src"
-LICENSE = "GPL"
-def define_os (d):
-	import bb
-	if bb.data.getVar('TARGET_OS', d).startswith('linux'):
-		return "-DLINUX"
-	return ""
 
+require matrixssl.inc
 CFLAGS += " ${@define_os(d)}"
 
 do_install () {
diff --git a/packages/kbdd/kbdd-patched-20040904/.mtn2git_empty b/packages/p3scan/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/kbdd/kbdd-patched-20040904/.mtn2git_empty
+++ b/packages/p3scan/.mtn2git_empty
diff --git a/packages/matrixssl/matrixssl-1.0-beta/.mtn2git_empty b/packages/p3scan/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/matrixssl/matrixssl-1.0-beta/.mtn2git_empty
+++ b/packages/p3scan/files/.mtn2git_empty
diff --git a/packages/p3scan/files/doc.configure.txt b/packages/p3scan/files/doc.configure.txt
new file mode 100644
index 0000000000..2d925f8314
--- /dev/null
+++ b/packages/p3scan/files/doc.configure.txt
@@ -0,0 +1,15 @@
+The following items needs to be considered when using clamsmtp:
+
+1. Transparent proxy
+
+   For transparent proxying you need an IP tables rule such as:
+
+     iptables -t nat -A PREROUTING -i eth0 -p tcp -m tcp --dport 25 -j REDIRECT --to-ports 8110
+     iptables -t nat -A PREROUTING -i eth0 -p tcp -m tcp --dport 110 -j REDIRECT --to-ports 8110
+     iptables -t nat -A PREROUTING -i eth0 -p tcp -m tcp --dport 995 -j REDIRECT --to-ports 8110
+
+   where eth0 is the incomming port, and 8110 is the port that p3scan is
+   running on. Also remember to enable transparent proxy support in the
+   configuration file.
+
+   The ports are 25 for smtp, 110 for pop3 and 995 for pop3s.
diff --git a/packages/p3scan/files/dont-search-use-include.patch b/packages/p3scan/files/dont-search-use-include.patch
new file mode 100644
index 0000000000..91723ce1b6
--- /dev/null
+++ b/packages/p3scan/files/dont-search-use-include.patch
@@ -0,0 +1,11 @@
+--- p3scan-2.9.05d/configure.in	2006/10/12 00:49:31	1.1
++++ p3scan-2.9.05d/configure.in	2006/10/12 00:49:41
+@@ -34,8 +34,6 @@
+ # Checks for libraries.
+ 
+ AC_CHECK_LIB(pthread, pthread_create,  [], [AC_MSG_ERROR([library 'pthread' is required!])])
+-LDFLAGS="$LDFLAGS -L/usr/lib/pthread"
+-CPPFLAGS="$CPPFLAGS -I/usr/include/pthread"
+ 
+ # Checks for header files.
+ AC_HEADER_DIRENT
diff --git a/packages/p3scan/files/libtool-fix.patch b/packages/p3scan/files/libtool-fix.patch
new file mode 100644
index 0000000000..4645bcc616
--- /dev/null
+++ b/packages/p3scan/files/libtool-fix.patch
@@ -0,0 +1,24 @@
+Use our own libtool that knows about cross compiling, not the libtool
+that is included.
+
+--- p3scan-2.9.05d/aclocal.m4	2006/10/12 04:17:35	1.1
++++ p3scan-2.9.05d/aclocal.m4	2006/10/12 04:18:28
+@@ -73,8 +73,7 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+-AC_SUBST(LIBTOOL)dnl
++LIBTOOL="$host_alias-libtool"
+ 
+ # Prevent multiple expansion
+ define([AC_PROG_LIBTOOL], [])
+@@ -140,7 +139,7 @@
+ rm="rm -f"
+ 
+ # Global variables:
+-default_ofile=libtool
++default_ofile==${host_alias}-libtool
+ can_build_shared=yes
+ 
+ # All known linkers require a `.a' archive for static linking (except MSVC,
diff --git a/packages/p3scan/files/p3scan.conf b/packages/p3scan/files/p3scan.conf
new file mode 100644
index 0000000000..2d8ba07e87
--- /dev/null
+++ b/packages/p3scan/files/p3scan.conf
@@ -0,0 +1,16 @@
+# See /usr/share/doc/p3scan/ and/or p3scan(8) for more information
+
+# Delete infected messages
+delete
+
+# Maximum # of connections we will handle at once.
+maxchilds = 10
+
+# Tcp port to listen on
+# port = 8110
+
+# Where to look for an email-template when a notification message has to be sent.
+# template = /etc/p3scan/p3scan-en.mail
+
+# The username the daemon should run as.
+user = mail
diff --git a/packages/p3scan/files/p3scan.init b/packages/p3scan/files/p3scan.init
new file mode 100644
index 0000000000..9f3865b8b2
--- /dev/null
+++ b/packages/p3scan/files/p3scan.init
@@ -0,0 +1,33 @@
+#!/bin/sh
+DAEMON=/usr/sbin/p3scan
+P3SCAN_CONFIG=/etc/p3scan/p3scan.conf
+PIDFILE=/var/run/p3scan/p3scan.pid
+NAME="p3scan"
+DESC="P3SCAN"
+
+test -r /etc/default/p3scan && . /etc/default/p3scan
+test -x "$DAEMON" || exit 0
+test ! -r "$P3SCAN_CONFIG" && exit 0
+        
+case "$1" in
+  start)
+    echo "Starting $DESC: "
+    start-stop-daemon --oknodo -S -x $DAEMON -- -c $P3SCAN_CONFIG
+    echo "$NAME."
+    ;;
+
+  stop)
+    echo "Stopping $DESC:"
+    start-stop-daemon -K -p $PIDFILE
+    ;;
+
+  restart)
+    $0 stop >/dev/null 2>&1
+    $0 start
+    ;;
+
+  *)
+    echo "Usage: $0 {start|stop|restart}"
+    exit 0
+    ;;
+esac
diff --git a/packages/p3scan/files/volatiles.05_p3scan b/packages/p3scan/files/volatiles.05_p3scan
new file mode 100644
index 0000000000..2a7caeddd9
--- /dev/null
+++ b/packages/p3scan/files/volatiles.05_p3scan
@@ -0,0 +1,4 @@
+# <type> <owner> <group> <mode> <path> <linksource>
+d mail mail 0755 /var/run/p3scan none
+d mail mail 0755 /var/spool/p3scan/children none
+d mail mail 0755 /var/spool/p3scan/notify none
diff --git a/packages/p3scan/p3scan_2.9.05d.bb b/packages/p3scan/p3scan_2.9.05d.bb
new file mode 100644
index 0000000000..1b77a014e1
--- /dev/null
+++ b/packages/p3scan/p3scan_2.9.05d.bb
@@ -0,0 +1,85 @@
+DESCRIPTION = "A transparent proxy-server for email clients. It is designed \
+to enable scanning of incoming/outgoing email messages (POP3, POPSS and \
+SMTP) for Virus's, Worms, Trojans, Spam and harmfull attachments."
+HOMEPAGE = "http://p3scan.sourceforge.net/"
+SECTION = "network"
+LICENSE = "GPLv2"
+DEPENDS = "gmp bzip2 zlib clamav openssl"
+RDEPENDS_${PN} = "${PN}-templates-en"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/p3scan/p3scan-2.9.05d.tar.gz \
+           file://libtool-fix.patch;patch=1 \
+           file://dont-search-use-include.patch;patch=1 \
+           file://p3scan.init \
+           file://p3scan.conf \
+           file://doc.configure.txt \
+           file://volatiles.05_p3scan"
+
+inherit autotools update-rc.d
+
+EXTRA_OECONF = "--with-clamav=${STAGING_LIBDIR}/.. \
+                --with-openssl=${STAGING_LIBDIR}/.. \
+                --disable-ripmime"
+
+# Full manual install because the autoconf installer puts in lots of
+# stuff we don't want and in lots of odd directories.
+do_install () {
+        install -m 0755 -d ${D}${sysconfdir}/init.d \
+                           ${D}${docdir}/p3scan \
+                           ${D}${mandir}/man8 \
+                           ${D}${sysconfdir}/p3scan \
+                           ${D}${sysconfdir}/default/volatiles \
+                           ${D}${sbindir}
+        install -m 755 ${WORKDIR}/p3scan.init ${D}${sysconfdir}/init.d/p3scan
+        install -m 755 ${WORKDIR}/p3scan.conf ${D}${sysconfdir}/p3scan/p3scan.conf
+        install -m 644 ${WORKDIR}/doc.configure.txt ${D}${docdir}/p3scan/configure.txt
+        install -m 755 src/.libs/p3scan ${D}${sbindir}
+        for i in etc/p3scan-*.mail \
+                 etc/p3scan.whitelist \
+                 etc/p3scan.blacklist; do
+          install -m 644 $i ${D}${sysconfdir}/p3scan/`basename $i`
+        done
+        for i in README ChangeLog README-ripmime README-emergency \
+                 spamfaq.html etc/p3scan.conf.sample p3scan.sh \
+                 AUTHORS CONTRIBUTERS; do
+          install -m 644 $i ${D}${docdir}/p3scan/`basename $i`
+        done
+        install -m 644 man/p3scan.man ${D}${mandir}/man8/p3scan.8
+        # We need some /var directories
+        for i in 05_p3scan; do
+          install -m 0644 ${WORKDIR}/volatiles.$i ${D}${sysconfdir}/default/volatiles/$i
+        done
+}
+
+PACKAGES = "${PN}-dbg ${PN}-doc \
+            ${PN}-templates-ru ${PN}-templates-en ${PN}-templates-pt-br \
+            ${PN}-templates-sp ${PN}-templates-ge ${PN}-templates-fr \
+            ${PN}-templates-nl ${PN}-templates-pl ${PN}-templates-it \
+            ${PN}"
+
+FILES_${PN} = "${sysconfdir}/p3scan/* \
+               ${sysconfdir}/init.d ${sysconfdir}/default ${sbindir}"
+FILES_${PN}-templates-ru = "${sysconfdir}/p3scan/p3scan-ru.mail"
+FILES_${PN}-templates-en = "${sysconfdir}/p3scan/p3scan-en.mail"
+FILES_${PN}-templates-pt-br = "${sysconfdir}/p3scan/p3scan-pt-br.mail"
+FILES_${PN}-templates-sp = "${sysconfdir}/p3scan/p3scan-sp.mail"
+FILES_${PN}-templates-ge = "${sysconfdir}/p3scan/p3scan-ge.mail"
+FILES_${PN}-templates-fr = "${sysconfdir}/p3scan/p3scan-fr.mail"
+FILES_${PN}-templates-nl = "${sysconfdir}/p3scan/p3scan-nl.mail"
+FILES_${PN}-templates-pl = "${sysconfdir}/p3scan/p3scan-pl.mail"
+FILES_${PN}-templates-it = "${sysconfdir}/p3scan/p3scan-it.mail"
+
+# Add havp's user and groups
+pkg_postinst_${PN} () {
+        grep -q mail: /etc/group || addgroup --system havp
+        grep -q mail: /etc/passwd || \
+            adduser --disabled-password --home=${localstatedir}/mail --system \
+                    --ingroup mail --no-create-home -g "Mail" mail
+        /etc/init.d/populate-volatile.sh
+}
+
+CONFFILES_${PN} = "${sysconfdir}/p3scan/p3scan.conf"
+
+INITSCRIPT_NAME = "p3scan"
+INITSCRIPT_PARAMS = "defaults 65 35"
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 0762a59af6..02669ec2db 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r7"
+PR = "r8"
 
 PACKAGES = "task-base \
             task-base-minimal \
@@ -258,7 +258,7 @@ task-distro-ipsec-rrecommends = "\
 task-distro-wifi-rdepends = "\
     wireless-tools \
     hostap-utils \
-    wpa-supplicant-nossl"
+    wpa-supplicant"
 
 task-distro-wifi-rrecommends = "\
     kernel-module-ieee80211-crypt \