From 7a948ec719ecc020c2337fe3f41c5fc42699e2c1 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 26 Jun 2013 17:37:57 +0200 Subject: Version 3 for DPkg::Pre-Install-Pkgs with MultiArch info Adds on top of Version 2 to all displayed version numbers the architecture as well as the MultiArch flag for consumption by the hooks. Most of the time the architecture will be the same for both versions displayed, but packages might change from "all" to "any" (or back) between versions so we can't display the architecture for packages. Pseudo-Format for Version 3: Examples: stuff - - none < 1 amd64 none **CONFIGURE** libsame 1 i386 same < 2 i386 same **CONFIGURE** stuff 2 i386 none > 1 i386 none **CONFIGURE** libsame 2 i386 same > - - none **REMOVE** toolkit 1 all foreign > - - none **REMOVE** Closes: #712116 --- doc/apt.conf.5.xml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'doc/apt.conf.5.xml') diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 3cf3136d3..9973fe42b 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -688,11 +688,17 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; will abort. APT will pass the filenames of all .deb files it is going to install to the commands, one per line on standard input. - Version 2 of this protocol dumps more information, including the + Version 2 of this protocol dumps more information, including the protocol version, the APT configuration space and the packages, files - and versions being changed. Version 2 is enabled by setting - DPkg::Tools::options::cmd::Version to 2. cmd is a - command given to Pre-Install-Pkgs. + and versions being changed. Version 3 adds the architecture and MultiArch + flag to each version being dumped. + + The version of the protocol to be used for the command + cmd can be chosen by setting + DPkg::Tools::options::cmd::Version + accordingly, the default being version 1. If APT isn't supporting the requested + version it will send the information in the highest version it has support for instead. + -- cgit v1.2.3 From 0e279e3527ce3dc9de0e01441ad693f415e75d6a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 23 Apr 2013 08:15:06 +0200 Subject: merge patch from Daniel Hartwig to Clarify units of Acquire::http::Dl-Limit (closes: #705445) Conflicts: debian/changelog --- doc/apt.conf.5.xml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'doc/apt.conf.5.xml') diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 9973fe42b..f5e1f966d 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -386,10 +386,12 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; Acquire::http::AllowRedirect controls whether APT will follow redirects, which is enabled by default. - The used bandwidth can be limited with Acquire::http::Dl-Limit - which accepts integer values in kilobytes. The default value is 0 which deactivates - the limit and tries to use all available bandwidth (note that this option implicitly - disables downloading from multiple servers at the same time.) + The used bandwidth can be limited with + Acquire::http::Dl-Limit which accepts integer + values in kilobytes per second. The default value is 0 which + deactivates the limit and tries to use all available bandwidth. + Note that this option implicitly disables downloading from + multiple servers at the same time. Acquire::http::User-Agent can be used to set a different User-Agent for the http download method as some proxies allow access for clients -- cgit v1.2.3 From 48498443e74b2a7e089709b954c50b7df374684b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 13 Aug 2013 18:18:15 +0200 Subject: allow Pre-Install-Pkgs hooks to get info over an FD != stdin This adds ::InfoFD option alongside the ::Version one to request sending the information to the specified FD, by default it is STDIN as it was the case before. The environment variable APT_HOOK_INFO_FD contains the FD the data is on as a confirmation that the APT version used understood the request. Allowing the hook to choose the FD is needed/helpful e.g. for shellscripts which have a hard time accessing FDs above 9 (as >= 10 are usually used internally by them) Closes: #671728 --- doc/apt.conf.5.xml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'doc/apt.conf.5.xml') diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index f5e1f966d..42119baa5 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -688,7 +688,8 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; options this must be specified in list notation. The commands are invoked in order using /bin/sh; should any fail APT will abort. APT will pass the filenames of all .deb files it is going to - install to the commands, one per line on standard input. + install to the commands, one per line on the requested file descriptor, defaulting + to standard input. Version 2 of this protocol dumps more information, including the protocol version, the APT configuration space and the packages, files @@ -700,7 +701,15 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; DPkg::Tools::options::cmd::Version accordingly, the default being version 1. If APT isn't supporting the requested version it will send the information in the highest version it has support for instead. - + + + The file descriptor to be used to send the information can be requested with + DPkg::Tools::options::cmd::InfoFD + which defaults to 0 for standard input and is available since + version 0.9.11. Support for the option can be detected by looking for the environment + variable APT_HOOK_INFO_FD which contains the number of the used + file descriptor as a confirmation. + -- cgit v1.2.3 From c08cf1dc784a98a253296a51433f6de7d16d3125 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 19 Oct 2013 18:29:59 +0200 Subject: add Acquire::http::Proxy-Auto-Detect to the apt.conf.5 manpage (closes: 726597) --- doc/apt.conf.5.xml | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'doc/apt.conf.5.xml') diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 42119baa5..e8da666c7 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -396,6 +396,14 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; Acquire::http::User-Agent 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. + + Acquire::http::Proxy-Auto-Detect can be used to + specify a external command to discover the http proxy to use. Apt expects + the command to output the proxy on stdout in the style + http://proxy:port/. See the + &squid-deb-proxy-client; package for a example implementation that + uses avahi. + -- cgit v1.2.3