From 92296fe4b0862a04ea3d965b4cd2d4a420e3be9f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 8 Jul 2016 15:59:23 +0200 Subject: support "install ./foo.changes" We support installing ./foo.deb (and ./foo.dsc for source) for a while now, but it can be a bit clunky to work with those directly if you e.g. build packages locally in a 'central' build-area. The changes files also include hashsums and can be signed, so this can also be considered an enhancement in terms of security as a user "just" has to verify the signature on the changes file then rather than checking all deb files individually in these manual installation procedures. --- apt-pkg/deb/debsrcrecords.cc | 19 ++++++++++++++++++- apt-pkg/deb/debsrcrecords.h | 2 +- apt-pkg/sourcelist.cc | 41 +++++++++++++++++++++++++++++++++++++++-- apt-pkg/sourcelist.h | 4 +++- 4 files changed, 61 insertions(+), 5 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc index e8295debb..5454d79c3 100644 --- a/apt-pkg/deb/debsrcrecords.cc +++ b/apt-pkg/deb/debsrcrecords.cc @@ -41,7 +41,15 @@ debSrcRecordParser::debSrcRecordParser(std::string const &File,pkgIndexFile cons Tags.Init(&Fd, 102400); } } - +std::string debSrcRecordParser::Package() const /*{{{*/ +{ + auto const name = Sect.FindS("Package"); + if (iIndex == nullptr) + return name.empty() ? Sect.FindS("Source") : name; + else + return name; +} + /*}}}*/ // SrcRecordParser::Binaries - Return the binaries field /*{{{*/ // --------------------------------------------------------------------- /* This member parses the binaries field into a pair of class arrays and @@ -190,6 +198,15 @@ bool debSrcRecordParser::Files2(std::vector &List) ParseQuoteWord(C, path) == false) return _error->Error("Error parsing file record in %s of source package %s", checksumField.c_str(), Package().c_str()); + if (iIndex == nullptr && checksumField == "Files") + { + // the Files field has a different format than the rest in deb-changes files + std::string ignore; + if (ParseQuoteWord(C, ignore) == false || + ParseQuoteWord(C, path) == false) + return _error->Error("Error parsing file record in %s of source package %s", checksumField.c_str(), Package().c_str()); + } + HashString const hashString(*type, hash); if (Base.empty() == false) path = Base + path; diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h index 89134af5f..850040cf5 100644 --- a/apt-pkg/deb/debsrcrecords.h +++ b/apt-pkg/deb/debsrcrecords.h @@ -40,7 +40,7 @@ class APT_HIDDEN debSrcRecordParser : public pkgSrcRecords::Parser virtual bool Step() APT_OVERRIDE {iOffset = Tags.Offset(); return Tags.Step(Sect);}; virtual bool Jump(unsigned long const &Off) APT_OVERRIDE {iOffset = Off; return Tags.Jump(Sect,Off);}; - virtual std::string Package() const APT_OVERRIDE {return Sect.FindS("Package");}; + virtual std::string Package() const APT_OVERRIDE; virtual std::string Version() const APT_OVERRIDE {return Sect.FindS("Version");}; virtual std::string Maintainer() const APT_OVERRIDE {return Sect.FindS("Maintainer");}; virtual std::string Section() const APT_OVERRIDE {return Sect.FindS("Section");}; diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 022aff2fe..000539582 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -543,7 +544,7 @@ void pkgSourceList::AddVolatileFile(pkgIndexFile * const File) /*{{{*/ VolatileFiles.push_back(File); } /*}}}*/ -bool pkgSourceList::AddVolatileFile(std::string const &File) /*{{{*/ +bool pkgSourceList::AddVolatileFile(std::string const &File, std::vector * const VolatileCmdL)/*{{{*/ { // Note: FileExists matches directories and links, too! if (File.empty() || FileExists(File) == false) @@ -556,13 +557,49 @@ bool pkgSourceList::AddVolatileFile(std::string const &File) /*{{{*/ AddVolatileFile(new debDscFileIndex(File)); else if (FileExists(flCombine(File, "debian/control"))) AddVolatileFile(new debDscFileIndex(flCombine(File, "debian/control"))); + else if (ext == "changes") + { + debDscRecordParser changes(File, nullptr); + std::vector fileslst; + if (changes.Files2(fileslst) == false || fileslst.empty()) + return false; + auto const basedir = flNotFile(File); + for (auto && file: fileslst) + { + auto const name = flCombine(basedir, file.Path); + AddVolatileFile(name, VolatileCmdL); + if (file.Hashes.VerifyFile(name) == false) + return _error->Error("The file %s does not match with the hashes in the %s file!", name.c_str(), File.c_str()); + } + return true; + } else return false; + if (VolatileCmdL != nullptr) + VolatileCmdL->push_back(File); return true; +} +bool pkgSourceList::AddVolatileFile(std::string const &File) +{ + return AddVolatileFile(File, nullptr); } /*}}}*/ -void pkgSourceList::AddVolatileFiles(CommandLine &CmdL, std::vector * const VolatileCmdL)/*{{{*/ +void pkgSourceList::AddVolatileFiles(CommandLine &CmdL, std::vector * const VolatileCmdL)/*{{{*/ +{ + std::remove_if(CmdL.FileList + 1, CmdL.FileList + 1 + CmdL.FileSize(), [&](char const * const I) { + if (I != nullptr && (I[0] == '/' || (I[0] == '.' && ((I[1] == '.' && I[2] == '/') || I[1] == '/')))) + { + if (AddVolatileFile(I, VolatileCmdL)) + ; + else + _error->Error(_("Unsupported file %s given on commandline"), I); + return true; + } + return false; + }); +} +void pkgSourceList::AddVolatileFiles(CommandLine &CmdL, std::vector * const VolatileCmdL) { std::remove_if(CmdL.FileList + 1, CmdL.FileList + 1 + CmdL.FileSize(), [&](char const * const I) { if (I != nullptr && (I[0] == '/' || (I[0] == '.' && ((I[1] == '.' && I[2] == '/') || I[1] == '/')))) diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h index 9c2d10a46..65f9c2b89 100644 --- a/apt-pkg/sourcelist.h +++ b/apt-pkg/sourcelist.h @@ -131,7 +131,9 @@ class pkgSourceList */ void AddVolatileFile(pkgIndexFile * const File); bool AddVolatileFile(std::string const &File); - void AddVolatileFiles(CommandLine &CmdL, std::vector * const VolatileCmdL); + bool AddVolatileFile(std::string const &File, std::vector * const VolatileCmdL); + APT_DEPRECATED_MSG("Use the overload with string-vector") void AddVolatileFiles(CommandLine &CmdL, std::vector * const VolatileCmdL); + void AddVolatileFiles(CommandLine &CmdL, std::vector * const VolatileCmdL); /** @return list of files registered with #AddVolatileFile */ std::vector GetVolatileFiles() const; -- cgit v1.2.3