dpkg: merge fixes from poky, update to 1.3.25

4 files changed, 91 insertions, 0 deletions

diff --git a/packages/dpkg/dpkg-native_1.13.25.bb b/packages/dpkg/dpkg-native_1.13.25.bb
new file mode 100644
index 0000000000..9f76db68ba
--- /dev/null
+++ b/packages/dpkg/dpkg-native_1.13.25.bb
@@ -0,0 +1,14 @@
+require dpkg.inc
+PR = "r0"
+DEPENDS += "zlib-native virtual/update-alternatives-native"
+SRC_URI += "file://noman.patch;patch=1"
+
+inherit native
+
+EXTRA_OECONF = "--without-static-progs \
+		--without-dselect \
+		--with-start-stop-daemon \
+		--with-zlib \
+		--with-bz2lib \
+                --without-selinux \
+		--without-sgml-doc"
diff --git a/packages/dpkg/dpkg_1.13.25.bb b/packages/dpkg/dpkg_1.13.25.bb
new file mode 100644
index 0000000000..deccb32827
--- /dev/null
+++ b/packages/dpkg/dpkg_1.13.25.bb
@@ -0,0 +1,11 @@
+require dpkg.inc
+PR = "r0"
+DEPENDS += "ncurses zlib bzip2"
+SRC_URI += "file://noman.patch;patch=1"
+
+EXTRA_OECONF = "--without-static-progs \
+		--without-dselect \
+		--with-start-stop-daemon \
+		--with-zlib \
+		--with-bz2lib \
+		--without-sgml-doc"
diff --git a/packages/dpkg/files/autofoo.patch b/packages/dpkg/files/autofoo.patch
new file mode 100644
index 0000000000..691121e418
--- /dev/null
+++ b/packages/dpkg/files/autofoo.patch
@@ -0,0 +1,48 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- dpkg-1.10.23/configure.in~autofoo
++++ dpkg-1.10.23/configure.in
+@@ -227,21 +227,36 @@
+ # OpenBSD passes AC_TRY_COMPILE for va_copy even though 
+ # it doesn't seem to exist, which is odd. We need to use
+ # AC_TRY_RUN.
++#
++# If crosscompiling, use AC_TRY_COMPILE. -CL
+ AC_TRY_RUN([
+ #include <stdarg.h>
+ main(){
+ va_list v1,v2;
+ va_copy(v1, v2);
+ exit(0);}
+-], [AC_MSG_RESULT(yes)
+-AC_DEFINE(HAVE_VA_COPY,,[Whether the va_copy macro exists])],[AC_MSG_RESULT(no)
+-AC_MSG_CHECKING([for va_list assignment copy])
++], [dpkg_cv_va_copy=yes], [dpkg_cv_va_copy=no],
+ AC_TRY_COMPILE([
+ #include <stdarg.h>
++main(){
++va_list v1,v2;
++va_copy(v1, v2);
++exit(0);}
++], [dpkg_cv_va_copy=yes], [dpkg_vc_va_copy=no]))
++
++if test "$dpkg_cv_va_copy" = "yes"; then
++	AC_MSG_RESULT(yes)
++	AC_DEFINE(HAVE_VA_COPY,,[Whether the va_copy macro exists])
++else
++	AC_MSG_RESULT(no)
++	AC_MSG_CHECKING([for va_list assignment copy])
++	AC_TRY_COMPILE([
++#include <stdarg.h>
+ ],[
+ va_list v1,v2;
+ v1 = v2;
+-], AC_MSG_RESULT(yes),AC_MSG_ERROR(no))])
++], AC_MSG_RESULT(yes), AC_MSG_ERROR(no))
++fi
+ 
+ DPKG_C_GCC_ATTRIBUTE([,,],supported,[int x],[,,],ATTRIB,[Define if function attributes a la GCC 2.5 and higher are available.],
+   DPKG_C_GCC_ATTRIBUTE(noreturn,noreturn,[int x],noreturn,NORETURN,[Define if nonreturning functions a la GCC 2.5 and higher are available.])
diff --git a/packages/dpkg/files/nochroot.patch b/packages/dpkg/files/nochroot.patch
new file mode 100644
index 0000000000..3a8beaebbf
--- /dev/null
+++ b/packages/dpkg/files/nochroot.patch
@@ -0,0 +1,18 @@
+---
+ src/help.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- dpkg-1.13.22.orig/src/help.c
++++ dpkg-1.13.22/src/help.c
+@@ -175,9 +175,11 @@ static const char* preexecscript(const c
+    */
+   size_t instdirl;
+ 
++#if 0
+   if (*instdir) {
+     if (chroot(instdir)) ohshite(_("failed to chroot to `%.250s'"),instdir);
+   }
++#endif
+   if (f_debug & dbg_scripts) {
+     fprintf(stderr,"D0%05o: fork/exec %s (",dbg_scripts,path);
+     while (*++argv) fprintf(stderr," %s",*argv);