From f359b7e8c03884cd9f097d4b3ff8b8b8be8053ba Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 1 Dec 2015 14:09:23 +0100 Subject: require explicit paths to dsc/control as we do for deb files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise a user is subject to unexpected content-injection depending on which directory she happens to start apt in. This also cleans up the code requiring less implementation details in build-dep which is always good. Technically, this is an ABI break as we override virtual methods, but that they weren't overridden was a mistake resulting in pure classes, which shouldn't be pure, so they were unusable – and as they are new in 1.1 nobody is using them yet (and hopefully ever as they are borderline implementation details). Closes: 806693 --- apt-private/private-source.cc | 113 ++++++++++++++++++++++-------------------- 1 file changed, 59 insertions(+), 54 deletions(-) (limited to 'apt-private') diff --git a/apt-private/private-source.cc b/apt-private/private-source.cc index 546aa523f..52487248f 100644 --- a/apt-private/private-source.cc +++ b/apt-private/private-source.cc @@ -915,9 +915,39 @@ static bool InstallBuildDepsLoop(CacheFile &Cache, std::string const &Src, // --------------------------------------------------------------------- /* This function will look at the build depends list of the given source package and install the necessary packages to make it true, or fail. */ +static std::vector GetBuildDeps(pkgSrcRecords::Parser * const Last, + char const * const Src, bool const StripMultiArch, std::string const &hostArch) +{ + std::vector BuildDeps; + // FIXME: Can't specify architecture to use for [wildcard] matching, so switch default arch temporary + if (hostArch.empty() == false) + { + std::string nativeArch = _config->Find("APT::Architecture"); + _config->Set("APT::Architecture", hostArch); + bool Success = Last->BuildDepends(BuildDeps, _config->FindB("APT::Get::Arch-Only", false), StripMultiArch); + _config->Set("APT::Architecture", nativeArch); + if (Success == false) + { + _error->Error(_("Unable to get build-dependency information for %s"), Src); + return {}; + } + } + else if (Last->BuildDepends(BuildDeps, _config->FindB("APT::Get::Arch-Only", false), StripMultiArch) == false) + { + _error->Error(_("Unable to get build-dependency information for %s"), Src); + return {}; + } + + if (BuildDeps.empty() == true) + ioprintf(c1out,_("%s has no build depends.\n"), Src); + + return BuildDeps; +} bool DoBuildDep(CommandLine &CmdL) { CacheFile Cache; + std::vector VolatileCmdL; + Cache.GetSourceList()->AddVolatileFiles(CmdL, &VolatileCmdL); _config->Set("APT::Install-Recommends", false); @@ -926,7 +956,7 @@ bool DoBuildDep(CommandLine &CmdL) if (Cache.Open(WantLock) == false) return false; - if (CmdL.FileSize() <= 1) + if (CmdL.FileSize() <= 1 && VolatileCmdL.empty()) return _error->Error(_("Must specify at least one package to check builddeps for")); // Read the source list @@ -974,64 +1004,39 @@ bool DoBuildDep(CommandLine &CmdL) return false; } - unsigned J = 0; - for (const char **I = CmdL.FileList + 1; *I != 0; I++, J++) + // FIXME: Avoid volatile sources == cmdline assumption { - std::string Src; - pkgSrcRecords::Parser *Last = 0; - std::unique_ptr LastOwner; - - // an unpacked debian source tree - using APT::String::Startswith; - if ((Startswith(*I, "./") || Startswith(*I, "/")) && - DirectoryExists(*I)) - { - ioprintf(c1out, _("Note, using directory '%s' to get the build dependencies\n"), *I); - // FIXME: how can we make this more elegant? - std::string TypeName = "Debian control file"; - pkgIndexFile::Type *Type = pkgIndexFile::Type::GetType(TypeName.c_str()); - if(Type != NULL) - LastOwner.reset(Last = Type->CreateSrcPkgParser(*I)); - } - // if its a local file (e.g. .dsc) use this - else if (FileExists(*I)) + auto const VolatileSources = List->GetVolatileFiles(); + if (VolatileSources.size() == VolatileCmdL.size()) { - ioprintf(c1out, _("Note, using file '%s' to get the build dependencies\n"), *I); - - // see if we can get a parser for this pkgIndexFile type - std::string TypeName = "Debian " + flExtension(*I) + " file"; - pkgIndexFile::Type *Type = pkgIndexFile::Type::GetType(TypeName.c_str()); - if(Type != NULL) - LastOwner.reset(Last = Type->CreateSrcPkgParser(*I)); - } else { - // normal case, search the cache for the source file - Last = FindSrc(*I,SrcRecs,Src,Cache); - } - - if (Last == 0) - return _error->Error(_("Unable to find a source package for %s"),Src.c_str()); - - // Process the build-dependencies - std::vector BuildDeps; - // FIXME: Can't specify architecture to use for [wildcard] matching, so switch default arch temporary - if (hostArch.empty() == false) - { - std::string nativeArch = _config->Find("APT::Architecture"); - _config->Set("APT::Architecture", hostArch); - bool Success = Last->BuildDepends(BuildDeps, _config->FindB("APT::Get::Arch-Only", false), StripMultiArch); - _config->Set("APT::Architecture", nativeArch); - if (Success == false) - return _error->Error(_("Unable to get build-dependency information for %s"),Src.c_str()); + for (size_t i = 0; i < VolatileSources.size(); ++i) + { + char const * const Src = VolatileCmdL[i]; + if (DirectoryExists(Src)) + ioprintf(c1out, _("Note, using directory '%s' to get the build dependencies\n"), Src); + else + ioprintf(c1out, _("Note, using file '%s' to get the build dependencies\n"), Src); + std::unique_ptr Last(VolatileSources[i]->CreateSrcParser()); + if (Last == nullptr) + return _error->Error(_("Unable to find a source package for %s"), Src); + + auto const BuildDeps = GetBuildDeps(Last.get(), Src, StripMultiArch, hostArch); + if (InstallBuildDepsLoop(Cache, Src, BuildDeps, StripMultiArch, hostArch) == false) + return false; + } } - else if (Last->BuildDepends(BuildDeps, _config->FindB("APT::Get::Arch-Only", false), StripMultiArch) == false) - return _error->Error(_("Unable to get build-dependency information for %s"),Src.c_str()); + else + _error->Error("Implementation error: Volatile sources (%lu) and commandline elements (%lu) do not match!", VolatileSources.size(), VolatileCmdL.size()); + } - if (BuildDeps.empty() == true) - { - ioprintf(c1out,_("%s has no build depends.\n"),Src.c_str()); - continue; - } + for (const char **I = CmdL.FileList + 1; *I != 0; ++I) + { + std::string Src; + pkgSrcRecords::Parser * const Last = FindSrc(*I,SrcRecs,Src,Cache); + if (Last == nullptr) + return _error->Error(_("Unable to find a source package for %s"), *I); + auto const BuildDeps = GetBuildDeps(Last, Src.c_str(), StripMultiArch, hostArch); if (InstallBuildDepsLoop(Cache, Src, BuildDeps, StripMultiArch, hostArch) == false) return false; } -- cgit v1.2.3