merge of 26ad3f94c9657a7c1863c3ac7d31f1fa6c42b738

     and 65876316eaa0a47f796c7bf502478eb9c886d0b8

25 files changed, 214 insertions, 115 deletions

diff --git a/packages/asterisk/asterisk-1.0.7/.mtn2git_empty b/packages/asterisk/asterisk-1.0.9/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/asterisk/asterisk-1.0.7/.mtn2git_empty
+++ b/packages/asterisk/asterisk-1.0.9/.mtn2git_empty
diff --git a/packages/asterisk/asterisk-1.0.9/gsm.patch b/packages/asterisk/asterisk-1.0.9/gsm.patch
new file mode 100644
index 0000000000..c59aa80bba
--- /dev/null
+++ b/packages/asterisk/asterisk-1.0.9/gsm.patch
@@ -0,0 +1,71 @@
+--- asterisk-1.0.9.org/codecs/gsm/Makefile	2005-06-21 16:27:28.000000000 +0200
++++ asterisk-1.0.9/codecs/gsm/Makefile	2005-08-14 21:47:10.000000000 +0200
+@@ -37,26 +37,6 @@
+ ######### ppro's, etc, as well as the AMD K6 and K7.  The compile will
+ ######### probably require gcc. 
+ 
+-ifneq (${OSARCH},Darwin)
+-ifneq (${PROC},x86_64)
+-ifneq (${PROC},ultrasparc)
+-ifneq ($(shell uname -m),ppc)
+-ifneq ($(shell uname -m),alpha)
+-ifneq ($(shell uname -m),armv4l)
+-ifneq (${PROC},sparc64)
+-ifneq (${PROC},ppc)
+-ifneq (${PROC},ppc64)
+-OPTIMIZE+=-march=$(PROC)
+-endif
+-endif
+-endif
+-endif
+-endif
+-endif
+-endif
+-endif
+-endif
+-
+ #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
+ #This works for even old (2.96) versions of gcc and provides a small boost either way.
+ #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn't support it.
+@@ -218,19 +198,6 @@
+ 		$(SRC)/gsm_option.c	\
+ 		$(SRC)/short_term.c	\
+ 		$(SRC)/table.c
+-ifeq (${OSARCH},Linux)
+-ifneq ($(shell uname -m),x86_64)
+-ifneq ($(shell uname -m),ppc)
+-ifneq ($(shell uname -m),alpha)
+-ifneq ($(shell uname -m),armv4l)
+-ifneq ($(shell uname -m),sparc64)
+-GSM_SOURCES+= $(SRC)/k6opt.s
+-endif
+-endif
+-endif
+-endif
+-endif
+-endif
+ 
+ TOAST_SOURCES = $(SRC)/toast.c 		\
+ 		$(SRC)/toast_lin.c	\
+@@ -276,20 +243,6 @@
+ 		$(SRC)/short_term.o	\
+ 		$(SRC)/table.o
+ 
+-ifeq (${OSARCH},Linux)
+-ifneq ($(shell uname -m), x86_64)
+-ifneq ($(shell uname -m), ppc)
+-ifneq ($(shell uname -m), alpha)
+-ifneq ($(shell uname -m), armv4l)
+-ifneq ($(shell uname -m), sparc64)
+-GSM_OBJECTS+= $(SRC)/k6opt.o
+-endif
+-endif
+-endif
+-endif
+-endif
+-endif
+-
+ TOAST_OBJECTS =	$(SRC)/toast.o 		\
+ 		$(SRC)/toast_lin.o	\
+ 		$(SRC)/toast_ulaw.o	\
+
diff --git a/packages/asterisk/asterisk-1.0.7/makefile.patch b/packages/asterisk/asterisk-1.0.9/makefile.patch
index 2eea89636d..066fb677dc 100644
--- a/packages/asterisk/asterisk-1.0.7/makefile.patch
+++ b/packages/asterisk/asterisk-1.0.9/makefile.patch
@@ -212,66 +212,6 @@
  # Add KDE Console if appropriate
  #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so")
  
---- asterisk-1.0.7/codecs/gsm/Makefile~makefile.patch
-+++ asterisk-1.0.7/codecs/gsm/Makefile
-@@ -37,20 +37,6 @@
- ######### ppro's, etc, as well as the AMD K6 and K7.  The compile will
- ######### probably require gcc. 
- 
--ifneq (${OSARCH},Darwin)
--ifneq (${PROC},x86_64)
--ifneq (${PROC},ultrasparc)
--ifneq ($(shell uname -m),ppc)
--ifneq ($(shell uname -m),alpha)
--ifneq (${PROC},sparc64)
--OPTIMIZE+=-march=$(PROC)
--endif
--endif
--endif
--endif
--endif
--endif
--
- #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
- #This works for even old (2.96) versions of gcc and provides a small boost either way.
- #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn't support it.
-@@ -212,17 +198,6 @@
- 		$(SRC)/gsm_option.c	\
- 		$(SRC)/short_term.c	\
- 		$(SRC)/table.c
--ifeq (${OSARCH},Linux)
--ifneq ($(shell uname -m),x86_64)
--ifneq ($(shell uname -m),ppc)
--ifneq ($(shell uname -m),alpha)
--ifneq ($(shell uname -m),sparc64)
--GSM_SOURCES+= $(SRC)/k6opt.s
--endif
--endif
--endif
--endif
--endif
- 
- TOAST_SOURCES = $(SRC)/toast.c 		\
- 		$(SRC)/toast_lin.c	\
-@@ -268,18 +243,6 @@
- 		$(SRC)/short_term.o	\
- 		$(SRC)/table.o
- 
--ifeq (${OSARCH},Linux)
--ifneq ($(shell uname -m), x86_64)
--ifneq ($(shell uname -m), ppc)
--ifneq ($(shell uname -m), alpha)
--ifneq ($(shell uname -m), sparc64)
--GSM_OBJECTS+= $(SRC)/k6opt.o
--endif
--endif
--endif
--endif
--endif
--
- TOAST_OBJECTS =	$(SRC)/toast.o 		\
- 		$(SRC)/toast_lin.o	\
- 		$(SRC)/toast_ulaw.o	\
 --- asterisk-1.0.7/codecs/lpc10/Makefile~makefile.patch
 +++ asterisk-1.0.7/codecs/lpc10/Makefile
 @@ -25,28 +25,6 @@
diff --git a/packages/asterisk/asterisk_1.0.7.bb b/packages/asterisk/asterisk_1.0.9.bb
index 1116849592..ccb6fe518f 100644
--- a/packages/asterisk/asterisk_1.0.7.bb
+++ b/packages/asterisk/asterisk_1.0.9.bb
@@ -2,6 +2,7 @@ DESCRIPTION="The Astersisk open source software PBX"
 HOMEPAGE="www.asterisk.org"
 LICENSE="GPL"
 SRC_URI="http://www.asterisk.org/html/downloads/asterisk-${PV}.tar.gz \
+	 file://gsm.patch;patch=1 \
          file://makefile.patch;patch=1"
 
 DEPENDS="ncurses zlib openssl"
diff --git a/packages/bwmon/bwmon_1.3.bb b/packages/bwmon/bwmon_1.3.bb
index 26c620e013..81cc0949a9 100644
--- a/packages/bwmon/bwmon_1.3.bb
+++ b/packages/bwmon/bwmon_1.3.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "The Linux bandwidth monitor"
 MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org"
 DEPENDS = "ncurses"
-
 LICENSE = "Unspecified"
+
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/bwmon/${P}.tar.gz \
diff --git a/packages/gnome/gnome-desktop_2.10.2.bb b/packages/gnome/gnome-desktop_2.10.2.bb
index d385068c59..f3eca5d574 100644
--- a/packages/gnome/gnome-desktop_2.10.2.bb
+++ b/packages/gnome/gnome-desktop_2.10.2.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
 SECTION = "x11/gnome"
 PR = "r0"
 DESCRIPTION = "GNOME library for reading .desktop files"
-inherit gnome
+inherit gnome pkgconfig
 
 DEPENDS = "gnome-common libgnomeui"
 
diff --git a/packages/icecast/icecast_2.2.0.bb b/packages/icecast/icecast_2.2.0.bb
index 1511f6dcfc..f184ad78c1 100644
--- a/packages/icecast/icecast_2.2.0.bb
+++ b/packages/icecast/icecast_2.2.0.bb
@@ -1,6 +1,7 @@
 DEPENDS = "libxslt"
 PR = "r1"
 MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org"
+LICENCE = "GPL-2"
 
 DEPENDS = "libvorbis libogg"
 
diff --git a/packages/iptables/iptables_1.3.3.bb b/packages/iptables/iptables_1.3.3.bb
new file mode 100644
index 0000000000..a67df35806
--- /dev/null
+++ b/packages/iptables/iptables_1.3.3.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "iptables network filtering tools"
+HOMEPAGE = "http://www.netfilter.org/"
+SECTION = "console/utils"
+LICENSE = "GPL"
+PR = "r1"
+
+PACKAGES =+ "${PN}-utils"
+FILES_${PN}-utils = "${bindir}/iptables-save ${bindir}/iptables-restore"
+
+SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2"
+
+S = "${WORKDIR}/iptables-${PV}"
+
+PARALLEL_MAKE=""
+
+export COPT_FLAGS = "${CFLAGS}"
+export KERNEL_DIR = "${STAGING_INCDIR}"
+
+do_compile () {
+	unset CFLAGS
+	oe_runmake BINDIR=${D}${sbindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} NO_SHARED_LIBS=1
+}
+
+do_install () {
+	oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} install NO_SHARED_LIBS=1
+}
+
+FILES_${PN}-doc += "${mandir}"
+
diff --git a/packages/libgpewidget/libgpewidget_0.103.bb b/packages/libgpewidget/libgpewidget_0.103.bb
new file mode 100644
index 0000000000..0d8dcf23cf
--- /dev/null
+++ b/packages/libgpewidget/libgpewidget_0.103.bb
@@ -0,0 +1,19 @@
+LICENSE = "LGPL"
+PR = "r2"
+DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native"
+
+SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
+
+inherit pkgconfig autotools
+
+EXTRA_OECONF = "--enable-cairo"
+
+do_stage () {
+	oe_libinstall -C .libs -so libgpewidget ${STAGING_LIBDIR}
+	autotools_stage_includes
+}
+
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz
index ce1f55b0f9..a388797b6e 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz
+++ b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.13-rc5-mm1
-# Sat Aug 13 23:17:29 2005
+# Sun Aug 14 22:04:01 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -519,12 +519,46 @@ CONFIG_NETDEVICES=y
 #
 # Wireless LAN (non-hamradio)
 #
-# CONFIG_NET_RADIO is not set
+CONFIG_NET_RADIO=y
+
+#
+# Obsolete Wireless cards support (pre-802.11)
+#
+# CONFIG_STRIP is not set
+# CONFIG_PCMCIA_WAVELAN is not set
+# CONFIG_PCMCIA_NETWAVE is not set
+
+#
+# Wireless 802.11 Frequency Hopping cards support
+#
+# CONFIG_PCMCIA_RAYCS is not set
+
+#
+# Wireless 802.11b ISA/PCI cards support
+#
+# CONFIG_HERMES is not set
+# CONFIG_ATMEL is not set
+
+#
+# Wireless 802.11b Pcmcia/Cardbus cards support
+#
+# CONFIG_AIRO_CS is not set
+# CONFIG_PCMCIA_WL3501 is not set
+# CONFIG_HOSTAP is not set
+CONFIG_NET_WIRELESS=y
 
 #
 # PCMCIA network device support
 #
-# CONFIG_NET_PCMCIA is not set
+CONFIG_NET_PCMCIA=y
+# CONFIG_PCMCIA_3C589 is not set
+# CONFIG_PCMCIA_3C574 is not set
+# CONFIG_PCMCIA_FMVJ18X is not set
+# CONFIG_PCMCIA_PCNET is not set
+# CONFIG_PCMCIA_NMCLAN is not set
+# CONFIG_PCMCIA_SMC91C92 is not set
+# CONFIG_PCMCIA_XIRC2PS is not set
+# CONFIG_PCMCIA_AXNET is not set
 
 #
 # Wan interfaces
diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
index bcc2c13c28..7dcd3ee7ee 100644
--- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
+++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 KV = "${@bb.data.getVar('PV',d,True)}"
 
-PR = "r4"
+PR = "r6"
 
 DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
 RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -79,10 +79,11 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
            ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \
            ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \
            ${RPSRC}/pxa27x_extraregs-r0.patch;patch=1 \
-           ${RPSRC}/spitzbase-r1.patch;patch=1 \
+           ${RPSRC}/spitzbase-r2.patch;patch=1 \
            ${RPSRC}/spitzkbd-r0.patch;patch=1 \
-           ${RPSRC}/spitzssp-r1.patch;patch=1 \
-           ${RPSRC}/spitzbl-r0.patch;patch=1 \
+           ${RPSRC}/spitzssp-r4.patch;patch=1 \
+           ${RPSRC}/spitzbl-r1.patch;patch=1 \
+           ${RPSRC}/spitzts-r1.patch;patch=1 \
            file://add-oz-release-string.patch;patch=1 \
            file://add-elpp-stuff.patch;patch=1 \
            file://pxa-serial-hack.patch;patch=1 \
@@ -109,8 +110,7 @@ SRC_URI_append_tosa = "${DOSRC}/nand-readid-r1.patch;patch=1 \
 		       ${DOSRC}/wm9712-ts-r2.patch;patch=1 \
                        ${DOSRC}/tosa-pxaac97-r1.patch;patch=1 \
         	       ${DOSRC}/tosa-bluetooth-r0.patch;patch=1 "
-SRC_URI_append_spitz = "${RPSRC}/spitzcf-r0.patch;patch=1 \
-                        ${RPSRC}/spitzts-r1.patch;patch=1 "
+SRC_URI_append_spitz = "${RPSRC}/spitzcf-r0.patch;patch=1 "
 
 S = "${WORKDIR}/linux-2.6.12"
 
diff --git a/packages/meta/e-image.bb b/packages/meta/e-image.bb
index f16f61c795..d58215d3a7 100644
--- a/packages/meta/e-image.bb
+++ b/packages/meta/e-image.bb
@@ -1,4 +1,9 @@
+DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager and Tools"
+LICENSE = "MIT"
+PR = "r1"
+
 export IMAGE_BASENAME = "e-image"
+export IMAGE_LINGUAS = ""
 
 DEPENDS = "task-bootstrap meta-e-x11 xserver-kdrive"
 
@@ -6,8 +11,8 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/evas = "evas-x11"
 PREFERRED_PROVIDER_virtual/ecore = "ecore-x11"
 PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11"
+PREFERRED_PROVIDER_virtual/libxine = "libxine-x11"
 
 export IPKG_INSTALL = "task-bootstrap task-enlightenment-x11 xserver-kdrive-fbdev"
 
 inherit image_ipk
-LICENSE = MIT
diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb
index f539dac95a..b4f3558e93 100644
--- a/packages/meta/meta-e-x11.bb
+++ b/packages/meta/meta-e-x11.bb
@@ -12,12 +12,13 @@ ALLOW_EMPTY = 1
 # X
 #
 DEPENDS  += "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig \
-	     ttf-bitstream-vera bash"
-RDEPENDS += "         rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo            ttf-bitstream-vera"
+             ttf-bitstream-vera bash"
+RDEPENDS += "         rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo            \
+             ttf-bitstream-vera"
 
 #
 # E
 #
-DEPENDS  += "entrance e-wm entice"
-RDEPENDS += "entrance e-wm entice"
+DEPENDS  += "entrance e-wm entice eclair examine "
+RDEPENDS += "entrance e-wm entice eclair examine "
 
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index 16240ff4e9..0a209fce0a 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -111,11 +111,14 @@ OPENSLUG_PACKAGES = "\
 	usbutils \
 	util-linux \
 	vlan \
+	vsftpd \
 	wakelan \
 	watchdog \
+	wireless-tools \
 	wget \
 	xinetd \
 	yp-tools ypbind ypserv \
+	zd1211 \
 	zlib \
 	"
 
diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc
index 60cc77356a..052ddac474 100644
--- a/packages/meta/opie-collections.inc
+++ b/packages/meta/opie-collections.inc
@@ -77,10 +77,10 @@ OPIE_EXTRA_SETTINGS = "opie-language opie-launcher-settings opie-doctab opie-sec
 
 OPIE_DEPENDS_24  = "konqueror-embedded opie-calculator opie-checkbook opie-mail opie-eye opie-rdesktop \
                     qpdf2 opie-wellenreiter opie-parashoot opie-mindbreaker opie-fifteen opie-tictac opie-tetrix   \
-                    opie-irc "
+                    opie-irc opie-mediaplayer2"
 OPIE_RDEPENDS_24 = "konqueror-embedded opie-calculator opie-checkbook opie-mail opie-eye opie-rdesktop \
                     qpdf2 opie-wellenreiter opie-parashoot opie-mindbreaker opie-fifteen opie-tictac opie-tetrix   \
-                    opie-irc "
+                    opie-irc opie-mediaplayer2 libxine-plugin-decode-ff libxine-plugin-dmx-avi"
 
 #
 #
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-divx_0.1.0.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-divx_0.1.0.bb
deleted file mode 100644
index 405d384cf8..0000000000
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-divx_0.1.0.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "OPIE Mediaplayer DIVX pseudo package."
-MAINTAINER = "Werner Schulte <w1@schulte-ac.de>"
-LICENSE = "GPL"
-ALLOW_EMPTY = "1"
-PACKAGES = "${PN}"
-PACKAGE_ARCH = "all"
-PR = "r1"
-
-DEPENDS = "opie-mediaplayer2 \
-	   opie-mediaplayer2-skin-default \
-	   libxine-fb "
-
-RDEPENDS = "opie-mediaplayer2 \
-	   opie-mediaplayer2-skin-default \
-	   libxine-plugin-ao-out-oss \
-	   libxine-plugin-decode-ff \
-	   libxine-plugin-decode-mad \
-	   libxine-plugin-dmx-audio \
-	   libxine-plugin-dmx-avi \
-	   libxine-plugin-dmx-mpeg \
-	   libxine-plugin-inp-file \
-	   libxine1"
-
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2.inc b/packages/opie-mediaplayer2/opie-mediaplayer2.inc
index 3372edddfd..00247fe6ad 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2.inc
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2.inc
@@ -6,8 +6,10 @@ LICENSE = "GPL"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 DEPENDS = "libxine-fb libqtaux2 opie-mediaplayer2-skin-default"
 RDEPENDS = "opie-mediaplayer2-skin"
-RRECOMMENDS = "opie-mediaplayer2-skin-default libxine-plugin-ao-out-oss libxine-plugin-decode-mad \
-libxine-plugin-dmx-audio libxine-plugin-dmx-mpeg libxine-plugin-inp-file "
+RRECOMMENDS = "opie-mediaplayer2-skin-default \
+libxine-plugin-ao-out-oss libxine-plugin-inp-file \
+libxine-plugin-decode-ff libxine-plugin-decode-mad \
+libxine-plugin-dmx-audio libxine-plugin-dmx-avi libxine-plugin-dmx-mpeg"
 APPNAME = "opieplayer2"
 
 S = "${WORKDIR}/${APPNAME}"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.0.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.0.bb
index b0fe5563e9..c94efb35ec 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.0.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.0.bb
@@ -1,6 +1,6 @@
 include ${PN}.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/opieplayer2 \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
index 631f545873..cc6d9b43c1 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
@@ -1,7 +1,7 @@
 include ${PN}.inc
     
 PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/opieplayer2 \
            ${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/sane-backends/sane-backends_1.0.15.bb b/packages/sane-backends/sane-backends_1.0.15.bb
index 187b996439..73e349d576 100644
--- a/packages/sane-backends/sane-backends_1.0.15.bb
+++ b/packages/sane-backends/sane-backends_1.0.15.bb
@@ -1,15 +1,16 @@
-MAINTAINER="Oyvind Repvik <nail@nslu2-linux.org>"
-DESCRIPTION="Scanner drivers for SANE"
-PR="r4"
-DEPENDS="jpeg libusb"
+MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
+DESCRIPTION = "Scanner drivers for SANE"
+PR = "r4"
+DEPENDS = "jpeg libusb"
+LICENCE = "LGPL"
 
-SRC_URI="ftp://ftp.sane-project.org/pub/sane/sane-backends-${PV}/sane-backends-${PV}.tar.gz \
+SRC_URI = "ftp://ftp.sane-project.org/pub/sane/sane-backends-${PV}/sane-backends-${PV}.tar.gz \
 	file://sane-plustek.patch;patch=1 \
 	file://Makefile.in.patch;patch=1 \
 	file://saned.xinetd \
 	"
 	
-EXTRA_OECONF="--disable-translations"
+EXTRA_OECONF = "--disable-translations"
 
 inherit autotools
 
diff --git a/packages/ssmtp/ssmtp_2.61.bb b/packages/ssmtp/ssmtp_2.61.bb
index 71a2ef7786..c48c48ae56 100644
--- a/packages/ssmtp/ssmtp_2.61.bb
+++ b/packages/ssmtp/ssmtp_2.61.bb
@@ -1,7 +1,8 @@
 SECTION = "console/network"
-
+MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 DEPENDS = "openssl"
 DESCRIPTION = "Extremely simple MTA to get mail off the system to a mail hub."
+LICENCE = "GPL"
 PR = "r4"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/s/ssmtp/ssmtp_${PV}.orig.tar.gz \
diff --git a/packages/sudo/sudo.inc b/packages/sudo/sudo.inc
index 279d1e61ee..7251bcdb4a 100644
--- a/packages/sudo/sudo.inc
+++ b/packages/sudo/sudo.inc
@@ -18,3 +18,7 @@ do_configure_prepend () {
 		cat aclocal.m4 > acinclude.m4
 	fi
 }
+
+pkg_postinst() {
+	chmod 0440 ${sysconfdir}/sudoers
+}
diff --git a/packages/sudo/sudo_1.6.8p8.bb b/packages/sudo/sudo_1.6.8p8.bb
index 087bcee541..cc8ae4081c 100644
--- a/packages/sudo/sudo_1.6.8p8.bb
+++ b/packages/sudo/sudo_1.6.8p8.bb
@@ -5,4 +5,4 @@ SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
 	   file://noexec-link.patch;patch=1"
 
 include sudo.inc
-PR = "r3"
+PR = "r4"
diff --git a/packages/vsftpd/vsftpd_2.0.3.bb b/packages/vsftpd/vsftpd_2.0.3.bb
index 52be1d6285..1cb4c55534 100644
--- a/packages/vsftpd/vsftpd_2.0.3.bb
+++ b/packages/vsftpd/vsftpd_2.0.3.bb
@@ -1,7 +1,8 @@
 DESCRIPTION = "Secure ftp daemon"
 SECTION = "console/network"
 DEPENDS = "openssl"
-PR = "r2"
+MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
+PR = "r3"
 LICENSE = "GPL"
 SRC_URI = "ftp://vsftpd.beasts.org/users/cevans/vsftpd-${PV}.tar.gz \
 	   file://makefile.patch;patch=1 \
@@ -9,6 +10,13 @@ SRC_URI = "ftp://vsftpd.beasts.org/users/cevans/vsftpd-${PV}.tar.gz \
 	   file://init \
 	   file://vsftpd.conf"
 
+do_configure() {
+	# Fix hardcoded /usr, /etc, /var mess.
+	cat tunables.c|sed s:\"/usr:\"${prefix}:g|sed s:\"/var:\"${localstatedir}:g \
+	|sed s:\"${prefix}/share/empty:\"${localstatedir}/share/empty:g |sed s:\"/etc:\"${sysconfdir}:g > tunables.c.new
+	mv tunables.c.new tunables.c
+}
+
 do_compile() {
 	oe_runmake "LIBS=-lssl -lcrypto -lcrypt -L${STAGING_LIBDIR}"
 }
@@ -32,4 +40,5 @@ INITSCRIPT_PARAMS = "defaults"
 pkg_postinst() {
 	addgroup ftp
 	adduser --system --home /var/tmp/ftp --no-create-home --ingroup ftp --disabled-password -s /bin/false ftp
-}
\ No newline at end of file
+	mkdir -p ${localstatedir}/share/empty
+}
diff --git a/packages/watchdog/watchdog_5.2.bb b/packages/watchdog/watchdog_5.2.bb
index 1d62b5ae8f..1bd7258b84 100644
--- a/packages/watchdog/watchdog_5.2.bb
+++ b/packages/watchdog/watchdog_5.2.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Software watchdog"
 MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 PR = "r2"
+LICENCE = "GPL"
 
 SRC_URI = "http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/${PN}-${PV}.tar.gz"
 FILES = "${sysconfdir}/watchdog.conf ${sbindir}/watchdog"