* apt-pkg/acquire-methods.cc:

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

diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index 52f54073cbc0288e582a8ced0f2ccec7cbc15b9d..0fd470ed5aa6d5a73260fe5713870cdf8e2e0fba 100644 (file)
--- a/apt-pkg/aptconfiguration.cc
+++ b/apt-pkg/aptconfiguration.cc
@@ -8,6 +8,8 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include <config.h>
+

 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>


@@ -17,6 +19,8 @@
 
 #include <sys/types.h>
 #include <dirent.h>
 
 #include <sys/types.h>
 #include <dirent.h>

+#include <stdio.h>
+#include <fcntl.h>

 
 #include <algorithm>
 #include <string>
 
 #include <algorithm>
 #include <string>


@@ -38,12 +42,12 @@ const Configuration::getCompressionTypes(bool const &Cached) {
 
        // setup the defaults for the compressiontypes => method mapping
        _config->CndSet("Acquire::CompressionTypes::bz2","bzip2");
 
        // setup the defaults for the compressiontypes => method mapping
        _config->CndSet("Acquire::CompressionTypes::bz2","bzip2");

+       _config->CndSet("Acquire::CompressionTypes::xz","xz");

        _config->CndSet("Acquire::CompressionTypes::lzma","lzma");
        _config->CndSet("Acquire::CompressionTypes::gz","gzip");
 
        _config->CndSet("Acquire::CompressionTypes::lzma","lzma");
        _config->CndSet("Acquire::CompressionTypes::gz","gzip");
 

-       // Set default application paths to check for optional compression types
-       _config->CndSet("Dir::Bin::lzma", "/usr/bin/lzma");
-       _config->CndSet("Dir::Bin::bzip2", "/bin/bzip2");
+       setDefaultConfigurationForCompressors();
+       std::vector<APT::Configuration::Compressor> const compressors = getCompressors();

 
        // accept non-list order as override setting for config settings on commandline
        std::string const overrideOrder = _config->Find("Acquire::CompressionTypes::Order","");
 
        // accept non-list order as override setting for config settings on commandline
        std::string const overrideOrder = _config->Find("Acquire::CompressionTypes::Order","");


@@ -53,19 +57,21 @@ const Configuration::getCompressionTypes(bool const &Cached) {
        // load the order setting into our vector
        std::vector<std::string> const order = _config->FindVector("Acquire::CompressionTypes::Order");
        for (std::vector<std::string>::const_iterator o = order.begin();
        // load the order setting into our vector
        std::vector<std::string> const order = _config->FindVector("Acquire::CompressionTypes::Order");
        for (std::vector<std::string>::const_iterator o = order.begin();

-            o != order.end(); o++) {
+            o != order.end(); ++o) {

                if ((*o).empty() == true)
                        continue;
                // ignore types we have no method ready to use
                if ((*o).empty() == true)
                        continue;
                // ignore types we have no method ready to use

-               if (_config->Exists(string("Acquire::CompressionTypes::").append(*o)) == false)
+               std::string const method = std::string("Acquire::CompressionTypes::").append(*o);
+               if (_config->Exists(method) == false)

                        continue;
                // ignore types we have no app ready to use
                        continue;
                // ignore types we have no app ready to use

-               string const appsetting = string("Dir::Bin::").append(*o);
-               if (_config->Exists(appsetting) == true) {
-                       std::string const app = _config->FindFile(appsetting.c_str(), "");
-                       if (app.empty() == false && FileExists(app) == false)
-                               continue;
-               }
+               std::string const app = _config->Find(method);
+               std::vector<APT::Configuration::Compressor>::const_iterator c = compressors.begin();
+               for (; c != compressors.end(); ++c)
+                       if (c->Name == app)
+                               break;
+               if (c == compressors.end())
+                       continue;

                types.push_back(*o);
        }
 
                types.push_back(*o);
        }
 


@@ -81,15 +87,23 @@ const Configuration::getCompressionTypes(bool const &Cached) {
                if (std::find(types.begin(),types.end(),Types->Tag) != types.end())
                        continue;
                // ignore types we have no app ready to use
                if (std::find(types.begin(),types.end(),Types->Tag) != types.end())
                        continue;
                // ignore types we have no app ready to use

-               string const appsetting = string("Dir::Bin::").append(Types->Value);
-               if (appsetting.empty() == false && _config->Exists(appsetting) == true) {
-                       std::string const app = _config->FindFile(appsetting.c_str(), "");
-                       if (app.empty() == false && FileExists(app) == false)
-                               continue;
-               }
+               std::vector<APT::Configuration::Compressor>::const_iterator c = compressors.begin();
+               for (; c != compressors.end(); ++c)
+                       if (c->Name == Types->Value)
+                               break;
+               if (c == compressors.end())
+                       continue;

                types.push_back(Types->Tag);
        }
 
                types.push_back(Types->Tag);
        }
 

+       // add the special "uncompressed" type
+       if (std::find(types.begin(), types.end(), "uncompressed") == types.end())
+       {
+               std::string const uncompr = _config->FindFile("Dir::Bin::uncompressed", "");
+               if (uncompr.empty() == true || FileExists(uncompr) == true)
+                       types.push_back("uncompressed");
+       }
+

        return types;
 }
                                                                        /*}}}*/
        return types;
 }
                                                                        /*}}}*/


@@ -132,7 +146,7 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
                for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D)) {
                        string const name = Ent->d_name;
                        size_t const foundDash = name.rfind("-");
                for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D)) {
                        string const name = Ent->d_name;
                        size_t const foundDash = name.rfind("-");

-                       size_t const foundUnderscore = name.rfind("_");
+                       size_t const foundUnderscore = name.rfind("_", foundDash);

                        if (foundDash == string::npos || foundUnderscore == string::npos ||
                            foundDash <= foundUnderscore ||
                            name.substr(foundUnderscore+1, foundDash-(foundUnderscore+1)) != "Translation")
                        if (foundDash == string::npos || foundUnderscore == string::npos ||
                            foundDash <= foundUnderscore ||
                            name.substr(foundUnderscore+1, foundDash-(foundUnderscore+1)) != "Translation")


@@ -143,7 +157,7 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
                        // Skip unusual files, like backups or that alike
                        string::const_iterator s = c.begin();
                        for (;s != c.end(); ++s) {
                        // Skip unusual files, like backups or that alike
                        string::const_iterator s = c.begin();
                        for (;s != c.end(); ++s) {

-                               if (isalpha(*s) == 0)
+                               if (isalpha(*s) == 0 && *s != '_')

                                        break;
                        }
                        if (s != c.end())
                                        break;
                        }
                        if (s != c.end())


@@ -155,33 +169,6 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
        }
        closedir(D);
 
        }
        closedir(D);
 

-       // 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
-       string const envMsg = string(Locale == 0 ? std::setlocale(LC_MESSAGES, NULL) : *Locale);
-       size_t const lenShort = (envMsg.find('_') != string::npos) ? envMsg.find('_') : 2;
-       size_t const lenLong = (envMsg.find_first_of(".@") != string::npos) ? envMsg.find_first_of(".@") : (lenShort + 3);
-
-       string envLong = envMsg.substr(0,lenLong);
-       string const envShort = envLong.substr(0,lenShort);
-       bool envLongIncluded = true;
-
-       // to save the servers from unneeded queries, we only try also long codes
-       // for languages it is realistic to have a long code translation file…
-       // TODO: Improve translation acquire system to drop them dynamic
-       char const *needLong[] = { "cs", "en", "pt", "sv", "zh", NULL };
-       if (envLong != envShort) {
-               for (char const **l = needLong; *l != NULL; l++)
-                       if (envShort.compare(*l) == 0) {
-                               envLongIncluded = false;
-                               break;
-                       }
-       }
-
-       // we don't add the long code, but we allow the user to do so
-       if (envLongIncluded == true)
-               envLong.clear();
-

        // FIXME: Remove support for the old APT::Acquire::Translation
        // it was undocumented and so it should be not very widthly used
        string const oldAcquire = _config->Find("APT::Acquire::Translation","");
        // FIXME: Remove support for the old APT::Acquire::Translation
        // it was undocumented and so it should be not very widthly used
        string const oldAcquire = _config->Find("APT::Acquire::Translation","");


@@ -203,12 +190,22 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
                        return codes;
        }
 
                        return codes;
        }
 

-       // It is very likely we will need to environment codes later,
+       // 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
+       string const envMsg = string(Locale == 0 ? std::setlocale(LC_MESSAGES, NULL) : *Locale);
+       size_t const lenShort = (envMsg.find('_') != string::npos) ? envMsg.find('_') : 2;
+       size_t const lenLong = (envMsg.find_first_of(".@") != string::npos) ? envMsg.find_first_of(".@") : (lenShort + 3);
+
+       string const envLong = envMsg.substr(0,lenLong);
+       string const envShort = envLong.substr(0,lenShort);
+
+       // It is very likely we will need the environment codes later,

        // so let us generate them now from LC_MESSAGES and LANGUAGE
        std::vector<string> environment;
        if (envShort != "C") {
                // take care of LC_MESSAGES
        // so let us generate them now from LC_MESSAGES and LANGUAGE
        std::vector<string> environment;
        if (envShort != "C") {
                // take care of LC_MESSAGES

-               if (envLongIncluded == false)
+               if (envLong != envShort)

                        environment.push_back(envLong);
                environment.push_back(envShort);
                // take care of LANGUAGE
                        environment.push_back(envLong);
                environment.push_back(envShort);
                // take care of LANGUAGE


@@ -225,16 +222,6 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
                                        continue;
                                if (std::find(environment.begin(), environment.end(), *e) != environment.end())
                                        continue;
                                        continue;
                                if (std::find(environment.begin(), environment.end(), *e) != environment.end())
                                        continue;

-                               if (e->find('_') != string::npos) {
-                                       // Drop LongCodes here - ShortCodes are also included
-                                       string const shorty = e->substr(0, e->find('_'));
-                                       char const **n = needLong;
-                                       for (; *n != NULL; ++n)
-                                               if (shorty == *n)
-                                                       break;
-                                       if (*n == NULL)
-                                               continue;
-                               }

                                ++addedLangs;
                                environment.push_back(*e);
                        }
                                ++addedLangs;
                                environment.push_back(*e);
                        }


@@ -243,7 +230,7 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
                environment.push_back("en");
        }
 
                environment.push_back("en");
        }
 

-       // Support settings like Acquire::Translation=none on the command line to
+       // Support settings like Acquire::Languages=none on the command line to

        // override the configuration settings vector of languages.
        string const forceLang = _config->Find("Acquire::Languages","");
        if (forceLang.empty() == false) {
        // override the configuration settings vector of languages.
        string const forceLang = _config->Find("Acquire::Languages","");
        if (forceLang.empty() == false) {


@@ -251,6 +238,8 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
                        codes = environment;
                } else if (forceLang != "none")
                        codes.push_back(forceLang);
                        codes = environment;
                } else if (forceLang != "none")
                        codes.push_back(forceLang);

+               else //if (forceLang == "none")
+                       builtin.clear();

                allCodes = codes;
                for (std::vector<string>::const_iterator b = builtin.begin();
                     b != builtin.end(); ++b)
                allCodes = codes;
                for (std::vector<string>::const_iterator b = builtin.begin();
                     b != builtin.end(); ++b)


@@ -293,7 +282,7 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
        // then needed and ensure the codes are not listed twice.
        bool noneSeen = false;
        for (std::vector<string>::const_iterator l = lang.begin();
        // then needed and ensure the codes are not listed twice.
        bool noneSeen = false;
        for (std::vector<string>::const_iterator l = lang.begin();

-            l != lang.end(); l++) {
+            l != lang.end(); ++l) {

                if (*l == "environment") {
                        for (std::vector<string>::const_iterator e = environment.begin();
                             e != environment.end(); ++e) {
                if (*l == "environment") {
                        for (std::vector<string>::const_iterator e = environment.begin();
                             e != environment.end(); ++e) {


@@ -334,14 +323,94 @@ std::vector<std::string> const Configuration::getArchitectures(bool const &Cache
        if (likely(Cached == true) && archs.empty() == false)
                return archs;
 
        if (likely(Cached == true) && archs.empty() == false)
                return archs;
 

-       archs = _config->FindVector("APT::Architectures");

        string const arch = _config->Find("APT::Architecture");
        string const arch = _config->Find("APT::Architecture");

+       archs = _config->FindVector("APT::Architectures");
+

        if (unlikely(arch.empty() == true))
                return archs;
 
        if (unlikely(arch.empty() == true))
                return archs;
 

+       // FIXME: It is a bit unclean to have debian specific code here…
+       if (archs.empty() == true) {
+               archs.push_back(arch);
+
+               // Generate the base argument list for dpkg
+               std::vector<const char *> Args;
+               string Tmp = _config->Find("Dir::Bin::dpkg","dpkg");
+               {
+                       string const dpkgChrootDir = _config->FindDir("DPkg::Chroot-Directory", "/");
+                       size_t dpkgChrootLen = dpkgChrootDir.length();
+                       if (dpkgChrootDir != "/" && Tmp.find(dpkgChrootDir) == 0) {
+                               if (dpkgChrootDir[dpkgChrootLen - 1] == '/')
+                                       --dpkgChrootLen;
+                               Tmp = Tmp.substr(dpkgChrootLen);
+                       }
+               }
+               Args.push_back(Tmp.c_str());
+
+               // Stick in any custom dpkg options
+               ::Configuration::Item const *Opts = _config->Tree("DPkg::Options");
+               if (Opts != 0) {
+                       Opts = Opts->Child;
+                       for (; Opts != 0; Opts = Opts->Next)
+                       {
+                               if (Opts->Value.empty() == true)
+                                       continue;
+                               Args.push_back(Opts->Value.c_str());
+                       }
+               }
+
+               Args.push_back("--print-foreign-architectures");
+               Args.push_back(NULL);
+
+               int external[2] = {-1, -1};
+               if (pipe(external) != 0)
+               {
+                       _error->WarningE("getArchitecture", "Can't create IPC pipe for dpkg --print-foreign-architectures");
+                       return archs;
+               }
+
+               pid_t dpkgMultiArch = ExecFork();
+               if (dpkgMultiArch == 0) {
+                       close(external[0]);
+                       std::string const chrootDir = _config->FindDir("DPkg::Chroot-Directory");
+                       if (chrootDir != "/" && chroot(chrootDir.c_str()) != 0)
+                               _error->WarningE("getArchitecture", "Couldn't chroot into %s for dpkg --print-foreign-architectures", chrootDir.c_str());
+                       int const nullfd = open("/dev/null", O_RDONLY);
+                       dup2(nullfd, STDIN_FILENO);
+                       dup2(external[1], STDOUT_FILENO);
+                       dup2(nullfd, STDERR_FILENO);
+                       execvp(Args[0], (char**) &Args[0]);
+                       _error->WarningE("getArchitecture", "Can't detect foreign architectures supported by dpkg!");
+                       _exit(100);
+               }
+               close(external[1]);
+
+               FILE *dpkg = fdopen(external[0], "r");
+               char buf[1024];
+               if(dpkg != NULL) {
+                       while (fgets(buf, sizeof(buf), dpkg) != NULL) {
+                               char* arch = strtok(buf, " ");
+                               while (arch != NULL) {
+                                       for (; isspace(*arch) != 0; ++arch);
+                                       if (arch[0] != '\0') {
+                                               char const* archend = arch;
+                                               for (; isspace(*archend) == 0 && *archend != '\0'; ++archend);
+                                               string a(arch, (archend - arch));
+                                               if (std::find(archs.begin(), archs.end(), a) == archs.end())
+                                                       archs.push_back(a);
+                                       }
+                                       arch = strtok(NULL, " ");
+                               }
+                       }
+                       fclose(dpkg);
+               }
+               ExecWait(dpkgMultiArch, "dpkg --print-foreign-architectures", true);
+               return archs;
+       }
+

        if (archs.empty() == true ||
            std::find(archs.begin(), archs.end(), arch) == archs.end())
        if (archs.empty() == true ||
            std::find(archs.begin(), archs.end(), arch) == archs.end())

-               archs.push_back(arch);
+               archs.insert(archs.begin(), arch);

 
        // erase duplicates and empty strings
        for (std::vector<string>::reverse_iterator a = archs.rbegin();
 
        // erase duplicates and empty strings
        for (std::vector<string>::reverse_iterator a = archs.rbegin();


@@ -363,4 +432,115 @@ bool const Configuration::checkArchitecture(std::string const &Arch) {
        return (std::find(archs.begin(), archs.end(), Arch) != archs.end());
 }
                                                                        /*}}}*/
        return (std::find(archs.begin(), archs.end(), Arch) != archs.end());
 }
                                                                        /*}}}*/

+// setDefaultConfigurationForCompressors                               /*{{{*/
+void Configuration::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");
+       if (FileExists(_config->FindFile("Dir::Bin::xz")) == true) {
+               _config->Clear("Dir::Bin::lzma");
+               _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");
+               }
+               if (_config->Exists("APT::Compressor::lzma::UncompressArg") == false) {
+                       _config->Set("APT::Compressor::lzma::UncompressArg::", "--format=lzma");
+                       _config->Set("APT::Compressor::lzma::UncompressArg::", "-d");
+               }
+       } else {
+               _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");
+               }
+               if (_config->Exists("APT::Compressor::lzma::UncompressArg") == false) {
+                       _config->Set("APT::Compressor::lzma::UncompressArg::", "--suffix=");
+                       _config->Set("APT::Compressor::lzma::UncompressArg::", "-d");
+               }
+       }
+}
+                                                                       /*}}}*/
+// getCompressors - Return Vector of usbale compressors                        /*{{{*/
+// ---------------------------------------------------------------------
+/* return a vector of compressors used by apt-ftparchive in the
+   multicompress functionality or to detect data.tar files */
+std::vector<APT::Configuration::Compressor>
+const Configuration::getCompressors(bool const Cached) {
+       static std::vector<APT::Configuration::Compressor> compressors;
+       if (compressors.empty() == false) {
+               if (Cached == true)
+                       return compressors;
+               else
+                       compressors.clear();
+       }
+
+       setDefaultConfigurationForCompressors();
+
+       compressors.push_back(Compressor(".", "", "", NULL, NULL, 1));
+       if (_config->Exists("Dir::Bin::gzip") == false || FileExists(_config->FindFile("Dir::Bin::gzip")) == true)
+               compressors.push_back(Compressor("gzip",".gz","gzip","-9n","-d",2));
+#ifdef HAVE_ZLIB
+       else
+               compressors.push_back(Compressor("gzip",".gz","false", NULL, NULL, 2));
+#endif
+       if (_config->Exists("Dir::Bin::bzip2") == false || FileExists(_config->FindFile("Dir::Bin::bzip2")) == true)
+               compressors.push_back(Compressor("bzip2",".bz2","bzip2","-9","-d",3));
+#ifdef HAVE_BZ2
+       else
+               compressors.push_back(Compressor("bzip2",".bz2","false", NULL, NULL, 3));
+#endif
+       if (_config->Exists("Dir::Bin::xz") == false || FileExists(_config->FindFile("Dir::Bin::xz")) == true)
+               compressors.push_back(Compressor("xz",".xz","xz","-6","-d",4));
+       if (_config->Exists("Dir::Bin::lzma") == false || FileExists(_config->FindFile("Dir::Bin::lzma")) == true)
+               compressors.push_back(Compressor("lzma",".lzma","lzma","-9","-d",5));
+
+       std::vector<std::string> const comp = _config->FindVector("APT::Compressor");
+       for (std::vector<std::string>::const_iterator c = comp.begin();
+            c != comp.end(); ++c) {
+               if (*c == "." || *c == "gzip" || *c == "bzip2" || *c == "lzma" || *c == "xz")
+                       continue;
+               compressors.push_back(Compressor(c->c_str(), std::string(".").append(*c).c_str(), c->c_str(), "-9", "-d", 100));
+       }
+
+       return compressors;
+}
+                                                                       /*}}}*/
+// getCompressorExtensions - supported data.tar extensions             /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+std::vector<std::string> const Configuration::getCompressorExtensions() {
+       std::vector<APT::Configuration::Compressor> const compressors = getCompressors();
+       std::vector<std::string> ext;
+       for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressors.begin();
+            c != compressors.end(); ++c)
+               if (c->Extension.empty() == false && c->Extension != ".")
+                       ext.push_back(c->Extension);
+       return ext;
+}
+                                                                       /*}}}*/
+// Compressor constructor                                              /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+Configuration::Compressor::Compressor(char const *name, char const *extension,
+                                     char const *binary,
+                                     char const *compressArg, char const *uncompressArg,
+                                     unsigned short const cost) {
+       std::string const config = std::string("APT::Compressor::").append(name).append("::");
+       Name = _config->Find(std::string(config).append("Name"), name);
+       Extension = _config->Find(std::string(config).append("Extension"), extension);
+       Binary = _config->Find(std::string(config).append("Binary"), binary);
+       Cost = _config->FindI(std::string(config).append("Cost"), cost);
+       std::string const compConf = std::string(config).append("CompressArg");
+       if (_config->Exists(compConf) == true)
+               CompressArgs = _config->FindVector(compConf);
+       else if (compressArg != NULL)
+               CompressArgs.push_back(compressArg);
+       std::string const uncompConf = std::string(config).append("UncompressArg");
+       if (_config->Exists(uncompConf) == true)
+               UncompressArgs = _config->FindVector(uncompConf);
+       else if (uncompressArg != NULL)
+               UncompressArgs.push_back(uncompressArg);
+}
+                                                                       /*}}}*/

 }
 }