diff options
| -rw-r--r-- | debian/changelog | 11 | ||||
| -rw-r--r-- | doc/apt.conf.5.xml | 13 | ||||
| -rw-r--r-- | methods/https.cc | 1 |
3 files changed, 21 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index fc5965d3d..313ae2865 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,17 @@ apt (0.7.25) UNRELEASED; urgency=low * doc/sources.list.5.xml: - add note about additional apt-transport-methods + [ Julian Andres Klode ] + * doc/apt.conf.5.xml: + - Deprecate unquoted values, string concatenation and explain what should + not be written inside a value (quotes,backslash). + - Restrict option names to alphanumerical characters and "/-:._+". + - Deprecate #include, we have apt.conf.d nowadays which should be + sufficient. + * methods/https.cc: + - Add support for authentication using netrc (Closes: #518473), patch + by Jussi Hakala <jussi.hakala@hut.fi>. + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 29 Sep 2009 15:51:34 +0200 apt (0.7.24) unstable; urgency=low diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 36b65b073..0cd63b31c 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -59,8 +59,12 @@ between <literal>/*</literal> and <literal>*/</literal>, just like C/C++ comments. Each line is of the form <literal>APT::Get::Assume-Yes "true";</literal> The trailing - semicolon is required and the quotes are optional. A new scope can be - opened with curly braces, like:</para> + semicolon and the quotes are required. The value must be on one line, and + there is no kind of string concatenation. It must not include inside quotes. + The behavior of the backslash "\" and escaped characters inside a value is + undefined and it should not be used. An option name may include + alphanumerical characters and the "/-:._+" characters. A new scope can + be opened with curly braces, like:</para> <informalexample><programlisting> APT { @@ -91,7 +95,8 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; new entry will simply add a new option to the list. If you specify a name you can override the option as every other option by reassigning a new value to the option.</para> - <para>Two specials are allowed, <literal>#include</literal> and <literal>#clear</literal>: + <para>Two specials are allowed, <literal>#include</literal> (which is deprecated + and not supported by alternative implementations) and <literal>#clear</literal>: <literal>#include</literal> will include the given file, unless the filename ends in a slash, then the whole directory is included. <literal>#clear</literal> is used to erase a part of the configuration tree. The @@ -337,7 +342,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; as specified in <filename>/etc/fstab</filename>. It is possible to provide alternate mount and unmount commands if your mount point cannot be listed in the fstab (such as an SMB mount and old mount packages). The syntax - is to put <literallayout>"/cdrom/"::Mount "foo";</literallayout> within + is to put <literallayout>/cdrom/::Mount "foo";</literallayout> within the cdrom block. It is important to have the trailing slash. Unmount commands can be specified using UMount.</para></listitem> </varlistentry> diff --git a/methods/https.cc b/methods/https.cc index 37d93e308..79e6fea3f 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -135,6 +135,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_setopt(curl, CURLOPT_NOPROGRESS, false); curl_easy_setopt(curl, CURLOPT_FAILONERROR, true); curl_easy_setopt(curl, CURLOPT_FILETIME, true); + curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); // SSL parameters are set by default to the common (non mirror-specific) value // if available (or a default one) and gets overload by mirror-specific ones. |