From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 27 Aug 2009 12:16:07 +0000 (+0200)
Subject: merged from lp:~donkult/apt/sid
X-Git-Tag: 0.7.23~1
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/fe58cbc86638e214fa137166a704fbff798c546a?hp=-c

merged from lp:~donkult/apt/sid
---

fe58cbc86638e214fa137166a704fbff798c546a
diff --combined configure.in
index 7287b925a,0dd1beb1a..ff11078b3
--- a/configure.in
+++ b/configure.in
@@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib
  AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
  
  dnl -- SET THIS TO THE RELEASE VERSION --
 -AC_DEFINE_UNQUOTED(VERSION,"0.7.22.1")
 +AC_DEFINE_UNQUOTED(VERSION,"0.7.22.3")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)
@@@ -112,6 -112,10 +112,10 @@@ if test x"$HAVE_STATVFS" != x"yes"; the
     ])
  fi
  
+ AC_CHECK_MEMBERS([struct statfs.f_type],,,
+     [$ac_includes_default
+      #include <sys/vfs.h>])
+ 
  dnl We should use the real timegm function if we have it.
  AC_CHECK_FUNC(timegm,AC_DEFINE(HAVE_TIMEGM))
  AC_SUBST(HAVE_TIMEGM)
diff --combined debian/changelog
index 2131b8077,00afc704b..1ee88f0ba
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,49 +1,57 @@@
 -apt (0.7.22.3) unstable; urgency=low
 +apt (0.7.22.3) UNRELEASED; urgency=low
 +
 +  [ Eugene V. Lyubimkin ]
 +  * methods/{http,https,ftp}, doc/apt.conf.5.xml:
 +    - Changed and unified the code that determines which proxy to use. Now
 +      'Acquire::{http,ftp}::Proxy[::<host>]' options have the highest priority,
 +      and '{http,ftp}_proxy' environment variables are used only if options
 +      mentioned above are not specified.
 +      (Closes: #445985, #157759, #320184, #365880, #479617)
  
-  -- Michael Vogt <mvo@debian.org>  Wed, 19 Aug 2009 11:14:15 +0200
+   [ David Kalnischkies ]
+   * cmdline/apt-get.cc:
+     - add APT::Get::HideAutoRemove=small to display only a short line
+       instead of the full package list. (Closes: #537450)
+     - ShowBroken() in build-dep (by Mike O'Connor, Closes: #145916)
+     - check for statfs.f_type (by Robert Millan, Closes: #509313)
+     - correct the order of picked package binary vs source in source
+     - use SourceVersion instead of the BinaryVersion to get the source
+       Patch by Matt Kraai, thanks! (Closes: #382826)
+     - add pkg/archive and codename in source (Closes: #414105, #441178)
+   * apt-pkg/contrib/strutl.cc:
+     - enable thousand separator according to the current locale
+       (by Luca Bruno, Closes: #223712)
+   * doc/apt.conf.5.xml:
+     - mention the apt.conf.d dir (by Vincent McIntyre, Closes: #520831)
+   * apt-inst/contrib/arfile.cc:
+     - use sizeof instead strlen (by Marius Vollmer, Closes: #504325)
+   * doc/apt-mark.8.xml:
+     - improve manpage based on patch by Carl Chenet (Closes: #510286)
+   * apt-pkg/acquire-item.cc:
+     - use configsettings for dynamic compression type use and order.
+       Based on a patch by Jyrki Muukkonen, thanks! (LP: #71746)
+   * apt-pkg/aptconfiguration.cc:
+     - add default configuration for compression types and add lzma
+       support. Order is now bzip2, lzma, gzip, none (Closes: #510526)
+   * ftparchive/writer.cc:
+     - add lzma support also here, patch for this (and inspiration for
+       the one above) by Robert Millan, thanks!
+   * apt-pkg/depcache.cc:
+     - restore the --ignore-hold effect in the Is{Delete,Install}Ok hooks
+   * doc/apt-get.8.xml:
+     - update the source description to reflect what it actually does
+       and how it can be used. (Closes: #413021)
+   * methods/http.cc:
+     - allow empty Reason-Phase in Status-Line to please squid,
+       thanks Modestas Vainius for noticing! (Closes: #531157, LP: #411435)
+ 
+   [ George Danchev ]
+   * cmdline/apt-cache.cc:
+     - fix a memory leak in the xvcg method (Closes: #511557)
+   * apt-pkg/indexcopy.cc:
+     - fix a memory leak then the Release file not exists (Closes: #511556)
+ 
 - -- David Kalnischkies <david@kalnischkies.com>  Sat, 08 Aug 2009 09:40:08 +0200
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 27 Aug 2009 14:15:39 +0200
  
  apt (0.7.22.2) unstable; urgency=low
  
@@@ -96,7 -131,7 +139,7 @@@ apt (0.7.22) unstable; urgency=lo
        (off by default)
      - send "dpkg-exec" message on the status fd when dpkg is run
      - provide DPkg::Chroot-Directory config option (useful for testing)
-     - fix potential hang when in a backgroud process group
+     - fix potential hang when in a background process group
    * apt-pkg/algorithms.cc:
      - consider recommends when making the scores for the problem 
        resolver
@@@ -125,7 -160,7 +168,7 @@@
    * apt-pkg/deb/debsystem.cc:
      - make strings i18n able 
    * fix problematic use of tolower() when calculating the version 
-     hash by using locale independant tolower_ascii() function. 
+     hash by using locale independent tolower_ascii() function. 
      Thanks to M. Vefa Bicakci (LP: #80248)
    * build fixes for g++-4.4
    * cmdline/apt-mark:
@@@ -245,7 -280,7 +288,7 @@@ apt (0.7.20) unstable; urgency=lo
    * buildlib/config.{sub,guess}:
      - Renewed. This fixes lintian errors.
    * doc/apt.conf.5.xml, debian/apt-transport-https:
 -    - Documented briefly 'APT::https' group of options. (Closes: #507398)
 +    - Documented briefly 'Acquire::https' group of options. (Closes: #507398)
      - Applied patch from Daniel Burrows to document 'Debug' group of options.
        (Closes: #457265)
      - Mentioned 'APT::Periodic' and 'APT::Archives' groups of options.
diff --combined doc/apt.conf.5.xml
index 1fe980d28,59235f115..c0c247ae9
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@@ -203,9 -203,8 +203,9 @@@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg
       standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per 
       host proxies can also be specified by using the form 
       <literal>http::Proxy::&lt;host&gt;</literal> with the special keyword <literal>DIRECT</literal> 
 -     meaning to use no proxies. The <envar>http_proxy</envar> environment variable
 -     will override all settings.</para>
 +	 meaning to use no proxies. If no one of the above settings is specified,
 +	 <envar>http_proxy</envar> environment variable
 +	 will be used.</para>
  
       <para>Three settings are provided for cache control with HTTP/1.1 compliant 
       proxy caches. <literal>No-Cache</literal> tells the proxy to not use its cached 
@@@ -253,13 -252,9 +253,13 @@@
  	 </para></listitem></varlistentry>
  
       <varlistentry><term>ftp</term>
 -     <listitem><para>FTP URIs; ftp::Proxy is the default proxy server to use. It is in the 
 -     standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal> and is 
 -     overridden by the <envar>ftp_proxy</envar> environment variable. To use a ftp 
 +     <listitem><para>FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the 
 +     standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per 
 +     host proxies can also be specified by using the form 
 +     <literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword <literal>DIRECT</literal> 
 +	 meaning to use no proxies. If no one of the above settings is specified,
 +	 <envar>ftp_proxy</envar> environment variable
 +	 will be used. To use a ftp 
       proxy you will have to set the <literal>ftp::ProxyLogin</literal> script in the 
       configuration file. This entry specifies the commands to send to tell 
       the proxy server what to connect to. Please see 
@@@ -308,6 -303,20 +308,20 @@@
       </para></listitem>
       </varlistentry>
  
+      <varlistentry><term>CompressionTypes</term>
+      <listitem><para>List of compression types which are understood by the acquire methods.
+      Files like <filename>Packages</filename> can be available in various compression formats.
+      This list defines in which order the acquire methods will try to download these files.
+      Per default <command>bzip2</command> compressed files will be prefered over
+      <command>lzma</command>, <command>gzip</command> and uncompressed files. The syntax for
+      the configuration fileentry is
+      <synopsis>Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> "<replaceable>Methodname</replaceable>";</synopsis>
+      e.g. <synopsis>Acquire::CompressionTypes::bz2 "bzip2";</synopsis>
+      Note that at runtime the <literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will
+      be checked: If this setting exists the method will only be used if this file exists, e.g. for
+      the bzip2 method above (the inbuilt) setting is <literallayout>Dir::Bin::bzip2 "/bin/bzip2";</literallayout>
+      </para></listitem>
+      </varlistentry>
     </variablelist>
    </para>
   </refsect1>
@@@ -342,6 -351,7 +356,7 @@@
  
     <para>Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> 
     specifies the location of the method handlers and <literal>gzip</literal>, 
+    <literal>bzip2</literal>, <literal>lzma</literal>,
     <literal>dpkg</literal>, <literal>apt-get</literal> <literal>dpkg-source</literal> 
     <literal>dpkg-buildpackage</literal> and <literal>apt-cache</literal> specify the location
     of the respective programs.</para>
@@@ -827,7 -837,17 +842,17 @@@ is commented
   </refsect1>
   
   <refsect1><title>Files</title>
-    <para><filename>/etc/apt/apt.conf</filename></para>
+    <variablelist>
+       <varlistentry><term><filename>/etc/apt/apt.conf</filename></term>
+       <listitem><para>APT configuration file.
+       Configuration Item: <literal>Dir::Etc::Main</literal>.</para></listitem> 
+       </varlistentry>
+ 
+       <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>
+       <listitem><para>APT configuration file fragments.
+       Configuration Item: <literal>Dir::Etc::Parts</literal>.</para></listitem>
+       </varlistentry>
+    </variablelist>
   </refsect1>
   
   <refsect1><title>See Also</title>
diff --combined methods/http.cc
index 1eba0f279,df62034e3..461a98406
--- a/methods/http.cc
+++ b/methods/http.cc
@@@ -311,27 -311,22 +311,27 @@@ bool ServerState::Open(
     Persistent = true;
     
     // Determine the proxy setting
 -   if (getenv("http_proxy") == 0)
 +   string SpecificProxy = _config->Find("Acquire::http::Proxy::" + ServerName.Host);
 +   if (!SpecificProxy.empty())
     {
 -      string DefProxy = _config->Find("Acquire::http::Proxy");
 -      string SpecificProxy = _config->Find("Acquire::http::Proxy::" + ServerName.Host);
 -      if (SpecificProxy.empty() == false)
 -      {
 -	 if (SpecificProxy == "DIRECT")
 -	    Proxy = "";
 -	 else
 -	    Proxy = SpecificProxy;
 -      }   
 -      else
 -	 Proxy = DefProxy;
 +	   if (SpecificProxy == "DIRECT")
 +		   Proxy = "";
 +	   else
 +		   Proxy = SpecificProxy;
     }
     else
 -      Proxy = getenv("http_proxy");
 +   {
 +	   string DefProxy = _config->Find("Acquire::http::Proxy");
 +	   if (!DefProxy.empty())
 +	   {
 +		   Proxy = DefProxy;
 +	   }
 +	   else
 +	   {
 +		   char* result = getenv("http_proxy");
 +		   Proxy = result ? result : "";
 +	   }
 +   }
     
     // Parse no_proxy, a , separated list of domains
     if (getenv("no_proxy") != 0)
@@@ -552,7 -547,7 +552,7 @@@ bool ServerState::HeaderLine(string Lin
        // Evil servers return no version
        if (Line[4] == '/')
        {
- 	 if (sscanf(Line.c_str(),"HTTP/%u.%u %u %[^\n]",&Major,&Minor,
+ 	 if (sscanf(Line.c_str(),"HTTP/%u.%u %u%[^\n]",&Major,&Minor,
  		    &Result,Code) != 4)
  	    return _error->Error(_("The HTTP server sent an invalid reply header"));
        }
@@@ -560,7 -555,7 +560,7 @@@
        {
  	 Major = 0;
  	 Minor = 9;
- 	 if (sscanf(Line.c_str(),"HTTP %u %[^\n]",&Result,Code) != 2)
+ 	 if (sscanf(Line.c_str(),"HTTP %u%[^\n]",&Result,Code) != 2)
  	    return _error->Error(_("The HTTP server sent an invalid reply header"));
        }