Upgrade to dpkg 1.18.10.

git-svn-id: http://svn.telesphoreo.org/trunk@819 514c082c-b64e-11dc-b46d-3d985efe055d

11 files changed, 147 insertions, 94 deletions

diff --git a/data/dpkg/_metadata/predepends_ b/data/dpkg/_metadata/predepends_
new file mode 100644
index 000000000..e0fb874aa
--- /dev/null
+++ b/data/dpkg/_metadata/predepends_
@@ -0,0 +1 @@
+tar (>= 1.23)
diff --git a/data/dpkg/_metadata/version b/data/dpkg/_metadata/version
index 15977dc74..0150af135 100644
--- a/data/dpkg/_metadata/version
+++ b/data/dpkg/_metadata/version
@@ -1 +1 @@
-1.14.25
+1.18.10
diff --git a/data/dpkg/checkpath.diff b/data/dpkg/checkpath.diff
index 2670bbe20..f29bf4480 100644
--- a/data/dpkg/checkpath.diff
+++ b/data/dpkg/checkpath.diff
@@ -1,17 +1,20 @@
-diff -ru dpkg-1.14.25/src/help.c dpkg-1.14.25+iPhone/src/help.c
---- dpkg-1.14.25/src/help.c	2009-02-01 06:19:02.000000000 +0000
-+++ dpkg-1.14.25+iPhone/src/help.c	2009-04-11 01:34:20.000000000 +0000
-@@ -77,12 +77,11 @@
- 
- void checkpath(void) {
- /* Verify that some programs can be found in the PATH. */
--  static const char *const checklist[]= { "ldconfig", 
-+  static const char *const checklist[]= {
- #if WITH_START_STOP_DAEMON
-     "start-stop-daemon",
- #endif    
--    "install-info",
--    "update-rc.d",
+diff -ru dpkg-1.18.10/src/help.c dpkg-1.18.10+iPhone/src/help.c
+--- dpkg-1.18.10/src/help.c	2016-07-05 01:55:14.000000000 +0000
++++ dpkg-1.18.10+iPhone/src/help.c	2016-08-22 21:34:30.000000000 +0000
+@@ -121,16 +121,7 @@
+     TAR,
+     DIFF,
+     BACKEND,
+-    /* Mac OS X uses dyld (Mach-O) instead of ld.so (ELF), and does not have
+-     * an ldconfig. */
+-#if defined(__APPLE__) && defined(__MACH__)
+-    "update_dyld_shared_cache",
+-#else
+-    "ldconfig",
+-#endif
+-#if BUILD_START_STOP_DAEMON
+-    "start-stop-daemon",
+-#endif
 +    "launchctl",
      NULL
    };
diff --git a/data/dpkg/dpkg_1.14.25.tar.gz b/data/dpkg/dpkg_1.14.25.tar.gz
deleted file mode 100644
index 4f8f877ce..000000000
--- a/data/dpkg/dpkg_1.14.25.tar.gz
+++ /dev/null
diff --git a/data/dpkg/dpkg_1.18.10.tar.xz b/data/dpkg/dpkg_1.18.10.tar.xz
new file mode 100644
index 000000000..d7fc053e6
--- /dev/null
+++ b/data/dpkg/dpkg_1.18.10.tar.xz
diff --git a/data/dpkg/extrainst.diff b/data/dpkg/extrainst.diff
index 59c508084..fe3052600 100644
--- a/data/dpkg/extrainst.diff
+++ b/data/dpkg/extrainst.diff
@@ -1,7 +1,7 @@
-diff -ru dpkg-1.14.25/lib/dpkg.h dpkg-1.14.25+iPhone/lib/dpkg.h
---- dpkg-1.14.25/lib/dpkg.h	2009-02-01 06:18:59.000000000 +0000
-+++ dpkg-1.14.25+iPhone/lib/dpkg.h	2009-04-11 01:20:50.000000000 +0000
-@@ -80,6 +80,7 @@
+diff -ru dpkg-1.18.10/lib/dpkg/dpkg.h dpkg-1.18.10+iPhone/lib/dpkg/dpkg.h
+--- dpkg-1.18.10/lib/dpkg/dpkg.h	2016-07-05 01:55:13.000000000 +0000
++++ dpkg-1.18.10+iPhone/lib/dpkg/dpkg.h	2016-08-15 23:45:06.000000000 +0000
+@@ -68,6 +68,7 @@
  #define CONTROLFILE        "control"
  #define CONFFILESFILE      "conffiles"
  #define PREINSTFILE        "preinst"
@@ -9,23 +9,23 @@ diff -ru dpkg-1.14.25/lib/dpkg.h dpkg-1.14.25+iPhone/lib/dpkg.h
  #define POSTINSTFILE       "postinst"
  #define PRERMFILE          "prerm"
  #define POSTRMFILE         "postrm"
-diff -ru dpkg-1.14.25/src/processarc.c dpkg-1.14.25+iPhone/src/processarc.c
---- dpkg-1.14.25/src/processarc.c	2009-02-01 06:19:02.000000000 +0000
-+++ dpkg-1.14.25+iPhone/src/processarc.c	2009-04-11 01:19:29.000000000 +0000
-@@ -596,6 +596,16 @@
-   p1[0] = -1;
-   waitsubproc(c1,BACKEND " --fsys-tarfile",PROCPIPE);
+diff -ru dpkg-1.18.10/src/unpack.c dpkg-1.18.10+iPhone/src/unpack.c
+--- dpkg-1.18.10/src/unpack.c	2016-07-05 02:00:41.000000000 +0000
++++ dpkg-1.18.10+iPhone/src/unpack.c	2016-08-15 23:43:41.000000000 +0000
+@@ -1434,6 +1434,16 @@
  
-+  if (oldversionstatus == stat_notinstalled || oldversionstatus == stat_configfiles) {
-+    maintainer_script_new(pkg->name, EXTRAINSTFILE, "extra-installation", cidir, cidirrest,
-+                          "install", (char *)0);
+   tar_deferred_extract(newfiles_queue.head, pkg);
+ 
++  if (oldversionstatus == PKG_STAT_NOTINSTALLED || oldversionstatus == PKG_STAT_CONFIGFILES) {
++    maintscript_new(pkg, EXTRAINSTFILE, "extra-installation", cidir, cidirrest,
++                    "install", NULL);
 +  } else {
-+    maintainer_script_new(pkg->name, EXTRAINSTFILE, "extra-installation", cidir, cidirrest,
-+                          "upgrade", versiondescribe(&pkg->installed.version,
-+                                                     vdew_nonambig),
-+                          (char *)0);
++    maintscript_new(pkg, EXTRAINSTFILE, "extra-installation", cidir, cidirrest,
++                    "upgrade",
++                    versiondescribe(&pkg->installed.version, vdew_nonambig),
++                    NULL);
 +  }
 +
-   if (oldversionstatus == stat_halfinstalled || oldversionstatus == stat_unpacked) {
-     /* Packages that were in `installed' and `postinstfailed' have been reduced
-      * to `unpacked' by now, by the running of the prerm script.
+   if (oldversionstatus == PKG_STAT_HALFINSTALLED ||
+       oldversionstatus == PKG_STAT_UNPACKED) {
+     /* Packages that were in ‘installed’ and ‘postinstfailed’ have been
diff --git a/data/dpkg/lzma.diff b/data/dpkg/lzma.diff
new file mode 100644
index 000000000..fa749a88a
--- /dev/null
+++ b/data/dpkg/lzma.diff
@@ -0,0 +1,64 @@
+diff -ru dpkg-1.18.10/dpkg-deb/main.c dpkg-1.18.10+iPhone/dpkg-deb/main.c
+--- dpkg-1.18.10/dpkg-deb/main.c	2016-07-05 01:55:13.000000000 +0000
++++ dpkg-1.18.10+iPhone/dpkg-deb/main.c	2016-08-22 22:37:49.000000000 +0000
+@@ -212,8 +212,6 @@
+   compress_params.type = compressor_find_by_name(value);
+   if (compress_params.type == COMPRESSOR_TYPE_UNKNOWN)
+     badusage(_("unknown compression type '%s'!"), value);
+-  if (compress_params.type == COMPRESSOR_TYPE_LZMA)
+-    warning(_("deprecated compression type '%s'; use xz instead"), value);
+   if (compress_params.type == COMPRESSOR_TYPE_BZIP2)
+     warning(_("deprecated compression type '%s'; use xz or gzip instead"), value);
+ }
+diff -ru dpkg-1.18.10/lib/dpkg/compress.c dpkg-1.18.10+iPhone/lib/dpkg/compress.c
+--- dpkg-1.18.10/lib/dpkg/compress.c	2016-07-05 02:00:41.000000000 +0000
++++ dpkg-1.18.10+iPhone/lib/dpkg/compress.c	2016-08-22 22:38:01.000000000 +0000
+@@ -639,6 +639,16 @@
+  * Lzma compressor.
+  */
+ 
++#define LZMA		"lzma"
++
++static void
++fixup_lzma_params(struct compress_params *params)
++{
++	/* Normalize compression level. */
++	if (params->level == 0)
++		params->level = 1;
++}
++
+ #ifdef WITH_LIBLZMA
+ static void
+ filter_unlzma_init(struct io_lzma *io, lzma_stream *s)
+@@ -700,10 +710,12 @@
+ 	filter_lzma(&io, fd_in, fd_out);
+ }
+ #else
++static const char *env_lzma[] = { "LZMA", NULL };
++
+ static void
+ decompress_lzma(int fd_in, int fd_out, const char *desc)
+ {
+-	fd_fd_filter(fd_in, fd_out, desc, env_xz, XZ, "-dc", "--format=lzma", NULL);
++	fd_fd_filter(fd_in, fd_out, desc, env_lzma, LZMA, "-dc", NULL);
+ }
+ 
+ static void
+@@ -712,7 +724,7 @@
+ 	char combuf[6];
+ 
+ 	snprintf(combuf, sizeof(combuf), "-c%d", params->level);
+-	fd_fd_filter(fd_in, fd_out, desc, env_xz, XZ, combuf, "--format=lzma", NULL);
++	fd_fd_filter(fd_in, fd_out, desc, env_lzma, LZMA, combuf, NULL);
+ }
+ #endif
+ 
+@@ -720,7 +732,7 @@
+ 	.name = "lzma",
+ 	.extension = ".lzma",
+ 	.default_level = 6,
+-	.fixup_params = fixup_none_params,
++	.fixup_params = fixup_lzma_params,
+ 	.compress = compress_lzma,
+ 	.decompress = decompress_lzma,
+ };
diff --git a/data/dpkg/make.sh b/data/dpkg/make.sh
index 9e82f91f0..074b599f4 100644
--- a/data/dpkg/make.sh
+++ b/data/dpkg/make.sh
@@ -1,7 +1,7 @@
 pkg:setup
-autoconf
-cp -a libcompat/obstack.[ch] lib
-pkg:configure --with-admindir=/var/lib/dpkg --without-start-stop-daemon --disable-nls --sysconfdir=/etc --disable-linker-optimisations dpkg_cv_va_copy=yes
+#autoconf
+#cp -a libcompat/obstack.[ch] lib
+pkg:configure --with-admindir=/var/lib/dpkg --disable-start-stop-daemon --disable-nls --sysconfdir=/etc --disable-linker-optimisations dpkg_cv_va_copy=yes --enable-static=yes --enable-shared=no --with-dpkg-deb-compressor=gzip
 pkg:make
 pkg:install
 pkg: rm -rf /usr/share/perl5
diff --git a/data/dpkg/port.diff b/data/dpkg/port.diff
deleted file mode 100644
index 236196707..000000000
--- a/data/dpkg/port.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -ru dpkg-1.14.25/lib/Makefile.am dpkg-1.14.25+iPhone/lib/Makefile.am
---- dpkg-1.14.25/lib/Makefile.am	2009-02-01 06:18:58.000000000 +0000
-+++ dpkg-1.14.25+iPhone/lib/Makefile.am	2009-04-11 01:11:30.000000000 +0000
-@@ -41,4 +41,5 @@
- 	trigdeferred.l \
- 	utils.c \
- 	varbuf.c \
--	vercmp.c
-+	vercmp.c \
-+	obstack.c
-diff -ru dpkg-1.14.25/lib/tarfn.c dpkg-1.14.25+iPhone/lib/tarfn.c
---- dpkg-1.14.25/lib/tarfn.c	2009-02-01 06:18:59.000000000 +0000
-+++ dpkg-1.14.25+iPhone/lib/tarfn.c	2009-04-11 01:11:30.000000000 +0000
-@@ -55,6 +55,14 @@
- 	return n;
- }
- 
-+int strnlen(const char *s, int size) {
-+    int i;
-+    for (i = 0; i != size; ++i)
-+        if (s[i] == '\0')
-+            return i;
-+    return size;
-+}
-+
- /* String block to C null-terminated string */
- static char *
- StoC(const char *s, int size)
-diff -ru dpkg-1.14.25/m4/funcs.m4 dpkg-1.14.25+iPhone/m4/funcs.m4
---- dpkg-1.14.25/m4/funcs.m4	2009-01-25 01:19:12.000000000 +0000
-+++ dpkg-1.14.25+iPhone/m4/funcs.m4	2009-04-11 01:11:30.000000000 +0000
-@@ -5,7 +5,7 @@
- # Define HAVE_VA_COPY if we have va_copy, fail if they can't be assigned
- AC_DEFUN([DPKG_FUNC_VA_COPY],
- [AC_CACHE_CHECK([for va_copy], [dpkg_cv_va_copy],
--[AC_TRY_RUN(
-+[AC_TRY_COMPILE(
- [#include <stdarg.h>
- main() {
- va_list v1, v2;
-diff -ru dpkg-1.14.25/utils/start-stop-daemon.c dpkg-1.14.25+iPhone/utils/start-stop-daemon.c
---- dpkg-1.14.25/utils/start-stop-daemon.c	2009-02-01 06:19:02.000000000 +0000
-+++ dpkg-1.14.25+iPhone/utils/start-stop-daemon.c	2009-04-11 01:13:30.000000000 +0000
-@@ -34,7 +34,7 @@
- #  define OSOpenBSD
- #elif defined(hpux)
- #  define OShpux
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || 1
- #  define OSFreeBSD
- #elif defined(__NetBSD__)
- #  define OSNetBSD
diff --git a/data/dpkg/telesphoreo.diff b/data/dpkg/telesphoreo.diff
index 5471e331b..57f19261e 100644
--- a/data/dpkg/telesphoreo.diff
+++ b/data/dpkg/telesphoreo.diff
@@ -1,9 +1,11 @@
-diff -ru dpkg-1.14.25/triplettable dpkg-1.14.25+iPhone/triplettable
---- dpkg-1.14.25/triplettable	2009-01-25 01:19:14.000000000 +0000
-+++ dpkg-1.14.25+iPhone/triplettable	2009-04-11 01:51:00.000000000 +0000
-@@ -13,4 +13,5 @@
+diff -ru dpkg-1.18.10/triplettable dpkg-1.18.10+iPhone/triplettable
+--- dpkg-1.18.10/triplettable	2016-07-05 01:55:14.000000000 +0000
++++ dpkg-1.18.10+iPhone/triplettable	2016-08-15 23:48:36.000000000 +0000
+@@ -30,6 +30,7 @@
  bsd-openbsd-<cpu>	openbsd-<cpu>
  bsd-netbsd-<cpu>	netbsd-<cpu>
  bsd-darwin-<cpu>	darwin-<cpu>
 +bsd-darwin-arm		iphoneos-arm
  sysv-solaris-<cpu>	solaris-<cpu>
+ uclibceabi-uclinux-arm	uclinux-armel
+ uclibc-uclinux-<cpu>	uclinux-<cpu>
diff --git a/data/dpkg/tolerance.diff b/data/dpkg/tolerance.diff
new file mode 100644
index 000000000..810b04f18
--- /dev/null
+++ b/data/dpkg/tolerance.diff
@@ -0,0 +1,35 @@
+diff -ru dpkg-1.18.10/lib/dpkg/parse.c dpkg-1.18.10+iPhone/lib/dpkg/parse.c
+--- dpkg-1.18.10/lib/dpkg/parse.c	2016-07-05 01:55:13.000000000 +0000
++++ dpkg-1.18.10+iPhone/lib/dpkg/parse.c	2016-08-22 21:55:26.000000000 +0000
+@@ -187,8 +187,6 @@
+   if ((ps->flags & pdb_recordavailable) ||
+       (pkg->status != PKG_STAT_NOTINSTALLED &&
+        pkg->status != PKG_STAT_HALFINSTALLED)) {
+-    parse_ensure_have_field(ps, &pkgbin->description, "description");
+-    parse_ensure_have_field(ps, &pkgbin->maintainer, "maintainer");
+     parse_must_have_field(ps, pkgbin->version.version, "version");
+   }
+ 
+diff -ru dpkg-1.18.10/lib/dpkg/parsehelp.c dpkg-1.18.10+iPhone/lib/dpkg/parsehelp.c
+--- dpkg-1.18.10/lib/dpkg/parsehelp.c	2016-07-05 01:55:13.000000000 +0000
++++ dpkg-1.18.10+iPhone/lib/dpkg/parsehelp.c	2016-08-22 21:55:03.000000000 +0000
+@@ -233,19 +233,6 @@
+     *hyphen++ = '\0';
+   rversion->revision= hyphen ? hyphen : "";
+ 
+-  /* XXX: Would be faster to use something like cisversion and cisrevision. */
+-  ptr = rversion->version;
+-  if (*ptr && !c_isdigit(*ptr++))
+-    return dpkg_put_warn(err, _("version number does not start with digit"));
+-  for (; *ptr; ptr++) {
+-    if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".-+~:", *ptr) == NULL)
+-      return dpkg_put_warn(err, _("invalid character in version number"));
+-  }
+-  for (ptr = rversion->revision; *ptr; ptr++) {
+-    if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".+~", *ptr) == NULL)
+-      return dpkg_put_warn(err, _("invalid character in revision number"));
+-  }
+-
+   return 0;
+ }
+