Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: pu We would like to update APT to a new version. The diff is attached. As the BTS is overloaded, I am sending it directly to the mailing list. (Don't drop the CC) -- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (500, 'unstable'), (250, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.38-2-amd64 (SMP w/4 CPU cores) Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -- Julian Andres Klode - Debian Developer, Ubuntu Member See http://wiki.debian.org/JulianAndresKlode and http://jak-linux.org/.
=== modified file 'apt-pkg/acquire-item.cc'
--- apt-pkg/acquire-item.cc 2010-09-09 20:23:31 +0000
+++ apt-pkg/acquire-item.cc 2011-04-11 13:04:42 +0000
@@ -861,8 +861,8 @@ string pkgAcqIndexTrans::Custom600Header
struct stat Buf;
if (stat(Final.c_str(),&Buf) != 0)
- return "\nFail-Ignore: true";
- return "\nFail-Ignore: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
+ return "\nFail-Ignore: true\nIndex-File: true";
+ return "\nFail-Ignore: true\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
}
/*}}}*/
// AcqIndexTrans::Failed - Silence failure messages for missing files /*{{{*/
=== modified file 'apt-pkg/contrib/fileutl.cc'
--- apt-pkg/contrib/fileutl.cc 2010-10-21 14:54:28 +0000
+++ apt-pkg/contrib/fileutl.cc 2011-04-11 13:04:42 +0000
@@ -42,6 +42,11 @@
#include <errno.h>
#include <set>
#include <algorithm>
+
+#include <config.h>
+#ifdef WORDS_BIGENDIAN
+#include <inttypes.h>
+#endif
/*}}}*/
using namespace std;
@@ -940,9 +945,16 @@ unsigned long FileFd::Size()
off_t orig_pos = lseek(iFd, 0, SEEK_CUR);
if (lseek(iFd, -4, SEEK_END) < 0)
return _error->Errno("lseek","Unable to seek to end of gzipped file");
+ size = 0L;
if (read(iFd, &size, 4) != 4)
return _error->Errno("read","Unable to read original size of gzipped file");
- size &= 0xFFFFFFFF;
+
+#ifdef WORDS_BIGENDIAN
+ uint32_t tmp_size = size;
+ uint8_t const * const p = (uint8_t const * const) &tmp_size;
+ tmp_size = (p[3] << 24) | (p[2] << 16) | (p[1] << 8) | p[0];
+ size = tmp_size;
+#endif
if (lseek(iFd, orig_pos, SEEK_SET) < 0)
return _error->Errno("lseek","Unable to seek in gzipped file");
=== modified file 'debian/changelog'
--- debian/changelog 2011-01-25 10:52:07 +0000
+++ debian/changelog 2011-04-11 13:04:42 +0000
@@ -1,3 +1,24 @@
+apt (0.8.10.3+squeeze1) UNRELEASED; urgency=low
+
+ [ Michael Vogt ]
+ * debian/control:
+ - make Vcs-Bzr point to http://bzr.debian.org/apt/apt/debian-squeeze
+ branch
+ * apt-pkg/acquire-item.cc:
+ - mark pkgAcqIndexTrans as Index-File to avoid asking the
+ user to insert the CD on each apt-get update, closes: #614300
+
+ [ Christian Perrier ]
+ * Fix error in French translation of manpages (apt_preferences(5)).
+ Merci, Rémi Vanicat. Closes: #613689
+
+ [ David Kalnischkies ]
+ * apt-pkg/contrib/fileutl.cc:
+ - reorder the loaded filesize bytes for big endian (Closes: #612986)
+ Thanks to Jörg Sommer for the detailed analyse!
+
+ -- David Kalnischkies <kalnischkies@gmail.com> Tue, 22 Feb 2011 11:25:58 +0100
+
apt (0.8.10.3) unstable; urgency=low
[ Programs translations ]
=== modified file 'debian/control'
--- debian/control 2010-09-17 07:55:12 +0000
+++ debian/control 2011-04-11 13:04:42 +0000
@@ -8,7 +8,7 @@ Uploaders: Michael Vogt <mvo@debian.org>
Standards-Version: 3.9.0
Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen
Build-Conflicts: autoconf2.13, automake1.4
-Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
+Vcs-Bzr: http://bzr.debian.org/apt/apt/debian-squeeze/
Package: apt
Architecture: any
=== modified file 'doc/po/fr.po'
--- doc/po/fr.po 2010-12-15 20:31:08 +0000
+++ doc/po/fr.po 2011-04-11 13:04:42 +0000
@@ -8809,7 +8809,7 @@ msgstr ""
"\n"
"Explanation: Debian unstable porte toujours le nom sid\n"
"Package: *\n"
-"Pin: release a=sid\n"
+"Pin: release n=sid\n"
"Pin-Priority: 800\n"
"\n"
"Package: *\n"
Attachment:
pgpUAUQ1JNVkf.pgp
Description: PGP signature