From: David Kalnischkies Date: Tue, 13 Sep 2011 15:52:22 +0000 (+0200) Subject: merge with debian/experimental X-Git-Tag: 0.9.0~57^2~1 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/74b220028595342028e3309002e4ec359af328f9 merge with debian/experimental --- 74b220028595342028e3309002e4ec359af328f9 diff --cc apt-pkg/indexcopy.cc index f52ecbbcb,747e464be..4df018ef4 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@@ -56,8 -53,8 +56,8 @@@ bool IndexCopy::CopyPackages(string CDR bool Debug = _config->FindB("Debug::aptcdrom",false); // Prepare the progress indicator - unsigned long TotalSize = 0; + off_t TotalSize = 0; - for (vector::iterator I = List.begin(); I != List.end(); I++) + for (vector::iterator I = List.begin(); I != List.end(); ++I) { struct stat Buf; if (stat(string(*I + GetFileName()).c_str(),&Buf) != 0 && @@@ -71,10 -68,10 +71,10 @@@ unsigned int NotFound = 0; unsigned int WrongSize = 0; unsigned int Packages = 0; - for (vector::iterator I = List.begin(); I != List.end(); I++) + for (vector::iterator I = List.begin(); I != List.end(); ++I) { string OrigPath = string(*I,CDROM.length()); - unsigned long FileSize = 0; + off_t FileSize = 0; // Open the package file FileFd Pkg; @@@ -788,8 -785,8 +788,8 @@@ bool TranslationsCopy::CopyTranslations bool Debug = _config->FindB("Debug::aptcdrom",false); // Prepare the progress indicator - unsigned long TotalSize = 0; + off_t TotalSize = 0; - for (vector::iterator I = List.begin(); I != List.end(); I++) + for (vector::iterator I = List.begin(); I != List.end(); ++I) { struct stat Buf; if (stat(string(*I).c_str(),&Buf) != 0 && @@@ -803,10 -800,10 +803,10 @@@ unsigned int NotFound = 0; unsigned int WrongSize = 0; unsigned int Packages = 0; - for (vector::iterator I = List.begin(); I != List.end(); I++) + for (vector::iterator I = List.begin(); I != List.end(); ++I) { string OrigPath = string(*I,CDROM.length()); - unsigned long FileSize = 0; + off_t FileSize = 0; // Open the package file FileFd Pkg; diff --cc debian/changelog index dd91d3aa8,c9439b0d4..f14930aa4 --- a/debian/changelog +++ b/debian/changelog @@@ -1,11 -1,55 +1,64 @@@ - apt (0.8.16~exp3+nmu1) experimental; urgency=low ++apt (0.8.16~exp6) experimental; urgency=low + + [ David Kalnischkies ] + * Support large files in the complete toolset. Indexes of this + size are pretty unlikely for now, but we need it for deb + packages which could become bigger than 4GB now (LP: #815895) + - -- David Kalnischkies Tue, 13 Sep 2011 17:44:00 +0200 ++ -- David Kalnischkies Tue, 13 Sep 2011 17:51:49 +0200 ++ + apt (0.8.16~exp5) experimental; urgency=low + + * merged the latest debian-sid fixes + * apt-pkg/makefile: + - install sha256.h compat header + * apt-pkg/pkgcachegen.{cc,h}: + - use ref-to-ptr semantic in NewDepends() to ensure that the + libapt does not segfault if the cache is remapped in between + (LP: #812862) + - fix crash when P.Arch() was used but the cache got remapped + * apt-pkg/acquire-item.{cc,h}: + - do not check for a "Package" tag in optional index targets + like the translations index + * apt-pkg/acquire.cc: + - fix potential divide-by-zero + * methods/mirror.cc: + - include the architecture(s) in the query string as well so + that the server can make better decisions + + -- Michael Vogt Mon, 15 Aug 2011 14:52:54 +0200 + + apt (0.8.16~exp4) experimental; urgency=low + + [ Julian Andres Klode ] + * apt-pkg/pkgcache.h: + - [ABI break] Add pkgCache::Header::CacheFileSize, storing the cache size + * apt-pkg/pkgcachegen.cc: + - Write the file size to the cache + * apt-pkg/pkgcache.cc: + - Check that cache is at least CacheFileSize bytes large (LP: #16467) + + [ Michael Vogt ] + * merged latest fixes from debian-sid + * apt-pkg/cdrom.{cc,h}: + - cleanup old ABI break avoidance hacks + * [ABI break] apt-pkg/acquire-item.{cc,h}: + - cleanup around OptionalIndexTarget and SubIndexTarget + * [ABI break] merged patch from Jonathan Thomas to have a new + RecordField() function in the pkgRecorder parser. Many thanks + Thomas + * [ABI break] merge patch from Jonathan Thomas to speed up the + depcache by caching the install-recommends and install-suggests + values + * apt-pkg/contrib/fileutl.{cc,h}: + - add GetModificationTime() helper + * apt-pkg/pkgcachegen.cc: + - regenerate the cache if the sources.list changes to ensure + that changes in the ordering there will be honored by apt + * apt-pkg/sourcelist.{cc,h}: + - add pkgSourceList::GetLastModifiedTime() helper + + -- Michael Vogt Thu, 28 Jul 2011 16:57:08 +0200 apt (0.8.16~exp3) experimental; urgency=low diff --cc methods/http.h index b74740ab3,6302807c5..c47d7184a --- a/methods/http.h +++ b/methods/http.h @@@ -36,16 -36,16 +36,16 @@@ class CircleBu static struct timeval BwReadTick; static const unsigned int BW_HZ; - unsigned long long LeftRead() - unsigned long LeftRead() const ++ unsigned long long LeftRead() const { - unsigned long Sz = Size - (InP - OutP); + unsigned long long Sz = Size - (InP - OutP); if (Sz > Size - (InP%Size)) Sz = Size - (InP%Size); return Sz; } - unsigned long long LeftWrite() - unsigned long LeftWrite() const ++ unsigned long long LeftWrite() const { - unsigned long Sz = InP - OutP; + unsigned long long Sz = InP - OutP; if (InP > MaxGet) Sz = MaxGet - OutP; if (Sz > Size - (OutP%Size)) @@@ -67,13 -67,13 +67,13 @@@ bool WriteTillEl(string &Data,bool Single = false); // Control the write limit - void Limit(long Max) {if (Max == -1) MaxGet = 0-1; else MaxGet = OutP + Max;} + void Limit(long long Max) {if (Max == -1) MaxGet = 0-1; else MaxGet = OutP + Max;} - bool IsLimit() {return MaxGet == OutP;}; - void Print() {cout << MaxGet << ',' << OutP << endl;}; + bool IsLimit() const {return MaxGet == OutP;}; + void Print() const {cout << MaxGet << ',' << OutP << endl;}; // Test for free space in the buffer - bool ReadSpace() {return Size - (InP - OutP) > 0;}; - bool WriteSpace() {return InP - OutP > 0;}; + bool ReadSpace() const {return Size - (InP - OutP) > 0;}; + bool WriteSpace() const {return InP - OutP > 0;}; // Dump everything void Reset(); diff --cc methods/mirror.cc index 768e6b3a3,a3e60ab15..61a7f12fd --- a/methods/mirror.cc +++ b/methods/mirror.cc @@@ -8,8 -8,7 +8,9 @@@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ +#include + + #include #include #include #include