* apt-inst/deb/debfile.h:

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

diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index cc77eea6faa6be7881fed2dec06110e12d34c63a..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>


@@ -18,6 +20,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <dirent.h>
 #include <stdio.h>

+#include <fcntl.h>

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


@@ -44,6 +47,7 @@ const Configuration::getCompressionTypes(bool const &Cached) {
        _config->CndSet("Acquire::CompressionTypes::gz","gzip");
 
        setDefaultConfigurationForCompressors();
        _config->CndSet("Acquire::CompressionTypes::gz","gzip");
 
        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","");


@@ -57,15 +61,17 @@ const Configuration::getCompressionTypes(bool const &Cached) {
                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,19 +87,19 @@ 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);
        }
 
        // add the special "uncompressed" type
        if (std::find(types.begin(), types.end(), "uncompressed") == types.end())
        {
                types.push_back(Types->Tag);
        }
 
        // add the special "uncompressed" type
        if (std::find(types.begin(), types.end(), "uncompressed") == types.end())
        {

-               string const uncompr = _config->FindFile("Dir::Bin::uncompressed", "");
+               std::string const uncompr = _config->FindFile("Dir::Bin::uncompressed", "");

                if (uncompr.empty() == true || FileExists(uncompr) == true)
                        types.push_back("uncompressed");
        }
                if (uncompr.empty() == true || FileExists(uncompr) == true)
                        types.push_back("uncompressed");
        }


@@ -326,13 +332,60 @@ std::vector<std::string> const Configuration::getArchitectures(bool const &Cache
        // FIXME: It is a bit unclean to have debian specific code here…
        if (archs.empty() == true) {
                archs.push_back(arch);
        // FIXME: It is a bit unclean to have debian specific code here…
        if (archs.empty() == true) {
                archs.push_back(arch);

-               string dpkgcall = _config->Find("Dir::Bin::dpkg", "dpkg");
-               std::vector<string> const dpkgoptions = _config->FindVector("DPkg::options");
-               for (std::vector<string>::const_iterator o = dpkgoptions.begin();
-                    o != dpkgoptions.end(); ++o)
-                       dpkgcall.append(" ").append(*o);
-               dpkgcall.append(" --print-foreign-architectures 2> /dev/null");
-               FILE *dpkg = popen(dpkgcall.c_str(), "r");
+
+               // 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 buf[1024];
                if(dpkg != NULL) {
                        while (fgets(buf, sizeof(buf), dpkg) != NULL) {


@@ -342,13 +395,16 @@ std::vector<std::string> const Configuration::getArchitectures(bool const &Cache
                                        if (arch[0] != '\0') {
                                                char const* archend = arch;
                                                for (; isspace(*archend) == 0 && *archend != '\0'; ++archend);
                                        if (arch[0] != '\0') {
                                                char const* archend = arch;
                                                for (; isspace(*archend) == 0 && *archend != '\0'; ++archend);

-                                               archs.push_back(string(arch, (archend - arch)));
+                                               string a(arch, (archend - arch));
+                                               if (std::find(archs.begin(), archs.end(), a) == archs.end())
+                                                       archs.push_back(a);

                                        }
                                        arch = strtok(NULL, " ");
                                }
                        }
                                        }
                                        arch = strtok(NULL, " ");
                                }
                        }

-                       pclose(dpkg);
+                       fclose(dpkg);

                }
                }

+               ExecWait(dpkgMultiArch, "dpkg --print-foreign-architectures", true);

                return archs;
        }
 
                return archs;
        }
 


@@ -379,9 +435,30 @@ bool const Configuration::checkArchitecture(std::string const &Arch) {
 // setDefaultConfigurationForCompressors                               /*{{{*/
 void Configuration::setDefaultConfigurationForCompressors() {
        // Set default application paths to check for optional compression types
 // setDefaultConfigurationForCompressors                               /*{{{*/
 void Configuration::setDefaultConfigurationForCompressors() {
        // Set default application paths to check for optional compression types

-       _config->CndSet("Dir::Bin::lzma", "/usr/bin/lzma");
-       _config->CndSet("Dir::Bin::xz", "/usr/bin/xz");

        _config->CndSet("Dir::Bin::bzip2", "/bin/bzip2");
        _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                        /*{{{*/
 }
                                                                        /*}}}*/
 // getCompressors - Return Vector of usbale compressors                        /*{{{*/


@@ -400,15 +477,23 @@ const Configuration::getCompressors(bool const Cached) {
 
        setDefaultConfigurationForCompressors();
 
 
        setDefaultConfigurationForCompressors();
 

-       compressors.push_back(Compressor(".", "", "", "", "", 1));
+       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));
        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));
        if (_config->Exists("Dir::Bin::bzip2") == false || FileExists(_config->FindFile("Dir::Bin::bzip2")) == true)
                compressors.push_back(Compressor("bzip2",".bz2","bzip2","-9","-d",3));

-       if (_config->Exists("Dir::Bin::lzma") == false || FileExists(_config->FindFile("Dir::Bin::lzma")) == true)
-               compressors.push_back(Compressor("lzma",".lzma","lzma","-9","-d",4));
+#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)
        if (_config->Exists("Dir::Bin::xz") == false || FileExists(_config->FindFile("Dir::Bin::xz")) == true)

-               compressors.push_back(Compressor("xz",".xz","xz","-6","-d",5));
+               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();
 
        std::vector<std::string> const comp = _config->FindVector("APT::Compressor");
        for (std::vector<std::string>::const_iterator c = comp.begin();


@@ -441,7 +526,7 @@ Configuration::Compressor::Compressor(char const *name, char const *extension,
                                      char const *binary,
                                      char const *compressArg, char const *uncompressArg,
                                      unsigned short const cost) {
                                      char const *binary,
                                      char const *compressArg, char const *uncompressArg,
                                      unsigned short const cost) {

-       std::string const config = string("APT:Compressor::").append(name).append("::");
+       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);
        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);