X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/68faa04f883627deea6e6d0bd6293e0001498403..295241d4043c55a41259b4846464e1668b2f6a5f:/packages/apt/apt-pkg-aptconfiguration.cc.patch

diff --git a/packages/apt/apt-pkg-aptconfiguration.cc.patch b/packages/apt/apt-pkg-aptconfiguration.cc.patch
index 49508e81..1cce5fea 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