diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-10-19 20:03:54 +0000 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-10-19 20:03:54 +0000 |
commit | f732cca1a45def35db5f88444b22c1485125bfde (patch) | |
tree | 946a54b3fe80924bd74ed6b5b0fc34f2d250911b /apt-pkg/contrib | |
parent | 66aafd44ba32466ed2d30939ba7371ea6155e191 (diff) | |
parent | 04f9a54dc9136f2d220a0180a750a9700a177de7 (diff) |
* merged with mainline
Patches applied:
* bubulle@debian.org--2005/apt--main--0--patch-105
Proofread by Fred Bothamy
* bubulle@debian.org--2005/apt--main--0--patch-106
Merge with mvo
* bubulle@debian.org--2005/apt--main--0--patch-107
Italian translation corrected
* bubulle@debian.org--2005/apt--main--0--patch-108
Italian translation update
* bubulle@debian.org--2005/apt--main--0--patch-109
Italian translation completed
* bubulle@debian.org--2005/apt--main--0--patch-110
Swedish translation update
* bubulle@debian.org--2005/apt--main--0--patch-111
Merge with Michael
* bubulle@debian.org--2005/apt--main--0--patch-112
Swedish translation completed
* bubulle@debian.org--2005/apt--main--0--patch-113
Silly update to French translation (testing)
* bubulle@debian.org--2005/apt--main--0--patch-114
Basque translation update
* bubulle@debian.org--2005/apt--main--0--patch-115
Basque translation completed
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62
* leak fix for debian #250583
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-63
* changelog update
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-64
* merged with bubulle
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-65
* inital support for "apt-get source -t dist" (but no downgrades yet
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-66
* full support for apt-get source -t now (and honor pining too)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-67
* added APT::Authentication::Trust-CDROM option
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-68
* fix a crash in apt-ftparchive
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-69
* sparc64 alignment fix
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-70
* fix segfault when there is no Archive for a VerFile
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-71
* don't get candidate release as version tag for FindSrc by default. because it break for bin-NMUs :/ (e.g. dpkg source is 1.13.11, but i386 version string is 1.13.11.0.1)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-72
* corrections in the changelog
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-73
* init the default ScreenWidth to 79 columns by default (Closes: #324921)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-74
apt-cdrom.cc:fix some missing gettext() calls (closes: #334539); doc/apt-cache.8.xml: fix typo (closes: #334714)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-75
* seting section to "admin" to match override file
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-76
* finalized the changelog
* michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-79
* michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-1
* implemented "TrustCDROM" mode
* michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-2
* added APT::Authentication::TrustCDROM to the configure-index
Diffstat (limited to 'apt-pkg/contrib')
-rw-r--r-- | apt-pkg/contrib/md5.h | 2 | ||||
-rw-r--r-- | apt-pkg/contrib/mmap.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h index 9e20f7cef..9447e9956 100644 --- a/apt-pkg/contrib/md5.h +++ b/apt-pkg/contrib/md5.h @@ -58,7 +58,7 @@ class MD5SumValue class MD5Summation { - unsigned char Buf[4*4]; + uint32_t Buf[4]; unsigned char Bytes[2*4]; unsigned char In[16*4]; bool Done; diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index bc22fba67..e395e6cc7 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -155,9 +155,9 @@ DynamicMMap::DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace) unsigned long EndOfFile = Fd->Size(); if (EndOfFile > WorkSpace) WorkSpace = EndOfFile; - else + else if(WorkSpace > 0) { - Fd->Seek(WorkSpace); + Fd->Seek(WorkSpace - 1); char C = 0; Fd->Write(&C,sizeof(C)); } |