From b5eb10e8d0be925c071fb1cf5df54bd07810ce42 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 14 Dec 2006 11:10:00 +0000
Subject: dbus 1.0.1: apply patch to fix CVE-2006-6107

---
 packages/dbus/dbus-1.0.1/dbus-exploit-fix.patch | 21 +++++++++++++++++++++
 packages/dbus/dbus_1.0.1.bb                     |  4 +++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 packages/dbus/dbus-1.0.1/dbus-exploit-fix.patch

diff --git a/packages/dbus/dbus-1.0.1/dbus-exploit-fix.patch b/packages/dbus/dbus-1.0.1/dbus-exploit-fix.patch
new file mode 100644
index 0000000000..7d36dbdf22
--- /dev/null
+++ b/packages/dbus/dbus-1.0.1/dbus-exploit-fix.patch
@@ -0,0 +1,21 @@
+https://bugs.freedesktop.org/show_bug.cgi?id=9142
+
+[..] the use case was the following. There
+are three processes A, B, and C. All of them add the same match (same value). A
+is started first, then B, and lastly C. Now, B and C are closed: if B is closed
+before C, A's match is removed; but if C is closed before B, A's match is not
+removed (no buggy behaviour). (B and C call dbus_bus_remove_match on exit.)
+
+diff -pur 0.61-osso23/bus/signals.c 0.61-osso23.new/bus/signals.c
+--- 0.61-osso23/bus/signals.c	2006-11-23 16:46:52.589602192 +0200
++++ 0.61-osso23.new/bus/signals.c	2006-11-23 16:49:28.873843376 +0200
+@@ -1067,6 +1067,9 @@ match_rule_equal (BusMatchRule *a,
+   if (a->flags != b->flags)
+     return FALSE;
+ 
++  if (a->matches_go_to != b->matches_go_to)
++    return FALSE;
++
+   if ((a->flags & BUS_MATCH_MESSAGE_TYPE) &&
+       a->message_type != b->message_type)
+     return FALSE;
diff --git a/packages/dbus/dbus_1.0.1.bb b/packages/dbus/dbus_1.0.1.bb
index 0198fa62c8..f04e9c4a40 100644
--- a/packages/dbus/dbus_1.0.1.bb
+++ b/packages/dbus/dbus_1.0.1.bb
@@ -1,3 +1,5 @@
 require dbus.inc
 
-PR = "r1"
+SRC_URI += "file://dbus-exploit-fix.patch;patch=1"
+
+PR = "r2"
-- 
cgit v1.2.3


From 0fe9ddd16cc52a08fa7f841d61400e9223f990b5 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 14 Dec 2006 11:17:28 +0000
Subject: dbus.inc: glib-2.0 isn't needed any more

---
 packages/dbus/dbus.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc
index d87975a20e..8baf8d9feb 100644
--- a/packages/dbus/dbus.inc
+++ b/packages/dbus/dbus.inc
@@ -2,7 +2,7 @@ SECTION = "base"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
-DEPENDS = "expat glib-2.0 virtual/libintl"
+DEPENDS = "expat virtual/libintl"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
 	   file://tmpdir.patch;patch=1 \
-- 
cgit v1.2.3


From 3f15e5b47397f623244abeab54c6151cd456c2b7 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 14 Dec 2006 11:24:21 +0000
Subject: dbus: add 1.0.2

---
 packages/dbus/dbus-0.95/.mtn2git_empty            |  0
 packages/dbus/dbus-0.95/cross.patch               | 10 ---
 packages/dbus/dbus-0.95/dbus-1.init               | 88 ---------------------
 packages/dbus/dbus-0.95/fix-install-daemon.patch  | 13 ---
 packages/dbus/dbus-1.0.2/.mtn2git_empty           |  0
 packages/dbus/dbus-1.0.2/cross.patch              | 10 +++
 packages/dbus/dbus-1.0.2/dbus-1.init              | 96 +++++++++++++++++++++++
 packages/dbus/dbus-1.0.2/fix-install-daemon.patch | 13 +++
 packages/dbus/dbus_1.0.2.bb                       |  2 +
 9 files changed, 121 insertions(+), 111 deletions(-)
 delete mode 100644 packages/dbus/dbus-0.95/.mtn2git_empty
 delete mode 100644 packages/dbus/dbus-0.95/cross.patch
 delete mode 100644 packages/dbus/dbus-0.95/dbus-1.init
 delete mode 100644 packages/dbus/dbus-0.95/fix-install-daemon.patch
 create mode 100644 packages/dbus/dbus-1.0.2/.mtn2git_empty
 create mode 100644 packages/dbus/dbus-1.0.2/cross.patch
 create mode 100644 packages/dbus/dbus-1.0.2/dbus-1.init
 create mode 100644 packages/dbus/dbus-1.0.2/fix-install-daemon.patch
 create mode 100644 packages/dbus/dbus_1.0.2.bb

diff --git a/packages/dbus/dbus-0.95/.mtn2git_empty b/packages/dbus/dbus-0.95/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/dbus/dbus-0.95/cross.patch b/packages/dbus/dbus-0.95/cross.patch
deleted file mode 100644
index 268a3ae3de..0000000000
--- a/packages/dbus/dbus-0.95/cross.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- /tmp/configure.in	2006-11-09 21:47:10.000000000 +0100
-+++ dbus-0.95/configure.in	2006-11-09 21:48:13.108554000 +0100
-@@ -719,6 +719,7 @@
-     exit (0);
- ]])],
-               [ac_cv_have_abstract_sockets=yes],
-+	      [ac_cv_have_abstract_sockets=no],
-               [ac_cv_have_abstract_sockets=no]
- )])
- AC_LANG_POP(C)
diff --git a/packages/dbus/dbus-0.95/dbus-1.init b/packages/dbus/dbus-0.95/dbus-1.init
deleted file mode 100644
index 4829c0d4a8..0000000000
--- a/packages/dbus/dbus-0.95/dbus-1.init
+++ /dev/null
@@ -1,88 +0,0 @@
-#! /bin/sh
-# -*- coding: utf-8 -*-
-# Debian init.d script for D-BUS
-# Copyright © 2003 Colin Walters <walters@debian.org>
-
-set -e
-
-DAEMON=/usr/bin/dbus-daemon
-NAME=dbus
-DAEMONUSER=messagebus
-PIDDIR=/var/run/dbus
-PIDFILE=$PIDDIR/pid
-DESC="system message bus"
-EVENTDIR=/etc/dbus-1/event.d
-
-test -x $DAEMON || exit 0
-
-# Source defaults file; edit that file to configure this script.
-ENABLED=1
-PARAMS=""
-if [ -e /etc/default/dbus ]; then
-  . /etc/default/dbus
-fi
-
-test "$ENABLED" != "0" || exit 0
-
-start_it_up()
-{
-  if [ ! -d $PIDDIR ]; then
-    mkdir -p $PIDDIR
-    chown $DAEMONUSER $PIDDIR
-    chgrp $DAEMONUSER $PIDDIR
-  fi
-  if [ -e $PIDFILE ]; then
-    PIDDIR=/proc/$(cat $PIDFILE)
-    if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then 
-      echo "$DESC already started; not starting."
-    else
-      echo "Removing stale PID file $PIDFILE."
-      rm -f $PIDFILE
-    fi
-  fi
- 
-  dbus-uuidgen --ensure  
-  echo -n "Starting $DESC: "
-  start-stop-daemon --start --quiet --pidfile $PIDFILE \
-    --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
-  echo "$NAME."
-  if [ -d $EVENTDIR ]; then
-      run-parts --arg=start $EVENTDIR
-  fi
-}
-
-shut_it_down()
-{
-  if [ -d $EVENTDIR ]; then
-      run-parts --reverse --arg=stop $EVENTDIR
-  fi
-  echo -n "Stopping $DESC: "
-  start-stop-daemon --stop  --quiet --pidfile $PIDFILE \
-    --user $DAEMONUSER
-  # We no longer include these arguments so that start-stop-daemon
-  # can do its job even given that we may have been upgraded.
-  # We rely on the pidfile being sanely managed
-  # --exec $DAEMON -- --system $PARAMS
-  echo "$NAME."
-  rm -f $PIDFILE
-}
-
-case "$1" in
-  start)
-    start_it_up
-  ;;
-  stop)
-    shut_it_down
-  ;;
-  restart|force-reload)
-    shut_it_down
-    sleep 1
-    start_it_up
-  ;;
-  *)
-    echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2
-    exit 1
-  ;;
-esac
-
-exit 0
diff --git a/packages/dbus/dbus-0.95/fix-install-daemon.patch b/packages/dbus/dbus-0.95/fix-install-daemon.patch
deleted file mode 100644
index c31786357d..0000000000
--- a/packages/dbus/dbus-0.95/fix-install-daemon.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: dbus-0.94/bus/Makefile.am
-===================================================================
---- dbus-0.94.orig/bus/Makefile.am	2006-10-01 17:36:18.000000000 +0200
-+++ dbus-0.94/bus/Makefile.am	2006-10-14 21:40:05.000000000 +0200
-@@ -110,7 +110,7 @@
- 		$(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \
- 		chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
- 	fi
--	$(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
-+	$(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
- 	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
- 	$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
- 	$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
diff --git a/packages/dbus/dbus-1.0.2/.mtn2git_empty b/packages/dbus/dbus-1.0.2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/dbus/dbus-1.0.2/cross.patch b/packages/dbus/dbus-1.0.2/cross.patch
new file mode 100644
index 0000000000..268a3ae3de
--- /dev/null
+++ b/packages/dbus/dbus-1.0.2/cross.patch
@@ -0,0 +1,10 @@
+--- /tmp/configure.in	2006-11-09 21:47:10.000000000 +0100
++++ dbus-0.95/configure.in	2006-11-09 21:48:13.108554000 +0100
+@@ -719,6 +719,7 @@
+     exit (0);
+ ]])],
+               [ac_cv_have_abstract_sockets=yes],
++	      [ac_cv_have_abstract_sockets=no],
+               [ac_cv_have_abstract_sockets=no]
+ )])
+ AC_LANG_POP(C)
diff --git a/packages/dbus/dbus-1.0.2/dbus-1.init b/packages/dbus/dbus-1.0.2/dbus-1.init
new file mode 100644
index 0000000000..38e7574ad5
--- /dev/null
+++ b/packages/dbus/dbus-1.0.2/dbus-1.init
@@ -0,0 +1,96 @@
+#! /bin/sh
+# -*- coding: utf-8 -*-
+# Debian init.d script for D-BUS
+# Copyright © 2003 Colin Walters <walters@debian.org>
+
+set -e
+
+DAEMON=/usr/bin/dbus-daemon
+NAME=dbus
+DAEMONUSER=messagebus
+PIDDIR=/var/run/dbus
+PIDFILE=$PIDDIR/pid
+UUIDDIR=/var/lib/dbus
+DESC="system message bus"
+EVENTDIR=/etc/dbus-1/event.d
+
+test -x $DAEMON || exit 0
+
+# Source defaults file; edit that file to configure this script.
+ENABLED=1
+PARAMS=""
+if [ -e /etc/default/dbus ]; then
+  . /etc/default/dbus
+fi
+
+test "$ENABLED" != "0" || exit 0
+
+start_it_up()
+{
+  if [ ! -d $PIDDIR ]; then
+    mkdir -p $PIDDIR
+    chown $DAEMONUSER $PIDDIR
+    chgrp $DAEMONUSER $PIDDIR
+  fi
+  if [ -e $PIDFILE ]; then
+    PIDDIR=/proc/$(cat $PIDFILE)
+    if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then 
+      echo "$DESC already started; not starting."
+    else
+      echo "Removing stale PID file $PIDFILE."
+      rm -f $PIDFILE
+    fi
+  fi
+
+  if [ ! -d $UUIDDIR ]; then
+    mkdir -p $UUIDDIR
+    chown $DAEMONUSER $UUIDDIR
+    chgrp $DAEMONUSER $UUIDDIR
+  fi
+ 
+  dbus-uuidgen --ensure  
+
+  echo -n "Starting $DESC: "
+  start-stop-daemon --start --quiet --pidfile $PIDFILE \
+    --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
+  echo "$NAME."
+  if [ -d $EVENTDIR ]; then
+      run-parts --arg=start $EVENTDIR
+  fi
+}
+
+shut_it_down()
+{
+  if [ -d $EVENTDIR ]; then
+      run-parts --reverse --arg=stop $EVENTDIR
+  fi
+  echo -n "Stopping $DESC: "
+  start-stop-daemon --stop  --quiet --pidfile $PIDFILE \
+    --user $DAEMONUSER
+  # We no longer include these arguments so that start-stop-daemon
+  # can do its job even given that we may have been upgraded.
+  # We rely on the pidfile being sanely managed
+  # --exec $DAEMON -- --system $PARAMS
+  echo "$NAME."
+  rm -f $PIDFILE
+}
+
+case "$1" in
+  start)
+    start_it_up
+  ;;
+  stop)
+    shut_it_down
+  ;;
+  restart|force-reload)
+    shut_it_down
+    sleep 1
+    start_it_up
+  ;;
+  *)
+    echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2
+    exit 1
+  ;;
+esac
+
+exit 0
diff --git a/packages/dbus/dbus-1.0.2/fix-install-daemon.patch b/packages/dbus/dbus-1.0.2/fix-install-daemon.patch
new file mode 100644
index 0000000000..c31786357d
--- /dev/null
+++ b/packages/dbus/dbus-1.0.2/fix-install-daemon.patch
@@ -0,0 +1,13 @@
+Index: dbus-0.94/bus/Makefile.am
+===================================================================
+--- dbus-0.94.orig/bus/Makefile.am	2006-10-01 17:36:18.000000000 +0200
++++ dbus-0.94/bus/Makefile.am	2006-10-14 21:40:05.000000000 +0200
+@@ -110,7 +110,7 @@
+ 		$(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \
+ 		chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
+ 	fi
+-	$(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
++	$(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
+ 	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
+ 	$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
+ 	$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
diff --git a/packages/dbus/dbus_1.0.2.bb b/packages/dbus/dbus_1.0.2.bb
new file mode 100644
index 0000000000..7345f22bb5
--- /dev/null
+++ b/packages/dbus/dbus_1.0.2.bb
@@ -0,0 +1,2 @@
+require dbus.inc
+
-- 
cgit v1.2.3


From 5d810964202ef8d2c197965ec8eb66082c62d492 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 14 Dec 2006 11:24:58 +0000
Subject: angstrom: prefer dbus 1.0.2

---
 conf/distro/angstrom-2007.1.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 630fbc6bbf..52e89c7637 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -8,7 +8,7 @@
 
 #DISTRO_VERSION = "2007.3"
 DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "22"
+DISTRO_REVISION = "23"
 
 require conf/distro/include/angstrom.inc
 require conf/distro/include/sane-srcdates.inc
@@ -177,7 +177,7 @@ PREFERRED_VERSION_busybox = "1.2.1"
 
 PCMCIA_MANAGER = "pcmciautils"
 
-PREFERRED_VERSION_dbus ?= "1.0.1"
+PREFERRED_VERSION_dbus ?= "1.0.2"
 PREFERRED_VERSION_dbus-glib ?= "0.71"
 
 PREFERRED_VERSION_gstreamer ?= "0.10.6"
-- 
cgit v1.2.3


From 682236a7ab13fa36caa6ee9fe96f1d899f1c85e6 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 14 Dec 2006 11:51:46 +0000
Subject: u2nl: update to 1.3

---
 packages/u2nl/files/buildsystem.patch | 18 ++++++++----------
 packages/u2nl/u2nl_1.1.bb             | 15 ---------------
 packages/u2nl/u2nl_1.3.bb             | 15 +++++++++++++++
 3 files changed, 23 insertions(+), 25 deletions(-)
 delete mode 100644 packages/u2nl/u2nl_1.1.bb
 create mode 100644 packages/u2nl/u2nl_1.3.bb

diff --git a/packages/u2nl/files/buildsystem.patch b/packages/u2nl/files/buildsystem.patch
index 2877a01729..9de58fa435 100644
--- a/packages/u2nl/files/buildsystem.patch
+++ b/packages/u2nl/files/buildsystem.patch
@@ -1,8 +1,8 @@
-Index: u2nl-1.1/Makefile
+Index: u2nl-1.3/Makefile
 ===================================================================
---- u2nl-1.1.orig/Makefile	2005-03-06 16:32:23.000000000 -0500
-+++ u2nl-1.1/Makefile	2005-03-11 02:38:00.454572600 -0500
-@@ -1,10 +1,25 @@
+--- u2nl-1.3.orig/Makefile	2005-01-03 19:31:20.000000000 +0100
++++ u2nl-1.3/Makefile	2006-12-14 12:38:15.052227000 +0100
+@@ -1,5 +1,25 @@
 +CC      = gcc
 +CFLAGS  = -Wall -g
 +LDFLAGS =
@@ -17,18 +17,16 @@ Index: u2nl-1.1/Makefile
  all: u2nl
  
  u2nl: u2nl.c
--	gcc $(CFLAGS) -Wall -g u2nl.c -o u2nl
+-	gcc -Wall -g u2nl.c -o u2nl
 -	
 +	$(CC) $(CFLAGS) $(LDFLAGS) u2nl.c -o u2nl
 +
- install:
--	cp u2nl /usr/local/bin
++install:
 +	$(INSTALL_DIR) $(DESTDIR)$(bindir)
 +	$(INSTALL_BIN) u2nl $(DESTDIR)$(bindir)/u2nl
 +
 +uninstall:
 +	-rm -f $(DESTDIR)$(bindir)/u2nl
- 
- clean:
--	rm -fR u2nl
++
++clean:
 +	-rm -fR u2nl
diff --git a/packages/u2nl/u2nl_1.1.bb b/packages/u2nl/u2nl_1.1.bb
deleted file mode 100644
index 7cfa7b75ba..0000000000
--- a/packages/u2nl/u2nl_1.1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "u2nl (pronounce: "u-tunnel", universal tunnel) is capable of \
-tunneling each and every TCP network connection from a Linux (2.4 and above, \
-with netfilter) computer through an http CONNECT proxy."
-HOMEPAGE = "http://www.reitwiessner.de/programs/u2nl.html"
-LICENSE = "GPL"
-SECTION = "console/network"
-PRIORITY = "optional"
-
-SRC_URI = "http://www.reitwiessner.de/programs/u2nl-${PV}.tar.gz \
-	   file://buildsystem.patch;patch=1"
-S = "${WORKDIR}/u2nl-${PV}"
-
-do_install () {
-	oe_runmake 'DESTDIR=${D}' install
-}
diff --git a/packages/u2nl/u2nl_1.3.bb b/packages/u2nl/u2nl_1.3.bb
new file mode 100644
index 0000000000..7cfa7b75ba
--- /dev/null
+++ b/packages/u2nl/u2nl_1.3.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "u2nl (pronounce: "u-tunnel", universal tunnel) is capable of \
+tunneling each and every TCP network connection from a Linux (2.4 and above, \
+with netfilter) computer through an http CONNECT proxy."
+HOMEPAGE = "http://www.reitwiessner.de/programs/u2nl.html"
+LICENSE = "GPL"
+SECTION = "console/network"
+PRIORITY = "optional"
+
+SRC_URI = "http://www.reitwiessner.de/programs/u2nl-${PV}.tar.gz \
+	   file://buildsystem.patch;patch=1"
+S = "${WORKDIR}/u2nl-${PV}"
+
+do_install () {
+	oe_runmake 'DESTDIR=${D}' install
+}
-- 
cgit v1.2.3


From bcec79858361aafd98fd275a40ed1f61833ca640 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Thu, 14 Dec 2006 11:53:45 +0000
Subject: poboxserver: upstream sources gone (temporarily?). Host at
 gakusei.sf.net now.

---
 packages/poboxserver/poboxserver_1.2.5.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/poboxserver/poboxserver_1.2.5.bb b/packages/poboxserver/poboxserver_1.2.5.bb
index 7a8bd6f8b5..f9cbdf11e8 100644
--- a/packages/poboxserver/poboxserver_1.2.5.bb
+++ b/packages/poboxserver/poboxserver_1.2.5.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 DEPENDS = "perl-native ruby-native nkf-native"
 PR = "r2"
 
-SRC_URI = "http://pitecan.com/OpenPOBox/dist/pobox-${PV}.tgz \
+SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/pobox-${PV}.tar.bz2 \
            http://www.vanille.de/mirror/pbserver-${PV}.tar.gz \
            file://OpenPOBox-1.25.diff;patch=1 \
            file://remove-local-includes.patch;patch=1 \
-- 
cgit v1.2.3


From f5501bf768939e0be0ef6dcceeaeb2b3882c4bac Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 14 Dec 2006 12:39:13 +0000
Subject: dbus: package libdbus into separate package - opie images will get
 smaller now

---
 packages/dbus/dbus.inc      | 41 ++++++++++++++++++++++++-----------------
 packages/dbus/dbus_0.95.bb  |  1 +
 packages/dbus/dbus_1.0.1.bb |  2 +-
 packages/dbus/dbus_1.0.2.bb |  1 +
 4 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc
index 8baf8d9feb..b76c05157a 100644
--- a/packages/dbus/dbus.inc
+++ b/packages/dbus/dbus.inc
@@ -1,6 +1,6 @@
+DESCRIPTION = "message bus system for applications to talk to one another"
 SECTION = "base"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
 DEPENDS = "expat virtual/libintl"
 
@@ -18,24 +18,15 @@ INITSCRIPT_PARAMS = "defaults"
 
 CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
 
-FILES_${PN} = "${bindir}/dbus-daemon ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${bindir}/dbus-uuidgen ${sysconfdir} ${datadir}/dbus-1/services ${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${libdir}/dbus-1.0/include"
+PACKAGES += "${PN}-lib"
 
-pkg_postinst_dbus() {
-#!/bin/sh
-
-# can't do adduser stuff offline
-if [ "x$D" != "x" ]; then
-  exit 1
-fi
-
-MESSAGEUSER=messagebus
-MESSAGEHOME=/var/run/dbus
+FILES_${PN} = "${bindir}/dbus-daemon ${bindir}/dbus-launch \
+               ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send \
+	       ${bindir}/dbus-monitor ${bindir}/dbus-uuidgen \
+	       ${sysconfdir} ${datadir}/dbus-1/service"
+FILES_${PN}-lib = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${libdir}/dbus-1.0/include"
 
-mkdir -p $MESSAGEHOME || true
-chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
-chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
-}
 
 EXTRA_OECONF = "--disable-qt  --disable-qt3 --disable-gtk --disable-tests \
 		--disable-checks --disable-xml-docs --disable-doxygen-docs \
@@ -59,3 +50,19 @@ python populate_packages_prepend () {
 	if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
 		bb.data.setVar('PKG_dbus', 'dbus-1', d)
 }
+
+pkg_postinst_dbus() {
+#!/bin/sh
+
+# can't do adduser stuff offline
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
+MESSAGEUSER=messagebus
+MESSAGEHOME=/var/run/dbus
+
+mkdir -p $MESSAGEHOME || true
+chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
+chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
+}
diff --git a/packages/dbus/dbus_0.95.bb b/packages/dbus/dbus_0.95.bb
index 688e5c630f..13e27534de 100644
--- a/packages/dbus/dbus_0.95.bb
+++ b/packages/dbus/dbus_0.95.bb
@@ -5,6 +5,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl"
+PR = "r1"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
 	   file://tmpdir.patch;patch=1 \
diff --git a/packages/dbus/dbus_1.0.1.bb b/packages/dbus/dbus_1.0.1.bb
index f04e9c4a40..3c45ee8bd6 100644
--- a/packages/dbus/dbus_1.0.1.bb
+++ b/packages/dbus/dbus_1.0.1.bb
@@ -2,4 +2,4 @@ require dbus.inc
 
 SRC_URI += "file://dbus-exploit-fix.patch;patch=1"
 
-PR = "r2"
+PR = "r3"
diff --git a/packages/dbus/dbus_1.0.2.bb b/packages/dbus/dbus_1.0.2.bb
index 7345f22bb5..0198fa62c8 100644
--- a/packages/dbus/dbus_1.0.2.bb
+++ b/packages/dbus/dbus_1.0.2.bb
@@ -1,2 +1,3 @@
 require dbus.inc
 
+PR = "r1"
-- 
cgit v1.2.3


From 2cae38214637979a90bdab0462a4d03d50c430e6 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 14 Dec 2006 12:48:49 +0000
Subject: dbus: make lib recommend dbus

---
 packages/dbus/dbus.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc
index b76c05157a..bbe482a829 100644
--- a/packages/dbus/dbus.inc
+++ b/packages/dbus/dbus.inc
@@ -3,6 +3,7 @@ SECTION = "base"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 LICENSE = "GPL"
 DEPENDS = "expat virtual/libintl"
+RRECOMMENDS_${PN}-lib = "${PN}"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
 	   file://tmpdir.patch;patch=1 \
-- 
cgit v1.2.3


From ef3c576b2ca6dc3ee5c850dab9e6c5f642d5f675 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 14 Dec 2006 12:51:47 +0000
Subject: dbus.inc: revert granularity change till someone comes up with
 something that doesn't break every dbus using app

---
 packages/dbus/dbus.inc | 42 +++++++++++++++++-------------------------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc
index bbe482a829..8baf8d9feb 100644
--- a/packages/dbus/dbus.inc
+++ b/packages/dbus/dbus.inc
@@ -1,9 +1,8 @@
-DESCRIPTION = "message bus system for applications to talk to one another"
 SECTION = "base"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
 DEPENDS = "expat virtual/libintl"
-RRECOMMENDS_${PN}-lib = "${PN}"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
 	   file://tmpdir.patch;patch=1 \
@@ -19,15 +18,24 @@ INITSCRIPT_PARAMS = "defaults"
 
 CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
 
-PACKAGES += "${PN}-lib"
-
-FILES_${PN} = "${bindir}/dbus-daemon ${bindir}/dbus-launch \
-               ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send \
-	       ${bindir}/dbus-monitor ${bindir}/dbus-uuidgen \
-	       ${sysconfdir} ${datadir}/dbus-1/service"
-FILES_${PN}-lib = "${libdir}/lib*.so.*"
+FILES_${PN} = "${bindir}/dbus-daemon ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${bindir}/dbus-uuidgen ${sysconfdir} ${datadir}/dbus-1/services ${libdir}/lib*.so.*"
 FILES_${PN}-dev += "${libdir}/dbus-1.0/include"
 
+pkg_postinst_dbus() {
+#!/bin/sh
+
+# can't do adduser stuff offline
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
+MESSAGEUSER=messagebus
+MESSAGEHOME=/var/run/dbus
+
+mkdir -p $MESSAGEHOME || true
+chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
+chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
+}
 
 EXTRA_OECONF = "--disable-qt  --disable-qt3 --disable-gtk --disable-tests \
 		--disable-checks --disable-xml-docs --disable-doxygen-docs \
@@ -51,19 +59,3 @@ python populate_packages_prepend () {
 	if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
 		bb.data.setVar('PKG_dbus', 'dbus-1', d)
 }
-
-pkg_postinst_dbus() {
-#!/bin/sh
-
-# can't do adduser stuff offline
-if [ "x$D" != "x" ]; then
-  exit 1
-fi
-
-MESSAGEUSER=messagebus
-MESSAGEHOME=/var/run/dbus
-
-mkdir -p $MESSAGEHOME || true
-chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
-chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
-}
-- 
cgit v1.2.3


From d8ebe3ef124c7780b0c8f3c00f5359c15de3e7e7 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 14 Dec 2006 14:09:48 +0000
Subject: dbus: drop 0.95

---
 packages/dbus/dbus_0.95.bb | 64 ----------------------------------------------
 1 file changed, 64 deletions(-)
 delete mode 100644 packages/dbus/dbus_0.95.bb

diff --git a/packages/dbus/dbus_0.95.bb b/packages/dbus/dbus_0.95.bb
deleted file mode 100644
index 13e27534de..0000000000
--- a/packages/dbus/dbus_0.95.bb
+++ /dev/null
@@ -1,64 +0,0 @@
-DEFAULT_PREFERENCE = "-1"
-
-SECTION = "base"
-HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-DESCRIPTION = "message bus system for applications to talk to one another"
-LICENSE = "GPL"
-DEPENDS = "expat glib-2.0 virtual/libintl"
-PR = "r1"
-
-SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
-	   file://tmpdir.patch;patch=1 \
-	   file://dbus-1.init \
-	   file://fix-segfault.patch;patch=1 \
-           file://cross.patch;patch=1 \
-	   file://fix-install-daemon.patch;patch=1"
-
-inherit autotools pkgconfig update-rc.d gettext
-
-INITSCRIPT_NAME = "dbus-1"
-INITSCRIPT_PARAMS = "defaults"
-
-CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
-
-FILES_${PN} = "${bindir}/dbus-daemon ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${bindir}/dbus-uuidgen ${sysconfdir} ${datadir}/dbus-1/services ${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${libdir}/dbus-1.0/include"
-
-pkg_postinst_dbus() {
-#!/bin/sh
-
-# can't do adduser stuff offline
-if [ "x$D" != "x" ]; then
-  exit 1
-fi
-
-MESSAGEUSER=messagebus
-MESSAGEHOME=/var/run/dbus
-
-mkdir -p $MESSAGEHOME || true
-chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
-chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
-}
-
-EXTRA_OECONF = "--disable-qt  --disable-qt3 --disable-gtk --disable-tests \
-		--disable-checks --disable-xml-docs --disable-doxygen-docs \
-		--with-xml=expat --without-x"
-
-do_stage () {
-	oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
-
-	autotools_stage_includes
-
-	mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
-	install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
-}
-
-do_install_append () {
-	install -d ${D}${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
-}
-
-python populate_packages_prepend () {
-	if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
-		bb.data.setVar('PKG_dbus', 'dbus-1', d)
-}
-- 
cgit v1.2.3


From 1eec7da2506128e9de16ebc6f784773826b26ee0 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 14 Dec 2006 14:19:42 +0000
Subject: wireshark: updated to 0.99.4 (it was ethereal before)

---
 packages/ethereal/.mtn2git_empty                |   0
 packages/ethereal/ethereal_0.99.0.bb            |  18 -
 packages/ethereal/files/.mtn2git_empty          |   0
 packages/ethereal/files/use-our-lemon.patch     |  16 -
 packages/wireshark/.mtn2git_empty               |   0
 packages/wireshark/files/.mtn2git_empty         |   0
 packages/wireshark/files/no-host-includes.patch | 546 ++++++++++++++++++++++++
 packages/wireshark/files/use-our-lemon.patch    |  16 +
 packages/wireshark/wireshark_0.99.4.bb          |  16 +
 9 files changed, 578 insertions(+), 34 deletions(-)
 delete mode 100644 packages/ethereal/.mtn2git_empty
 delete mode 100644 packages/ethereal/ethereal_0.99.0.bb
 delete mode 100644 packages/ethereal/files/.mtn2git_empty
 delete mode 100644 packages/ethereal/files/use-our-lemon.patch
 create mode 100644 packages/wireshark/.mtn2git_empty
 create mode 100644 packages/wireshark/files/.mtn2git_empty
 create mode 100644 packages/wireshark/files/no-host-includes.patch
 create mode 100644 packages/wireshark/files/use-our-lemon.patch
 create mode 100644 packages/wireshark/wireshark_0.99.4.bb

diff --git a/packages/ethereal/.mtn2git_empty b/packages/ethereal/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/ethereal/ethereal_0.99.0.bb b/packages/ethereal/ethereal_0.99.0.bb
deleted file mode 100644
index a6748be077..0000000000
--- a/packages/ethereal/ethereal_0.99.0.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Ethereal is the world's most popular network protocol analyzer"
-HOMEPAGE = "http://www.ethereal.com"
-SECTION = "x11/network"
-LICENSE = "GPL"
-DEPENDS = "perl-native gtk+ gnutls libpcap"
-PR = "r2"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/ethereal/ethereal-${PV}.tar.bz2 \
-           file://use-our-lemon.patch;patch=1"
-S = "${WORKDIR}/ethereal-${PV}"
-
-inherit autotools
-
-do_compile_prepend() {
-	${BUILD_CC} ${BUILD_CFLAGS} -o rdps rdps.c
-	oe_runmake -C tools/lemon CC="${BUILD_CC} ${BUILD_CFLAGS}"
-}
-
diff --git a/packages/ethereal/files/.mtn2git_empty b/packages/ethereal/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/ethereal/files/use-our-lemon.patch b/packages/ethereal/files/use-our-lemon.patch
deleted file mode 100644
index c2850807db..0000000000
--- a/packages/ethereal/files/use-our-lemon.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- ethereal-0.99.0/tools/Makefile.am~use-our-lemon
-+++ ethereal-0.99.0/tools/Makefile.am
-@@ -21,7 +21,7 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
--SUBDIRS = lemon
-+SUBDIRS = 
- 
- PIDL_FILES= \
- 	pidl/MANIFEST					\
diff --git a/packages/wireshark/.mtn2git_empty b/packages/wireshark/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/wireshark/files/.mtn2git_empty b/packages/wireshark/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/wireshark/files/no-host-includes.patch b/packages/wireshark/files/no-host-includes.patch
new file mode 100644
index 0000000000..4a9493d607
--- /dev/null
+++ b/packages/wireshark/files/no-host-includes.patch
@@ -0,0 +1,546 @@
+Index: wireshark-0.99.4/plugins/acn/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/acn/Makefile.am	2006-12-14 14:47:13.322227000 +0100
++++ wireshark-0.99.4/plugins/acn/Makefile.am	2006-12-14 14:47:38.862227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/acn/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/acn/Makefile.in	2006-12-14 14:47:13.352227000 +0100
++++ wireshark-0.99.4/plugins/acn/Makefile.in	2006-12-14 14:48:09.612227000 +0100
+@@ -371,7 +371,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = acn
+Index: wireshark-0.99.4/plugins/agentx/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/agentx/Makefile.am	2006-12-14 14:47:13.372227000 +0100
++++ wireshark-0.99.4/plugins/agentx/Makefile.am	2006-12-14 14:48:30.252227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/agentx/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/agentx/Makefile.in	2006-12-14 14:47:13.402227000 +0100
++++ wireshark-0.99.4/plugins/agentx/Makefile.in	2006-12-14 14:48:37.612227000 +0100
+@@ -370,7 +370,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = agentx
+Index: wireshark-0.99.4/plugins/artnet/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/artnet/Makefile.am	2006-12-14 14:47:13.422227000 +0100
++++ wireshark-0.99.4/plugins/artnet/Makefile.am	2006-12-14 14:48:42.422227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/artnet/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/artnet/Makefile.in	2006-12-14 14:47:13.452227000 +0100
++++ wireshark-0.99.4/plugins/artnet/Makefile.in	2006-12-14 14:48:46.142227000 +0100
+@@ -370,7 +370,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = artnet
+Index: wireshark-0.99.4/plugins/asn1/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/asn1/Makefile.am	2006-12-14 14:47:13.482227000 +0100
++++ wireshark-0.99.4/plugins/asn1/Makefile.am	2006-12-14 14:48:50.352227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/asn1/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/asn1/Makefile.in	2006-12-14 14:47:13.502227000 +0100
++++ wireshark-0.99.4/plugins/asn1/Makefile.in	2006-12-14 14:48:54.772227000 +0100
+@@ -370,7 +370,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = asn1
+Index: wireshark-0.99.4/plugins/ciscosm/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/ciscosm/Makefile.am	2006-12-14 14:47:13.532227000 +0100
++++ wireshark-0.99.4/plugins/ciscosm/Makefile.am	2006-12-14 14:49:01.482227000 +0100
+@@ -23,7 +23,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/ciscosm/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/ciscosm/Makefile.in	2006-12-14 14:47:13.552227000 +0100
++++ wireshark-0.99.4/plugins/ciscosm/Makefile.in	2006-12-14 14:49:18.302227000 +0100
+@@ -371,7 +371,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = ciscosm
+Index: wireshark-0.99.4/plugins/docsis/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/docsis/Makefile.am	2006-12-14 14:47:13.582227000 +0100
++++ wireshark-0.99.4/plugins/docsis/Makefile.am	2006-12-14 14:49:18.302227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/docsis/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/docsis/Makefile.in	2006-12-14 14:47:13.602227000 +0100
++++ wireshark-0.99.4/plugins/docsis/Makefile.in	2006-12-14 14:49:18.312227000 +0100
+@@ -380,7 +380,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = docsis
+Index: wireshark-0.99.4/plugins/enttec/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/enttec/Makefile.am	2006-12-14 14:47:13.632227000 +0100
++++ wireshark-0.99.4/plugins/enttec/Makefile.am	2006-12-14 14:49:18.322227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/enttec/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/enttec/Makefile.in	2006-12-14 14:47:13.662227000 +0100
++++ wireshark-0.99.4/plugins/enttec/Makefile.in	2006-12-14 14:49:18.332227000 +0100
+@@ -370,7 +370,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = enttec
+Index: wireshark-0.99.4/plugins/gryphon/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/gryphon/Makefile.am	2006-12-14 14:47:13.712227000 +0100
++++ wireshark-0.99.4/plugins/gryphon/Makefile.am	2006-12-14 14:49:18.342227000 +0100
+@@ -24,7 +24,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/gryphon/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/gryphon/Makefile.in	2006-12-14 14:47:13.732227000 +0100
++++ wireshark-0.99.4/plugins/gryphon/Makefile.in	2006-12-14 14:49:18.342227000 +0100
+@@ -373,7 +373,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = gryphon
+Index: wireshark-0.99.4/plugins/h223/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/h223/Makefile.am	2006-12-14 14:47:13.762227000 +0100
++++ wireshark-0.99.4/plugins/h223/Makefile.am	2006-12-14 14:49:18.352227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/h223/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/h223/Makefile.in	2006-12-14 14:47:13.792227000 +0100
++++ wireshark-0.99.4/plugins/h223/Makefile.in	2006-12-14 14:49:18.362227000 +0100
+@@ -373,7 +373,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = h223
+Index: wireshark-0.99.4/plugins/irda/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/irda/Makefile.am	2006-12-14 14:47:13.812227000 +0100
++++ wireshark-0.99.4/plugins/irda/Makefile.am	2006-12-14 14:49:18.362227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/irda/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/irda/Makefile.in	2006-12-14 14:47:13.842227000 +0100
++++ wireshark-0.99.4/plugins/irda/Makefile.in	2006-12-14 14:49:18.372227000 +0100
+@@ -371,7 +371,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = irda
+Index: wireshark-0.99.4/plugins/lwres/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/lwres/Makefile.am	2006-12-14 14:47:13.862227000 +0100
++++ wireshark-0.99.4/plugins/lwres/Makefile.am	2006-12-14 14:49:18.382227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/lwres/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/lwres/Makefile.in	2006-12-14 14:47:13.892227000 +0100
++++ wireshark-0.99.4/plugins/lwres/Makefile.in	2006-12-14 14:49:19.432227000 +0100
+@@ -370,7 +370,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = lwres
+Index: wireshark-0.99.4/plugins/megaco/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/megaco/Makefile.am	2006-12-14 14:47:13.942227000 +0100
++++ wireshark-0.99.4/plugins/megaco/Makefile.am	2006-12-14 14:49:19.442227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/megaco/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/megaco/Makefile.in	2006-12-14 14:47:13.972227000 +0100
++++ wireshark-0.99.4/plugins/megaco/Makefile.in	2006-12-14 14:49:19.452227000 +0100
+@@ -370,7 +370,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = megaco
+Index: wireshark-0.99.4/plugins/mgcp/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/mgcp/Makefile.am	2006-12-14 14:47:13.992227000 +0100
++++ wireshark-0.99.4/plugins/mgcp/Makefile.am	2006-12-14 14:49:19.462227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/mgcp/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/mgcp/Makefile.in	2006-12-14 14:47:14.022227000 +0100
++++ wireshark-0.99.4/plugins/mgcp/Makefile.in	2006-12-14 14:49:19.462227000 +0100
+@@ -371,7 +371,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = mgcp
+Index: wireshark-0.99.4/plugins/opsi/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/opsi/Makefile.am	2006-12-14 14:47:14.042227000 +0100
++++ wireshark-0.99.4/plugins/opsi/Makefile.am	2006-12-14 14:49:19.472227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/opsi/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/opsi/Makefile.in	2006-12-14 14:47:14.072227000 +0100
++++ wireshark-0.99.4/plugins/opsi/Makefile.in	2006-12-14 14:49:19.482227000 +0100
+@@ -371,7 +371,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = opsi
+Index: wireshark-0.99.4/plugins/pcli/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/pcli/Makefile.am	2006-12-14 14:47:14.102227000 +0100
++++ wireshark-0.99.4/plugins/pcli/Makefile.am	2006-12-14 14:49:19.492227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/pcli/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/pcli/Makefile.in	2006-12-14 14:47:14.122227000 +0100
++++ wireshark-0.99.4/plugins/pcli/Makefile.in	2006-12-14 14:49:19.492227000 +0100
+@@ -370,7 +370,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = pcli
+Index: wireshark-0.99.4/plugins/profinet/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/profinet/Makefile.am	2006-12-14 14:47:14.152227000 +0100
++++ wireshark-0.99.4/plugins/profinet/Makefile.am	2006-12-14 14:49:19.502227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/profinet/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/profinet/Makefile.in	2006-12-14 14:47:14.182227000 +0100
++++ wireshark-0.99.4/plugins/profinet/Makefile.in	2006-12-14 14:49:19.512227000 +0100
+@@ -371,7 +371,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = profinet
+Index: wireshark-0.99.4/plugins/rlm/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/rlm/Makefile.am	2006-12-14 14:47:14.202227000 +0100
++++ wireshark-0.99.4/plugins/rlm/Makefile.am	2006-12-14 14:49:19.522227000 +0100
+@@ -23,7 +23,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/rlm/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/rlm/Makefile.in	2006-12-14 14:47:14.232227000 +0100
++++ wireshark-0.99.4/plugins/rlm/Makefile.in	2006-12-14 14:49:19.542227000 +0100
+@@ -371,7 +371,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = rlm
+Index: wireshark-0.99.4/plugins/rtnet/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/rtnet/Makefile.am	2006-12-14 14:47:14.252227000 +0100
++++ wireshark-0.99.4/plugins/rtnet/Makefile.am	2006-12-14 14:49:19.562227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/rtnet/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/rtnet/Makefile.in	2006-12-14 14:47:14.282227000 +0100
++++ wireshark-0.99.4/plugins/rtnet/Makefile.in	2006-12-14 14:49:19.572227000 +0100
+@@ -370,7 +370,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = rtnet
+Index: wireshark-0.99.4/plugins/rudp/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/rudp/Makefile.am	2006-12-14 14:47:14.312227000 +0100
++++ wireshark-0.99.4/plugins/rudp/Makefile.am	2006-12-14 14:49:19.582227000 +0100
+@@ -23,7 +23,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/rudp/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/rudp/Makefile.in	2006-12-14 14:47:14.342227000 +0100
++++ wireshark-0.99.4/plugins/rudp/Makefile.in	2006-12-14 14:49:20.202227000 +0100
+@@ -371,7 +371,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = rudp
+Index: wireshark-0.99.4/plugins/sbus/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/sbus/Makefile.am	2006-12-14 14:47:14.362227000 +0100
++++ wireshark-0.99.4/plugins/sbus/Makefile.am	2006-12-14 14:49:20.212227000 +0100
+@@ -21,7 +21,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/sbus/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/sbus/Makefile.in	2006-12-14 14:47:14.392227000 +0100
++++ wireshark-0.99.4/plugins/sbus/Makefile.in	2006-12-14 14:49:20.222227000 +0100
+@@ -369,7 +369,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = sbus
+Index: wireshark-0.99.4/plugins/v5ua/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/v5ua/Makefile.am	2006-12-14 14:47:14.442227000 +0100
++++ wireshark-0.99.4/plugins/v5ua/Makefile.am	2006-12-14 14:49:20.232227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/v5ua/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/v5ua/Makefile.in	2006-12-14 14:47:14.472227000 +0100
++++ wireshark-0.99.4/plugins/v5ua/Makefile.in	2006-12-14 14:49:20.232227000 +0100
+@@ -370,7 +370,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = v5ua
diff --git a/packages/wireshark/files/use-our-lemon.patch b/packages/wireshark/files/use-our-lemon.patch
new file mode 100644
index 0000000000..c2850807db
--- /dev/null
+++ b/packages/wireshark/files/use-our-lemon.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- ethereal-0.99.0/tools/Makefile.am~use-our-lemon
++++ ethereal-0.99.0/tools/Makefile.am
+@@ -21,7 +21,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ 
+-SUBDIRS = lemon
++SUBDIRS = 
+ 
+ PIDL_FILES= \
+ 	pidl/MANIFEST					\
diff --git a/packages/wireshark/wireshark_0.99.4.bb b/packages/wireshark/wireshark_0.99.4.bb
new file mode 100644
index 0000000000..5b1fa72a1b
--- /dev/null
+++ b/packages/wireshark/wireshark_0.99.4.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Ethereal is the world's most popular network protocol analyzer"
+HOMEPAGE = "http://www.ethereal.com"
+SECTION = "x11/network"
+LICENSE = "GPL"
+DEPENDS = "perl-native gtk+ gnutls libpcap pcre expat"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
+           file://use-our-lemon.patch;patch=1 \
+	   file://no-host-includes.patch;patch=1"
+
+inherit autotools
+
+do_compile_prepend() {
+	${BUILD_CC} ${BUILD_CFLAGS} -o rdps rdps.c
+	oe_runmake -C tools/lemon CC="${BUILD_CC} ${BUILD_CFLAGS}" LDFLAGS="${BUILD_LDFLAGS}"
+}
-- 
cgit v1.2.3


From 82b156cac94e39537deefd1f6a99aab49fe5cab0 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 14 Dec 2006 14:20:05 +0000
Subject: scw: update to 0.4.3, point to Debian mirrors

---
 packages/scw/scw_0.4.2.bb | 13 -------------
 packages/scw/scw_0.4.3.bb | 12 ++++++++++++
 2 files changed, 12 insertions(+), 13 deletions(-)
 delete mode 100644 packages/scw/scw_0.4.2.bb
 create mode 100644 packages/scw/scw_0.4.3.bb

diff --git a/packages/scw/scw_0.4.2.bb b/packages/scw/scw_0.4.2.bb
deleted file mode 100644
index 68d18ecb6c..0000000000
--- a/packages/scw/scw_0.4.2.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Scw is a widget set specifically designed for chat programs."
-HOMEPAGE = "http://corrie.scp.fi/users/kalle.vahlman/scw/"
-LICENSE = "LGPL"
-DEPENDS = "gtk+"
-
-
-SRC_URI = "http://corrie.scp.fi/users/kalle.vahlman/scw/${P}.tar.gz"
-
-inherit autotools pkgconfig
-
-do_stage() {
-autotools_stage_all
-}
diff --git a/packages/scw/scw_0.4.3.bb b/packages/scw/scw_0.4.3.bb
new file mode 100644
index 0000000000..759f901d69
--- /dev/null
+++ b/packages/scw/scw_0.4.3.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Scw is a widget set specifically designed for chat programs."
+HOMEPAGE = "http://corrie.scp.fi/users/kalle.vahlman/scw/"
+LICENSE = "LGPL"
+DEPENDS = "gtk+"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/s/${PN}/${PN}_${PV}.orig.tar.gz"
+
+inherit autotools pkgconfig
+
+do_stage() {
+autotools_stage_all
+}
-- 
cgit v1.2.3


From ad2a5351ef542b757a5649d7c47a4a7325ce8c01 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 14 Dec 2006 14:22:05 +0000
Subject: cdtool: update to 2.1.8

---
 packages/cdtool/cdtool_2.1.8.bb     | 13 +++++++++++++
 packages/cdtool/cdtool_2.1.8pre4.bb | 13 -------------
 2 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 packages/cdtool/cdtool_2.1.8.bb
 delete mode 100644 packages/cdtool/cdtool_2.1.8pre4.bb

diff --git a/packages/cdtool/cdtool_2.1.8.bb b/packages/cdtool/cdtool_2.1.8.bb
new file mode 100644
index 0000000000..ec51290edf
--- /dev/null
+++ b/packages/cdtool/cdtool_2.1.8.bb
@@ -0,0 +1,13 @@
+# cdtool .bb build file
+# Copyright (C) 2006, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see /COPYING)
+
+HOMEPAGE="http://hinterhof.net/cdtool/"
+DESCRIPTION="cdtool is a free software package to control the audio functions \
+of an attached CDROM drive from the command line in a quick and scriptable way."
+LICENSE = "GPL"
+
+SRC_URI="http://hinterhof.net/${PN}/dist/${PN}-${PV}.tar.gz \
+	file://install-no-owner.patch;patch=1"
+
+inherit autotools
diff --git a/packages/cdtool/cdtool_2.1.8pre4.bb b/packages/cdtool/cdtool_2.1.8pre4.bb
deleted file mode 100644
index ec51290edf..0000000000
--- a/packages/cdtool/cdtool_2.1.8pre4.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-# cdtool .bb build file
-# Copyright (C) 2006, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see /COPYING)
-
-HOMEPAGE="http://hinterhof.net/cdtool/"
-DESCRIPTION="cdtool is a free software package to control the audio functions \
-of an attached CDROM drive from the command line in a quick and scriptable way."
-LICENSE = "GPL"
-
-SRC_URI="http://hinterhof.net/${PN}/dist/${PN}-${PV}.tar.gz \
-	file://install-no-owner.patch;patch=1"
-
-inherit autotools
-- 
cgit v1.2.3


From b0740932227a49bc8f42ba678b2a84eb9c8fb11a Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 14 Dec 2006 14:28:55 +0000
Subject: masqmail: update to 0.2.21, switched to Debian mirror

---
 packages/masqmail/files/.mtn2git_empty             |  0
 .../masqmail/files/configure-ac-glib-2-0.patch     | 11 --------
 packages/masqmail/masqmail_0.2.20.bb               | 30 ----------------------
 packages/masqmail/masqmail_0.2.21.bb               | 28 ++++++++++++++++++++
 4 files changed, 28 insertions(+), 41 deletions(-)
 delete mode 100644 packages/masqmail/files/.mtn2git_empty
 delete mode 100644 packages/masqmail/files/configure-ac-glib-2-0.patch
 delete mode 100644 packages/masqmail/masqmail_0.2.20.bb
 create mode 100644 packages/masqmail/masqmail_0.2.21.bb

diff --git a/packages/masqmail/files/.mtn2git_empty b/packages/masqmail/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/masqmail/files/configure-ac-glib-2-0.patch b/packages/masqmail/files/configure-ac-glib-2-0.patch
deleted file mode 100644
index c5e607f52d..0000000000
--- a/packages/masqmail/files/configure-ac-glib-2-0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- masqmail-0.2.20/configure.ac.orig	2005-11-11 16:36:05.894559778 -0800
-+++ masqmail-0.2.20/configure.ac	2005-11-11 16:36:19.935443315 -0800
-@@ -20,7 +20,7 @@ AC_STDC_HEADERS
- dnl AC_ARG_PROGRAM
- AC_PROG_RANLIB
- 
--AM_PATH_GLIB
-+AM_PATH_GLIB_2_0
- 
- dnl resolver support (default is use it)
- AC_ARG_ENABLE(resolver,
diff --git a/packages/masqmail/masqmail_0.2.20.bb b/packages/masqmail/masqmail_0.2.20.bb
deleted file mode 100644
index 1a64833bfc..0000000000
--- a/packages/masqmail/masqmail_0.2.20.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-# MasqMail from http://innominate.org/kurth/masqmail/
-DESCRIPTION = "MasqMail is a mail server designed for hosts that do not have a permanent internet connection eg. a home network or a single host at home. It has special support for connections to different ISPs. It replaces sendmail or other MTAs such as qmail or exim."
-HOMEPAGE = "http://innominate.org/kurth/masqmail/"
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "GPL"
-PR = "r0"
-
-DEPENDS = "glib-2.0"
-
-SRC_URI = "http://innominate.org/kurth/masqmail/download/masqmail-${PV}.tar.gz"
-SRC_URI += "file://configure-ac-glib-2-0.patch;patch=1"
-
-EXTRA_OECONF += "--disable-glibtest"
-EXTRA_OECONF += "--disable-resolver"
-EXTRA_OECONF += "--disable-debug"
-
-# These are the standard Debian values for ownership of the programs,
-# this stuff fakes out the install script chown operations then replicates
-# them by setting the ipkg owner/group to the desired values - everything
-# ends up owned by the nominated user.
-MAIL_USER ?= "mail"
-MAIL_GROUP ?= "mail"
-
-EXTRA_OECONF += "--with-user=$(id -u)"
-EXTRA_OECONF += "--with-group=$(id -g)"
-
-IPKGBUILDCMD = "ipkg-build -o ${MAIL_USER} -g ${MAIL_GROUP}"
-
-inherit autotools
diff --git a/packages/masqmail/masqmail_0.2.21.bb b/packages/masqmail/masqmail_0.2.21.bb
new file mode 100644
index 0000000000..05f377e4e5
--- /dev/null
+++ b/packages/masqmail/masqmail_0.2.21.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "MasqMail is a mail server designed for hosts that do not have \
+a permanent internet connection eg. a home network or a single host at home. \
+It has special support for connections to different ISPs. It replaces sendmail \
+or other MTAs such as qmail or exim."
+HOMEPAGE = "http://innominate.org/kurth/masqmail/"
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/m/${PN}/${PN}_${PV}.orig.tar.gz"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF += "--disable-glibtest"
+EXTRA_OECONF += "--disable-resolver"
+
+# These are the standard Debian values for ownership of the programs,
+# this stuff fakes out the install script chown operations then replicates
+# them by setting the ipkg owner/group to the desired values - everything
+# ends up owned by the nominated user.
+MAIL_USER ?= "mail"
+MAIL_GROUP ?= "mail"
+
+EXTRA_OECONF += "--with-user=$(id -u)"
+EXTRA_OECONF += "--with-group=$(id -g)"
+
+IPKGBUILDCMD = "ipkg-build -o ${MAIL_USER} -g ${MAIL_GROUP}"
-- 
cgit v1.2.3


From e5e6684a6a43cb2e2cfdd5f3906083f925998e82 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 14 Dec 2006 14:37:57 +0000
Subject: live555: point SRC_URI to one of places where it is available

---
 packages/live555/live555_20051005.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/live555/live555_20051005.bb b/packages/live555/live555_20051005.bb
index bc25517ea9..24f13b6983 100644
--- a/packages/live555/live555_20051005.bb
+++ b/packages/live555/live555_20051005.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://live.com/"
 LICENSE = "LGPL"
 SECTION = "devel"
 
-SRC_URI = "http://live.com/liveMedia/public/live.2005.10.05.tar.gz \
+SRC_URI = "http://downloads.videolan.org/pub/videolan/vlc/0.8.5/contrib/live.2005.10.05.tar.gz \
            file://config.linux-cross"
 
 S = "${WORKDIR}/live"
-- 
cgit v1.2.3


From b9d891817f88568799b8aab4bf66de2b541c45c9 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 14 Dec 2006 14:51:30 +0000
Subject: c7x0/akita/spitz: fix order or zaurus includes

---
 conf/machine/akita.conf | 2 +-
 conf/machine/c7x0.conf  | 2 +-
 conf/machine/spitz.conf | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index 5685c3d0f3..2682fb300f 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -2,8 +2,8 @@
 #@NAME: Sharp Zaurus SL-C1000
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
 
-include conf/machine/include/zaurus-clamshell.conf
 include conf/machine/include/zaurus-2.6.conf
+include conf/machine/include/zaurus-clamshell.conf
 
 PACKAGE_EXTRA_ARCHS += "iwmmxt" 
 
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 047e44707c..d1afb882e3 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -2,8 +2,8 @@
 #@NAME: Sharp Zaurus SL-C7x0
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices
 
-include conf/machine/include/zaurus-clamshell.conf
 include conf/machine/include/zaurus-2.6.conf
+include conf/machine/include/zaurus-clamshell.conf
 
 IMAGE_FSTYPES ?= "jffs2"
 
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 9a54643b3f..455ae56677 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -2,8 +2,8 @@
 #@NAME: Sharp Zaurus SL-C3000
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
 
-include conf/machine/include/zaurus-clamshell.conf
 include conf/machine/include/zaurus-2.6.conf
+include conf/machine/include/zaurus-clamshell.conf
 
 PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
 
-- 
cgit v1.2.3


From f60a824a4cfc3d554c4c325f65c586081aa03020 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 14 Dec 2006 16:03:21 +0000
Subject: ipaq-pxa270: drop as indicated before. This machine has been split
 into hx4700 and hx2000

---
 conf/machine/ipaq-px