From bd9f2f00af36f60b18ed1e03f7e627de16903ef7 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Sun, 8 Mar 2020 20:00:47 +0200 Subject: [PATCH] dpkg: update to 1.20.0 --- packages/dpkg/build.sh | 5 ++--- packages/dpkg/lib-dpkg-triglib.c.patch | 18 ------------------ 2 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 packages/dpkg/lib-dpkg-triglib.c.patch diff --git a/packages/dpkg/build.sh b/packages/dpkg/build.sh index 123de9806..d576b3448 100644 --- a/packages/dpkg/build.sh +++ b/packages/dpkg/build.sh @@ -1,10 +1,9 @@ TERMUX_PKG_HOMEPAGE=https://packages.debian.org/dpkg TERMUX_PKG_DESCRIPTION="Debian package management system" TERMUX_PKG_LICENSE="GPL-2.0" -TERMUX_PKG_VERSION=1.19.7 -TERMUX_PKG_REVISION=9 +TERMUX_PKG_VERSION=1.20.0 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/debian/pool/main/d/dpkg/dpkg_${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=4c27fededf620c0aa522fff1a48577ba08144445341257502e7730f2b1a296e8 +TERMUX_PKG_SHA256=b633cc2b0e030efb61e11029d8a3fb1123f719864c9992da2e52b471c96d0900 # with the extract.c.patch we remove the -p and --warning=no-timestamp tar options so we can use busybox tar TERMUX_PKG_DEPENDS="bzip2, coreutils, diffutils, gzip, less, libbz2, liblzma, tar, xz-utils, zlib" TERMUX_PKG_BREAKS="dpkg-dev" diff --git a/packages/dpkg/lib-dpkg-triglib.c.patch b/packages/dpkg/lib-dpkg-triglib.c.patch deleted file mode 100644 index f15702aa3..000000000 --- a/packages/dpkg/lib-dpkg-triglib.c.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -u -r ../dpkg-1.18.2/lib/dpkg/triglib.c ./lib/dpkg/triglib.c ---- ../dpkg-1.18.2/lib/dpkg/triglib.c 2015-07-12 22:38:47.000000000 -0400 -+++ ./lib/dpkg/triglib.c 2015-08-25 17:54:10.350853590 -0400 -@@ -787,10 +787,13 @@ - if (errno != EEXIST) - ohshite(_("unable to create triggers state" - " directory '%.250s'"), triggersdir); -- } else if (chown(triggersdir, 0, 0)) { -+ } -+#ifndef __ANDROID__ -+ else if (chown(triggersdir, 0, 0)) { - ohshite(_("unable to set ownership of triggers state" - " directory '%.250s'"), triggersdir); - } -+#endif - ur = trigdef_update_start(tduf); - } - switch (ur) {