From 9c52178c83dc0dc3752687c4155370733ea77624 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Fri, 24 Jul 2020 17:11:41 +0300 Subject: [PATCH] cups: do not check permissions on $PREFIX/tmp --- packages/cups/build.sh | 2 +- packages/cups/no-tmpdir-permission-check.patch | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 packages/cups/no-tmpdir-permission-check.patch diff --git a/packages/cups/build.sh b/packages/cups/build.sh index a44ee4817e..1df723172b 100644 --- a/packages/cups/build.sh +++ b/packages/cups/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE="https://www.cups.org/" TERMUX_PKG_DESCRIPTION="Common UNIX Printing System" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_VERSION="2.3.3" -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL="https://github.com/apple/cups/releases/download/v${TERMUX_PKG_VERSION}/cups-${TERMUX_PKG_VERSION}-source.tar.gz" TERMUX_PKG_SHA256="261fd948bce8647b6d5cb2a1784f0c24cc52b5c4e827b71d726020bcc502f3ee" TERMUX_PKG_DEPENDS="libiconv, libcrypt" diff --git a/packages/cups/no-tmpdir-permission-check.patch b/packages/cups/no-tmpdir-permission-check.patch new file mode 100644 index 0000000000..b8411fe469 --- /dev/null +++ b/packages/cups/no-tmpdir-permission-check.patch @@ -0,0 +1,15 @@ +diff -uNr cups-2.3.3/scheduler/conf.c cups-2.3.3.mod/scheduler/conf.c +--- cups-2.3.3/scheduler/conf.c 2020-04-27 21:04:29.000000000 +0300 ++++ cups-2.3.3.mod/scheduler/conf.c 2020-07-24 17:10:21.669188122 +0300 +@@ -1180,11 +1180,6 @@ + else if (!S_ISDIR(tmpinfo.st_mode)) + cupsdLogMessage(CUPSD_LOG_ERROR, "TMPDIR (%s) is not a directory.", + tmpdir); +- else if ((tmpinfo.st_uid != User || !(tmpinfo.st_mode & S_IWUSR)) && +- (tmpinfo.st_gid != Group || !(tmpinfo.st_mode & S_IWGRP)) && +- !(tmpinfo.st_mode & S_IWOTH)) +- cupsdLogMessage(CUPSD_LOG_ERROR, +- "TMPDIR (%s) has the wrong permissions.", tmpdir); + else + cupsdSetString(&TempDir, tmpdir); + }