dpkg: upgrade to version 1.15.8.5

Rebase several patches to fit the latest version
Fix a compile issue related with snprintf.
Reset PR in dpkg.inc

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Saul Wold <Saul.Wold@intel.com>

5 files changed, 50 insertions, 27 deletions

diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index 7a4a1a607a..c3ee244d7d 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -1,11 +1,10 @@
 DESCRIPTION = "Package maintenance system for Debian."
 LICENSE = "GPL"
 SECTION = "base"
-PR = "r7"
+PR = "r0"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz \
-           file://ignore_extra_fields.patch;patch=1 \
-           file://noupdalt.patch;patch=1"
+SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.bz2 \
+           file://ignore_extra_fields.patch;patch=1"
 
 DEPENDS = "zlib bzip2"
 DEPENDS_virtclass-native = "bzip2-native zlib-native virtual/update-alternatives-native gettext-native"
diff --git a/meta/recipes-devtools/dpkg/dpkg/check_snprintf.patch b/meta/recipes-devtools/dpkg/dpkg/check_snprintf.patch
new file mode 100644
index 0000000000..7673cf1bd7
--- /dev/null
+++ b/meta/recipes-devtools/dpkg/dpkg/check_snprintf.patch
@@ -0,0 +1,32 @@
+diff -ruN dpkg-1.15.8.5-orig/m4/dpkg-funcs.m4 dpkg-1.15.8.5/m4/dpkg-funcs.m4
+--- dpkg-1.15.8.5-orig/m4/dpkg-funcs.m4	2010-10-08 12:27:15.082131611 +0800
++++ dpkg-1.15.8.5/m4/dpkg-funcs.m4	2010-10-08 13:56:50.074284346 +0800
+@@ -27,7 +27,7 @@
+ # -----------------------
+ # Define HAVE_C99_SNPRINTF if we have C99 snprintf family semantics
+ AC_DEFUN([DPKG_FUNC_C99_SNPRINTF],
+-[AC_CACHE_CHECK([for C99 snprintf functions], [dpkg_cv_c99_snprintf],
++[AC_CACHE_CHECK([for C99 snprintf functions], [ac_cv_func_snprintf_c99],
+ 	[AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -58,14 +58,14 @@
+ 	return 0;
+ }
+ 	]])],
+-	[dpkg_cv_c99_snprintf=yes],
+-	[dpkg_cv_c99_snprintf=no],
+-	[dpkg_cv_c99_snprintf=no])])
+-AS_IF([test "x$dpkg_cv_c99_snprintf" = "xyes"],
++	[ac_cv_func_snprintf_c99=yes],
++	[ac_cv_func_snprintf_c99=no],
++	[ac_cv_func_snprintf_c99=no])])
++AS_IF([test "x$ac_cv_func_snprintf_c99" = "xyes"],
+ 	[AC_DEFINE([HAVE_C99_SNPRINTF], 1,
+ 	           [Define to 1 if the 'snprintf' family is C99 conformant])],
+ 	)
+-AM_CONDITIONAL(HAVE_C99_SNPRINTF, [test "x$dpkg_cv_c99_snprintf" = "xyes"])
++AM_CONDITIONAL(HAVE_C99_SNPRINTF, [test "x$ac_cv_func_snprintf_c99" = "xyes"])
+ ])# DPKG_FUNC_C99_SNPRINTF
+ 
+ # DPKG_MMAP
diff --git a/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch b/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch
index d09343c6e5..27b4f3b004 100644
--- a/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch
@@ -1,11 +1,7 @@
- dpkg-deb/build.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- dpkg-1.14.19.orig/dpkg-deb/build.c
-+++ dpkg-1.14.19/dpkg-deb/build.c
-@@ -241,18 +241,18 @@ void do_build(const char *const *argv) {
-     if (checkedinfo->priority == pri_other) {
-       fprintf(stderr, _("warning, `%s' contains user-defined Priority value `%s'\n"),
+diff -ruN dpkg-1.15.8.5-orig/dpkg-deb/build.c dpkg-1.15.8.5/dpkg-deb/build.c
+--- dpkg-1.15.8.5-orig/dpkg-deb/build.c	2010-10-08 12:27:15.042083703 +0800
++++ dpkg-1.15.8.5/dpkg-deb/build.c	2010-10-08 12:31:53.822534277 +0800
+@@ -275,14 +275,14 @@
                controlfile, checkedinfo->otherpriority);
        warns++;
      }
@@ -14,13 +10,11 @@
        if (known_arbitrary_field(field))
          continue;
  
-       fprintf(stderr, _("warning, `%s' contains user-defined field `%s'\n"),
+       warning(_("'%s' contains user-defined field '%s'"),
                controlfile, field->name);
        warns++;
 -    }
 +    }*/
-     checkversion(checkedinfo->available.version.version,"(upstream) version",&errs);
-     checkversion(checkedinfo->available.version.revision,"Debian revision",&errs);
-     if (errs) ohshit(_("%d errors in control file"),errs);
  
      if (subdir) {
+       versionstring= versiondescribe(&checkedinfo->available.version,vdew_never);
diff --git a/meta/recipes-devtools/dpkg/dpkg/noman.patch b/meta/recipes-devtools/dpkg/dpkg/noman.patch
index f5984fe14a..d8fc9c45cc 100644
--- a/meta/recipes-devtools/dpkg/dpkg/noman.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/noman.patch
@@ -1,16 +1,13 @@
----
- Makefile.am |    3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
---- dpkg-1.13.22.orig/Makefile.am
-+++ dpkg-1.13.22/Makefile.am
-@@ -15,8 +15,7 @@ SUBDIRS = \
+diff -ruN dpkg-1.15.8.5-orig/Makefile.am dpkg-1.15.8.5/Makefile.am
+--- dpkg-1.15.8.5-orig/Makefile.am	2010-10-08 12:27:15.042083703 +0800
++++ dpkg-1.15.8.5/Makefile.am	2010-10-08 12:27:27.755148228 +0800
+@@ -12,8 +12,7 @@
  	utils \
+ 	$(MAYBE_DSELECT) \
  	scripts \
- 	po \
--	origins \
+-	po \
 -	man
-+	origins
++	po
  
  ACLOCAL_AMFLAGS = -I m4
  
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.14.19.bb b/meta/recipes-devtools/dpkg/dpkg_1.15.8.5.bb
index 1e54306c93..2562f4b724 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.14.19.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.15.8.5.bb
@@ -1,6 +1,7 @@
 require dpkg.inc
 
-SRC_URI += "file://noman.patch;patch=1"
+SRC_URI += "file://noman.patch;patch=1 \
+            file://check_snprintf.patch"
 
 EXTRA_OECONF = "--without-static-progs \
 		--without-dselect \