sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dpkg: Update from 1.19.0.5 to 1.19.2

Browse Source
This commit is contained in:
Fredrik Fornwall 2018-11-11 03:28:36 +01:00
parent bf251e0126
commit 89ad32b7fd
3 changed files with 51 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/dpkg/build.sh
View File

@ -1,7 +1,7 @@
TERMUX_PKG_HOMEPAGE=https://packages.debian.org/dpkg
TERMUX_PKG_DESCRIPTION="Debian package management system"
TERMUX_PKG_VERSION=1.19.0.5
TERMUX_PKG_SHA256=818046927a7f77c1bcbbad7d8dbc04cdf0f3e6ec4e1a4f9d313378ecc69d85b5
TERMUX_PKG_VERSION=1.19.2
TERMUX_PKG_SHA256=f8f2ae2cf8065b81239db960b3794099ec607c94a125cec61c986f68f9861b71
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/debian/pool/main/d/dpkg/dpkg_${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
ac_cv_lib_selinux_setexecfilecon=no

53
packages/dpkg/src-archives.c.patch
View File

@ -1,39 +1,64 @@
diff -u -r ../dpkg-1.18.18/src/archives.c ./src/archives.c
--- ../dpkg-1.18.18/src/archives.c 2016-12-17 13:46:21.000000000 -0500
+++ ./src/archives.c 2016-12-20 18:44:57.276098093 -0500
@@ -393,8 +393,10 @@
diff -u -r ../dpkg-1.19.2/src/archives.c ./src/archives.c
--- ../dpkg-1.19.2/src/archives.c 2018-10-08 09:43:48.000000000 +0000
+++ ./src/archives.c 2018-11-11 02:17:28.534503365 +0000
@@ -389,9 +389,11 @@
namenode->statoverride->uid,
namenode->statoverride->gid,
namenode->statoverride->mode);
+#ifndef __ANDROID__
if (fchown(fd, st->uid, st->gid))
rc = fchown(fd, st->uid, st->gid);
if (forcible_nonroot_error(rc))
ohshite(_("error setting ownership of '%.255s'"), te->name);
+#endif
if (fchmod(fd, st->mode & ~S_IFMT))
rc = fchmod(fd, st->mode & ~S_IFMT);
if (forcible_nonroot_error(rc))
ohshite(_("error setting permissions of '%.255s'"), te->name);
@@ -506,11 +508,15 @@
@@ -506,13 +508,17 @@
return; /* Already handled using the file descriptor. */
if (te->type == TAR_FILETYPE_SYMLINK) {
+#ifndef __ANDROID__
if (lchown(path, st->uid, st->gid))
rc = lchown(path, st->uid, st->gid);
if (forcible_nonroot_error(rc))
ohshite(_("error setting ownership of symlink '%.255s'"), path);
+#endif
} else {
+#ifndef __ANDROID__
if (chown(path, st->uid, st->gid))
rc = chown(path, st->uid, st->gid);
if (forcible_nonroot_error(rc))
ohshite(_("error setting ownership of '%.255s'"), path);
+#endif
if (chmod(path, st->mode & ~S_IFMT))
rc = chmod(path, st->mode & ~S_IFMT);
if (forcible_nonroot_error(rc))
ohshite(_("error setting permissions of '%.255s'"), path);
}
@@ -1046,12 +1052,19 @@
@@ -552,9 +558,11 @@
else if (linksize > stab->st_size)
ohshit(_("symbolic link '%.250s' size has changed from %jd to %zd"),
fn_old, (intmax_t)stab->st_size, linksize);
+#ifndef __ANDROID__
else if (linksize < stab->st_size)
warning(_("symbolic link '%.250s' size has changed from %jd to %zd"),
fn_old, (intmax_t)stab->st_size, linksize);
+#endif
linkname[linksize] = '\0';
if (strcmp(linkname, te->linkname) == 0) {
free(linkname);
@@ -1041,20 +1049,29 @@
else if (r > stab.st_size)
ohshit(_("symbolic link '%.250s' size has changed from %jd to %zd"),
fnamevb.buf, (intmax_t)stab.st_size, r);
+#ifndef __ANDROID__
else if (r < stab.st_size)
warning(_("symbolic link '%.250s' size has changed from %jd to %zd"),
fnamevb.buf, (intmax_t)stab.st_size, r);
+#endif
varbuf_trunc(&symlinkfn, r);
varbuf_end_str(&symlinkfn);
if (symlink(symlinkfn.buf,fnametmpvb.buf))
ohshite(_("unable to make backup symlink for '%.255s'"), ti->name);
+#ifndef __ANDROID__
if (lchown(fnametmpvb.buf,stab.st_uid,stab.st_gid))
rc = lchown(fnametmpvb.buf, stab.st_uid, stab.st_gid);
if (forcible_nonroot_error(rc))
ohshite(_("unable to chown backup symlink for '%.255s'"), ti->name);
+#endif
tarobject_set_se_context(fnamevb.buf, fnametmpvb.buf, stab.st_mode);

18
packages/dpkg/src-help.c.patch
View File

@ -1,12 +1,14 @@
diff -u -r ../dpkg-1.18.2/src/help.c ./src/help.c
--- ../dpkg-1.18.2/src/help.c 2015-07-13 09:53:37.000000000 -0400
+++ ./src/help.c 2015-08-25 18:09:39.779664557 -0400
@@ -91,7 +91,7 @@
* an ldconfig. */
#if defined(__APPLE__) && defined(__MACH__)
diff -u -r ../dpkg-1.19.2/src/help.c ./src/help.c
--- ../dpkg-1.19.2/src/help.c 2018-10-07 22:07:52.000000000 +0000
+++ ./src/help.c 2018-11-11 02:13:05.133548711 +0000
@@ -127,8 +127,10 @@
"update_dyld_shared_cache",
-#else
+#elif !defined(__ANDROID__)
#elif defined(__GLIBC__) || defined(__UCLIBC__) || \
defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#ifndef __ANDROID__
"ldconfig",
#endif
+#endif
#if BUILD_START_STOP_DAEMON
"start-stop-daemon",
#endif