From 026f60e2c5601c4db42220cd20af9bfe066b2d83 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 18 Oct 2005 13:36:47 +0000 Subject: * inital support for "apt-get source -t dist" (but no downgrades yet --- cmdline/apt-get.cc | 10 +++++++++- debian/changelog | 5 +++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index a22d881b6..55681d59e 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1194,8 +1194,16 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, { VerTag = string(TmpSrc.begin() + Slash + 1,TmpSrc.end()); TmpSrc = string(TmpSrc.begin(),TmpSrc.begin() + Slash); + } else if(_config->Find("APT::Default-Release") != "") { + // if we have a Default-Release (-t) we want a exact match + // FIXME: we won't support downgrades + // (i.e. -t stable won't work on a unstable system + pkgCache::PkgIterator Pkg = Cache.FindPkg(TmpSrc); + if(Pkg.end() == false) { + pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg); + VerTag = Ver.VerStr(); + } } - /* Lookup the version of the package we would install if we were to install a version and determine the source package name, then look in the archive for a source package of the same name. In theory diff --git a/debian/changelog b/debian/changelog index 28152fa0a..4ed84ab36 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,12 +10,13 @@ apt (0.6.41.1) unstable; urgency=low - patch-100: Completed Danish translation (Closes: #325686) - patch-104: French translation completed - patch-109: Italian translation completed - - patch-112: Swedish translation update - - patch-115: Basque translation completed + - patch-112: Swedish translation update + - patch-115: Basque translation completed (Closes: #333299) * applied french man-page update (thanks to Philippe Batailler) (closes: #316318, #327456) * fix leak in the mmap code, thanks to Daniel Burrows for the patch (closes: #250583) + * partial support for apt-get source -t (no "downgrades" currently) -- -- cgit v1.2.3 From aca056a93dda08ad03690b4b70295832a723a655 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 18 Oct 2005 22:42:09 +0000 Subject: * full support for apt-get source -t now (and honor pining too) --- cmdline/apt-get.cc | 61 +++++++++++++++++++++++++++++++++++++++--------------- debian/changelog | 4 ++-- 2 files changed, 46 insertions(+), 19 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 55681d59e..82f202103 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1190,35 +1190,62 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, string VerTag; string TmpSrc = Name; string::size_type Slash = TmpSrc.rfind('='); + + // honor pining and default release + string DefRel = _config->Find("APT::Default-Release"); + + pkgCache::PkgIterator Pkg = Cache.FindPkg(TmpSrc); + pkgCache::VerIterator CandVer = Cache.GetCandidateVer(Pkg); + if(Pkg.end() == false) + { + VerTag = CandVer.VerStr(); + } + if (Slash != string::npos) { VerTag = string(TmpSrc.begin() + Slash + 1,TmpSrc.end()); TmpSrc = string(TmpSrc.begin(),TmpSrc.begin() + Slash); - } else if(_config->Find("APT::Default-Release") != "") { - // if we have a Default-Release (-t) we want a exact match - // FIXME: we won't support downgrades - // (i.e. -t stable won't work on a unstable system - pkgCache::PkgIterator Pkg = Cache.FindPkg(TmpSrc); - if(Pkg.end() == false) { - pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg); - VerTag = Ver.VerStr(); + } + else if(DefRel.empty() == false) + { + // we have a default release, try to locate the pkg. we do it like + // this because GetCandidateVer() will not "downgrade", that means + // "apt-get source -t stable apt" won't work on a unstable system + for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; + Ver++) + { + for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false; + VF++) + { + /* If this is the status file, and the current version is not the + version in the status file (ie it is not installed, or somesuch) + then it is not a candidate for installation, ever. This weeds + out bogus entries that may be due to config-file states, or + other. */ + if ((VF.File()->Flags & pkgCache::Flag::NotSource) == + pkgCache::Flag::NotSource && Pkg.CurrentVer() != Ver) + continue; + + //std::cout << VF.File().Archive() << std::endl; + if(VF.File().Archive() == DefRel) + { + VerTag = Ver.VerStr(); + break; + } + } } } + /* Lookup the version of the package we would install if we were to install a version and determine the source package name, then look - in the archive for a source package of the same name. In theory - we could stash the version string as well and match that too but - today there aren't multi source versions in the archive. */ - if (_config->FindB("APT::Get::Only-Source") == false && - VerTag.empty() == true) + in the archive for a source package of the same name. */ + if (_config->FindB("APT::Get::Only-Source") == false) { - pkgCache::PkgIterator Pkg = Cache.FindPkg(TmpSrc); if (Pkg.end() == false) { - pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg); - if (Ver.end() == false) + if (CandVer.end() == false) { - pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList()); + pkgRecords::Parser &Parse = Recs.Lookup(CandVer.FileList()); Src = Parse.SourcePkg(); } } diff --git a/debian/changelog b/debian/changelog index 4ed84ab36..06bf36e0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,9 +16,9 @@ apt (0.6.41.1) unstable; urgency=low (closes: #316318, #327456) * fix leak in the mmap code, thanks to Daniel Burrows for the patch (closes: #250583) - * partial support for apt-get source -t (no "downgrades" currently) + * support for apt-get source -t (and honor pining) - -- + -- apt (0.6.41) unstable; urgency=low -- cgit v1.2.3 From e8cdc56aaf6a12223fb9868784c18c8c0ada6315 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 19 Oct 2005 08:11:04 +0000 Subject: * added APT::Authentication::Trust-CDROM option Patches applied: * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-79 * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-1 * implemented "TrustCDROM" mode * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-2 * added APT::Authentication::TrustCDROM to the configure-index --- apt-pkg/deb/debmetaindex.cc | 4 ++++ debian/changelog | 4 +++- doc/examples/configure-index | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index 526c8c0b2..ed5cb80d1 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -165,6 +165,10 @@ bool debReleaseIndex::IsTrusted() const string VerifiedSigFile = _config->FindDir("Dir::State::lists") + URItoFileName(MetaIndexURI("Release")) + ".gpg"; + if(_config->FindB("APT::Authentication::Trust-CDROM", false)) + if(URI.substr(0,strlen("cdrom:")) == "cdrom:") + return true; + if (FileExists(VerifiedSigFile)) return true; return false; diff --git a/debian/changelog b/debian/changelog index 06bf36e0d..78a7f890a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,7 +16,9 @@ apt (0.6.41.1) unstable; urgency=low (closes: #316318, #327456) * fix leak in the mmap code, thanks to Daniel Burrows for the patch (closes: #250583) - * support for apt-get source -t (and honor pining) + * support for apt-get source -t (and honor pining) (closes: #152129) + * added "APT::Authentication::Trust-CDROM" option to make the life + for the installer people easier (closes: #334656) -- diff --git a/doc/examples/configure-index b/doc/examples/configure-index index dee0c06ff..5ab84fe05 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -72,6 +72,11 @@ APT NoAct "false"; }; + Authentication + { + Trust-CDROM "false"; // consider the CDROM always trusted + }; + GPGV { TrustedKeyring "/etc/apt/trusted.gpg"; -- cgit v1.2.3 From 7524e34882a4a2c21908da29218dd527e166406a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 19 Oct 2005 08:20:04 +0000 Subject: * fix a crash in apt-ftparchive --- debian/changelog | 2 ++ ftparchive/writer.cc | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 78a7f890a..f237e5d69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ apt (0.6.41.1) unstable; urgency=low * support for apt-get source -t (and honor pining) (closes: #152129) * added "APT::Authentication::Trust-CDROM" option to make the life for the installer people easier (closes: #334656) + * fix crash in apt-ftparchive (thanks to Bastian Blank for the patch) + (closes: #334671) -- diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 0b68d0bbf..fc9ea27d7 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -581,8 +581,6 @@ bool SourcesWriter::DoPackage(string FileName) auto_ptr Itm(BOver.GetItem(BinList[I])); if (Itm.get() == 0) continue; - if (OverItem.get() == 0) - OverItem = Itm; unsigned char NewPrioV = debListParser::GetPrio(Itm->Priority); if (NewPrioV < BestPrioV || BestPrio.empty() == true) @@ -590,6 +588,9 @@ bool SourcesWriter::DoPackage(string FileName) BestPrioV = NewPrioV; BestPrio = Itm->Priority; } + + if (OverItem.get() == 0) + OverItem = Itm; } } -- cgit v1.2.3 From ed478d8cabf4abd695f2cacc50442e8c0e3ac770 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 19 Oct 2005 10:30:32 +0000 Subject: * sparc64 alignment fix --- apt-pkg/contrib/md5.h | 2 +- debian/changelog | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h index 9e20f7cef..9447e9956 100644 --- a/apt-pkg/contrib/md5.h +++ b/apt-pkg/contrib/md5.h @@ -58,7 +58,7 @@ class MD5SumValue class MD5Summation { - unsigned char Buf[4*4]; + uint32_t Buf[4]; unsigned char Bytes[2*4]; unsigned char In[16*4]; bool Done; diff --git a/debian/changelog b/debian/changelog index f237e5d69..078d2c8b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,8 +21,11 @@ apt (0.6.41.1) unstable; urgency=low for the installer people easier (closes: #334656) * fix crash in apt-ftparchive (thanks to Bastian Blank for the patch) (closes: #334671) + * apt-pkg/contrib/md5.cc: + - fix a alignment problem on sparc64 that gives random bus errors + (thanks to Fabbione for providing a test-case) - -- + -- apt (0.6.41) unstable; urgency=low -- cgit v1.2.3 From d87116efb8c7382cc463f5208277470fce129d12 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 19 Oct 2005 12:34:19 +0000 Subject: * fix segfault when there is no Archive for a VerFile --- cmdline/apt-get.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 82f202103..3ffb740a6 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1227,7 +1227,7 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, continue; //std::cout << VF.File().Archive() << std::endl; - if(VF.File().Archive() == DefRel) + if(VF.File().Archive() && (VF.File().Archive() == DefRel)) { VerTag = Ver.VerStr(); break; -- cgit v1.2.3 From ce6162bed91fd2e508d751d3d88dd16f3d97c8d3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 19 Oct 2005 13:51:20 +0000 Subject: * don't get candidate release as version tag for FindSrc by default. because it break for bin-NMUs :/ (e.g. dpkg source is 1.13.11, but i386 version string is 1.13.11.0.1) --- cmdline/apt-get.cc | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 3ffb740a6..6e17611cb 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1191,15 +1191,9 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, string TmpSrc = Name; string::size_type Slash = TmpSrc.rfind('='); - // honor pining and default release + // honor default release string DefRel = _config->Find("APT::Default-Release"); - pkgCache::PkgIterator Pkg = Cache.FindPkg(TmpSrc); - pkgCache::VerIterator CandVer = Cache.GetCandidateVer(Pkg); - if(Pkg.end() == false) - { - VerTag = CandVer.VerStr(); - } if (Slash != string::npos) { @@ -1243,9 +1237,10 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, { if (Pkg.end() == false) { - if (CandVer.end() == false) + pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg); + if (Ver.end() == false) { - pkgRecords::Parser &Parse = Recs.Lookup(CandVer.FileList()); + pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList()); Src = Parse.SourcePkg(); } } @@ -1300,10 +1295,7 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, } } - if (Last == 0) - return 0; - - if (Last->Jump(Offset) == false) + if (Last == 0 || Last->Jump(Offset) == false) return 0; return Last; -- cgit v1.2.3