German translation proof read by Helge Kreutzmann

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

diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index 71aee3f728c001f577f766f33ebfd17f8494044c..8d84409a13b767814970d5c069a67c2ebea47e65 100644 (file)
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -51,8 +51,9 @@ class APT_HIDDEN debReleaseIndexPrivate                                       /*{{{*/
 
    std::vector<std::string> Architectures;
    std::vector<std::string> NoSupportForAll;
 
    std::vector<std::string> Architectures;
    std::vector<std::string> NoSupportForAll;

+   std::map<std::string, std::string> const ReleaseOptions;

 
 

-   debReleaseIndexPrivate() : CheckValidUntil(metaIndex::TRI_UNSET), ValidUntilMin(0), ValidUntilMax(0) {}
+   debReleaseIndexPrivate(std::map<std::string, std::string> const &Options) : CheckValidUntil(metaIndex::TRI_UNSET), ValidUntilMin(0), ValidUntilMax(0), ReleaseOptions(Options) {}

 };
                                                                        /*}}}*/
 // ReleaseIndex::MetaIndex* - display helpers                          /*{{{*/
 };
                                                                        /*}}}*/
 // ReleaseIndex::MetaIndex* - display helpers                          /*{{{*/


@@ -80,28 +81,27 @@ std::string debReleaseIndex::MetaIndexFile(const char *Type) const
    return _config->FindDir("Dir::State::lists") +
       URItoFileName(MetaIndexURI(Type));
 }
    return _config->FindDir("Dir::State::lists") +
       URItoFileName(MetaIndexURI(Type));
 }

-
-std::string debReleaseIndex::MetaIndexURI(const char *Type) const
+static std::string constructMetaIndexURI(std::string URI, std::string const &Dist, char const * const Type)

 {
 {

-   std::string Res;
-

    if (Dist == "/")
    if (Dist == "/")

-      Res = URI;
+      ;

    else if (Dist[Dist.size()-1] == '/')
    else if (Dist[Dist.size()-1] == '/')

-      Res = URI + Dist;
+      URI += Dist;

    else
    else

-      Res = URI + "dists/" + Dist + "/";
-   
-   Res += Type;
-   return Res;
+      URI += "dists/" + Dist + "/";
+   return URI + Type;
+}
+std::string debReleaseIndex::MetaIndexURI(const char *Type) const
+{
+   return constructMetaIndexURI(URI, Dist, Type);

 }
                                                                        /*}}}*/
 // ReleaseIndex Con- and Destructors                                   /*{{{*/
 }
                                                                        /*}}}*/
 // ReleaseIndex Con- and Destructors                                   /*{{{*/

-debReleaseIndex::debReleaseIndex(std::string const &URI, std::string const &Dist) :
-                                       metaIndex(URI, Dist, "deb"), d(new debReleaseIndexPrivate())
+debReleaseIndex::debReleaseIndex(std::string const &URI, std::string const &Dist, std::map<std::string, std::string> const &Options) :
+                                       metaIndex(URI, Dist, "deb"), d(new debReleaseIndexPrivate(Options))

 {}
 {}

-debReleaseIndex::debReleaseIndex(std::string const &URI, std::string const &Dist, bool const pTrusted) :
-                                       metaIndex(URI, Dist, "deb"), d(new debReleaseIndexPrivate())
+debReleaseIndex::debReleaseIndex(std::string const &URI, std::string const &Dist, bool const pTrusted, std::map<std::string, std::string> const &Options) :
+                                       metaIndex(URI, Dist, "deb"), d(new debReleaseIndexPrivate(Options))

 {
    Trusted = pTrusted ? TRI_YES : TRI_NO;
 }
 {
    Trusted = pTrusted ? TRI_YES : TRI_NO;
 }


@@ -113,17 +113,10 @@ debReleaseIndex::~debReleaseIndex() {
 // ReleaseIndex::GetIndexTargets                                       /*{{{*/
 static void GetIndexTargetsFor(char const * const Type, std::string const &URI, std::string const &Dist,
       std::vector<debReleaseIndexPrivate::debSectionEntry> const &entries,
 // ReleaseIndex::GetIndexTargets                                       /*{{{*/
 static void GetIndexTargetsFor(char const * const Type, std::string const &URI, std::string const &Dist,
       std::vector<debReleaseIndexPrivate::debSectionEntry> const &entries,

-      std::vector<IndexTarget> &IndexTargets)
+      std::vector<IndexTarget> &IndexTargets, std::map<std::string, std::string> const &ReleaseOptions)

 {
    bool const flatArchive = (Dist[Dist.length() - 1] == '/');
 {
    bool const flatArchive = (Dist[Dist.length() - 1] == '/');

-   std::string baseURI = URI;
-   if (flatArchive)
-   {
-      if (Dist != "/")
-         baseURI += Dist;
-   }
-   else
-      baseURI += "dists/" + Dist + "/";
+   std::string const baseURI = constructMetaIndexURI(URI, Dist, "");

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


@@ -154,7 +147,7 @@ static void GetIndexTargetsFor(char const * const Type, std::string const &URI,
       DefKeepCompressedAs += "uncompressed";
    }
 
       DefKeepCompressedAs += "uncompressed";
    }
 

-   std::vector<std::string> const NativeArchs = { _config->Find("APT::Architecture"), "all" };
+   std::vector<std::string> const NativeArchs = { _config->Find("APT::Architecture"), "implicit:all" };

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


@@ -217,15 +210,15 @@ static void GetIndexTargetsFor(char const * const Type, std::string const &URI,
                  Options.insert(std::make_pair("SITE", Site));
                  Options.insert(std::make_pair("RELEASE", Release));
                  if (tplMetaKey.find("$(COMPONENT)") != std::string::npos)
                  Options.insert(std::make_pair("SITE", Site));
                  Options.insert(std::make_pair("RELEASE", Release));
                  if (tplMetaKey.find("$(COMPONENT)") != std::string::npos)

-                    Options.insert(std::make_pair("COMPONENT", E->Name));
+                    Options.emplace("COMPONENT", E->Name);

                  if (tplMetaKey.find("$(LANGUAGE)") != std::string::npos)
                  if (tplMetaKey.find("$(LANGUAGE)") != std::string::npos)

-                    Options.insert(std::make_pair("LANGUAGE", *L));
+                    Options.emplace("LANGUAGE", *L);

                  if (tplMetaKey.find("$(ARCHITECTURE)") != std::string::npos)
                  if (tplMetaKey.find("$(ARCHITECTURE)") != std::string::npos)

-                    Options.insert(std::make_pair("ARCHITECTURE", *A));
+                    Options.emplace("ARCHITECTURE", (*A == "implicit:all") ? "all" : *A);

                  else if (tplMetaKey.find("$(NATIVE_ARCHITECTURE)") != std::string::npos)
                  else if (tplMetaKey.find("$(NATIVE_ARCHITECTURE)") != std::string::npos)

-                    Options.insert(std::make_pair("ARCHITECTURE", NativeArch));
+                    Options.emplace("ARCHITECTURE", (NativeArch == "implicit:all") ? "all" : NativeArch);

                  if (tplMetaKey.find("$(NATIVE_ARCHITECTURE)") != std::string::npos)
                  if (tplMetaKey.find("$(NATIVE_ARCHITECTURE)") != std::string::npos)

-                    Options.insert(std::make_pair("NATIVE_ARCHITECTURE", NativeArch));
+                    Options.emplace("NATIVE_ARCHITECTURE", (NativeArch == "implicit:all") ? "all" : NativeArch);

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


@@ -293,8 +286,7 @@ static void GetIndexTargetsFor(char const * const Type, std::string const &URI,
                  }
 
                  // not available in templates, but in the indextarget
                  }
 
                  // 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(ReleaseOptions.begin(), ReleaseOptions.end());

                  Options.insert(std::make_pair("IDENTIFIER", Identifier));
                  Options.insert(std::make_pair("TARGET_OF", Type));
                  Options.insert(std::make_pair("CREATED_BY", *T));
                  Options.insert(std::make_pair("IDENTIFIER", Identifier));
                  Options.insert(std::make_pair("TARGET_OF", Type));
                  Options.insert(std::make_pair("CREATED_BY", *T));


@@ -307,18 +299,23 @@ static void GetIndexTargetsFor(char const * const Type, std::string const &URI,
                  Options.insert(std::make_pair("SOURCESENTRY", E->sourcesEntry));
 
                  bool IsOpt = IsOptional;
                  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")
                  {
                     auto const arch = Options.find("ARCHITECTURE");
                     if (arch != Options.end() && arch->second == "all")

-                       IsOpt = true;
+                    {
+                       // one of them must be implicit:all then
+                       if (*A != "all" && NativeArch != "all")
+                          IsOpt = true;
+                       else // user used arch=all explicitly
+                          Options.emplace("Force-Support-For-All", "yes");
+                    }

                  }
 
                  IndexTarget Target(
                        MetaKey,
                        ShortDesc,
                        LongDesc,
                  }
 
                  IndexTarget Target(
                        MetaKey,
                        ShortDesc,
                        LongDesc,

-                       Options.find("BASE_URI")->second + MetaKey,
+                       baseURI + MetaKey,

                        IsOpt,
                        KeepCompressed,
                        Options
                        IsOpt,
                        KeepCompressed,
                        Options


@@ -345,8 +342,8 @@ static void GetIndexTargetsFor(char const * const Type, std::string const &URI,
 std::vector<IndexTarget> debReleaseIndex::GetIndexTargets() const
 {
    std::vector<IndexTarget> IndexTargets;
 std::vector<IndexTarget> debReleaseIndex::GetIndexTargets() const
 {
    std::vector<IndexTarget> IndexTargets;

-   GetIndexTargetsFor("deb-src", URI, Dist, d->DebSrcEntries, IndexTargets);
-   GetIndexTargetsFor("deb", URI, Dist, d->DebEntries, IndexTargets);
+   GetIndexTargetsFor("deb-src", URI, Dist, d->DebSrcEntries, IndexTargets, d->ReleaseOptions);
+   GetIndexTargetsFor("deb", URI, Dist, d->DebEntries, IndexTargets, d->ReleaseOptions);

    return IndexTargets;
 }
                                                                        /*}}}*/
    return IndexTargets;
 }
                                                                        /*}}}*/


@@ -441,18 +438,13 @@ bool debReleaseIndex::Load(std::string const &Filename, std::string * const Erro
       }
    }
 
       }
    }
 

+   bool AuthPossible = false;

    if(FoundHashSum == false)
    if(FoundHashSum == false)

-   {
-      if (ErrorText != NULL)
-        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;
-   }
+      _error->Warning(_("No Hash entry in Release file %s"), Filename.c_str());
+   else if(FoundStrongHashSum == false)
+      _error->Warning(_("No Hash entry in Release file %s which is considered strong enough for security purposes"), Filename.c_str());
+   else
+      AuthPossible = true;

 
    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)


@@ -540,18 +532,19 @@ bool debReleaseIndex::Load(std::string const &Filename, std::string * const Erro
       }
    }
 
       }
    }
 

-   LoadedSuccessfully = TRI_YES;
-   return true;
+   if (AuthPossible)
+      LoadedSuccessfully = TRI_YES;
+   return AuthPossible;

 }
                                                                        /*}}}*/
 metaIndex * debReleaseIndex::UnloadedClone() const                     /*{{{*/
 {
    if (Trusted == TRI_NO)
 }
                                                                        /*}}}*/
 metaIndex * debReleaseIndex::UnloadedClone() const                     /*{{{*/
 {
    if (Trusted == TRI_NO)

-      return new debReleaseIndex(URI, Dist, false);
+      return new debReleaseIndex(URI, Dist, false, d->ReleaseOptions);

    else if (Trusted == TRI_YES)
    else if (Trusted == TRI_YES)

-      return new debReleaseIndex(URI, Dist, true);
+      return new debReleaseIndex(URI, Dist, true, d->ReleaseOptions);

    else
    else

-      return new debReleaseIndex(URI, Dist);
+      return new debReleaseIndex(URI, Dist, d->ReleaseOptions);

 }
                                                                        /*}}}*/
 bool debReleaseIndex::parseSumData(const char *&Start, const char *End,        /*{{{*/
 }
                                                                        /*}}}*/
 bool debReleaseIndex::parseSumData(const char *&Start, const char *End,        /*{{{*/


@@ -616,7 +609,7 @@ bool debReleaseIndex::parseSumData(const char *&Start, const char *End,     /*{{{*/
 
 bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll)/*{{{*/
 {
 
 bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll)/*{{{*/
 {

-#define APT_TARGET(X) IndexTarget("", X, MetaIndexInfo(X), MetaIndexURI(X), false, false, std::map<std::string,std::string>())
+#define APT_TARGET(X) IndexTarget("", X, MetaIndexInfo(X), MetaIndexURI(X), false, false, d->ReleaseOptions)

    pkgAcqMetaClearSig * const TransactionManager = new pkgAcqMetaClearSig(Owner,
         APT_TARGET("InRelease"), APT_TARGET("Release"), APT_TARGET("Release.gpg"), this);
 #undef APT_TARGET
    pkgAcqMetaClearSig * const TransactionManager = new pkgAcqMetaClearSig(Owner,
         APT_TARGET("InRelease"), APT_TARGET("Release"), APT_TARGET("Release.gpg"), this);
 #undef APT_TARGET


@@ -687,12 +680,19 @@ bool debReleaseIndex::SetSignedBy(std::string const &pSignedBy)
         std::stringstream os;
         std::copy(fingers.begin(), fingers.end(), std::ostream_iterator<std::string>(os, ","));
         SignedBy = os.str();
         std::stringstream os;
         std::copy(fingers.begin(), fingers.end(), std::ostream_iterator<std::string>(os, ","));
         SignedBy = os.str();

-        while (SignedBy[SignedBy.size() - 1] == ',')
-           SignedBy.resize(SignedBy.size() - 1);

       }
       }

+      // Normalize the string: Remove trailing commas
+      while (SignedBy[SignedBy.size() - 1] == ',')
+        SignedBy.resize(SignedBy.size() - 1);
+   }
+   else {
+      // Only compare normalized strings
+      auto pSignedByView = APT::StringView(pSignedBy);
+      while (pSignedByView[pSignedByView.size() - 1] == ',')
+        pSignedByView = pSignedByView.substr(0, pSignedByView.size() - 1);
+      if (pSignedByView != SignedBy)
+        return _error->Error(_("Conflicting values set for option %s regarding source %s %s: %s != %s"), "Signed-By", URI.c_str(), Dist.c_str(), SignedBy.c_str(), pSignedByView.to_string().c_str());

    }
    }

-   else if (SignedBy != pSignedBy)
-      return _error->Error(_("Conflicting values set for option %s regarding source %s %s: %s != %s"), "Signed-By", URI.c_str(), Dist.c_str(), SignedBy.c_str(), pSignedBy.c_str());

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


@@ -724,6 +724,10 @@ bool debReleaseIndex::IsArchitectureSupported(std::string const &arch) const/*{{
                                                                        /*}}}*/
 bool debReleaseIndex::IsArchitectureAllSupportedFor(IndexTarget const &target) const/*{{{*/
 {
                                                                        /*}}}*/
 bool debReleaseIndex::IsArchitectureAllSupportedFor(IndexTarget const &target) const/*{{{*/
 {

+   if (target.Options.find("Force-Support-For-All") != target.Options.end())
+      return true;
+   if (IsArchitectureSupported("all") == false)
+      return false;

    if (d->NoSupportForAll.empty())
       return true;
    return std::find(d->NoSupportForAll.begin(), d->NoSupportForAll.end(), target.Option(IndexTarget::CREATED_BY)) == d->NoSupportForAll.end();
    if (d->NoSupportForAll.empty())
       return true;
    return std::find(d->NoSupportForAll.begin(), d->NoSupportForAll.end(), target.Option(IndexTarget::CREATED_BY)) == d->NoSupportForAll.end();


@@ -749,6 +753,10 @@ std::vector <pkgIndexFile *> *debReleaseIndex::GetIndexFiles()             /*{{{*/
    return Indexes;
 }
                                                                        /*}}}*/
    return Indexes;
 }
                                                                        /*}}}*/

+std::map<std::string, std::string> debReleaseIndex::GetReleaseOptions()
+{
+   return d->ReleaseOptions;
+}

 
 static bool ReleaseFileName(debReleaseIndex const * const That, std::string &ReleaseFile)/*{{{*/
 {
 
 static bool ReleaseFileName(debReleaseIndex const * const That, std::string &ReleaseFile)/*{{{*/
 {


@@ -857,87 +865,62 @@ pkgCache::RlsFileIterator debReleaseIndex::FindInCache(pkgCache &Cache, bool con
 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/
 

-static std::vector<std::string> parsePlusMinusOptions(std::string const &Name, /*{{{*/
-      std::map<std::string, std::string> const &Options, std::vector<std::string> const &defaultValues)
+class APT_HIDDEN debSLTypeDebian : public pkgSourceList::Type          /*{{{*/

 {
 {

-   std::map<std::string, std::string>::const_iterator val = Options.find(Name);
-   std::vector<std::string> Values;
-   if (val != Options.end())
-      Values = VectorizeString(val->second, ',');
-   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())
+   static std::vector<std::string> getDefaultSetOf(std::string const &Name,
+        std::map<std::string, std::string> const &Options, std::vector<std::string> const &defaultValues)

    {
    {

-      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();
-      });
+      auto const val = Options.find(Name);
+      if (val != Options.end())
+        return VectorizeString(val->second, ',');
+      return defaultValues;

    }
    }

-   if ((val = Options.find(Name + "-")) != Options.end())
+   static std::vector<std::string> applyPlusMinusOptions(std::string const &Name,
+        std::map<std::string, std::string> const &Options, std::vector<std::string> &&Values)

    {
    {

-      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;
-}
-                                                                       /*}}}*/
-class APT_HIDDEN debSLTypeDebian : public pkgSourceList::Type          /*{{{*/
-{
-   metaIndex::TriState GetTriStateOption(std::map<std::string, std::string>const &Options, char const * const name) const
-   {
-      std::map<std::string, std::string>::const_iterator const opt = Options.find(name);
-      if (opt != Options.end())
-        return StringToBool(opt->second, false) ? metaIndex::TRI_YES : metaIndex::TRI_NO;
-      return metaIndex::TRI_DONTCARE;
+      auto val = Options.find(Name + "+");
+      if (val != Options.end())
+      {
+        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())
+      {
+        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;

    }
    }

-
-   time_t GetTimeOption(std::map<std::string, std::string>const &Options, char const * const name) const
+   static std::vector<std::string> parsePlusMinusOptions(std::string const &Name,
+        std::map<std::string, std::string> const &Options, std::vector<std::string> const &defaultValues)

    {
    {

-      std::map<std::string, std::string>::const_iterator const opt = Options.find(name);
-      if (opt == Options.end())
-        return 0;
-      return strtoull(opt->second.c_str(), NULL, 10);
+      return applyPlusMinusOptions(Name, Options, getDefaultSetOf(Name, Options, defaultValues));

    }
    }

-
-   protected:
-
-   bool CreateItemInternal(std::vector<metaIndex *> &List, std::string const &URI,
-                          std::string const &Dist, std::string const &Section,
-                          bool const &IsSrc, std::map<std::string, std::string> const &Options) const
+   static std::vector<std::string> parsePlusMinusArchOptions(std::string const &Name,
+        std::map<std::string, std::string> const &Options)

    {
    {

-      debReleaseIndex *Deb = NULL;
-      for (std::vector<metaIndex *>::const_iterator I = List.begin();
-          I != List.end(); ++I)
-      {
-        // We only worry about debian entries here
-        if (strcmp((*I)->GetType(), "deb") != 0)
-           continue;
-
-        /* This check insures that there will be only one Release file
-           queued for all the Packages files and Sources files it
-           corresponds to. */
-        if ((*I)->GetURI() == URI && (*I)->GetDist() == Dist)
-        {
-           Deb = dynamic_cast<debReleaseIndex*>(*I);
-           if (Deb != NULL)
-              break;
-        }
-      }
-
-      // No currently created Release file indexes this entry, so we create a new one.
-      if (Deb == NULL)
+      auto Values = getDefaultSetOf(Name, Options, APT::Configuration::getArchitectures());
+      // all is a very special architecture users shouldn't be concerned with explicitly
+      // but if the user does, do not override the choice
+      auto const val = Options.find(Name + "-");
+      if (val != Options.end())

       {
       {

-        Deb = new debReleaseIndex(URI, Dist);
-        List.push_back(Deb);
+        std::vector<std::string> const minus = VectorizeString(val->second, ',');
+        if (std::find(minus.begin(), minus.end(), "all") != minus.end())
+           return applyPlusMinusOptions(Name, Options, std::move(Values));

       }
       }

-
+      Values = applyPlusMinusOptions(Name, Options, std::move(Values));
+      if (std::find(Values.begin(), Values.end(), "all") == Values.end())
+        Values.push_back("implicit:all");
+      return Values;
+   }
+   static std::vector<std::string> parsePlusMinusTargetOptions(char const * const Name,
+        std::map<std::string, std::string> const &Options)
+   {

       std::vector<std::string> const alltargets = _config->FindVector(std::string("Acquire::IndexTargets::") + Name, "", true);
       std::vector<std::string> deftargets;
       deftargets.reserve(alltargets.size());
       std::vector<std::string> const alltargets = _config->FindVector(std::string("Acquire::IndexTargets::") + Name, "", true);
       std::vector<std::string> deftargets;
       deftargets.reserve(alltargets.size());


@@ -987,13 +970,132 @@ class APT_HIDDEN debSLTypeDebian : public pkgSourceList::Type            /*{{{*/
            return seenOnce.insert(t).second == false;
         }), mytargets.end());
       }
            return seenOnce.insert(t).second == false;
         }), mytargets.end());
       }

+      return mytargets;
+   }
+
+   metaIndex::TriState GetTriStateOption(std::map<std::string, std::string>const &Options, char const * const name) const
+   {
+      std::map<std::string, std::string>::const_iterator const opt = Options.find(name);
+      if (opt != Options.end())
+        return StringToBool(opt->second, false) ? metaIndex::TRI_YES : metaIndex::TRI_NO;
+      return metaIndex::TRI_DONTCARE;
+   }

 
 

-      bool UsePDiffs = _config->FindB("Acquire::PDiffs", true);
+   static time_t GetTimeOption(std::map<std::string, std::string>const &Options, char const * const name)
+   {
+      std::map<std::string, std::string>::const_iterator const opt = Options.find(name);
+      if (opt == Options.end())
+        return 0;
+      return strtoull(opt->second.c_str(), NULL, 10);
+   }
+
+   static bool GetBoolOption(std::map<std::string, std::string> const &Options, char const * const name, bool const defVal)
+   {
+      std::map<std::string, std::string>::const_iterator const opt = Options.find(name);
+      if (opt == Options.end())
+        return defVal;
+      return StringToBool(opt->second, defVal);
+   }
+
+   static std::vector<std::string> GetMapKeys(std::map<std::string, std::string> const &Options)
+   {
+      std::vector<std::string> ret;
+      ret.reserve(Options.size());
+      for (auto &&O: Options)
+        ret.emplace_back(O.first);
+      std::sort(ret.begin(), ret.end());
+      return ret;
+   }
+
+   static bool MapsAreEqual(std::map<std::string, std::string> const &OptionsA,
+        std::map<std::string, std::string> const &OptionsB,
+        std::string const &URI, std::string const &Dist)
+   {
+      auto const KeysA = GetMapKeys(OptionsA);
+      auto const KeysB = GetMapKeys(OptionsB);
+      auto const m = std::mismatch(KeysA.begin(), KeysA.end(), KeysB.begin());
+      if (m.first != KeysA.end())

       {
       {

-        std::map<std::string, std::string>::const_iterator const opt = Options.find("pdiffs");
-        if (opt != Options.end())
-           UsePDiffs = StringToBool(opt->second);
+        if (std::find(KeysB.begin(), KeysB.end(), *m.first) == KeysB.end())
+           return _error->Error(_("Conflicting values set for option %s regarding source %s %s"), m.first->c_str(), "<set>", "<unset>");
+        else
+           return _error->Error(_("Conflicting values set for option %s regarding source %s %s"), m.second->c_str(), "<set>", "<unset>");

       }
       }

+      if (m.second != KeysB.end())
+      {
+        if (std::find(KeysA.begin(), KeysA.end(), *m.second) == KeysA.end())
+           return _error->Error(_("Conflicting values set for option %s regarding source %s %s"), m.first->c_str(), "<set>", "<unset>");
+        else
+           return _error->Error(_("Conflicting values set for option %s regarding source %s %s"), m.second->c_str(), "<set>", "<unset>");
+      }
+      for (auto&& key: KeysA)
+      {
+        if (key == "BASE_URI" || key == "REPO_URI")
+           continue;
+        auto const a = OptionsA.find(key);
+        auto const b = OptionsB.find(key);
+        if (unlikely(a == OptionsA.end() || b == OptionsB.end()) || a->second != b->second)
+           return _error->Error(_("Conflicting values set for option %s regarding source %s %s"), key.c_str(), URI.c_str(), Dist.c_str());
+      }
+      return true;
+   }
+
+   static debReleaseIndex * GetDebReleaseIndexBy(std::vector<metaIndex *> &List, std::string const &URI,
+                          std::string const &Dist, std::map<std::string, std::string> const &Options)
+   {
+      std::map<std::string,std::string> ReleaseOptions = {{
+        { "BASE_URI", constructMetaIndexURI(URI, Dist, "") },
+        { "REPO_URI", URI },
+      }};
+      if (GetBoolOption(Options, "allow-insecure", _config->FindB("Acquire::AllowInsecureRepositories")))
+        ReleaseOptions.emplace("ALLOW_INSECURE", "true");
+      if (GetBoolOption(Options, "allow-weak", _config->FindB("Acquire::AllowWeakRepositories")))
+        ReleaseOptions.emplace("ALLOW_WEAK", "true");
+      if (GetBoolOption(Options, "allow-downgrade-to-insecure", _config->FindB("Acquire::AllowDowngradeToInsecureRepositories")))
+        ReleaseOptions.emplace("ALLOW_DOWNGRADE_TO_INSECURE", "true");
+
+      debReleaseIndex * Deb = nullptr;
+      std::string const FileName = URItoFileName(constructMetaIndexURI(URI, Dist, "Release"));
+      for (auto const &I: List)
+      {
+        // We only worry about debian entries here
+        if (strcmp(I->GetType(), "deb") != 0)
+           continue;
+
+        auto const D = dynamic_cast<debReleaseIndex*>(I);
+        if (unlikely(D == nullptr))
+           continue;
+
+        /* This check ensures that there will be only one Release file
+           queued for all the Packages files and Sources files it
+           corresponds to. */
+        if (URItoFileName(D->MetaIndexURI("Release")) == FileName)
+        {
+           if (MapsAreEqual(ReleaseOptions, D->GetReleaseOptions(), URI, Dist) == false)
+              return nullptr;
+           Deb = D;
+           break;
+        }
+      }
+
+      // No currently created Release file indexes this entry, so we create a new one.
+      if (Deb == nullptr)
+      {
+        Deb = new debReleaseIndex(URI, Dist, ReleaseOptions);
+        List.push_back(Deb);
+      }
+      return Deb;
+   }
+
+   protected:
+
+   bool CreateItemInternal(std::vector<metaIndex *> &List, std::string const &URI,
+                          std::string const &Dist, std::string const &Section,
+                          bool const &IsSrc, std::map<std::string, std::string> const &Options) const
+   {
+      auto const Deb = GetDebReleaseIndexBy(List, URI, Dist, Options);
+
+      bool const UsePDiffs = GetBoolOption(Options, "pdiffs", _config->FindB("Acquire::PDiffs", true));

 
       std::string UseByHash = _config->Find("APT::Acquire::By-Hash", "yes");
       UseByHash = _config->Find("Acquire::By-Hash", UseByHash);
 
       std::string UseByHash = _config->Find("APT::Acquire::By-Hash", "yes");
       UseByHash = _config->Find("Acquire::By-Hash", UseByHash);


@@ -1011,8 +1113,8 @@ class APT_HIDDEN debSLTypeDebian : public pkgSourceList::Type             /*{{{*/
            entry->second,
            IsSrc,
            Section,
            entry->second,
            IsSrc,
            Section,

-           mytargets,
-           parsePlusMinusOptions("arch", Options, APT::Configuration::getArchitectures()),
+           parsePlusMinusTargetOptions(Name, Options),
+           parsePlusMinusArchOptions("arch", Options),

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