debian/control: Set Standards-Version to 3.9.7

[apt.git] / apt-pkg / deb / debmetaindex.cc

diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index b2e9eeb0096b4600c5d5cce2dd8a2368ece3b91c..97f881269dc4b6923ec1040d88879c6edcf29985 100644 (file)
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -21,6 +21,7 @@
 #include <utility>
 #include <vector>
 #include <algorithm>
 #include <utility>
 #include <vector>
 #include <algorithm>

+#include <sstream>

 
 #include <sys/stat.h>
 #include <string.h>
 
 #include <sys/stat.h>
 #include <string.h>


@@ -32,10 +33,13 @@ class APT_HIDDEN debReleaseIndexPrivate                                     /*{{{*/
    public:
    struct APT_HIDDEN debSectionEntry
    {
    public:
    struct APT_HIDDEN debSectionEntry
    {

+      std::string sourcesEntry;

       std::string Name;
       std::vector<std::string> Targets;
       std::vector<std::string> Architectures;
       std::vector<std::string> Languages;
       std::string Name;
       std::vector<std::string> Targets;
       std::vector<std::string> Architectures;
       std::vector<std::string> Languages;

+      bool UsePDiffs;
+      std::string UseByHash;

    };
 
    std::vector<debSectionEntry> DebEntries;
    };
 
    std::vector<debSectionEntry> DebEntries;


@@ -45,6 +49,9 @@ class APT_HIDDEN debReleaseIndexPrivate                                       /*{{{*/
    time_t ValidUntilMin;
    time_t ValidUntilMax;
 
    time_t ValidUntilMin;
    time_t ValidUntilMax;
 

+   std::vector<std::string> Architectures;
+   std::vector<std::string> NoSupportForAll;
+

    debReleaseIndexPrivate() : CheckValidUntil(metaIndex::TRI_UNSET), ValidUntilMin(0), ValidUntilMax(0) {}
 };
                                                                        /*}}}*/
    debReleaseIndexPrivate() : CheckValidUntil(metaIndex::TRI_UNSET), ValidUntilMin(0), ValidUntilMax(0) {}
 };
                                                                        /*}}}*/


@@ -120,21 +127,78 @@ static void GetIndexTargetsFor(char const * const Type, std::string const &URI,
    std::string const Release = (Dist == "/") ? "" : Dist;
    std::string const Site = ::URI::ArchiveOnly(URI);
 
    std::string const Release = (Dist == "/") ? "" : Dist;
    std::string const Site = ::URI::ArchiveOnly(URI);
 

+   std::string DefCompressionTypes;
+   {
+      std::vector<std::string> types = APT::Configuration::getCompressionTypes();
+      if (types.empty() == false)
+      {
+        std::ostringstream os;
+        std::copy(types.begin(), types.end()-1, std::ostream_iterator<std::string>(os, " "));
+        os << *types.rbegin();
+        DefCompressionTypes = os.str();
+      }
+   }
+   std::string DefKeepCompressedAs;
+   {
+      std::vector<APT::Configuration::Compressor> comps = APT::Configuration::getCompressors();
+      if (comps.empty() == false)
+      {
+        std::sort(comps.begin(), comps.end(),
+              [](APT::Configuration::Compressor const &a, APT::Configuration::Compressor const &b) { return a.Cost < b.Cost; });
+        std::ostringstream os;
+        for (auto const &c : comps)
+           if (c.Cost != 0)
+              os << c.Extension.substr(1) << ' ';
+        DefKeepCompressedAs = os.str();
+      }
+      DefKeepCompressedAs += "uncompressed";
+   }
+   std::string const NativeArch = _config->Find("APT::Architecture");

    bool const GzipIndex = _config->FindB("Acquire::GzipIndexes", false);
    for (std::vector<debReleaseIndexPrivate::debSectionEntry>::const_iterator E = entries.begin(); E != entries.end(); ++E)
    {
       for (std::vector<std::string>::const_iterator T = E->Targets.begin(); T != E->Targets.end(); ++T)
       {
    bool const GzipIndex = _config->FindB("Acquire::GzipIndexes", false);
    for (std::vector<debReleaseIndexPrivate::debSectionEntry>::const_iterator E = entries.begin(); E != entries.end(); ++E)
    {
       for (std::vector<std::string>::const_iterator T = E->Targets.begin(); T != E->Targets.end(); ++T)
       {

-#define APT_T_CONFIG(X) _config->Find(std::string("Acquire::IndexTargets::") + Type  + "::" + *T + "::" + (X))
-        std::string const tplMetaKey = APT_T_CONFIG(flatArchive ? "flatMetaKey" : "MetaKey");
-        std::string const tplShortDesc = APT_T_CONFIG("ShortDescription");
-        std::string const tplLongDesc = "$(SITE) " + APT_T_CONFIG(flatArchive ? "flatDescription" : "Description");
-        bool const IsOptional = _config->FindB(std::string("Acquire::IndexTargets::") + Type + "::" + *T + "::Optional", true);
-        bool const KeepCompressed = _config->FindB(std::string("Acquire::IndexTargets::") + Type + "::" + *T + "::KeepCompressed", GzipIndex);
-#undef APT_T_CONFIG
+#define APT_T_CONFIG_STR(X, Y) _config->Find(std::string("Acquire::IndexTargets::") + Type  + "::" + *T + "::" + (X), (Y))
+#define APT_T_CONFIG_BOOL(X, Y) _config->FindB(std::string("Acquire::IndexTargets::") + Type  + "::" + *T + "::" + (X), (Y))
+        std::string const tplMetaKey = APT_T_CONFIG_STR(flatArchive ? "flatMetaKey" : "MetaKey", "");
+        std::string const tplShortDesc = APT_T_CONFIG_STR("ShortDescription", "");
+        std::string const tplLongDesc = "$(SITE) " + APT_T_CONFIG_STR(flatArchive ? "flatDescription" : "Description", "");
+        bool const IsOptional = APT_T_CONFIG_BOOL("Optional", true);
+        bool const KeepCompressed = APT_T_CONFIG_BOOL("KeepCompressed", GzipIndex);
+        bool const DefaultEnabled = APT_T_CONFIG_BOOL("DefaultEnabled", true);
+        bool const UsePDiffs = APT_T_CONFIG_BOOL("PDiffs", E->UsePDiffs);
+        std::string const UseByHash = APT_T_CONFIG_STR("By-Hash", E->UseByHash);
+        std::string const CompressionTypes = APT_T_CONFIG_STR("CompressionTypes", DefCompressionTypes);
+        std::string KeepCompressedAs = APT_T_CONFIG_STR("KeepCompressedAs", "");
+#undef APT_T_CONFIG_BOOL
+#undef APT_T_CONFIG_STR

         if (tplMetaKey.empty())
            continue;
 
         if (tplMetaKey.empty())
            continue;
 

+        if (KeepCompressedAs.empty())
+           KeepCompressedAs = DefKeepCompressedAs;
+        else
+        {
+           std::vector<std::string> const defKeep = VectorizeString(DefKeepCompressedAs, ' ');
+           std::vector<std::string> const valKeep = VectorizeString(KeepCompressedAs, ' ');
+           std::vector<std::string> keep;
+           for (auto const &val : valKeep)
+           {
+              if (val.empty())
+                 continue;
+              if (std::find(defKeep.begin(), defKeep.end(), val) == defKeep.end())
+                 continue;
+              keep.push_back(val);
+           }
+           if (std::find(keep.begin(), keep.end(), "uncompressed") == keep.end())
+              keep.push_back("uncompressed");
+           std::ostringstream os;
+           std::copy(keep.begin(), keep.end()-1, std::ostream_iterator<std::string>(os, " "));
+           os << *keep.rbegin();
+           KeepCompressedAs = os.str();
+        }
+

         for (std::vector<std::string>::const_iterator L = E->Languages.begin(); L != E->Languages.end(); ++L)
         {
            if (*L == "none" && tplMetaKey.find("$(LANGUAGE)") != std::string::npos)
         for (std::vector<std::string>::const_iterator L = E->Languages.begin(); L != E->Languages.end(); ++L)
         {
            if (*L == "none" && tplMetaKey.find("$(LANGUAGE)") != std::string::npos)


@@ -142,7 +206,7 @@ static void GetIndexTargetsFor(char const * const Type, std::string const &URI,
 
            for (std::vector<std::string>::const_iterator A = E->Architectures.begin(); A != E->Architectures.end(); ++A)
            {
 
            for (std::vector<std::string>::const_iterator A = E->Architectures.begin(); A != E->Architectures.end(); ++A)
            {

-
+              // available in templates

               std::map<std::string, std::string> Options;
               Options.insert(std::make_pair("SITE", Site));
               Options.insert(std::make_pair("RELEASE", Release));
               std::map<std::string, std::string> Options;
               Options.insert(std::make_pair("SITE", Site));
               Options.insert(std::make_pair("RELEASE", Release));


@@ -152,10 +216,10 @@ static void GetIndexTargetsFor(char const * const Type, std::string const &URI,
                  Options.insert(std::make_pair("LANGUAGE", *L));
               if (tplMetaKey.find("$(ARCHITECTURE)") != std::string::npos)
                  Options.insert(std::make_pair("ARCHITECTURE", *A));
                  Options.insert(std::make_pair("LANGUAGE", *L));
               if (tplMetaKey.find("$(ARCHITECTURE)") != std::string::npos)
                  Options.insert(std::make_pair("ARCHITECTURE", *A));

-              Options.insert(std::make_pair("BASE_URI", baseURI));
-              Options.insert(std::make_pair("REPO_URI", URI));
-              Options.insert(std::make_pair("TARGET_OF", "deb-src"));
-              Options.insert(std::make_pair("CREATED_BY", *T));
+              else if (tplMetaKey.find("$(NATIVE_ARCHITECTURE)") != std::string::npos)
+                 Options.insert(std::make_pair("ARCHITECTURE", NativeArch));
+              if (tplMetaKey.find("$(NATIVE_ARCHITECTURE)") != std::string::npos)
+                 Options.insert(std::make_pair("NATIVE_ARCHITECTURE", NativeArch));

 
               std::string MetaKey = tplMetaKey;
               std::string ShortDesc = tplShortDesc;
 
               std::string MetaKey = tplMetaKey;
               std::string ShortDesc = tplShortDesc;


@@ -166,12 +230,85 @@ static void GetIndexTargetsFor(char const * const Type, std::string const &URI,
                  ShortDesc = SubstVar(ShortDesc, std::string("$(") + O->first + ")", O->second);
                  LongDesc = SubstVar(LongDesc, std::string("$(") + O->first + ")", O->second);
               }
                  ShortDesc = SubstVar(ShortDesc, std::string("$(") + O->first + ")", O->second);
                  LongDesc = SubstVar(LongDesc, std::string("$(") + O->first + ")", O->second);
               }

+
+              {
+                 auto const dup = std::find_if(IndexTargets.begin(), IndexTargets.end(), [&](IndexTarget const &IT) {
+                    return MetaKey == IT.MetaKey && baseURI == IT.Option(IndexTarget::BASE_URI) &&
+                       E->sourcesEntry == IT.Option(IndexTarget::SOURCESENTRY) && *T == IT.Option(IndexTarget::CREATED_BY);
+                 });
+                 if (dup != IndexTargets.end())
+                 {
+                    if (tplMetaKey.find("$(ARCHITECTURE)") == std::string::npos)
+                       break;
+                    continue;
+                 }
+              }
+
+              {
+                 auto const dup = std::find_if(IndexTargets.begin(), IndexTargets.end(), [&](IndexTarget const &IT) {
+                    return MetaKey == IT.MetaKey && baseURI == IT.Option(IndexTarget::BASE_URI) &&
+                       E->sourcesEntry == IT.Option(IndexTarget::SOURCESENTRY) && *T != IT.Option(IndexTarget::CREATED_BY);
+                 });
+                 if (dup != IndexTargets.end())
+                 {
+                    std::string const dupT = dup->Option(IndexTarget::CREATED_BY);
+                    std::string const dupEntry = dup->Option(IndexTarget::SOURCESENTRY);
+                    //TRANSLATOR: an identifier like Packages; Releasefile key indicating
+                    // a file like main/binary-amd64/Packages; another identifier like Contents;
+                    // filename and linenumber of the sources.list entry currently parsed
+                    _error->Warning(_("Target %s wants to acquire the same file (%s) as %s from source %s"),
+                          T->c_str(), MetaKey.c_str(), dupT.c_str(), dupEntry.c_str());
+                    if (tplMetaKey.find("$(ARCHITECTURE)") == std::string::npos)
+                       break;
+                    continue;
+                 }
+              }
+
+              {
+                 auto const dup = std::find_if(IndexTargets.begin(), IndexTargets.end(), [&](IndexTarget const &T) {
+                    return MetaKey == T.MetaKey && baseURI == T.Option(IndexTarget::BASE_URI) &&
+                       E->sourcesEntry != T.Option(IndexTarget::SOURCESENTRY);
+                 });
+                 if (dup != IndexTargets.end())
+                 {
+                    std::string const dupEntry = dup->Option(IndexTarget::SOURCESENTRY);
+                    //TRANSLATOR: an identifier like Packages; Releasefile key indicating
+                    // a file like main/binary-amd64/Packages; filename and linenumber of
+                    // two sources.list entries
+                    _error->Warning(_("Target %s (%s) is configured multiple times in %s and %s"),
+                          T->c_str(), MetaKey.c_str(), dupEntry.c_str(), E->sourcesEntry.c_str());
+                    if (tplMetaKey.find("$(ARCHITECTURE)") == std::string::npos)
+                       break;
+                    continue;
+                 }
+              }
+
+              // not available in templates, but in the indextarget
+              Options.insert(std::make_pair("BASE_URI", baseURI));
+              Options.insert(std::make_pair("REPO_URI", URI));
+              Options.insert(std::make_pair("TARGET_OF", Type));
+              Options.insert(std::make_pair("CREATED_BY", *T));
+              Options.insert(std::make_pair("PDIFFS", UsePDiffs ? "yes" : "no"));
+              Options.insert(std::make_pair("BY_HASH", UseByHash));
+              Options.insert(std::make_pair("DEFAULTENABLED", DefaultEnabled ? "yes" : "no"));
+              Options.insert(std::make_pair("COMPRESSIONTYPES", CompressionTypes));
+              Options.insert(std::make_pair("KEEPCOMPRESSEDAS", KeepCompressedAs));
+              Options.insert(std::make_pair("SOURCESENTRY", E->sourcesEntry));
+
+              bool IsOpt = IsOptional;
+              if (IsOpt == false)
+              {
+                 auto const arch = Options.find("ARCHITECTURE");
+                 if (arch != Options.end() && arch->second == "all")
+                    IsOpt = true;
+              }
+

               IndexTarget Target(
                     MetaKey,
                     ShortDesc,
                     LongDesc,
                     Options.find("BASE_URI")->second + MetaKey,
               IndexTarget Target(
                     MetaKey,
                     ShortDesc,
                     LongDesc,
                     Options.find("BASE_URI")->second + MetaKey,

-                    IsOptional,
+                    IsOpt,

                     KeepCompressed,
                     Options
                     );
                     KeepCompressed,
                     Options
                     );


@@ -198,15 +335,17 @@ std::vector<IndexTarget> debReleaseIndex::GetIndexTargets() const
    return IndexTargets;
 }
                                                                        /*}}}*/
    return IndexTargets;
 }
                                                                        /*}}}*/

-void debReleaseIndex::AddComponent(bool const isSrc, std::string const &Name,/*{{{*/
+void debReleaseIndex::AddComponent(std::string const &sourcesEntry,    /*{{{*/
+        bool const isSrc, std::string const &Name,

         std::vector<std::string> const &Targets,
         std::vector<std::string> const &Architectures,
         std::vector<std::string> const &Targets,
         std::vector<std::string> const &Architectures,

-        std::vector<std::string> Languages)
+        std::vector<std::string> Languages,
+        bool const usePDiffs, std::string const &useByHash)

 {
    if (Languages.empty() == true)
       Languages.push_back("none");
    debReleaseIndexPrivate::debSectionEntry const entry = {
 {
    if (Languages.empty() == true)
       Languages.push_back("none");
    debReleaseIndexPrivate::debSectionEntry const entry = {

-      Name, Targets, Architectures, Languages
+      sourcesEntry, Name, Targets, Architectures, Languages, usePDiffs, useByHash

    };
    if (isSrc)
       d->DebSrcEntries.push_back(entry);
    };
    if (isSrc)
       d->DebSrcEntries.push_back(entry);


@@ -223,7 +362,7 @@ bool debReleaseIndex::Load(std::string const &Filename, std::string * const Erro
       return false;
 
    pkgTagFile TagFile(&Fd, Fd.Size());
       return false;
 
    pkgTagFile TagFile(&Fd, Fd.Size());

-   if (_error->PendingError() == true)
+   if (Fd.IsOpen() == false || Fd.Failed())

    {
       if (ErrorText != NULL)
         strprintf(*ErrorText, _("Unable to parse Release file %s"),Filename.c_str());
    {
       if (ErrorText != NULL)
         strprintf(*ErrorText, _("Unable to parse Release file %s"),Filename.c_str());


@@ -243,11 +382,23 @@ bool debReleaseIndex::Load(std::string const &Filename, std::string * const Erro
 
    Suite = Section.FindS("Suite");
    Codename = Section.FindS("Codename");
 
    Suite = Section.FindS("Suite");
    Codename = Section.FindS("Codename");

+   {
+      std::string const archs = Section.FindS("Architectures");
+      if (archs.empty() == false)
+        d->Architectures = VectorizeString(archs, ' ');
+   }
+   {
+      std::string const targets = Section.FindS("No-Support-for-Architecture-all");
+      if (targets.empty() == false)
+        d->NoSupportForAll = VectorizeString(targets, ' ');
+   }

 
    bool FoundHashSum = false;
 
    bool FoundHashSum = false;

-   for (int i=0;HashString::SupportedHashes()[i] != NULL; i++)
+   bool FoundStrongHashSum = false;
+   auto const SupportedHashes = HashString::SupportedHashes();
+   for (int i=0; SupportedHashes[i] != NULL; i++)

    {
    {

-      if (!Section.Find(HashString::SupportedHashes()[i], Start, End))
+      if (!Section.Find(SupportedHashes[i], Start, End))

         continue;
 
       std::string Name;
         continue;
 
       std::string Name;


@@ -258,17 +409,20 @@ bool debReleaseIndex::Load(std::string const &Filename, std::string * const Erro
         if (!parseSumData(Start, End, Name, Hash, Size))
            return false;
 
         if (!parseSumData(Start, End, Name, Hash, Size))
            return false;
 

+        HashString const hs(SupportedHashes[i], Hash);

          if (Entries.find(Name) == Entries.end())
          {
             metaIndex::checkSum *Sum = new metaIndex::checkSum;
             Sum->MetaKeyFilename = Name;
             Sum->Size = Size;
            Sum->Hashes.FileSize(Size);
          if (Entries.find(Name) == Entries.end())
          {
             metaIndex::checkSum *Sum = new metaIndex::checkSum;
             Sum->MetaKeyFilename = Name;
             Sum->Size = Size;
            Sum->Hashes.FileSize(Size);

-            APT_IGNORE_DEPRECATED(Sum->Hash = HashString(HashString::SupportedHashes()[i],Hash);)
+            APT_IGNORE_DEPRECATED(Sum->Hash = hs;)

             Entries[Name] = Sum;
          }
             Entries[Name] = Sum;
          }

-         Entries[Name]->Hashes.push_back(HashString(HashString::SupportedHashes()[i],Hash));
+         Entries[Name]->Hashes.push_back(hs);

          FoundHashSum = true;
          FoundHashSum = true;

+        if (FoundStrongHashSum == false && hs.usable() == true)
+           FoundStrongHashSum = true;

       }
    }
 
       }
    }
 


@@ -278,13 +432,18 @@ bool debReleaseIndex::Load(std::string const &Filename, std::string * const Erro
         strprintf(*ErrorText, _("No Hash entry in Release file %s"), Filename.c_str());
       return false;
    }
         strprintf(*ErrorText, _("No Hash entry in Release file %s"), Filename.c_str());
       return false;
    }

+   if(FoundStrongHashSum == false)
+   {
+      if (ErrorText != NULL)
+        strprintf(*ErrorText, _("No Hash entry in Release file %s, which is considered strong enough for security purposes"), Filename.c_str());
+      return false;
+   }

 
    std::string const StrDate = Section.FindS("Date");
    if (RFC1123StrToTime(StrDate.c_str(), Date) == false)
    {
 
    std::string const StrDate = Section.FindS("Date");
    if (RFC1123StrToTime(StrDate.c_str(), Date) == false)
    {

-      if (ErrorText != NULL)
-        strprintf(*ErrorText, _("Invalid 'Date' entry in Release file %s"), Filename.c_str());
-      return false;
+      _error->Warning( _("Invalid 'Date' entry in Release file %s"), Filename.c_str());
+      Date = 0;

    }
 
    bool CheckValidUntil = _config->FindB("Acquire::Check-Valid-Until", true);
    }
 
    bool CheckValidUntil = _config->FindB("Acquire::Check-Valid-Until", true);


@@ -324,15 +483,18 @@ bool debReleaseIndex::Load(std::string const &Filename, std::string * const Erro
            MinAge = _config->FindI(("Acquire::Min-ValidTime::" + Label).c_str(), MinAge);
       }
 
            MinAge = _config->FindI(("Acquire::Min-ValidTime::" + Label).c_str(), MinAge);
       }
 

-      if (MinAge != 0 && ValidUntil != 0) {
-        time_t const min_date = Date + MinAge;
-        if (ValidUntil < min_date)
-           ValidUntil = min_date;
-      }
-      if (MaxAge != 0) {
-        time_t const max_date = Date + MaxAge;
-        if (ValidUntil == 0 || ValidUntil > max_date)
-           ValidUntil = max_date;
+      if (MinAge != 0 || ValidUntil != 0 || MaxAge != 0)
+      {
+        if (MinAge != 0 && ValidUntil != 0) {
+           time_t const min_date = Date + MinAge;
+           if (ValidUntil < min_date)
+              ValidUntil = min_date;
+        }
+        if (MaxAge != 0 && Date != 0) {
+           time_t const max_date = Date + MaxAge;
+           if (ValidUntil == 0 || ValidUntil > max_date)
+              ValidUntil = max_date;
+        }

       }
    }
 
       }
    }
 


@@ -420,10 +582,8 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll)/*{{{*/
 #undef APT_TARGET
    // special case for --print-uris
    if (GetAll)
 #undef APT_TARGET
    // special case for --print-uris
    if (GetAll)

-   {
-      for (std::vector<IndexTarget>::const_iterator Target = targets.begin(); Target != targets.end(); ++Target)
-        new pkgAcqIndex(Owner, TransactionManager, *Target);
-   }
+      for (auto const &Target: targets)
+        new pkgAcqIndex(Owner, TransactionManager, Target);

 
    return true;
 }
 
    return true;
 }


@@ -435,7 +595,7 @@ bool debReleaseIndex::SetTrusted(TriState const pTrusted)
       Trusted = pTrusted;
    else if (Trusted != pTrusted)
       // TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
       Trusted = pTrusted;
    else if (Trusted != pTrusted)
       // TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite

-      return _error->Error(_("Conflicting values set for option %s concerning source %s %s"), "Trusted", URI.c_str(), Dist.c_str());
+      return _error->Error(_("Conflicting values set for option %s regarding source %s %s"), "Trusted", URI.c_str(), Dist.c_str());

    return true;
 }
 bool debReleaseIndex::SetCheckValidUntil(TriState const pCheckValidUntil)
    return true;
 }
 bool debReleaseIndex::SetCheckValidUntil(TriState const pCheckValidUntil)


@@ -443,7 +603,7 @@ bool debReleaseIndex::SetCheckValidUntil(TriState const pCheckValidUntil)
    if (d->CheckValidUntil == TRI_UNSET)
       d->CheckValidUntil = pCheckValidUntil;
    else if (d->CheckValidUntil != pCheckValidUntil)
    if (d->CheckValidUntil == TRI_UNSET)
       d->CheckValidUntil = pCheckValidUntil;
    else if (d->CheckValidUntil != pCheckValidUntil)

-      return _error->Error(_("Conflicting values set for option %s concerning source %s %s"), "Check-Valid-Until", URI.c_str(), Dist.c_str());
+      return _error->Error(_("Conflicting values set for option %s regarding source %s %s"), "Check-Valid-Until", URI.c_str(), Dist.c_str());

    return true;
 }
 bool debReleaseIndex::SetValidUntilMin(time_t const Valid)
    return true;
 }
 bool debReleaseIndex::SetValidUntilMin(time_t const Valid)


@@ -451,7 +611,7 @@ bool debReleaseIndex::SetValidUntilMin(time_t const Valid)
    if (d->ValidUntilMin == 0)
       d->ValidUntilMin = Valid;
    else if (d->ValidUntilMin != Valid)
    if (d->ValidUntilMin == 0)
       d->ValidUntilMin = Valid;
    else if (d->ValidUntilMin != Valid)

-      return _error->Error(_("Conflicting values set for option %s concerning source %s %s"), "Min-ValidTime", URI.c_str(), Dist.c_str());
+      return _error->Error(_("Conflicting values set for option %s regarding source %s %s"), "Min-ValidTime", URI.c_str(), Dist.c_str());

    return true;
 }
 bool debReleaseIndex::SetValidUntilMax(time_t const Valid)
    return true;
 }
 bool debReleaseIndex::SetValidUntilMax(time_t const Valid)


@@ -459,7 +619,7 @@ bool debReleaseIndex::SetValidUntilMax(time_t const Valid)
    if (d->ValidUntilMax == 0)
       d->ValidUntilMax = Valid;
    else if (d->ValidUntilMax != Valid)
    if (d->ValidUntilMax == 0)
       d->ValidUntilMax = Valid;
    else if (d->ValidUntilMax != Valid)

-      return _error->Error(_("Conflicting values set for option %s concerning source %s %s"), "Max-ValidTime", URI.c_str(), Dist.c_str());
+      return _error->Error(_("Conflicting values set for option %s regarding source %s %s"), "Max-ValidTime", URI.c_str(), Dist.c_str());

    return true;
 }
 bool debReleaseIndex::SetSignedBy(std::string const &pSignedBy)
    return true;
 }
 bool debReleaseIndex::SetSignedBy(std::string const &pSignedBy)


@@ -477,12 +637,12 @@ bool debReleaseIndex::SetSignedBy(std::string const &pSignedBy)
         finger.erase(std::remove(finger.begin(), finger.end(), ' '), finger.end());
         std::transform(finger.begin(), finger.end(), finger.begin(), ::toupper);
         if (finger.length() != 40 || finger.find_first_not_of("0123456789ABCDEF") != std::string::npos)
         finger.erase(std::remove(finger.begin(), finger.end(), ' '), finger.end());
         std::transform(finger.begin(), finger.end(), finger.begin(), ::toupper);
         if (finger.length() != 40 || finger.find_first_not_of("0123456789ABCDEF") != std::string::npos)

-           return _error->Error(_("Invalid value set for option %s concerning source %s %s (%s)"), "Signed-By", URI.c_str(), Dist.c_str(), "not a fingerprint");
+           return _error->Error(_("Invalid value set for option %s regarding source %s %s (%s)"), "Signed-By", URI.c_str(), Dist.c_str(), "not a fingerprint");

       }
       SignedBy = pSignedBy;
    }
    else if (SignedBy != pSignedBy)
       }
       SignedBy = pSignedBy;
    }
    else if (SignedBy != pSignedBy)

-      return _error->Error(_("Conflicting values set for option %s concerning source %s %s"), "Signed-By", URI.c_str(), Dist.c_str());
+      return _error->Error(_("Conflicting values set for option %s regarding source %s %s"), "Signed-By", URI.c_str(), Dist.c_str());

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -505,23 +665,36 @@ bool debReleaseIndex::IsTrusted() const
    return FileExists(MetaIndexFile("InRelease"));
 }
                                                                        /*}}}*/
    return FileExists(MetaIndexFile("InRelease"));
 }
                                                                        /*}}}*/

+bool debReleaseIndex::IsArchitectureSupported(std::string const &arch) const/*{{{*/
+{
+   if (d->Architectures.empty())
+      return true;
+   return std::find(d->Architectures.begin(), d->Architectures.end(), arch) != d->Architectures.end();
+}
+                                                                       /*}}}*/
+bool debReleaseIndex::IsArchitectureAllSupportedFor(IndexTarget const &target) const/*{{{*/
+{
+   if (d->NoSupportForAll.empty())
+      return true;
+   return std::find(d->NoSupportForAll.begin(), d->NoSupportForAll.end(), target.Option(IndexTarget::CREATED_BY)) == d->NoSupportForAll.end();
+}
+                                                                       /*}}}*/

 std::vector <pkgIndexFile *> *debReleaseIndex::GetIndexFiles()         /*{{{*/
 {
    if (Indexes != NULL)
       return Indexes;
 
    Indexes = new std::vector<pkgIndexFile*>();
 std::vector <pkgIndexFile *> *debReleaseIndex::GetIndexFiles()         /*{{{*/
 {
    if (Indexes != NULL)
       return Indexes;
 
    Indexes = new std::vector<pkgIndexFile*>();

-   std::vector<IndexTarget> const Targets = GetIndexTargets();

    bool const istrusted = IsTrusted();
    bool const istrusted = IsTrusted();

-   for (std::vector<IndexTarget>::const_iterator T = Targets.begin(); T != Targets.end(); ++T)
+   for (auto const &T: GetIndexTargets())

    {
    {

-      std::string const TargetName = T->Option(IndexTarget::CREATED_BY);
+      std::string const TargetName = T.Option(IndexTarget::CREATED_BY);

       if (TargetName == "Packages")
       if (TargetName == "Packages")

-        Indexes->push_back(new debPackagesIndex(*T, istrusted));
+        Indexes->push_back(new debPackagesIndex(T, istrusted));

       else if (TargetName == "Sources")
       else if (TargetName == "Sources")

-        Indexes->push_back(new debSourcesIndex(*T, istrusted));
+        Indexes->push_back(new debSourcesIndex(T, istrusted));

       else if (TargetName == "Translations")
       else if (TargetName == "Translations")

-        Indexes->push_back(new debTranslationsIndex(*T));
+        Indexes->push_back(new debTranslationsIndex(T));

    }
    return Indexes;
 }
    }
    return Indexes;
 }


@@ -559,8 +732,6 @@ bool debReleaseIndex::Merge(pkgCacheGenerator &Gen,OpProgress * /*Prog*/) const/
    // signature for an 'InRelease' file couldn't be checked
    if (OpenMaybeClearSignedFile(ReleaseFile, Rel) == false)
       return false;
    // signature for an 'InRelease' file couldn't be checked
    if (OpenMaybeClearSignedFile(ReleaseFile, Rel) == false)
       return false;

-   if (_error->PendingError() == true)
-      return false;

 
    // Store the IMS information
    pkgCache::RlsFileIterator File = Gen.GetCurRlsFile();
 
    // Store the IMS information
    pkgCache::RlsFileIterator File = Gen.GetCurRlsFile();


@@ -574,7 +745,7 @@ bool debReleaseIndex::Merge(pkgCacheGenerator &Gen,OpProgress * /*Prog*/) const/
 
    pkgTagFile TagFile(&Rel, Rel.Size());
    pkgTagSection Section;
 
    pkgTagFile TagFile(&Rel, Rel.Size());
    pkgTagSection Section;

-   if (_error->PendingError() == true || TagFile.Step(Section) == false)
+   if (Rel.IsOpen() == false || Rel.Failed() || TagFile.Step(Section) == false)

       return false;
 
    std::string data;
       return false;
 
    std::string data;


@@ -583,6 +754,7 @@ bool debReleaseIndex::Merge(pkgCacheGenerator &Gen,OpProgress * /*Prog*/) const/
    if (data.empty() == false) \
    { \
       map_stringitem_t const storage = Gen.StoreString(pkgCacheGenerator::TYPE, data); \
    if (data.empty() == false) \
    { \
       map_stringitem_t const storage = Gen.StoreString(pkgCacheGenerator::TYPE, data); \

+      if (storage == 0) return false; \

       STORE = storage; \
    }
    APT_INRELEASE(MIXED, "Suite", File->Archive)
       STORE = storage; \
    }
    APT_INRELEASE(MIXED, "Suite", File->Archive)


@@ -594,7 +766,7 @@ bool debReleaseIndex::Merge(pkgCacheGenerator &Gen,OpProgress * /*Prog*/) const/
    Section.FindFlag("NotAutomatic", File->Flags, pkgCache::Flag::NotAutomatic);
    Section.FindFlag("ButAutomaticUpgrades", File->Flags, pkgCache::Flag::ButAutomaticUpgrades);
 
    Section.FindFlag("NotAutomatic", File->Flags, pkgCache::Flag::NotAutomatic);
    Section.FindFlag("ButAutomaticUpgrades", File->Flags, pkgCache::Flag::ButAutomaticUpgrades);
 

-   return !_error->PendingError();
+   return true;

 }
                                                                        /*}}}*/
 // ReleaseIndex::FindInCache - Find this index                         /*{{{*/
 }
                                                                        /*}}}*/
 // ReleaseIndex::FindInCache - Find this index                         /*{{{*/


@@ -645,22 +817,23 @@ static std::vector<std::string> parsePlusMinusOptions(std::string const &Name, /
    else
       Values = defaultValues;
 
    else
       Values = defaultValues;
 

+   // all is a very special architecture users shouldn't be concerned with explicitly
+   if (Name == "arch" && std::find(Values.begin(), Values.end(), "all") == Values.end())
+      Values.push_back("all");
+

    if ((val = Options.find(Name + "+")) != Options.end())
    {
    if ((val = Options.find(Name + "+")) != Options.end())
    {

-      std::vector<std::string> const plusArch = VectorizeString(val->second, ',');
-      for (std::vector<std::string>::const_iterator plus = plusArch.begin(); plus != plusArch.end(); ++plus)
-        if (std::find(Values.begin(), Values.end(), *plus) == Values.end())
-           Values.push_back(*plus);
+      std::vector<std::string> const plus = VectorizeString(val->second, ',');
+      std::copy_if(plus.begin(), plus.end(), std::back_inserter(Values), [&Values](std::string const &v) {
+        return std::find(Values.begin(), Values.end(), v) == Values.end();
+      });

    }
    if ((val = Options.find(Name + "-")) != Options.end())
    {
    }
    if ((val = Options.find(Name + "-")) != Options.end())
    {

-      std::vector<std::string> const minusArch = VectorizeString(val->second, ',');
-      for (std::vector<std::string>::const_iterator minus = minusArch.begin(); minus != minusArch.end(); ++minus)
-      {
-        std::vector<std::string>::iterator kill = std::find(Values.begin(), Values.end(), *minus);
-        if (kill != Values.end())
-           Values.erase(kill);
-      }
+      std::vector<std::string> const minus = VectorizeString(val->second, ',');
+      Values.erase(std::remove_if(Values.begin(), Values.end(), [&minus](std::string const &v) {
+        return std::find(minus.begin(), minus.end(), v) != minus.end();
+      }), Values.end());

    }
    return Values;
 }
    }
    return Values;
 }


@@ -715,12 +888,56 @@ class APT_HIDDEN debSLTypeDebian : public pkgSourceList::Type             /*{{{*/
         List.push_back(Deb);
       }
 
         List.push_back(Deb);
       }
 

+      std::vector<std::string> const alltargets = _config->FindVector(std::string("Acquire::IndexTargets::") + Name, "", true);
+      std::vector<std::string> deftargets;
+      deftargets.reserve(alltargets.size());
+      std::copy_if(alltargets.begin(), alltargets.end(), std::back_inserter(deftargets), [&](std::string const &t) {
+        std::string c = "Acquire::IndexTargets::";
+        c.append(Name).append("::").append(t).append("::DefaultEnabled");
+        return _config->FindB(c, true);
+      });
+      std::vector<std::string> mytargets = parsePlusMinusOptions("target", Options, deftargets);
+      for (auto const &target : alltargets)
+      {
+        std::map<std::string, std::string>::const_iterator const opt = Options.find(target);
+        if (opt == Options.end())
+           continue;
+        auto const tarItr = std::find(mytargets.begin(), mytargets.end(), target);
+        bool const optValue = StringToBool(opt->second);
+        if (optValue == true && tarItr == mytargets.end())
+           mytargets.push_back(target);
+        else if (optValue == false && tarItr != mytargets.end())
+           mytargets.erase(std::remove(mytargets.begin(), mytargets.end(), target), mytargets.end());
+      }
+
+      bool UsePDiffs = _config->FindB("Acquire::PDiffs", true);
+      {
+        std::map<std::string, std::string>::const_iterator const opt = Options.find("pdiffs");
+        if (opt != Options.end())
+           UsePDiffs = StringToBool(opt->second);
+      }
+
+      std::string UseByHash = _config->Find("APT::Acquire::By-Hash", "yes");
+      UseByHash = _config->Find("Acquire::By-Hash", UseByHash);
+      {
+        std::string const host = ::URI(URI).Host;
+        UseByHash = _config->Find("APT::Acquire::" + host + "::By-Hash", UseByHash);
+        UseByHash = _config->Find("Acquire::" + host + "::By-Hash", UseByHash);
+        std::map<std::string, std::string>::const_iterator const opt = Options.find("by-hash");
+        if (opt != Options.end())
+           UseByHash = opt->second;
+      }
+
+      auto const entry = Options.find("sourceslist-entry");

       Deb->AddComponent(
       Deb->AddComponent(

+           entry->second,

            IsSrc,
            Section,
            IsSrc,
            Section,

-           parsePlusMinusOptions("target", Options, _config->FindVector(std::string("Acquire::IndexTargets::") + Name, "", true)),
+           mytargets,

            parsePlusMinusOptions("arch", Options, APT::Configuration::getArchitectures()),
            parsePlusMinusOptions("arch", Options, APT::Configuration::getArchitectures()),

-           parsePlusMinusOptions("lang", Options, APT::Configuration::getLanguages(true))
+           parsePlusMinusOptions("lang", Options, APT::Configuration::getLanguages(true)),
+           UsePDiffs,
+           UseByHash

            );
 
       if (Deb->SetTrusted(GetTriStateOption(Options, "trusted")) == false ||
            );
 
       if (Deb->SetTrusted(GetTriStateOption(Options, "trusted")) == false ||