merge of 'c8b6f226355d3351327e8b61f52855537a448a23'

     and 'ff788cdac5bbfb991ee004911daf4db1b80ff5ce'

12 files changed, 151 insertions, 125 deletions

diff --git a/packages/clamav/clamav.inc b/packages/clamav/clamav.inc
new file mode 100644
index 0000000000..2a09c52461
--- /dev/null
+++ b/packages/clamav/clamav.inc
@@ -0,0 +1,122 @@
+DESCRIPTION = "Clam AntiVirus is a GPL anti-virus toolkit for UNIX. The main \
+purpose of this software is the integration with mail servers (attachment \
+scanning)."
+DESCRIPTION_${PN}-lib = "The dynamic library that is shared between all of \
+the Clam AntiVirus components"
+DESCRIPTION_${PN}-freshclam = "An automatic virus signature update \
+application for Clam AntiVirus"
+DESCRIPTION_${PN}-data = "Static antivirus signature database for Clam AntiVirus"
+DESCRIPTION_${PN}-daemon = "An on-demand file scanning service for Clam AntiVirus"
+HOMEPAGE = "http://www.clamav.net/"
+SECTION = "network"
+LICENSE = "GPL"
+DEPENDS = "zlib bzip2 gmp"
+RDEPENDS_${PN} = "${PN}-data"
+RDEPENDS_${PN}-daemon = "${PN}-data"
+RRECOMMENDS_${PN} = "${PN}-freshclam"
+RRECOMMENDS_${PN}-daemon = "${PN}-freshclam"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/clamav/clamav-${PV}.tar.gz \
+          file://cross-compile-fix.patch;patch=1 \
+          file://libtool-fix.patch;patch=1 \
+          file://clamav-daemon.init \
+          file://clamav-freshclam.init \
+          file://clamav-daemon.default \
+          file://clamd.conf \
+          file://freshclam.conf \
+          file://volatiles.02_clamav-data \
+          file://volatiles.03_clamav-daemon \
+          file://volatiles.03_clamav-freshclam"
+
+inherit autotools update-rc.d binconfig
+
+# Don't check for clamav uid/gid - they don't exist on the host
+# Put virus definitions in /var/lib not /usr/lib
+EXTRA_OECONF = "--disable-clamav \
+                --with-dbdir=${localstatedir}/lib/clamav"
+
+do_install_append() {
+        install -m 0755 -d ${D}${sysconfdir}/default/volatiles \
+                           ${D}${sysconfdir}/init.d ${D}${docdir}/clamav
+
+        # Save the installed clamd.conf in the doc dir and then install our new one
+        install -m 0755 ${D}${sysconfdir}/clamd.conf ${D}${docdir}/clamav/clamd.conf.example
+        install -m 0755 ${WORKDIR}/clamd.conf ${D}${sysconfdir}/clamd.conf
+
+        # Save the installed freshclam.conf in the doc dir and then install our new one
+        install -m 0755 ${D}${sysconfdir}/freshclam.conf ${D}${docdir}/clamav/freshclam.conf.example
+
+        # Install our config files and init scripts
+        install -m 0755 ${WORKDIR}/freshclam.conf ${D}${sysconfdir}/freshclam.conf
+        install -m 0755 ${WORKDIR}/clamav-daemon.default ${D}${sysconfdir}/default/clamav-daemon
+        install -m 0755 ${WORKDIR}/clamav-daemon.init ${D}${sysconfdir}/init.d/clamav-daemon
+        install -m 0755 ${WORKDIR}/clamav-freshclam.init ${D}${sysconfdir}/init.d/clamav-freshclam
+
+        # We need some /var directories
+        for i in 02_clamav-data 03_clamav-daemon 03_clamav-freshclam; do
+          install -m 0644 ${WORKDIR}/volatiles.$i ${D}${sysconfdir}/default/volatiles/$i
+        done
+
+        # Move the clamav data to a non-volatile location, we'll symlink back
+        # If freshclam is running it'll break the link to this static data
+        # once it has succesfully downloaded an update
+        install -m 0755 -d ${D}${libdir}
+        mv ${D}${localstatedir}/lib/clamav ${D}${libdir}
+}
+do_stage () {
+        oe_libinstall -a -so libclamav ${STAGING_LIBDIR}
+        rm -f ${STAGING_LIBDIR}/libclamav.la
+        install -m 0644 libclamav/clamav.h ${STAGING_INCDIR}
+}
+
+PACKAGES += "${PN}-freshclam ${PN}-daemon ${PN}-data ${PN}-lib"
+
+FILES_${PN} = "${bindir}/clamscan ${bindir}/sigtool ${bindir}/clamdscan"
+FILES_${PN}-lib = "${libdir}/libclamav.so.*"
+FILES_${PN}-freshclam = "${bindir}/freshclam \
+                         ${sysconfdir}/freshclam.conf \
+                         ${sysconfdir}/init.d/clamav-freshclam \
+                         ${sysconfdir}/default/volatiles/03_clamav-freshclam"
+FILES_${PN}-daemon = "${sysconfdir}/clamd.conf \
+                      ${sbindir}/clamd \
+                      ${sysconfdir}/init.d/clamav-daemon \
+                      ${sysconfdir}/default/clamav-daemon \
+                      ${sysconfdir}/default/volatiles/03_clamav-daemon"
+FILES_${PN}-data = "${libdir}/clamav/main.cvd \
+                    ${libdir}/clamav/daily.cvd \
+                    ${sysconfdir}/default/volatiles/02_clamav-data"
+FILES_${PN}-dev += "${bindir}/clamav-config"
+
+# Add clamav's user and groups
+pkg_postinst_${PN}-freshclam () {
+        grep -q clamav: /etc/group || addgroup clamav
+        grep -q clamav: /etc/passwd || \
+            adduser --disabled-password --home=/var/lib/clamav/ --system \
+                    --ingroup clamav --no-create-home -g "ClamAV" clamav
+        /etc/init.d/populate-volatile.sh
+}
+pkg_postinst_${PN}-daemon () {
+        grep -q clamav: /etc/group || addgroup clamav
+        grep -q clamav: /etc/passwd || \
+            adduser --disabled-password --home=/var/lib/clamav/ --system \
+                    --ingroup clamav --no-create-home -g "ClamAV" clamav
+        /etc/init.d/populate-volatile.sh
+}
+pkg_postinst_${PN}-data () {
+        grep -q clamav: /etc/group || addgroup clamav
+        grep -q clamav: /etc/passwd || \
+            adduser --disabled-password --home=/var/lib/clamav/ --system \
+                    --ingroup clamav --no-create-home -g "ClamAV" clamav
+        /etc/init.d/populate-volatile.sh
+}
+
+# Indicate that the default files are configuration files
+CONFFILES_${PN}-daemon = "${sysconfdir}/clamd.conf \
+                          ${sysconfdir}/default/clamav-daemon"
+CONFFILES_${PN}-freshclam = "${sysconfdir}/freshclam.conf"
+
+INITSCRIPT_PACKAGES = "${PN}-daemon ${PN}-freshclam"
+INITSCRIPT_NAME_${PN}-daemon = "clamav-daemon"
+INITSCRIPT_NAME_${PN}-freshclam = "clamav-freshclam"
+INITSCRIPT_PARAMS_${PN}-daemon = "defaults 50 50"
+INITSCRIPT_PARAMS_${PN}-freshclam = "defaults 50 50"
diff --git a/packages/clamav/clamav_0.88.4.bb b/packages/clamav/clamav_0.88.4.bb
index 9cb432d579..2d980440fa 100644
--- a/packages/clamav/clamav_0.88.4.bb
+++ b/packages/clamav/clamav_0.88.4.bb
@@ -1,123 +1,3 @@
-DESCRIPTION = "Clam AntiVirus is a GPL anti-virus toolkit for UNIX. The main \
-purpose of this software is the integration with mail servers (attachment \
-scanning)."
-DESCRIPTION_${PN}-lib = "The dynamic library that is shared between all of \
-the Clam AntiVirus components"
-DESCRIPTION_${PN}-freshclam = "An automatic virus signature update \
-application for Clam AntiVirus"
-DESCRIPTION_${PN}-data = "Static antivirus signature database for Clam AntiVirus"
-DESCRIPTION_${PN}-daemon = "An on-demand file scanning service for Clam AntiVirus"
-HOMEPAGE = "http://www.clamav.net/"
-SECTION = "network"
-LICENSE = "GPL"
-DEPENDS = "zlib bzip2 gmp"
-RDEPENDS_${PN} = "${PN}-data"
-RDEPENDS_${PN}-daemon = "${PN}-data"
-RRECOMMENDS_${PN} = "${PN}-freshclam"
-RRECOMMENDS_${PN}-daemon = "${PN}-freshclam"
-PR = "r6"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/clamav/clamav-${PV}.tar.gz \
-          file://cross-compile-fix.patch;patch=1 \
-          file://libtool-fix.patch;patch=1 \
-          file://clamav-daemon.init \
-          file://clamav-freshclam.init \
-          file://clamav-daemon.default \
-          file://clamd.conf \
-          file://freshclam.conf \
-          file://volatiles.02_clamav-data \
-          file://volatiles.03_clamav-daemon \
-          file://volatiles.03_clamav-freshclam"
-
-inherit autotools update-rc.d binconfig
-
-# Don't check for clamav uid/gid - they don't exist on the host
-# Put virus definitions in /var/lib not /usr/lib
-EXTRA_OECONF = "--disable-clamav \
-                --with-dbdir=${localstatedir}/lib/clamav"
-
-do_install_append() {
-        install -m 0755 -d ${D}${sysconfdir}/default/volatiles \
-                           ${D}${sysconfdir}/init.d ${D}${docdir}/clamav
-
-        # Save the installed clamd.conf in the doc dir and then install our new one
-        install -m 0755 ${D}${sysconfdir}/clamd.conf ${D}${docdir}/clamav/clamd.conf.example
-        install -m 0755 ${WORKDIR}/clamd.conf ${D}${sysconfdir}/clamd.conf
-
-        # Save the installed freshclam.conf in the doc dir and then install our new one
-        install -m 0755 ${D}${sysconfdir}/freshclam.conf ${D}${docdir}/clamav/freshclam.conf.example
-
-        # Install our config files and init scripts
-        install -m 0755 ${WORKDIR}/freshclam.conf ${D}${sysconfdir}/freshclam.conf
-        install -m 0755 ${WORKDIR}/clamav-daemon.default ${D}${sysconfdir}/default/clamav-daemon
-        install -m 0755 ${WORKDIR}/clamav-daemon.init ${D}${sysconfdir}/init.d/clamav-daemon
-        install -m 0755 ${WORKDIR}/clamav-freshclam.init ${D}${sysconfdir}/init.d/clamav-freshclam
+require clamav.inc
 
-        # We need some /var directories
-        for i in 02_clamav-data 03_clamav-daemon 03_clamav-freshclam; do
-          install -m 0644 ${WORKDIR}/volatiles.$i ${D}${sysconfdir}/default/volatiles/$i
-        done
-
-        # Move the clamav data to a non-volatile location, we'll symlink back
-        # If freshclam is running it'll break the link to this static data
-        # once it has succesfully downloaded an update
-        install -m 0755 -d ${D}${libdir}
-        mv ${D}${localstatedir}/lib/clamav ${D}${libdir}
-}
-do_stage () {
-        oe_libinstall -a -so libclamav ${STAGING_LIBDIR}
-        rm -f ${STAGING_LIBDIR}/libclamav.la
-        install -m 0644 libclamav/clamav.h ${STAGING_INCDIR}
-}
-
-PACKAGES += "${PN}-freshclam ${PN}-daemon ${PN}-data ${PN}-lib"
-
-FILES_${PN} = "${bindir}/clamscan ${bindir}/sigtool ${bindir}/clamdscan"
-FILES_${PN}-lib = "${libdir}/libclamav.so.*"
-FILES_${PN}-freshclam = "${bindir}/freshclam \
-                         ${sysconfdir}/freshclam.conf \
-                         ${sysconfdir}/init.d/clamav-freshclam \
-                         ${sysconfdir}/default/volatiles/03_clamav-freshclam"
-FILES_${PN}-daemon = "${sysconfdir}/clamd.conf \
-                      ${sbindir}/clamd \
-                      ${sysconfdir}/init.d/clamav-daemon \
-                      ${sysconfdir}/default/clamav-daemon \
-                      ${sysconfdir}/default/volatiles/03_clamav-daemon"
-FILES_${PN}-data = "${libdir}/clamav/main.cvd \
-                    ${libdir}/clamav/daily.cvd \
-                    ${sysconfdir}/default/volatiles/02_clamav-data"
-FILES_${PN}-dev += "${bindir}/clamav-config"
-
-# Add clamav's user and groups
-pkg_postinst_${PN}-freshclam () {
-        grep -q clamav: /etc/group || addgroup clamav
-        grep -q clamav: /etc/passwd || \
-            adduser --disabled-password --home=/var/lib/clamav/ --system \
-                    --ingroup clamav --no-create-home -g "ClamAV" clamav
-        /etc/init.d/populate-volatile.sh
-}
-pkg_postinst_${PN}-daemon () {
-        grep -q clamav: /etc/group || addgroup clamav
-        grep -q clamav: /etc/passwd || \
-            adduser --disabled-password --home=/var/lib/clamav/ --system \
-                    --ingroup clamav --no-create-home -g "ClamAV" clamav
-        /etc/init.d/populate-volatile.sh
-}
-pkg_postinst_${PN}-data () {
-        grep -q clamav: /etc/group || addgroup clamav
-        grep -q clamav: /etc/passwd || \
-            adduser --disabled-password --home=/var/lib/clamav/ --system \
-                    --ingroup clamav --no-create-home -g "ClamAV" clamav
-        /etc/init.d/populate-volatile.sh
-}
-
-# Indicate that the default files are configuration files
-CONFFILES_${PN}-daemon = "${sysconfdir}/clamd.conf \
-                          ${sysconfdir}/default/clamav-daemon"
-CONFFILES_${PN}-freshclam = "${sysconfdir}/freshclam.conf"
-
-INITSCRIPT_PACKAGES = "${PN}-daemon ${PN}-freshclam"
-INITSCRIPT_NAME_${PN}-daemon = "clamav-daemon"
-INITSCRIPT_NAME_${PN}-freshclam = "clamav-freshclam"
-INITSCRIPT_PARAMS_${PN}-daemon = "defaults 50 50"
-INITSCRIPT_PARAMS_${PN}-freshclam = "defaults 50 50"
+PR = "r6"
diff --git a/packages/clamav/clamav_0.88.5.bb b/packages/clamav/clamav_0.88.5.bb
new file mode 100644
index 0000000000..fec4ae59d8
--- /dev/null
+++ b/packages/clamav/clamav_0.88.5.bb
@@ -0,0 +1,3 @@
+require clamav.inc
+
+PR = "r0"
diff --git a/packages/clamav/site/.mtn2git_empty b/packages/clamav/site/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/clamav/site/.mtn2git_empty
+++ /dev/null
diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass
index 162274b89f..fc527b292a 100644
--- a/packages/glibc/glibc-package.bbclass
+++ b/packages/glibc/glibc-package.bbclass
@@ -261,7 +261,7 @@ python package_do_split_gconvs () {
 		cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, treedir, localedef_opts)
 		bb.note("generating locale %s (%s)" % (locale, encoding))
 		if os.system(cmd):
-			raise bb.build.FuncFailed("localedef returned an error.")
+			raise bb.build.FuncFailed("localedef returned an error (command was %s)." % cmd)
 
 	def output_locale(name, locale, encoding):
 		use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1)
diff --git a/packages/libpng/1.2.12/.mtn2git_empty b/packages/libpng/1.2.12/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/libpng/1.2.12/.mtn2git_empty
+++ /dev/null
diff --git a/packages/libpng/libpng-1.2.12/.mtn2git_empty b/packages/libpng/libpng-1.2.12/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/libpng/libpng-1.2.12/.mtn2git_empty
+++ /dev/null
diff --git a/packages/oprofile/oprofile/opcontrol_bashisms.patch b/packages/oprofile/oprofile/opcontrol_bashisms.patch
new file mode 100644
index 0000000000..01ef11df86
--- /dev/null
+++ b/packages/oprofile/oprofile/opcontrol_bashisms.patch
@@ -0,0 +1,16 @@
+ utils/opcontrol |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: oprofile-0.9.2/utils/opcontrol
+===================================================================
+--- oprofile-0.9.2.orig/utils/opcontrol	2006-03-29 22:54:07.000000000 +0100
++++ oprofile-0.9.2/utils/opcontrol	2006-10-12 11:14:39.000000000 +0100
+@@ -485,7 +485,7 @@ validate_separate_args()
+ 	SEPARATE_KERNEL=0
+ 	SEPARATE_THREAD=0
+ 	SEPARATE_CPU=0
+-	while (($i < $#)); do
++	while [ "$i" -lt "$#" ]; do
+ 		shift
+ 		case "$1" in
+ 			lib|library)
diff --git a/packages/oprofile/oprofile_0.9.1.bb b/packages/oprofile/oprofile_0.9.2.bb
index 991c7bfc99..e64aa10d49 100644
--- a/packages/oprofile/oprofile_0.9.1.bb
+++ b/packages/oprofile/oprofile_0.9.2.bb
@@ -6,6 +6,7 @@ DEPENDS = "popt binutils"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \
 	   file://no_arm_mapping_syms.patch;patch=1 \
+           file://opcontrol_bashisms.patch;patch=1 \
 	   file://acinclude.m4"
 S = "${WORKDIR}/oprofile-${PV}"
 
diff --git a/packages/oprofile/oprofile_cvs.bb b/packages/oprofile/oprofile_cvs.bb
index 5818d2ae5c..902c569e85 100644
--- a/packages/oprofile/oprofile_cvs.bb
+++ b/packages/oprofile/oprofile_cvs.bb
@@ -1,12 +1,16 @@
-PV = "0.9.1+cvs${SRCDATE}"
+PV = "0.9.2+cvs${SRCDATE}"
+PR = "r1"
 SECTION = "devel"
 DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \
 of profiling all running code at low overhead."
 LICENSE = "GPL"
 DEPENDS = "popt binutils"
 
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/oprofile;module=oprofile \
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "cvs://anonymous@oprofile.cvs.sourceforge.net/cvsroot/oprofile;module=oprofile \
 	   file://no_arm_mapping_syms.patch;patch=1 \
+           file://opcontrol_bashisms.patch;patch=1 \
 	   file://acinclude.m4"
 S = "${WORKDIR}/oprofile"
 
diff --git a/packages/pine/pine_4.63.bb b/packages/pine/pine_4.64.bb
index 1bcb451f52..1bcb451f52 100644
--- a/packages/pine/pine_4.63.bb
+++ b/packages/pine/pine_4.64.bb
diff --git a/packages/quagga/quagga-0.99.2/.mtn2git_empty b/packages/quagga/quagga-0.99.2/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/quagga/quagga-0.99.2/.mtn2git_empty
+++ /dev/null