diff options
author | Michael Vogt <mvo@debian.org> | 2013-07-02 08:32:34 +0200 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2013-07-02 08:32:34 +0200 |
commit | 8e4c3f0a42664b8c37cc2e0de285849fbf118e11 (patch) | |
tree | 059b76fef1c1636a7e1ad16e5a4ce06304271718 /test/integration/test-cve-2013-1051-InRelease-parsing | |
parent | 25a4d2049fb79bc2c86cd45e977b4a071e5300ac (diff) | |
parent | e3c62328abbd548bb0da42fdbad954b3ce4f7102 (diff) |
Merge remote-tracking branch 'donkult/debian/sid' into debian/sid
Conflicts:
debian/changelog
Diffstat (limited to 'test/integration/test-cve-2013-1051-InRelease-parsing')
-rwxr-xr-x | test/integration/test-cve-2013-1051-InRelease-parsing | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/integration/test-cve-2013-1051-InRelease-parsing b/test/integration/test-cve-2013-1051-InRelease-parsing index bd68fccf6..6764fefff 100755 --- a/test/integration/test-cve-2013-1051-InRelease-parsing +++ b/test/integration/test-cve-2013-1051-InRelease-parsing @@ -12,7 +12,7 @@ insertpackage 'stable' 'good-pkg' 'all' '1.0' setupaptarchive changetowebserver -ARCHIVE='http://localhost/' +ARCHIVE='http://localhost:8080/' msgtest 'Initial apt-get update should work with' 'InRelease' aptget update -qq && msgpass || msgfail @@ -37,7 +37,7 @@ sed -i '/^-----BEGIN PGP SIGNATURE-----/,/^-----END PGP SIGNATURE-----/ s/^$/ / # we append the (evil unsigned) Release file to the (good signed) InRelease cat aptarchive/dists/stable/Release >> aptarchive/dists/stable/InRelease - +touch -d '+1hour' aptarchive/dists/stable/InRelease # ensure the update fails # useful for debugging to add "-o Debug::pkgAcquire::auth=true" |