"support" unsigned Release files without hashes again

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

diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index 10ab0f8443c4d417451c7a8c7ff605bf65685358..a43ec706fd012eab7f3279b6cd43a3811932875f 100644 (file)
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -20,12 +20,10 @@
 #include <string>
 #include <utility>
 #include <vector>
 #include <string>
 #include <utility>
 #include <vector>

-#include <set>

 #include <algorithm>
 #include <algorithm>

+#include <sstream>

 
 

-#include <sys/types.h>

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

-#include <unistd.h>

 #include <string.h>
 
 #include <apti18n.h>
 #include <string.h>
 
 #include <apti18n.h>


@@ -35,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;


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

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

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


@@ -123,18 +126,36 @@ 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 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("APT::Acquire::Targets::") + 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 = APT_T_CONFIG(flatArchive ? "flatDescription" : "Description");
-        bool const IsOptional = _config->FindB(std::string("APT::Acquire::Targets::") + Type + "::" + *T + "::Optional", true);
-        bool const KeepCompressed = _config->FindB(std::string("APT::Acquire::Targets::") + 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);
+#undef APT_T_CONFIG_BOOL
+#undef APT_T_CONFIG_STR

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


@@ -145,7 +166,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));


@@ -155,10 +176,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;


@@ -169,12 +190,84 @@ 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("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
                     );


@@ -201,15 +294,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);


@@ -226,7 +321,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());


@@ -246,6 +341,11 @@ 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, ' ');
+   }

 
    bool FoundHashSum = false;
    for (int i=0;HashString::SupportedHashes()[i] != NULL; i++)
 
    bool FoundHashSum = false;
    for (int i=0;HashString::SupportedHashes()[i] != NULL; i++)


@@ -423,10 +523,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;
 }


@@ -508,23 +606,29 @@ 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();
+}
+                                                                       /*}}}*/

 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;
 }


@@ -562,8 +666,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();


@@ -577,7 +679,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;


@@ -586,6 +688,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)


@@ -597,7 +700,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                         /*{{{*/


@@ -648,22 +751,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;
 }


@@ -718,12 +822,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("APT::Acquire::Targets::") + 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 ||


@@ -758,7 +906,7 @@ class APT_HIDDEN debSLTypeDeb : public debSLTypeDebian                      /*{{{*/
 
    bool CreateItem(std::vector<metaIndex *> &List, std::string const &URI,
                   std::string const &Dist, std::string const &Section,
 
    bool CreateItem(std::vector<metaIndex *> &List, std::string const &URI,
                   std::string const &Dist, std::string const &Section,

-                  std::map<std::string, std::string> const &Options) const
+                  std::map<std::string, std::string> const &Options) const APT_OVERRIDE

    {
       return CreateItemInternal(List, URI, Dist, Section, false, Options);
    }
    {
       return CreateItemInternal(List, URI, Dist, Section, false, Options);
    }


@@ -774,7 +922,7 @@ class APT_HIDDEN debSLTypeDebSrc : public debSLTypeDebian           /*{{{*/
 
    bool CreateItem(std::vector<metaIndex *> &List, std::string const &URI,
                   std::string const &Dist, std::string const &Section,
 
    bool CreateItem(std::vector<metaIndex *> &List, std::string const &URI,
                   std::string const &Dist, std::string const &Section,

-                  std::map<std::string, std::string> const &Options) const
+                  std::map<std::string, std::string> const &Options) const APT_OVERRIDE

    {
       return CreateItemInternal(List, URI, Dist, Section, true, Options);
    }
    {
       return CreateItemInternal(List, URI, Dist, Section, true, Options);
    }


@@ -785,34 +933,5 @@ class APT_HIDDEN debSLTypeDebSrc : public debSLTypeDebian          /*{{{*/
 };
                                                                        /*}}}*/
 
 };
                                                                        /*}}}*/
 

-debDebFileMetaIndex::debDebFileMetaIndex(std::string const &DebFile)   /*{{{*/
-   : metaIndex(DebFile, "local-uri", "deb-dist"), d(NULL), DebFile(DebFile)
-{
-   DebIndex = new debDebPkgFileIndex(DebFile);
-   Indexes = new std::vector<pkgIndexFile *>();
-   Indexes->push_back(DebIndex);
-}
-debDebFileMetaIndex::~debDebFileMetaIndex() {}
-                                                                       /*}}}*/
-class APT_HIDDEN debSLTypeDebFile : public pkgSourceList::Type         /*{{{*/
-{
-   public:
-
-   bool CreateItem(std::vector<metaIndex *> &List, std::string const &URI,
-                  std::string const &/*Dist*/, std::string const &/*Section*/,
-                  std::map<std::string, std::string> const &/*Options*/) const
-   {
-      metaIndex *mi = new debDebFileMetaIndex(URI);
-      List.push_back(mi);
-      return true;
-   }
-
-   debSLTypeDebFile() : Type("deb-file", "Debian local deb file")
-   {
-   }
-};
-                                                                       /*}}}*/
-

 APT_HIDDEN debSLTypeDeb _apt_DebType;
 APT_HIDDEN debSLTypeDebSrc _apt_DebSrcType;
 APT_HIDDEN debSLTypeDeb _apt_DebType;
 APT_HIDDEN debSLTypeDebSrc _apt_DebSrcType;

-APT_HIDDEN debSLTypeDebFile _apt_DebFileType;