From: Michael Vogt Date: Wed, 9 Jun 2010 09:51:21 +0000 (+0200) Subject: * merge the remaining Ubuntu change: X-Git-Tag: 0.8.0~9^2~42 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/23c5897cbdb5a957788201a5178e963586dcdbc9?hp=-c * merge the remaining Ubuntu change: - on gpg verification failure warn and restore the last known good state - on failure display the IP of the server (useful for servers that use round robin DNS) - support Original-Maintainer in RewritePackageOrder - enable cdrom autodetection via libudev by default - show messsage about Vcs in use when apt-get source is run for packages maintained in a Vcs - better support transitional packages with mark auto-installed. when the transitional package is in "oldlibs" the new package is not marked auto installed (same is true for section metapackages) - provide new "deb mirror://archive.foo/mirrors.list sid main" method expects a list of mirrors (generated on the server e.g. via geoip) and will use that, including cycle on failure - write apport crash file on package failure (disabled by default on debian until apport is available) - support mirror failure reporting (disabled by default on debian) --- 23c5897cbdb5a957788201a5178e963586dcdbc9 diff --combined apt-pkg/acquire-item.cc index c035b9163,a959253bc..bb8a01db8 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@@ -64,6 -64,7 +64,7 @@@ void pkgAcquire::Item::Failed(string Me { Status = StatIdle; ErrorText = LookupTag(Message,"Message"); + UsedMirror = LookupTag(Message,"UsedMirror"); if (QueueCounter <= 1) { /* This indicates that the file is not available right now but might @@@ -76,10 -77,17 +77,17 @@@ Dequeue(); return; } - + Status = StatError; Dequeue(); } - ++ + // report mirror failure back to LP if we actually use a mirror + string FailReason = LookupTag(Message, "FailReason"); + if(FailReason.size() != 0) + ReportMirrorFailure(FailReason); + else + ReportMirrorFailure(ErrorText); } /*}}}*/ // Acquire::Item::Start - Item has begun to download /*{{{*/ @@@ -101,7 -109,7 +109,7 @@@ void pkgAcquire::Item::Done(string Mess { // We just downloaded something.. string FileName = LookupTag(Message,"Filename"); - // we only inform the Log class if it was actually not a local thing + UsedMirror = LookupTag(Message,"UsedMirror"); if (Complete == false && !Local && FileName == DestFile) { if (Owner->Log != 0) @@@ -110,7 -118,6 +118,6 @@@ if (FileSize == 0) FileSize= Size; - Status = StatDone; ErrorText = string(); Owner->Dequeue(this); @@@ -132,6 -139,49 +139,49 @@@ void pkgAcquire::Item::Rename(string Fr } } /*}}}*/ + + void pkgAcquire::Item::ReportMirrorFailure(string FailCode) + { + // we only act if a mirror was used at all + if(UsedMirror.empty()) + return; + #if 0 + std::cerr << "\nReportMirrorFailure: " + << UsedMirror + << " Uri: " << DescURI() + << " FailCode: " + << FailCode << std::endl; + #endif + const char *Args[40]; + unsigned int i = 0; + string report = _config->Find("Methods::Mirror::ProblemReporting", + "/usr/lib/apt/apt-report-mirror-failure"); + if(!FileExists(report)) + return; + Args[i++] = report.c_str(); + Args[i++] = UsedMirror.c_str(); + Args[i++] = DescURI().c_str(); + Args[i++] = FailCode.c_str(); + Args[i++] = NULL; + pid_t pid = ExecFork(); + if(pid < 0) + { + _error->Error("ReportMirrorFailure Fork failed"); + return; + } + else if(pid == 0) + { + execvp(Args[0], (char**)Args); + std::cerr << "Could not exec " << Args[0] << std::endl; + _exit(100); + } + if(!ExecWait(pid, "report-mirror-failure")) + { + _error->Warning("Couldn't report problem to '%s'", + _config->Find("Methods::Mirror::ProblemReporting").c_str()); + } + } + // AcqDiffIndex::AcqDiffIndex - Constructor /*{{{*/ // --------------------------------------------------------------------- /* Get the DiffIndex file first and see if there are patches availabe @@@ -310,7 -360,7 +360,7 @@@ bool pkgAcqDiffIndex::ParseDiffIndex(st if(last_space != string::npos) Description.erase(last_space, Description.size()-last_space); new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc, - ExpectedHash, available_patches); + ExpectedHash, ServerSha1, available_patches); Complete = false; Status = StatDone; Dequeue(); @@@ -378,10 -428,9 +428,10 @@@ void pkgAcqDiffIndex::Done(string Messa pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner, string URI,string URIDesc,string ShortDesc, HashString ExpectedHash, + string ServerSha1, vector diffs) : Item(Owner), RealURI(URI), ExpectedHash(ExpectedHash), - available_patches(diffs) + available_patches(diffs), ServerSha1(ServerSha1) { DestFile = _config->FindDir("Dir::State::lists") + "partial/"; @@@ -467,13 -516,6 +517,13 @@@ bool pkgAcqIndexDiffs::QueueNextDiff( std::clog << "QueueNextDiff: " << FinalFile << " (" << local_sha1 << ")"<::iterator I=available_patches.begin(); @@@ -571,7 -613,7 +621,7 @@@ void pkgAcqIndexDiffs::Done(string Mess // see if there is more to download if(available_patches.size() > 0) { new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc, - ExpectedHash, available_patches); + ExpectedHash, ServerSha1, available_patches); return Finish(); } else return Finish(true); @@@ -624,7 -666,6 +674,6 @@@ string pkgAcqIndex::Custom600Headers( struct stat Buf; if (stat(Final.c_str(),&Buf) != 0) return "\nIndex-File: true"; - return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime); } /*}}}*/ @@@ -692,6 -733,7 +741,7 @@@ void pkgAcqIndex::Done(string Message,u Status = StatAuthError; ErrorText = _("Hash Sum mismatch"); Rename(DestFile,DestFile + ".FAILED"); + ReportMirrorFailure("HashChecksumFailure"); return; } // Done, move it into position @@@ -882,8 -924,9 +932,9 @@@ void pkgAcqMetaSig::Done(string Message Rename(LastGoodSig, DestFile); // queue a pkgAcqMetaIndex to be verified against the sig we just retrieved - new pkgAcqMetaIndex(Owner, MetaIndexURI, MetaIndexURIDesc, MetaIndexShortDesc, - DestFile, IndexTargets, MetaIndexParser); + new pkgAcqMetaIndex(Owner, MetaIndexURI, MetaIndexURIDesc, + MetaIndexShortDesc, DestFile, IndexTargets, + MetaIndexParser); } /*}}}*/ @@@ -896,7 -939,7 +947,7 @@@ void pkgAcqMetaSig::Failed(string Messa { Item::Failed(Message,Cnf); // move the sigfile back on transient network failures - if(FileExists(DestFile)) + if(FileExists(LastGoodSig)) Rename(LastGoodSig,Final); // set the status back to , Item::Failed likes to reset it @@@ -971,6 -1014,15 +1022,15 @@@ void pkgAcqMetaIndex::Done(string Messa if (AuthPass == true) { AuthDone(Message); + + // all cool, move Release file into place + Complete = true; + + string FinalFile = _config->FindDir("Dir::State::lists"); + FinalFile += URItoFileName(RealURI); + Rename(DestFile,FinalFile); + chmod(FinalFile.c_str(),0644); + DestFile = FinalFile; } else { @@@ -1022,22 -1074,15 +1082,15 @@@ void pkgAcqMetaIndex::RetrievalDone(str return; } - // see if the download was a IMSHit + // make sure to verify against the right file on I-M-S hit IMSHit = StringToBool(LookupTag(Message,"IMS-Hit"),false); + if(IMSHit) + { + string FinalFile = _config->FindDir("Dir::State::lists"); + FinalFile += URItoFileName(RealURI); + DestFile = FinalFile; + } Complete = true; - - string FinalFile = _config->FindDir("Dir::State::lists"); - FinalFile += URItoFileName(RealURI); - - // If we get a IMS hit we can remove the empty file in partial - // othersie we move the file in place - if (IMSHit) - unlink(DestFile.c_str()); - else - Rename(DestFile,FinalFile); - - chmod(FinalFile.c_str(),0644); - DestFile = FinalFile; } /*}}}*/ void pkgAcqMetaIndex::AuthDone(string Message) /*{{{*/ @@@ -1067,7 -1112,6 +1120,6 @@@ QueueIndexes(true); // Done, move signature file into position - string VerifiedSigFile = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI) + ".gpg"; Rename(SigFile,VerifiedSigFile); @@@ -1108,7 -1152,7 +1160,7 @@@ void pkgAcqMetaIndex::QueueIndexes(boo // Queue Packages file (either diff or full packages files, depending // on the users option) - if(_config->FindB("Acquire::PDiffs",true) == true) - if(_config->FindB("Acquire::PDiffs",false) == true) ++ if(_config->FindB("Acquire::PDiffs", true) == true) new pkgAcqDiffIndex(Owner, (*Target)->URI, (*Target)->Description, (*Target)->ShortDesc, ExpectedIndexHash); else @@@ -1211,30 -1255,30 +1263,30 @@@ void pkgAcqMetaIndex::Failed(string Mes { if (AuthPass == true) { - // if we fail the authentication but got the file via a IMS-Hit - // this means that the file wasn't downloaded and that it might be - // just stale (server problem, proxy etc). we delete what we have - // queue it again without i-m-s - // alternatively we could just unlink the file and let the user try again - if (IMSHit) + // gpgv method failed, if we have a good signature + string LastGoodSigFile = _config->FindDir("Dir::State::lists") + + "partial/" + URItoFileName(RealURI) + ".gpg.reverify"; + if(FileExists(LastGoodSigFile)) { - Complete = false; - Local = false; - AuthPass = false; - unlink(DestFile.c_str()); - - DestFile = _config->FindDir("Dir::State::lists") + "partial/"; - DestFile += URItoFileName(RealURI); - Desc.URI = RealURI; - QueueURI(Desc); + string VerifiedSigFile = _config->FindDir("Dir::State::lists") + + URItoFileName(RealURI) + ".gpg"; + Rename(LastGoodSigFile,VerifiedSigFile); + Status = StatTransientNetworkError; + _error->Warning(_("A error occurred during the signature " + "verification. The repository is not updated " + "and the previous index files will be used." + "GPG error: %s: %s\n"), + Desc.Description.c_str(), + LookupTag(Message,"Message").c_str()); + RunScripts("APT::Update::Auth-Failure"); return; + } else { + _error->Warning(_("GPG error: %s: %s"), + Desc.Description.c_str(), + LookupTag(Message,"Message").c_str()); } - // gpgv method failed - _error->Warning("GPG error: %s: %s", - Desc.Description.c_str(), - LookupTag(Message,"Message").c_str()); - + ReportMirrorFailure("GPGFailure"); } // No Release file was present, or verification failed, so fall @@@ -1327,8 -1371,7 +1379,8 @@@ pkgAcqArchive::pkgAcqArchive(pkgAcquir the archive is already available in the cache and stashs the MD5 for checking later. */ bool pkgAcqArchive::QueueNext() -{ +{ + string const ForceHash = _config->Find("Acquire::ForceHash"); for (; Vf.end() == false; Vf++) { // Ignore not source sources @@@ -1351,25 -1394,12 +1403,25 @@@ return false; string PkgFile = Parse.FileName(); - if(Parse.SHA256Hash() != "") - ExpectedHash = HashString("SHA256", Parse.SHA256Hash()); - else if (Parse.SHA1Hash() != "") - ExpectedHash = HashString("SHA1", Parse.SHA1Hash()); - else - ExpectedHash = HashString("MD5Sum", Parse.MD5Hash()); + if (ForceHash.empty() == false) + { + if(stringcasecmp(ForceHash, "sha256") == 0) + ExpectedHash = HashString("SHA256", Parse.SHA256Hash()); + else if (stringcasecmp(ForceHash, "sha1") == 0) + ExpectedHash = HashString("SHA1", Parse.SHA1Hash()); + else + ExpectedHash = HashString("MD5Sum", Parse.MD5Hash()); + } + else + { + string Hash; + if ((Hash = Parse.SHA256Hash()).empty() == false) + ExpectedHash = HashString("SHA256", Hash); + else if ((Hash = Parse.SHA1Hash()).empty() == false) + ExpectedHash = HashString("SHA1", Hash); + else + ExpectedHash = HashString("MD5Sum", Parse.MD5Hash()); + } if (PkgFile.empty() == true) return _error->Error(_("The package index files are corrupted. No Filename: " "field for package %s."), @@@ -1561,9 -1591,8 +1613,9 @@@ void pkgAcqArchive::Finished( /* The file is added to the queue */ pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string Hash, unsigned long Size,string Dsc,string ShortDesc, - const string &DestDir, const string &DestFilename) : - Item(Owner), ExpectedHash(Hash) + const string &DestDir, const string &DestFilename, + bool IsIndexFile) : + Item(Owner), ExpectedHash(Hash), IsIndexFile(IsIndexFile) { Retries = _config->FindI("Acquire::Retries",0); @@@ -1678,13 -1707,3 +1730,13 @@@ void pkgAcqFile::Failed(string Message, Item::Failed(Message,Cnf); } /*}}}*/ +// AcqIndex::Custom600Headers - Insert custom request headers /*{{{*/ +// --------------------------------------------------------------------- +/* The only header we use is the last-modified header. */ +string pkgAcqFile::Custom600Headers() +{ + if (IsIndexFile) + return "\nIndex-File: true"; + return ""; +} + /*}}}*/ diff --combined apt-pkg/acquire-item.h index b338b2a41,06fcffc73..332df5a6b --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@@ -27,7 -27,6 +27,7 @@@ #include #include #include +#include /** \addtogroup acquire * @{ @@@ -47,7 -46,7 +47,7 @@@ * * \see pkgAcquire */ -class pkgAcquire::Item +class pkgAcquire::Item : public WeakPointable { protected: @@@ -143,6 -142,7 +143,7 @@@ * download progress indicator's overall statistics. */ bool Local; + string UsedMirror; /** \brief The number of fetch queues into which this item has been * inserted. @@@ -243,6 -243,17 +244,17 @@@ /** \return \b true if this object is being fetched from a trusted source. */ virtual bool IsTrusted() {return false;}; + + // report mirror problems + /** \brief Report mirror problem + * + * This allows reporting mirror failures back to a centralized + * server. The apt-report-mirror-failure script is called for this + * + * \param FailCode A short failure string that is send + */ + void ReportMirrorFailure(string FailCode); + /** \brief Initialize an item. * @@@ -423,10 -434,6 +435,10 @@@ class pkgAcqIndexDiffs : public pkgAcqu * off the front? */ vector available_patches; + + /** Stop applying patches when reaching that sha1 */ + string ServerSha1; + /** The current status of this patch. */ enum DiffState { @@@ -480,7 -487,6 +492,7 @@@ */ pkgAcqIndexDiffs(pkgAcquire *Owner,string URI,string URIDesc, string ShortDesc, HashString ExpectedHash, + string ServerSha1, vector diffs=vector()); }; /*}}}*/ @@@ -551,7 -557,8 +563,8 @@@ class pkgAcqIndex : public pkgAcquire:: * fallback is ".gz" or none. */ pkgAcqIndex(pkgAcquire *Owner,string URI,string URIDesc, - string ShortDesc, HashString ExpectedHash, string compressExt=""); + string ShortDesc, HashString ExpectedHash, + string compressExt=""); }; /*}}}*/ /** \brief An acquire item that is responsible for fetching a {{{ @@@ -614,7 -621,6 +627,6 @@@ class pkgAcqMetaSig : public pkgAcquire /** \brief The last good signature file */ string LastGoodSig; - /** \brief The fetch request that is currently being processed. */ pkgAcquire::ItemDesc Desc; @@@ -862,9 -868,6 +874,9 @@@ class pkgAcqFile : public pkgAcquire::I */ unsigned int Retries; + /** \brief Should this file be considered a index file */ + bool IsIndexFile; + public: // Specialized action members @@@ -873,7 -876,6 +885,7 @@@ pkgAcquire::MethodConfig *Cnf); virtual string DescURI() {return Desc.URI;}; virtual string HashSum() {return ExpectedHash.toStr(); }; + virtual string Custom600Headers(); /** \brief Create a new pkgAcqFile object. * @@@ -897,8 -899,6 +909,8 @@@ * * \param DestFilename The filename+path the file is downloaded to. * + * \param IsIndexFile The file is considered a IndexFile and cache-control + * headers like "cache-control: max-age=0" are send * * If DestFilename is empty, download to DestDir/ if * DestDir is non-empty, $CWD/ otherwise. If @@@ -908,8 -908,7 +920,8 @@@ pkgAcqFile(pkgAcquire *Owner, string URI, string Hash, unsigned long Size, string Desc, string ShortDesc, - const string &DestDir="", const string &DestFilename=""); + const string &DestDir="", const string &DestFilename="", + bool IsIndexFile=false); }; /*}}}*/ /** @} */ diff --combined apt-pkg/algorithms.cc index f1e51131a,a3963d546..f17c76d6c --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@@ -83,28 -83,13 +83,28 @@@ void pkgSimulate::Describe(PkgIterator bool pkgSimulate::Install(PkgIterator iPkg,string /*File*/) { // Adapt the iterator - PkgIterator Pkg = Sim.FindPkg(iPkg.Name()); + PkgIterator Pkg = Sim.FindPkg(iPkg.Name(), iPkg.Arch()); Flags[Pkg->ID] = 1; cout << "Inst "; Describe(Pkg,cout,true,true); Sim.MarkInstall(Pkg,false); - + + if (strcmp(Pkg.Arch(),"all") == 0) + { + pkgCache::GrpIterator G = Pkg.Group(); + pkgCache::GrpIterator iG = iPkg.Group(); + for (pkgCache::PkgIterator P = G.FindPkg("any"); P.end() != true; P = G.NextPkg(P)) + { + if (strcmp(P.Arch(), "all") == 0) + continue; + if (iG.FindPkg(P.Arch())->CurrentVer == 0) + continue; + Flags[P->ID] = 1; + Sim.MarkInstall(P, false); + } + } + // Look for broken conflicts+predepends. for (PkgIterator I = Sim.PkgBegin(); I.end() == false; I++) { @@@ -146,22 -131,9 +146,22 @@@ bool pkgSimulate::Configure(PkgIterator iPkg) { // Adapt the iterator - PkgIterator Pkg = Sim.FindPkg(iPkg.Name()); + PkgIterator Pkg = Sim.FindPkg(iPkg.Name(), iPkg.Arch()); Flags[Pkg->ID] = 2; + + if (strcmp(Pkg.Arch(),"all") == 0) + { + pkgCache::GrpIterator G = Pkg.Group(); + for (pkgCache::PkgIterator P = G.FindPkg("any"); P.end() != true; P = G.NextPkg(P)) + { + if (strcmp(P.Arch(), "all") == 0) + continue; + if (Flags[P->ID] == 1) + Flags[P->ID] = 2; + } + } + // Sim.MarkInstall(Pkg,false); if (Sim[Pkg].InstBroken() == true) { @@@ -209,26 -181,10 +209,26 @@@ bool pkgSimulate::Remove(PkgIterator iPkg,bool Purge) { // Adapt the iterator - PkgIterator Pkg = Sim.FindPkg(iPkg.Name()); + PkgIterator Pkg = Sim.FindPkg(iPkg.Name(), iPkg.Arch()); Flags[Pkg->ID] = 3; Sim.MarkDelete(Pkg); + + if (strcmp(Pkg.Arch(),"all") == 0) + { + pkgCache::GrpIterator G = Pkg.Group(); + pkgCache::GrpIterator iG = iPkg.Group(); + for (pkgCache::PkgIterator P = G.FindPkg("any"); P.end() != true; P = G.NextPkg(P)) + { + if (strcmp(P.Arch(), "all") == 0) + continue; + if (iG.FindPkg(P.Arch())->CurrentVer == 0) + continue; + Flags[P->ID] = 3; + Sim.MarkDelete(P); + } + } + if (Purge == true) cout << "Purg "; else @@@ -535,11 -491,11 +535,11 @@@ void pkgProblemResolver::MakeScores( // Important Required Standard Optional Extra signed short PrioMap[] = { 0, - _config->FindI("pkgProblemResolver::Scores::Important",3), - _config->FindI("pkgProblemResolver::Scores::Required",2), - _config->FindI("pkgProblemResolver::Scores::Standard",1), - _config->FindI("pkgProblemResolver::Scores::Optional",-1), - _config->FindI("pkgProblemResolver::Scores::Extra",-2) + (signed short) _config->FindI("pkgProblemResolver::Scores::Important",3), + (signed short) _config->FindI("pkgProblemResolver::Scores::Required",2), + (signed short) _config->FindI("pkgProblemResolver::Scores::Standard",1), + (signed short) _config->FindI("pkgProblemResolver::Scores::Optional",-1), + (signed short) _config->FindI("pkgProblemResolver::Scores::Extra",-2) }; signed short PrioEssentials = _config->FindI("pkgProblemResolver::Scores::Essentials",100); signed short PrioInstalledAndNotObsolete = _config->FindI("pkgProblemResolver::Scores::NotObsolete",1); @@@ -1184,8 -1140,7 +1184,7 @@@ bool pkgProblemResolver::Resolve(bool B return _error->Error(_("Unable to correct problems, you have held broken packages.")); } - // set the auto-flags (mvo: I'm not sure if we _really_ need this, but - // I didn't managed + // set the auto-flags (mvo: I'm not sure if we _really_ need this) pkgCache::PkgIterator I = Cache.PkgBegin(); for (;I.end() != true; I++) { if (Cache[I].NewInstall() && !(Flags[I->ID] & PreInstalled)) { @@@ -1398,9 -1353,7 +1397,9 @@@ bool ListUpdate(pkgAcquireStatus &Stat int PulseInterval) { pkgAcquire::RunResult res; - pkgAcquire Fetcher(&Stat); + pkgAcquire Fetcher; + if (Fetcher.Setup(&Stat, _config->FindDir("Dir::State::Lists")) == false) + return false; // Populate it with the source selection if (List.GetIndexes(&Fetcher) == false) diff --combined apt-pkg/deb/debsystem.cc index 59f826d96,089a465c1..ef5ec9703 --- a/apt-pkg/deb/debsystem.cc +++ b/apt-pkg/deb/debsystem.cc @@@ -18,7 -18,6 +18,6 @@@ #include #include #include - #include #include #include @@@ -79,8 -78,8 +78,15 @@@ bool debSystem::Lock( { close(LockFD); LockFD = -1; ++ const char *cmd; ++ if (getenv("SUDO_USER") != NULL) ++ cmd = "sudo dpkg --configure -a"; ++ else ++ cmd = "dpkg --configure -a"; ++ // TRANSLATORS: the %s contains the recovery command, usually ++ // dpkg --configure -a return _error->Error(_("dpkg was interrupted, you must manually " - "run 'dpkg --configure -a' to correct the problem. ")); - "run 'sudo dpkg --configure -a' to correct the problem. ")); ++ "run '%s' to correct the problem. "), cmd); } LockCount++; diff --combined apt-pkg/deb/dpkgpm.cc index 8318fe37f,18c731788..c724c69a9 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@@ -12,6 -12,7 +12,7 @@@ #include #include #include + #include #include #include #include @@@ -24,6 -25,7 +25,7 @@@ #include #include #include + #include #include #include #include @@@ -50,7 -52,6 +52,7 @@@ namespac std::make_pair("configure", N_("Configuring %s")), std::make_pair("remove", N_("Removing %s")), std::make_pair("purge", N_("Completely removing %s")), + std::make_pair("disappear", N_("Noting disappearance of %s")), std::make_pair("trigproc", N_("Running post-installation trigger %s")) }; @@@ -106,7 -107,7 +108,7 @@@ ionice(int PID /* */ pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) : pkgPackageManager(Cache), dpkgbuf_pos(0), - term_out(NULL), PackagesDone(0), PackagesTotal(0), pkgFailures(0) + term_out(NULL), history_out(NULL), PackagesDone(0), PackagesTotal(0) { } /*}}}*/ @@@ -125,19 -126,7 +127,19 @@@ bool pkgDPkgPM::Install(PkgIterator Pkg if (File.empty() == true || Pkg.end() == true) return _error->Error("Internal Error, No file name for %s",Pkg.Name()); - List.push_back(Item(Item::Install,Pkg,File)); + // If the filename string begins with DPkg::Chroot-Directory, return the + // substr that is within the chroot so dpkg can access it. + string const chrootdir = _config->FindDir("DPkg::Chroot-Directory","/"); + if (chrootdir != "/" && File.find(chrootdir) == 0) + { + size_t len = chrootdir.length(); + if (chrootdir.at(len - 1) == '/') + len--; + List.push_back(Item(Item::Install,Pkg,File.substr(len))); + } + else + List.push_back(Item(Item::Install,Pkg,File)); + return true; } /*}}}*/ @@@ -354,7 -343,6 +356,6 @@@ bool pkgDPkgPM::RunScriptsWithPkgs(cons return true; } - /*}}}*/ // DPkgPM::DoStdin - Read stdin and pass to slave pty /*{{{*/ // --------------------------------------------------------------------- @@@ -420,12 -408,11 +421,12 @@@ void pkgDPkgPM::ProcessDpkgStatusLine(i 'processing: install: pkg' 'processing: configure: pkg' 'processing: remove: pkg' - 'processing: purge: pkg' - but for apt is it a ignored "unknown" action + 'processing: purge: pkg' + 'processing: disappear: pkg' 'processing: trigproc: trigger' */ - char* list[5]; + char* list[6]; // dpkg sends multiline error messages sometimes (see // #374195 for a example. we should support this by // either patching dpkg to not send multiline over the @@@ -468,14 -455,19 +469,22 @@@ write(OutStatusFd, status.str().c_str(), status.str().size()); if (Debug == true) std::clog << "send: '" << status.str() << "'" << endl; + + if (strncmp(action, "disappear", strlen("disappear")) == 0) + disappearedPkgs.insert(string(pkg_or_trigger)); return; } if(strncmp(action,"error",strlen("error")) == 0) { + // urgs, sometime has ":" in its error string so that we + // end up with the error message split between list[3] + // and list[4], e.g. the message: + // "failed in buffer_write(fd) (10, ret=-1): backend dpkg-deb ..." + // concat them again + if( list[4] != NULL ) + list[3][strlen(list[3])] = ':'; + status << "pmerror:" << list[1] << ":" << (PackagesDone/float(PackagesTotal)*100.0) << ":" << list[3] @@@ -484,6 -476,8 +493,8 @@@ write(OutStatusFd, status.str().c_str(), status.str().size()); if (Debug == true) std::clog << "send: '" << status.str() << "'" << endl; + pkgFailures++; + WriteApportReport(list[1], list[3]); return; } else if(strncmp(action,"conffile",strlen("conffile")) == 0) @@@ -568,7 -562,7 +579,7 @@@ void pkgDPkgPM::DoDpkgStatusFd(int stat } /*}}}*/ // DPkgPM::WriteHistoryTag /*{{{*/ -void pkgDPkgPM::WriteHistoryTag(FILE *history_out, string tag, string value) +void pkgDPkgPM::WriteHistoryTag(string tag, string value) { if (value.size() > 0) { @@@ -609,7 -603,7 +620,7 @@@ bool pkgDPkgPM::OpenLog( _config->Find("Dir::Log::History")); if (!history_name.empty()) { - FILE *history_out = fopen(history_name.c_str(),"a"); + history_out = fopen(history_name.c_str(),"a"); if (history_out == NULL) return _error->WarningE("OpenLog", _("Could not open file '%s'"), history_name.c_str()); chmod(history_name.c_str(), 0644); @@@ -631,14 -625,12 +642,14 @@@ remove += I.Name() + string(" (") + Cache[I].CurVersion + string("), "); } } - WriteHistoryTag(history_out, "Install", install); - WriteHistoryTag(history_out, "Upgrade", upgrade); - WriteHistoryTag(history_out, "Downgrade",downgrade); - WriteHistoryTag(history_out, "Remove",remove); - WriteHistoryTag(history_out, "Purge",purge); - fclose(history_out); + if (_config->Exists("Commandline::AsString") == true) + WriteHistoryTag("Commandline", _config->Find("Commandline::AsString")); + WriteHistoryTag("Install", install); + WriteHistoryTag("Upgrade", upgrade); + WriteHistoryTag("Downgrade",downgrade); + WriteHistoryTag("Remove",remove); + WriteHistoryTag("Purge",purge); + fflush(history_out); } return true; @@@ -661,14 -653,14 +672,14 @@@ bool pkgDPkgPM::CloseLog( } term_out = NULL; - string history_name = flCombine(_config->FindDir("Dir::Log"), - _config->Find("Dir::Log::History")); - if (!history_name.empty()) + if(history_out) { - FILE *history_out = fopen(history_name.c_str(),"a"); + if (dpkg_error.size() > 0) + fprintf(history_out, "Error: %s\n", dpkg_error.c_str()); fprintf(history_out, "End-Date: %s\n", timestr); fclose(history_out); } + history_out = NULL; return true; } @@@ -916,8 -908,6 +927,8 @@@ bool pkgDPkgPM::Go(int OutStatusFd { if((*I).Pkg.end() == true) continue; + if (I->Op == Item::Configure && disappearedPkgs.find(I->Pkg.Name()) != disappearedPkgs.end()) + continue; Args[n++] = I->Pkg.Name(); Size += strlen(Args[n-1]); } @@@ -1085,10 -1075,9 +1096,10 @@@ signal(SIGHUP,old_SIGHUP); return _error->Errno("waitpid","Couldn't wait for subprocess"); } + // wait for input or output here FD_ZERO(&rfds); - if (!stdin_is_dev_null) + if (master >= 0 && !stdin_is_dev_null) FD_SET(0, &rfds); FD_SET(_dpkgin, &rfds); if(master >= 0) @@@ -1141,6 -1130,7 +1152,6 @@@ if(stopOnError) RunScripts("DPkg::Post-Invoke"); - string dpkg_error; if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV) strprintf(dpkg_error, "Sub-process %s received a segmentation fault.",Args[0]); else if (WIFEXITED(Status) != 0) @@@ -1149,7 -1139,17 +1160,7 @@@ strprintf(dpkg_error, "Sub-process %s exited unexpectedly",Args[0]); if(dpkg_error.size() > 0) - { _error->Error(dpkg_error.c_str()); - string history_name = flCombine(_config->FindDir("Dir::Log"), - _config->Find("Dir::Log::History")); - if (!history_name.empty()) - { - FILE *history_out = fopen(history_name.c_str(),"a"); - fprintf(history_out, "Error: %s\n", dpkg_error.c_str()); - fclose(history_out); - } - } if(stopOnError) { @@@ -1175,3 -1175,186 +1186,186 @@@ void pkgDPkgPM::Reset( List.erase(List.begin(),List.end()); } /*}}}*/ + // pkgDpkgPM::WriteApportReport - write out error report pkg failure /*{{{*/ + // --------------------------------------------------------------------- + /* */ + void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) + { + string pkgname, reportfile, srcpkgname, pkgver, arch; + string::size_type pos; + FILE *report; + - if (_config->FindB("Dpkg::ApportFailureReport",true) == false) ++ if (_config->FindB("Dpkg::ApportFailureReport", false) == false) + { + std::clog << "configured to not write apport reports" << std::endl; + return; + } + + // only report the first errors + if(pkgFailures > _config->FindI("APT::Apport::MaxReports", 3)) + { + std::clog << _("No apport report written because MaxReports is reached already") << std::endl; + return; + } + + // check if its not a follow up error + const char *needle = dgettext("dpkg", "dependency problems - leaving unconfigured"); + if(strstr(errormsg, needle) != NULL) { + std::clog << _("No apport report written because the error message indicates its a followup error from a previous failure.") << std::endl; + return; + } + + // do not report disk-full failures + if(strstr(errormsg, strerror(ENOSPC)) != NULL) { + std::clog << _("No apport report written because the error message indicates a disk full error") << std::endl; + return; + } + + // do not report out-of-memory failures + if(strstr(errormsg, strerror(ENOMEM)) != NULL) { + std::clog << _("No apport report written because the error message indicates a out of memory error") << std::endl; + return; + } + + // do not report dpkg I/O errors + // XXX - this message is localized, but this only matches the English version. This is better than nothing. + if(strstr(errormsg, "short read in buffer_copy (")) { + std::clog << _("No apport report written because the error message indicates a dpkg I/O error") << std::endl; + return; + } + + // get the pkgname and reportfile + pkgname = flNotDir(pkgpath); + pos = pkgname.find('_'); + if(pos != string::npos) + pkgname = pkgname.substr(0, pos); + + // find the package versin and source package name + pkgCache::PkgIterator Pkg = Cache.FindPkg(pkgname); + if (Pkg.end() == true) + return; + pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg); + if (Ver.end() == true) + return; + pkgver = Ver.VerStr() == NULL ? "unknown" : Ver.VerStr(); + pkgRecords Recs(Cache); + pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList()); + srcpkgname = Parse.SourcePkg(); + if(srcpkgname.empty()) + srcpkgname = pkgname; + + // if the file exists already, we check: + // - if it was reported already (touched by apport). + // If not, we do nothing, otherwise + // we overwrite it. This is the same behaviour as apport + // - if we have a report with the same pkgversion already + // then we skip it + reportfile = flCombine("/var/crash",pkgname+".0.crash"); + if(FileExists(reportfile)) + { + struct stat buf; + char strbuf[255]; + + // check atime/mtime + stat(reportfile.c_str(), &buf); + if(buf.st_mtime > buf.st_atime) + return; + + // check if the existing report is the same version + report = fopen(reportfile.c_str(),"r"); + while(fgets(strbuf, sizeof(strbuf), report) != NULL) + { + if(strstr(strbuf,"Package:") == strbuf) + { + char pkgname[255], version[255]; + if(sscanf(strbuf, "Package: %s %s", pkgname, version) == 2) + if(strcmp(pkgver.c_str(), version) == 0) + { + fclose(report); + return; + } + } + } + fclose(report); + } + + // now write the report + arch = _config->Find("APT::Architecture"); + report = fopen(reportfile.c_str(),"w"); + if(report == NULL) + return; + if(_config->FindB("DPkgPM::InitialReportOnly",false) == true) + chmod(reportfile.c_str(), 0); + else + chmod(reportfile.c_str(), 0600); + fprintf(report, "ProblemType: Package\n"); + fprintf(report, "Architecture: %s\n", arch.c_str()); + time_t now = time(NULL); + fprintf(report, "Date: %s" , ctime(&now)); + fprintf(report, "Package: %s %s\n", pkgname.c_str(), pkgver.c_str()); + fprintf(report, "SourcePackage: %s\n", srcpkgname.c_str()); + fprintf(report, "ErrorMessage:\n %s\n", errormsg); + + // ensure that the log is flushed + if(term_out) + fflush(term_out); + + // attach terminal log it if we have it + string logfile_name = _config->FindFile("Dir::Log::Terminal"); + if (!logfile_name.empty()) + { + FILE *log = NULL; + char buf[1024]; + + fprintf(report, "DpkgTerminalLog:\n"); + log = fopen(logfile_name.c_str(),"r"); + if(log != NULL) + { + while( fgets(buf, sizeof(buf), log) != NULL) + fprintf(report, " %s", buf); + fclose(log); + } + } + + // log the ordering + const char *ops_str[] = {"Install", "Configure","Remove","Purge"}; + fprintf(report, "AptOrdering:\n"); + for (vector::iterator I = List.begin(); I != List.end(); I++) + fprintf(report, " %s: %s\n", (*I).Pkg.Name(), ops_str[(*I).Op]); + + // attach dmesg log (to learn about segfaults) + if (FileExists("/bin/dmesg")) + { + FILE *log = NULL; + char buf[1024]; + + fprintf(report, "Dmesg:\n"); + log = popen("/bin/dmesg","r"); + if(log != NULL) + { + while( fgets(buf, sizeof(buf), log) != NULL) + fprintf(report, " %s", buf); + fclose(log); + } + } + + // attach df -l log (to learn about filesystem status) + if (FileExists("/bin/df")) + { + FILE *log = NULL; + char buf[1024]; + + fprintf(report, "Df:\n"); + log = popen("/bin/df -l","r"); + if(log != NULL) + { + while( fgets(buf, sizeof(buf), log) != NULL) + fprintf(report, " %s", buf); + fclose(log); + } + } + + fclose(report); + + } + /*}}}*/ diff --combined apt-pkg/deb/dpkgpm.h index 330c788a2,160486bf9..ce3e20f2e --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@@ -29,10 -29,9 +29,11 @@@ class pkgDPkgPM : public pkgPackageMana char dpkgbuf[1024]; int dpkgbuf_pos; FILE *term_out; + FILE *history_out; + string dpkg_error; protected: + int pkgFailures; // progress reporting struct DpkgState @@@ -49,6 -48,7 +50,7 @@@ // the int is the state that is already done (e.g. a package that is // going to be install is already in state "half-installed") map PackageOpsDone; + // progress reporting unsigned int PackagesDone; unsigned int PackagesTotal; @@@ -68,8 -68,11 +70,11 @@@ // Helpers bool RunScriptsWithPkgs(const char *Cnf); bool SendV2Pkgs(FILE *F); - void WriteHistoryTag(FILE* history_out, string tag, string value); + void WriteHistoryTag(string tag, string value); + // apport integration + void WriteApportReport(const char *pkgpath, const char *errormsg); + // dpkg log bool OpenLog(); bool CloseLog(); diff --combined apt-pkg/init.cc index 60281deb3,e2f847ed2..21472eb3b --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@@ -51,6 -51,7 +51,7 @@@ bool pkgInitConfig(Configuration &Cnf Cnf.Set("Dir::State::lists","lists/"); Cnf.Set("Dir::State::cdroms","cdroms.list"); + Cnf.Set("Dir::State::mirrors","mirrors/"); // Cache Cnf.Set("Dir::Cache","var/cache/apt/"); @@@ -94,10 -95,10 +95,10 @@@ // Read the configuration parts dir string Parts = Cnf.FindDir("Dir::Etc::parts"); - if (FileExists(Parts) == true) + if (DirectoryExists(Parts) == true) Res &= ReadConfigDir(Cnf,Parts); else - _error->WarningE("FileExists",_("Unable to read %s"),Parts.c_str()); + _error->WarningE("DirectoryExists",_("Unable to read %s"),Parts.c_str()); // Read the main config file string FName = Cnf.FindFile("Dir::Etc::main"); diff --combined apt-pkg/tagfile.cc index 0d4999ee7,1c41f1265..e1f576875 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@@ -193,8 -193,17 +193,8 @@@ bool pkgTagFile::Jump(pkgTagSection &Ta /*}}}*/ // TagSection::Scan - Scan for the end of the header information /*{{{*/ // --------------------------------------------------------------------- -/* This looks for the first double new line in the data stream. It also - indexes the tags in the section. This very simple hash function for the - last 8 letters gives very good performance on the debian package files */ -inline static unsigned long AlphaHash(const char *Text, const char *End = 0) -{ - unsigned long Res = 0; - for (; Text != End && *Text != ':' && *Text != 0; Text++) - Res = ((unsigned long)(*Text) & 0xDF) ^ (Res << 1); - return Res & 0xFF; -} - +/* This looks for the first double new line in the data stream. + It also indexes the tags in the section. */ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength) { const char *End = Start + MaxLength; @@@ -409,6 -418,7 +409,7 @@@ static const char *iTFRewritePackageOrd "Section", "Installed-Size", "Maintainer", + "Original-Maintainer", "Architecture", "Source", "Version", @@@ -438,6 -448,7 +439,7 @@@ static const char *iTFRewriteSourceOrde "Priority", "Section", "Maintainer", + "Original-Maintainer", "Build-Depends", "Build-Depends-Indep", "Build-Conflicts", diff --combined cmdline/apt-get.cc index 44235e358,b379dc82f..eaf04eee7 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@@ -258,8 -258,8 +258,8 @@@ void ShowBroken(ostream &out,CacheFile } // Print out each package and the failed dependencies - out <<" " << I.Name() << ":"; - unsigned Indent = strlen(I.Name()) + 3; + out << " " << I.FullName(true) << " :"; + unsigned const Indent = I.FullName(true).size() + 3; bool First = true; pkgCache::VerIterator Ver; @@@ -312,7 -312,7 +312,7 @@@ out << ' ' << End.DepType() << ": "; FirstOr = false; - out << Start.TargetPkg().Name(); + out << Start.TargetPkg().FullName(true); // Show a quick summary of the version requirements if (Start.TargetVer() != 0) @@@ -374,9 -374,7 +374,9 @@@ void ShowNew(ostream &out,CacheFile &Ca { pkgCache::PkgIterator I(Cache,Cache.List[J]); if (Cache[I].NewInstall() == true) { - List += string(I.Name()) + " "; + if (Cache[I].CandidateVerIter(Cache).Pseudo() == true) + continue; + List += I.FullName(true) + " "; VersionsList += string(Cache[I].CandVersion) + "\n"; } } @@@ -398,12 -396,10 +398,12 @@@ void ShowDel(ostream &out,CacheFile &Ca pkgCache::PkgIterator I(Cache,Cache.List[J]); if (Cache[I].Delete() == true) { + if (Cache[I].CandidateVerIter(Cache).Pseudo() == true) + continue; if ((Cache[I].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge) - List += string(I.Name()) + "* "; + List += I.FullName(true) + "* "; else - List += string(I.Name()) + " "; + List += I.FullName(true) + " "; VersionsList += string(Cache[I].CandVersion)+ "\n"; } @@@ -428,7 -424,7 +428,7 @@@ void ShowKept(ostream &out,CacheFile &C I->CurrentVer == 0 || Cache[I].Delete() == true) continue; - List += string(I.Name()) + " "; + List += I.FullName(true) + " "; VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n"; } ShowList(out,_("The following packages have been kept back:"),List,VersionsList); @@@ -448,10 -444,8 +448,10 @@@ void ShowUpgraded(ostream &out,CacheFil // Not interesting if (Cache[I].Upgrade() == false || Cache[I].NewInstall() == true) continue; - - List += string(I.Name()) + " "; + if (Cache[I].CandidateVerIter(Cache).Pseudo() == true) + continue; + + List += I.FullName(true) + " "; VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n"; } ShowList(out,_("The following packages will be upgraded:"),List,VersionsList); @@@ -471,10 -465,8 +471,10 @@@ bool ShowDowngraded(ostream &out,CacheF // Not interesting if (Cache[I].Downgrade() == false || Cache[I].NewInstall() == true) continue; - - List += string(I.Name()) + " "; + if (Cache[I].CandidateVerIter(Cache).Pseudo() == true) + continue; + + List += I.FullName(true) + " "; VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n"; } return ShowList(out,_("The following packages will be DOWNGRADED:"),List,VersionsList); @@@ -492,7 -484,7 +492,7 @@@ bool ShowHold(ostream &out,CacheFile &C pkgCache::PkgIterator I(Cache,Cache.List[J]); if (Cache[I].InstallVer != (pkgCache::Version *)I.CurrentVer() && I->SelectedState == pkgCache::State::Hold) { - List += string(I.Name()) + " "; + List += I.FullName(true) + " "; VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n"; } } @@@ -526,7 -518,7 +526,7 @@@ bool ShowEssential(ostream &out,CacheFi if (Added[I->ID] == false) { Added[I->ID] = true; - List += string(I.Name()) + " "; + List += I.FullName(true) + " "; //VersionsList += string(Cache[I].CurVersion) + "\n"; ??? } } @@@ -550,7 -542,7 +550,7 @@@ Added[P->ID] = true; char S[300]; - snprintf(S,sizeof(S),_("%s (due to %s) "),P.Name(),I.Name()); + snprintf(S,sizeof(S),_("%s (due to %s) "),P.FullName(true).c_str(),I.FullName(true).c_str()); List += S; //VersionsList += "\n"; ??? } @@@ -574,9 -566,6 +574,9 @@@ void Stats(ostream &out,pkgDepCache &De unsigned long ReInstall = 0; for (pkgCache::PkgIterator I = Dep.PkgBegin(); I.end() == false; I++) { + if (pkgCache::VerIterator(Dep, Dep[I].CandidateVer).Pseudo() == true) + continue; + if (Dep[I].NewInstall() == true) Install++; else @@@ -692,7 -681,7 +692,7 @@@ bool CacheFile::CheckDeps(bool AllowBro } else { - c1out << _("You might want to run `apt-get -f install' to correct these.") << endl; + c1out << _("You might want to run 'apt-get -f install' to correct these.") << endl; ShowBroken(c1out,*this,true); return _error->Error(_("Unmet dependencies. Try using -f.")); @@@ -811,19 -800,20 +811,19 @@@ bool InstallPackages(CacheFile &Cache,b pkgRecords Recs(Cache); if (_error->PendingError() == true) return false; - - // Lock the archive directory - FileFd Lock; - if (_config->FindB("Debug::NoLocking",false) == false && - _config->FindB("APT::Get::Print-URIs") == false) - { - Lock.Fd(GetLock(_config->FindDir("Dir::Cache::Archives") + "lock")); - if (_error->PendingError() == true) - return _error->Error(_("Unable to lock the download directory")); - } - + // Create the download object + pkgAcquire Fetcher; AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0)); - pkgAcquire Fetcher(&Stat); + if (_config->FindB("APT::Get::Print-URIs", false) == true) + { + // force a hashsum for compatibility reasons + _config->CndSet("Acquire::ForceHash", "md5sum"); + if (Fetcher.Setup(&Stat, "") == false) + return false; + } + else if (Fetcher.Setup(&Stat, _config->FindDir("Dir::Cache::Archives")) == false) + return false; // Read the source list pkgSourceList List; @@@ -1044,7 -1034,7 +1044,7 @@@ if (Res == pkgPackageManager::Failed || _error->PendingError() == true) return false; if (Res == pkgPackageManager::Completed) - return true; + break; // Reload the fetcher object and loop again for media swapping Fetcher.Shutdown(); @@@ -1052,24 -1042,7 +1052,24 @@@ return false; _system->Lock(); - } + } + + std::set const disappearedPkgs = PM->GetDisappearedPackages(); + if (disappearedPkgs.empty() == true) + return true; + + string disappear; + for (std::set::const_iterator d = disappearedPkgs.begin(); + d != disappearedPkgs.end(); ++d) + disappear.append(*d).append(" "); + + ShowList(c1out, P_("The following package disappeared from your system as\n" + "all files have been overwritten by other packages:", + "The following packages disappeared from your system as\n" + "all files have been overwritten by other packages:", disappearedPkgs.size()), disappear, ""); + c0out << _("Note: This is done automatic and on purpose by dpkg.") << std::endl; + + return true; } /*}}}*/ // TryToInstall - Try to install a single package /*{{{*/ @@@ -1111,7 -1084,7 +1111,7 @@@ bool TryToInstall(pkgCache::PkgIterato if (found_one == true) { ioprintf(c1out,_("Note, selecting %s instead of %s\n"), - Prov.Name(),Pkg.Name()); + Prov.FullName(true).c_str(),Pkg.FullName(true).c_str()); Pkg = Prov; } } @@@ -1122,20 -1095,10 +1122,20 @@@ { if (AllowFail == true) ioprintf(c1out,_("Skipping %s, it is already installed and upgrade is not set.\n"), + Pkg.FullName(true).c_str()); + return true; + } + + // Ignore request for install if package would be new + if (_config->FindB("APT::Get::Only-Upgrade", false) == true && + Pkg->CurrentVer == 0) + { + if (AllowFail == true) + ioprintf(c1out,_("Skipping %s, it is not installed and only upgrades are requested.\n"), Pkg.Name()); return true; } - + // Check if there is something at all to install pkgDepCache::StateCache &State = Cache[Pkg]; if (Remove == true && Pkg->CurrentVer == 0) @@@ -1149,7 -1112,7 +1149,7 @@@ if (AllowFail == false) return false; - ioprintf(c1out,_("Package %s is not installed, so not removed\n"),Pkg.Name()); + ioprintf(c1out,_("Package %s is not installed, so not removed\n"),Pkg.FullName(true).c_str()); return true; } @@@ -1161,37 -1124,30 +1161,37 @@@ if (Pkg->ProvidesList != 0) { ioprintf(c1out,_("Package %s is a virtual package provided by:\n"), - Pkg.Name()); + Pkg.FullName(true).c_str()); pkgCache::PrvIterator I = Pkg.ProvidesList(); + unsigned short provider = 0; for (; I.end() == false; I++) { pkgCache::PkgIterator Pkg = I.OwnerPkg(); if (Cache[Pkg].CandidateVerIter(Cache) == I.OwnerVer()) { + c1out << " " << Pkg.FullName(true) << " " << I.OwnerVer().VerStr(); if (Cache[Pkg].Install() == true && Cache[Pkg].NewInstall() == false) - c1out << " " << Pkg.Name() << " " << I.OwnerVer().VerStr() << - _(" [Installed]") << endl; - else - c1out << " " << Pkg.Name() << " " << I.OwnerVer().VerStr() << endl; - } + c1out << _(" [Installed]"); + c1out << endl; + ++provider; + } } - c1out << _("You should explicitly select one to install.") << endl; + // if we found no candidate which provide this package, show non-candidates + if (provider == 0) + for (I = Pkg.ProvidesList(); I.end() == false; I++) + c1out << " " << I.OwnerPkg().FullName(true) << " " << I.OwnerVer().VerStr() + << _(" [Not candidate version]") << endl; + else + c1out << _("You should explicitly select one to install.") << endl; } else { ioprintf(c1out, _("Package %s is not available, but is referred to by another package.\n" "This may mean that the package is missing, has been obsoleted, or\n" - "is only available from another source\n"),Pkg.Name()); + "is only available from another source\n"),Pkg.FullName(true).c_str()); string List; string VersionsList; @@@ -1205,13 -1161,13 +1205,13 @@@ if (Seen[Dep.ParentPkg()->ID] == true) continue; Seen[Dep.ParentPkg()->ID] = true; - List += string(Dep.ParentPkg().Name()) + " "; + List += Dep.ParentPkg().FullName(true) + " "; //VersionsList += string(Dep.ParentPkg().CurVersion) + "\n"; ??? } ShowList(c1out,_("However the following packages replace it:"),List,VersionsList); } - _error->Error(_("Package %s has no installation candidate"),Pkg.Name()); + _error->Error(_("Package %s has no installation candidate"),Pkg.FullName(true).c_str()); return false; } @@@ -1232,7 -1188,7 +1232,7 @@@ { if (Pkg->CurrentVer == 0 || Pkg.CurrentVer().Downloadable() == false) ioprintf(c1out,_("Reinstallation of %s is not possible, it cannot be downloaded.\n"), - Pkg.Name()); + Pkg.FullName(true).c_str()); else Cache.SetReInstall(Pkg,true); } @@@ -1240,7 -1196,7 +1240,7 @@@ { if (AllowFail == true) ioprintf(c1out,_("%s is already the newest version.\n"), - Pkg.Name()); + Pkg.FullName(true).c_str()); } } else @@@ -1269,23 -1225,18 +1269,23 @@@ bool TryToChangeVer(pkgCache::PkgIterat { if (IsRel == true) return _error->Error(_("Release '%s' for '%s' was not found"), - VerTag,Pkg.Name()); + VerTag,Pkg.FullName(true).c_str()); return _error->Error(_("Version '%s' for '%s' was not found"), - VerTag,Pkg.Name()); + VerTag,Pkg.FullName(true).c_str()); } if (strcmp(VerTag,Ver.VerStr()) != 0) { ioprintf(c1out,_("Selected version %s (%s) for %s\n"), - Ver.VerStr(),Ver.RelStr().c_str(),Pkg.Name()); + Ver.VerStr(),Ver.RelStr().c_str(),Pkg.FullName(true).c_str()); } Cache.SetCandidateVersion(Ver); + + // Set the all package to the same candidate + if (Ver.Pseudo() == true) + Cache.SetCandidateVersion(Match.Find(Pkg.Group().FindPkg("all"))); + return true; } /*}}}*/ @@@ -1474,19 -1425,23 +1474,19 @@@ bool DoUpdate(CommandLine &CmdL if (List.ReadMainList() == false) return false; - // Lock the list directory - FileFd Lock; - if (_config->FindB("Debug::NoLocking",false) == false) - { - Lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock")); - if (_error->PendingError() == true) - return _error->Error(_("Unable to lock the list directory")); - } - // Create the progress AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0)); // Just print out the uris an exit if the --print-uris flag was used if (_config->FindB("APT::Get::Print-URIs") == true) { + // force a hashsum for compatibility reasons + _config->CndSet("Acquire::ForceHash", "md5sum"); + // get a fetcher - pkgAcquire Fetcher(&Stat); + pkgAcquire Fetcher; + if (Fetcher.Setup(&Stat) == false) + return false; // Populate it with the source selection and get all Indexes // (GetAll=true) @@@ -1550,7 -1505,7 +1550,7 @@@ bool DoAutomaticRemove(CacheFile &Cache { if(Pkg.CurrentVer() != 0 || Cache[Pkg].Install()) if(Debug) - std::cout << "We could delete %s" << Pkg.Name() << std::endl; + std::cout << "We could delete %s" << Pkg.FullName(true).c_str() << std::endl; if (doAutoRemove) { @@@ -1565,11 -1520,12 +1565,11 @@@ // only show stuff in the list that is not yet marked for removal if(Cache[Pkg].Delete() == false) { + ++autoRemoveCount; // we don't need to fill the strings if we don't need them - if (smallList == true) - ++autoRemoveCount; - else + if (smallList == false) { - autoremovelist += string(Pkg.Name()) + " "; + autoremovelist += Pkg.FullName(true) + " "; autoremoveversions += string(Cache[Pkg].CandVersion) + "\n"; } } @@@ -1580,12 -1536,9 +1580,12 @@@ if (doAutoRemove == false && (autoremovelist.empty() == false || autoRemoveCount != 0)) { if (smallList == false) - ShowList(c1out, _("The following packages were automatically installed and are no longer required:"), autoremovelist, autoremoveversions); + ShowList(c1out, P_("The following package is automatically installed and is no longer required:", + "The following packages were automatically installed and are no longer required:", + autoRemoveCount), autoremovelist, autoremoveversions); else - ioprintf(c1out, _("%lu packages were automatically installed and are no longer required.\n"), autoRemoveCount); + ioprintf(c1out, P_("%lu package was automatically installed and is no longer required.\n", + "%lu packages were automatically installed and are no longer required.\n", autoRemoveCount), autoRemoveCount); c1out << _("Use 'apt-get autoremove' to remove them.") << std::endl; } // Now see if we had destroyed anything (if we had done anything) @@@ -1805,14 -1758,11 +1805,14 @@@ bool DoInstall(CommandLine &CmdL // Run over the matches bool Hit = false; - for (Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) + for (pkgCache::GrpIterator Grp = Cache->GrpBegin(); Grp.end() == false; ++Grp) { - if (regexec(&Pattern,Pkg.Name(),0,0,0) != 0) + if (regexec(&Pattern,Grp.Name(),0,0,0) != 0) continue; - + Pkg = Grp.FindPkg("native"); + if (unlikely(Pkg.end() == true)) + continue; + ioprintf(c1out,_("Note, selecting %s for regex '%s'\n"), Pkg.Name(),S); @@@ -1843,11 -1793,10 +1843,11 @@@ Cache[Pkg].Install() == false && (Cache[Pkg].Flags & pkgCache::Flag::Auto) && _config->FindB("APT::Get::ReInstall",false) == false && + _config->FindB("APT::Get::Only-Upgrade",false) == false && _config->FindB("APT::Get::Download-Only",false) == false) { ioprintf(c1out,_("%s set to manually installed.\n"), - Pkg.Name()); + Pkg.FullName(true).c_str()); Cache->MarkAuto(Pkg,false); AutoMarkChanged++; } @@@ -1859,7 -1808,7 +1859,7 @@@ packages */ if (BrokenFix == true && Cache->BrokenCount() != 0) { - c1out << _("You might want to run `apt-get -f install' to correct these:") << endl; + c1out << _("You might want to run 'apt-get -f install' to correct these:") << endl; ShowBroken(c1out,Cache,false); return _error->Error(_("Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution).")); @@@ -1916,7 -1865,7 +1916,7 @@@ break; if (*J == 0) { - List += string(I.Name()) + " "; + List += I.FullName(true) + " "; VersionsList += string(Cache[I].CandVersion) + "\n"; } } @@@ -1952,11 -1901,10 +1952,11 @@@ for(;;) { /* Skip if package is installed already, or is about to be */ - string target = string(Start.TargetPkg().Name()) + " "; - - if ((*Start.TargetPkg()).SelectedState == pkgCache::State::Install - || Cache[Start.TargetPkg()].Install()) + string target = Start.TargetPkg().FullName(true) + " "; + pkgCache::PkgIterator const TarPkg = Start.TargetPkg(); + if (TarPkg->SelectedState == pkgCache::State::Install || + TarPkg->SelectedState == pkgCache::State::Hold || + Cache[Start.TargetPkg()].Install()) { foundInstalledInOrGroup=true; break; @@@ -2031,46 -1979,6 +2031,46 @@@ return InstallPackages(Cache,false); } + +/* mark packages as automatically/manually installed. */ +bool DoMarkAuto(CommandLine &CmdL) +{ + bool Action = true; + int AutoMarkChanged = 0; + OpTextProgress progress; + CacheFile Cache; + if (Cache.Open() == false) + return false; + + if (strcasecmp(CmdL.FileList[0],"markauto") == 0) + Action = true; + else if (strcasecmp(CmdL.FileList[0],"unmarkauto") == 0) + Action = false; + + for (const char **I = CmdL.FileList + 1; *I != 0; I++) + { + const char *S = *I; + // Locate the package + pkgCache::PkgIterator Pkg = Cache->FindPkg(S); + if (Pkg.end() == true) { + return _error->Error(_("Couldn't find package %s"),S); + } + else + { + if (!Action) + ioprintf(c1out,_("%s set to manually installed.\n"), Pkg.Name()); + else + ioprintf(c1out,_("%s set to automatically installed.\n"), + Pkg.Name()); + + Cache->MarkAuto(Pkg,Action); + AutoMarkChanged++; + } + } + if (AutoMarkChanged && ! _config->FindB("APT::Get::Simulate",false)) + return Cache->writeStateFile(NULL); + return false; +} /*}}}*/ // DoDistUpgrade - Automatic smart upgrader /*{{{*/ // --------------------------------------------------------------------- @@@ -2279,23 -2187,13 +2279,23 @@@ bool DoSource(CommandLine &CmdL // Create the download object AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0)); - pkgAcquire Fetcher(&Stat); + pkgAcquire Fetcher; + if (Fetcher.Setup(&Stat) == false) + return false; DscFile *Dsc = new DscFile[CmdL.FileSize()]; // insert all downloaded uris into this set to avoid downloading them // twice set queued; + + // Diff only mode only fetches .diff files + bool const diffOnly = _config->FindB("APT::Get::Diff-Only", false); + // Tar only mode only fetches .tar files + bool const tarOnly = _config->FindB("APT::Get::Tar-Only", false); + // Dsc only mode only fetches .dsc files + bool const dscOnly = _config->FindB("APT::Get::Dsc-Only", false); + // Load the requestd sources into the fetcher unsigned J = 0; for (const char **I = CmdL.FileList + 1; *I != 0; I++, J++) @@@ -2306,6 -2204,33 +2306,33 @@@ if (Last == 0) return _error->Error(_("Unable to find a source package for %s"),Src.c_str()); + string srec = Last->AsStr(); + string::size_type pos = srec.find("\nVcs-"); + while (pos != string::npos) + { + pos += strlen("\nVcs-"); + string vcs = srec.substr(pos,srec.find(":",pos)-pos); + if(vcs == "Browser") + { + pos = srec.find("\nVcs-", pos); + continue; + } + pos += vcs.length()+2; + string::size_type epos = srec.find("\n", pos); + string uri = srec.substr(pos,epos-pos).c_str(); + ioprintf(c1out, _("NOTICE: '%s' packaging is maintained in " + "the '%s' version control system at:\n" + "%s\n"), + Src.c_str(), vcs.c_str(), uri.c_str()); + if(vcs == "Bzr") + ioprintf(c1out,_("Please use:\n" + "bzr get %s\n" + "to retrieve the latest (possibly unreleased) " + "updates to the package.\n"), + uri.c_str()); + break; + } + // Back track vector Lst; if (Last->Files(Lst) == false) @@@ -2322,17 -2247,21 +2349,17 @@@ Dsc[J].Version = Last->Version(); Dsc[J].Dsc = flNotDir(I->Path); } - - // Diff only mode only fetches .diff files - if (_config->FindB("APT::Get::Diff-Only",false) == true && - I->Type != "diff") - continue; - - // Tar only mode only fetches .tar files - if (_config->FindB("APT::Get::Tar-Only",false) == true && - I->Type != "tar") - continue; - // Dsc only mode only fetches .dsc files - if (_config->FindB("APT::Get::Dsc-Only",false) == true && - I->Type != "dsc") - continue; + // Handle the only options so that multiple can be used at once + if (diffOnly == true || tarOnly == true || dscOnly == true) + { + if ((diffOnly == true && I->Type == "diff") || + (tarOnly == true && I->Type == "tar") || + (dscOnly == true && I->Type == "dsc")) + ; // Fine, we want this file downloaded + else + continue; + } // don't download the same uri twice (should this be moved to // the fetcher interface itself?) @@@ -2446,7 -2375,6 +2473,7 @@@ if (Process == 0) { + bool const fixBroken = _config->FindB("APT::Get::Fix-Broken", false); for (unsigned I = 0; I != J; I++) { string Dir = Dsc[I].Package + '-' + Cache->VS().UpstreamVersion(Dsc[I].Version.c_str()); @@@ -2459,7 -2387,7 +2486,7 @@@ // See if the package is already unpacked struct stat Stat; - if (stat(Dir.c_str(),&Stat) == 0 && + if (fixBroken == false && stat(Dir.c_str(),&Stat) == 0 && S_ISDIR(Stat.st_mode) != 0) { ioprintf(c0out ,_("Skipping unpack of already unpacked source in %s\n"), @@@ -2543,9 -2471,7 +2570,9 @@@ bool DoBuildDep(CommandLine &CmdL // Create the download object AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0)); - pkgAcquire Fetcher(&Stat); + pkgAcquire Fetcher; + if (Fetcher.Setup(&Stat) == false) + return false; unsigned J = 0; for (const char **I = CmdL.FileList + 1; *I != 0; I++, J++) @@@ -2557,7 -2483,7 +2584,7 @@@ // Process the build-dependencies vector BuildDeps; - if (Last->BuildDepends(BuildDeps, _config->FindB("APT::Get::Arch-Only",false)) == false) + if (Last->BuildDepends(BuildDeps, _config->FindB("APT::Get::Arch-Only",true)) == false) return _error->Error(_("Unable to get build-dependency information for %s"),Src.c_str()); // Also ensure that build-essential packages are present @@@ -2656,7 -2582,7 +2683,7 @@@ for (; Prv.end() != true; Prv++) { if (_config->FindB("Debug::BuildDeps",false) == true) - cout << " Checking provider " << Prv.OwnerPkg().Name() << endl; + cout << " Checking provider " << Prv.OwnerPkg().FullName() << endl; if ((*Cache)[Prv.OwnerPkg()].InstVerIter(*Cache).end() == false) break; @@@ -2697,7 -2623,7 +2724,7 @@@ if (Prv.end() == false) { if (_config->FindB("Debug::BuildDeps",false) == true) - cout << " Is provided by installed package " << Prv.OwnerPkg().Name() << endl; + cout << " Is provided by installed package " << Prv.OwnerPkg().FullName() << endl; skipAlternatives = hasAlternatives; continue; } @@@ -2722,7 -2648,7 +2749,7 @@@ return _error->Error(_("Failed to satisfy %s dependency for %s: Installed package %s is too new"), Last->BuildDepType((*D).Type), Src.c_str(), - Pkg.Name()); + Pkg.FullName(true).c_str()); } } @@@ -2771,6 -2697,7 +2798,6 @@@ return true; } /*}}}*/ - // DoMoo - Never Ask, Never Tell /*{{{*/ // --------------------------------------------------------------------- /* */ @@@ -2861,8 -2788,6 +2888,8 @@@ bool ShowHelp(CommandLine &CmdL " clean - Erase downloaded archive files\n" " autoclean - Erase old downloaded archive files\n" " check - Verify that there are no broken dependencies\n" + " markauto - Mark the given packages as automatically installed\n" + " unmarkauto - Mark the given packages as manually installed\n" "\n" "Options:\n" " -h This help text.\n" @@@ -2941,7 -2866,6 +2968,7 @@@ int main(int argc,const char *argv[] {0,"fix-missing","APT::Get::Fix-Missing",0}, {0,"ignore-hold","APT::Ignore-Hold",0}, {0,"upgrade","APT::Get::upgrade",0}, + {0,"only-upgrade","APT::Get::Only-Upgrade",0}, {0,"force-yes","APT::Get::force-yes",0}, {0,"print-uris","APT::Get::Print-URIs",0}, {0,"diff-only","APT::Get::Diff-Only",0}, @@@ -2968,9 -2892,6 +2995,8 @@@ {"remove",&DoInstall}, {"purge",&DoInstall}, {"autoremove",&DoInstall}, - {"purge",&DoInstall}, + {"markauto",&DoMarkAuto}, + {"unmarkauto",&DoMarkAuto}, {"dist-upgrade",&DoDistUpgrade}, {"dselect-upgrade",&DoDSelectUpgrade}, {"build-dep",&DoBuildDep}, diff --combined cmdline/apt-report-mirror-failure index 000000000,e8ffdc2c7..7c390642a mode 000000,100755..100755 --- a/cmdline/apt-report-mirror-failure +++ b/cmdline/apt-report-mirror-failure @@@ -1,0 -1,24 +1,29 @@@ + #!/usr/bin/python ++# ++# This is a stub that is meant to support failure reporting of ++# mirrors to a central database ++# ++# its currently not used + + import sys + import urllib + import apt_pkg + + apt_pkg.init() + url = apt_pkg.Config.find("Acquire::Mirror::ReportFailures", "") + #"http://people.ubuntu.com:9000/mirror-failure") + #"http://localhost:9000/mirror-failure") + if not url: + sys.exit(0) + + print "Reporting mirror failure to '%s'" % url + + data = {} + data['mirror'] = sys.argv[1] + data['failurl'] = sys.argv[2] + data['error'] = sys.argv[3] + f = urllib.urlopen(url, urllib.urlencode(data)) + f.read() + f.close() + + diff --combined cmdline/makefile index 3260e375b,5ae6fb0f1..917ccc96a --- a/cmdline/makefile +++ b/cmdline/makefile @@@ -58,3 -58,9 +58,9 @@@ SOURCE=apt-mar TO=$(BIN) TARGET=program include $(COPY_H) + -# The apt-key program -SOURCE=apt-report-mirror-failure -TO=$(BIN) -TARGET=program -include $(COPY_H) ++# The apt-report-mirror-failure program ++#SOURCE=apt-report-mirror-failure ++#TO=$(BIN) ++#TARGET=program ++#include $(COPY_H) diff --combined configure.in index 5e7122f33,0069020ff..8e5c636f7 --- a/configure.in +++ b/configure.in @@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- - AC_DEFINE_UNQUOTED(VERSION,"0.7.26~exp4") -AC_DEFINE_UNQUOTED(VERSION,"0.7.25ubuntu1") ++AC_DEFINE_UNQUOTED(VERSION,"0.7.26~exp6") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --combined debian/apt.conf.autoremove index b41be8397,44e6eb69c..2f00b9f8b --- a/debian/apt.conf.autoremove +++ b/debian/apt.conf.autoremove @@@ -1,9 -1,23 +1,23 @@@ APT { NeverAutoRemove - { + { + "^linux-firmware$"; "^linux-image.*"; "^linux-restricted-modules.*"; - "^kfreebsd-image.*"; + "^linux-ubuntu-modules-.*"; + }; + + Never-MarkAuto-Sections - { ++ { + "metapackages"; + "restricted/metapackages"; + "universe/metapackages"; + "multiverse/metapackages"; + "oldlibs"; + "restricted/oldlibs"; + "universe/oldlibs"; + "multiverse/oldlibs"; + }; }; diff --combined debian/changelog index 3771ca415,4da4e86b9..1740d196c --- a/debian/changelog +++ b/debian/changelog @@@ -1,222 -1,52 +1,247 @@@ -apt (0.7.25.3ubuntu9) lucid-proposed; urgency=low ++apt (0.7.26~exp6) experimental; urgency=low + - * debian/apt.postinst: - - do not fail if getent returns nothing useful (LP: #579647) - thanks to Jean-Baptiste Lallement - - -- Michael Vogt Fri, 14 May 2010 09:40:50 +0200 - -apt (0.7.25.3ubuntu8) lucid-proposed; urgency=low ++ [ Michael Vogt ] ++ * merge the remaining Ubuntu change: ++ - on gpg verification failure warn and restore the last known ++ good state ++ - on failure display the IP of the server (useful for servers ++ that use round robin DNS) ++ - support Original-Maintainer in RewritePackageOrder ++ - enable cdrom autodetection via libudev by default ++ - show messsage about Vcs in use when apt-get source is run for ++ packages maintained in a Vcs ++ - better support transitional packages with mark auto-installed. ++ when the transitional package is in "oldlibs" the new package ++ is not marked auto installed (same is true for section ++ metapackages) ++ - provide new "deb mirror://archive.foo/mirrors.list sid main" ++ method expects a list of mirrors (generated on the server e.g. ++ via geoip) and will use that, including cycle on failure ++ - write apport crash file on package failure (disabled by default ++ on debian until apport is available) ++ - support mirror failure reporting (disabled by default on debian) ++ ++ -- Michael Vogt Wed, 09 Jun 2010 10:50:17 +0200 ++ +apt (0.7.26~exp5) experimental; urgency=low - [ Loïc Minier ] - * Use https:// in Vcs-Bzr URL. + [ David Kalnischkies ] + * cmdline/apt-get.cc: + - rerun dpkg-source in source if --fix-broken is given (Closes: #576752) + - don't suggest held packages as they are installed (Closes: #578135) + - handle multiple --{tar,diff,dsc}-only options correctly + - show at the end of the install process a list of disappeared packages + * cmdline/apt-cache.cc: + - use GroupCount for package names in stats and add a package struct line + * methods/rred.cc: + - use the patchfile modification time instead of the one from the + "old" file - thanks to Philipp Weis for noticing! (Closes: #571541) + * debian/rules: + - remove targets referring to CVS or arch as they are useless + - use $(CURDIR) instead of $(pwd) + - use dpkg-buildflags if available for CXXFLAGS + * README.arch: + - remove the file completely as it has no use nowadays + * apt-pkg/depcache.cc: + - be doublesure that the killer query is empty before starting reinstall + * methods/gpgv.cc: + - remove the keyrings count limit by using vector magic + * contrib/mmap.cc: + - clarify "MMap reached size limit" error message, thanks Ivan Masár! + * doc/apt.ent + - add entities for the current oldstable/stable/testing codenames + * doc/sources.list.5.xml: + - use stable-codename instead of stable in the examples (Closes: #531492) + * doc/apt_preferences.5.xml: + - adapt some examples here to use current codenames as well + - add "NotAutomatic: yes" handling, thanks Osamu Aoki (Closes: #490347) + * debian/libapt-pkg-doc.doc-base.cache: + - remove yet another reference to the removed cache.sgml + * doc/apt-get.8.xml: + - do not say explicit target_release_{name,version,codename}, it should + be clear by itself and 'man' can break lines again (Closes: #566166) + - remove the gnome-apt reference as it is removed from unstable + * apt-pkg/deb/dpkgpm.cc: + - add 'disappear' to the known processing states, thanks Jonathan Nieder + * apt-pkg/packagemanager.h: + - export info about disappeared packages with GetDisappearedPackages() [ Michael Vogt ] - * apt-pkg/deb/debrecords.cc: - - fix max tag buffer size (LP: #545336, closes: #578959) - * apt-pkg/indexfile.cc: - - If no "_" is found in the language code, try to find a "." - This is required for languages like Esperanto that have no - county associated with them (LP: #560956) - Thanks to "Aisano" for the fix + * methods/http.{cc,h}: + - code cleanup, use enums instead of magic ints + + [ Jari Aalto ] + * debian/rules: + - spell out some less known options to reduce manpage consultation-rate + - Use POSIX command substitution: $() + - Remove EOL whitespace (Closes: #577804) - -- Michael Vogt Wed, 05 May 2010 10:33:46 +0200 + [ Julian Andres Klode ] + * apt-pkg/acquire-item.cc: + - Fix pkgAcqFile::Custom600Headers() to always return something. + -apt (0.7.25.3ubuntu7) lucid; urgency=low + [ Christian Perrier ] + * Slovak translation update. Closes: #581159 + * Italian translation update. Closes: #581742 - Cherry pick fixes from the lp:~mvo/apt/mvo branch: + -- Michael Vogt Tue, 25 May 2010 16:01:42 +0200 - [ Evan Dandrea ] - * Remember hosts with general failures for - https://wiki.ubuntu.com/NetworklessInstallationFixes (LP: #556831). - - [ Michael Vogt ] - * improve debug output for Debug::pkgPackageManager +apt (0.7.26~exp4) experimental; urgency=low - -- Michael Vogt Wed, 14 Apr 2010 20:30:03 +0200 + [ David Kalnischkies ] + * apt-pkg/depcache.cc: + - rewrite the pseudo package reinstaller to be more intelligent + in his package choices + * apt-pkg/packagemanager.cc: + - don't try to "unpack" pseudo packages twice + * apt-pkg/contrib/fileutl.cc: + - add a parent-guarded "mkdir -p" as CreateDirectory() + * apt-pkg/acquire.{cc,h}: + - add a delayed constructor with Setup() for success reporting + - check for and create directories in Setup if needed instead of + error out unfriendly in the Constructor (Closes: #523920, #525783) + - optional handle a lock file in Setup() + * apt-pkg/acquire-item.cc: + - Acquire::ForceHash to force method for expected hash + * cmdline/apt-get.cc: + - remove the lock file handling and let Acquire take care of it instead + - display MD5Sum in --print-uris if not forced to use another method + instead of displaying the strongest available (Closes: #576420) + - regex for package names executed on Grp- not PkgIterator + - show non-candidates as fallback for virtual packages (Closes: #578385) + - set also "all" to this version for pseudo packages in TryToChangeVer + * apt-pkg/deb/dpkgpm.cc: + - remove Chroot-Directory from files passed to install commands. + Thanks to Kel Modderman for report & patch! (Closes: #577226) + * ftparchive/writer.cc: + - remove 999 chars Files and Checksums rewrite limit (Closes: #577759) + * cmdline/apt-cache.cc: + - align Installed and Candidate Version in policy so they can be compared + easier, thanks Ralf Gesellensetter for the pointer! (Closes: #578657) + * doc/apt.ent: + - Add a note about APT_CONFIG in the -c description (Closes: #578267) + * doc/po/de.po: + - correct typos in german apt_preferences manpage, thanks Chris Leick! + * apt-pkg/sourcelist.cc: + - be less strict and accept [option=value] as well + * apt-pkg/contrib/configuration.cc: + - error out if #clear directive has no argument + * doc/files.sgml: + - sync documentation with status quo, regarding files/directories in + use, extended_states and uri schemes. + * doc/cache.sgml: + - drop the file in favor of inplace documentation with doxygen + * apt-pkg/pkgcache.h: + - enhance the Groups ABI by providing a ID as the other structs does + - check also the size of the Group struct then checking for the others + + [ Jari Aalto ] + * cmdline/apt-get.cc: + - replace backticks with single quotes around fix-broken command + in the broken packages message. (Closes: #577168) + * dselect/install: + - modernize if-statements not to use 'x' (Closes: #577117) + - replace backticks with POSIX $() (Closes: #577116) -apt (0.7.25.3ubuntu6) lucid; urgency=low + [ Michael Vogt ] + * [ Abi break ] apt-pkg/acquire-item.{cc,h}: + - add "IsIndexFile" to constructor of pkgAcqFile so that it sends + the right cache control headers + * cmdline/apt-get.cc: + - fix crash when pkg.VersionList() is empty + * apt-pkg/depcache.cc: + - fix incorrect std::cout usage for debug output + * test/libapt/getlanguages_test.cc: + - Add test for Esperanto that has nocounty associated with them + (LP: #560956) + * apt-pkg/deb/debrecords.cc: + - fix max tag buffer size (LP: #545336, closes: #578959) + * debian/rules: + - install html doxygen in libapt-pkg-doc + * debian/control: + - build-depend on doxygen + [ Julian Andres Klode ] + * apt-pkg/contrib/weakptr.h: + - add a class WeakPointable which allows one to register weak pointers to + an object which will be set to NULL when the object is deallocated. + * [ABI break] apt-pkg/acquire{-worker,-item,}.h: + - subclass pkgAcquire::{Worker,Item,ItemDesc} from WeakPointable. + * apt-pkg/pkgcache.cc: + - Merge fix from David to correct handling in single-arch environments. + * cmdline/apt-cache.cc: + - Add a showauto command to apt-cache. * cmdline/apt-get.cc: - - fix crash when pkg.VersionList() is empty (LP: #556056) + - Add apt-get markauto and unmarkauto commands. + + -- Michael Vogt Thu, 06 May 2010 09:32:54 +0200 - -- Michael Vogt Thu, 08 Apr 2010 21:13:25 +0200 +apt (0.7.26~exp3) experimental; urgency=low -apt (0.7.25.3ubuntu5) lucid; urgency=low + [ Christian Perrier ] + * German translation update. Closes: #571037 + * Spanish manpages translation update. Closes: #573293 + * Dutch translation update. Closes: #573946 + * Polish manpages translation update. Closes: #574558 + * Add "manpages-pl (<< 20060617-3~)" to avoid file conflicts with + that package that was providing some manpages for APT utilities. [ David Kalnischkies ] + * [BREAK] merge MultiArch-ABI. We don't support MultiArch, + but we support the usage of the new ABI so libapt users + can start to prepare for MultiArch (Closes: #536029) + * Ignore :qualifiers after package name in build dependencies + in the library by default, but try to honour them in apt-get + as we have some sort of MultiArch support ready (Closes: #558103) + * add translation of the manpages to PT (portuguese) + Thanks to Américo Monteiro! + * Switch to dpkg-source 3.0 (native) format + * apt-pkg/depcache.cc: + - remove Auto-Installed information from extended_states + together with the package itself (Closes: #572364) + * cmdline/apt-mark: + - don't crash if no arguments are given (Closes: #570962) + * debian/control: + - remove some years old and obsolete Replaces + - add automake/conf build-depends/conflicts as recommend by + the autotools-dev README (Closes: #572615) + * apt-pkg/contrib/mmap.{h,cc}: + - add char[] fallback for filesystems without shared writable + mmap() like JFFS2. Thanks to Marius Vollmer for writing + and to Loïc Minier for pointing to the patch! (Closes: #314334) + * doc/apt_preferences.5.xml: + - fix two typos and be more verbose in the novice warning. + Thanks to Osamu Aoki for pointing it out! (Closes: #567669) + - fix a=sid vs. n=sid typo, thanks Ansgar Burchardt! + - origin can be used to match a hostname (Closes: #352667) + - remove wrong pin-priority is optional remark (Closes: #574944) + * apt-pkg/deb/dpkgpm.cc: + - fix error message construction in OpenLog() + - if available store the Commandline in the history * cmdline/apt-get.cc: + - add a --only-upgrade flag to install command (Closes: #572259) + - fix memory leaks in error conditions in DoSource() - try version match in FindSrc first exact than fuzzy (LP: #551178) + * apt-pkg/contrib/cmndline.cc: + - save Commandline in Commandline::AsString for logging + * apt-pkg/deb/debversion.cc: + - consider absent of debian revision equivalent to 0 (Closes: #573592) + * doc/makefile, doc/*: + - generate subdirectories for building the manpages in on the fly + depending on the po files we have. + * apt-pkg/pkgcachegen.cc: + - merge versions correctly even if multiple different versions + with the same version number are available. + Thanks to Magnus Holmgren for the patch! (Closes: #351056) + * ftparchive/writer.cc: + - write LongDescriptions if they shouldn't be included in Packages + file into i18n/Translation-en by default. + * doc/po/de.po: + - correct a few typos in the german manpage translation. + Thanks to Chris Leick and Georg Koppen! (Closes: #574962) + * apt-pkg/contrib/strutl.cc: + - convert all toupper calls to tolower_ascii for a little speedup [ Jean-Baptiste Lallement ] * apt-pkg/contrib/strutl.cc: @@@ -224,25 -54,38 +249,25 @@@ - unescape '%' sequence only if followed by 2 hex digit - username/password are urlencoded in proxy string (RFC 3986) - -- Michael Vogt Wed, 31 Mar 2010 21:59:42 +0200 - -apt (0.7.25.3ubuntu4) lucid; urgency=low - - [ David Kalnischkies ] - * apt-pkg/deb/debversion.cc: - - consider absent of debian revision equivalent to 0 (Closes: #573592) - LP: #540228 - * cmdline/apt-get.cc, apt-pkg/cdrom.cc: - - fix memory leaks in error conditions in DoSource() - * apt-pkg/deb/dpkgpm.cc: - - fix error message construction in OpenLog() - - -- Michael Vogt Fri, 26 Mar 2010 16:57:49 +0100 - -apt (0.7.25.3ubuntu3) lucid; urgency=low - - * apt-pkg/indexfile.cc: - - remove "cs" from languages that need the full langcode when - downloading translations (thanks to Steve Langasek) - - -- Michael Vogt Mon, 15 Mar 2010 09:42:39 +0100 - -apt (0.7.25.3ubuntu2) lucid; urgency=low + [ Julian Andres Klode ] + * cmdline/apt-cache.cc: + - Change behavior of showsrc to match the one of show (Closes: #512046). + * cmdline/apt-key: + - Honor Apt::GPGV::TrustedKeyring (Closes: #316390) + * cmdline/apt-mark: + - Use the new python-apt API (and conflict with python-apt << 0.7.93.2). + * apt-inst/contrib/arfile.h: + - Add public ARArchive::Members() which returns the list of members. + * apt-pkg/policy.cc: + - Always return a candidate if there is at least one version pinned > 0 + (Closes: #512318) + * ftparchive/apt-ftparchive.cc: + - Read default configuration (Closes: #383257) + * debian/rules: + - Fix the libraries name to be e.g. libapt-pkg4.9 instead of + libapt-pkg-4.9. [ Michael Vogt ] - * abicheck/ - - add new abitest tester using the ABI Compliance Checker from - http://ispras.linuxfoundation.org/index.php/ABI_compliance_checker - * debian/apt.conf.autoremove: - - add "oldlibs" to the APT::Never-MarkAuto-Sections as its used - for transitional packages * apt-pkg/deb/dpkgpm.cc: - fix backgrounding when dpkg runs (closes: #486222) * cmdline/apt-mark: @@@ -251,82 -94,40 +276,82 @@@ * cmdline/apt-get.cc: - if apt-get source foo=version or foo/distro can not be found, error out (LP: #502641) - * apt-pkg/indexfile.cc: - - deal correctly with three letter langcodes (LP: #391409) - * debian/apt.cron.daily: - - do not look into admin users gconf anymore for the http proxy - the user now needs to use the "Apply system-wide" UI in the - gnome-control-center to set it - * debian/apt.postinst: - - add set_apt_proxy_from_gconf() and run that once on upgrade if - there is no proxy configured already system-wide (LP: #432631) - From that point on gnome-control-center will have to warn if - the user makes changes to the proxy settings and does not apply - them system wide + * apt-pkg/packagemanager.cc: + - better debug output + * doc/examples/configure-index: + - add missing Debug::pkgPackageManager option - [ Robert Collins ] - * Change the package index Info methods to allow apt-cache policy to be - useful when using several different archives on the same host. - (Closes: #329814, LP: #22354) + -- Michael Vogt Thu, 01 Apr 2010 17:30:43 +0200 + +apt (0.7.26~exp2) experimental; urgency=low + + * fix crash when LANGUAGE is not set - -- Michael Vogt Fri, 12 Mar 2010 23:10:52 +0100 + -- Michael Vogt Thu, 18 Feb 2010 22:07:23 +0100 -apt (0.7.25.3ubuntu1) lucid; urgency=low +apt (0.7.26~exp1) experimental; urgency=low + + [ David Kalnischkies ] + * [BREAK] add possibility to download and use multiply + Translation files, configurable with Acquire::Translation + (Closes: #444222, #448216, #550564) + * Ignore :qualifiers after package name in build dependencies + for now as long we don't understand them (Closes: #558103) + * apt-pkg/contrib/mmap.{cc,h}: + - extend it to have a growable flag - unused now but maybe... + * apt-pkg/pkgcache.h: + - use long instead of short for {Ver,Desc}File size, + patch from Víctor Manuel Jáquez Leal, thanks! (Closes: #538917) + * apt-pkg/acquire-item.cc: + - allow also to skip the last patch if target is reached, + thanks Bernhard R. Link! (Closes: #545699) + * ftparchive/writer.{cc,h}: + - add --arch option for packages and contents commands + - if an arch is given accept only *_all.deb and *_arch.deb instead + of *.deb. Thanks Stephan Bosch for the patch! (Closes: #319710) + - add APT::FTPArchive::AlwaysStat to disable the too aggressive + caching if versions are build multiply times (not recommend) + Patch by Christoph Goehre, thanks! (Closes: #463260) + * apt-pkg/deb/dpkgpm.cc: + - stdin redirected to /dev/null takes all CPU (Closes: #569488) + Thanks to Aurelien Jarno for providing (again) a patch! + * buildlib/apti18n.h.in, po/makefile: + - add ngettext support with P_() + * aptconfiguration.cc: + - include all existing Translation files in the Cache (Closes: 564137) + * debian/control: + - update with no changes to debian policy 3.8.4 + * doc/apt_preferences.5.xml: + - explicitly warn against careless use (Closes: #567669) + * debian/rules: + - remove creation of empty dir /usr/share/apt + * doc/apt-cdrom.8.xml: + - fix typo spotted by lintian: proc(c)eed + [ Ivan Masár ] + * Slovak translation update. Closes: #568294 + [ Michael Vogt ] - * merged with the debian-sid branch + * [BREAK] merged lp:~mvo/apt/history + - this writes a /var/log/apt/history tagfile that contains details + from the transaction (complements term.log) * methods/http.cc: + - add cache-control headers even if no cache is given to allow + adding options for intercepting proxies - add Acquire::http::ProxyAutoDetect configuration that can be used to call a external helper to figure out the proxy configuration and return it to apt via stdout (this is a step towards WPAD and zeroconf/avahi support) - - [ Ivan Masár ] - * Slovak translation update. Closes: #568294 + * abicheck/ + - add new abitest tester using the ABI Compliance Checker from + http://ispras.linuxfoundation.org/index.php/ABI_compliance_checker + + [ Robert Collins ] + * Change the package index Info methods to allow apt-cache policy to be + useful when using several different archives on the same host. + (Closes: #329814, LP: #22354) - -- Michael Vogt Wed, 17 Feb 2010 23:33:32 +0100 + -- Michael Vogt Thu, 18 Feb 2010 16:11:39 +0100 apt (0.7.25.3) unstable; urgency=low @@@ -448,6 -249,58 +473,6 @@@ apt (0.7.25.1) unstable; urgency=lo -- Michael Vogt Sat, 09 Jan 2010 21:52:36 +0100 -apt (0.7.25ubuntu4) lucid; urgency=low - - * cmdline/apt-cdrom.cc: - - make Acquire::cdrom::AutoDetect default, this can be - turned off with "--no-auto-detect" - * methods/http.cc: - - add cache-control headers even if no cache is given to allow - adding options for intercepting proxies - - -- Michael Vogt Tue, 02 Feb 2010 16:58:59 -0800 - -apt (0.7.25ubuntu3) lucid; urgency=low - - * cmdline/apt-get.cc: - - don't mark as manually if in download only (Closes: #468180) - - -- Michael Vogt Mon, 01 Feb 2010 18:41:15 +0100 - -apt (0.7.25.2) unstable; urgency=low - - [ Michael Vogt ] - * apt-pkg/contrib/cdromutl.cc: - - fix UnmountCdrom() fails, give it a bit more time and try - the umount again - * apt-pkg/cdrom.cc: - - fix crash in pkgUdevCdromDevices - * methods/cdrom.cc: - - fixes in multi cdrom setup code (closes: #549312) - - add new "Acquire::cdrom::AutoDetect" config that enables/disables - the dlopen of libudev for automatic cdrom detection. Off by default - currently, feedback/testing welcome - * cmdline/apt-cdrom.cc: - - add new --auto-detect option that uses libudev to figure out - the cdrom/mount-point - - -- Michael Vogt Wed, 27 Jan 2010 16:11:32 +0100 - -apt (0.7.25ubuntu2) lucid; urgency=low - - * Change history branch so that it does not break the - apt ABI for the pkgPackageManager interface - (can be reverted on the next ABI break) - - -- Michael Vogt Wed, 23 Dec 2009 10:14:16 +0100 - -apt (0.7.25ubuntu1) lucid; urgency=low - - * Merged from the mvo branch - * merged from the lp:~mvo/apt/history branch - - -- Michael Vogt Tue, 22 Dec 2009 09:44:08 +0100 - apt (0.7.25) unstable; urgency=low [ Christian Perrier ] @@@ -591,6 -444,29 +616,6 @@@ -- Michael Vogt Tue, 15 Dec 2009 09:21:55 +0100 -apt (0.7.24ubuntu1) lucid; urgency=low - - [ Michael Vogt ] - * apt-pkg/deb/dpkgpm.cc: - - include df -l output in the apport log as well (thanks to - tjaalton) - * apt-pkg/packagemanager.cc: - - add output about pre-depends configuring when debug::pkgPackageManager - is used - * methods/https.cc: - - fix incorrect use of CURLOPT_TIMEOUT, closes: #497983, LP: #354972 - thanks to Brian Thomason for the patch - * merge lp:~mvo/apt/netrc branch, this adds support for a - /etc/apt/auth.conf that can be used to store username/passwords - in a "netrc" style file (with the extension that it supports "/" - in a machine definition). Based on the maemo git branch. - - [ Brian Murray ] - * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc: - - typo fix (LP: #462328) - - -- Michael Vogt Mon, 14 Dec 2009 09:27:26 +0100 - apt (0.7.24) unstable; urgency=low [ Nicolas François ] @@@ -660,6 -536,59 +685,6 @@@ -- Michael Vogt Fri, 25 Sep 2009 19:57:25 +0200 -apt (0.7.23.1ubuntu2) karmic; urgency=low - - [ Michael Vogt ] - * debian/control: - - fix Vcr-Bzr header - - [ Kees Cook ] - * debian/apt.cron.daily: - - fix quotes for use with "eval", thanks to Lars Ljung (LP: #449535). - - -- Michael Vogt Thu, 15 Oct 2009 19:05:19 +0200 - -apt (0.7.23.1ubuntu1) karmic; urgency=low - - [ Matt Zimmerman ] - * apt-pkg/deb/dpkgpm.cc: - - Suppress apport reports on dpkg short reads (these I/O errors are not - generally indicative of a bug in the packaging) - - [ Loïc Minier ] - * cmdline/apt-key: - - Emit a warning if removed keys keyring is missing and skip associated - checks (LP: #218971) - - [ Brian Murray ] - * cmdline/apt-get.cc: - - typo fix (LP: #370094) - - [ Michael Vogt ] - * apt-pkg/deb/dpkgpm.cc: - - when tcgetattr() returns non-zero skip all pty magic - (thanks to Simon Richter, closes: #509866) - * apt-inst/contrib/arfile.cc: - - show propper error message for Invalid archive members - * apt-pkg/acquire-worker.cc: - - show error details of failed methods - * apt-pkg/contrib/fileutl.cc: - - if a process aborts with signal, show signal number - * methods/http.cc: - - ignore SIGPIPE, we deal with EPIPE from write in - HttpMethod::ServerDie() (LP: #385144) - * debian/apt.cron.daily: - - if the timestamp is too far in the future, delete it - (LP: #135262) - - [ Merge ] - * merged from debian, reverted the libdlopen-udev branch - because its too late in the release process for this now - * not merged the proxy behaviour change from 0.7.23 (that will - be part of lucid) - - -- Michael Vogt Wed, 23 Sep 2009 18:15:10 +0200 - apt (0.7.23.1) unstable; urgency=low [ Michael Vogt ] @@@ -889,6 -818,34 +914,6 @@@ apt (0.7.22) unstable; urgency=lo -- Michael Vogt Wed, 29 Jul 2009 19:16:22 +0200 -apt (0.7.21ubuntu1) karmic; urgency=low - - * merged from the debian-sid bzr branch - - [ Christian Perrier ] - * Documentation translations: - - Fix a typo in apt-get(8) French translation. Closes: #525043 - Thanks to Guillaume Delacour for spotting it. - * Translations: - - fr.po - - sk.po. Closes: #525857 - - ru.po. Closes: #526816 - - eu.po. Closes: #528985 - - zh_CN.po. Closes: #531390 - - fr.po - - it.po. Closes: #531758 - - ca.po. Closes: #531921 - * Added translations - - ast.po (Asturian by Marcos Alvareez Costales). - Closes: #529007, #529730 - - [ Michael Vogt ] - * apt-pkg/acquire.cc: - - make the (internal) max pipeline depth of the acquire queue - configurable via Acquire::Max-Pipeline-Depth - - -- Michael Vogt Tue, 09 Jun 2009 15:49:07 +0200 - apt (0.7.21) unstable; urgency=low [ Christian Perrier ] @@@ -932,29 -889,148 +957,29 @@@ -- Michael Vogt Tue, 14 Apr 2009 14:12:51 +0200 -apt (0.7.20.2ubuntu7) karmic; urgency=low - - * fix problematic use of tolower() when calculating the version - hash by using locale independant tolower_ascii() function. - Thanks to M. Vefa Bicakci (LP: #80248) - * build fixes for g++-4.4 - * include dmesg output in apport package failures - * include apt ordering into apport package failures +apt (0.7.20.2) unstable; urgency=medium - -- Michael Vogt Fri, 24 Apr 2009 10:14:01 +0200 + [ Eugene V. Lyubimkin ] + * Urgency set to medium due to RC bug fix. + * doc/apt.ent, apt-get.8.xml: + - Fix invalid XML entities. (Closes: #514402) -apt (0.7.20.2ubuntu6) jaunty; urgency=low + -- Eugene V. Lyubimkin Sat, 07 Feb 2009 16:48:21 +0200 - [ Jamie Strandboge ] - * apt.cron.daily: catch invalid dates due to DST time changes - in the stamp files (LP: #354793) +apt (0.7.20.1) unstable; urgency=low [ Michael Vogt ] - * methods/gpgv.cc: - - properly check for expired and revoked keys (closes: #433091) - LP: #356012 + * apt-pkg/pkgcachegen.cc: + - fix apt-cache search for localized description + (closes: #512110) + + [ Christian Perrier ] + * Translations: + - fr.po: fix spelling error to "défectueux". Thanks to Thomas Péteul. - -- Michael Vogt Wed, 08 Apr 2009 22:39:50 +0200 + -- Michael Vogt Tue, 20 Jan 2009 09:35:05 +0100 -apt (0.7.20.2ubuntu5) jaunty; urgency=low - - [ Colin Watson ] - * cmdline/acqprogress.cc: - - Call pkgAcquireStatus::Pulse even if quiet, so that we still get - dlstatus messages on the status-fd (LP: #290234). - - [ Michael Vogt ] - * debian/apt.cron.daily: - - do not clutter cron mail with bogus gconftool messages - (LP: #223502) - - merge fix for cache locking from debian (closes: #459344) - - run update-apt-xapian-index (with ionice) to ensure that - the index is up-to-date when synaptic is run (LP: #288797) - - -- Michael Vogt Mon, 30 Mar 2009 13:22:28 +0200 - -apt (0.7.20.2ubuntu4) jaunty; urgency=low - - * ftparchive/cachedb.cc: - - when apt-ftparchive clean is used, compact the database - at the end (thanks to cprov) - - -- Michael Vogt Thu, 26 Mar 2009 13:43:59 +0100 - -apt (0.7.20.2ubuntu3) jaunty; urgency=low - - * methods/mirror.cc: - - when download the mirror file and the server is down, - return a propper error message (LP: #278635) - - -- Michael Vogt Thu, 19 Mar 2009 15:42:15 +0100 - -apt (0.7.20.2ubuntu2) jaunty; urgency=low - - * apt-pkg/deb/dpkgpm.cc: - - revert termios patch (LP: #338514) - * cmdline/apt-get.cc - - fix "apt-get source pkg" if there is a binary package and - a source package of the same name but from different - packages (LP: #330103) - - -- Michael Vogt Mon, 09 Mar 2009 16:33:28 +0100 - -apt (0.7.20.2ubuntu1) jaunty; urgency=low - - [ Christian Perrier ] - * Translations: - - bg.po. Closes: #513211 - - zh_TW.po. Closes: #513311 - - nb.po. Closes: #513843 - - [ Michael Vogt ] - * merged from the debian-sid branch - * [ABI break] merge support for http redirects, thanks to - Jeff Licquia and Anthony Towns - * [ABI break] use int for the package IDs (thanks to Steve Cotton) - * apt-pkg/contrib/strutl.cc: - - fix TimeToStr i18n (LP: #289807) - * debian/apt.conf.autoremove: - - readd "linux-image" (and friends) to the auto-remove - blacklist - * fix some i18n issues (thanks to Gabor Kelemen) - LP: #263089 - * apt-pkg/deb/dpkgpm.cc: - - filter "ENOMEM" errors when creating apport reports - * cmdline/apt-get.cc: - - fix "apt-get source pkg=ver" if binary name != source name - (LP: #202219) - * apt-pkg/indexrecords.cc: - - fix some i18n issues - * apt-pkg/contrib/strutl.h: - - add new strprintf() function to make i18n strings easier - * apt-pkg/dev/debsystem.cc: - - add missing apti18n.h header - * cmdline/apt-get.cc: - - default to "false" for the "APT::Get::Build-Dep-Automatic" - option (follow debian here) - * apt-pkg/pkgcache.cc: - - do not run "dpkg --configure pkg" if pkg is in trigger-awaited - state (LP: #322955) - * methods/https.cc: - - add Acquire::https::AllowRedirect support - - do not unlink files in partial/ (thanks to robbiew) - - [ Dereck Wonnacott ] - * Clarify the --help for 'purge' (LP: #243948) - - [ Ian Weisser ] - * /apt-pkg/deb/debsystem.cc: - - add 'sudo' to the error message to "run 'dpkg --configure -a'" - (LP: #52697) - - -- Michael Vogt Mon, 09 Feb 2009 14:21:05 +0100 - -apt (0.7.20.2) unstable; urgency=medium - - [ Eugene V. Lyubimkin ] - * Urgency set to medium due to RC bug fix. - * doc/apt.ent, apt-get.8.xml: - - Fix invalid XML entities. (Closes: #514402) - - -- Eugene V. Lyubimkin Sat, 07 Feb 2009 16:48:21 +0200 - -apt (0.7.20.1) unstable; urgency=low - - [ Michael Vogt ] - * apt-pkg/pkgcachegen.cc: - - fix apt-cache search for localized description - (closes: #512110) - - [ Christian Perrier ] - * Translations: - - fr.po: fix spelling error to "défectueux". Thanks to Thomas Péteul. - - -- Michael Vogt Tue, 20 Jan 2009 09:35:05 +0100 - -apt (0.7.20) unstable; urgency=low +apt (0.7.20) unstable; urgency=low [ Eugene V. Lyubimkin ] * debian/changelog: @@@ -1000,6 -1076,12 +1025,6 @@@ -- Michael Vogt Mon, 05 Jan 2009 08:59:20 +0100 -apt (0.7.19ubuntu1) jaunty; urgency=low - - * merge from debian - - -- Michael Vogt Mon, 24 Nov 2008 10:52:20 +0100 - apt (0.7.19) unstable; urgency=low [ Eugene V. Lyubimkin ] @@@ -1298,6 -1380,90 +1323,6 @@@ apt (0.7.15~exp1) experimental; urgency -- Michael Vogt Tue, 16 Sep 2008 21:27:03 +0200 -apt (0.7.14ubuntu7) jaunty; urgency=low - - * cmdline/apt-cache.cc: - - remove the gettext from a string that consists entirely - of variables (LP: #56792) - * apt-pkg/deb/dpkgpm.cc: - - fix potential hang when in a backgroud process group - - -- Michael Vogt Tue, 28 Oct 2008 21:09:12 +0100 - -apt (0.7.14ubuntu6) intrepid; urgency=low - - * debian/apt.conf.autoremove: - - remove "linux-image" (and friends) from the auto-remove - blacklist. we have the kernel fallback infrastructure now - in intrepid (thanks to BenC) - * apt-pkg/indexcopy.cc: - - support having CDs with no Packages file (just a Packages.gz) - by not forcing a verification on non-existing files - (LP: #255545) - * apt-pkg/deb/dpkgpm.cc: - - improve the filtering for duplicated apport reports (thanks - to seb128 for pointing that problem out) - - do not report disk full errors from dpkg via apport - - -- Michael Vogt Thu, 07 Aug 2008 16:28:05 +0200 - -apt (0.7.14ubuntu5) intrepid; urgency=low - - * fix various -Wall warnings - * make "apt-get build-dep" installed packages marked automatic - by default. This can be changed by setting the value of - APT::Get::Build-Dep-Automatic to false (thanks to Aaron - Haviland, closes: #44874, LP: #248268) - - -- Michael Vogt Wed, 06 Aug 2008 14:00:51 +0200 - -apt (0.7.14ubuntu4) intrepid; urgency=low - - [ Michael Vogt ] - * apt-pkg/deb/dpkgpm.cc: - - fix uninitialized variable that caused no apport reports - to be written sometimes (thanks to Matt Zimmerman) - * merge patch that enforces stricter https server certificate - checking (thanks to Arnaud Ebalard, closes: #485960) - * allow per-mirror specific https settings - (thanks to Arnaud Ebalard, closes: #485965) - * add doc/examples/apt-https-method-example.cof - (thanks to Arnaud Ebalard, closes: #485964) - * add DPkg::NoTriggers option so that applications that call - apt/aptitude (like the installer) defer trigger processing - (thanks to Joey Hess) - * document --install-recommends and --no-install-recommends - (thanks to Dereck Wonnacott, LP: #126180) - - [ Dereck Wonnacott ] - * apt-ftparchive might write corrupt Release files (LP: #46439) - * Apply --important option to apt-cache depends (LP: #16947) - - -- Michael Vogt Tue, 05 Aug 2008 10:10:49 +0200 - -apt (0.7.14ubuntu3) intrepid; urgency=low - - [ Otavio Salvador ] - * Apply patch to avoid truncating of arbitrary files. Thanks to Bryan - Donlan for the patch. Closes: #482476 - * Avoid using dbus if dbus-daemon isn't running. Closes: #438803 - - [ Michael Vogt ] - * apt-pkg/deb/dpkgpm.cc: - - improve apt progress reporting, display trigger actions - * apt-pkg/depcache.cc: - - when checking for new important deps, skip critical ones - (LP: #236360) - - -- Michael Vogt Tue, 03 Jun 2008 17:27:07 +0200 - -apt (0.7.14ubuntu2) intrepid; urgency=low - - * debian/control: - - fix FTBFS by adding missing intltool dependency - - -- Michael Vogt Fri, 09 May 2008 13:50:22 +0200 - apt (0.7.14) unstable; urgency=low [ Christian Perrier ] @@@ -1524,97 -1690,359 +1549,97 @@@ apt (0.7.10) unstable; urgency=lo -- Michael Vogt Mon, 07 Jan 2008 21:40:47 +0100 -apt (0.7.9ubuntu17) hardy-proposed; urgency=low - - * apt-pkg/acquire-item.cc: - - fix signaure removal on transient network failures LP: #220627 - (thanks to Scott James Remnant) - - -- Michael Vogt Tue, 22 Apr 2008 16:32:49 +0200 - -apt (0.7.9ubuntu16) hardy; urgency=low - - * cmdline/apt-key: - - only check against master-keys in net-update to not break - custom CDs (thanks to Colin Watson) - - -- Michael Vogt Tue, 08 Apr 2008 14:17:14 +0200 +apt (0.7.9) unstable; urgency=low -apt (0.7.9ubuntu15) hardy; urgency=low + [ Christian Perrier ] + * Add several languages to LINGUAS and, therefore, really ship the relevant + translation: + Arabic, Dzongkha, Khmer, Marathi, Nepali, Thai + Thanks to Theppitak Karoonboonyanan for checking this out. Closes: #448321 - * cmdline/apt-get.cc: - - do two passes when installing tasks, first ignoring dependencies, - then resolving them and run the problemResolver at the end - so that it can correct any missing dependencies. This should - fix livecd building for kubuntu (thanks to Jonathan Riddell - for reporting the problem) + [ Program translations ] + - Korean updated. Closes: #448430 + - Galician updated. Closes: #448497 + - Swedish updated. - -- Michael Vogt Thu, 13 Mar 2008 23:25:45 +0100 + [ Otavio Salvador ] + * Fix configure script to check for CURL library and headers presense. + * Applied patch from Brian M. Carlson + to add backward support for arches that lacks pselect support, + closes: #448406. + * Umount CD-ROM when calling apt-cdrom ident, except when called with + -m, closes: #448521. -apt (0.7.9ubuntu14) hardy; urgency=low + -- Otavio Salvador Wed, 31 Oct 2007 13:37:26 -0200 - * cmdline/apt-get.cc: - - fix incorrect help output for -f (LP: #57487) - - run the problemResolver after a task was installed - so that it can correct any missing dependencies - * typo fixes (LP: #107960) +apt (0.7.8) unstable; urgency=low - -- Michael Vogt Tue, 11 Mar 2008 21:46:07 +0100 + * Applied patch from Daniel Leidert to fix + APT::Acquire::Translation "none" support, closes: #437523. + * Applied patch from Daniel Burrows to add support + for the Homepage field (ABI break), closes: #447970. + * Applied patch from Frans Pop to fix a trailing + space after cd label, closes: #448187. -apt (0.7.9ubuntu13) hardy; urgency=low + -- Otavio Salvador Fri, 26 Oct 2007 18:20:13 -0200 - [ Lionel Porcheron ] - * debian/apt.cron.daily: - - only call gconftool if gcontool is installed (LP: #194281) +apt (0.7.7) unstable; urgency=low [ Michael Vogt ] - * doc/apt_preferences.5.xml: - - fix typo (LP: #150900) - * doc/example/sources.list: - - updated for hardy (LP: #195879) - * debian/apt.cron.daily: - - sleep random amount of time (default within 0-30min) before - starting the upate to hit the mirrors less hard - - -- Michael Vogt Tue, 04 Mar 2008 15:35:09 +0100 - -apt (0.7.9ubuntu12) hardy; urgency=low - + * apt-inst/contrib/extracttar.cc: + - fix fd leak for zero size files (thanks to Bill Broadley for + reporting this bug) + * apt-pkg/acquire-item.cc: + - remove zero size files on I-M-S hit + * methods/https.cc: + - only send LastModified if we actually have a file + - send range request with if-range + - delete failed downloads + - delete zero size I-M-S hits + * apt-pkg/deb/dpkgpm.{cc,h}: + - merged dpkg-log branch, this lets you specify a + Dir::Log::Terminal file to log dpkg output to + (ABI break) + - fix parse error when dpkg sends unexpected data + * merged apt--sha256 branch to fully support the new + sha256 checksums in the Packages and Release files + (ABI break) + * apt-pkg/pkgcachegen.cc: + - increase default mmap size + * tests/local-repo: + - added local repository testcase + * apt-pkg/acquire.cc: + - increase MaxPipeDepth for the internal worker<->method + communication to 1000 for the debtorrent backend + * make apt build with g++ 4.3 + * fix missing SetExecClose() call when the status-fd is used * debian/apt.cron.daily: - - use admin user proxy settings + - move unattended-upgrade before apt-get autoclean + * fix "purge" commandline argument, closes: #133421 + (thanks to Julien Danjou for the patch) * cmdline/apt-get.cc: - - fix task installation (thanks to Colin Watson) - - -- Michael Vogt Thu, 21 Feb 2008 15:07:44 +0100 - -apt (0.7.9ubuntu11) hardy; urgency=low - - * apt-pkg/algorithms.cc: - - add APT::Update::Post-Invoke-Success script slot - (LP: #188127) - - -- Michael Vogt Thu, 10 Jan 2008 12:06:12 +0100 - -apt (0.7.9ubuntu10) hardy; urgency=low - - * cmdline/apt-key: - - add "net-update" command that fetches the - ubuntu-archive-keyring.gpg and add keys from it that are - signed by the ubuntu-master-keyring.gpg - (apt-archive-key-signatures spec) + - do not change the auto-installed information if a package + is reinstalled + * apt-pkg/acquire-item.cc: + - fix crash in diff acquire code + * cmdline/apt-mark: + - Fix chmoding after have renamed the extended-states file (LP: #140019) + (thanks to Laurent Bigonville) + * apt-pkg/depcache.cc: + - set "APT::Install-Recommends" to true by default (OMG!) * debian/apt.cron.daily: - - add apt-key net-update to the nightly cron job - - -- Michael Vogt Wed, 13 Feb 2008 15:50:28 +0100 - -apt (0.7.9ubuntu9) hardy; urgency=low - - * fix FTBFS due to incorrect intltool build-depends - - -- Michael Vogt Mon, 11 Feb 2008 16:04:37 +0100 - -apt (0.7.9ubuntu8) hardy; urgency=low - - * share/apt-auth-failure.note: - - show update-notifier note if the nightly update fails with a - authentication failure (apt-authentication-reliability spec) - - -- Michael Vogt Mon, 11 Feb 2008 14:04:56 +0100 - -apt (0.7.9ubuntu7) hardy; urgency=low - - * methods/connect.cc: - - remember hosts with Resolve failures or connect Timeouts - see https://wiki.ubuntu.com/NetworklessInstallationFixes - * cmdlines/apt-key: - - fix bug in the new apt-key update code that imports only - keys signed with the master key (thanks to cjwatson) - - -- Michael Vogt Fri, 08 Feb 2008 11:38:35 +0100 - -apt (0.7.9ubuntu6) hardy; urgency=low - - * cmdline/apt-key: - - add support for a master-keyring that contains signing keys - that can be used to sign the archive signing keys. This should - make key-rollover easier. - * apt-pkg/deb/dpkgpm.cc: - - merged patch from Kees Cook to fix anoying upper-case display - on amd64 in sbuild - * apt-pkg/algorithms.cc: - - add APT::Update::Post-Invoke-Success script slot - - Make the breaks handling use the kill list. This means, that a - Breaks: Pkg (<< version) may put Pkg onto the remove list. - * apt-pkg/deb/dpkgpm.cc: - - add APT::Apport::MaxReports to limit the maximum number - of reports generated in a single run (default to 3) - * apt-pkg/deb/debmetaindex.cc: - - add missing "Release" file uri when apt-get update --print-uris - is run - - -- Michael Vogt Mon, 04 Feb 2008 14:28:02 +0100 - -apt (0.7.9ubuntu5) hardy; urgency=low - - * Merged apt-authentication-reliabilty branch. This means - that apt will refuse to update and use the old lists if - the authentication of a repository that used to be - authenticated fails. See - https://wiki.ubuntu.com/AptAuthenticationReliability - for more details. - - -- Michael Vogt Wed, 16 Jan 2008 10:36:10 +0100 - -apt (0.7.9ubuntu4) hardy; urgency=low - - * apt-pkg/algorithms.cc: - - Since APT::Get::List-Cleanup and APT::List-Cleanup both default to - true, the effect of the compatibility code was to require both of them - to be set to false in order to disable list cleanup; this broke the - installer. Instead, disable list cleanup if either of them is set to - false. - - -- Colin Watson Wed, 09 Jan 2008 22:34:37 +0000 - -apt (0.7.9ubuntu3) hardy; urgency=low - - * merged the apt--DoListUpdate branch, this provides a common interface - for "apt-get update" like operations for the frontends and also provides - hooks to run stuff in APT::Update::{Pre,Post}-Invoke - - -- Michael Vogt Mon, 07 Jan 2008 19:02:11 +0100 - -apt (0.7.9ubuntu2) hardy; urgency=low - - [ Otavio Salvador ] - * Applied patch from Aurelien Jarno to fix building - with newest dpkg-shlibdeps changing the packaging building order and a - patch from Robert Millan to fix parallel building, - closes: #452862. - * Applied patch from Alexander Winston - to use 'min' as symbol for minute, closes: #219034. - * Applied patch from Amos Waterland to allow apt to - work properly in initramfs, closes: #448316. - * Applied patch from Robert Millan to make apt-key and - apt-get to ignore time conflicts, closes: #451328. - * Applied patch from Peter Eisentraut to fix a - grammatical error ("manual installed" -> "manually installed"), - closes: #438136. - * Fix cron.daily job to not call fail if apt isn't installed, closes: - #443286. - - [ Daniel Burrows ] - * apt-pkg/contrib/configuration.cc: - - if RootDir is set, then FindFile and FindDir will return paths - relative to the directory stored in RootDir, closes: #456457. - - [ Christian Perrier ] - * Fix wording for "After unpacking...". Thans to Michael Gilbert - for the patch. Closes: #260825 - - [ Program translations ] - - Vietnamese updated. Closes: #453774 - - Japanese updated. Closes: #456909 - - French updated. - - [ Michael Vogt ] - * apt-pkg/packagemanager.{cc,h}: - - propergate the Immediate flag to make hitting the - "E: Internal Error, Could not perform immediate configuration (2)" - harder. (LP: #179247) - * debian/apt.conf.daily: - - print warning if the cache can not be locked (closes: #454561), - thanks to Bastian Kleineidam - * debian/control: - - build against libdb-dev (instead of libdb4.4-dev) - - -- Michael Vogt Thu, 03 Jan 2008 11:31:45 +0100 - -apt (0.7.9ubuntu1) hardy; urgency=low - - * merged from http://bzr.debian.org/apt/apt/debian-sid/, remaining - changes: - - mirror download method (pending merge with debian) - - no pdiff download by default (unsuitable for ubuntu) - - no recommends-by-default yet - - add "Original-Maintainer" field to tagfile - - show warning on apt-get source if the package is maintained - in a VCS (pedinging merge with debian) - - use ubuntu-archive keyring instead of debians one - - support metapackages section for autoremoval - - debian maintainer field change - - send ubuntu string in user-agent - - * Changes from the debian-sid bzr branch (but not uploaded to debian - yet): - - [ Otavio Salvador ] - * Applied patch from Mike O'Connor to add a manpage to - apt-mark, closes: #430207. - * Applied patch from Andrei Popescu to add a - note about some frontends in apt.8 manpage, closes: #438545. - * Applied patch from Aurelien Jarno to avoid CPU - getting crazy when /dev/null is redirected to stdin (which breaks - buildds), closes: #452858. - - [ Program translations ] - - Basque updated. Closes: #453088 - - [ Michael Vogt ] - * debian/rules - - fix https install location - * methods/gpgv.cc: - - remove cruft code that caused timestamp/I-M-S issues - * ftparchive/contents.cc: - - fix error output - * methods/mirror.{cc,h}: - - only update mirror list on IndexFile updates - * apt-pkg/acquire-item.{cc,h}: - - make the authentication download code more robust against - servers/proxies with broken If-Range implementations - * debian/control: - - build against libdb-dev (instead of libdb4.4-dev) - * merged the apt--DoListUpdate branch, this provides a common interface - for "apt-get update" like operations for the frontends and also provides - hooks to run stuff in APT::Update::{Pre,Post}-Invoke - - [ Chris Cheney ] - * ftparchive/contents.cc: - - support lzma data members - * ftparchive/multicompress.cc: - - support lzma output - - -- Michael Vogt Thu, 13 Dec 2007 14:46:27 +0100 - -apt (0.7.9) unstable; urgency=low - - [ Christian Perrier ] - * Add several languages to LINGUAS and, therefore, really ship the relevant - translation: - Arabic, Dzongkha, Khmer, Marathi, Nepali, Thai - Thanks to Theppitak Karoonboonyanan for checking this out. Closes: #448321 - - [ Program translations ] - - Korean updated. Closes: #448430 - - Galician updated. Closes: #448497 - - Swedish updated. - - [ Otavio Salvador ] - * Fix configure script to check for CURL library and headers presense. - * Applied patch from Brian M. Carlson - to add backward support for arches that lacks pselect support, - closes: #448406. - * Umount CD-ROM when calling apt-cdrom ident, except when called with - -m, closes: #448521. - - -- Otavio Salvador Wed, 31 Oct 2007 13:37:26 -0200 - -apt (0.7.8) unstable; urgency=low - - * Applied patch from Daniel Leidert to fix - APT::Acquire::Translation "none" support, closes: #437523. - * Applied patch from Daniel Burrows to add support - for the Homepage field (ABI break), closes: #447970. - * Applied patch from Frans Pop to fix a trailing - space after cd label, closes: #448187. - - -- Otavio Salvador Fri, 26 Oct 2007 18:20:13 -0200 - -apt (0.7.7) unstable; urgency=low - - [ Michael Vogt ] - * apt-inst/contrib/extracttar.cc: - - fix fd leak for zero size files (thanks to Bill Broadley for - reporting this bug) - * apt-pkg/acquire-item.cc: - - remove zero size files on I-M-S hit - * methods/https.cc: - - only send LastModified if we actually have a file - - send range request with if-range - - delete failed downloads - - delete zero size I-M-S hits - * apt-pkg/deb/dpkgpm.{cc,h}: - - merged dpkg-log branch, this lets you specify a - Dir::Log::Terminal file to log dpkg output to - (ABI break) - - fix parse error when dpkg sends unexpected data - * merged apt--sha256 branch to fully support the new - sha256 checksums in the Packages and Release files - (ABI break) - * apt-pkg/pkgcachegen.cc: - - increase default mmap size - * tests/local-repo: - - added local repository testcase - * apt-pkg/acquire.cc: - - increase MaxPipeDepth for the internal worker<->method - communication to 1000 for the debtorrent backend - * make apt build with g++ 4.3 - * fix missing SetExecClose() call when the status-fd is used - * debian/apt.cron.daily: - - move unattended-upgrade before apt-get autoclean - * fix "purge" commandline argument, closes: #133421 - (thanks to Julien Danjou for the patch) - * cmdline/apt-get.cc: - - do not change the auto-installed information if a package - is reinstalled - * apt-pkg/acquire-item.cc: - - fix crash in diff acquire code - * cmdline/apt-mark: - - Fix chmoding after have renamed the extended-states file (LP: #140019) - (thanks to Laurent Bigonville) - * apt-pkg/depcache.cc: - - set "APT::Install-Recommends" to true by default (OMG!) - * debian/apt.cron.daily: - - only run the cron job if apt-get check succeeds (LP: #131719) - - [ Program translations ] - - French updated - - Basque updated. Closes: #436425 - - Fix the zh_CN translator's name in debian/changelog for 0.7.2 - Closes: #423272 - - Vietnamese updated. Closes: #440611 - - Danish updated. Closes: #441102 - - Thai added. Closes: #442833 - - Swedish updated. - - Galician updated. Closes: #446626 + - only run the cron job if apt-get check succeeds (LP: #131719) + + [ Program translations ] + - French updated + - Basque updated. Closes: #436425 + - Fix the zh_CN translator's name in debian/changelog for 0.7.2 + Closes: #423272 + - Vietnamese updated. Closes: #440611 + - Danish updated. Closes: #441102 + - Thai added. Closes: #442833 + - Swedish updated. + - Galician updated. Closes: #446626 [ Otavio Salvador ] * Add hash support to copy method. Thanks Anders Kaseorg by the patch @@@ -1649,6 -2077,200 +1674,6 @@@ -- Michael Vogt Tue, 23 Oct 2007 14:58:03 +0200 -apt (0.7.6ubuntu14.1) gutsy-proposed; urgency=low - - [ Michael Vogt ] - * apt-pkg/deb/dpkgpm.{cc,h}: - - give up timeslice on EIO error in read from master terminal - * debian/apt.cron.daily: - - only run the cron job if apt-get check succeeds (LP: #131719) - - [ Martin Emrich ] - * apt-pkg/deb/dpkgpm.{cc,h}: - - rewrite dpkgpm.cc to use pselect() instead of select() - to block signals during select() (LP: #134858) - - -- Michael Vogt Sat, 20 Oct 2007 07:51:12 +0200 - -apt (0.7.6ubuntu14) gutsy; urgency=low - - * apt-pkg/deb/dpkgpm.cc: - - fix resource leak (LP: #148806) - - -- Michael Vogt Mon, 15 Oct 2007 20:57:44 +0200 - -apt (0.7.6ubuntu13) gutsy; urgency=low - - * apt-pkg/deb/dpkgpm.cc: - - fix crash in WriteApportReport (LP: #144537) - * apt-pkg/acquire-item.cc - - fix disappearing local Packages.gz file (LP: #131166) - * methods/https.cc: - - fix off-by-one error I-M-S handling - - cleanup after I-M-S hit - - -- Michael Vogt Tue, 09 Oct 2007 01:48:26 +0200 - -apt (0.7.6ubuntu12) gutsy; urgency=low - - [ Michael Vogt ] - * cmdline/apt-mark: - - Fix chmoding after have renamed the extended-states file - (thanks to Laurent Bigonville, LP: #140019) - * apt-pkg/deb/debmetaindex.cc: comparison with string literal results - in unspecified behaviour; - * Reset curl options and timestamp between downloaded files. Thanks to - Ryan Murray for the patch - - [Paul Sladen] - * Have 'cron.daily/apt' send D-Bus doesn't exist error messages - to the bit bucket. Thanks to 'dasdda'. (LP: #115397) - - -- Michael Vogt Wed, 03 Oct 2007 02:17:45 +0200 - -apt (0.7.6ubuntu11) gutsy; urgency=low - - * apt-pkg/contrib/mmap.cc: - - don't fail if msync() returns > 0 (LP: #144001) - - -- Colin Watson Sat, 22 Sep 2007 21:39:29 +0100 - -apt (0.7.6ubuntu10) gutsy; urgency=low - - * apt-pkg/deb/dpkgpm.cc: - - fix parse error when dpkg sends unexpected data - - -- Michael Vogt Tue, 18 Sep 2007 17:25:09 +0100 - -apt (0.7.6ubuntu9) gutsy; urgency=low - - * apt-pkg/deb/dpkgpm.cc: - - fix progress reporting precent calculation (LP: #137798) - * make apt build with g++ 4.3 - * fix missing SetExecClose() call when the status-fd is used - (LP: #136767) - * debian/apt.cron.daily: - - move unattended-upgrade before apt-get autoclean - * fix "purge" commandline argument, closes LP: #125733 - (thanks to Julien Danjou for the patch) - * cmdline/apt-get.cc: - - do not change the auto-installed information if a package - is reinstalled (LP: #139448) - - -- Michael Vogt Tue, 11 Sep 2007 20:55:00 +0200 - -apt (0.7.6ubuntu8) gutsy; urgency=low - - * apt-pkg/deb/dpkgpm.{cc,h}: - - fix bug in dpkg log writing when a signal is caught during - select() (LP: #134858) - - write end marker in the log as well - - -- Michael Vogt Wed, 05 Sep 2007 15:03:46 +0200 - -apt (0.7.6ubuntu7) gutsy; urgency=low - - * reupload to fix FTBFS - - -- Michael Vogt Thu, 16 Aug 2007 19:44:20 +0200 - -apt (0.7.6ubuntu6) gutsy; urgency=low - - * dpkg-triggers: Deal properly with new package states. - - -- Ian Jackson Wed, 15 Aug 2007 20:44:37 +0100 - -apt (0.7.6ubuntu5) UNRELEASED; urgency=low - - * apt-pkg/acquire-item.cc: - - fix file removal on local repo i-m-s hit (LP: #131166) - * tests/local-repo: - - added regression test for this bug - - -- Michael Vogt Thu, 09 Aug 2007 12:34:07 +0200 - -apt (0.7.6ubuntu4) gutsy; urgency=low - - * cmdline/apt-get.cc: - - remove YnPrompt when a XS-Vcs- tag is found, improve the - notice (LP: #129575) - * methods/copy.cc: - - take hashes here too - * apt-pkg/acquire-worker.cc: - - only pass on computed hash if we recived one from the method - - -- Michael Vogt Wed, 08 Aug 2007 19:30:29 +0200 - -apt (0.7.6ubuntu3) gutsy; urgency=low - - * apt-pkg/deb/dpkgpm.cc: - - fix packagename extraction when writting apport reports - * apt-pkg/pkgcachegen.cc: - - increase default mmap size (LP: #125640) - - -- Michael Vogt Tue, 07 Aug 2007 09:52:00 +0200 - -apt (0.7.6ubuntu2) gutsy; urgency=low - - * doc/examples/sources.list: - - change example source to gutsy - * apt-pkg/deb/dpkgpm.cc: - - do not break if no /dev/pts is available - - -- Michael Vogt Mon, 06 Aug 2007 15:17:57 +0200 - -apt (0.7.6ubuntu1) gutsy; urgency=low - - [ Michael Vogt ] - * apt-inst/contrib/extracttar.cc: - - fix fd leak for zero size files (thanks to Bill Broadley for - reporting this bug) - * apt-pkg/acquire-item.cc: - - remove zero size files on I-M-S hit - * methods/https.cc: - - only send LastModified if we actually have a file - - send range request with if-range - - delete failed downloads - (thanks to Thom May for his help here) - - delete zero size I-M-S hits - * apt-pkg/deb/dpkgpm.{cc,h}: - - merged dpkg-log branch, this lets you specify a - Dir::Log::Terminal file to log dpkg output to - (ABI break) - - when writting apport reports, attach the dpkg - terminal log too - * merged apt--sha256 branch to fully support the new - sha256 checksums in the Packages and Release files - (ABI break) - * apt-pkg/pkgcachegen.cc: - - increase default mmap size - * tests/local-repo: - - added local repository testcase - * make apt build with g++ 4.3 - * fix missing SetExecClose() call when the status-fd is used - * debian/apt.cron.daily: - - move unattended-upgrade before apt-get autoclean - * fix "purge" commandline argument, closes: #133421 - (thanks to Julien Danjou for the patch) - * cmdline/apt-get.cc: - - do not change the auto-installed information if a package - is reinstalled - * cmdline/apt-mark: - - Fix chmoding after have renamed the extended-states file (LP: #140019) - (thanks to Laurent Bigonville) - - [ Ian Jackson ] - * dpkg-triggers: Deal properly with new package states. - - -- Michael Vogt Thu, 02 Aug 2007 11:55:54 +0200 - -apt (0.7.6) unstable; urgency=low - - * Applied patch from Aurelien Jarno to fix wrong - directory downloading on non-linux architectures (closes: #435597) - - -- Otavio Salvador Wed, 01 Aug 2007 19:49:51 -0300 - apt (0.7.6) unstable; urgency=low * Applied patch from Aurelien Jarno to fix wrong @@@ -1676,6 -2298,14 +1701,6 @@@ apt (0.7.5) unstable; urgency=lo -- Otavio Salvador Wed, 25 Jul 2007 20:16:46 -0300 -apt (0.7.4ubuntu1) gutsy; urgency=low - - * debian/apt.conf.ubuntu, apt.conf.autoremove: - - Change metapackages to {restricted,universe,multiverse}/metapackages - in Install-Recommends-Sections and Never-MarkAuto-Sections - - -- Michael Vogt Thu, 26 Jul 2007 10:42:29 +0200 - apt (0.7.4) unstable; urgency=low [ Michael Vogt ] @@@ -1736,6 -2366,90 +1761,6 @@@ apt (0.7.3) unstable; urgency=lo -- Michael Vogt Sun, 01 Jul 2007 12:31:29 +0200 -apt (0.7.2ubuntu7) gutsy; urgency=low - - * fix build-dependencies - * fixes in the auto-mark code (thanks to Daniel - Burrows) - - -- Michael Vogt Mon, 9 Jul 2007 19:02:54 +0200 - -apt (0.7.2ubuntu6) gutsy; urgency=low - - [ Michael Vogt] - * cmdline/apt-get.cc: - - make the XS-Vcs-$foo warning more copy'n'paste - friendly (thanks to Matt Zimmerman) - - ignore the Vcs-Browser tag (Fixes LP: #121770) - * debian/apt.conf.autoremove: - - added "linux-ubuntu-modules" to APT::NeverAutoRemove - - [ Sarah Hobbs ] - * Change metapackages to *metapackages in Install-Recommends-Section - and Never-MarkAuto-Section of debian/apt.conf.autoremove, so that - the Recommends of metapackages in universe and multiverse will get - installed. - * Also make this change in doc/examples/configure-index. - * Added a Build Dependancies of automake, docbook-xsl, xsltproc, xmlto, - docbook to fix FTBFS. - * Added in previous changelog entries, as those who uploaded did not - actually commit to Bzr. - - -- Sarah Hobbs Mon, 09 Jul 2007 01:15:57 +1000 - -apt (0.7.2ubuntu5) gutsy; urgency=low - - * Rerun autoconf to fix the FTBFS. - - -- Michael Bienia Fri, 06 Jul 2007 19:17:33 +0200 - -apt (0.7.2ubuntu4) gutsy; urgency=low - - * Rebuild for the libcurl4 -> libcurl3 transition mess. - - -- Steve Kowalik Fri, 6 Jul 2007 12:44:05 +1000 - -apt (0.7.2ubuntu3) gutsy; urgency=low - - * cmdline/apt-get.cc: - - fix InstallTask code when a pkgRecord ends - with a single '\n' (thanks to Soren Hansen for reporting) - - -- Michael Vogt Wed, 27 Jun 2007 13:33:38 +0200 - -apt (0.7.2ubuntu2) gutsy; urgency=low - - * fixed compile errors with g++ 4.3 (thanks to - Daniel Burrows, closes: #429378) - * fix FTFBFS by changing build-depends to - libcurl4-gnutls-dev (closes: #428363) - - -- Michael Vogt Tue, 19 Jun 2007 13:47:03 +0200 - -apt (0.7.2ubuntu1) gutsy; urgency=low - - * apt-pkg/deb/dpkgpm.cc: - - apport integration added, this means that a apport - report is written on dpkg failures - * cmdline/apt-get.cc: - - merged http://people.ubuntu.com/~mvo/bzr/apt/xs-vcs-bzr/ - this will warn when Vcs- headers are found on apt-get source - (Fixes LP:#115959) - * merged from debian/unstable, remaining changes: - - maintainer field changed - - merged the apt--mirror branch - http://people.ubuntu.com/~mvo/bzr/apt/apt--mirror/ - - apport reporting on package install/upgrade/remove failure - - support for "Originial-Maintainer" field - - merged apt--xs-vcs-bzr branch - (http://people.ubuntu.com/~mvo/bzr/apt/xs-vcs-bzr/) - - use ubuntu archive keyring by default - - debian/apt.conf.autoremove - + install recommands for section "metapackages" - + do not mark direct dependencies of "metapackages" as autoremoved - - -- Michael Vogt Thu, 14 Jun 2007 10:38:36 +0200 - apt (0.7.2-0.1) unstable; urgency=low * Non-maintainer upload. @@@ -1810,26 -2524,140 +1835,26 @@@ apt (0.7.1) experimental; urgency=lo double queuing of URLs) - this fixes hangs in bzip/gzip * merged from Christian Perrier: * mr.po: New Marathi translation Closes: #416806 - * zh_CN.po: Updated by Eric Pareja Closes: #416822 - * tl.po: Updated by Eric Pareja Closes: #416638 - * gl.po: Updated by Jacobo Tarrio - Closes: #412828 - * da.po: Updated by Claus Hindsgaul - Closes: #409483 - * fr.po: Remove a non-breakable space for usability - issues. Closes: #408877 - * ru.po: Updated Russian translation. Closes: #405476 - * *.po: Unfuzzy after upstream typo corrections - * vi.po: Updated to 515t. Closes: #426976 - * eu.po: Updated to 515t. Closes: #423766 - * pt.po: 515t. Closes: #423111 - * fr.po: Updated by Christian Perrier - * Update all PO and the POT. Gives 513t2f for formerly - complete translations - * apt-pkg/policy.cc: - - allow multiple packages (thanks to David Foerster) - - -- Michael Vogt Wed, 2 May 2007 13:43:44 +0200 - -apt (0.7.0) experimental; urgency=low - - * Package that contains all the new features - * Removed all #pragma interface/implementation - * Branch that contains all the new features: - * translated package descriptions - * task install support - * automatic dependency removal (thanks to Daniel Burrows) - * merged support for the new dpkg "Breaks" field - (thanks to Ian Jackson) - * handle network failures more gracefully on "update" - * support for unattended-upgrades (via unattended-upgrades - package) - * added apt-transport-https method - * merged "install-recommends" branch (ABI break): - - new "--install-recommends" - - install new recommends on "upgrade" if --install-recommends is - given - - new "--fix-policy" option to install all packages with unmet - important dependencies (usefull with --install-recommends to - see what not-installed recommends are on the system) - - fix of recommended packages display (only show CandidateVersion - fix or-group handling) - * merged "install-task" branch (use with "apt-get install taskname^") - - -- Michael Vogt Fri, 12 Jan 2007 20:48:07 +0100 - -apt (0.6.46.4ubuntu10) feisty; urgency=low - - * apt-pkg/depcache.cc: - - added "APT::Never-MarkAuto-Section" and consider dependencies - of packages in this section manual (LP#59893) - - ensure proper permissions in the extended_state file (LP#67037) - * debian/apt.conf.ubuntu: - - added APT::Never-MarkAuto-Section "metapackages" (LP#59893) - * cmdline/apt-get.cc: - - "apt-get install foo" on a already installed package foo will - clean the automatic installed flag (LP#72007) - - do not show packages already marked for removal as auto-installed - (LP#64493) - - applied patch to (optionally) hide the auto-remove information - (thanks to Frode M. Døving) (LP#69148) - - -- Michael Vogt Wed, 14 Mar 2007 13:32:32 +0100 - -apt (0.6.46.4ubuntu9) feisty; urgency=low - - * debian/control: - - set XS-Vcs-Bzr header - - Set Ubuntu maintainer address - * apt-pkg/cdrom.cc: - - only unmount if APT::CDROM::NoMount is false - - only umount if it was mounted by the method before - * cmdline/apt-get.cc: - - fix version output in autoremove list (LP#68941) - * apt-pkg/packagemanager.cc: - - do not spin 100% cpu in FixMissing() (LP#84476) - * apt-pkg/indexfile.cc: - - fix problem overwriting APT::Acquire::Translation - * doc/examples/configure-index: - - document APT::Acquire::Translation - - -- Michael Vogt Tue, 13 Mar 2007 15:24:39 +0100 - -apt (0.6.46.4ubuntu8) feisty; urgency=low - - * fix segfault in the pkgRecords destructor - * Bump ABI version - * debian/control: - - make the libcurl3-gnutls-dev versionized (LP#86614) - - -- Michael Vogt Mon, 26 Feb 2007 14:26:33 +0100 - -apt (0.6.46.4ubuntu7) feisty; urgency=low - - * Merged the apt--mirror branch. This means that a new 'mirror' - method is available that will allow dynamic mirror updates. - The sources.list entry looks something like this: - "deb mirror://mirrors.lp.net/get_mirror feisty main restricted" - - It also supports error reporting to a configurable url for mirror - problems/failures. - * Bump ABI version - - -- Michael Vogt Tue, 6 Feb 2007 11:38:06 +0100 - -apt (0.6.46.4ubuntu6) feisty; urgency=low - - * methods/http.cc: - - send apt version in User-Agent - * apt-pkg/deb/debrecords.cc: - - fix SHA1Hash() return value - * apt-pkg/algorithms.cc: - - fix resolver bug on removal triggered by weak-dependencies - with or-groups - - fix segfault (lp: #76530) - - -- Michael Vogt Wed, 20 Dec 2006 11:04:36 +0100 - -apt (0.6.46.4ubuntu5) feisty; urgency=low - - * added apt-transport-https package to provide a optional - https transport (apt-https spec) - - -- Michael Vogt Tue, 19 Dec 2006 16:23:43 +0100 - -apt (0.6.46.4ubuntu4) feisty; urgency=low - - * apt-pkg/algorithms.cc: - - only increase the score of installed applications if they - are not obsolete + * zh_CN.po: Updated by Eric Pareja Closes: #416822 + * tl.po: Updated by Eric Pareja Closes: #416638 + * gl.po: Updated by Jacobo Tarrio + Closes: #412828 + * da.po: Updated by Claus Hindsgaul + Closes: #409483 + * fr.po: Remove a non-breakable space for usability + issues. Closes: #408877 + * ru.po: Updated Russian translation. Closes: #405476 + * *.po: Unfuzzy after upstream typo corrections + * vi.po: Updated to 515t. Closes: #426976 + * eu.po: Updated to 515t. Closes: #423766 + * pt.po: 515t. Closes: #423111 + * fr.po: Updated by Christian Perrier + * Update all PO and the POT. Gives 513t2f for formerly + complete translations + * apt-pkg/policy.cc: + - allow multiple packages (thanks to David Foerster) - -- Michael Vogt Mon, 18 Dec 2006 19:39:05 +0100 + -- Michael Vogt Wed, 2 May 2007 13:43:44 +0200 apt (0.7.0) experimental; urgency=low @@@ -1858,6 -2686,29 +1883,6 @@@ -- Michael Vogt Fri, 12 Jan 2007 20:48:07 +0100 -apt (0.6.46.4ubuntu3) feisty; urgency=low - - * apt-pkg/algorithm.cc: - - use clog for all debugging - * apt-pkg/depcache.cc: - - never mark Required package for autoremoval (lp: #75882) - - -- Michael Vogt Mon, 18 Dec 2006 11:56:05 +0100 - -apt (0.6.46.4ubuntu2) feisty; urgency=low - - * apt-pkg/algorithms.cc: add missing call to MarkKeep - so that dist-upgrade isn't broken by unsatisfiable Breaks. - (thanks to Ian Jackson) - - -- Michael Vogt Thu, 7 Dec 2006 23:07:24 +0100 - -apt (0.6.46.4ubuntu1) feisty; urgency=low - - * merged with debian - - -- Michael Vogt Thu, 7 Dec 2006 12:13:14 +0100 - apt (0.6.46.4-0.1) unstable; urgency=emergency * NMU @@@ -1893,7 -2744,7 +1918,7 @@@ apt (0.6.46.3-0.2) unstable; urgency=hi * Fix FTBFS on most arches (regression from the fix of #400874) -- Andreas Barth Tue, 5 Dec 2006 15:51:22 +0000 - + apt (0.6.46.3-0.1) unstable; urgency=high * Non-maintainer upload with permission of Michael Vogt. @@@ -1904,6 -2755,26 +1929,6 @@@ -- Andreas Barth Tue, 5 Dec 2006 10:34:56 +0000 -apt (0.6.46.3ubuntu2) feisty; urgency=low - - * apt-pkg/algorithms.cc: add missing call to MarkKeep - so that dist-upgrade isn't broken by unsatisfiable Breaks. - - -- Ian Jackson Thu, 7 Dec 2006 15:46:52 +0000 - -apt (0.6.46.3ubuntu1) feisty; urgency=low - - * doc/apt-get.8.xml: - - documented autoremove, thanks to Vladimír Lapá%Gč%@ek - (lp: #62919) - * fix broken i18n in the dpkg progress reporting, thanks to - Frans Pop and Steinar Gunderson. (closes: #389261) - * po/en_GB.po: - - typo (lp: #61270) - * add apt-secure.8 to "See also" section - - -- Michael Vogt Thu, 23 Nov 2006 07:24:12 +0100 - apt (0.6.46.3) unstable; urgency=low * apt-pkg/deb/dpkgpm.cc: @@@ -1999,6 -2870,173 +2024,6 @@@ apt (0.6.46) unstable; urgency=lo -- Michael Vogt Thu, 21 Sep 2006 10:25:03 +0200 -apt (0.6.45ubuntu14) edgy; urgency=low - - * cmdline/apt-get.cc: - - fix in the TryInstallTask() code to make sure that all package - there are marked manual install (lp: #61684) - - -- Michael Vogt Thu, 28 Sep 2006 00:34:20 +0200 - -apt (0.6.45ubuntu13) edgy; urgency=low - - * no-changes upload to make apt rebuild against latest g++ and - fix synaptic FTBFS (see bug: #62461 for details) - - -- Michael Vogt Tue, 26 Sep 2006 22:33:10 +0200 - -apt (0.6.45ubuntu12) edgy; urgency=low - - * apt-pkg/depcache.cc: - - fix in the sweep() code, set garbage flag for packages scheduled - for removal too - - do not change the autoFlag in MarkKeep(), this can lead to suprising - side effects - - -- Michael Vogt Thu, 21 Sep 2006 00:58:24 +0200 - -apt (0.6.45ubuntu11) edgy; urgency=low - - * removed "installtask" and change it so that tasknames can be given - with "apt-get install taskname^" - * improve the writeStateFile() code - - -- Michael Vogt Wed, 20 Sep 2006 14:14:24 +0200 - -apt (0.6.45ubuntu10) edgy; urgency=low - - * methods/http.cc: - - check more careful for incorrect proxy settings (closes: #378868) - * methods/gzip.cc: - - don't hang when /var is full (closes: #341537), thanks to - Luis Rodrigo Gallardo Cruz for the patch - * doc/examples/sources.list: - - removed non-us.debian.org from the example (closes: #380030,#316196) - * Merged from Christian Perrier bzr branch: - * ro.po: Updated to 514t. Closes: #388402 - * dz.po: Updated to 514t. Closes: #388184 - * it.po: Fixed typos. Closes: #387812 - * ku.po: New kurdish translation. Closes: #387766 - * sk.po: Updated to 514t. Closes: #386851 - * ja.po: Updated to 514t. Closes: #386537 - * gl.po: Updated to 514t. Closes: #386397 - * fr.po: Updated to 516t. - * fi.po: Updated to 512t. Closes: #382702 - * share/archive-archive.gpg: - - removed the outdated amd64 and debian-2004 keys - * apt-pkg/tagfile.cc: - - applied patch from Jeroen van Wolffelaar to make the tags - caseinsensitive (closes: #384182) - - reverted MMap use in the tagfile because it does not work - across pipes (closes: #383487) - * added "installtask" command - * added new ubuntu specific rewrite rule for "Original-Maintainer" - - -- Michael Vogt Tue, 19 Sep 2006 15:07:51 +0200 - -apt (0.6.45ubuntu9) edgy; urgency=low - - * cmdline/apt-get.cc: - - if --no-remove is given, do not run the AutoRemove code - - -- Michael Vogt Wed, 13 Sep 2006 11:54:20 +0200 - -apt (0.6.45ubuntu8) edgy; urgency=low - - * apt-pkg/algorithm.cc: - - fix pkgProblemResolver.InstallProtect() to preserve the auto-install - information (lp: #59457) - * cmdline/apt-get.cc: - - fix typo in autoremove information (lp: #59420) - * install apt-mark to modify the automatically install information for - packages - - -- Michael Vogt Fri, 8 Sep 2006 20:07:22 +0200 - -apt (0.6.45ubuntu7) edgy; urgency=low - - * apt-pkg/depcache.cc: - - fix a bug in the install-recommends-section code - - -- Michael Vogt Thu, 7 Sep 2006 18:22:38 +0200 - -apt (0.6.45ubuntu6) edgy; urgency=low - - [Michael Vogt] - * cmdline/apt-get.cc: - - always show auto-removable packages and give a hint how to remove - them - * debian/apt.conf.ubuntu: - - exlucde linux-image and linux-restricted-modules from ever being - auto-removed - - added "metapackages" as the section we want to install recommends - by default - * apt-pkg/depcache.cc: - - added support to turn install-recommends selectively on/off by - section - [Ian Jackson] - * Tests pass without code changes! Except that we need this: - * Bump cache file major version to force rebuild so that Breaks - dependencies are included. - * Don't depend on or suggest any particular dpkg or dpkg-dev versions; - --auto-deconfigure is very very old and dpkg-dev's Breaks support - is more or less orthogonal. - * Initial draft of `Breaks' implementation. Appears to compile, - but as yet *completely untested*. - - -- Michael Vogt Thu, 7 Sep 2006 11:50:52 +0200 - -apt (0.6.45ubuntu5) edgy; urgency=low - - * apt-pkg/pkgcachegen.cc: - - increase the APT::Cache-Limit to deal with the increased demand due - to the translated descriptions - * apt-pkg/deb/dpkgpm.cc: - - pass "--auto-deconfigure" to dpkg on install to support the - new "breaks" in dpkg - - -- Michael Vogt Tue, 15 Aug 2006 12:06:26 +0200 - -apt (0.6.45ubuntu4) edgy; urgency=low - - * cmdline/apt-get.cc: - - fix in the new --fix-polciy code - - -- Michael Vogt Mon, 14 Aug 2006 21:08:11 +0200 - -apt (0.6.45ubuntu3) edgy; urgency=low - - * ABI break - * merged latest apt--install-recommends (closes: #559000) - * added "--fix-policy" option to can be used as "--fix-broken" and - will install missing weak depends (recommends, and/or suggests - depending on the settings) - * merged the apt--ddtp branch - - -- Michael Vogt Fri, 11 Aug 2006 12:53:23 +0200 - -apt (0.6.45ubuntu2) edgy; urgency=low - - * debian/control: - - switched to libdb4.4 for building (closes: #381019) - * cmdline/apt-get.cc: - - show only the recommends/suggests for the candidate-version, not for all - versions of the package (closes: #257054) - - properly handle recommends/suggests or-groups when printing the list of - suggested/recommends packages (closes: #311619) - * merged "apt--install-recommends" branch: - - added "{no-}install-recommends" commandline option - - added APT::Install-{Recommends,Suggests} option - - currently Install-Recommends defaults to "False" - - -- Michael Vogt Wed, 9 Aug 2006 23:38:46 +0200 - -apt (0.6.45ubuntu1) edgy; urgency=low - - * merged with debian/unstable - - -- Michael Vogt Tue, 1 Aug 2006 15:43:22 +0200 - apt (0.6.45) unstable; urgency=low * apt-pkg/contrib/sha256.cc: @@@ -2044,6 -3082,37 +2069,6 @@@ -- Michael Vogt Thu, 27 Jul 2006 00:52:05 +0200 -apt (0.6.44.2ubuntu4) edgy; urgency=low - - * Make apt-get dselect-upgrade happy again - - -- Michael Vogt Fri, 21 Jul 2006 11:03:02 +0200 - -apt (0.6.44.2ubuntu3) edgy; urgency=low - - * Close extended_states file after writing it. - - -- Colin Watson Tue, 18 Jul 2006 00:12:13 +0100 - -apt (0.6.44.2ubuntu2) edgy; urgency=low - - * create a empty extended_states file if none exists already - - -- Michael Vogt Tue, 4 Jul 2006 09:23:03 +0200 - -apt (0.6.44.2ubuntu1) edgy; urgency=low - - * merged with debian/unstable - * merged the "auto-mark" branch to support aptitude like - marking of automatically installed dependencies and added - "apt-get remove --auto-remove" to remove unused auto-installed - packages again - * changed library version from 3.11 to 3.50 to make it clearly - different from the debian version (we are ABI incompatible because - of the auto-mark patch) - - -- Michael Vogt Mon, 3 Jul 2006 18:30:46 +0200 - apt (0.6.44.2exp1) experimental; urgency=low * added support for i18n of the package descriptions @@@ -2132,6 -3201,26 +2157,6 @@@ apt (0.6.44) unstable; urgency=lo -- Michael Vogt Mon, 8 May 2006 22:28:53 +0200 -apt (0.6.43.3ubuntu3) dapper; urgency=low - - * methods/http.cc: - - fix the user-agent string - - -- Michael Vogt Fri, 26 May 2006 18:09:32 +0200 - -apt (0.6.43.3ubuntu2) dapper; urgency=low - - * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman) - - -- Michael Vogt Tue, 18 Apr 2006 13:24:40 +0200 - -apt (0.6.43.3ubuntu1) dapper; urgency=low - - * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large in - the status-fd (ubuntu #28954) - - -- Michael Vogt Tue, 28 Mar 2006 20:34:46 +0200 - apt (0.6.43.3) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-186: @@@ -2164,6 -3253,38 +2189,6 @@@ -- Michael Vogt Wed, 22 Feb 2006 10:13:04 +0100 -apt (0.6.43.2ubuntu1) dapper; urgency=low - - * Merge bubulle@debian.org--2005/apt--main--0 up to patch-182: - * ca.po: Completed to 512t. Closes: #351592 - * eu.po: Completed to 512t. Closes: #350483 - * ja.po: Completed to 512t. Closes: #349806 - * pl.po: Completed to 512t. Closes: #349514 - * sk.po: Completed to 512t. Closes: #349474 - * gl.po: Completed to 512 strings Closes: #349407 - * vi.po: Completed to 512 strings - * sv.po: Completed to 512 strings Closes: #349210 - * ru.po: Completed to 512 strings Closes: #349154 - * da.po: Completed to 512 strings Closes: #349084 - * fr.po: Completed to 512 strings - * LINGUAS: Add Welsh - * *.po: Updated from sources (512 strings) - * vi.po: Completed to 511 strings Closes: #348968 - * apt-pkg/deb/deblistparser.cc: - - don't explode on a DepCompareOp in a Provides line, but warn about - it and ignore it otherwise (thanks to James Troup for reporting it) - * cmdline/apt-get.cc: - - don't lock the lists directory in DoInstall, breaks --print-uri - (thanks to James Troup for reporting it) - * debian/apt.dirs: create /etc/apt/sources.list.d - * make apt-cache madison work without deb-src entries (#352583) - * cmdline/apt-get.cc: only run the list-cleaner if a update was - successfull - * apt-get update errors are only warnings nowdays - * be more careful with the signature file on network failures - - -- Michael Vogt Mon, 20 Feb 2006 22:27:48 +0100 - apt (0.6.43.2) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-166: @@@ -2187,6 -3308,24 +2212,6 @@@ -- Michael Vogt Thu, 19 Jan 2006 00:06:33 +0100 -apt (0.6.43.1ubuntu1) dapper; urgency=low - - * Merge bubulle@debian.org--2005/apt--main--0 up to patch-159: - - en_GB.po, de.po: fix spaces errors in "Ign " translations - Closes: #347258 - - makefile: make update-po a pre-requisite of clean target so - that POT and PO files are always up-to-date - - sv.po: Completed to 511t. Closes: #346450 - - sk.po: Completed to 511t. Closes: #346369 - - fr.po: Completed to 511t - - *.po: Updated from sources (511 strings) - * add patch to fix http download corruption problem (thanks to - Petr Vandrovec, closes: #280844, #290694) - * added APT::Periodic::Unattended-Upgrade (requires the package - "unattended-upgrade") - - -- Michael Vogt Tue, 10 Jan 2006 17:09:31 +0100 - apt (0.6.43.1) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-148: @@@ -2210,6 -3349,19 +2235,6 @@@ -- Michael Vogt Fri, 6 Jan 2006 01:17:08 +0100 -apt (0.6.43ubuntu2) dapper; urgency=low - - * merged some missing bits that wheren't merged by baz in the previous - upload (*grumble*) - - -- Michael Vogt Thu, 8 Dec 2005 18:35:58 +0100 - -apt (0.6.43ubuntu1) dapper; urgency=low - - * merged with debian - - -- Michael Vogt Fri, 25 Nov 2005 11:36:29 +0100 - apt (0.6.43) unstable; urgency=medium * Merge bubulle@debian.org--2005/apt--main--0 up to patch-132: @@@ -2230,6 -3382,22 +2255,6 @@@ -- Michael Vogt Tue, 29 Nov 2005 00:17:07 +0100 -apt (0.6.42.3ubuntu2) dapper; urgency=low - - * Merge bubulle@debian.org--2005/apt--main--0 up to patch-131: - * zh_CN.po: Completed to 507 strings(Closes: #338267) - * gl.po: Completed to 510 strings (Closes: #338356) - * added support for "/etc/apt/sources.list.d" directory - (closes: #66325) - - -- Michael Vogt Mon, 14 Nov 2005 15:30:12 +0100 - -apt (0.6.42.3ubuntu1) dapper; urgency=low - - * synced with debian - - -- Michael Vogt Thu, 10 Nov 2005 05:05:56 +0100 - apt (0.6.42.3) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-129: @@@ -2258,7 -3426,7 +2283,7 @@@ apt (0.6.42.2) unstable; urgency=hig * Priority high to get the AMD key into testing ASAP. -- Frans Pop Sun, 30 Oct 2005 21:29:11 +0100 - + apt (0.6.42.1) unstable; urgency=low * fix a incorrect example in the apt_prefrences man page @@@ -2336,6 -3504,80 +2361,6 @@@ apt (0.6.41) unstable; urgency=lo -- Michael Vogt Mon, 5 Sep 2005 22:59:03 +0200 -apt (0.6.40.1ubuntu8) breezy; urgency=low - - * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62: - - fix for a bad memory/file leak in the mmap code (ubuntu #15603) - * po/de.po, po/fr.po: - - updated the translations - * po/makefile: - - create a single pot file in each domain dir to make rosetta happy - - -- Michael Vogt Wed, 28 Sep 2005 10:16:06 +0200 - -apt (0.6.40.1ubuntu7) breezy; urgency=low - - * updated the pot/po files , no code changes - - -- Michael Vogt Tue, 27 Sep 2005 18:38:16 +0200 - -apt (0.6.40.1ubuntu6) breezy; urgency=low - - * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-56: - - make it possible for apt to handle a failed MediaChange event and - fall back to other sources (ubuntu #13713) - - -- Michael Vogt Tue, 13 Sep 2005 22:09:50 +0200 - -apt (0.6.40.1ubuntu5) breezy; urgency=low - - * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-{50,51}. - This adds media-change reporting to the apt status-fd (ubuntu #15213) - * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55: - apt-pkg/cdrom.cc: - - unmount the cdrom when apt failed to locate any package files - - -- Michael Vogt Mon, 12 Sep 2005 15:44:26 +0200 - -apt (0.6.40.1ubuntu4) breezy; urgency=low - - * debian/apt.cron.daily: - - fix a embarrassing typo - - -- Michael Vogt Wed, 7 Sep 2005 10:10:37 +0200 - -apt (0.6.40.1ubuntu3) breezy; urgency=low - - * debian/apt.cron.daily: - - use the ctime as well when figuring what packages need to - be removed. This fixes the problem that packages copied with - "cp -a" (e.g. from the installer) have old mtimes (ubuntu #14504) - - -- Michael Vogt Tue, 6 Sep 2005 18:30:46 +0200 - -apt (0.6.40.1ubuntu2) breezy; urgency=low - - * improved the support for "error" and "conffile" reporting from - dpkg, added the format to README.progress-reporting - * added README.progress-reporting to the apt-doc package - * Do md5sum checking for file and cdrom method (closes: #319142) - * Change pkgPolicy::Pin from private to protected to let subclasses - access it too (closes: #321799) - * methods/connect.cc: - - send failure reason for EAI_AGAIN (TmpResolveFailure) to acuire-item - * apt-pkg/acquire-item.cc: - - fail early if a FailReason is TmpResolveFailure (avoids hangs during - the install when no network is available) - * merged michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0 - - -- Michael Vogt Tue, 23 Aug 2005 19:44:55 +0200 - -apt (0.6.40.1ubuntu1) breezy; urgency=low - - * Synchronize with Debian - - -- Michael Vogt Fri, 5 Aug 2005 14:20:56 +0200 - apt (0.6.40.1) unstable; urgency=low * bugfix in the parsing code for the apt<->dpkg communication. apt @@@ -2345,6 -3587,12 +2370,6 @@@ -- Michael Vogt Fri, 5 Aug 2005 13:24:58 +0200 -apt (0.6.40ubuntu1) breezy; urgency=low - - * Synchronize with Debian - - -- Matt Zimmerman Thu, 4 Aug 2005 15:53:22 -0700 - apt (0.6.40) unstable; urgency=low * Patch from Jordi Mallach to mark some additional strings for translation @@@ -2360,6 -3608,39 +2385,6 @@@ -- Matt Zimmerman Thu, 28 Jul 2005 11:57:32 -0700 -apt (0.6.39ubuntu4) breezy; urgency=low - - * Fix keyring paths in apt-key, apt.postinst (I swear I remember doing this - before...) - - -- Matt Zimmerman Wed, 29 Jun 2005 08:39:17 -0700 - -apt (0.6.39ubuntu3) breezy; urgency=low - - * Fix keyring locations for Ubuntu in apt-key too. - - -- Colin Watson Wed, 29 Jun 2005 14:45:36 +0100 - -apt (0.6.39ubuntu2) breezy; urgency=low - - * Install ubuntu-archive.gpg rather than debian-archive.gpg as - /etc/apt/trusted.gpg. - - -- Colin Watson Wed, 29 Jun 2005 11:53:34 +0100 - -apt (0.6.39ubuntu1) breezy; urgency=low - - * Michael Vogt - - Change debian/bugscript to use #!/bin/bash (Closes: #313402) - - Fix a incorrect example in the man-page (closes: #282918) - - Support architecture-specific extra overrides - (closes: #225947). Thanks to Anthony Towns for idea and - the patch, thanks to Colin Watson for testing it. - - better report network timeouts from the methods to the acuire code, - only timeout once per sources.list line - - -- Matt Zimmerman Tue, 28 Jun 2005 11:52:24 -0700 - apt (0.6.39) unstable; urgency=low * Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6 @@@ -2372,6 -3653,13 +2397,6 @@@ -- Matt Zimmerman Tue, 28 Jun 2005 11:51:09 -0700 -apt (0.6.38ubuntu1) breezy; urgency=low - - * First release from Ubuntu branch - * Merge with --main--0, switch back to Ubuntu keyring - - -- Matt Zimmerman Sat, 25 Jun 2005 16:52:41 -0700 - apt (0.6.38) unstable; urgency=low * Merge michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6, a workaround @@@ -4250,3 -5538,4 +4275,3 @@@ apt (0.0.1) unstable; urgency=lo * Initial Release. -- Scott K. Ellis Tue, 31 Mar 1998 12:49:28 -0500 - diff --combined debian/control index 4f41c130b,477ab5b90..9ac0d582e --- a/debian/control +++ b/debian/control @@@ -1,20 -1,21 +1,20 @@@ Source: apt Section: admin Priority: important -Maintainer: Ubuntu Core Developers -XSBC-Original-Maintainer: APT Development Team +Maintainer: APT Development Team Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Luca Bruno , Julian Andres Klode -Standards-Version: 3.8.3 -Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, intltool -Vcs-Bzr: https://code.launchpad.net/~ubuntu-core-dev/apt/ubuntu +Standards-Version: 3.8.4 - Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen ++Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen, intltool +Build-Conflicts: autoconf2.13, automake1.4 Package: apt Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) +Depends: ${shlibs:Depends}, debian-archive-keyring, ${misc:Depends} +Replaces: manpages-pl (<< 20060617-3~) Provides: ${libapt-pkg:provides} -Recommends: ubuntu-keyring +Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt Description: Advanced front-end for dpkg This is Debian's next generation front-end for the dpkg package manager. @@@ -28,6 -29,7 +28,6 @@@ Package: apt-do Architecture: all Priority: optional Depends: ${misc:Depends} -Replaces: apt (<< 0.5.4.9) Section: doc Description: Documentation for APT This package contains the user guide and offline guide, for APT, an @@@ -51,14 -53,12 +51,14 @@@ Section: do Description: Documentation for APT development This package contains documentation for development of the APT Debian package manipulation program and its libraries. + . + This includes the source code documentation generated by doxygen + in html format. Package: apt-utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Provides: ${libapt-inst:provides} -Replaces: apt (<< 0.5.9) Description: APT utility programs This package contains some APT utility programs such as apt-ftparchive, apt-sortpkgs and apt-extracttemplates. diff --combined debian/rules index 827fc2034,6fc2ec9f0..4c6795910 --- a/debian/rules +++ b/debian/rules @@@ -27,14 -27,10 +27,14 @@@ endi # See below -include build/environment.mak -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - export CXXFLAGS = -O0 -g -Wall +ifneq (,$(shell which dpkg-buildflags)) + export CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) else - export CXXFLAGS = -O2 -g -Wall + ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + export CXXFLAGS = -O0 -g -Wall + else + export CXXFLAGS = -O2 -g -Wall + endif endif # Default rule @@@ -51,7 -47,7 +51,7 @@@ BASE= ifdef BUILD BUILD_POSSIBLE := $(BUILD) $(BASE)/$(BUILD) else -BUILD_POSSIBLE := $(BASE) $(BASE)/build-$(shell uname -m) $(BASE)/build +BUILD_POSSIBLE := $(BASE) $(BASE)/build-$(shell uname --machine) $(BASE)/build endif BUILDX:= $(foreach i,$(BUILD_POSSIBLE),$(wildcard $(i)/environment.mak*)) BUILDX:= $(patsubst %/,%,$(firstword $(dir $(BUILDX)))) @@@ -82,24 -78,24 +82,24 @@@ APT_UTILS=ftparchive sortpkgs extractte include buildlib/libversion.mak # Determine which package we should provide in the control files -LIBAPTPKG_PROVIDE=libapt-pkg$(LIBEXT)-$(LIBAPTPKG_MAJOR) -LIBAPTINST_PROVIDE=libapt-inst$(LIBEXT)-$(LIBAPTINST_MAJOR) +LIBAPTPKG_PROVIDE=libapt-pkg$(LIBAPTPKG_MAJOR) +LIBAPTINST_PROVIDE=libapt-inst$(LIBAPTINST_MAJOR) debian/shlibs.local: apt-pkg/makefile - # We have 3 shlibs.local files.. One for 'apt', one for 'apt-utils' and + # We have 3 shlibs.local files: One for 'apt', one for 'apt-utils' and # one for the rest of the packages. This ensures that each package gets - # the right overrides.. + # the right overrides… rm -rf $@ $@.apt $@.apt-utils - echo "libapt-pkg$(LIBEXT) $(LIBAPTPKG_MAJOR)" > $@.apt + echo "libapt-pkg $(LIBAPTPKG_MAJOR)" > $@.apt - echo "libapt-pkg$(LIBEXT) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@.apt-utils - echo "libapt-inst$(LIBEXT) $(LIBAPTINST_MAJOR)" >> $@.apt-utils + echo "libapt-pkg $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@.apt-utils + echo "libapt-inst $(LIBAPTINST_MAJOR)" >> $@.apt-utils - echo "libapt-pkg$(LIBEXT) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@ - echo "libapt-inst$(LIBEXT) $(LIBAPTINST_MAJOR) $(LIBAPTINST_PROVIDE)" >> $@ + echo "libapt-pkg $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@ + echo "libapt-inst $(LIBAPTINST_MAJOR) $(LIBAPTINST_PROVIDE)" >> $@ -build: build/build-stamp -build-doc: build/build-doc-stamp +build: build/build-stamp +build-doc: build/build-doc-stamp # Note that this is unconditionally done first as part of loading environment.mak # The true is needed to force make to reload environment.mak after running @@@ -127,12 -123,14 +127,12 @@@ build/build-doc-stamp: build/configure- clean: dh_testdir -# dh_testroot - [ -f Makefile ] && $(MAKE) clean - [ -f Makefile ] && $(MAKE) distclean + [ ! -f Makefile ] || $(MAKE) clean distclean rm -rf build # Add here commands to clean up after the build process. - dh_clean debian/shlibs.local debian/shlibs.local.apt debian/shlibs.local.apt-utils + dh_clean debian/copyright debian/shlibs.local debian/shlibs.local.apt debian/shlibs.local.apt-utils binary-indep: apt-doc libapt-pkg-doc # Build architecture-independent files here. @@@ -143,20 -141,22 +143,20 @@@ libapt-pkg-doc: build-doc debian/shlibs dh_installdirs -p$@ # # libapt-pkg-doc install -# - dh_installdocs -p$@ $(BLD)/docs/cache* $(BLD)/docs/design* $(BLD)/docs/dpkg-tech* \ - $(BLD)/docs/files* $(BLD)/docs/method* \ - doc/libapt-pkg2_to_3.txt doc/style.txt +# + dh_installdocs -p$@ $(BLD)/docs/design* \ + $(BLD)/docs/dpkg-tech* \ + $(BLD)/docs/files* \ + $(BLD)/docs/method* \ + doc/libapt-pkg2_to_3.txt \ + doc/style.txt \ + $(BLD)/doc/doxygen/html dh_installexamples -p$@ -# dh_installmenu -p$@ -# dh_installinit -p$@ -# dh_installcron -p$@ -# dh_installman -p$@ -# dh_undocumented -p$@ dh_installchangelogs -p$@ dh_strip -p$@ dh_compress -p$@ dh_fixperms -p$@ -# dh_suidregister -p$@ dh_installdeb -p$@ dh_gencontrol -p$@ -u -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE) dh_md5sums -p$@ @@@ -170,10 -170,8 +170,10 @@@ apt-doc: build-do # apt-doc install # # Copy the guides - dh_installdocs -p$@ $(BLD)/docs/guide*.text $(BLD)/docs/guide*.html \ - $(BLD)/docs/offline*.text $(BLD)/docs/offline*.html + dh_installdocs -p$@ $(BLD)/docs/guide*.text \ + $(BLD)/docs/guide*.html \ + $(BLD)/docs/offline*.text \ + $(BLD)/docs/offline*.html dh_installchangelogs -p$@ dh_compress -p$@ dh_fixperms -p$@ @@@ -192,7 -190,7 +192,7 @@@ apt: build build-doc debian/shlibs.loca dh_testdir -p$@ dh_testroot -p$@ dh_clean -p$@ -k - dh_installdirs -p$@ /usr/share/bug/$@ /usr/share/$@ + dh_installdirs -p$@ # # apt install # @@@ -215,7 -213,11 +215,9 @@@ cp debian/bugscript debian/$@/usr/share/bug/apt/script cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt + cp share/ubuntu-archive.gpg debian/$@/usr/share/$@ + sed 's/^_//' share/apt-auth-failure.note > debian/$@/usr/share/$@/apt-auth-failure.note cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove - cp debian/apt.conf.ubuntu debian/$@/etc/apt/apt.conf.d/01ubuntu -# head -n 500 ChangeLog > debian/ChangeLog # copy lintian override cp share/lintian-overrides debian/$@/usr/share/lintian/overrides/apt @@@ -225,6 -227,10 +227,10 @@@ rm -f build/po/*.pot rm -f po/*.pot + # move the mirror failure script in place - mv debian/$@/usr/bin/apt-report-mirror-failure \ - debian/$@/usr/lib/apt/apt-report-mirror-failure \ ++ #mv debian/$@/usr/bin/apt-report-mirror-failure \ ++ # debian/$@/usr/lib/apt/apt-report-mirror-failure \ + dh_installexamples -p$@ $(BLD)/docs/examples/* dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES))) dh_installcron -p$@ @@@ -233,9 -239,9 +239,9 @@@ dh_strip -p$@ dh_compress -p$@ dh_fixperms -p$@ - dh_makeshlibs -p$@ -m$(LIBAPTPKG_MAJOR) -V '$(LIBAPTPKG_PROVIDE)' + dh_makeshlibs -p$@ --major=$(LIBAPTPKG_MAJOR) --version-info='$(LIBAPTPKG_PROVIDE)' dh_installdeb -p$@ - dh_shlibdeps -p$@ -l`pwd`/debian/apt/usr/lib:`pwd`/debian/$@/usr/lib -- -Ldebian/shlibs.local.apt + dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib -- -Ldebian/shlibs.local.apt dh_gencontrol -p$@ -u -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE) dh_md5sums -p$@ dh_builddeb -p$@ @@@ -254,11 -260,16 +260,11 @@@ libapt-pkg-dev: build debian/shlibs.loc cp $(BLD)/include/apt-pkg/*.h debian/libapt-pkg-dev/usr/include/apt-pkg/ dh_installdocs -p$@ -# dh_installmenu -p$@ -# dh_installinit -p$@ -# dh_installcron -p$@ -# dh_installman -p$@ dh_installchangelogs -p$@ dh_strip -p$@ dh_compress -p$@ dh_fixperms -p$@ -# dh_suidregister -p$@ dh_installdeb -p$@ dh_gencontrol -p$@ -u -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE) -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE) dh_md5sums -p$@ @@@ -286,9 -297,9 +292,9 @@@ apt-utils: build debian/shlibs.loca dh_strip -p$@ dh_compress -p$@ dh_fixperms -p$@ - dh_makeshlibs -m$(LIBAPTINST_MAJOR) -V '$(LIBAPTINST_PROVIDE)' -p$@ + dh_makeshlibs -p$@ --major=$(LIBAPTINST_MAJOR) --version-info='$(LIBAPTINST_PROVIDE)' dh_installdeb -p$@ - dh_shlibdeps -p$@ -l`pwd`/debian/apt/usr/lib:`pwd`/debian/$@/usr/lib -- -Ldebian/shlibs.local.apt-utils + dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib -- -Ldebian/shlibs.local.apt-utils dh_gencontrol -p$@ -u -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE) dh_md5sums -p$@ dh_builddeb -p$@ @@@ -300,7 -311,7 +306,7 @@@ apt-transport-https: build debian/shlib dh_installdirs -p$@ # install the method - mkdir -p debian/$@/usr/lib/apt/methods + mkdir --parents debian/$@/usr/lib/apt/methods cp $(BLD)/bin/methods/https debian/$@/usr/lib/apt/methods dh_installdocs -p$@ debian/apt-transport-https.README @@@ -314,18 -325,61 +320,18 @@@ dh_compress -p$@ dh_fixperms -p$@ dh_installdeb -p$@ - dh_shlibdeps -p$@ -l`pwd`/debian/apt/usr/lib:`pwd`/debian/$@/usr/lib + dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib dh_gencontrol -p$@ dh_md5sums -p$@ dh_builddeb -p$@ -source diff: - @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false - -# Update from CVS -l33ch: really-clean - cvs update - buildlib/mkChangeLog - -# Update from CVS and then configure for build -super-l33ch: l33ch Makefile.in - configure: $(MAKE) configure -l33ch-stamp: super-l33ch - touch $@ - really-clean: clean - -find -name Makefile.in -print0 | xargs -0r rm -f + -find . -name Makefile.in -print0 | xargs --null --no-run-if-empty -- rm -f find -name ChangeLog | xargs rm -f rm -f l33ch-stamp binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary debian/shlibs.local - - -# Done by the uploader. -#cvs update.. -#edit debian/changelog -# configure.in has the version automatically updated now. -# edit configure.in -# debian/rules cvs-build - -CVS_BUILDDIR=apt-$(APT_DEBVER) -CVS_ROOT=$(shell cat CVS/Root) -CVS_MODULE=$(shell cat CVS/Repository) -cvs-build: - rm -rf debian/cvs-build - mkdir -p debian/cvs-build - (cd debian/cvs-build;cvs -d $(CVS_ROOT) export -r$(APT_CVSTAG) -d apt-$(APT_DEBVER) $(CVS_MODULE)) - $(MAKE) -C debian/cvs-build/$(CVS_BUILDDIR) startup doc - (cd debian/cvs-build/$(CVS_BUILDDIR);$(DEB_BUILD_PROG)) - -cvs-mkul: - -mkdir -p ../upload-$(APT_DEBVER) - cp `find debian/cvs-build -maxdepth 1 -type f` ../upload-$(APT_DEBVER) - -arch-build: - rm -rf debian/arch-build - mkdir -p debian/arch-build/apt-$(APT_DEBVER) - tar -c --exclude=arch-build --no-recursion -f - `bzr inventory` | (cd debian/arch-build/$(PKG)-$(APT_DEBVER);tar xf -) - $(MAKE) -C debian/arch-build/apt-$(APT_DEBVER) startup doc - (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG); dpkg-genchanges -S > ../apt_$(APT_DEBVER)_source.changes) diff --combined methods/http.cc index d43dd14c8,904030e0a..3e2227f2b --- a/methods/http.cc +++ b/methods/http.cc @@@ -67,7 -67,7 +67,7 @@@ unsigned long CircleBuf::BwReadLimit=0 unsigned long CircleBuf::BwTickReadData=0; struct timeval CircleBuf::BwReadTick={0,0}; const unsigned int CircleBuf::BW_HZ=10; - + // CircleBuf::CircleBuf - Circular input buffer /*{{{*/ // --------------------------------------------------------------------- /* */ @@@ -378,7 -378,7 +378,7 @@@ bool ServerState::Close( // --------------------------------------------------------------------- /* Returns 0 if things are OK, 1 if an IO error occurred and 2 if a header parse error occurred */ -int ServerState::RunHeaders() +ServerState::RunHeadersResult ServerState::RunHeaders() { State = Header; @@@ -407,7 -407,7 +407,7 @@@ string::const_iterator J = I; for (; J != Data.end() && *J != '\n' && *J != '\r';J++); if (HeaderLine(string(I,J)) == false) - return 2; + return RUN_HEADERS_PARSE_ERROR; I = J; } @@@ -419,11 -419,11 +419,11 @@@ if (Encoding == Closes && HaveContent == true) Persistent = false; - return 0; + return RUN_HEADERS_OK; } while (Owner->Go(false,this) == true); - return 1; + return RUN_HEADERS_IO_ERROR; } /*}}}*/ // ServerState::RunData - Transfer the data from the socket /*{{{*/ @@@ -734,7 -734,7 +734,7 @@@ void HttpMethod::SendReq(FetchItem *Itm Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n"; } Req += "User-Agent: " + _config->Find("Acquire::http::User-Agent", - "Ubuntu APT-HTTP/1.3 ("VERSION")") + "\r\n\r\n"; + "Debian APT-HTTP/1.3 ("VERSION")") + "\r\n\r\n"; if (Debug == true) cerr << Req << endl; @@@ -914,10 -914,15 +914,10 @@@ bool HttpMethod::ServerDie(ServerState // HttpMethod::DealWithHeaders - Handle the retrieved header data /*{{{*/ // --------------------------------------------------------------------- /* We look at the header data we got back from the server and decide what - to do. Returns - 0 - File is open, - 1 - IMS hit - 3 - Unrecoverable error - 4 - Error with error content page - 5 - Unrecoverable non-server error (close the connection) - 6 - Try again with a new or changed URI + to do. Returns DealWithHeadersResult (see http.h for details). */ -int HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv) +HttpMethod::DealWithHeadersResult +HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv) { // Not Modified if (Srv->Result == 304) @@@ -925,7 -930,7 +925,7 @@@ unlink(Queue->DestFile.c_str()); Res.IMSHit = true; Res.LastModified = Queue->LastModified; - return 1; + return IMS_HIT; } /* Redirect @@@ -944,7 -949,7 +944,7 @@@ if (!Srv->Location.empty()) { NextURI = Srv->Location; - return 6; + return TRY_AGAIN_OR_REDIRECT; } /* else pass through for error message */ } @@@ -953,10 -958,13 +953,13 @@@ failure */ if (Srv->Result < 200 || Srv->Result >= 300) { + char err[255]; + snprintf(err,sizeof(err)-1,"HttpError%i",Srv->Result); + SetFailReason(err); _error->Error("%u %s",Srv->Result,Srv->Code); if (Srv->HaveContent == true) - return 4; - return 3; + return ERROR_WITH_CONTENT_PAGE; + return ERROR_UNRECOVERABLE; } // This is some sort of 2xx 'data follows' reply @@@ -967,7 -975,7 +970,7 @@@ delete File; File = new FileFd(Queue->DestFile,FileFd::WriteAny); if (_error->PendingError() == true) - return 5; + return ERROR_NOT_FROM_SERVER; FailFile = Queue->DestFile; FailFile.c_str(); // Make sure we dont do a malloc in the signal handler @@@ -995,13 -1003,13 +998,13 @@@ if (Srv->In.Hash->AddFD(File->Fd(),Srv->StartPos) == false) { _error->Errno("read",_("Problem hashing file")); - return 5; + return ERROR_NOT_FROM_SERVER; } lseek(File->Fd(),0,SEEK_END); } SetNonBlock(File->Fd(),true); - return 0; + return FILE_IS_OPEN; } /*}}}*/ // HttpMethod::SigTerm - Handle a fatal signal /*{{{*/ @@@ -1029,7 -1037,7 +1032,7 @@@ void HttpMethod::SigTerm(int depth. */ bool HttpMethod::Fetch(FetchItem *) { - if (Server == 0) + if (Server == 0) return true; // Queue the requests @@@ -1142,11 -1150,11 +1145,11 @@@ int HttpMethod::Loop( // Fetch the next URL header data from the server. switch (Server->RunHeaders()) { - case 0: + case ServerState::RUN_HEADERS_OK: break; // The header data is bad - case 2: + case ServerState::RUN_HEADERS_PARSE_ERROR: { _error->Error(_("Bad header data")); Fail(true); @@@ -1156,7 -1164,7 +1159,7 @@@ // The server closed a connection during the header get.. default: - case 1: + case ServerState::RUN_HEADERS_IO_ERROR: { FailCounter++; _error->Discard(); @@@ -1180,7 -1188,7 +1183,7 @@@ switch (DealWithHeaders(Res,Server)) { // Ok, the file is Open - case 0: + case FILE_IS_OPEN: { URIStart(Res); @@@ -1233,21 -1241,21 +1236,21 @@@ } // IMS hit - case 1: + case IMS_HIT: { URIDone(Res); break; } // Hard server error, not found or something - case 3: + case ERROR_UNRECOVERABLE: { Fail(); break; } // Hard internal error, kill the connection and fail - case 5: + case ERROR_NOT_FROM_SERVER: { delete File; File = 0; @@@ -1259,7 -1267,7 +1262,7 @@@ } // We need to flush the data, the header is like a 404 w/ error text - case 4: + case ERROR_WITH_CONTENT_PAGE: { Fail(); @@@ -1272,7 -1280,7 +1275,7 @@@ } // Try again with a new URL - case 6: + case TRY_AGAIN_OR_REDIRECT: { // Clear rest of response if there is content if (Server->HaveContent) @@@ -1366,15 -1374,4 +1369,4 @@@ bool HttpMethod::AutoDetectProxy( } /*}}}*/ - int main() - { - setlocale(LC_ALL, ""); - // ignore SIGPIPE, this can happen on write() if the socket - // closes the connection (this is dealt with via ServerDie()) - signal(SIGPIPE, SIG_IGN); - - HttpMethod Mth; - return Mth.Loop(); - } - diff --combined methods/http.h index af0f5e033,bac94e177..d0677bdaa --- a/methods/http.h +++ b/methods/http.h @@@ -13,7 -13,7 +13,7 @@@ #define MAXLEN 360 - #include + using std::cout; using std::endl; @@@ -117,19 -117,7 +117,19 @@@ struct ServerStat void Reset() {Major = 0; Minor = 0; Result = 0; Size = 0; StartPos = 0; Encoding = Closes; time(&Date); ServerFd = -1; Pipeline = true;}; - int RunHeaders(); + + /** \brief Result of the header acquire */ + enum RunHeadersResult { + /** \brief Header ok */ + RUN_HEADERS_OK, + /** \brief IO error while retrieving */ + RUN_HEADERS_IO_ERROR, + /** \brief Parse error after retrieving */ + RUN_HEADERS_PARSE_ERROR, + }; + /** \brief Get the headers before the data */ + RunHeadersResult RunHeaders(); + /** \brief Transfer the data from the socket */ bool RunData(); bool Open(); @@@ -145,29 -133,9 +145,28 @@@ class HttpMethod : public pkgAcqMetho bool Go(bool ToFile,ServerState *Srv); bool Flush(ServerState *Srv); bool ServerDie(ServerState *Srv); - int DealWithHeaders(FetchResult &Res,ServerState *Srv); + + /** \brief Result of the header parsing */ + enum DealWithHeadersResult { + /** \brief The file is open and ready */ + FILE_IS_OPEN, + /** \brief We got a IMS hit, the file has not changed */ + IMS_HIT, + /** \brief The server reported a unrecoverable error */ + ERROR_UNRECOVERABLE, + /** \brief The server reported a error with a error content page */ + ERROR_WITH_CONTENT_PAGE, + /** \brief A error on the client side */ + ERROR_NOT_FROM_SERVER, + /** \brief A redirect or retry request */ + TRY_AGAIN_OR_REDIRECT + }; + /** \brief Handle the retrieved header data */ + DealWithHeadersResult DealWithHeaders(FetchResult &Res,ServerState *Srv); + + /** \brief Try to AutoDetect the proxy */ bool AutoDetectProxy(); - virtual bool Fetch(FetchItem *); virtual bool Configuration(string Message); // In the event of a fatal signal this file will be closed and timestamped. @@@ -175,10 -143,13 +174,13 @@@ static int FailFd; static time_t FailTime; static void SigTerm(int); + + protected: + virtual bool Fetch(FetchItem *); string NextURI; string AutoDetectProxyCmd; - + public: friend class ServerState;