diff --git a/packages/apt/apt-pkg-aptconfiguration.cc.patch b/packages/apt/apt-pkg-aptconfiguration.cc.patch index 49508e816..1cce5fea4 100644 --- a/packages/apt/apt-pkg-aptconfiguration.cc.patch +++ b/packages/apt/apt-pkg-aptconfiguration.cc.patch @@ -1,18 +1,20 @@ -diff -u -r ../apt-1.1.3/apt-pkg/aptconfiguration.cc ./apt-pkg/aptconfiguration.cc ---- ../apt-1.1.3/apt-pkg/aptconfiguration.cc 2015-11-30 03:08:24.000000000 -0500 -+++ ./apt-pkg/aptconfiguration.cc 2015-12-03 18:16:35.167212811 -0500 -@@ -35,8 +35,8 @@ +diff -u -r ../apt-1.2/apt-pkg/aptconfiguration.cc ./apt-pkg/aptconfiguration.cc +--- ../apt-1.2/apt-pkg/aptconfiguration.cc 2016-01-15 13:53:52.000000000 -0500 ++++ ./apt-pkg/aptconfiguration.cc 2016-01-25 06:12:27.102248821 -0500 +@@ -35,9 +35,9 @@ // setDefaultConfigurationForCompressors /*{{{*/ static void setDefaultConfigurationForCompressors() { // Set default application paths to check for optional compression types - _config->CndSet("Dir::Bin::bzip2", "/bin/bzip2"); - _config->CndSet("Dir::Bin::xz", "/usr/bin/xz"); +- _config->CndSet("Dir::Bin::lz4", "/usr/bin/lz4"); + _config->CndSet("Dir::Bin::bzip2", "bin/bzip2"); + _config->CndSet("Dir::Bin::xz", "bin/xz"); ++ _config->CndSet("Dir::Bin::lz4", "bin/lz4"); if (FileExists(_config->FindFile("Dir::Bin::xz")) == true) { _config->Set("Dir::Bin::lzma", _config->FindFile("Dir::Bin::xz")); _config->Set("APT::Compressor::lzma::Binary", "xz"); -@@ -49,7 +49,7 @@ +@@ -50,7 +50,7 @@ _config->Set("APT::Compressor::lzma::UncompressArg::", "-d"); } } else { @@ -20,8 +22,8 @@ diff -u -r ../apt-1.1.3/apt-pkg/aptconfiguration.cc ./apt-pkg/aptconfiguration.c + _config->CndSet("Dir::Bin::lzma", "bin/lzma"); if (_config->Exists("APT::Compressor::lzma::CompressArg") == false) { _config->Set("APT::Compressor::lzma::CompressArg::", "--suffix="); - _config->Set("APT::Compressor::lzma::CompressArg::", "-9"); -@@ -218,7 +218,7 @@ + _config->Set("APT::Compressor::lzma::CompressArg::", "-6"); +@@ -220,7 +220,7 @@ // get the environment language codes: LC_MESSAGES (and later LANGUAGE) // we extract both, a long and a short code and then we will // check if we actually need both (rare) or if the short is enough diff --git a/packages/apt/build.sh b/packages/apt/build.sh index 1d326713f..398630af7 100644 --- a/packages/apt/build.sh +++ b/packages/apt/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://packages.debian.org/apt TERMUX_PKG_DESCRIPTION="Front-end for the dpkg package manager" TERMUX_PKG_DEPENDS="liblzma, libgnustl, dpkg, gnupg" -TERMUX_PKG_VERSION=1.1.10 +TERMUX_PKG_VERSION=1.2.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: @@ -52,4 +52,8 @@ termux_step_make_install () { # The trusted.gpg was created with "apt-key add public-key.key": cp $TERMUX_PKG_BUILDER_DIR/trusted.gpg $TERMUX_PREFIX/etc/apt/ + + mkdir -p $TERMUX_PREFIX/etc/bash_completion.d/ + cp $TERMUX_PKG_SRCDIR/completions/bash/apt \ + $TERMUX_PREFIX/etc/bash_completion.d/ } diff --git a/packages/apt/completions-bash-apt.patch b/packages/apt/completions-bash-apt.patch new file mode 100644 index 000000000..059a63a35 --- /dev/null +++ b/packages/apt/completions-bash-apt.patch @@ -0,0 +1,27 @@ +diff -u -r ../apt-1.2/completions/bash/apt ./completions/bash/apt +--- ../apt-1.2/completions/bash/apt 2016-01-15 13:53:52.000000000 -0500 ++++ ./completions/bash/apt 2016-01-25 06:15:46.747246153 -0500 +@@ -2,7 +2,7 @@ + + _apt() + { +- local sourcesdir="/etc/apt/sources.list.d" ++ local sourcesdir="@TERMUX_PREFIX@/etc/apt/sources.list.d" + local cur prev words cword + _init_completion || return + +@@ -66,14 +66,9 @@ + if [[ -n $command ]]; then + case $command in + remove|purge|autoremove) +- if [[ -f /etc/debian_version ]]; then + # Debian system + COMPREPLY=( $( \ + _xfunc dpkg _comp_dpkg_installed_packages $cur ) ) +- else +- # assume RPM based +- _xfunc rpm _rpm_installed_packages +- fi + return 0 + ;; + show|list)