diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-11-10 04:19:29 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-11-10 04:19:29 +0000 |
| commit | dce5db2944b46964b41776dec4e2239a06678dfc (patch) | |
| tree | 10fb6d64b05e8e3218cb8423fe5349436bcc8ced | |
| parent | 1d1b09d580e2de36f719cd9e1f6004b265b41cb9 (diff) | |
| parent | a3371852091e3590bd425f2674b56ae3d5ae2445 (diff) | |
* merged with debians apt
Patches applied:
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-88
* finalized changelog
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-89
* turn off "secure-acquire" when --allow-unauthenticated is given
| -rw-r--r-- | apt-pkg/acquire-item.cc | 6 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/changelog | 12 |
3 files changed, 17 insertions, 3 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index ef107444f..343293386 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -769,6 +769,12 @@ pkgAcqArchive::pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources, } } + // "allow-unauthenticated" restores apts old fetching behaviour + // that means that e.g. unauthenticated file:// uris are higher + // priority than authenticated http:// uris + if (_config->FindB("APT::Get::AllowUnauthenticated",false) == true) + Trusted = false; + // Select a source if (QueueNext() == false && _error->PendingError() == false) _error->Error(_("I wasn't able to locate file for the %s package. " diff --git a/configure.in b/configure.in index de9e6fa38..b08311e72 100644 --- a/configure.in +++ b/configure.in @@ -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.6.42.3") +AC_DEFINE_UNQUOTED(VERSION,"0.6.42.3ubuntu1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 14f565453..ccf6b8ead 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (0.6.42.3ubuntu1) dapper; urgency=low + + * synced with debian + + -- Michael Vogt <michael.vogt@ubuntu.com> 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: @@ -11,10 +17,12 @@ apt (0.6.42.3) unstable; urgency=low - patch-128: Danish translation update (closes: #337949) - patch-129: Basque translation update (closes: #338101) * cmdline/apt-get.cc: - - bufix in FindSrc (closes: #335213) + - bufix in FindSrc (closes: #335213, #337910) * added armeb to archtable (closes: #333599) + * with --allow-unauthenticated use the old fallback behaviour for + sources (closes: #335112) - -- + -- Michael Vogt <mvo@debian.org> Wed, 9 Nov 2005 07:22:31 +0100 apt (0.6.42.2) unstable; urgency=high |