chiark - git - mdw - termux-packages/blob - packages/apt/cmdline-apt-key.in.patch

   1 diff -u -r ../apt-1.4.7/cmdline/apt-key.in ./cmdline/apt-key.in
   2 --- ../apt-1.4.7/cmdline/apt-key.in     2017-07-13 23:45:39.000000000 +0200
   3 +++ ./cmdline/apt-key.in        2017-07-26 12:18:17.424086422 +0200
   4 @@ -16,10 +16,7 @@
   5  aptkey_echo() { echo "$@"; }
   6
   7  requires_root() {
   8 -       if [ "$(id -u)" -ne 0 ]; then
   9 -               apt_error "This command can only be used by root."
  10 -               exit 1
  11 -       fi
  12 +continue
  13  }
  14
  15  command_available() {
  16 @@ -260,7 +257,7 @@
  17         if accessible_file_exists "$TRUSTEDFILE"; then
  18             $ACTION "$TRUSTEDFILE" "$@"
  19         fi
  20 -       local TRUSTEDPARTS="/etc/apt/trusted.gpg.d"
  21 +       local TRUSTEDPARTS="@TERMUX_PREFIX@/etc/apt/trusted.gpg.d"
  22         eval "$(apt-config shell TRUSTEDPARTS Dir::Etc::TrustedParts/d)"
  23         if [ -d "$TRUSTEDPARTS" ]; then
  24             TRUSTEDPARTS="$(readlink -f "$TRUSTEDPARTS")"
  25 @@ -542,7 +539,7 @@
  26  done
  27
  28  if [ -z "$TRUSTEDFILE" ]; then
  29 -   TRUSTEDFILE="/etc/apt/trusted.gpg"
  30 +   TRUSTEDFILE="@TERMUX_PREFIX@/etc/apt/trusted.gpg"
  31     eval $(apt-config shell TRUSTEDFILE Apt::GPGV::TrustedKeyring)
  32     eval $(apt-config shell TRUSTEDFILE Dir::Etc::Trusted/f)
  33  fi
  34 @@ -612,7 +609,8 @@
  35             unset TMPDIR
  36         fi
  37      fi
  38 -    GPGHOMEDIR="$(mktemp --directory --tmpdir 'apt-key-gpghome.XXXXXXXXXX')"
  39 +    # Use short options as busybox mktemp does not support long ones:
  40 +    GPGHOMEDIR="$(mktemp -d -t 'apt-key-gpghome.XXXXXXXXXX')"
  41      CURRENTTRAP="${CURRENTTRAP} cleanup_gpg_home;"
  42      trap "${CURRENTTRAP}" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
  43      if [ -z "$GPGHOMEDIR" ]; then