From: David Kalnischkies <kalnischkies@gmail.com>
Date: Thu, 10 Dec 2009 22:05:23 +0000 (+0100)
Subject: merge with lp:~mvo/apt/debian-sid : move all my ABI break changes
X-Git-Tag: 0.8.0~39^2~38
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/f932cd7c75cd7b0da99c97064f8d112075ccd7f5

merge with lp:~mvo/apt/debian-sid : move all my ABI break changes
to the "new" 0.7.26 version
---

f932cd7c75cd7b0da99c97064f8d112075ccd7f5
diff --cc debian/changelog
index 26b3e8c1e,1f4fa38b8..5cd6eeb4a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,3 +1,45 @@@
++apt (0.7.26) UNRELEASED; urgency=low
++
++  [ David Kalnischkies ]
++  * [BREAK] add possibility to download and use multiply
++    Translation files, configurable with Acquire::Translation
++    (Closes: #444222, #448216, #550564)
++  * Ignore :qualifiers after package name in build dependencies
++    for now as long we don't understand them (Closes: #558103)
++  * doc/apt.conf.5.xml:
++    - briefly document the behaviour of the new https options
++  * methods/connect.cc:
++    - add AI_ADDRCONFIG to ai_flags as suggested by Aurelien Jarno
++      in response to Bernhard R. Link, thanks! (Closes: #505020)
++  * methods/rred.cc:
++    - rewrite to be able to handle even big patch files
++    - adopt optional mmap+iovec patch from Morten Hustveit
++      (Closes: #463354) which should speed up a bit. Thanks!
++  * apt-pkg/contrib/mmap.{cc,h}:
++    - extend it to have a growable flag - unused now but maybe...
++  * apt-pkg/pkgcache.h:
++    - use long instead of short for {Ver,Desc}File size,
++      patch from Víctor Manuel Jáquez Leal, thanks! (Closes: #538917)
++  * apt-pkg/acquire-item.cc:
++    - allow also to skip the last patch if target is reached,
++      thanks Bernhard R. Link! (Closes: #545699)
++  * methods/http{,s}.cc
++    - add config setting for User-Agent to the Acquire group,
++      thanks Timothy J. Miller! (Closes: #355782)
++    - add https options which default to http ones (Closes: #557085)
++  * ftparchive/writer.{cc,h}:
++    - add APT::FTPArchive::AlwaysStat to disable the too aggressive
++      caching if versions are build multiply times (not recommend)
++      Patch by Christoph Goehre, thanks! (Closes: #463260)
++  * ftparchive/*:
++    - fix a few typos in strings, comments and manpage,
++      thanks Karl Goetz! (Closes: #558757)
++  * debian/apt.cron.daily:
++    - check cache size even if we do nothing else otherwise, thanks
++      Francesco Poli for patch(s) and patience! (Closes: #459344)
++
++ -- Michael Vogt <mvo@debian.org>  Thu, 10 Dec 2009 22:02:38 +0100
++
  apt (0.7.25) UNRELEASED; urgency=low
  
    [ Christian Perrier ]
diff --cc doc/po/apt-doc.pot
index 5172f7f84,f833cec6c..58af2ebdf
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@@ -4671,26 -4652,16 +4652,26 @@@ msgid "
  "deactivates the download from multiple servers at the same time.)"
  msgstr ""
  
 +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 +#: apt.conf.5.xml:280
 +msgid ""
 +"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 +"User-Agent for the http download method as some proxies allow access for "
 +"clients only if the client uses a known identifier."
 +msgstr ""
 +
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:286
+ #: apt.conf.5.xml:281
  msgid "https"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:287
+ #: apt.conf.5.xml:282
  msgid ""
 -"HTTPS URIs. Cache-control and proxy options are the same as for "
 -"<literal>http</literal> method.  <literal>Pipeline-Depth</literal> option is "
 +"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
 +"options are the same as for <literal>http</literal> method and will also "
 +"default to the options from the <literal>http</literal> method if they are "
 +"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
  "not supported yet."
  msgstr ""
  
diff --cc doc/po/de.po
index 3ec7c4a5b,b6cbeef6a..bc15abae3
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@@ -6289,31 -6262,16 +6289,31 @@@ msgstr "
  "implizit das Herunterladen von mehreren Servern zur gleichen Zeit "
  "deaktiviert.)"
  
 +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 +#: apt.conf.5.xml:280
 +msgid ""
 +"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 +"User-Agent for the http download method as some proxies allow access for "
 +"clients only if the client uses a known identifier."
 +msgstr ""
 +
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:286
+ #: apt.conf.5.xml:281
  msgid "https"
  msgstr "https"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:287
+ #: apt.conf.5.xml:282
 -msgid ""
 -"HTTPS URIs. Cache-control and proxy options are the same as for "
 -"<literal>http</literal> method.  <literal>Pipeline-Depth</literal> option is "
 +#, fuzzy
 +#| msgid ""
 +#| "HTTPS URIs. Cache-control and proxy options are the same as for "
 +#| "<literal>http</literal> method.  <literal>Pipeline-Depth</literal> option "
 +#| "is not supported yet."
 +msgid ""
 +"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
 +"options are the same as for <literal>http</literal> method and will also "
 +"default to the options from the <literal>http</literal> method if they are "
 +"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
  "not supported yet."
  msgstr ""
  "HTTPS-URIs. Zwischenspeichersteuerung und Proxy-Optionen entsprehen denen "
@@@ -6452,9 -6410,8 +6452,9 @@@ msgid "cdrom
  msgstr "cdrom"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
- #: apt.conf.5.xml:356
+ #: apt.conf.5.xml:349
  #, fuzzy, no-wrap
 +#| msgid "\"/cdrom/\"::Mount \"foo\";"
  msgid "/cdrom/::Mount \"foo\";"
  msgstr "\"/cdrom/\"::Mount \"foo\";"
  
diff --cc doc/po/es.po
index 266f69c02,d80f57e65..d79d8d0ec
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@@ -5769,27 -5769,17 +5769,27 @@@ msgid "
  "multiple servers at the same time.)"
  msgstr ""
  
 +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 +#: apt.conf.5.xml:280
 +msgid ""
 +"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 +"User-Agent for the http download method as some proxies allow access for "
 +"clients only if the client uses a known identifier."
 +msgstr ""
 +
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:286
+ #: apt.conf.5.xml:281
  #, fuzzy
  msgid "https"
  msgstr "http"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:287
+ #: apt.conf.5.xml:282
  msgid ""
 -"HTTPS URIs. Cache-control and proxy options are the same as for "
 -"<literal>http</literal> method.  <literal>Pipeline-Depth</literal> option is "
 +"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
 +"options are the same as for <literal>http</literal> method and will also "
 +"default to the options from the <literal>http</literal> method if they are "
 +"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
  "not supported yet."
  msgstr ""
  
@@@ -9866,6 -9809,6 +9866,10 @@@ msgstr "
  msgid "Which will use the already fetched archives on the disc."
  msgstr ""
  
++#, fuzzy
++#~ msgid "<option>APT::FTPArchive::AlwaysStat</option>"
++#~ msgstr "<option>--all-versions</option>"
++
  #, fuzzy
  #~ msgid "/usr/share/doc/apt/"
  #~ msgstr "/usr/share/doc/apt/"
diff --cc doc/po/fr.po
index 49dc38f7f,fbdf0b2db..0bc12a321
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@@ -6276,31 -6192,16 +6192,31 @@@ msgid "
  "multiple servers at the same time.)"
  msgstr ""
  
 +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 +#: apt.conf.5.xml:280
 +msgid ""
 +"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 +"User-Agent for the http download method as some proxies allow access for "
 +"clients only if the client uses a known identifier."
 +msgstr ""
 +
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:286
+ #: apt.conf.5.xml:281
  msgid "https"
  msgstr "https"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:287
+ #: apt.conf.5.xml:282
 -msgid ""
 -"HTTPS URIs. Cache-control and proxy options are the same as for "
 -"<literal>http</literal> method.  <literal>Pipeline-Depth</literal> option is "
 +#, fuzzy
 +#| msgid ""
 +#| "HTTPS URIs. Cache-control and proxy options are the same as for "
 +#| "<literal>http</literal> method.  <literal>Pipeline-Depth</literal> option "
 +#| "is not supported yet."
 +msgid ""
 +"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
 +"options are the same as for <literal>http</literal> method and will also "
 +"default to the options from the <literal>http</literal> method if they are "
 +"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
  "not supported yet."
  msgstr ""
  "URI HTTPS. Les options de contrôle de cache et de mandataire (proxy) sont "
diff --cc doc/po/it.po
index 37cf5d078,4e02c188d..5c5a65595
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@@ -4638,26 -4638,16 +4638,26 @@@ msgid "
  "multiple servers at the same time.)"
  msgstr ""
  
 +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 +#: apt.conf.5.xml:280
 +msgid ""
 +"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 +"User-Agent for the http download method as some proxies allow access for "
 +"clients only if the client uses a known identifier."
 +msgstr ""
 +
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:286
+ #: apt.conf.5.xml:281
  msgid "https"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:287
+ #: apt.conf.5.xml:282
  msgid ""
 -"HTTPS URIs. Cache-control and proxy options are the same as for "
 -"<literal>http</literal> method.  <literal>Pipeline-Depth</literal> option is "
 +"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
 +"options are the same as for <literal>http</literal> method and will also "
 +"default to the options from the <literal>http</literal> method if they are "
 +"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
  "not supported yet."
  msgstr ""
  
diff --cc doc/po/ja.po
index ba04b200f,ee2d4aca1..80da7c0a2
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@@ -6504,32 -6340,17 +6340,32 @@@ msgid "
  "multiple servers at the same time.)"
  msgstr ""
  
 +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 +#: apt.conf.5.xml:280
 +msgid ""
 +"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 +"User-Agent for the http download method as some proxies allow access for "
 +"clients only if the client uses a known identifier."
 +msgstr ""
 +
  # type: <tag></tag>
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:286
+ #: apt.conf.5.xml:281
  msgid "https"
  msgstr "https"
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:287
+ #: apt.conf.5.xml:282
 -msgid ""
 -"HTTPS URIs. Cache-control and proxy options are the same as for "
 -"<literal>http</literal> method.  <literal>Pipeline-Depth</literal> option is "
 +#, fuzzy
 +#| msgid ""
 +#| "HTTPS URIs. Cache-control and proxy options are the same as for "
 +#| "<literal>http</literal> method.  <literal>Pipeline-Depth</literal> option "
 +#| "is not supported yet."
 +msgid ""
 +"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
 +"options are the same as for <literal>http</literal> method and will also "
 +"default to the options from the <literal>http</literal> method if they are "
 +"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
  "not supported yet."
  msgstr ""
  "HTTPS URI - キャッシュの制御やプロキシオプションは <literal>http</literal> メ"
diff --cc doc/po/pl.po
index 27b7a8a7b,3b3670abf..a413bb862
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@@ -4640,26 -4640,16 +4640,26 @@@ msgid "
  "multiple servers at the same time.)"
  msgstr ""
  
 +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 +#: apt.conf.5.xml:280
 +msgid ""
 +"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 +"User-Agent for the http download method as some proxies allow access for "
 +"clients only if the client uses a known identifier."
 +msgstr ""
 +
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:286
+ #: apt.conf.5.xml:281
  msgid "https"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:287
+ #: apt.conf.5.xml:282
  msgid ""
 -"HTTPS URIs. Cache-control and proxy options are the same as for "
 -"<literal>http</literal> method.  <literal>Pipeline-Depth</literal> option is "
 +"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
 +"options are the same as for <literal>http</literal> method and will also "
 +"default to the options from the <literal>http</literal> method if they are "
 +"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
  "not supported yet."
  msgstr ""
  
diff --cc doc/po/pt_BR.po
index ea410fc4d,de86f98bb..f24b9dfd5
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@@ -4689,26 -4689,16 +4689,26 @@@ msgid "
  "multiple servers at the same time.)"
  msgstr ""
  
 +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 +#: apt.conf.5.xml:280
 +msgid ""
 +"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 +"User-Agent for the http download method as some proxies allow access for "
 +"clients only if the client uses a known identifier."
 +msgstr ""
 +
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
- #: apt.conf.5.xml:286
+ #: apt.conf.5.xml:281
  msgid "https"
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
- #: apt.conf.5.xml:287
+ #: apt.conf.5.xml:282
  msgid ""
 -"HTTPS URIs. Cache-control and proxy options are the same as for "
 -"<literal>http</literal> method.  <literal>Pipeline-Depth</literal> option is "
 +"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
 +"options are the same as for <literal>http</literal> method and will also "
 +"default to the options from the <literal>http</literal> method if they are "
 +"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
  "not supported yet."
  msgstr ""
  
diff --cc methods/http.cc
index 8fcff0b5d,3b210f6b6..2dae87a02
--- a/methods/http.cc
+++ b/methods/http.cc
@@@ -724,12 -725,13 +725,14 @@@ void HttpMethod::SendReq(FetchItem *Itm
        Req += string("Proxy-Authorization: Basic ") + 
            Base64Encode(Proxy.User + ":" + Proxy.Password) + "\r\n";
  
+    maybe_add_auth (Uri, _config->FindFile("Dir::Etc::netrc"));
     if (Uri.User.empty() == false || Uri.Password.empty() == false)
+    {
        Req += string("Authorization: Basic ") + 
            Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
-    
+    }
 -   Req += "User-Agent: Debian APT-HTTP/1.3 ("VERSION")\r\n\r\n";
 +   Req += "User-Agent: " + _config->Find("Acquire::http::User-Agent",
 +		"Debian APT-HTTP/1.3 ("VERSION")") + "\r\n\r\n";
     
     if (Debug == true)
        cerr << Req << endl;
diff --cc methods/https.cc
index 4daa04e32,86d7f3a6b..726f53c44
--- a/methods/https.cc
+++ b/methods/https.cc
@@@ -197,20 -211,17 +199,23 @@@ bool HttpsMethod::Fetch(FetchItem *Itm
        curl_easy_setopt(curl, CURLOPT_MAX_RECV_SPEED_LARGE, dlLimit);
  
     // set header
 -   curl_easy_setopt(curl, CURLOPT_USERAGENT,"Debian APT-CURL/1.0 ("VERSION")");
 +   curl_easy_setopt(curl, CURLOPT_USERAGENT,
 +	_config->Find("Acquire::https::User-Agent",
 +		_config->Find("Acquire::http::User-Agent",
 +			"Debian APT-CURL/1.0 ("VERSION")")).c_str());
  
     // set timeout
 -   int timeout = _config->FindI("Acquire::http::Timeout",120);
 +   int timeout = _config->FindI("Acquire::https::Timeout",
 +		_config->FindI("Acquire::http::Timeout",120));
 +   curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout);
     curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, timeout);
+    //set really low lowspeed timeout (see #497983)
+    curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, DL_MIN_SPEED);
+    curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, timeout);
  
     // set redirect options and default to 10 redirects
 -   bool AllowRedirect = _config->FindI("Acquire::https::AllowRedirect", true);
 +   bool AllowRedirect = _config->FindB("Acquire::https::AllowRedirect",
 +	_config->FindB("Acquire::http::AllowRedirect",true));
     curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, AllowRedirect);
     curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 10);
  
diff --cc po/apt-all.pot
index b6610a191,ac231dff9..4ccf7413d
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2009-11-28 02:10+0100\n"
 -"POT-Creation-Date: 2009-12-10 22:06+0100\n"
++"POT-Creation-Date: 2009-12-10 23:01+0100\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@@ -342,7 -342,7 +342,7 @@@ msgstr "
  
  #: ftparchive/cachedb.cc:72
  msgid ""
--"DB format is invalid. If you upgraded from a older version of apt, please "
++"DB format is invalid. If you upgraded from an older version of apt, please "
  "remove and re-create the database."
  msgstr ""
  
@@@ -1700,7 -1700,7 +1700,7 @@@ msgstr "
  msgid "Unable to accept connection"
  msgstr ""
  
- #: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
 -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
++#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr ""
  
@@@ -1864,47 -1864,47 +1864,47 @@@ msgstr "
  msgid "Unknown date format"
  msgstr ""
  
- #: methods/http.cc:788
 -#: methods/http.cc:790
++#: methods/http.cc:791
  msgid "Select failed"
  msgstr ""
  
- #: methods/http.cc:793
 -#: methods/http.cc:795
++#: methods/http.cc:796
  msgid "Connection timed out"
  msgstr ""
  
- #: methods/http.cc:816
 -#: methods/http.cc:818
++#: methods/http.cc:819
  msgid "Error writing to output file"
  msgstr ""
  
- #: methods/http.cc:847
 -#: methods/http.cc:849
++#: methods/http.cc:850
  msgid "Error writing to file"
  msgstr ""
  
- #: methods/http.cc:875
 -#: methods/http.cc:877
++#: methods/http.cc:878
  msgid "Error writing to the file"
  msgstr ""
  
- #: methods/http.cc:889
 -#: methods/http.cc:891
++#: methods/http.cc:892
  msgid "Error reading from server. Remote end closed connection"
  msgstr ""
  
- #: methods/http.cc:891
 -#: methods/http.cc:893
++#: methods/http.cc:894
  msgid "Error reading from server"
  msgstr ""
  
- #: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
 -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
++#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
  msgid "Failed to truncate file"
  msgstr ""
  
- #: methods/http.cc:1147
 -#: methods/http.cc:1149
++#: methods/http.cc:1150
  msgid "Bad header data"
  msgstr ""
  
- #: methods/http.cc:1164 methods/http.cc:1219
 -#: methods/http.cc:1166 methods/http.cc:1221
++#: methods/http.cc:1167 methods/http.cc:1222
  msgid "Connection failed"
  msgstr ""
  
- #: methods/http.cc:1311
 -#: methods/http.cc:1313
++#: methods/http.cc:1314
  msgid "Internal error"
  msgstr ""