Updates and fixes

similarity index 88%
rename from meta/recipes-connectivity/resolvconf/resolvconf_1.62.bb
rename to meta/recipes-connectivity/resolvconf/resolvconf_1.63.bb
index af72199..61f4309 100644
@@ -14,8 +14,8 @@ PR = "r0"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz"
 
-SRC_URI[md5sum] = "5d9656c9d7a2e1304d9d41ed13cf54a4"
-SRC_URI[sha256sum] = "cd00b3757fc73d2729be6e2532ca033ddd5542c4deff451929695bcc3af97c61"
+SRC_URI[md5sum] = "4a62b7ce617518a5567c9e8c47fa7a41"
+SRC_URI[sha256sum] = "5299a5d7a44b8e09fca31fe246aa199cd6938195e597762c1cc97c1f9d93ad38"
 
 inherit allarch
 

similarity index 100%
rename from meta/recipes-support/libiconv/libiconv-1.13.1/autoconf.patch
rename to meta/recipes-support/libiconv/libiconv-1.14/autoconf.patch

similarity index 88%
rename from meta/recipes-support/libiconv/libiconv_1.13.1.bb
rename to meta/recipes-support/libiconv/libiconv_1.14.bb
index 6471e32..5eea823 100644
@@ -13,8 +13,8 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
            file://autoconf.patch \
           "
 
-SRC_URI[md5sum] = "7ab33ebd26687c744a37264a330bbe9a"
-SRC_URI[sha256sum] = "55a36168306089009d054ccdd9d013041bfc3ab26be7033d107821f1c4949a49"
+SRC_URI[md5sum] = "e34509b1623cec449dfeb73d7ce9c6c6"
+SRC_URI[sha256sum] = "72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613"
 
 S = "${WORKDIR}/libiconv-${PV}"
 

index 14a8770..d125616 100644
@@ -1,29 +1,58 @@
-Upstream-Status: Inappropriate [Pending]
-Get this patch from  buildroot maillist.
+Upstream-Status: Submitted
 
-dropbear: fix static build
 
-The latest release 0.53.1 change: lcrypt needs to be before object files for static linking
+dropbear: fix static build
 
-the -lcrypt is missing during the link
+A more appropriate fix is to remove @CRYPTLIB@ from the objs
+line, since it will cause problems with target checking,
+this change also meets the goals of the orignal change which
+was to not link libcrypt to all binaries.
 
 svr-authpasswd.o: In function `svr_auth_password':
 svr-authpasswd.c:(.text+0xfc): undefined reference to `crypt'
 collect2: ld returned 1 exit status
 
-Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
-Signed-off-by: Mei Lei <[email protected]>
+Signed-off-by: Saul Wold <[email protected]>
 
-diff --git a/Makefile.in b/Makefile.in
-index 8d81647..0b9b769 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -77,7 +77,7 @@ STRIP=@STRIP@
- INSTALL=@INSTALL@
- CPPFLAGS=@CPPFLAGS@
- CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@
--LIBS+=@LIBS@
-+LIBS+=@CRYPTLIB@ @LIBS@
- LDFLAGS=@LDFLAGS@
+Index: dropbear-2011.54/Makefile.in
+===================================================================
+--- dropbear-2011.54.orig/Makefile.in	2011-11-08 04:48:15.000000000 -0800
++++ dropbear-2011.54/Makefile.in	2011-12-27 13:44:41.644354442 -0800
+@@ -56,7 +56,7 @@
+ 		loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \
+ 		listener.h fake-rfc2553.h
+ 
+-dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) @CRYPTLIB@ 
++dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS)
+ dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS)
+ dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS)
+ dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS)
+@@ -158,7 +158,10 @@
+ dropbearkey: $(dropbearkeyobjs)
+ dropbearconvert: $(dropbearconvertobjs)
+ 
+-dropbear dbclient dropbearkey dropbearconvert: $(HEADERS) $(LIBTOM_DEPS) Makefile
++dropbear: $(HEADERS) $(LIBTOM_DEPS) Makefile
++	$(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBS) @CRYPTLIB@
++
++dbclient dropbearkey dropbearconvert: $(HEADERS) $(LIBTOM_DEPS) Makefile
+ 	$(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBS)
+ 
+ # scp doesn't use the libs so is special.
+@@ -169,14 +172,14 @@
+ # multi-binary compilation.
+ MULTIOBJS=
+ ifeq ($(MULTI),1)
+-	MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) @CRYPTLIB@ 
++	MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs)))
+ 	CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI
+ endif
+ 
+ dropbearmulti: multilink 
+ 
+ multibinary: $(HEADERS) $(MULTIOBJS) $(LIBTOM_DEPS) Makefile
+-	$(CC) $(LDFLAGS) -o dropbearmulti$(EXEEXT) $(MULTIOBJS) $(LIBS)
++	$(CC) $(LDFLAGS) -o dropbearmulti$(EXEEXT) $(MULTIOBJS) $(LIBS) @CRYPTLIB@
+ 
+ multilink: multibinary $(addprefix link, $(PROGRAMS))
  
- EXEEXT=@EXEEXT@

index b7b4b83..1bd8bda 100644
@@ -3,4 +3,4 @@ require dropbear.inc
 SRC_URI[md5sum] = "ce1e236c4a8df0cb95253defee6716b5"
 SRC_URI[sha256sum] = "a5fe60fa9c11e7b0f6a21ef6e86a53ce3d55236548901905070ff1c1716fbf47"
 
-PR = "r0"
+PR = "r1"

index d036eca..7d8c597 100644
@@ -1,6 +1,6 @@
 require python.inc
 DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 SRC_URI += "file://04-default-is-optimized.patch \
            file://05-enable-ctypes-cross-build.patch \

@@ -11,7 +11,9 @@ SRC_URI += "file://04-default-is-optimized.patch \
            file://debug.patch \
            file://unixccompiler.patch \
            file://nohostlibs.patch \
-           file://multilib.patch "
+           file://multilib.patch \
+           file://add-md5module-support.patch \
+           "
 S = "${WORKDIR}/Python-${PV}"
 
 inherit native

new file mode 100644
index 0000000..33fea77
@@ -0,0 +1,18 @@
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Saul Wold <[email protected]>
+
+Index: Python-2.7.2/Modules/Setup.dist
+===================================================================
+--- Python-2.7.2.orig/Modules/Setup.dist	2011-06-11 08:46:26.000000000 -0700
++++ Python-2.7.2/Modules/Setup.dist	2011-12-27 15:51:41.244623219 -0800
+@@ -248,7 +248,7 @@
+ # Message-Digest Algorithm, described in RFC 1321.  The necessary files
+ # md5.c and md5.h are included here.
+ 
+-#_md5 md5module.c md5.c
++_md5 md5module.c md5.c
+ 
+ 
+ # The _sha module implements the SHA checksum algorithms.

index 5e8e0d7..654c850 100644
@@ -1,7 +1,7 @@
 require python.inc
 DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib"
 DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
-PR = "${INC_PR}.4"
+PR = "${INC_PR}.5"
 
 DISTRO_SRC_URI ?= "file://sitecustomize.py"
 DISTRO_SRC_URI_linuxstdbase = ""

@@ -19,6 +19,7 @@ SRC_URI += "\
   file://cgi_py.patch \
   file://remove_sqlite_rpath.patch \
   file://setup_py_skip_cross_import_check.patch \
+  file://add-md5module-support.patch \
 "
 
 S = "${WORKDIR}/Python-${PV}"

index aa577b3..dfe00f2 100644
@@ -16,7 +16,7 @@ BOOST_VER = "${@"_".join(d.getVar("PV",1).split("."))}"
 BOOST_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}"
 BOOST_P = "boost_${BOOST_VER}"
 
-INC_PR = "r2"
+INC_PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BOOST_P}.tar.bz2"
 

@@ -119,15 +119,14 @@ BJAM_TOOLS   = "-sTOOLS=gcc \
 		'-sGCC_STDLIB_DIRECTORY=${STAGING_LIBDIR}' \
 		'-sNO_BZIP2=1' \
 		'-sNO_ZLIB=1' \
-		'-sBUILD=release <optimization>space <inlining>on <debug-symbols>off' \
+		'-sBUILD=release <optimization>space <threading>multi <inlining>on <debug-symbols>off' \
 		'-sPYTHON_VERSION=${PYTHON_VERSION}' \
 		'--layout=system' \
 		"
 
 BJAM_OPTS    = '${BJAM_TOOLS} \
 		--builddir=${S}/${TARGET_SYS} \
-		--with-python-root=${PYTHON_ROOT} \
-		--without-icu \
+                --disable-icu \
 		${BJAM_EXTRA}'
 
 

@@ -153,6 +152,15 @@ do_install() {
 		--libdir=${D}${libdir} \
 		--includedir=${D}${includedir} \
 		install
+	for lib in ${BOOST_LIBS}; do
+		if [ -e ${D}${libdir}/libboost_${lib}.a ]; then
+			ln -s libboost_${lib}.a ${D}${libdir}/libboost_${lib}-mt.a
+		fi
+		if [ -e ${D}${libdir}/libboost_${lib}.so ]; then
+			ln -s libboost_${lib}.so ${D}${libdir}/libboost_${lib}-mt.so
+		fi
+	done
+
 }
 
 BBCLASSEXTEND = "native"

deleted file mode 100644
index e1e0ca1..0000000
@@ -1,27 +0,0 @@
-include boost.inc
-
-LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
-
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://arm-intrinsics.patch"
-
-SRC_URI[md5sum] = "a2dc343f7bc7f83f8941e47ed4a18200"
-SRC_URI[sha256sum] = "815a5d9faac4dbd523fbcf3fe1065e443c0bbf43427c44aa423422c6ec4c2e31"
-
-BJAM_OPTS    = '${BJAM_TOOLS} \
-                --builddir=${S}/${TARGET_SYS} \
-                ${BJAM_EXTRA}'
-
-# build only mt libraries and install symlinks for compatibility
-BJAM_EXTRA += "threading=multi"
-do_install_append() {
-	for lib in ${BOOST_LIBS}; do
-	    if [ -e ${D}${libdir}/libboost_${lib}.a ]; then
-		ln -s libboost_${lib}.a ${D}${libdir}/libboost_${lib}-mt.a
-	    fi
-	    if [ -e ${D}${libdir}/libboost_${lib}.so ]; then
-		ln -s libboost_${lib}.so ${D}${libdir}/libboost_${lib}-mt.so
-	    fi
-	done
-}

new file mode 100644
index 0000000..29e2153
@@ -0,0 +1,10 @@
+include boost.inc
+
+LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
+
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://arm-intrinsics.patch"
+
+SRC_URI[md5sum] = "d1e9a7a7f532bb031a3c175d86688d95"
+SRC_URI[sha256sum] = "1bf254b2d69393ccd57a3cdd30a2f80318a005de8883a0792ed2f5e2598e5ada"

similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.19.1/MCONFIG
rename to meta/recipes-core/util-linux/util-linux-2.20.1/MCONFIG

similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.19.1/make_include
rename to meta/recipes-core/util-linux/util-linux-2.20.1/make_include

similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.19.1/remove-lscpu.patch
rename to meta/recipes-core/util-linux/util-linux-2.20.1/remove-lscpu.patch

similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.19.1/remove_sigsetmark.patch
rename to meta/recipes-core/util-linux/util-linux-2.20.1/remove_sigsetmark.patch

similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-__progname-conflict.patch
rename to meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-__progname-conflict.patch

similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-compile.patch
rename to meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-compile.patch

similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.19.1/util-linux-ng-2.16-mount_lock_path.patch
rename to meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-2.16-mount_lock_path.patch

similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.19.1/util-linux-ng-replace-siginterrupt.patch
rename to meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-replace-siginterrupt.patch

index acc4a39..5445f4f 100644
@@ -18,7 +18,7 @@ DEPENDS = "zlib ncurses"
 DEPENDS_virtclass-native = " lzo-native"
 
 
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux-ng/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \
+SRC_URI = "ftp://ftp.infradead.org/pub/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \
            file://MCONFIG \
            file://swapargs.h \
            file://defines.h \

@@ -78,9 +78,7 @@ do_compile () {
 	install ${WORKDIR}/make_include ${S}/make_include
 	install ${WORKDIR}/swapargs.h ${S}/mount/swapargs.h
 	install ${WORKDIR}/defines.h ${S}/defines.h
-	oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= \
-		'OPT=${CFLAGS}' 'CC=${CC}' 'LD=${LD}' \
-		'LDFLAGS=${LDFLAGS}'
+	oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}' 
 }
 
 checklink() {

similarity index 84%
rename from meta/recipes-core/util-linux/util-linux_2.19.1.bb
rename to meta/recipes-core/util-linux/util-linux_2.20.1.bb
index 82040ef..a569131 100644
@@ -1,5 +1,5 @@
-MAJOR_VERSION = "2.19"
-PR = "r12"
+MAJOR_VERSION = "2.20"
+PR = "r0"
 require util-linux.inc
 
 # note that `lscpu' is under GPLv3+

@@ -8,11 +8,10 @@ LICENSE_util-linux-lscpu = "GPLv3+"
 SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
             file://util-linux-ng-2.16-mount_lock_path.patch \
             file://uclibc-__progname-conflict.patch \      
-            file://remove_sigsetmark.patch \
 "
 
-SRC_URI[md5sum] = "3eab06f05163dfa65479c44e5231932c"
-SRC_URI[sha256sum] = "d3eac4afcc687b3ae1ffedcab2dc12df84c7ba7045cce31386d2b7040a011c7d"
+SRC_URI[md5sum] = "079b37517fd4e002a2e6e992e8b4e361"
+SRC_URI[sha256sum] = "d16ebcda3e64ab88ed363d9c1242cdb7ccfd5e1f56c83d0c3b0638c23793bbe0"
 
 # Only lscpu part is gplv3; rest of the code is not, 
 # so take out the lscpu parts while running non-gplv3 build.

@@ -42,7 +41,7 @@ addtask remove_lscpu before do_configure after do_patch
 
 # fallocate is glibc 2.10, fallocate64 is glibc 2.11
 # we need to disable it for older versions
-EXTRA_OECONF += "ac_cv_func_fallocate=no"
+EXTRA_OECONF += "ac_cv_func_fallocate=no scanf_cv_type_modifier=as"
 EXTRA_OECONF_virtclass-native += "--disable-fallocate --disable-use-tty-group"
 
 do_install_append () {

index c6c1f0d..a26d89a 100644
@@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "3f8ac1fedd7c4bec480afcbe4acabdd4ac59ec0446a0fd50c8975cd0aa
 
 PARALLEL_MAKE = ""
 
-EXTRA_OECONF += " --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid"
+EXTRA_OECONF += " --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid --disable-uuidd"
 EXTRA_OECONF_darwin = "--sbindir=${base_sbindir} --enable-bsd-shlibs"
 EXTRA_OECONF_darwin8 = "--sbindir=${base_sbindir} --enable-bsd-shlibs"
 

similarity index 100%
rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.12/rxvt.desktop
rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.14/rxvt.desktop

similarity index 100%
rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.12/rxvt.png
rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.14/rxvt.png

similarity index 100%
rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.12/xwc.patch
rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.14/xwc.patch

similarity index 88%
rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.12.bb
rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.14.bb
index 5625245..c349249 100644
@@ -1,14 +1,15 @@
 SECTION = "x11/utils"
-DEPENDS = "virtual/libx11 libxt libxft"
 DESCRIPTION = "rxvt-unicode is a clone of the well known \
 terminal emulator rxvt, modified to store text in Unicode \
 (either UCS-2 or UCS-4) and to use locale-correct input and \
 output. It also supports mixing multiple fonts at the \
 same time, including Xft fonts."
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://src/main.C;beginline=1;endline=31;md5=775485398a09fa7aee6f90464af88432"
 
+DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf"
+
 PR = "r0"
 
 SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \

@@ -16,8 +17,8 @@ SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2
 	   file://rxvt.desktop \
 	   file://rxvt.png"
 
-SRC_URI[md5sum] = "945af37d661c8c45a7cac292160e7c70"
-SRC_URI[sha256sum] = "1db334204bfb264b3134e01d9d3cf446c5ac7d47514909435f914f3906f37e7e"
+SRC_URI[md5sum] = "022235a9a8b012c29e72c49177be6ce4"
+SRC_URI[sha256sum] = "29928a33be6b3fb0edd126df2c3d35e1900f8268b546ce54430780c550fa1d52"
 
 inherit autotools update-alternatives
 

index ab18e12..ba07fed 100644
@@ -477,6 +477,7 @@ RECIPE_LATEST_RELEASE_DATE_pn-openssl = "Sep 06, 2010"
 RECIPE_LAST_UPDATE_pn-openssl = "Nov 28, 2011"
 RECIPE_MAINTAINER_pn-openssl = "Saul Wold <[email protected]>"
 RECIPE_INTEL_SECTION_pn-openssl = "base libs"
+RECIPE_NO_UPDATE_REASON_pn-openssl = "1.0.0e is latest"
 
 RECIPE_STATUS_pn-libnss-mdns = "green"
 DISTRO_PN_ALIAS_pn-libnss-mdns = "Meego=nss-mdns OpenSuSE=nss-mdns Ubuntu=nss-mdns Mandriva=nss_mdns Debian=nss-mdns"

@@ -504,7 +505,7 @@ RECIPE_LATEST_RELEASE_DATE_pn-popt = "May 01, 2010"
 RECIPE_STATUS_pn-sqlite3 = "green"   # need upgrade
 RECIPE_LATEST_VERSION_pn-sqlite3 = "3.7.9"
 RECIPE_LATEST_RELEASE_DATE_pn-sqlite3 = "Nov 01, 2011"
-RECIPE_LAST_UPDATE_pn-sqlite3 = "Dec 01, 2011"
+RECIPE_LAST_UPDATE_pn-sqlite3 = "Dec 27, 2011"
 RECIPE_MANUAL_CHECK_DATE_pn-sqlite3= "Dec 01, 2011"
 RECIPE_MAINTAINER_pn-sqlite3 = "Saul Wold <[email protected]>"
 RECIPE_DEPENDENCY_CHECK_pn-sqlite3 = "not done"

@@ -533,7 +534,7 @@ RECIPE_STATUS_pn-libcap = "yellow"   # hand crafted Makefiles
 RECIPE_LATEST_VERSION_pn-libcap = "2.22"
 RECIPE_LATEST_RELEASE_DATE_pn-libcap = "Jan 01, 2010"
 RECIPE_LAST_UPDATE_pn-libcap = "Jul 25, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-libcap = "Dec 15, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-libcap = "Dec 27, 2011"
 RECIPE_MAINTAINER_pn-libcap = "Saul Wold <[email protected]>"
 RECIPE_DEPENDENCY_CHECK_pn-libcap = "done"
 RECIPE_INTEL_SECTION_pn-libcap = "base libs"

@@ -591,7 +592,7 @@ RECIPE_DEPENDENCY_CHECK_pn-libcheck = "done"
 RECIPE_LATEST_VERSION_pn-libcheck = "0.9.8"
 RECIPE_LATEST_RELEASE_DATE_pn-libcheck = "Sep 23, 2009"
 RECIPE_LAST_UPDATE_pn-libcheck = "Aug 20, 2010"
-RECIPE_MANUAL_CHECK_DATE_pn-libcheck = "Dec 01, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-libcheck = "Dec 27, 2011"
 RECIPE_MAINTAINER_pn-libcheck = "Saul Wold <[email protected]>"
 RECIPE_INTEL_SECTION_pn-libcheck = "base libs"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libcheck = "9 months"

@@ -1293,7 +1294,7 @@ RECIPE_LATEST_VERSION_pn-console-tools = "0.3.2"
 RECIPE_LAST_UPDATE_pn-console-tools = "Jul 21, 2006"
 RECIPE_MAINTAINER_pn-console-tools = "Saul Wold <[email protected]>"
 DISTRO_PN_ALIAS_pn-console-tools = "Debian=console-tools Ubuntu=console-tools"
-RECIPE_MANUAL_CHECK_DATE_pn-console-tools= "Dec 01, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-console-tools= "Dec 27, 2011"
 
 RECIPE_STATUS_pn-fuse = "red"
 RECIPE_LATEST_VERSION_pn-fuse = "2.8.4"

@@ -1334,7 +1335,7 @@ RECIPE_MAINTAINER_pn-pm-utils = "Dongxiao Xu <[email protected]>"
 RECIPE_STATUS_pn-psmisc = "red"
 RECIPE_LATEST_VERSION_pn-psmisc = "22.14"
 RECIPE_LATEST_RELEASE_DATE_pn-psmisc = "Jun 20, 2011"
-RECIPE_LAST_UPDATE_pn-psmisc = "Dec 01, 2011"
+RECIPE_LAST_UPDATE_pn-psmisc = "Dec 27, 2011"
 RECIPE_MANUAL_CHECK_DATE_pn-psmisc = "Dec 01, 2011"
 RECIPE_MAINTAINER_pn-psmisc = "Saul Wold <[email protected]>"
 

@@ -1342,7 +1343,7 @@ RECIPE_STATUS_pn-boost = "yellow"
 RECIPE_LATEST_VERSION_pn-boost = "1.47.0"
 RECIPE_LATEST_RELEASE_DATE_pn-boost = "Jul 12, 2011"
 RECIPE_LAST_UPDATE_pn-boost = "Aug 19, 2010"
-RECIPE_MANUAL_CHECK_DATE_pn-boost = "Dec 01, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-boost = "Dec 27, 2011"
 RECIPE_MAINTAINER_pn-boost = "Saul Wold <[email protected]>"
 
 RECIPE_STATUS_pn-boost-jam-native = "green"

@@ -1489,8 +1490,8 @@ RECIPE_LAST_UPDATE_pn-sysfsutils = "Jun 18, 2010"
 RECIPE_DEPENDENCY_CHECK_pn-sysfsutils = "not done"
 RECIPE_INTEL_SECTION_pn-sysfsutils = "base utils"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-sysfsutils = "n/a"
-RECIPE_MANUAL_CHECK_DATE_pn-sysfsutils = "Dec 01, 2011"
-RECIPE_COMMENTS_pn-sysfsutils = ""
+RECIPE_MANUAL_CHECK_DATE_pn-sysfsutils = "Dec 27, 2011"
+RECIPE_COMMENTS_pn-sysfsutils = "No update on kernel.org"
 RECIPE_MAINTAINER_pn-sysfsutils = "Saul Wold <[email protected]>"
 
 RECIPE_STATUS_pn-curl = "green"

@@ -1542,7 +1543,7 @@ RECIPE_STATUS_pn-less = "green"
 RECIPE_LATEST_VERSION_pn-less = "444"
 RECIPE_LATEST_RELEASE_DATE_pn-less = "Jun 9, 2011"
 RECIPE_LAST_UPDATE_pn-less = "Dec 01, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-less = "Dec 01, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-less = "Dec 27, 2011"
 RECIPE_MAINTAINER_pn-less = "Saul Wold <[email protected]>"
 RECIPE_DEPENDENCY_CHECK_pn-less = "done"
 RECIPE_INTEL_SECTION_pn-less = "base utils"

@@ -1700,7 +1701,7 @@ RECIPE_MAINTAINER_pn-zip = "Saul Wold <[email protected]>"
 RECIPE_DEPENDENCY_CHECK_pn-zip = "not done"
 RECIPE_INTEL_SECTION_pn-zip = "base utils"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-zip = "21 months"
-RECIPE_MANUAL_CHECK_DATE_pn-zip = "Dec 01, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-zip = "Dec 27, 2011"
 RECIPE_COMMENTS_pn-zip = ""
 
 RECIPE_STATUS_pn-strace = "green"

@@ -1789,7 +1790,7 @@ RECIPE_LATEST_RELEASE_DATE_pn-shared-mime-info = "Feb 01, 2010"
 RECIPE_STATUS_pn-util-linux = "green"
 RECIPE_LATEST_VERSION_pn-util-linux = "2.20.1"
 RECIPE_LATEST_RELEASE_DATE_pn-util-linux = "Nov 07, 2011"
-RECIPE_LAST_UPDATE_pn-util-linux = "Dec 01, 2011"
+RECIPE_LAST_UPDATE_pn-util-linux = "Dec 27, 2011"
 RECIPE_MAINTAINER_pn-util-linux = "Saul Wold <[email protected]>"
 RECIPE_INTEL_SECTION_pn-util-linux = "base utils"
 RECIPE_MANUAL_CHECK_DATE_pn-util-linux = "Dec 01, 2011"

@@ -1799,12 +1800,12 @@ RECIPE_STATUS_pn-usbutils = "green"
 RECIPE_LATEST_VERSION_pn-usbutils = "0.91"
 RECIPE_LATEST_RELEASE_DATE_pn-usbutils = "Oct 22, 2010"
 RECIPE_LAST_UPDATE_pn-usbutils = "May 20, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-usbutils = "May 24, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-usbutils = "Dec 27, 2011"
 RECIPE_MAINTAINER_pn-usbutils = "Saul Wold <[email protected]>"
 RECIPE_DEPENDENCY_CHECK_pn-usbutils = "done"
 RECIPE_INTEL_SECTION_pn-usbutils = "base utils"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-usbutils = "2 months"
-RECIPE_COMMENTS_pn-usbutils = ""
+RECIPE_COMMENTS_pn-usbutils = "No update on kernel.org"
 
 RECIPE_STATUS_pn-pciutils = "yellow"    # custom build system, several hacks
 RECIPE_LAST_UPDATE_pn-pciutils = "Nov 10, 2010"

@@ -1843,7 +1844,7 @@ DISTRO_PN_ALIAS_pn-zypper = "OpenSuse=zypper Meego=zypper"
 RECIPE_STATUS_pn-sysstat = "green"
 RECIPE_LATEST_VERSION_pn-sysstat = "10.0.3"
 RECIPE_LATEST_RELEASE_DATE_pn-sysstat = "Nov 27, 2011"
-RECIPE_LAST_UPDATE_pn-sysstat = "Dec 01, 2011"
+RECIPE_LAST_UPDATE_pn-sysstat = "Dec 27, 2011"
 RECIPE_MANUAL_CHECK_DATE_pn-sysstat = "Dec 01, 2011"
 RECIPE_MAINTAINER_pn-sysstat = "Saul Wold <[email protected]>"
 

@@ -1877,7 +1878,7 @@ RECIPE_STATUS_pn-cracklib="green"
 RECIPE_LATEST_VERSION_pn-cracklib="2.8.18"
 RECIPE_LATEST_RELEASE_DATE_pn-cracklib = "Aug 29, 2010"
 RECIPE_LAST_UPDATE_pn-cracklib = "Nov 13, 2010"
-RECIPE_MANUAL_CHECK_DATE_pn-cracklib = "Dec 01, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-cracklib = "Dec 27, 2011"
 RECIPE_MAINTAINER_pn-cracklib="Saul Wold <[email protected]>"
 
 RECIPE_STATUS_pn-openobex = "red"

@@ -1908,11 +1909,11 @@ RECIPE_MANUAL_CHECK_DATE_pn-parted = "Nov 22, 2011"
 RECIPE_MAINTAINER_pn-parted = "Zhai Edwin <[email protected]>"
 
 RECIPE_STATUS_pn-resolvconf = "green"
-RECIPE_LATEST_VERSION_pn-resolvconf = "1.62"
-RECIPE_LATEST_RELEASE_DATE_pn-resolvconf = "Nov 30, 2011"
-RECIPE_LAST_UPDATE_pn-resolvconf = "Dec 01, 2011"
+RECIPE_LATEST_VERSION_pn-resolvconf = "1.63"
+RECIPE_LATEST_RELEASE_DATE_pn-resolvconf = "Dec 18, 2011"
+RECIPE_LAST_UPDATE_pn-resolvconf = "Dec 28, 2011"
 RECIPE_MAINTAINER_pn-resolvconf = "Saul Wold <[email protected]>"
-RECIPE_MANUAL_CHECK_DATE_pn-resolvconf = "Dec 01, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-resolvconf = "Dec 28, 2011"
 RECIPE_COMMENTS_pn-resolvconf = ""
 
 RECIPE_STATUS_pn-openswan = "red"

@@ -1963,7 +1964,7 @@ RECIPE_STATUS_pn-libexif = "green"
 RECIPE_LATEST_VERSION_pn-libexif = "0.6.20"
 RECIPE_LATEST_RELEASE_DATE_pn-libexif = "Dec 12, 2010"
 RECIPE_LAST_UPDATE_pn-libexif = "Apr 15, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-libexif = "Dec 01, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-libexif = "Dec 27, 2011"
 RECIPE_MAINTAINER_pn-libexif = "Saul Wold <[email protected]>"
 
 RECIPE_STATUS_pn-setserial = "red"

@@ -3481,7 +3482,7 @@ RECIPE_INTEL_SECTION_pn-qemugl="graphic app"
 RECIPE_LAST_UPDATE_pn-qemugl = "Nov 28, 2010"
 RECIPE_NO_UPDATE_REASON_pn-qemugl = "Do not upgrade to version: 33466cd8 because the upstream is broken in x86_64 build"
 RECIPE_MAINTAINER_pn-qemugl="Saul Wold <[email protected]>"
-RECIPE_MANUAL_CHECK_DATE_pn-qemugl= "Dec 01, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-qemugl= "Dec 27, 2011"
 
 RECIPE_STATUS_pn-fotowall="green" # no update needed
 RECIPE_LATEST_VERSION_pn-fotowall="0.9"

@@ -5763,7 +5764,7 @@ RECIPE_MAINTAINER_pn-glew = "Saul Wold <[email protected]>"
 RECIPE_LATEST_VERSION_pn-squashfs-tools = "4.2"
 RECIPE_LATEST_RELEASE_DATE_pn-squashfs-tools = "Feb 28, 2011"
 RECIPE_LAST_UPDATE_pn-squashfs-tools = "Oct 21, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-squashfs-tools = "Dec 01, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-squashfs-tools = "Dec 27, 2011"
 RECIPE_MAINTAINER_pn-squashfs-tools = "Saul Wold <[email protected]>"
 
 RECIPE_LATEST_VERSION_pn-mpeg2dec = "0.5.1"

@@ -5774,14 +5775,14 @@ RECIPE_MAINTAINER_pn-squashfs-tools = "Saul Wold <[email protected]>"
 RECIPE_LATEST_VERSION_pn-lame = "3.99.3"
 RECIPE_LATEST_RELEASE_DATE_pn-lame = "Nov 26, 2011"
 RECIPE_LAST_UPDATE_pn-lame = "Nov 28, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-lame = "Dec 01, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-lame = "Dec 27, 2011"
 DISTRO_PN_ALIAS_pn-lame = "Debian=lame Ubuntu=lame"
 RECIPE_MAINTAINER_pn-lame = "Saul Wold <[email protected]>"
 
 RECIPE_LATEST_VERSION_pn-libmad = "0.15.1b"
 RECIPE_LATEST_RELEASE_DATE_pn-libmad = "Feb 18, 2004"
 RECIPE_LAST_UPDATE_pn-libmad = "Jul 04, 2006"
-RECIPE_MANUAL_CHECK_DATE_pn-libmad = "Dec 01, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-libmad = "Dec 27, 2011"
 RECIPE_MAINTAINER_pn-libmad = "Saul Wold <[email protected]>"
 
 RECIPE_LATEST_VERSION_pn-libxml-perl = "0.08"

@@ -5789,7 +5790,7 @@ RECIPE_LATEST_VERSION_pn-libxml-perl = "0.08"
 RECIPE_LATEST_VERSION_pn-lsb = "1.4"
 RECIPE_LAST_UPDATE_pn-lsb = "Nov 04, 2010"
 RECIPE_LATEST_RELEASE_DATE_pn-lsb = "Jan 04, 2001"
-RECIPE_MANUAL_CHECK_DATE_pn-lsb = "Dec 01, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-lsb = "Dec 27, 2011"
 RECIPE_NO_UPDATE_REASON_pn-lsb = "1.4 is fixed version of LSB Test"
 RECIPE_MAINTAINER_pn-lsb = "Saul Wold <[email protected]>"
 

index e6da2ea..ffebf2b 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 Index: openswan-2.4.7/Makefile.inc
 ===================================================================
 --- openswan-2.4.7.orig/Makefile.inc	2006-12-25 18:05:40.608503250 +0100

index e3cc876..92f3547 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 --- openswan-2.2.0.orig/programs/Makefile.program	2004-06-03 03:06:27.000000000 +0200
 +++ openswan-2.2.0/programs/Makefile.program	2005-03-05 13:50:19.000000000 +0100
 @@ -30,10 +30,6 @@

index b3863a5..c24227c 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 diff -Nru openswan-2.4.7.orig/doc/Makefile openswan-2.4.7/doc/Makefile
 --- openswan-2.4.7.orig/doc/Makefile	2005-11-08 23:32:45.000000000 +0200
 +++ openswan-2.4.7/doc/Makefile	2006-12-06 22:46:54.732830840 +0200

index 16084e6..1d9ea43 100644
@@ -1,3 +1,5 @@
+
+Upstream-Status: Inappropriate [configuration]
 --- wbxml2-0.9.2/Makefile.am.old	2007-01-03 19:50:24.000000000 +0000
 +++ wbxml2-0.9.2/Makefile.am	2007-01-03 19:50:39.000000000 +0000
 @@ -24,9 +24,9 @@

index aeb02ab..64a9aff 100644
@@ -3,6 +3,8 @@
  gcalctool/Makefile.am |    2 --
  2 files changed, 1 insertion(+), 3 deletions(-)
 
+Upstream-Status: Inappropriate [configuration]
+
 Index: gcalctool-5.8.17/gcalctool/Makefile.am
 ===================================================================
 --- gcalctool-5.8.17.orig/gcalctool/Makefile.am	2005-12-19 15:46:57.000000000 +0000

index c703100..7fbbe28 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 --- fribidi-0.10.4/configure.in~	2002-05-19 11:06:48.000000000 +0100
 +++ fribidi-0.10.4/configure.in	2004-08-03 17:42:28.000000000 +0100
 @@ -50,7 +50,7 @@

index 95b636d..4251138 100644
@@ -1,7 +1,8 @@
 
 #
 # Patch managed by http://www.holgerschurig.de/patcher.html
-#
+# 
+Upstream-Status: Inappropriate [configuration]
 
 --- openobex-1.2/apps/Makefile.am~disable-cable-test
 +++ openobex-1.2/apps/Makefile.am

index 20ac70b..18841a8 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 Index: openobex-1.5/acinclude.m4
 ===================================================================
 --- openobex-1.5.orig/acinclude.m4	2009-02-08 18:30:22.000000000 +0000

index c9ad668..bca75fb 100644
@@ -1,4 +1,4 @@
-UpstreamStatus: Pending
+Upstream-Status: Pending
 
 Used the cross strip instead of host strip to avoid this build error:
 

index c231d75..44ad768 100644
@@ -6,7 +6,7 @@ Subject: [PATCH] Disable building of alg-test
 alg-test utility depends on linux/if_alg.h header that is only
 available on kernels >= 2.6.39.
 
-Upstream Status: Inappropriate [configuration]
+Upstream-Status: Inappropriate [configuration]
 
 Signed-off-by: Otavio Salvador <[email protected]>
 ---

index d0c05d7..6dae2aa 100644
@@ -3,7 +3,7 @@ will shut down all the networking when it starts without any configuration
 which is usualy not what the users expects. This is particularly
 problematic with our qemu images and runtime testing using qemu.
 
-Upstream Status: Inappropriate [Configuration]
+Upstream-Status: Inappropriate [Configuration]
 
 RP 2011/12/12
 

index 083547a..7bc8caf 100644
@@ -11,6 +11,8 @@ CDPATH="${ZSH_VERSION+.}:" && cd . && perllibdir="automake-1.11.1/lib:./lib" "au
 /bin/sh: automake-1.11.1/aclocal: No such file or directory
 make: *** [aclocal.m4] Error 127
 
+Upstream-Status: Pending
+
 Signed-off-by: Tom Rini <[email protected]>
 
 Index: automake-1.11.1/m4/tar.m4

index 510f12e..9d7f732 100644
@@ -1,4 +1,4 @@
-UpstreamStatus: Inappropriate
+Upstream-Status: Inappropriate
 
 This patch fixes populated dosfs image creation with directory 
 structures. Earlier it was causing segfault; and only image 

index 21ebc10..6ee3f7f 100644
@@ -4,7 +4,7 @@ broken images with the -d option. It can still be enabled on the commandline
 at the users own risk. This changes us back to the 2.10 version's behaviour
 which was known to work well even with large images.
 
-Upstream Status: Inapprioriate [depends on other patches we apply]
+Upstream-Status: Inapproriate [depends on other patches we apply]
 
 RP 2011/12/13
 

index 6fd38e5..1281d12 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 --- trunk/libopkg/opkg_download.c	2011-03-10 16:41:29.000000000 +0800
 +++ trunk/libopkg/opkg_download.c	2011-03-10 16:42:33.000000000 +0800
 @@ -162,6 +162,7 @@

index 476d091..2eb9abd 100644
@@ -1,3 +1,6 @@
+
+Upstream-Status: Inappropriate [configuration]
+
 Index: intltool-0.40.6/intltool.m4
 ===================================================================
 --- intltool-0.40.6.orig/intltool.m4	2009-02-14 14:12:28.000000000 -0800

index 435e74e..b679f8b 100644
@@ -6,7 +6,7 @@ Subject: ipkg-utils: Make arfile.py handle six digit UIDs
     as a single field.  This makes things better than before as it now honors
     the fixed field widths.
     
-Upsteam-status: Pending (there is no upstream after openmoko imploded)
+Upstream-Status: Pending (there is no upstream after openmoko imploded)
 
 --- ipkg-utils/arfile.py.orig	2010-09-29 13:38:15.000000000 -0700
 +++ ipkg-utils/arfile.py	2010-10-01 16:06:00.000000000 -0700

index 6faa7a2..f9223a8 100644
@@ -1,6 +1,8 @@
 Due to disabling the LD_LIBRARY_PATH handling, we need to use a static
 libsqlite.
 
+Upstream-Status: Inappropriate [configuration]
+
 diff -ur git.orig/Makefile.in git/Makefile.in
 --- git.orig/Makefile.in
 +++ git/Makefile.in

index f8d7aee..0526031 100644
@@ -16,6 +16,9 @@ The python recipe building was failing because python-native
 could not handle sys.lib var. sys.lib var is defined in the 
 multilib patch hence added this multilib.patch for python-native 
 recipe.
+
+Upstream-Status: Inappropriate [oe-specific]
+
 Signed-Off-By: Nitin A Kamble <[email protected]>
 
 Index: Python-2.7.2/Include/pythonrun.h

index babff12..df470f7 100644
@@ -12,6 +12,9 @@ Date:   Tue Jun 28 21:21:29 2011 +0800
 
 2011/09/29
 Rebased for python 2.7.2
+
+Upstream-Status: Inappropriate [configuration]
+
 Signed-Off-By: Nitin A Kamble <[email protected]>
 
 Index: Python-2.7.2/Include/pythonrun.h

index 92c534e..6aa072d 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 diff --git a/rpmdb/rpmdb.h b/rpmdb/rpmdb.h
 index 0e1bdd7..8b522bb 100644
 --- a/rpmdb/rpmdb.h

index 69b7130..3663692 100644
@@ -1,3 +1,6 @@
+
+Upstream-Status: Inappropriate [configuration]
+
 Index: rpm-5.1.9/configure.ac
 ===================================================================
 --- rpm-5.1.9.orig/configure.ac	2009-04-18 17:47:02.000000000 +0100

index 30c5f7b..5e93517 100644
@@ -4,6 +4,8 @@ configure.ac:11: error: m4_divert_push: cannot change diversion to `GROW' inside
 
 without this patch.
 
+Upstream-Status: Pending
+
 Signed-off-by: Mark Hatle <[email protected]>
 
 diff -ur rpm-5.1.10.orig/configure.ac rpm-5.1.10/configure.ac

index 323bb71..5fe6ded 100644
@@ -2,6 +2,8 @@ Remove the sanity checking from the rpm autogen.sh.  This is required because
 we may have slightly different, but yet compatible versions.  If we do end
 up breaking things, we'll deal with it at that time.
 
+Upstream-Status: Pending
+
 Signed-off-by: Mark Hatle <[email protected]>
 
 diff -ur rpm-5.4.0.orig/autogen.sh rpm-5.4.0/autogen.sh

index 3619058..3aac116 100644
@@ -14,6 +14,8 @@ This patch changes the list of supported items to:
   <arch>-<vendor>-<os>
   <arch>-<vendor>-<os>-<extension>
 
+Upstream-Status: Pending
+
 Signed-off-by: Mark Hatle <[email protected]>
 
 Index: rpm-5.4.0/lib/rpmrc.c

index d1e4bf6..1f948cd 100644
@@ -7,6 +7,8 @@ Note: this is a temporary workaround.  Eventually we will want to have a way
 to seed per-file dependency and other information in order to generate a
 package from previously determined information.
 
+Upstream-Status: Pending
+
 Signed-off-by: Mark Hatle <[email protected]>
 
 diff --git a/lib/rpmfc.c b/lib/rpmfc.c

index 829399c..b5ff263 100644
@@ -2,6 +2,8 @@ During installation, the libtool relink attempts to link to -lrpm...
 The problem is that it hasn't been installed yet!  So small change causes
 the libtool to instead use the build version.
 
+Upstream-Status: Pending
+
 Signed-off-by: Mark Hatle <[email protected]>
 
 --- rpm-5.4.0/lib/Makefile.am.orig

index aafa416..babafb3 100644
@@ -1,3 +1,6 @@
+
+Upstream-Status: Inappropriate [configuration]
+
 diff --git a/rpmdb/DB_CONFIG.in b/rpmdb/DB_CONFIG.in
 index 8b94c94..e0b4689 100644
 --- a/rpmdb/DB_CONFIG.in

index 4aded75..d81e25a 100644
@@ -1,5 +1,7 @@
 lib/order.c: Make the dependency loop messages into debug msgs
 
+Upstream-Status: Pending
+
 Signed-off-by: Mark Hatle <[email protected]>
 
 diff -urN rpm-5.4.0.orig/lib/order.c rpm-5.4.0/lib/order.c

index 33039ad..f6e5828 100644
@@ -1,5 +1,7 @@
 Backport from RPM 5.4.1 CVS, disabled fsync.
 
+Upstream-Status: Backport
+
 Signed-off-by: Mark Hatle <[email protected]>
 
 diff -ur rpm-5.4.0.orig/CHANGES rpm-5.4.0/CHANGES

index 09a1c13..7b81857 100644
@@ -1,5 +1,7 @@
 Fix up platform and related sysinfo file loading.
 
+Upstream-Status: Pending
+
 This ensures that RPM knows the compatible set of package types at all times.
 
 Signed-off-by: Mark Hatle <[email protected]>

index 5051ce6..b38b34d 100644
@@ -1,5 +1,7 @@
 Workaround for a memory leak in --showrc.
 
+Upstream-Status: Pending
+
 Signed-off-by: Mark Hatle <[email protected]>
 
 diff -ur rpm-5.4.0.orig/lib/rpmrc.c rpm-5.4.0/lib/rpmrc.c

index 5c1819c..d6f43a2 100644
@@ -4,6 +4,8 @@ Previously the max was set to 5, up this to 20... this should be more
 then enough for now.. also add an RPM_ERROR message in case we exceed the
 new maximum.
 
+Upstream-Status: Pending
+
 Signed-off-by: Mark Hatle <[email protected]>
 
 diff -urN rpm-5.4.0.orig/rpmio/rpmbag.c rpm-5.4.0/rpmio/rpmbag.c

index 9e7bba0..dd8d8bd 100644
@@ -1,5 +1,5 @@
 Source: None
-Status: Needs to go Upstream
+Upstream-Status: Pending
 Author: Khem Raj <[email protected]>
 Date: 2011-03-03
 Description:

index 9bca528..99962af 100644
@@ -2,6 +2,7 @@ sigmask is a macro which is dropped if BSD compatibility is
 not enabled. So we check if the macro does not exist then
 we define it to __sigmask
 
+Upstream-Status: Inappropriate [configuration]
 Signed-off-by: Khem Raj <[email protected]>
 
 Index: strace-4.5.20/signal.c

index 67b8547..ea00157 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 Index: gobject-introspection-0.9.10/tools/g-ir-annotation-tool.in
 ===================================================================
 --- gobject-introspection-0.9.10.orig/tools/g-ir-annotation-tool.in

index b4ca49d..b5b2ec4 100644
@@ -1,7 +1,7 @@
 Using @PYTHON@ for this path would result in the build system python being 
 referred to. Instead we want to locate python from the environment.
 
-Upstream Status: Inappropriate [configuration]
+Upstream-Status: Inappropriate [configuration]
 
 diff -ruN libglade-2.6.4-orig//libglade-convert.in libglade-2.6.4/libglade-convert.in
 --- libglade-2.6.4-orig//libglade-convert.in	2011-09-22 10:18:28.991164003 +0800

index c6a06ed..c0f5fb0 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 Index: git/Makefile
 ===================================================================
 --- git.orig/Makefile	2010-11-22 11:20:14.303472770 -0600

index 2f7d809..1120617 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 Index: git/Makefile
 ===================================================================
 --- git.orig/Makefile	2011-11-02 14:52:17.243104779 -0700

index e0ad999..d07335a 100644
@@ -1,3 +1,6 @@
+
+Upstream-Status: Inappropriate [configuration]
+
 Index: tools/perf/Makefile
 ===================================================================
 --- a/tools/perf/Makefile	2011-01-14 14:17:33.127008554 -0600

index 60e7f70..c53ac64 100644
@@ -1,3 +1,6 @@
+
+Upstream-Status: Pending
+
 Index: git/util.h
 ===================================================================
 --- git.orig/util.h	2010-12-07 22:41:57.156243001 -0600

index 84f968e..e055b8a 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 Index: git/util.h
 ===================================================================
 --- git.orig/util.h	2010-12-08 01:22:44.486243001 -0600

index 88f414a..d59d12e 100644
@@ -2,6 +2,8 @@ Allow LIB_INSTALL_DIR to be set by the the cmake configure invocation.  We dont
 easily have a way of determining something that patches ${LIB_SUFFIX} so we'll
 set LIB_INSTALL_DIR.
 
+Upstream-Status: Inappropriate [configuration]
+
 Signed-off-by: Kumar Gala <[email protected]>
 
 Index: libmusicbrainz-3.0.3/CMakeLists.txt

index a96136f..329c880 100644
@@ -1,4 +1,4 @@
-UpstreamStatus: Pending
+Upstream-Status: Pending
 
 When LONG_MIN is passed to val, -val is undefined.  This patch fixes
 it.  See for details: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50066