debian/control: Set Standards-Version to 3.9.7

[apt.git] / apt-pkg / aptconfiguration.cc

diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index 74f88640cc54ee2a967e3044df7b9a6a17ccd602..01ae5a64240d0b0ec28e2001a9e813d16de729e0 100644 (file)
--- a/apt-pkg/aptconfiguration.cc
+++ b/apt-pkg/aptconfiguration.cc
@@ -37,12 +37,13 @@ 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");
        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");
                if (_config->Exists("APT::Compressor::lzma::CompressArg") == false) {
                        _config->Set("APT::Compressor::lzma::CompressArg::", "--format=lzma");
-                       _config->Set("APT::Compressor::lzma::CompressArg::", "-9");
+                       _config->Set("APT::Compressor::lzma::CompressArg::", "-6");
                }
                if (_config->Exists("APT::Compressor::lzma::UncompressArg") == false) {
                        _config->Set("APT::Compressor::lzma::UncompressArg::", "--format=lzma");
@@ -52,7 +53,7 @@ static void setDefaultConfigurationForCompressors() {
                _config->CndSet("Dir::Bin::lzma", "/usr/bin/lzma");
                if (_config->Exists("APT::Compressor::lzma::CompressArg") == false) {
                        _config->Set("APT::Compressor::lzma::CompressArg::", "--suffix=");
-                       _config->Set("APT::Compressor::lzma::CompressArg::", "-9");
+                       _config->Set("APT::Compressor::lzma::CompressArg::", "-6");
                }
                if (_config->Exists("APT::Compressor::lzma::UncompressArg") == false) {
                        _config->Set("APT::Compressor::lzma::UncompressArg::", "--suffix=");
@@ -79,6 +80,7 @@ const Configuration::getCompressionTypes(bool const &Cached) {
        _config->CndSet("Acquire::CompressionTypes::bz2","bzip2");
        _config->CndSet("Acquire::CompressionTypes::lzma","lzma");
        _config->CndSet("Acquire::CompressionTypes::gz","gzip");
+       _config->CndSet("Acquire::CompressionTypes::lz4","lz4");
 
        setDefaultConfigurationForCompressors();
        std::vector<APT::Configuration::Compressor> const compressors = getCompressors();
@@ -364,30 +366,36 @@ const Configuration::getCompressors(bool const Cached) {
 
        setDefaultConfigurationForCompressors();
 
-       compressors.push_back(Compressor(".", "", "", NULL, NULL, 1));
+       compressors.push_back(Compressor(".", "", "", NULL, NULL, 0));
+       if (_config->Exists("Dir::Bin::lz4") == false || FileExists(_config->FindFile("Dir::Bin::lz4")) == true)
+               compressors.push_back(Compressor("lz4",".lz4","lz4","-1","-d",50));
+#ifdef HAVE_LZ4
+       else
+               compressors.push_back(Compressor("lz4",".lz4","false", NULL, NULL, 50));
+#endif
        if (_config->Exists("Dir::Bin::gzip") == false || FileExists(_config->FindFile("Dir::Bin::gzip")) == true)
-               compressors.push_back(Compressor("gzip",".gz","gzip","-9n","-d",2));
+               compressors.push_back(Compressor("gzip",".gz","gzip","-6n","-d",100));
 #ifdef HAVE_ZLIB
        else
-               compressors.push_back(Compressor("gzip",".gz","false", NULL, NULL, 2));
+               compressors.push_back(Compressor("gzip",".gz","false", NULL, NULL, 100));
 #endif
        if (_config->Exists("Dir::Bin::xz") == false || FileExists(_config->FindFile("Dir::Bin::xz")) == true)
-               compressors.push_back(Compressor("xz",".xz","xz","-6","-d",3));
+               compressors.push_back(Compressor("xz",".xz","xz","-6","-d",200));
 #ifdef HAVE_LZMA
        else
-               compressors.push_back(Compressor("xz",".xz","false", NULL, NULL, 3));
+               compressors.push_back(Compressor("xz",".xz","false", NULL, NULL, 200));
 #endif
        if (_config->Exists("Dir::Bin::bzip2") == false || FileExists(_config->FindFile("Dir::Bin::bzip2")) == true)
-               compressors.push_back(Compressor("bzip2",".bz2","bzip2","-9","-d",4));
+               compressors.push_back(Compressor("bzip2",".bz2","bzip2","-6","-d",300));
 #ifdef HAVE_BZ2
        else
-               compressors.push_back(Compressor("bzip2",".bz2","false", NULL, NULL, 4));
+               compressors.push_back(Compressor("bzip2",".bz2","false", NULL, NULL, 300));
 #endif
        if (_config->Exists("Dir::Bin::lzma") == false || FileExists(_config->FindFile("Dir::Bin::lzma")) == true)
-               compressors.push_back(Compressor("lzma",".lzma","lzma","-9","-d",5));
+               compressors.push_back(Compressor("lzma",".lzma","lzma","-6","-d",400));
 #ifdef HAVE_LZMA
        else
-               compressors.push_back(Compressor("lzma",".lzma","false", NULL, NULL, 5));
+               compressors.push_back(Compressor("lzma",".lzma","false", NULL, NULL, 400));
 #endif
 
        std::vector<std::string> const comp = _config->FindVector("APT::Compressor");