merge of '9fa7d7e59941b8d15fcc1dc722bd3d781d3a4407'

     and 'dbb377d00572c21544539346dc158feea2cfd1d6'

25 files changed, 213 insertions, 137 deletions

diff --git a/classes/package.bbclass b/classes/package.bbclass
index 03999a54ef..8dbc5d7b25 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -170,6 +170,8 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
 # is necessary for this stuff to work.
 PACKAGE_DEPENDS ?= "file-native"
 DEPENDS_prepend =+ "${PACKAGE_DEPENDS} "
+# file(1) output to match to consider a file an unstripped executable
+FILE_UNSTRIPPED_MATCH ?= "not stripped"
 #FIXME: this should be "" when any errors are gone!
 IGNORE_STRIP_ERRORS ?= "1"
 
@@ -178,9 +180,9 @@ runstrip() {
 	st=0
 	if {	file "$1" || {
 			oewarn "file $1: failed (forced strip)" >&2
-			echo 'not stripped'
+			echo '${FILE_UNSTRIPPED_MATCH}'
 		}
-	   } | grep -q 'not stripped'
+	   } | grep -q '${FILE_UNSTRIPPED_MATCH}'
 	then
 		oenote "${STRIP} $1"
 		ro=
@@ -188,7 +190,7 @@ runstrip() {
 			ro=1
 			chmod +w "$1"
 		}
-		mkdir $(dirname "$1")/.debug
+		mkdir -p $(dirname "$1")/.debug
 		debugfile="$(dirname "$1")/.debug/$(basename "$1")"
 		'${OBJCOPY}' --only-keep-debug "$1" "$debugfile"
 		'${STRIP}' "$1"
diff --git a/contrib/sanitize.py b/contrib/sanitize.py
index 27ca6e3d8d..028b2cc535 100755
--- a/contrib/sanitize.py
+++ b/contrib/sanitize.py
@@ -24,7 +24,7 @@ import string
 import re
 
 __author__ = "Cyril Romain <cyril.romain@gmail.com>"
-__version__ = "$Revision: 0.4 $"
+__version__ = "$Revision: 0.5 $"
 
 # The standard set of variables often found in .bb files in the preferred order
 OE_vars = [
@@ -72,6 +72,8 @@ OE_vars = [
     'includedir',
     'python',
     'qtopiadir',
+    'pkg_preins',
+    'pkg_prerm',
     'pkg_postins',
     'pkg_postrm',
     'require',
@@ -79,9 +81,9 @@ OE_vars = [
     'basesysconfdir',
     'sysconfdir',
     'ALLOW_EMPTY',
-    'ALTERNATIVE_LINK',
     'ALTERNATIVE_NAME',
     'ALTERNATIVE_PATH',
+    'ALTERNATIVE_LINK',
     'ALTERNATIVE_PRIORITY',
     'ALTNAME',
     'AMD_DRIVER_LABEL',
@@ -104,7 +106,6 @@ OE_vars = [
     'BONOBO_HEADERS',
     'BOOTSCRIPTS',
     'BROKEN',
-    'BUILD_ALL_DEPS',
     'BUILD_CPPFLAGS',
     'CFLAGS',
     'CCFLAGS',
@@ -133,8 +134,8 @@ OE_vars = [
     'GNOME_VFS_HEADERS',
     'HEADERS',
     'INHIBIT_DEFAULT_DEPS',
-    'INITSCRIPT_NAME',
     'INITSCRIPT_PACKAGES',
+    'INITSCRIPT_NAME',
     'INITSCRIPT_PARAMS',
     'IPKG_INSTALL',
     'KERNEL_IMAGETYPE',
@@ -158,13 +159,13 @@ OE_vars = [
     'LIBTOOL',
     'LIBBDB_EXTRA',
     'LIBV',
-    'MACHINE',
     'MACHINE_ESSENTIAL_EXTRA_RDEPENDS',
     'MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS',
     'MACHINE_EXTRA_RDEPENDS',
     'MACHINE_EXTRA_RRECOMMENDS',
     'MACHINE_FEATURES',
     'MACHINE_TASKS',
+    'MACHINE',
     'MACHTYPE',
     'MAKE_TARGETS',
     'MESSAGEUSER',
@@ -178,6 +179,7 @@ OE_vars = [
     'PAKCAGE_ARCH',
     'PCMCIA_MANAGER',
     'PKG_BASENAME',
+    'PKG',
     'QEMU',
     'QMAKE_PROFILES',
     'QPEDIR',
@@ -200,8 +202,8 @@ OE_vars = [
     'others'
 ]
 
-varRegexp = r'^([A-Z_0-9]*)([ \t]*?)([+.:]?=[+.]?)([ \t]*?)("[^"]*["\\]?)'
-routineRegexp = r'^([a-zA-Z0-9_ -]+?)\('
+varRegexp = r'^([a-zA-Z_0-9${}-]*)([ \t]*)([+.:]?=[+.]?)([ \t]*)([^\t]+)'
+routineRegexp = r'^([a-zA-Z0-9_ ${}-]+?)\('
 
 # Variables seen in the processed .bb
 seen_vars = {}
@@ -245,11 +247,17 @@ def conformTo_rule3(line):
     return line.lstrip()
 
 # _Format guideline #4_:
-#   Use quotes on the right hand side of assignments: FOO = "BAR"
+#   Use quotes on the right hand side of assignments FOO = "BAR"
 def respect_rule4(line):
-    return re.match(varRegexp, line) is not None
+    r = re.search(varRegexp, line)
+    if r is not None:
+        r2 = re.search(r'("?)([^"\\]*)(["\\]?)', r.group(5))
+        # do not test for None it because always match
+        return r2.group(1)=='"' and r2.group(3)!=''
+    return False
 def conformTo_rule4(line):
-    return conformTo_rule5_(line)
+    r = re.search(varRegexp, line)
+    return ''.join([r.group(1), ' ', r.group(3), ' "', r.group(5), r.group(5).endswith('"') and '' or '"'])
 
 # _Format guideline #5_:
 #   The correct spacing for a variable is FOO = "BAR".
@@ -279,7 +287,7 @@ rules = (
     (respect_rule1, conformTo_rule1, "No spaces are allowed behind the line continuation symbol '\\'"),
     (respect_rule2, conformTo_rule2, "Tabs should not be used (use spaces instead)"),
     (respect_rule3, conformTo_rule3, "Comments inside bb files are allowed using the '#' character at the beginning of a line"),
-    (respect_rule4, conformTo_rule4, "Use quotes on the right hand side of assignments: FOO = \"BAR\""),
+    (respect_rule4, conformTo_rule4, "Use quotes on the right hand side of assignments FOO = \"BAR\""),
     (respect_rule5, conformTo_rule5, "The correct spacing for a variable is FOO = \"BAR\""),
     (respect_rule6, conformTo_rule6, "Don't use spaces or tabs on empty lines"),
     (respect_rule7, conformTo_rule7, "Indentation of multiline variables such as SRC_URI is desireable"),
@@ -296,7 +304,7 @@ def follow_rule(i, line):
         # if the line still does not respect the rule
         if not rules[i][0](line):
             # this is a rule disgression
-            print "## Disgression: ", rules[i][2], " in:", line
+            print "## Disgression: ", rules[i][2], " in:", oldline
         else:
             # just remind user about his/her errors
             print "## Reminder: ", rules[i][2], " in :", oldline
@@ -327,6 +335,7 @@ if __name__ == "__main__":
     commentBloc = []
     olines = []
     for line in lines: 
+        originalLine = line
         # rstrip line to remove line breaks characters
         line = line.rstrip()
         line = follow_rule(2, line)
@@ -340,7 +349,8 @@ if __name__ == "__main__":
             commentBloc = []
             continue
 
-        if line.startswith('}'): in_routine=False
+        if line.startswith('}'): 
+            in_routine=False
         keep = line.endswith('\\') or in_routine
 
         # handles commented lines
@@ -352,41 +362,46 @@ if __name__ == "__main__":
             continue
 
         if seen_vars.has_key(var):
-            for c in commentBloc: 
+            for c in commentBloc:
                 seen_vars[var].append(c)
                 commentBloc = []
             seen_vars[var].append(line)
         else:
-            varexist = False
             for k in OE_vars:
                 if line.startswith(k):
-                    line = follow_rule(0, line)
-                    varexist = True
-                    if re.match(routineRegexp, line) is not None: 
-                        in_routine=True
-                    elif re.match(varRegexp, line) is not None:
-                        line = follow_rule(4, line)
-                        line = follow_rule(5, line)
-                    for c in commentBloc: 
-                        seen_vars[k].append(c)
-                        commentBloc = []
-                    seen_vars[k].append(line)
-                    var = (keep==True or in_routine==True) and k or ""
+                    var = k
                     break
-            if not varexist:
+            if re.match(routineRegexp, line) is not None: 
+                in_routine=True
+                line = follow_rule(0, line)
+            elif re.match(varRegexp, line) is not None:
+                line = follow_rule(0, line)
+                line = follow_rule(4, line)
+                line = follow_rule(5, line)
+            if var == "":
                 if not in_routine:
-                    print "## Warning: unknown variable/routine \"%s\"" % line
-                    seen_vars['others'].append(line)
+                    print "## Warning: unknown variable/routine \"%s\"" % originalLine
+                var = 'others'
+            for c in commentBloc:
+                seen_vars[var].append(c)
+                commentBloc = []
+            seen_vars[var].append(line)
         if not keep and not in_routine: var = ""
 
     # -- dump the sanitized .bb file --
-    #for k in OE_vars: print k, OE_vars[k]
     addEmptyLine = False
+    # write comments that are not related to variables nor routines
+    for l in olines: 
+        olines.append(l)
+    # write variables and routines
+    previourVarPrefix = "unknown"
     for k in OE_vars:
         if k=='SRC_URI': addEmptyLine = True
         if seen_vars[k] != []: 
-            if addEmptyLine: olines.append("")
+            if addEmptyLine and not k.startswith(previourVarPrefix):
+                olines.append("")
             for l in seen_vars[k]: 
                 olines.append(l)
+            previourVarPrefix = k.split('_')[0]=='' and "unknown" or k.split('_')[0]
     for line in olines: print line
 
diff --git a/packages/bwmon/bwmon_1.3.bb b/packages/bwmon/bwmon_1.3.bb
index 81cc0949a9..8f5d5f4e3b 100644
--- a/packages/bwmon/bwmon_1.3.bb
+++ b/packages/bwmon/bwmon_1.3.bb
@@ -1,17 +1,17 @@
 DESCRIPTION = "The Linux bandwidth monitor"
 MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org"
+LICENSE = "GPL"
 DEPENDS = "ncurses"
-LICENSE = "Unspecified"
-
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/bwmon/${P}.tar.gz \
-	   file://makefile.patch;patch=1"
-EXTRA_OEMAKE = "LDFLAGS=-L${STAGING_LIBDIR}"
+           file://makefile.patch;patch=1"
 
 inherit autotools
 
+EXTRA_OEMAKE = "LDFLAGS=-L${STAGING_LIBDIR}"
+
 do_install () {
-	install -d ${D}${bindir}
-	install ${S}/bwmon ${D}${bindir}/bwmon
+        install -d ${D}${bindir}
+        install ${S}/bwmon ${D}${bindir}/bwmon
 }
diff --git a/packages/e17/e-utils_20060501.bb b/packages/e17/e-utils_20060501.bb
index 3f1af895ae..fc94cd106f 100644
--- a/packages/e17/e-utils_20060501.bb
+++ b/packages/e17/e-utils_20060501.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Enlightenment Window Manager Utilities"
-DEPENDS = "virtual/ecore virtual/evas virtual/esmart edje eet ewl engrave virtual/imlib2 e epsilon"
+DEPENDS = "virtual/ecore virtual/evas virtual/esmart edje eet ewl engrave virtual/imlib2 epsilon"
 LICENSE = "MIT"
 PR = "r1"
 
diff --git a/packages/eventlog/.mtn2git_empty b/packages/eventlog/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/eventlog/.mtn2git_empty
diff --git a/packages/eventlog/eventlog_0.2.5.bb b/packages/eventlog/eventlog_0.2.5.bb
new file mode 100644
index 0000000000..bf8beef391
--- /dev/null
+++ b/packages/eventlog/eventlog_0.2.5.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "Replacement syslog API"
+MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
+LICENSE = "BSD"
+PR = "r0"
+
+SRC_URI = "http://www.balabit.com/downloads/syslog-ng/2.0/src/${PN}-${PV}.tar.gz"
+
+inherit autotools
+
diff --git a/packages/gnupg/gnupg-1.4.2.2/30_nm_always_check.patch b/packages/gnupg/gnupg-1.4.2.2/30_nm_always_check.patch
new file mode 100644
index 0000000000..914f1475b7
--- /dev/null
+++ b/packages/gnupg/gnupg-1.4.2.2/30_nm_always_check.patch
@@ -0,0 +1,21 @@
+Originally the test for _'s on symbols was not done when cross-compiling and
+it was assumed that the _'s were appended. The test does in fact work since
+it simply compiles a file and then run's nm on it. So patch this to enable.
+Without this x86 targets fail during linking since the assembler code has
+the _'s appended when it shouldn't.
+
+--- gnupg-1.4.2.2/acinclude.m4	2006/09/11 22:11:23	1.1
++++ gnupg-1.4.2.2/acinclude.m4	2006/09/11 22:17:25
+@@ -673,11 +673,7 @@
+         ac_cv_sys_symbol_underscore=yes
+         ;;
+     *)
+-      if test "$cross_compiling" = yes; then
+-         ac_cv_sys_symbol_underscore=yes
+-      else
+-         tmp_do_check="yes"
+-      fi
++        tmp_do_check="yes"
+        ;;
+ esac
+ 
diff --git a/packages/gnupg/gnupg.inc b/packages/gnupg/gnupg.inc
index b4eb9bba65..2d8e37605f 100644
--- a/packages/gnupg/gnupg.inc
+++ b/packages/gnupg/gnupg.inc
@@ -70,3 +70,7 @@ do_install () {
 	mv ${D}${datadir}/${PN}/* ${D}/${docdir}/${PN}/ || :
 	mv ${D}${prefix}/doc/* ${D}/${docdir}/${PN}/ || :
 }
+
+# Exclude debug files from the main packages
+FILES_${PN} = "${bindir}/* ${datadir}/${PN} ${libexecdir}/${PN}/*"
+FILES_${PN}-dbg += "${libexecdir}/${PN}/.debug"
diff --git a/packages/gnupg/gnupg_1.4.2.2.bb b/packages/gnupg/gnupg_1.4.2.2.bb
index 97c301cf97..b21eb88b91 100644
--- a/packages/gnupg/gnupg_1.4.2.2.bb
+++ b/packages/gnupg/gnupg_1.4.2.2.bb
@@ -6,8 +6,9 @@ EXTRA_OECONF += "--with-readline=${STAGING_LIBDIR}/.."
 
 SRC_URI += "file://15_free_caps.patch;patch=1 \
 	    file://16_min_privileges.patch;patch=1 \
-	    file://22_zero_length_mpi_fix.patch;patch=1 "
+	    file://22_zero_length_mpi_fix.patch;patch=1 \
+            file://30_nm_always_check.patch;patch=1"
 
 S = "${WORKDIR}/gnupg-${PV}"
 
-PR = "r1"
+PR = "r2"
diff --git a/packages/libdvb/libdvb_0.5.5.1.bb b/packages/libdvb/libdvb_0.5.5.1.bb
index 0e0c2b9caf..2f5e77034d 100644
--- a/packages/libdvb/libdvb_0.5.5.1.bb
+++ b/packages/libdvb/libdvb_0.5.5.1.bb
@@ -1,29 +1,27 @@
-LICENSE = "GPL"
 DESCRIPTION = "Linux Digital Video Broadcast library"
 DESCRIPTION_libdvb-dev = "Headers for libdvb development"
 HOMEPAGE = "http://www.metzlerbros.org/dvb/index.html"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org"
 SECTION = "libs"
 PRIORITY = "optional"
+MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org"
+LICENSE = "GPL"
 PR = "r2"
 
 SRC_URI = "http://www.metzlerbros.org/dvb/${PN}-${PV}.tar.gz \
-	  file://topf2ps.patch;patch=1"
+          file://topf2ps.patch;patch=1"
 
 S = "${WORKDIR}/${PN}-${PV}"
 
 inherit autotools pkgconfig
 
 do_configure() {
-	grep -v ^PREFIX ${S}/config.mk > ${S}/config.mk.new
-	echo "PREFIX=${prefix}" >> ${S}/config.mk.new
-	mv ${S}/config.mk.new ${S}/config.mk
+        grep -v ^PREFIX ${S}/config.mk > ${S}/config.mk.new
+        echo "PREFIX=${prefix}" >> ${S}/config.mk.new
+        mv ${S}/config.mk.new ${S}/config.mk
 }
 
-
 do_stage() {
-	install -d ${STAGING_INCDIR}/dvb
-	install -m 0644 ${S}/include/*.h ${STAGING_INCDIR}/dvb
-	oe_libinstall -a -C libdvb libdvb ${STAGING_LIBDIR}
+        install -d ${STAGING_INCDIR}/dvb
+        install -m 0644 ${S}/include/*.h ${STAGING_INCDIR}/dvb
+        oe_libinstall -a -C libdvb libdvb ${STAGING_LIBDIR}
 }
-
diff --git a/packages/libgpg-error/libgpg-error_1.3.bb b/packages/libgpg-error/libgpg-error_1.3.bb
index c29053832b..a2a19b254c 100644
--- a/packages/libgpg-error/libgpg-error_1.3.bb
+++ b/packages/libgpg-error/libgpg-error_1.3.bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 DESCRIPTION = "GPG-Error library"
 SECTION = "libs"
 PRIORITY = "optional"
@@ -9,7 +9,7 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.gz \
 
 # move libgpg-error-config into -dev package
 FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${bindir}"
+FILES_${PN}-dev += "${bindir}/*"
 
 inherit autotools binconfig pkgconfig
 
diff --git a/packages/libol/libol_0.3.18.bb b/packages/libol/libol_0.3.18.bb
new file mode 100644
index 0000000000..3412acfc9a
--- /dev/null
+++ b/packages/libol/libol_0.3.18.bb
@@ -0,0 +1,16 @@
+MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org"
+PR = "r5"
+
+SRC_URI = "http://www.balabit.com/downloads/libol/0.3/${PN}-${PV}.tar.gz"
+
+S = "${WORKDIR}/${PN}-${PV}"
+
+inherit autotools
+
+do_stage() {
+        install -d ${STAGING_INCDIR}/libol
+        install -m 0755 ${S}/libol-config ${STAGING_BINDIR}
+        install -m 0755 ${S}/src/.libs/libol.so.0.0.0 ${STAGING_LIBDIR}
+        ln -fs ${STAGING_LIBDIR}/libol.so.0.0.0 ${STAGING_LIBDIR}/libol.so.0
+        install ${S}/src/*.h ${STAGING_INCDIR}/libol/
+}
diff --git a/packages/libpcre/libpcre-native_4.4.bb b/packages/libpcre/libpcre-native_4.4.bb
index 7caddc321d..7be8ffd0ac 100644
--- a/packages/libpcre/libpcre-native_4.4.bb
+++ b/packages/libpcre/libpcre-native_4.4.bb
@@ -1,4 +1,4 @@
 SECTION = "unknown"
-include libpcre_${PV}.bb
+require libpcre_${PV}.bb
 inherit native
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpcre-${PV}"
diff --git a/packages/libpcre/libpcre_4.4.bb b/packages/libpcre/libpcre_4.4.bb
index f26b595894..941888577b 100644
--- a/packages/libpcre/libpcre_4.4.bb
+++ b/packages/libpcre/libpcre_4.4.bb
@@ -5,41 +5,37 @@ provides a POSIX calling interface to PCRE; the regular expressions \
 themselves still follow Perl syntax and semantics. The header file for \
 the POSIX-style functions is called pcreposix.h."
 SECTION = "devel"
-PR = "r1"
-
+PR = "r6"
+LICENSE = "BSD"
 SRC_URI = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.bz2"
 S = "${WORKDIR}/pcre-${PV}"
 
-PARALLEL_MAKE = ""
-
 inherit autotools binconfig
 
+PARALLEL_MAKE = ""
+
 LEAD_SONAME = "libpcre.so"
 CFLAGS_append = " -D_REENTRANT"
 EXTRA_OECONF = " --with-link-size=2 --enable-newline-is-lf --with-match-limit=10000000"
 
-
 do_compile () {
-	${BUILD_CC} -DLINK_SIZE=2 -I${S}/include -c dftables.c
-	${BUILD_CC} dftables.o -o dftables
-	oe_runmake
+	# stop libtool from trying to link with host libraries - fix from #33
+	# this resolve build problem on amd64 - #1015
+	sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${TARGET_SYS}-libtool
+
+	# The generation of dftables can lead to timestamp problems with ccache
+	# because the generated config.h seems newer.  It is sufficient to ensure that the
+	# attempt to build dftables inside make will actually work (foo_FOR_BUILD is
+	# only used for this).
+	oe_runmake CC_FOR_BUILD="${BUILD_CC}" CFLAGS_FOR_BUILD="-DLINK_SIZE=2 -I${S}/include" LINK_FOR_BUILD="${BUILD_CC}"
 }
 
 do_stage () {
-        # Force all -L(dir) output to be prepended with the staging libdir to stop libtool
-        # from trying to link to host libraries.
-        sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/*libtool
-
-        oe_libinstall -a -so libpcre ${STAGING_LIBDIR}
-        oe_libinstall -a -so libpcreposix ${STAGING_LIBDIR}
-        install -m 0644 pcre.h ${STAGING_INCDIR}/
-        install -m 0644 pcreposix.h ${STAGING_INCDIR}/
-
-        # pcreposix linked originally to the libpcre in it's working directory. That messed
-        # the .la file up. I fix this manually here:
-        sed -i 's:${S}:${STAGING_LIBDIR}:' ${STAGING_LIBDIR}/libpcreposix.la
+	oe_libinstall -a -so libpcre ${STAGING_LIBDIR}
+	oe_libinstall -a -so libpcreposix ${STAGING_LIBDIR}
+	install -m 0644 pcre.h ${STAGING_INCDIR}/
+	install -m 0644 pcreposix.h ${STAGING_INCDIR}/
 }
 
-
 FILES_${PN} = "${libdir}/lib*.so*"
-FILES_${PN}-dev += "${bindir}"
+FILES_${PN}-dev += "${bindir}/*"
diff --git a/packages/libpng/libpng_1.2.12.bb b/packages/libpng/libpng_1.2.12.bb
index 66b691b617..deff600a7a 100644
--- a/packages/libpng/libpng_1.2.12.bb
+++ b/packages/libpng/libpng_1.2.12.bb
@@ -4,7 +4,7 @@ LICENSE = "libpng"
 SECTION = "libs"
 PRIORITY = "required"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-PR = "r3"
+PR = "r4"
 
 DEPENDS = "zlib"
 
@@ -21,36 +21,13 @@ FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
 SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2"
 S = "${WORKDIR}/libpng-${PV}"
 
-inherit pkgconfig binconfig pkgconfig
-
-EXTRA_OEMAKE_append = " ZLIBINC=${STAGING_INCDIR} ZLIBLIB=${STAGING_LIBDIR}"
-CFLAGS += "-DPNG_NO_ASSEMBLER_CODE"
-
-do_compile() {
-	sed < scripts/makefile.linux > makefile -e 's/^ZLIBINC.*//' -e 's/^ZLIBLIB.*//'
-	unset LDFLAGS
-	oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \
-		   'ZLIBINC=${STAGING_INCDIR}' \
-		   'ZLIBLIB=${STAGING_LIBDIR}'
-}
-
-# apperently libpng doesn't expand the vars in libpng.pc, so we'll do that with sed
-# pkgconfig.bbclass will use a similar trick to fix them
-
-do_stage_prepend() {
-	sed -i  -e 's:=@libdir@:=${libdir}:;' \
-		-e 's:=@includedir@:=${includedir}:;' \
-		-e 's:=@prefix@:=${prefix}:' \
-		-e 's:=@exec_prefix@:=${exec_prefix}:' \
-            	-e 's:-lpng12:-lpng12\ -lz\ -lm:' \
-		libpng.pc
-
-}
+inherit autotools binconfig pkgconfig
 
 do_stage() {
 	cp libpng.pc libpng12.pc
 	install -m 644 png.h ${STAGING_INCDIR}/png.h
 	install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h
+	oe_libinstall -so libpng ${STAGING_LIBDIR}/
 	oe_libinstall -so libpng12 ${STAGING_LIBDIR}/
 	ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so
 }
diff --git a/packages/meta/nylon-feed.bb b/packages/meta/nylon-feed.bb
index 21d53b9895..724e373739 100644
--- a/packages/meta/nylon-feed.bb
+++ b/packages/meta/nylon-feed.bb
@@ -9,7 +9,6 @@ DEPENDS = "${NYLON_FEED} \
     glib-2.0 \
     glibc \
     gmp \
-    hotplug \
     iproute2 \
     libcgicc \
     libedit \
diff --git a/packages/nylon/simple-firewall.bb b/packages/nylon/simple-firewall.bb
index 35911dad2c..408faf9f29 100644
--- a/packages/nylon/simple-firewall.bb
+++ b/packages/nylon/simple-firewall.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel"
 SRCDATE = "20060810"
-PV = "cvs${CVSDATE}"
+PV = "cvs${SRCDATE}"
 
 
 INHIBIT_PACKAGE_STRIP = "1"
@@ -14,5 +14,6 @@ SRC_URI = "http://meshcube.org/nylon/unstable/sources/${PN}_gruen.4g__${SRCDATE}
 S = "${WORKDIR}/${PN}"
 
 do_install() {
+	install -d -m 755 ${D}
 	(cd ${S}; tar -c --exclude .svn -f - . ) | tar -C ${D} -xpf -
 }
diff --git a/packages/syslog-ng/syslog-ng_1.6.11.bb b/packages/syslog-ng/syslog-ng_1.6.11.bb
new file mode 100644
index 0000000000..0eea18d4e9
--- /dev/null
+++ b/packages/syslog-ng/syslog-ng_1.6.11.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "Alternative system logger daemon"
+MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org"
+DEPENDS = "libol flex"
+PR = "r0"
+
+SRC_URI = "http://www.balabit.com/downloads/syslog-ng/1.6/src/${PN}-${PV}.tar.gz \
+          file://syslog-ng.conf \
+          file://initscript"
+
+S = "${WORKDIR}/${PN}-${PV}"
+
+inherit autotools update-rc.d
+
+EXTRA_OECONF = "--with-libol=${STAGING_BINDIR}/"
+
+do_install_append() {
+        install -d ${D}/${sysconfdir}/${PN}
+        install ${WORKDIR}/syslog-ng.conf ${D}${sysconfdir}/${PN}/syslog-ng.conf
+        install -d ${D}/${sysconfdir}/init.d
+        install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog-ng
+}
+
+pkg_postinst() {
+        update-rc.d -f syslog remove
+}
+
+pkg_postrm() {
+        update-rc.d syslog add 5
+}
+
+CONFFILES_${PN} = "${sysconfdir}/${PN}/syslog-ng.conf"
+
+INITSCRIPT_NAME = "syslog-ng"
+
+INITSCRIPT_PARAMS = "defaults 05"
diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc
index 2064489ec6..8cd85d53d1 100644
--- a/packages/uclibc/uclibc.inc
+++ b/packages/uclibc/uclibc.inc
@@ -14,7 +14,7 @@ MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 
 python __anonymous () {
     import bb, re
-    uc_os = (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None)
+    uc_os = (re.match('.*uclibc*', bb.data.getVar('TARGET_OS', d, 1)) != None)
     if not uc_os:
         raise bb.parse.SkipPackage("incompatible with target %s" %
                                    bb.data.getVar('TARGET_OS', d, 1))
diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb
index a12b9b99c6..c2821eb585 100644
--- a/packages/uclibc/uclibc_svn.bb
+++ b/packages/uclibc/uclibc_svn.bb
@@ -34,24 +34,4 @@ S = "${WORKDIR}/uClibc"
 # have a 'good' set of kernel header files in the cross directory.
 #UCLIBC_PATCHES += "file://nokernelheadercheck.patch;patch=1"
 #
-# Thumb support
-UCLIBC_PATCHES += " file://thumb-defined-arm-or-thumb.patch;patch=1"
-#
-# Thumb interworking support
-UCLIBC_PATCHES += " file://thumb-mov-pc-bx.patch;patch=1"
-UCLIBC_PATCHES += " file://thumb-swi-r7.patch;patch=1"
-UCLIBC_PATCHES += " file://thumb-sysnum-h.patch;patch=1"
-UCLIBC_PATCHES += " file://thumb-asm-swi.patch;patch=1"
-UCLIBC_PATCHES += " file://thumb-call-via-rx.patch;patch=1"
-#
-# This is a core change and is controversial, maybe even wrong
-# on some architectures
-THUMB_INTERWORK_RESOLVE_PATCH = ""
-THUMB_INTERWORK_RESOLVE_PATCH_thumb-interwork = " file://thumb-resolve.patch;patch=1"
-UCLIBC_PATCHES += " ${THUMB_INTERWORK_RESOLVE_PATCH}"
-
-# Set this for non-head patches (the above list should match the
-# requirements of the SVN head).
-UCLIBC_SVN_PATCHES ?= "${UCLIBC_PATCHES}"
 
-SRC_URI += "${UCLIBC_SVN_PATCHES}"
diff --git a/packages/zd1211/zd1211_r83.bb b/packages/zd1211/zd1211_r83.bb
index 5f0c6a0d0a..2a560bada5 100644
--- a/packages/zd1211/zd1211_r83.bb
+++ b/packages/zd1211/zd1211_r83.bb
@@ -1,16 +1,16 @@
 DESCRIPTION = "Driver for zd1211 family of wireless USB Dongles"
-PRIORITY = "optional"
+HOMEPAGE = "http://zd1211.ath.cx/"
 SECTION = "kernel/modules"
+PRIORITY = "optional"
 MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 LICENSE = "GPL"
-PR = "r1"
 RDEPENDS = "wireless-tools"
+PR = "r1"
 
 SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \
-           file://makefile.patch;patch=1" 
-
+           file://makefile.patch;patch=1"
 SRC_URI_unslung = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \
-       	file://makefile-unslung.patch;patch=1 \
+        file://makefile-unslung.patch;patch=1 \
         file://unslung-iwpriv-hack.patch;patch=1 \
         file://unslung-writel-logging.patch;patch=1"
 
@@ -25,10 +25,10 @@ do_compile () {
                    'KDIR=${STAGING_KERNEL_DIR}' \
                    'KERNEL_VERSION=${KERNEL_VERSION}' \
                    'CC=${KERNEL_CC}' \
-                   'LD=${KERNEL_LD}' 
+                   'LD=${KERNEL_LD}'
 }
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net
         install -m 0644 ${S}/zd1211*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net
 }
diff --git a/site/i486-linux b/site/i486-linux
index c21dfcd365..2fc4c476af 100644
--- a/site/i486-linux
+++ b/site/i486-linux
@@ -125,6 +125,9 @@ jm_cv_func_working_readdir=yes
 # cvs
 cvs_cv_func_printf_ptr=${cvs_cv_func_printf_ptr=yes}
 
+# rp-pppoe
+rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev}
+
 # gettext
 am_cv_func_working_getline=${am_cv_func_working_getline=yes}
 
@@ -157,6 +160,11 @@ screen_cv_sys_sockets_nofs=${screen_cv_sys_sockets_nofs=no}
 screen_cv_sys_sockets_usable=${screen_cv_sys_sockets_usable=yes}
 screen_cv_sys_terminfo_used=${screen_cv_sys_terminfo_used=yes}
 
+# lftp
+ac_cv_need_trio=${ac_cv_need_trio=no}
+lftp_cv_va_copy=${lftp_cv_va_copy=no}
+lftp_cv___va_copy=${lftp_cv___va_copy=yes}
+
 # slrn
 slrn_cv___va_copy=${slrn_cv___va_copy=yes}
 slrn_cv_va_copy=${slrn_cv_va_copy=no}
diff --git a/site/i586-linux b/site/i586-linux
index 1be379c993..b4fda09b81 100644
--- a/site/i586-linux
+++ b/site/i586-linux
@@ -107,6 +107,9 @@ ac_cv_have_openpty_ctty_bug=${ac_cv_have_openpty_ctty_bug=yes}
 # samba
 samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
 
+# rp-pppoe
+rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev}
+
 # gettext
 am_cv_func_working_getline=${am_cv_func_working_getline=yes}
 
@@ -132,6 +135,11 @@ ac_cv_va_copy=${ac_cv_va_copy=no}
 ac_cv___va_copy=${ac_cv___va_copy=yes}
 racoon_cv_bug_getaddrinfo=${racoon_cv_bug_getaddrinfo=no}
 
+# lftp
+ac_cv_need_trio=${ac_cv_need_trio=no}
+lftp_cv_va_copy=${lftp_cv_va_copy=no}
+lftp_cv___va_copy=${lftp_cv___va_copy=yes}
+
 # slrn
 slrn_cv___va_copy=${slrn_cv___va_copy=yes}
 slrn_cv_va_copy=${slrn_cv_va_copy=no}
diff --git a/site/sh4-linux b/site/sh4-linux
index 8e25cad4a5..bb0bf09e6c 100644
--- a/site/sh4-linux
+++ b/site/sh4-linux
@@ -250,6 +250,9 @@ mysql_cv_func_atomic_sub=${mysql_cv_func_atomic_sub=no}
 mysql_cv_func_atomic_add=${mysql_cv_func_atomic_add=no}
 ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes}
 
+# rp-pppoe
+rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev}
+
 # gettext
 am_cv_func_working_getline=${am_cv_func_working_getline=yes}
 
diff --git a/site/sh4-linux-uclibc b/site/sh4-linux-uclibc
index 30054561f2..c083f418b5 100644
--- a/site/sh4-linux-uclibc
+++ b/site/sh4-linux-uclibc
@@ -3,6 +3,9 @@ ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes}
 ac_cv_func_malloc_works=${ac_cv_func_malloc_works=yes}
 ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes}
 
+# rp-pppoe
+rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev}
+
 # gettext
 am_cv_func_working_getline=${am_cv_func_working_getline=yes}