[oe-commits] org.oe.dev dpkg: merge fixes from poky, update to 1.3.25

[koen commit]

dpkg: merge fixes from poky, update to 1.3.25

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 7a23814bd62c758511ad3c7794a216c90b9d149c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7a23814bd62c758511ad3c7794a216c90b9d149c
Files:
1
packages/dpkg/dpkg-native_1.13.25.bb
packages/dpkg/dpkg_1.13.25.bb
packages/dpkg/files/autofoo.patch
packages/dpkg/files/nochroot.patch
Diffs:

#
# mt diff -re6bdcad4b437acfaea836bb37c83ecddc4ca3e18 -r7a23814bd62c758511ad3c7794a216c90b9d149c
#
# 
# 
# add_file "packages/dpkg/dpkg-native_1.13.25.bb"
#  content [448cfc03f391987c099cb9b002f37e20eadb25d9]
# 
# add_file "packages/dpkg/dpkg_1.13.25.bb"
#  content [447b8af2ef375b9607b5df7961b6bd2d573eeef3]
# 
# add_file "packages/dpkg/files/autofoo.patch"
#  content [15327c7fb1d0937364adeae5f0f1f018eedf8843]
# 
# add_file "packages/dpkg/files/nochroot.patch"
#  content [96c39aa83c0bb252677018577b751073b25a096d]
# 
============================================================
--- packages/dpkg/dpkg-native_1.13.25.bb	448cfc03f391987c099cb9b002f37e20eadb25d9
+++ packages/dpkg/dpkg-native_1.13.25.bb	448cfc03f391987c099cb9b002f37e20eadb25d9
@@ -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"
============================================================
--- packages/dpkg/dpkg_1.13.25.bb	447b8af2ef375b9607b5df7961b6bd2d573eeef3
+++ packages/dpkg/dpkg_1.13.25.bb	447b8af2ef375b9607b5df7961b6bd2d573eeef3
@@ -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"
============================================================
--- packages/dpkg/files/autofoo.patch	15327c7fb1d0937364adeae5f0f1f018eedf8843
+++ packages/dpkg/files/autofoo.patch	15327c7fb1d0937364adeae5f0f1f018eedf8843
@@ -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.])
============================================================
--- packages/dpkg/files/nochroot.patch	96c39aa83c0bb252677018577b751073b25a096d
+++ packages/dpkg/files/nochroot.patch	96c39aa83c0bb252677018577b751073b25a096d
@@ -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);