add Acquire::http::Proxy-Auto-Detect to the apt.conf.5 manpage (closes: 726597)

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index c9bb061236715b1fcef04b0512d620fb45552bce..0d0d95c7afb905c636dd9e636b4dc4a48cdcf2b0 100644 (file)
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -124,6 +124,12 @@
   </citerefentry>"
 >
 
   </citerefentry>"
 >
 

+<!ENTITY squid-deb-proxy-client "<citerefentry>
+    <refentrytitle><command>squid-deb-proxy-client</command></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+

 <!ENTITY debsign "<citerefentry>
     <refentrytitle><command>debsign</command></refentrytitle>
     <manvolnum>1</manvolnum>
 <!ENTITY debsign "<citerefentry>
     <refentrytitle><command>debsign</command></refentrytitle>
     <manvolnum>1</manvolnum>

diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 42119baa581d7af3e92c2afac8b61e10ec543647..e8da666c7c829b89ffd4b52b903850f9f36a4f39 100644 (file)
--- 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";};
      <para><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.</para>
      <para><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.</para>

+
+     <para><literal>Acquire::http::Proxy-Auto-Detect</literal> 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
+     <literal>http://proxy:port/</literal>. See the 
+     &squid-deb-proxy-client; package for a example implementation that
+     uses avahi.</para>
+

      </listitem>
      </varlistentry>
 
      </listitem>
      </varlistentry>
 

diff --git a/methods/http.cc b/methods/http.cc
index 71a02e53a062e3a7bae2f22dd63dbfea34bdf2c0..b22b61efca5c9251713e5c334632ccd6f9634cbf 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -798,7 +798,6 @@ bool HttpMethod::Configuration(string Message)
    PipelineDepth = _config->FindI("Acquire::http::Pipeline-Depth",
                                  PipelineDepth);
    Debug = _config->FindB("Debug::Acquire::http",false);
    PipelineDepth = _config->FindI("Acquire::http::Pipeline-Depth",
                                  PipelineDepth);
    Debug = _config->FindB("Debug::Acquire::http",false);

-   AutoDetectProxyCmd = _config->Find("Acquire::http::ProxyAutoDetect");

 
    // Get the proxy to use
    AutoDetectProxy();
 
    // Get the proxy to use
    AutoDetectProxy();


@@ -811,6 +810,11 @@ bool HttpMethod::Configuration(string Message)
 /* */
 bool HttpMethod::AutoDetectProxy()
 {
 /* */
 bool HttpMethod::AutoDetectProxy()
 {

+   // option is "Acquire::http::Proxy-Auto-Detect" but we allow the old
+   // name without the dash ("-")
+   AutoDetectProxyCmd = _config->Find("Acquire::http::Proxy-Auto-Detect",
+                                      _config->Find("Acquire::http::ProxyAutoDetect"));
+

    if (AutoDetectProxyCmd.empty())
       return true;
 
    if (AutoDetectProxyCmd.empty())
       return true;