++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 ]
"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 ""
"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 "
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\";"
"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 ""
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/"
"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 "
"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 ""
"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> メ"
"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 ""
"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 ""
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;
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);
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"
#: 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 ""
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 ""
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 ""
projects / apt.git / commitdiff
