Update dpkg

15 files changed, 10 insertions, 336 deletions

diff --git a/data/dpkg/_metadata/_dpkg.dep b/data/dpkg/_metadata/_dpkg.dep
new file mode 120000
index 000000000..ace4a76a6
--- /dev/null
+++ b/data/dpkg/_metadata/_dpkg.dep
@@ -0,0 +1 @@
+../../_dpkg
\ No newline at end of file
diff --git a/data/dpkg/_metadata/bzip2.dep b/data/dpkg/_metadata/bzip2.dep
index a49d97af9..15aa44a77 100644..120000
--- a/data/dpkg/_metadata/bzip2.dep
+++ b/data/dpkg/_metadata/bzip2.dep
@@ -1 +1 @@
-link ../../bzip2
\ No newline at end of file
+../../bzip2
\ No newline at end of file
diff --git a/data/dpkg/_metadata/in.1443.00 b/data/dpkg/_metadata/in.1443.00
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/dpkg/_metadata/in.1443.00
diff --git a/data/dpkg/_metadata/postinst b/data/dpkg/_metadata/postinst
new file mode 100755
index 000000000..2b593ddc2
--- /dev/null
+++ b/data/dpkg/_metadata/postinst
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [[ ! -e /var/lib/dpkg/available ]]; then
+    touch /var/lib/dpkg/available
+fi
diff --git a/data/dpkg/_metadata/version b/data/dpkg/_metadata/version
index 0150af135..3ed574417 100644
--- a/data/dpkg/_metadata/version
+++ b/data/dpkg/_metadata/version
@@ -1 +1 @@
-1.18.10
+1.18.25
diff --git a/data/dpkg/blankline.diff b/data/dpkg/blankline.diff
deleted file mode 100644
index 4c743aabe..000000000
--- a/data/dpkg/blankline.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-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-12-30 02:19:22.000000000 +0000
-@@ -622,8 +622,6 @@
- 
-   /* Loop per field. */
-   for (;;) {
--    bool blank_line;
--
-     /* Scan field name. */
-     fs->fieldstart = ps->dataptr - 1;
-     while (!parse_at_eof(ps) && !c_isspace(c) && c != ':' && c != MSDOS_EOF_CHAR)
-@@ -667,16 +665,10 @@
-       parse_error(ps, _("MSDOS end of file (^Z) in value of field '%.*s' (missing newline?)"),
-                   fs->fieldlen, fs->fieldstart);
- 
--    blank_line = false;
--
-     /* Scan field value. */
-     fs->valuestart = ps->dataptr - 1;
-     for (;;) {
-       if (c == '\n' || c == MSDOS_EOF_CHAR) {
--        if (blank_line)
--          parse_error(ps,
--                      _("blank line in value of field '%.*s'"),
--                      fs->fieldlen, fs->fieldstart);
-         ps->lno++;
- 
-         if (parse_at_eof(ps))
-@@ -688,9 +680,6 @@
-           break;
- 
-         parse_ungetc(c, ps);
--        blank_line = true;
--      } else if (blank_line && !c_isspace(c)) {
--        blank_line = false;
-       }
- 
-       if (parse_at_eof(ps))
diff --git a/data/dpkg/checkpath.diff b/data/dpkg/checkpath.diff
deleted file mode 100644
index f29bf4480..000000000
--- a/data/dpkg/checkpath.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-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.18.10.tar.xz b/data/dpkg/dpkg_1.18.10.tar.xz
deleted file mode 100644
index d7fc053e6..000000000
--- a/data/dpkg/dpkg_1.18.10.tar.xz
+++ /dev/null
diff --git a/data/dpkg/extrainst.diff b/data/dpkg/extrainst.diff
deleted file mode 100644
index fe3052600..000000000
--- a/data/dpkg/extrainst.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-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"
-+#define EXTRAINSTFILE      "extrainst_"
- #define POSTINSTFILE       "postinst"
- #define PRERMFILE          "prerm"
- #define POSTRMFILE         "postrm"
-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 @@
- 
-   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 {
-+    maintscript_new(pkg, EXTRAINSTFILE, "extra-installation", cidir, cidirrest,
-+                    "upgrade",
-+                    versiondescribe(&pkg->installed.version, vdew_nonambig),
-+                    NULL);
-+  }
-+
-   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
deleted file mode 100644
index fa749a88a..000000000
--- a/data/dpkg/lzma.diff
+++ /dev/null
@@ -1,64 +0,0 @@
-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 54629d49a..d5b539653 100644
--- a/data/dpkg/make.sh
+++ b/data/dpkg/make.sh
@@ -1,12 +1,6 @@
-pkg:setup
-#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 TAR=tar
-pkg:make
-pkg:install
+cp -a "$(PKG_DEST_ _dpkg)/." "${PKG_DEST}/"
 pkg: rm -rf /usr/share/perl5
 pkg: grep -Erl '#! ?/usr/bin/perl' / | while read -r line; do
     rm -f "${line}"
 done
-pkg: rm -rf /{usr,var}/lib/dpkg/methods
-pkg: rm -rf /usr/lib/dpkg/parsechangelog
+pkg: rm -rf /{usr,var}/lib{,exec}/dpkg/methods
diff --git a/data/dpkg/nullptr.diff b/data/dpkg/nullptr.diff
deleted file mode 100644
index 8679bb25d..000000000
--- a/data/dpkg/nullptr.diff
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -ur dpkg-1.18.10/dselect/method.cc dpkg-1.18.10+iPhone/dselect/method.cc
---- dpkg-1.18.10/dselect/method.cc	2016-07-04 16:00:41.000000000 -1000
-+++ dpkg-1.18.10+iPhone/dselect/method.cc	2018-07-25 16:26:13.000000000 -1000
-@@ -50,10 +50,10 @@
- static const char *const methoddirectories[]= {
-   LIBDIR "/" METHODSDIR,
-   LOCALLIBDIR "/" METHODSDIR,
--  nullptr
-+  NULL
- };
- 
--static char *methodlockfile = nullptr;
-+static char *methodlockfile = NULL;
- static int methlockfd= -1;
- 
- static void
-@@ -84,7 +84,7 @@
-   int nread;
- 
-   if (!options) {
--    newoptions = nullptr;
-+    newoptions = NULL;
-     nread= 0;
-     for (ccpp= methoddirectories; *ccpp; ccpp++)
-       readmethods(*ccpp, &newoptions, &nread);
-@@ -101,7 +101,7 @@
- static enum urqresult lockmethod(void) {
-   struct flock fl;
- 
--  if (methodlockfile == nullptr)
-+  if (methodlockfile == NULL)
-     methodlockfile = dpkg_db_get_path(METHLOCKFILE);
- 
-   if (methlockfd == -1) {
-@@ -124,7 +124,7 @@
-     sthfailed(_("cannot lock access method area"));
-     return urqr_fail;
-   }
--  push_cleanup(cu_unlockmethod, ~0, nullptr, 0, 0);
-+  push_cleanup(cu_unlockmethod, ~0, NULL, 0, 0);
-   return urqr_normal;
- }
- 
-@@ -140,7 +140,7 @@
- 
-   pid = subproc_fork();
-   if (pid == 0) {
--    subproc_signals_cleanup(0, nullptr);
-+    subproc_signals_cleanup(0, NULL);
-     command_exec(cmd);
-   }
- 
-@@ -178,7 +178,7 @@
- 
-     command_init(&cmd, coption->meth->path, name);
-     command_add_args(&cmd, exepath, dpkg_db_get_dir(),
--                     coption->meth->name, coption->name, nullptr);
-+                     coption->meth->name, coption->name, NULL);
-     ur = falliblesubprocess(&cmd);
-     command_destroy(&cmd);
-   } else {
-@@ -204,7 +204,7 @@
- 
-   command_init(&cmd, DPKG, name);
-   command_add_args(&cmd, DPKG, "--admindir", dpkg_db_get_dir(), "--pending",
--                   dpkgmode, nullptr);
-+                   dpkgmode, NULL);
- 
-   cursesoff();
-   printf("running dpkg --pending %s ...\n",dpkgmode);
-@@ -243,7 +243,7 @@
- 
-     command_init(&cmd, coption->meth->path, _("query/setup script"));
-     command_add_args(&cmd, METHODSETUPSCRIPT, dpkg_db_get_dir(),
--                     coption->meth->name, coption->name, nullptr);
-+                     coption->meth->name, coption->name, NULL);
-     ur = falliblesubprocess(&cmd);
-     command_destroy(&cmd);
-     if (ur == urqr_normal) writecurrentopt();
diff --git a/data/dpkg/runcmd.diff b/data/dpkg/runcmd.diff
deleted file mode 100644
index 80edf7ee6..000000000
--- a/data/dpkg/runcmd.diff
+++ /dev/null
@@ -1,45 +0,0 @@
---- dpkg-1.18.10/lib/dpkg/command.c	2016-07-04 15:55:13.000000000 -1000
-+++ dpkg-1.18.10+iPhone/lib/dpkg/command.c	2018-07-27 18:00:54.000000000 -1000
-@@ -31,6 +31,8 @@
- #include <dpkg/path.h>
- #include <dpkg/command.h>
- 
-+void runcmd(struct command *cmd);
-+
- /**
-  * Initialize a command structure.
-  *
-@@ -178,8 +180,7 @@
- void
- command_exec(struct command *cmd)
- {
--	execvp(cmd->filename, (char * const *)cmd->argv);
--	ohshite(_("unable to execute %s (%s)"), cmd->name, cmd->filename);
-+	runcmd(cmd);
- }
- 
- 
-@@ -230,3 +231,23 @@
- 	execlp(shell, shell, mode, cmd, NULL);
- 	ohshite(_("unable to execute %s (%s)"), name, cmd);
- }
-+
-+void
-+runcmd(struct command *cmd)
-+{
-+	int i = 0;
-+	char cmdstring[cmd->argv_size];
-+	char *ptr = cmdstring; // set ptr to the start of the destination buffer
-+	for (i=0; i<cmd->argc; i++) {
-+		const char *current_arg = cmd->argv[i];
-+		char c;
-+		while ( (c = *current_arg++) ) {
-+			// copy each character to the destination buffer until the end of the current string
-+			*ptr++ = c;
-+		}
-+		*ptr++ = ' '; // or whatever joining character you want
-+	}
-+	*ptr = '\0'; // null terminate
-+	command_shell(cmdstring, cmd->name);
-+	ohshite(_("unable to execute %s (%s)"), cmd->name, cmd->filename);
-+}
diff --git a/data/dpkg/telesphoreo.diff b/data/dpkg/telesphoreo.diff
deleted file mode 100644
index d31957409..000000000
--- a/data/dpkg/telesphoreo.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-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,8 @@
- bsd-openbsd-<cpu>	openbsd-<cpu>
- bsd-netbsd-<cpu>	netbsd-<cpu>
- bsd-darwin-<cpu>	darwin-<cpu>
-+bsd-darwin-arm		iphoneos-arm
-+bsd-darwin-arm64		iphoneos-arm64
- 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
deleted file mode 100644
index 810b04f18..000000000
--- a/data/dpkg/tolerance.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-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;
- }
-