From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 22 Mar 2013 20:49:22 +0000 (+0100)
Subject: merged the debian-wheezy branch
X-Git-Tag: 0.9.8~31
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/6b1e33b5447e50af6bac0b2d260b167b28e3e1fd

merged the debian-wheezy branch
---

6b1e33b5447e50af6bac0b2d260b167b28e3e1fd
diff --cc debian/changelog
index 4c830afe9,9ed9b4d61..1ba066a3b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,80 -1,17 +1,94 @@@
+ apt (0.9.7.8) unstable; urgency=criticial
+ 
+   * SECURITY UPDATE: InRelease verification bypass
+     - CVE-2013-1051
+   
+   [ David Kalnischk ]
+   * 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
+ 
+  -- Michael Vogt <mvo@debian.org>  Thu, 14 Mar 2013 07:47:36 +0100
+ 
 +apt (0.9.7.8~exp3) UNRELEASEDexperimental; urgency=low
 +
 +  [ Niels Thykier ]
 +  * test/libapt/assert.h, test/libapt/run-tests:
 +    - exit with status 1 on test failure
 +  
 +  [ Daniel Hartwig ]
 +  * test/integration/framework:
 +    - continue after test failure but preserve exit status
 +
 +  [ Programs translation updates ]
 +  * Turkish (Mert Dirik). Closes: #703526
 +
 +  [ Colin Watson ]
 +  * methods/connect.cc:
 +    - provide useful error message in case of EAI_SYSTEM
 +      (closes: #703603)
 +  
 +  [ Michael Vogt ]
 +  * add new config options "Acquire::ForceIPv4" and 
 +    "Acquire::ForceIPv6" to allow focing one or the other
 +    (closes: #611891)
 +
 + -- Michael Vogt <mvo@debian.org>  Sun, 17 Mar 2013 19:46:23 +0100
 +
 +apt (0.9.7.8~exp2) experimental; urgency=low
 +
 +  * include two missing patches to really fix bug #696225, thanks to
 +    Guillem Jover 
 +  * ensure sha512 is really used when available, thanks to Tyler Hicks
 +   (LP: #1098752)
 +
 + -- Michael Vogt <mvo@debian.org>  Fri, 01 Mar 2013 19:06:55 +0100
 +
 +apt (0.9.7.8~exp1) experimental; urgency=low
 +
 +  [ Manpages translation updates ]
 +  * Italian (Beatrice Torracca). Closes: #696601
 +  
 +  [ Programs translation updates ]
 +  * Japanese (Kenshi Muto). Closes: #699783
 +  
 +  [ Michael Vogt ]
 +  * fix pkgProblemResolver::Scores, thanks to Paul Wise. 
 +    Closes: #697577
 +  * fix missing translated apt.8 manpages, thanks to Helge Kreutzmann
 +    for the report. Closes: #696923
 +  * apt-pkg/contrib/progress.cc:
 +    - Make "..." translatable to fix inconsistencies in the output
 +      of e.g. apt-get update. While this adds new translatable strings,
 +      not having translations for them will not break anything.
 +      Thanks to Guillem Jover. Closes: #696225
 +  * debian/apt.cron.daily:
 +    - when reading from /dev/urandom, use less entropy and fix a rare
 +      bug when the random number chksum is less than 1000.
 +      Closes: #695285
 +  * methods/https.cc:
 +    - reuse connection in https, thanks to Thomas Bushnell, BSG for the
 +      patch. LP: #1087543, Closes: #695359
 +    - add missing curl_easy_cleanup()
 +  * methods/http.cc:
 +    - quote spaces in filenames to ensure as the http method is also
 +      (potentially) used for non deb,dsc content that may contain
 +      spaces, thanks to Daniel Hartwig and Thomas Bushnell 
 +      (LP: #1086997)
 +    - quote plus in filenames to work around a bug in the S3 server
 +      (LP: #1003633)
 +  * apt-pkg/indexrecords.cc:
 +    - support '\r' in the Release file
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/depcache.cc:
 +    - prefer to install packages which have an already installed M-A:same
 +      sibling while choosing providers (LP: #1130419)
 +
 + -- Michael Vogt <mvo@debian.org>  Fri, 01 Mar 2013 14:16:42 +0100
 +
  apt (0.9.7.7) unstable; urgency=low
  
    [ Program translation updates ]
diff --cc po/ca.po
index 61d231277,8eaa638a7..e582886b0
--- a/po/ca.po
+++ b/po/ca.po
@@@ -822,9 -827,11 +825,11 @@@ msgstr "S'ha marcat %s com instaŀlat a
  msgid ""
  "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
  "instead."
- msgstr "Aquesta ordre és desaconsellada. Empreu «apt-mark auto» i «apt-mark manual» en el seu lloc."
+ msgstr ""
+ "Aquesta ordre és desaconsellada. Empreu «apt-mark auto» i «apt-mark manual» "
+ "en el seu lloc."
  
 -#: cmdline/apt-get.cc:2185
 +#: cmdline/apt-get.cc:2183
  msgid "Calculating upgrade... "
  msgstr "S'està calculant l'actualització… "
  
@@@ -883,9 -890,10 +888,10 @@@ msgid "
  msgstr ""
  "Empreu:\n"
  "bzr branch %s\n"
- "per obtenir les últimes actualitzacions (possiblement no publicades) del paquet.\n"
+ "per obtenir les últimes actualitzacions (possiblement no publicades) del "
+ "paquet.\n"
  
 -#: cmdline/apt-get.cc:2568
 +#: cmdline/apt-get.cc:2566
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr "S'està ometent el fitxer ja baixat «%s»\n"
@@@ -954,9 -962,11 +960,11 @@@ msgstr "
  msgid ""
  "No architecture information available for %s. See apt.conf(5) APT::"
  "Architectures for setup"
- msgstr "No hi ha informació d'arquitectura disponible per a %s. Vegeu apt.conf(5) APT::Architectures per a configurar-ho"
+ msgstr ""
+ "No hi ha informació d'arquitectura disponible per a %s. Vegeu apt.conf(5) "
+ "APT::Architectures per a configurar-ho"
  
 -#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
 +#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr ""
@@@ -972,16 -982,20 +980,20 @@@ msgstr "%s no té dependències de cons
  msgid ""
  "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
  "packages"
- msgstr "La dependència %s en %s no es pot satisfer perquè %s no és permès als paquets «%s»"
+ msgstr ""
+ "La dependència %s en %s no es pot satisfer perquè %s no és permès als "
+ "paquets «%s»"
  
 -#: cmdline/apt-get.cc:3028
 +#: cmdline/apt-get.cc:3026
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
  "found"
- msgstr "La dependència %s en %s no es pot satisfer perquè no es pot trobar el paquet %s"
+ msgstr ""
+ "La dependència %s en %s no es pot satisfer perquè no es pot trobar el paquet "
+ "%s"
  
 -#: cmdline/apt-get.cc:3051
 +#: cmdline/apt-get.cc:3049
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
@@@ -993,16 -1007,20 +1005,20 @@@
  msgid ""
  "%s dependency for %s cannot be satisfied because candidate version of "
  "package %s can't satisfy version requirements"
- msgstr "La dependència %s per a %s no es pot satisfer perquè la versió candidata del paquet %s no pot satisfer els requeriments de versions"
+ msgstr ""
+ "La dependència %s per a %s no es pot satisfer perquè la versió candidata del "
+ "paquet %s no pot satisfer els requeriments de versions"
  
 -#: cmdline/apt-get.cc:3096
 +#: cmdline/apt-get.cc:3094
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because package %s has no candidate "
  "version"
- msgstr "La dependència %s en %s no es pot satisfer perquè el paquet %s no té versió candidata"
+ msgstr ""
+ "La dependència %s en %s no es pot satisfer perquè el paquet %s no té versió "
+ "candidata"
  
 -#: cmdline/apt-get.cc:3119
 +#: cmdline/apt-get.cc:3117
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s"
@@@ -2782,10 -2792,10 +2790,10 @@@ msgid "
  "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
  "under APT::Immediate-Configure for details. (%d)"
  msgstr ""
- "No s'ha pogut realitzar la configuració immediata de «%s». Vegeu man 5 "
- "apt.conf, sota APT::Immediate-Configure per a més detalls. (%d)"
+ "No s'ha pogut realitzar la configuració immediata de «%s». Vegeu man 5 apt."
+ "conf, sota APT::Immediate-Configure per a més detalls. (%d)"
  
 -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
  #, c-format
  msgid "Could not configure '%s'. "
  msgstr "No s'ha pogut configurar «%s»."
diff --cc po/ja.po
index 9fe66d972,48ee00f58..fb455abcc
--- a/po/ja.po
+++ b/po/ja.po
@@@ -8,8 -8,8 +8,8 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.9.7.1\n"
  "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 -"POT-Creation-Date: 2013-03-14 08:05+0100\n"
 +"POT-Creation-Date: 2012-10-15 09:49+0200\n"
- "PO-Revision-Date: 2013-02-05 09:41+0900\n"
+ "PO-Revision-Date: 2012-07-01 00:14+0900\n"
  "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
  "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
  "Language: ja\n"
@@@ -677,11 -679,11 +677,11 @@@ msgstr[0] "
  "以下のパッケージは、全ファイルが別のパッケージで上書きされたため、\n"
  "システムから消えました:"
  
 -#: cmdline/apt-get.cc:1423
 +#: cmdline/apt-get.cc:1421
  msgid "Note: This is done automatically and on purpose by dpkg."
- msgstr "注意: これは dpkg により自動でわざと行われます。"
+ msgstr "注意: これは dpkg により自動でわざと行われれます。"
  
 -#: cmdline/apt-get.cc:1561
 +#: cmdline/apt-get.cc:1559
  #, c-format
  msgid "Ignore unavailable target release '%s' of package '%s'"
  msgstr "パッケージ '%2$s' の利用できないターゲットリリース '%1$s' を無視"