X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/68faa04f883627deea6e6d0bd6293e0001498403..de9af52cfceb33b568f7da5b2c856a278a32c445:/packages/apt/cmdline-apt-key.in.patch

diff --git a/packages/apt/cmdline-apt-key.in.patch b/packages/apt/cmdline-apt-key.in.patch
index 86ba52e3..3f6a859c 100644
--- a/packages/apt/cmdline-apt-key.in.patch
+++ b/packages/apt/cmdline-apt-key.in.patch
@@ -1,7 +1,7 @@
-diff -u -r ../apt-1.1.3/cmdline/apt-key.in ./cmdline/apt-key.in
---- ../apt-1.1.3/cmdline/apt-key.in	2015-11-30 03:08:24.000000000 -0500
-+++ ./cmdline/apt-key.in	2015-12-03 16:55:22.860914040 -0500
-@@ -19,10 +19,7 @@
+diff -u -r ../apt-1.1.6/cmdline/apt-key.in ./cmdline/apt-key.in
+--- ../apt-1.1.6/cmdline/apt-key.in	2015-12-24 11:14:15.000000000 -0500
++++ ./cmdline/apt-key.in	2015-12-25 17:58:37.186396718 -0500
+@@ -16,10 +16,7 @@
  aptkey_echo() { echo "$@"; }
  
  requires_root() {
@@ -12,17 +12,22 @@ diff -u -r ../apt-1.1.3/cmdline/apt-key.in ./cmdline/apt-key.in
 +	continue
  }
  
- get_fingerprints_of_keyring() {
-@@ -212,7 +209,7 @@
+ command_available() {
+@@ -231,7 +228,7 @@
  	if [ -s "$TRUSTEDFILE" ]; then
  	    $ACTION "$TRUSTEDFILE" "$@"
  	fi
 -	local TRUSTEDPARTS="/etc/apt/trusted.gpg.d"
 +	local TRUSTEDPARTS="@TERMUX_PREFIX@/etc/apt/trusted.gpg.d"
- 	eval $(apt-config shell TRUSTEDPARTS Dir::Etc::TrustedParts/d)
+ 	eval "$(apt-config shell TRUSTEDPARTS Dir::Etc::TrustedParts/d)"
  	if [ -d "$TRUSTEDPARTS" ]; then
  	    # strip / suffix as gpg will double-slash in that case (#665411)
-@@ -286,7 +283,7 @@
+@@ -301,11 +298,11 @@
+     # if a --keyring was given, just use this one
+     if [ -n "$FORCED_KEYRING" ]; then
+ 	if [ -s "$FORCED_KEYRING" ]; then
+-	    cp --dereference "$FORCED_KEYRING" "$PUBRING"
++	    cp "$FORCED_KEYRING" "$PUBRING"
  	fi
      else
  	# otherwise all known keyrings are merged
@@ -31,7 +36,16 @@ diff -u -r ../apt-1.1.3/cmdline/apt-key.in ./cmdline/apt-key.in
  	eval $(apt-config shell TRUSTEDPARTS Dir::Etc::TrustedParts/d)
  	if [ -d "$TRUSTEDPARTS" ]; then
  	    # ignore errors mostly for non-existing $TRUSTEDFILE
-@@ -441,7 +438,7 @@
+@@ -316,7 +313,7 @@
+ 	       done
+ 	    } > "$PUBRING" 2>/dev/null
+ 	elif [ -s "$TRUSTEDFILE" ]; then
+-	    cp --dereference "$TRUSTEDFILE" "$PUBRING"
++	    cp "$TRUSTEDFILE" "$PUBRING"
+ 	fi
+     fi
+ 
+@@ -460,7 +457,7 @@
  done
  
  if [ -z "$TRUSTEDFILE" ]; then