Browse Source

merged from donkult

tags/debian/0.8.8
Michael Vogt 11 years ago
parent
commit
f71b3b984f
10 changed files with 237 additions and 68 deletions
  1. +12
    -6
      apt-pkg/contrib/fileutl.cc
  2. +1
    -0
      apt-pkg/contrib/fileutl.h
  3. +8
    -7
      apt-pkg/pkgcache.cc
  4. +14
    -0
      debian/changelog
  5. +1
    -1
      methods/bzip2.cc
  6. +1
    -1
      methods/gzip.cc
  7. +108
    -51
      test/integration/test-bug-595691-empty-and-broken-archive-files
  8. +91
    -0
      test/integration/test-bug-601016-description-translation
  9. +1
    -1
      test/libapt/run-tests
  10. +0
    -1
      test/versions.lst

+ 12
- 6
apt-pkg/contrib/fileutl.cc View File

@@ -910,18 +910,24 @@ unsigned long FileFd::Tell()
return Res;
}
/*}}}*/
// FileFd::Size - Return the size of the file /*{{{*/
// FileFd::FileSize - Return the size of the file /*{{{*/
// ---------------------------------------------------------------------
/* */
unsigned long FileFd::Size()
unsigned long FileFd::FileSize()
{
struct stat Buf;
unsigned long size;
off_t orig_pos;

if (fstat(iFd,&Buf) != 0)
return _error->Errno("fstat","Unable to determine the file size");
size = Buf.st_size;
return Buf.st_size;
}
/*}}}*/
// FileFd::Size - Return the size of the content in the file /*{{{*/
// ---------------------------------------------------------------------
/* */
unsigned long FileFd::Size()
{
unsigned long size = FileSize();

// only check gzsize if we are actually a gzip file, just checking for
// "gz" is not sufficient as uncompressed files will be opened with
@@ -931,7 +937,7 @@ unsigned long FileFd::Size()
/* unfortunately zlib.h doesn't provide a gzsize(), so we have to do
* this ourselves; the original (uncompressed) file size is the last 32
* bits of the file */
orig_pos = lseek(iFd, 0, SEEK_CUR);
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");
if (read(iFd, &size, 4) != 4)


+ 1
- 0
apt-pkg/contrib/fileutl.h View File

@@ -63,6 +63,7 @@ class FileFd
bool Truncate(unsigned long To);
unsigned long Tell();
unsigned long Size();
unsigned long FileSize();
bool Open(string FileName,OpenMode Mode,unsigned long Perms = 0666);
bool OpenDescriptor(int Fd, OpenMode Mode, bool AutoClose=false);
bool Close();


+ 8
- 7
apt-pkg/pkgcache.cc View File

@@ -891,18 +891,19 @@ pkgCache::DescIterator pkgCache::VerIterator::TranslatedDescription() const
for (std::vector<string>::const_iterator l = lang.begin();
l != lang.end(); l++)
{
pkgCache::DescIterator DescDefault = DescriptionList();
pkgCache::DescIterator Desc = DescDefault;

for (; Desc.end() == false; Desc++)
pkgCache::DescIterator Desc = DescriptionList();
for (; Desc.end() == false; ++Desc)
if (*l == Desc.LanguageCode() ||
(*l == "en" && strcmp(Desc.LanguageCode(),"") == 0))
break;
if (Desc.end() == true)
Desc = DescDefault;
if (Desc.end() == true)
continue;
return Desc;
}

for (pkgCache::DescIterator Desc = DescriptionList();
Desc.end() == false; ++Desc)
if (strcmp(Desc.LanguageCode(), "") == 0)
return Desc;
return DescriptionList();
};



+ 14
- 0
debian/changelog View File

@@ -1,3 +1,17 @@
apt (0.8.8) UNRELEASED; urgency=low

[ David Kalnischkies ]
* apt-pkg/contrib/fileutl.cc:
- Add a FileFd::FileSize() method to get the size of the underlying
file and not the size of the content in the file as FileFd::Size()
does - the sizes can differ since the direct gzip integration
* methods/{gzip,bzip2}.cc:
- use FileSize() to determine if the file is invalid (Closes: #600852)
* apt-pkg/pkgcache.cc:
- fallback always to a suitable description (Closes: #601016)

-- David Kalnischkies <kalnischkies@gmail.com> Tue, 26 Oct 2010 23:23:01 +0200

apt (0.8.7) unstable; urgency=low

[ Manpages translations ]


+ 1
- 1
methods/bzip2.cc View File

@@ -57,7 +57,7 @@ bool Bzip2Method::Fetch(FetchItem *Itm)
FileFd From(Path,FileFd::ReadOnly);

// FIXME add an error message saying that empty files can't be valid archives
if(From.Size() == 0)
if(From.FileSize() == 0)
return false;

int GzOut[2];


+ 1
- 1
methods/gzip.cc View File

@@ -49,7 +49,7 @@ bool GzipMethod::Fetch(FetchItem *Itm)
FileFd From(Path,FileFd::ReadOnlyGzip);

// FIXME add an error message saying that empty files can't be valid archives
if(From.Size() == 0)
if(From.FileSize() == 0)
return false;

FileFd To(Itm->DestFile,FileFd::WriteAtomic);


+ 108
- 51
test/integration/test-bug-595691-empty-and-broken-archive-files View File

@@ -10,6 +10,7 @@ buildaptarchive
setupflataptarchive

testaptgetupdate() {
rm -rf rootdir/var/lib/apt rootdir/var/cache/apt
aptget update 2>> testaptgetupdate.diff >> testaptgetupdate.diff || true
sed -i -e '/^Fetched / d' -e 's#\[[0-9]* [kMGTPY]*B\]#\[\]#' testaptgetupdate.diff
GIVEN="$1"
@@ -23,69 +24,125 @@ testaptgetupdate() {
rm testaptgetupdate.diff
}

touch aptarchive/en.bz2
createemptyarchive() {
find aptarchive/ \( -name "Packages*" -o -name "en*" \) -type f -delete
if [ "en" = "$1" ]; then
echo -n "" | $COMPRESSOR > aptarchive/Packages.$COMPRESS
fi
touch aptarchive/Packages
echo -n "" | $COMPRESSOR > aptarchive/${1}.$COMPRESS
aptftparchive release aptarchive/ > aptarchive/Release
signreleasefiles
rm -f aptarchive/Packages
}

testaptgetupdate "Ign file: Release.gpg
Ign file:$(readlink -f aptarchive)/ Translation-en
Get:1 file: Release []
Reading package lists..." "empty file en.bz2 over file"
createemptyfile() {
find aptarchive/ \( -name "Packages*" -o -name "en*" \) -type f -delete
if [ "en" = "$1" ]; then
echo -n "" | $COMPRESSOR > aptarchive/Packages.$COMPRESS
fi
touch aptarchive/Packages aptarchive/${1}.$COMPRESS
aptftparchive release aptarchive/ > aptarchive/Release
signreleasefiles
rm -f aptarchive/Packages
}

rm aptarchive/en.bz2
echo -n "" | bzip2 > aptarchive/en.bz2
setupcompressor() {
COMPRESSOR="$1"
case $COMPRESSOR in
gzip) COMPRESS="gz";;
bzip2) COMPRESS="bz2";;
lzma) COMPRESS="lzma";;
esac
echo "Acquire::CompressionTypes::Order { \"${COMPRESS}\"; };
Dir::Bin::gzip \"/does/not/exist\";
Dir::Bin::bzip2 \"/does/not/exist\";
Dir::Bin::lzma \"/does/not/exist\";" > rootdir/etc/apt/apt.conf.d/00compressor
if [ -e "/bin/${COMPRESSOR}" ]; then
echo "Dir::Bin::${COMPRESSOR} \"/bin/${COMPRESSOR}\";" >> rootdir/etc/apt/apt.conf.d/00compressor
elif [ -e "/usr/bin/${COMPRESSOR}" ]; then
echo "Dir::Bin::${COMPRESSOR} \"/usr/bin/${COMPRESSOR}\";" >> rootdir/etc/apt/apt.conf.d/00compressor
else
msgtest "Test for availability of compressor" "${COMPRESSOR}"
msgfail
exit 1
fi
}

testaptgetupdate "Ign file: Release.gpg
Get:1 file: Release []
Reading package lists..." "empty archive en.bz2 over file"
testoverfile() {
setupcompressor "$1"

rm aptarchive/en.bz2
createemptyfile 'en'
testaptgetupdate "Get:1 file: Release.gpg []
Get:2 file: Release []
Ign file:$(readlink -f aptarchive)/ Translation-en
Reading package lists..." "empty file en.$COMPRESS over file"

createemptyarchive 'en'
testaptgetupdate "Get:1 file: Release.gpg []
Get:2 file: Release []
Reading package lists..." "empty archive en.$COMPRESS over file"

createemptyarchive 'Packages'
# FIXME: Why omits the file transport the Packages Get line?
#Get:3 file: Packages []
testaptgetupdate "Ign file:$(readlink -f aptarchive)/ Translation-en
Get:1 file: Release.gpg []
Get:2 file: Release []
Reading package lists..." "empty archive Packages.$COMPRESS over file"

createemptyfile 'Packages'
testaptgetupdate "Ign file:$(readlink -f aptarchive)/ Translation-en
Get:1 file: Release.gpg []
Get:2 file: Release []
Err file: Packages
Undetermined Error
W: Failed to fetch file:$(readlink -f aptarchive/Packages.$COMPRESS) Undetermined Error

# do the same again with http instead of file
changetowebserver
E: Some index files failed to download, they have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over file"
}

touch aptarchive/en.bz2
testoverhttp() {
setupcompressor "$1"

testaptgetupdate "Ign http://localhost Release.gpg
Get:1 http://localhost/ Translation-en
Get:2 http://localhost Release []
createemptyfile 'en'
testaptgetupdate "Get:1 http://localhost Release.gpg []
Get:2 http://localhost/ Translation-en
Get:3 http://localhost Release []
Ign http://localhost/ Translation-en
Get:4 http://localhost Packages []
Reading package lists..." "empty file en.$COMPRESS over http"

createemptyarchive 'en'
testaptgetupdate "Get:1 http://localhost Release.gpg []
Get:2 http://localhost/ Translation-en []
Get:3 http://localhost Release []
Get:4 http://localhost Packages []
Reading package lists..." "empty archive en.$COMPRESS over http"

createemptyarchive 'Packages'
testaptgetupdate "Get:1 http://localhost Release.gpg []
Ign http://localhost/ Translation-en
Get:3 http://localhost Packages []
Reading package lists..." "empty file en.bz2 over http"

rm aptarchive/en.bz2
echo -n "" | bzip2 > aptarchive/en.bz2

testaptgetupdate "Ign http://localhost Release.gpg
Get:1 http://localhost/ Translation-en []
Get:2 http://localhost Release []
Ign http://localhost Packages/DiffIndex
Get:3 http://localhost Packages []
Reading package lists..." "empty archive en.bz2 over http"

rm aptarchive/en.bz2

rm aptarchive/Packages
touch aptarchive/Packages
buildaptarchivefromfiles

testaptgetupdate "Ign http://localhost Release.gpg
Ign http://localhost/ Translation-en
Get:1 http://localhost Release []
Ign http://localhost Packages/DiffIndex
Get:2 http://localhost Packages []
Reading package lists..." "empty archive Packages over http"

find aptarchive/ -name 'Packages*' -type f -delete
touch aptarchive/Packages.bz2
aptftparchive release aptarchive/ > aptarchive/Release
Reading package lists..." "empty archive Packages.$COMPRESS over http"

#FIXME: we should response with a good error message instead
testaptgetupdate "Ign http://localhost Release.gpg
createemptyfile 'Packages'
#FIXME: we should response with a good error message instead
testaptgetupdate "Get:1 http://localhost Release.gpg []
Ign http://localhost/ Translation-en
Get:1 http://localhost Release []
Ign http://localhost Packages/DiffIndex
Get:2 http://localhost Packages
Get:2 http://localhost Release []
Get:3 http://localhost Packages
Err http://localhost Packages
Undetermined Error
W: Failed to fetch http://localhost:8080/Packages.bz2 Undetermined Error
W: Failed to fetch http://localhost:8080/Packages.$COMPRESS Undetermined Error

E: Some index files failed to download, they have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over http"
}

for COMPRESSOR in 'gzip' 'bzip2' 'lzma'; do testoverfile $COMPRESSOR; done

# do the same again with http instead of file
changetowebserver

E: Some index files failed to download, they have been ignored, or old ones used instead." "empty file Packages over http"
for COMPRESSOR in 'gzip' 'bzip2' 'lzma'; do testoverhttp $COMPRESSOR; done

+ 91
- 0
test/integration/test-bug-601016-description-translation View File

@@ -0,0 +1,91 @@
#!/bin/sh
set -e

TESTDIR=$(readlink -f $(dirname $0))
. $TESTDIR/framework
setupenvironment
configarchitecture "i386"

# we need a valid locale here, otherwise the language configuration
# will be overridden by LC_ALL=C
LOCALE="$(echo "$LANG" | cut -d'_' -f 1)"

PACKAGESTANZA="Package: apt
Priority: important
Section: admin
Installed-Size: 5984
Maintainer: APT Development Team <deity@lists.debian.org>
Architecture: i386
Version: 0.8.7
Filename: pool/main/a/apt/apt_0.8.7_i386.deb
Size: 2140230
MD5sum: 74769bfbcef9ebc4fa74f7a5271b9c08
Description-md5: d41ee493aa9fcc6cbc9ce4eb7069959c"


echo "$PACKAGESTANZA
Description: Advanced front-end for dpkg" > aptarchive/Packages

echo "Package: apt
Description-md5: d41ee493aa9fcc6cbc9ce4eb7069959c
Description-${LOCALE}: Mächtige Oberfläche für dpkg
Das Paket bietet dem Nutzer technisch führende Methoden für den Zugriff
auf den dpkg-Paketmanager. Es beinhaltet das apt-get-Werkzeug und die
APT-Dselect-Methode. Beides sind einfache und sicherere Wege,
um Pakete zu installieren und Upgrades durchzuführen." | bzip2 > aptarchive/${LOCALE}.bz2

# the $LOCALE translation file will not be included as it is a flat archive it came from and therefore
# its name can not be guessed correctly… (in non-flat archives the files are called Translation-*)
echo 'APT::Cache::Generate "false";' > rootdir/etc/apt/apt.conf.d/00nogenerate

NOLONGSTANZA="$PACKAGESTANZA
Description: Advanced front-end for dpkg
"

ENGLISHSTANZA="$PACKAGESTANZA
Description: Advanced front-end for dpkg
"

LOCALESTANZA="$PACKAGESTANZA
Description-${LOCALE}: Mächtige Oberfläche für dpkg
Das Paket bietet dem Nutzer technisch führende Methoden für den Zugriff
auf den dpkg-Paketmanager. Es beinhaltet das apt-get-Werkzeug und die
APT-Dselect-Methode. Beides sind einfache und sicherere Wege,
um Pakete zu installieren und Upgrades durchzuführen.
"

testrun() {
echo "Acquire::Languages { \"${LOCALE}\"; \"en\"; };" > rootdir/etc/apt/apt.conf.d/00languages
export LC_ALL=""
setupaptarchive
testequal "$LOCALESTANZA" aptcache show apt -o Test=File-${LOCALE}
testequal "$NOLONGSTANZA" aptcache show apt -o Acquire::Languages="ww" -o Test=File-${LOCALE}
testequal "$LOCALESTANZA" aptcache show apt -o Acquire::Languages::="ww" -o Test=File-${LOCALE}
LC_ALL=C testequal "$ENGLISHSTANZA" aptcache show apt -o Test=File-${LOCALE}
export LC_ALL=""
echo "Acquire::Languages { \"ww\"; \"${LOCALE}\"; \"en\"; };" > rootdir/etc/apt/apt.conf.d/00languages
testequal "$LOCALESTANZA" aptcache show apt -o Test=File-ww-${LOCALE}
echo "Acquire::Languages { \"ww\"; \"en\"; };" > rootdir/etc/apt/apt.conf.d/00languages
testequal "$ENGLISHSTANZA" aptcache show apt -o Test=File-ww
}

testrun

echo "$PACKAGESTANZA
Description: Advanced front-end for dpkg" > aptarchive/Packages

echo "Package: apt
Description-md5: d41ee493aa9fcc6cbc9ce4eb7069959c
Description-en: Advanced front-end for dpkg
This is Debian's next generation front-end for the dpkg package manager.
It provides the apt-get utility and APT dselect method that provides a
simpler, safer way to install and upgrade packages." | bzip2 > aptarchive/en.bz2

ENGLISHSTANZA="$PACKAGESTANZA
Description-en: Advanced front-end for dpkg
This is Debian's next generation front-end for the dpkg package manager.
It provides the apt-get utility and APT dselect method that provides a
simpler, safer way to install and upgrade packages.
"

testrun

+ 1
- 1
test/libapt/run-tests View File

@@ -4,7 +4,7 @@ set -e
local DIR=$(readlink -f $(dirname $0))
echo "Compiling the tests …"
test -d "$DIR/../../build/obj/test/libapt/" || mkdir -p "$DIR/../../build/obj/test/libapt/"
$(cd $DIR && make)
(cd $DIR && make)
echo "Running all testcases …"
LDPATH="$DIR/../../build/bin"
EXT="_libapt_test"


+ 0
- 1
test/versions.lst View File

@@ -104,4 +104,3 @@ III-alpha9.8 III-alpha9.8-1.5 -1
1.4+OOo3.0.0~ 1.4+OOo3.0.0-4 -1 # another tilde check
2.4.7-1 2.4.7-z -1 # revision comparing
1.002-1+b2 1.00 1 # whatever...
2.2.4-47978_Debian_lenny 2.2.4-47978_Debian_lenny 0 # and underscore...

Loading…
Cancel
Save