From 55971004215609a02ca19c59bd058da20729ba11 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 14 Mar 2013 14:26:43 +0100 Subject: * SECURITY UPDATE: InRelease verification bypass - CVE-2013-1051 * apt-pkg/deb/debmetaindex.cc, test/integration/test-bug-595691-empty-and-broken-archive-files, test/integration/test-releasefile-verification: - disable InRelease downloading until the verification issue is fixed, thanks to Ansgar Burchardt for finding the flaw --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 762d2818e..50b3599fc 100644 --- a/debian/control +++ b/debian/control @@ -12,8 +12,8 @@ Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, po4a (>= 0.34-2), autotools-dev, autoconf, automake Build-Depends-Indep: doxygen, debiandoc-sgml Build-Conflicts: autoconf2.13, automake1.4 -Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ -Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/ +Vcs-Bzr: http://bzr.debian.org/apt/debian-wheezy/ +Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-wheezy/ Package: apt Architecture: any -- cgit v1.2.3-70-g09d2 From 2f8f21c3d494328f0b4a544998fc6118b25b56c3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 25 Mar 2013 08:56:42 +0100 Subject: merge patches from daniel to fix merge artifact and test failure --- debian/changelog | 4 ++++ debian/control | 4 ++-- po/ca.po | 10 ++++++++++ po/cs.po | 10 ++++++++++ po/ru.po | 10 ++++++++++ test/integration/test-apt-get-download | 2 +- 6 files changed, 37 insertions(+), 3 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index fbc6009a1..558b657ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,10 @@ apt (0.9.7.9~exp2) UNRELEASED; urgency=low * cmdline/apt-get.cc: - do not have space between "-a" and option when cross building (closes: #703792) + * test/integration/test-apt-get-download: + - fix test now that #1098752 is fixed + * po/{ca,cs,ru}.po: + - fix merge artifact -- Christian Perrier Sun, 24 Mar 2013 08:57:45 +0100 diff --git a/debian/control b/debian/control index 50b3599fc..762d2818e 100644 --- a/debian/control +++ b/debian/control @@ -12,8 +12,8 @@ Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, po4a (>= 0.34-2), autotools-dev, autoconf, automake Build-Depends-Indep: doxygen, debiandoc-sgml Build-Conflicts: autoconf2.13, automake1.4 -Vcs-Bzr: http://bzr.debian.org/apt/debian-wheezy/ -Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-wheezy/ +Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ +Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/ Package: apt Architecture: any diff --git a/po/ca.po b/po/ca.po index 41488ba3c..0f3570949 100644 --- a/po/ca.po +++ b/po/ca.po @@ -2438,6 +2438,16 @@ msgstr "" msgid "%c%s... %u%%" msgstr "%c%s… Fet" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "…" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, c-format +msgid "%c%s... %u%%" +msgstr "%c%s… %u%%" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." diff --git a/po/cs.po b/po/cs.po index cb260c621..6e9543939 100644 --- a/po/cs.po +++ b/po/cs.po @@ -2416,6 +2416,16 @@ msgstr "" msgid "%c%s... %u%%" msgstr "%c%s… Hotovo" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "…" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, c-format +msgid "%c%s... %u%%" +msgstr "%c%s… %u%%" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." diff --git a/po/ru.po b/po/ru.po index 2a72ee3c1..703a83a7c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2474,6 +2474,16 @@ msgstr "" msgid "%c%s... %u%%" msgstr "%c%s… Готово" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "…" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, c-format +msgid "%c%s... %u%%" +msgstr "%c%s… %u%%" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." diff --git a/test/integration/test-apt-get-download b/test/integration/test-apt-get-download index b164f7dba..420b2e380 100755 --- a/test/integration/test-apt-get-download +++ b/test/integration/test-apt-get-download @@ -26,7 +26,7 @@ testdownload apt_1.0_all.deb apt stable testdownload apt_2.0_all.deb apt DEBFILE="$(readlink -f aptarchive)/pool/apt_2.0_all.deb" -testequal "'file://${DEBFILE}' apt_2.0_all.deb $(stat -c%s $DEBFILE) sha256:$(sha256sum $DEBFILE | cut -d' ' -f 1)" aptget download apt --print-uris +testequal "'file://${DEBFILE}' apt_2.0_all.deb $(stat -c%s $DEBFILE) sha512:$(sha512sum $DEBFILE | cut -d' ' -f 1)" aptget download apt --print-uris # deb:677887 testequal "E: Can't find a source to download version '1.0' of 'vrms:i386'" aptget download vrms -- cgit v1.2.3-70-g09d2 From b57220d815aedbc023847d0885e08c6ed50e629a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 8 Apr 2013 08:41:51 +0200 Subject: * debian/control: - replace manpages-it (closes: #704723) --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 5701cfeb0..87fe0bb04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ apt (0.9.7.9~exp3) UNRELEASED; urgency=low * apt-pkg/sourcelist.cc: - fix segfault when a hostname contains a [, thanks to Tzafrir Cohen (closes: #704653) + * debian/control: + - replace manpages-it (closes: #704723) -- Michael Vogt Thu, 04 Apr 2013 18:21:06 +0200 diff --git a/debian/control b/debian/control index 762d2818e..49647340a 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/ Package: apt Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, debian-archive-keyring, gnupg -Replaces: manpages-pl (<< 20060617-3~) +Replaces: manpages-pl (<< 20060617-3~), manpages-it Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, xz-utils, python-apt Description: commandline package manager -- cgit v1.2.3-70-g09d2