From: Michael Vogt Date: Fri, 5 Sep 2014 12:41:54 +0000 (+0200) Subject: Merge branch 'debian/sid' into debian/experimental X-Git-Tag: 1.1.exp3~15 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/8c782efd93342c6119e8ba2ff6989b7a164b7f3d Merge branch 'debian/sid' into debian/experimental Conflicts: apt-pkg/acquire-item.cc configure.ac debian/changelog doc/apt-verbatim.ent doc/po/apt-doc.pot doc/po/de.po doc/po/es.po doc/po/fr.po doc/po/it.po doc/po/ja.po doc/po/pt.po po/ar.po po/ast.po po/bg.po po/bs.po po/ca.po po/cs.po po/cy.po po/da.po po/de.po po/dz.po po/el.po po/es.po po/eu.po po/fi.po po/fr.po po/gl.po po/hu.po po/it.po po/ja.po po/km.po po/ko.po po/ku.po po/lt.po po/mr.po po/nb.po po/ne.po po/nl.po po/nn.po po/pl.po po/pt.po po/pt_BR.po po/ro.po po/ru.po po/sk.po po/sl.po po/sv.po po/th.po po/tl.po po/tr.po po/uk.po po/vi.po po/zh_CN.po po/zh_TW.po test/integration/test-ubuntu-bug-346386-apt-get-update-paywall --- 8c782efd93342c6119e8ba2ff6989b7a164b7f3d diff --cc apt-pkg/acquire-item.cc index 221d2a267,6cb9b012a..3feb17ffa --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@@ -362,14 -350,13 +362,14 @@@ pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcq Debug = _config->FindB("Debug::pkgAcquire::Diffs",false); - Desc.Description = URIDesc + "/DiffIndex"; + RealURI = Target->URI; Desc.Owner = this; - Desc.ShortDesc = ShortDesc; - Desc.URI = URI + ".diff/Index"; + Desc.Description = Target->Description + "/DiffIndex"; + Desc.ShortDesc = Target->ShortDesc; + Desc.URI = Target->URI + ".diff/Index"; DestFile = _config->FindDir("Dir::State::lists") + "partial/"; - DestFile += URItoFileName(Target->URI) + string(".DiffIndex"); + DestFile += URItoFileName(Desc.URI); if(Debug) std::clog << "pkgAcqDiffIndex: " << Desc.URI << std::endl; @@@ -402,10 -389,10 +402,10 @@@ // AcqIndex::Custom600Headers - Insert custom request headers /*{{{*/ // --------------------------------------------------------------------- /* The only header we use is the last-modified header. */ -string pkgAcqDiffIndex::Custom600Headers() +string pkgAcqDiffIndex::Custom600Headers() const { string Final = _config->FindDir("Dir::State::lists"); - Final += URItoFileName(RealURI) + string(".IndexDiff"); + Final += URItoFileName(Desc.URI); if(Debug) std::clog << "Custom600Header-IMS: " << Final << std::endl; diff --cc debian/changelog index 52e4e7a3a,d940e853b..5b885ad6c --- a/debian/changelog +++ b/debian/changelog @@@ -1,73 -1,36 +1,106 @@@ +apt (1.1~exp2) experimental; urgency=medium + + [ Guillem Jover ] + * Add new Base256ToNum long long overload function + * Fix ar and tar code to be LFS-safe (Closes: #742882) + + [ Michael Vogt ] + * increase libapt-inst to version 1.6 + * Only allow "apt-get build-dep path" when path starts with ./ or / + * Allow passing a full path to apt-get install /foo/bar.deb (CLoses: #752327) + * merge changes from the 1.0.6 upload + + -- Michael Vogt Thu, 10 Jul 2014 13:18:08 +0200 + +apt (1.1~exp1) experimental; urgency=low + + [ David Kalnischkies ] + * [API Break] change "std::string pkgAcquire::Item::DescURI()" to + "std::string pkgAcquire::Item::DescURI() const" + * [ABI-Break] increase hashtable size for packages/groups by factor 5 + * [ABI-Break] cleanup datatypes mix used in binary cache + * [internal API-Break] remove the Section member from package struct + * use 'best' hash for source authentication (LP: 1098738) + * use HashStringList in the acquire system + * deal with hashes in ftparchive more dynamic as well + * reenable pipelining via hashsum reordering support + * parse and retrieve multiple Descriptions in one record + * improve pkgTagSection scanning and parsing + * invalid cache if architecture set doesn't match (Closes: 745036) + + [ Michael Vogt ] + * add support for "apt-get build-dep foo.dsc" + * add support for "apt-get build-dep unpacked-source-dir" + * add support for "apt-get install foo_1.0_all.deb" + * make "apt-get update" progress much more accurate by loading the + sizes of the targets into the fetcher early + * Implement simple by-hash for apt update to improve reliability of + the update. Apt will try to fetch the Packages file via + /by-hash/$hash_type/$hash_value if the repo supports that. + - add APT::Acquire::$(host)::By-Hash=1 knob + - add Acquire-By-Hash=1 to Release file + * add Debug::Acquire::Progress debug option + * [ABI-Break] lp:~mvo/apt/source-hashes: + - use sha{512,256,1} for deb-src when available LP: #1098738 + * [ABI-Break] stop exporting the accidently exported parsenetrc() symbol + * [ABI-Break] remove the PACKAGE_MATCHER_ABI_COMPAT defines + * [ABI BREAK] apt-pkg/pkgcache.h: + - adjust pkgCache::State::VerPriority enum, to match reality + * test/integration/test-debsrc-hashes: + - add integration test, thanks to Daniel Hartwig + * [ABI-Break] remove the PACKAGE_MATCHER_ABI_COMPAT defines + * [ABI-Break] Pass struct IndexTarget/indexRecords to + pkgAcqIndex{,Merge}Diffs + * [internal API-Break] rename pkgCache::Package::NextPackage to + pkgCache::Package::Next + * Calculate Percent as part of pkgAcquireStatus to provide a weighted + percent for both items and bytes + * apt-pkg/contrib/macros.h: bump library version to 4.13 + * apt-private/acqprogress.cc: do not show file size on IMSHit, it wasn't + fetched + * Fix warnings from clang -Wall/clang -fsanitize=address + * add DropPrivs() and drop privileges to nobody when running the + the buildin apt and dump solvers + * lp:~mvo/apt/webserver-simulate-broken-with-fix346386: + - fix invalid InRelease file download checking and add regression + test to server broken files to the buildin test webserver + - add regression test for LP: #34638 + + -- Michael Vogt Thu, 19 Jun 2014 12:01:48 +0200 + + apt (1.0.7) unstable; urgency=medium + + [ Michael Vogt ] + * add REAMDE.md + * StringToBool: only act if the entire string is consumed by strtol() + * Use @builddeps@ in the debian/tests/control file + * apt-pkg/acquire-item.cc: make pkgAcqDiffIndex more uniform + * Fix SmartConfigure to ignore ordering of packages that are already valid + * doc/apt.8.xml: fix typo, thanks to Jakub Wilk (Closes: #756056) + * doc/po/pt.po: updated, thanks to Américo Monteir (Closes: #756200) + + [ victory ] + * Update Japanese documentation translation (Closes: #754817) + + [ Trần Ngọc Quân ] + * l10n: vi.po (636t): Update one new string + + [ Julian Andres Klode ] + * Fix debListParser to accept "no" as a value for the Multi-Arch field + (Closes: #759099) + + [ Mert Dirik ] + * Turkish program translation update (Closes: 756710) + + [ Miroslav Kure ] + * Czech program translation update (Closes: 758208) + + [ David Kalnischkies ] + * add dpkg::source-options for dpkg-source invocation (Closes: 757534) + * support versioned provides as implemented by dpkg (Closes: 758153) + + -- Michael Vogt Wed, 27 Aug 2014 17:11:42 -0700 + apt (1.0.6) unstable; urgency=medium [ Chris Leick ] diff --cc test/integration/test-ubuntu-bug-346386-apt-get-update-paywall index 8e50843f3,a773660d2..f655ae2d8 --- a/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall +++ b/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall @@@ -16,13 -16,11 +16,12 @@@ setupaptarchiv changetowebserver -o 'aptwebserver::overwrite::.*::filename=/knights' msgtest 'Acquire test file from the webserver to check' 'overwrite' - echo '601 Configuration - Config-Item: Acquire::http::DependOnSTDIN=0 + if downloadfile http://localhost:8080/holygrail ./knights-talking >/dev/null; then + msgpass + else + msgfail + fi + - 600 Acquire URI - URI: http://localhost:8080/holygrail - Filename: knights-talking - ' | runapt ${METHODSDIR}/http >/dev/null 2>&1 && msgpass || msgfail testfileequal knights-talking 'ni ni ni' ensure_n_canary_strings_in_dir() {