From d5f38102698899c4d3693583247a71f54ea1b278 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 24 Oct 2005 08:28:53 +0000 Subject: * cmdline/apt-get.cc: fix bug in FindSrc() (debian #335213) --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 567dc803e..a7ea0c954 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ apt (0.6.42.2) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-118: - patch-118: Russian translation update by Yuri Kozlov (closes: #335164) + * cmdline/apt-get.cc: + - bufix in FindSrc (closes: #335213) -- -- cgit v1.2.3-70-g09d2 From c5198dc1d0edeb3999741f00a25ec946cd66d6b9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 25 Oct 2005 09:23:47 +0000 Subject: * added armeb to archtable --- buildlib/archtable | 1 + buildlib/sizetable | 1 + debian/changelog | 1 + 3 files changed, 3 insertions(+) (limited to 'debian') diff --git a/buildlib/archtable b/buildlib/archtable index b01743c02..af1123d02 100644 --- a/buildlib/archtable +++ b/buildlib/archtable @@ -11,6 +11,7 @@ sparc sparc sparc64 sparc alpha.* alpha m68k m68k +armeb.* armeb arm.* arm powerpc powerpc ppc powerpc diff --git a/buildlib/sizetable b/buildlib/sizetable index 911180145..51a136d4a 100644 --- a/buildlib/sizetable +++ b/buildlib/sizetable @@ -12,6 +12,7 @@ # CPU endian sizeof: char, int, short, long i386 little 1 4 2 4 arm little 1 4 2 4 +armeb big 1 4 2 4 alpha little 1 4 2 8 mipsel little 1 4 2 4 sparc big 1 4 2 4 diff --git a/debian/changelog b/debian/changelog index a7ea0c954..a4e403030 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ apt (0.6.42.2) unstable; urgency=low - patch-118: Russian translation update by Yuri Kozlov (closes: #335164) * cmdline/apt-get.cc: - bufix in FindSrc (closes: #335213) + * added armeb to archtable (closes: #333599) -- -- cgit v1.2.3-70-g09d2 From 670c56e521e3f59be7722f1243399d8289e14626 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 8 Nov 2005 16:19:07 +0000 Subject: * merged the NMU from Franz Pop, fixed armeb problem (#333599) --- buildlib/archtable | 2 +- buildlib/sizetable | 1 + configure.in | 2 +- debian/changelog | 11 ++++++++++- share/debian-archive.gpg | Bin 1303 -> 2717 bytes 5 files changed, 13 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/buildlib/archtable b/buildlib/archtable index af1123d02..197529202 100644 --- a/buildlib/archtable +++ b/buildlib/archtable @@ -11,7 +11,7 @@ sparc sparc sparc64 sparc alpha.* alpha m68k m68k -armeb.* armeb +arm.*b armeb arm.* arm powerpc powerpc ppc powerpc diff --git a/buildlib/sizetable b/buildlib/sizetable index 51a136d4a..cf6a3ae2d 100644 --- a/buildlib/sizetable +++ b/buildlib/sizetable @@ -11,6 +11,7 @@ # The format is:- # CPU endian sizeof: char, int, short, long i386 little 1 4 2 4 +armeb big 1 4 2 4 arm little 1 4 2 4 armeb big 1 4 2 4 alpha little 1 4 2 8 diff --git a/configure.in b/configure.in index 758727f2f..cae1ffe6a 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.1") +AC_DEFINE_UNQUOTED(VERSION,"0.6.42.2") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index a8c9e398b..acacb8f23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.6.42.2) unstable; urgency=low +apt (0.6.42.3) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-129: - patch-118: Russian translation update by Yuri Kozlov (closes: #335164) @@ -16,6 +16,15 @@ apt (0.6.42.2) unstable; urgency=low -- +apt (0.6.42.2) unstable; urgency=high + + * NMU (approved by maintainer) + * Add AMD64 archive signing key to debian-archive.gpg (closes: #336500). + * Add big-endian arm (armeb) support (closes: #333599). + * 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 diff --git a/share/debian-archive.gpg b/share/debian-archive.gpg index c391d8fa1..bb5ed5033 100644 Binary files a/share/debian-archive.gpg and b/share/debian-archive.gpg differ -- cgit v1.2.3-70-g09d2 From 025b8a36fa50680dd1549426c5906363ddaebd02 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 9 Nov 2005 04:52:57 +0000 Subject: * finalized changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index acacb8f23..0b0343d9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,7 +14,7 @@ apt (0.6.42.3) unstable; urgency=low - bufix in FindSrc (closes: #335213) * added armeb to archtable (closes: #333599) - -- + -- Michael Vogt Wed, 9 Nov 2005 05:52:31 +0100 apt (0.6.42.2) unstable; urgency=high -- cgit v1.2.3-70-g09d2 From a3371852091e3590bd425f2674b56ae3d5ae2445 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 9 Nov 2005 19:46:44 +0000 Subject: * turn off "secure-acquire" when --allow-unauthenticated is given --- apt-pkg/acquire-item.cc | 6 ++++++ debian/changelog | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index dea68f3ee..debd1face 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -770,6 +770,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/debian/changelog b/debian/changelog index 0b0343d9c..9e9b46ab9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,10 +11,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 Wed, 9 Nov 2005 05:52:31 +0100 + -- Michael Vogt Wed, 9 Nov 2005 07:22:31 +0100 apt (0.6.42.2) unstable; urgency=high -- cgit v1.2.3-70-g09d2