Patch apt to work with busybox cp

diff --git a/packages/apt/build.sh b/packages/apt/build.sh
index 35bcc42ff053e881d31b3442b369c834ddf9ab13..6414cde38e41f5573025dc4d732a2e811e9764f3 100644 (file)
--- a/packages/apt/build.sh
+++ b/packages/apt/build.sh
@@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://packages.debian.org/apt
 TERMUX_PKG_DESCRIPTION="Front-end for the dpkg package manager"
 TERMUX_PKG_DEPENDS="libbz2, liblzma, libgnustl, dpkg, gnupg"
 TERMUX_PKG_VERSION=1.1.3
 TERMUX_PKG_DESCRIPTION="Front-end for the dpkg package manager"
 TERMUX_PKG_DEPENDS="libbz2, liblzma, libgnustl, dpkg, gnupg"
 TERMUX_PKG_VERSION=1.1.3

+TERMUX_PKG_BUILD_REVISION=1

 TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/a/apt/apt_${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--host=${TERMUX_ARCH}-linux --disable-rpath acl_cv_rpath=$TERMUX_PREFIX/lib gt_cv_func_CFPreferencesCopyAppValue=no gt_cv_func_CFLocaleCopyCurrent=no ac_cv_c_bigendian=no --no-create"
 # When ready to drop bz2 support:
 TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/a/apt/apt_${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--host=${TERMUX_ARCH}-linux --disable-rpath acl_cv_rpath=$TERMUX_PREFIX/lib gt_cv_func_CFPreferencesCopyAppValue=no gt_cv_func_CFLocaleCopyCurrent=no ac_cv_c_bigendian=no --no-create"
 # When ready to drop bz2 support:

diff --git a/packages/apt/cmdline-apt-key.in.patch b/packages/apt/cmdline-apt-key.in.patch
index 86ba52e3515b0745583295a30763ec20f56bbc57..0d07e4f25a3985220be976cff5a20c1d6a3f3617 100644 (file)
--- a/packages/apt/cmdline-apt-key.in.patch
+++ b/packages/apt/cmdline-apt-key.in.patch
@@ -1,6 +1,6 @@
 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
 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
++++ ./cmdline/apt-key.in       2015-12-03 21:22:35.231730185 -0500

 @@ -19,10 +19,7 @@
  aptkey_echo() { echo "$@"; }
  
 @@ -19,10 +19,7 @@
  aptkey_echo() { echo "$@"; }
  


@@ -22,7 +22,12 @@ 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
            # strip / suffix as gpg will double-slash in that case (#665411)
        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 @@
+@@ -282,11 +279,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
        fi
      else
        # otherwise all known keyrings are merged


@@ -31,6 +36,15 @@ 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
        eval $(apt-config shell TRUSTEDPARTS Dir::Etc::TrustedParts/d)
        if [ -d "$TRUSTEDPARTS" ]; then
            # ignore errors mostly for non-existing $TRUSTEDFILE

+@@ -297,7 +294,7 @@
+              done
+           } > "$PUBRING" 2>/dev/null
+       elif [ -s "$TRUSTEDFILE" ]; then
+-          cp --dereference "$TRUSTEDFILE" "$PUBRING"
++          cp "$TRUSTEDFILE" "$PUBRING"
+       fi
+     fi
+ 

 @@ -441,7 +438,7 @@
  done
  
 @@ -441,7 +438,7 @@
  done