summaryrefslogtreecommitdiff
path: root/data/dpkg/extrainst.diff
diff options
context:
space:
mode:
Diffstat (limited to 'data/dpkg/extrainst.diff')
-rw-r--r--data/dpkg/extrainst.diff40
1 files changed, 20 insertions, 20 deletions
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