2017-07-26 12:38:18 +02:00
|
|
|
diff -u -r ../apt-1.4.7/cmdline/apt-key.in ./cmdline/apt-key.in
|
|
|
|
|
--- ../apt-1.4.7/cmdline/apt-key.in 2017-07-13 23:45:39.000000000 +0200
|
|
|
|
|
+++ ./cmdline/apt-key.in 2017-07-26 12:18:17.424086422 +0200
|
2017-07-20 05:47:45 +02:00
|
|
|
@@ -16,10 +16,7 @@
|
|
|
|
|
aptkey_echo() { echo "$@"; }
|
|
|
|
|
|
|
|
|
|
requires_root() {
|
|
|
|
|
- if [ "$(id -u)" -ne 0 ]; then
|
|
|
|
|
- apt_error "This command can only be used by root."
|
|
|
|
|
- exit 1
|
|
|
|
|
- fi
|
|
|
|
|
+continue
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
command_available() {
|
|
|
|
|
@@ -260,7 +257,7 @@
|
|
|
|
|
if accessible_file_exists "$TRUSTEDFILE"; then
|
|
|
|
|
$ACTION "$TRUSTEDFILE" "$@"
|
|
|
|
|
fi
|
|
|
|
|
- local TRUSTEDPARTS="/etc/apt/trusted.gpg.d"
|
2017-07-26 12:38:18 +02:00
|
|
|
+ local TRUSTEDPARTS="@TERMUX_PREFIX@/etc/apt/trusted.gpg.d"
|
2017-07-20 05:47:45 +02:00
|
|
|
eval "$(apt-config shell TRUSTEDPARTS Dir::Etc::TrustedParts/d)"
|
|
|
|
|
if [ -d "$TRUSTEDPARTS" ]; then
|
|
|
|
|
TRUSTEDPARTS="$(readlink -f "$TRUSTEDPARTS")"
|
|
|
|
|
@@ -542,7 +539,7 @@
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
if [ -z "$TRUSTEDFILE" ]; then
|
|
|
|
|
- TRUSTEDFILE="/etc/apt/trusted.gpg"
|
2017-07-26 12:38:18 +02:00
|
|
|
+ TRUSTEDFILE="@TERMUX_PREFIX@/etc/apt/trusted.gpg"
|
2017-07-20 05:47:45 +02:00
|
|
|
eval $(apt-config shell TRUSTEDFILE Apt::GPGV::TrustedKeyring)
|
|
|
|
|
eval $(apt-config shell TRUSTEDFILE Dir::Etc::Trusted/f)
|
|
|
|
|
fi
|
2017-07-26 12:38:18 +02:00
|
|
|
@@ -612,7 +609,8 @@
|
|
|
|
|
unset TMPDIR
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
- GPGHOMEDIR="$(mktemp --directory --tmpdir 'apt-key-gpghome.XXXXXXXXXX')"
|
|
|
|
|
+ # Use short options as busybox mktemp does not support long ones:
|
|
|
|
|
+ GPGHOMEDIR="$(mktemp -d -t 'apt-key-gpghome.XXXXXXXXXX')"
|
|
|
|
|
CURRENTTRAP="${CURRENTTRAP} cleanup_gpg_home;"
|
|
|
|
|
trap "${CURRENTTRAP}" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
|
|
|
|
|
if [ -z "$GPGHOMEDIR" ]; then
|
