* starmeged with matt, added some comments to the unsetting of no_proxy in ftp.cc

Patches applied:

 * apt@packages.debian.org/apt--main--0--patch-49
   Merge michael.vogt@canonical.com--2004/apt--status-fd--0

 * apt@packages.debian.org/apt--main--0--patch-50
   Increment libapt-pkg version

 * apt@packages.debian.org/apt--main--0--patch-51
   0.6.30

 * michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-32

 * michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-1

 * michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-2
   * changed version of the library

 * michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-3
   * merged with matt again

 * michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-4
   * merged with apt--main--0 and fixed permissions in po/

 * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-1
   tag of michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-4

 * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-2
   * merged with matt's tree

 * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-3
   * removed a stupid "<<<" merge in the changelog

 * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-4
   * star-merged with apt@packages.debian.org/apt--main--0

 * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-5
   * removed the "pre-fork/post-fork" change and put it into it's own branch, star-merged with matt so that it applies cleanly

 * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-6
   * cleaned a incorrect log-file merge

 * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-7
   * removed a conflict in =tagging-method

 * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-8
   * cleaned up the delta so that it no longer contains unreleated whitespace changes

diff --git a/debian/rules b/debian/rules
index b756b3b323c93ae39d9d3ffec3003c1a59975a3a..71d6d549ee58c75fc2633b78db14f3aaac7efb37 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ endif
 # Default rule
 build:
 
-DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS)
+DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEBUILD_DPKG_BUILDPACKAGE_OPTS)
 APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p')
 APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(VERSION,"\(.*\)")/\1/p' configure.in)
 APT_CVSTAG=$(shell echo "$(APT_DEBVER)" | sed -e 's/^/v/' -e 's/\./_/g')

diff --git a/methods/ftp.cc b/methods/ftp.cc
index fafa10534c4fd38e26e6fb19b65a6cedb3d2f483..c115e165ddd405705b7f0f7f0fcf9579766d5e9b 100644 (file)
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -1098,6 +1098,9 @@ int main(int argc,const char *argv[])
         char S[300];
         snprintf(S,sizeof(S),"http_proxy=%s",getenv("ftp_proxy"));
         putenv(S);
+        // mvo: because we switch from ftp to http we have to unset
+        //      "no_proxy". otherwise the http method would try to 
+        //      get a ftp url using http (see #283718)
         putenv("no_proxy=");
         
         // Run the http method

diff --git a/po/apt-all.pot b/po/apt-all.pot
index 4d0e156585bb3975b2d18bb398cd97cf89d48b65..b7062c5883d011d73f28496355bf30ca40f13b2f 100644 (file)
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -1561,7 +1561,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:951 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr ""
 
@@ -1584,7 +1584,7 @@ msgstr ""
 msgid "Query"
 msgstr ""
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1107
 msgid "Unable to invoke "
 msgstr ""
 
@@ -1655,76 +1655,76 @@ msgstr ""
 msgid "Read error from %s process"
 msgstr ""
 
-#: methods/http.cc:344
+#: methods/http.cc:379
 msgid "Waiting for headers"
 msgstr ""
 
-#: methods/http.cc:490
+#: methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr ""
 
-#: methods/http.cc:498
+#: methods/http.cc:533
 msgid "Bad header line"
 msgstr ""
 
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:552 methods/http.cc:559
 msgid "The http server sent an invalid reply header"
 msgstr ""
 
-#: methods/http.cc:553
+#: methods/http.cc:588
 msgid "The http server sent an invalid Content-Length header"
 msgstr ""
 
-#: methods/http.cc:568
+#: methods/http.cc:603
 msgid "The http server sent an invalid Content-Range header"
 msgstr ""
 
-#: methods/http.cc:570
+#: methods/http.cc:605
 msgid "This http server has broken range support"
 msgstr ""
 
-#: methods/http.cc:594
+#: methods/http.cc:629
 msgid "Unknown date format"
 msgstr ""
 
-#: methods/http.cc:737
+#: methods/http.cc:772
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:742
+#: methods/http.cc:777
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:765
+#: methods/http.cc:800
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/http.cc:793
+#: methods/http.cc:828
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:818
+#: methods/http.cc:853
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:832
+#: methods/http.cc:867
 msgid "Error reading from server Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:834
+#: methods/http.cc:869
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:1065
+#: methods/http.cc:1100
 msgid "Bad header Data"
 msgstr ""
 
-#: methods/http.cc:1082
+#: methods/http.cc:1117
 msgid "Connection failed"
 msgstr ""
 
-#: methods/http.cc:1173
+#: methods/http.cc:1208
 msgid "Internal error"
 msgstr ""
 
@@ -2259,31 +2259,31 @@ msgstr ""
 msgid "rename failed, %s (%s -> %s)."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:897
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
 msgid "MD5Sum mismatch"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:711
+#: apt-pkg/acquire-item.cc:718
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:764
+#: apt-pkg/acquire-item.cc:771
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:800
+#: apt-pkg/acquire-item.cc:807
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:887
+#: apt-pkg/acquire-item.cc:894
 msgid "Size mismatch"
 msgstr ""