From 52f2e1dadd74b6cce8fd72f1a693fb774bfe5cdf Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sat, 26 Sep 2009 15:12:39 +0200 Subject: doc/apt.conf.5.xml: Start deprecating stuff. - Deprecate unquoted values, string concatenation and explain what should not be written inside a value (quotes,backslash). --- debian/changelog | 8 +++++++- doc/apt.conf.5.xml | 7 +++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 101ad03a7..4f8b72a31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ apt (0.7.25) UNRELEASED; urgency=low + [ Christian Perrier ] * Fix apt-ftparchive(1) wrt description of the "-o" option. Thanks to Dann Frazier for the patch. Closes: #273100 - -- Christian Perrier Sat, 26 Sep 2009 11:17:25 +0200 + [ 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). + + -- Julian Andres Klode Sat, 26 Sep 2009 15:00:28 +0200 apt (0.7.24) unstable; urgency=low diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index e752f9d27..b1522a614 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -59,8 +59,11 @@ between /* and */, just like C/C++ comments. Each line is of the form APT::Get::Assume-Yes "true"; The trailing - semicolon is required and the quotes are optional. A new scope can be - opened with curly braces, like: + 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. A new scope can be opened with curly + braces, like: APT { -- cgit v1.2.3 From 31f113db16fc6854be90ca7ec3f7321fd65e99f3 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sat, 26 Sep 2009 16:14:54 +0200 Subject: doc/apt.conf.5.xml: Restrict option names to alphanumerical characters and "/-:._+". --- debian/changelog | 1 + doc/apt.conf.5.xml | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4f8b72a31..018b072d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ apt (0.7.25) UNRELEASED; urgency=low * 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 "/-:._+". -- Julian Andres Klode Sat, 26 Sep 2009 15:00:28 +0200 diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index b1522a614..661f97ab1 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -62,8 +62,9 @@ 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. A new scope can be opened with curly - braces, like: + 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: APT { @@ -329,7 +330,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; as specified in /etc/fstab. 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 "/cdrom/"::Mount "foo"; within + is to put /cdrom/::Mount "foo"; within the cdrom block. It is important to have the trailing slash. Unmount commands can be specified using UMount. -- cgit v1.2.3 From 334459abb1f5fa7f8a6be694cf9ecb05d692f01e Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 28 Sep 2009 15:21:08 +0200 Subject: doc/apt.conf.5.xml: Deprecate #include, we have apt.conf.d nowadays which should be sufficient. --- debian/changelog | 2 ++ doc/apt.conf.5.xml | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 018b072d8..10e70b8d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ apt (0.7.25) UNRELEASED; urgency=low - 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. -- Julian Andres Klode Sat, 26 Sep 2009 15:00:28 +0200 diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 661f97ab1..a12524328 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -95,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. - Two specials are allowed, #include and #clear: + Two specials are allowed, #include (which is deprecated + and not supported by alternative implementations) and #clear: #include will include the given file, unless the filename ends in a slash, then the whole directory is included. #clear is used to erase a part of the configuration tree. The -- cgit v1.2.3 From f465a80f6e0e0cc3edae1870881135ced824c9e3 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 12 Oct 2009 16:24:34 +0200 Subject: methods/https.cc: Add support for authentication using netrc (Closes: #518473), patch by Jussi Hakala . --- debian/changelog | 3 +++ methods/https.cc | 1 + 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 34a35b2f9..68ee83bac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,9 @@ apt (0.7.25) UNRELEASED; urgency=low - 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 . -- Michael Vogt Tue, 29 Sep 2009 15:51:34 +0200 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. -- cgit v1.2.3