merge lp:~mvo/apt/netrc branch, this adds support for a

/etc/apt/auth.conf that can be used to store username/passwords
in a "netrc" style file (with the extension that it supports "/"
in a machine definition). Based on the maemo git branch.

diff --combined debian/changelog
index 417cd2436da6dbdeb6668d1158716d36c0219769,16e8929ad570dcde5f21840f22cca41167c7d0dd..685c048ea9985fd0d37a6fcbcc501a99b0dd2259
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -6,17 -6,7 +6,21 @@@ apt (0.7.22.4) unstable; urgency=lo
        (thanks to Simon Richter, closes: #509866)
    * apt-inst/contrib/arfile.cc:
      - show propper error message for Invalid archive members
 +  * apt-pkg/packagemanager.cc:
 +    - add output about pre-depends configuring when debug::pkgPackageManager
 +      is used
 +  * methods/https.cc:
 +    - fix incorrect use of CURLOPT_TIMEOUT, closes: #497983, LP: #354972
 +      thanks to Brian Thomason for the patch
++  * merge lp:~mvo/apt/netrc branch, this adds support for a
++    /etc/apt/auth.conf that can be used to store username/passwords
++    in a "netrc" style file (with the extension that it supports "/"
++    in a machine definition). Based on the maemo git branch.
  
 +  [ Brian Murray ]
 +  * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc:
 +    - typo fix (LP: #462328)
 +  
    [ Loïc Minier ]
    * cmdline/apt-key:
      - Emit a warning if removed keys keyring is missing and skip associated

diff --combined methods/https.cc
index dbc1cf52cde1643c59d93c310b9db168b6860f93,585e13848d1cd50e658abb4aef6f52186a4fd62f..86d7f3a6ba6542ed894292fbfc668789690f4949
--- 1/methods/https.cc
--- 2/methods/https.cc
+++ b/methods/https.cc
@@@ -14,6 -14,7 +14,7 @@@
  #include <apt-pkg/acquire-method.h>
  #include <apt-pkg/error.h>
  #include <apt-pkg/hashes.h>
+ #include <apt-pkg/netrc.h>
  
  #include <sys/stat.h>
  #include <sys/time.h>
@@@ -126,8 -127,10 +127,10 @@@ bool HttpsMethod::Fetch(FetchItem *Itm
     curl_easy_reset(curl);
     SetupProxy();
  
+    maybe_add_auth (Uri, _config->FindFile("Dir::Etc::netrc"));
+ 
     // callbacks
-    curl_easy_setopt(curl, CURLOPT_URL, Itm->Uri.c_str());
+    curl_easy_setopt(curl, CURLOPT_URL, static_cast<string>(Uri).c_str());
     curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
     curl_easy_setopt(curl, CURLOPT_WRITEDATA, this);
     curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, progress_callback);
@@@ -212,10 -215,8 +215,10 @@@
  
     // set timeout
     int timeout = _config->FindI("Acquire::http::Timeout",120);
 -   curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout);
     curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, timeout);
 +   //set really low lowspeed timeout (see #497983)
 +   curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, DL_MIN_SPEED);
 +   curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, timeout);
  
     // set redirect options and default to 10 redirects
     bool AllowRedirect = _config->FindI("Acquire::https::AllowRedirect", true);

diff --combined po/apt-all.pot
index a1864629031088d089e2754e6e0a0009130d2521,b05e180c1a71279dbc7d56e3e3e3fff7a3f2785c..a6caa7ac3d34212cc5dc81e94cbc73d1185d076e
--- 1/po/apt-all.pot
--- 2/po/apt-all.pot
+++ b/po/apt-all.pot
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2009-07-26 01:10+0200\n"
 -"POT-Creation-Date: 2009-10-16 15:18+0200\n"
++"POT-Creation-Date: 2009-11-04 13:06+0100\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@@ -989,7 -989,7 +989,7 @@@ msgstr "
  msgid "Calculating upgrade... "
  msgstr ""
  
- #: cmdline/apt-get.cc:1897 methods/ftp.cc:702 methods/connect.cc:112
+ #: cmdline/apt-get.cc:1897 methods/ftp.cc:708 methods/connect.cc:112
  msgid "Failed"
  msgstr ""
  
@@@ -1281,7 -1281,12 +1281,12 @@@ msgstr "
  msgid "Error reading archive member header"
  msgstr ""
  
- #: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102
+ #: apt-inst/contrib/arfile.cc:90
+ #, c-format
+ msgid "Invalid archive member header %s"
+ msgstr ""
+ 
+ #: apt-inst/contrib/arfile.cc:102
  msgid "Invalid archive member header"
  msgstr ""
  
@@@ -1381,10 -1386,12 +1386,12 @@@ msgstr "
  msgid "File %s/%s overwrites the one in the package %s"
  msgstr ""
  
+ #. Only warn if there are no sources.list.d.
+ #. Only warn if there is no sources.list file.
  #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
- #: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:163
- #: apt-pkg/sourcelist.cc:169 apt-pkg/sourcelist.cc:324 apt-pkg/acquire.cc:419
- #: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+ #: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
+ #: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
+ #: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
  #: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
  #, c-format
  msgid "Unable to read %s"
@@@ -1559,147 -1566,147 +1566,147 @@@ msgid "Invalid URI, local URIS must no
  msgstr ""
  
  #. Login must be before getpeername otherwise dante won't work.
- #: methods/ftp.cc:162
+ #: methods/ftp.cc:168
  msgid "Logging in"
  msgstr ""
  
- #: methods/ftp.cc:168
+ #: methods/ftp.cc:174
  msgid "Unable to determine the peer name"
  msgstr ""
  
- #: methods/ftp.cc:173
+ #: methods/ftp.cc:179
  msgid "Unable to determine the local name"
  msgstr ""
  
- #: methods/ftp.cc:204 methods/ftp.cc:232
+ #: methods/ftp.cc:210 methods/ftp.cc:238
  #, c-format
  msgid "The server refused the connection and said: %s"
  msgstr ""
  
- #: methods/ftp.cc:210
+ #: methods/ftp.cc:216
  #, c-format
  msgid "USER failed, server said: %s"
  msgstr ""
  
- #: methods/ftp.cc:217
+ #: methods/ftp.cc:223
  #, c-format
  msgid "PASS failed, server said: %s"
  msgstr ""
  
- #: methods/ftp.cc:237
+ #: methods/ftp.cc:243
  msgid ""
  "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
  "is empty."
  msgstr ""
  
- #: methods/ftp.cc:265
+ #: methods/ftp.cc:271
  #, c-format
  msgid "Login script command '%s' failed, server said: %s"
  msgstr ""
  
- #: methods/ftp.cc:291
+ #: methods/ftp.cc:297
  #, c-format
  msgid "TYPE failed, server said: %s"
  msgstr ""
  
- #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
+ #: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
  msgid "Connection timeout"
  msgstr ""
  
- #: methods/ftp.cc:335
+ #: methods/ftp.cc:341
  msgid "Server closed the connection"
  msgstr ""
  
- #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
+ #: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190
  msgid "Read error"
  msgstr ""
  
- #: methods/ftp.cc:345 methods/rsh.cc:197
+ #: methods/ftp.cc:351 methods/rsh.cc:197
  msgid "A response overflowed the buffer."
  msgstr ""
  
- #: methods/ftp.cc:362 methods/ftp.cc:374
+ #: methods/ftp.cc:368 methods/ftp.cc:380
  msgid "Protocol corruption"
  msgstr ""
  
- #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
+ #: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232
  msgid "Write error"
  msgstr ""
  
- #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
+ #: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
  msgid "Could not create a socket"
  msgstr ""
  
- #: methods/ftp.cc:698
+ #: methods/ftp.cc:704
  msgid "Could not connect data socket, connection timed out"
  msgstr ""
  
- #: methods/ftp.cc:704
+ #: methods/ftp.cc:710
  msgid "Could not connect passive socket."
  msgstr ""
  
- #: methods/ftp.cc:722
+ #: methods/ftp.cc:728
  msgid "getaddrinfo was unable to get a listening socket"
  msgstr ""
  
- #: methods/ftp.cc:736
+ #: methods/ftp.cc:742
  msgid "Could not bind a socket"
  msgstr ""
  
- #: methods/ftp.cc:740
+ #: methods/ftp.cc:746
  msgid "Could not listen on the socket"
  msgstr ""
  
- #: methods/ftp.cc:747
+ #: methods/ftp.cc:753
  msgid "Could not determine the socket's name"
  msgstr ""
  
- #: methods/ftp.cc:779
+ #: methods/ftp.cc:785
  msgid "Unable to send PORT command"
  msgstr ""
  
- #: methods/ftp.cc:789
+ #: methods/ftp.cc:795
  #, c-format
  msgid "Unknown address family %u (AF_*)"
  msgstr ""
  
- #: methods/ftp.cc:798
+ #: methods/ftp.cc:804
  #, c-format
  msgid "EPRT failed, server said: %s"
  msgstr ""
  
- #: methods/ftp.cc:818
+ #: methods/ftp.cc:824
  msgid "Data socket connect timed out"
  msgstr ""
  
- #: methods/ftp.cc:825
+ #: methods/ftp.cc:831
  msgid "Unable to accept connection"
  msgstr ""
  
- #: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
+ #: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr ""
  
- #: methods/ftp.cc:877
+ #: methods/ftp.cc:883
  #, c-format
  msgid "Unable to fetch file, server said '%s'"
  msgstr ""
  
- #: methods/ftp.cc:892 methods/rsh.cc:322
+ #: methods/ftp.cc:898 methods/rsh.cc:322
  msgid "Data socket timed out"
  msgstr ""
  
- #: methods/ftp.cc:922
+ #: methods/ftp.cc:928
  #, c-format
  msgid "Data transfer failed, server said '%s'"
  msgstr ""
  
  #. Get the files information
- #: methods/ftp.cc:997
+ #: methods/ftp.cc:1005
  msgid "Query"
  msgstr ""
  
- #: methods/ftp.cc:1109
+ #: methods/ftp.cc:1117
  msgid "Unable to invoke "
  msgstr ""
  
@@@ -1807,80 -1814,80 +1814,80 @@@ msgstr "
  msgid "Read error from %s process"
  msgstr ""
  
- #: methods/http.cc:379
+ #: methods/http.cc:385
  msgid "Waiting for headers"
  msgstr ""
  
- #: methods/http.cc:525
+ #: methods/http.cc:531
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr ""
  
- #: methods/http.cc:533
+ #: methods/http.cc:539
  msgid "Bad header line"
  msgstr ""
  
- #: methods/http.cc:552 methods/http.cc:559
+ #: methods/http.cc:558 methods/http.cc:565
  msgid "The HTTP server sent an invalid reply header"
  msgstr ""
  
- #: methods/http.cc:588
+ #: methods/http.cc:594
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr ""
  
- #: methods/http.cc:603
+ #: methods/http.cc:609
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr ""
  
- #: methods/http.cc:605
+ #: methods/http.cc:611
  msgid "This HTTP server has broken range support"
  msgstr ""
  
- #: methods/http.cc:629
+ #: methods/http.cc:635
  msgid "Unknown date format"
  msgstr ""
  
- #: methods/http.cc:782
+ #: methods/http.cc:790
  msgid "Select failed"
  msgstr ""
  
- #: methods/http.cc:787
+ #: methods/http.cc:795
  msgid "Connection timed out"
  msgstr ""
  
- #: methods/http.cc:810
+ #: methods/http.cc:818
  msgid "Error writing to output file"
  msgstr ""
  
- #: methods/http.cc:841
+ #: methods/http.cc:849
  msgid "Error writing to file"
  msgstr ""
  
- #: methods/http.cc:869
+ #: methods/http.cc:877
  msgid "Error writing to the file"
  msgstr ""
  
- #: methods/http.cc:883
+ #: methods/http.cc:891
  msgid "Error reading from server. Remote end closed connection"
  msgstr ""
  
- #: methods/http.cc:885
+ #: methods/http.cc:893
  msgid "Error reading from server"
  msgstr ""
  
- #: methods/http.cc:976 apt-pkg/contrib/mmap.cc:215
+ #: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
  msgid "Failed to truncate file"
  msgstr ""
  
- #: methods/http.cc:1141
+ #: methods/http.cc:1149
  msgid "Bad header data"
  msgstr ""
  
- #: methods/http.cc:1158 methods/http.cc:1213
+ #: methods/http.cc:1166 methods/http.cc:1221
  msgid "Connection failed"
  msgstr ""
  
- #: methods/http.cc:1305
+ #: methods/http.cc:1313
  msgid "Internal error"
  msgstr ""
  
@@@ -2211,16 -2218,16 +2218,16 @@@ msgstr "
  msgid "Dependency generation"
  msgstr ""
  
- #: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:192 apt-pkg/depcache.cc:196
+ #: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
  msgid "Reading state information"
  msgstr ""
  
- #: apt-pkg/depcache.cc:220
+ #: apt-pkg/depcache.cc:223
  #, c-format
  msgid "Failed to open StateFile %s"
  msgstr ""
  
- #: apt-pkg/depcache.cc:226
+ #: apt-pkg/depcache.cc:229
  #, c-format
  msgid "Failed to write temporary StateFile %s"
  msgstr ""
@@@ -2260,32 -2267,32 +2267,32 @@@ msgstr "
  msgid "Malformed line %lu in source list %s (dist parse)"
  msgstr ""
  
- #: apt-pkg/sourcelist.cc:203
+ #: apt-pkg/sourcelist.cc:206
  #, c-format
  msgid "Opening %s"
  msgstr ""
  
- #: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:445
+ #: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr ""
  
- #: apt-pkg/sourcelist.cc:240
+ #: apt-pkg/sourcelist.cc:243
  #, c-format
  msgid "Malformed line %u in source list %s (type)"
  msgstr ""
  
- #: apt-pkg/sourcelist.cc:244
+ #: apt-pkg/sourcelist.cc:247
  #, c-format
  msgid "Type '%s' is not known on line %u in source list %s"
  msgstr ""
  
- #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
+ #: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
  #, c-format
  msgid "Malformed line %u in source list %s (vendor id)"
  msgstr ""
  
--#: apt-pkg/packagemanager.cc:426
++#: apt-pkg/packagemanager.cc:432
  #, c-format
  msgid ""
  "This installation run will require temporarily removing the essential "
@@@ -2357,12 -2364,12 +2364,12 @@@ msgstr "
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr ""
  
- #: apt-pkg/init.cc:132
+ #: apt-pkg/init.cc:133
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr ""
  
- #: apt-pkg/init.cc:148
+ #: apt-pkg/init.cc:149
  msgid "Unable to determine a suitable packaging system type"
  msgstr ""
  
@@@ -2654,6 -2661,6 +2661,21 @@@ msgstr "
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
  
++#: apt-pkg/indexcopy.cc:530
++#, c-format
++msgid "Skipping nonexistent file %s"
++msgstr ""
++
++#: apt-pkg/indexcopy.cc:536
++#, c-format
++msgid "Can't find authentication record for: %s"
++msgstr ""
++
++#: apt-pkg/indexcopy.cc:542
++#, c-format
++msgid "Hash mismatch for: %s"
++msgstr ""
++
  #: apt-pkg/deb/dpkgpm.cc:49
  #, c-format
  msgid "Installing %s"
@@@ -2719,11 -2726,11 +2741,11 @@@ msgstr "
  msgid "Completely removed %s"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:820
+ #: apt-pkg/deb/dpkgpm.cc:822
  msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
  msgstr ""
  
- #: apt-pkg/deb/dpkgpm.cc:848
+ #: apt-pkg/deb/dpkgpm.cc:851
  msgid "Running dpkg"
  msgstr ""