diff options
| -rw-r--r-- | apt-pkg/init.h | 2 | ||||
| -rw-r--r-- | apt-pkg/makefile | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/NEWS (renamed from debian/NEWS.Debian) | 9 | ||||
| -rw-r--r-- | debian/changelog | 56 | ||||
| -rw-r--r-- | doc/apt.conf.5.xml | 15 | ||||
| -rw-r--r-- | methods/ftp.cc | 33 | ||||
| -rw-r--r-- | methods/http.cc | 31 | ||||
| -rw-r--r-- | methods/https.cc | 31 | ||||
| -rw-r--r-- | po/apt-all.pot | 106 |
10 files changed, 166 insertions, 121 deletions
diff --git a/apt-pkg/init.h b/apt-pkg/init.h index 165299253..44d1d107c 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -19,7 +19,7 @@ // See the makefile #define APT_PKG_MAJOR 4 #define APT_PKG_MINOR 8 -#define APT_PKG_RELEASE 0 +#define APT_PKG_RELEASE 1 extern const char *pkgVersion; extern const char *pkgLibVersion; diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 679d97e70..7816ecf0d 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -14,7 +14,7 @@ include ../buildlib/defaults.mak LIBRARY=apt-pkg LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER) MAJOR=4.8 -MINOR=0 +MINOR=1 SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil -ldl APT_DOMAIN:=libapt-pkg$(MAJOR) diff --git a/configure.in b/configure.in index eb3ec0426..bf179ac9d 100644 --- a/configure.in +++ b/configure.in @@ -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) diff --git a/debian/NEWS.Debian b/debian/NEWS index f44d1966b..88f2c564e 100644 --- a/debian/NEWS.Debian +++ b/debian/NEWS @@ -1,3 +1,12 @@ +apt (0.7.23) unstable; urgency=low + + * Code that determines which proxy to use was changed. 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. + + -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Thu, 19 Aug 2009 11:26:16 +0200 + apt (0.6.44) unstable; urgency=low * apt-ftparchive --db now uses Berkeley DB_BTREE instead of DB_HASH. diff --git a/debian/changelog b/debian/changelog index c3f9881ac..10afb5ef9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,35 @@ -apt (0.7.22.3) unstable; urgency=low +apt (0.7.24) UNRELEASED; urgency=low + + [ Nicolas François ] + * Cleaned up the first patch draft from KURASAWA Nozomu to finally + get po4a support for translating the man pages. + Many thanks to both for this excellent work! (Closes: #441608) + * doc/ja/*, doc/po/ja.po: + - remove the old ja man page translation and replace it with + the new po4a-powered translation by KURASAWA Nozomu. + * doc/*.?.xml (manpages): + - add contrib to author tags and also add refmiscinfo to fix warnings + * doc/style.txt, buildlib/defaults.mak, buildlib/manpage.mak: + - fix a few typos in the comments of this files + + [ David Kalnischkies ] + * doc/Doxyfile.in: + - update file with doxygen 1.6.1 (current unstable) + - activate DOT_MULTI_TARGETS, it is default on since doxygen 1.5.9 + * buildlib/po4a_manpage.mak, doc/makefile, configure: + - simplify the makefiles needed for po4a manpages + + -- David Kalnischkies <kalnischkies@gmail.com> Fri, 28 Aug 2009 09:40:08 +0200 + +apt (0.7.23) unstable; 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) [ David Kalnischkies ] * cmdline/apt-get.cc: @@ -22,7 +53,7 @@ apt (0.7.22.3) unstable; urgency=low * 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/init.cc: + * 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: @@ -36,11 +67,6 @@ apt (0.7.22.3) unstable; urgency=low * methods/http.cc: - allow empty Reason-Phase in Status-Line to please squid, thanks Modestas Vainius for noticing! (Closes: #531157, LP: #411435) - * doc/Doxyfile.in: - - update file with doxygen 1.6.1 (current unstable) - - activate DOT_MULTI_TARGETS, it is default on since doxygen 1.5.9 - * buildlib/po4a_manpage.mak, doc/makefile, configure: - - simplify the makefiles needed for po4a manpages [ George Danchev ] * cmdline/apt-cache.cc: @@ -48,19 +74,7 @@ apt (0.7.22.3) unstable; urgency=low * apt-pkg/indexcopy.cc: - fix a memory leak then the Release file not exists (Closes: #511556) - [ Nicolas François ] - * Cleaned up the first patch draft from KURASAWA Nozomu to finally - get po4a support for translating the man pages. - Many thanks to both for this excellent work! (Closes: #441608) - * doc/ja/*, doc/po/ja.po: - - remove the old ja man page translation and replace it with - the new po4a-powered translation by KURASAWA Nozomu. - * doc/*.?.xml (manpages): - - add contrib to author tags and also add refmiscinfo to fix warnings - * doc/style.txt, buildlib/defaults.mak, buildlib/manpage.mak: - - fix a few typos in the comments of this files - - -- David Kalnischkies <david@kalnischkies.com> Sat, 08 Aug 2009 09:40:08 +0200 + -- Michael Vogt <mvo@debian.org> Thu, 27 Aug 2009 14:44:39 +0200 apt (0.7.22.2) unstable; urgency=low @@ -297,7 +311,7 @@ apt (0.7.20) unstable; urgency=low * 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 --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 2412260e7..e0ce0db40 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -204,8 +204,9 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per host proxies can also be specified by using the form <literal>http::Proxy::<host></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,9 +254,13 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; </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::<host></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 diff --git a/methods/ftp.cc b/methods/ftp.cc index 554a24cf5..c91600ad5 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -112,23 +112,28 @@ bool FTPConn::Open(pkgAcqMethod *Owner) Close(); // Determine the proxy setting - if (getenv("ftp_proxy") == 0) + string SpecificProxy = _config->Find("Acquire::ftp::Proxy::" + ServerName.Host); + if (!SpecificProxy.empty()) { - string DefProxy = _config->Find("Acquire::ftp::Proxy"); - string SpecificProxy = _config->Find("Acquire::ftp::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("ftp_proxy"); - + { + string DefProxy = _config->Find("Acquire::ftp::Proxy"); + if (!DefProxy.empty()) + { + Proxy = DefProxy; + } + else + { + char* result = getenv("ftp_proxy"); + Proxy = result ? result : ""; + } + } + // Parse no_proxy, a , separated list of domains if (getenv("no_proxy") != 0) { diff --git a/methods/http.cc b/methods/http.cc index df62034e3..461a98406 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -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) diff --git a/methods/https.cc b/methods/https.cc index 8bf44b52a..37d93e308 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -61,19 +61,26 @@ void HttpsMethod::SetupProxy() URI ServerName = Queue->Uri; // 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 + { + 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 diff --git a/po/apt-all.pot b/po/apt-all.pot index 518a3a1c1..1b763f620 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -994,7 +994,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1933 methods/ftp.cc:702 methods/connect.cc:112 +#: cmdline/apt-get.cc:1933 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "" @@ -1566,147 +1566,147 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:162 +#: methods/ftp.cc:167 msgid "Logging in" msgstr "" -#: methods/ftp.cc:168 +#: methods/ftp.cc:173 msgid "Unable to determine the peer name" msgstr "" -#: methods/ftp.cc:173 +#: methods/ftp.cc:178 msgid "Unable to determine the local name" msgstr "" -#: methods/ftp.cc:204 methods/ftp.cc:232 +#: methods/ftp.cc:209 methods/ftp.cc:237 #, c-format msgid "The server refused the connection and said: %s" msgstr "" -#: methods/ftp.cc:210 +#: methods/ftp.cc:215 #, c-format msgid "USER failed, server said: %s" msgstr "" -#: methods/ftp.cc:217 +#: methods/ftp.cc:222 #, c-format msgid "PASS failed, server said: %s" msgstr "" -#: methods/ftp.cc:237 +#: methods/ftp.cc:242 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" -#: methods/ftp.cc:265 +#: methods/ftp.cc:270 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" -#: methods/ftp.cc:291 +#: methods/ftp.cc:296 #, 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:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" msgstr "" -#: methods/ftp.cc:335 +#: methods/ftp.cc:340 msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 msgid "Read error" msgstr "" -#: methods/ftp.cc:345 methods/rsh.cc:197 +#: methods/ftp.cc:350 methods/rsh.cc:197 msgid "A response overflowed the buffer." msgstr "" -#: methods/ftp.cc:362 methods/ftp.cc:374 +#: methods/ftp.cc:367 methods/ftp.cc:379 msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 msgid "Write error" msgstr "" -#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 +#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734 msgid "Could not create a socket" msgstr "" -#: methods/ftp.cc:698 +#: methods/ftp.cc:703 msgid "Could not connect data socket, connection timed out" msgstr "" -#: methods/ftp.cc:704 +#: methods/ftp.cc:709 msgid "Could not connect passive socket." msgstr "" -#: methods/ftp.cc:722 +#: methods/ftp.cc:727 msgid "getaddrinfo was unable to get a listening socket" msgstr "" -#: methods/ftp.cc:736 +#: methods/ftp.cc:741 msgid "Could not bind a socket" msgstr "" -#: methods/ftp.cc:740 +#: methods/ftp.cc:745 msgid "Could not listen on the socket" msgstr "" -#: methods/ftp.cc:747 +#: methods/ftp.cc:752 msgid "Could not determine the socket's name" msgstr "" -#: methods/ftp.cc:779 +#: methods/ftp.cc:784 msgid "Unable to send PORT command" msgstr "" -#: methods/ftp.cc:789 +#: methods/ftp.cc:794 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "" -#: methods/ftp.cc:798 +#: methods/ftp.cc:803 #, c-format msgid "EPRT failed, server said: %s" msgstr "" -#: methods/ftp.cc:818 +#: methods/ftp.cc:823 msgid "Data socket connect timed out" msgstr "" -#: methods/ftp.cc:825 +#: methods/ftp.cc:830 msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" -#: methods/ftp.cc:877 +#: methods/ftp.cc:882 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "" -#: methods/ftp.cc:892 methods/rsh.cc:322 +#: methods/ftp.cc:897 methods/rsh.cc:322 msgid "Data socket timed out" msgstr "" -#: methods/ftp.cc:922 +#: methods/ftp.cc:927 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "" #. Get the files information -#: methods/ftp.cc:997 +#: methods/ftp.cc:1002 msgid "Query" msgstr "" -#: methods/ftp.cc:1109 +#: methods/ftp.cc:1114 msgid "Unable to invoke " msgstr "" @@ -1814,80 +1814,80 @@ msgstr "" msgid "Read error from %s process" msgstr "" -#: methods/http.cc:379 +#: methods/http.cc:384 msgid "Waiting for headers" msgstr "" -#: methods/http.cc:525 +#: methods/http.cc:530 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:533 +#: methods/http.cc:538 msgid "Bad header line" msgstr "" -#: methods/http.cc:552 methods/http.cc:559 +#: methods/http.cc:557 methods/http.cc:564 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:588 +#: methods/http.cc:593 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:603 +#: methods/http.cc:608 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:605 +#: methods/http.cc:610 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:629 +#: methods/http.cc:634 msgid "Unknown date format" msgstr "" -#: methods/http.cc:782 +#: methods/http.cc:787 msgid "Select failed" msgstr "" -#: methods/http.cc:787 +#: methods/http.cc:792 msgid "Connection timed out" msgstr "" -#: methods/http.cc:810 +#: methods/http.cc:815 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:841 +#: methods/http.cc:846 msgid "Error writing to file" msgstr "" -#: methods/http.cc:869 +#: methods/http.cc:874 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:883 +#: methods/http.cc:888 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:885 +#: methods/http.cc:890 msgid "Error reading from server" msgstr "" -#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 msgid "Failed to truncate file" msgstr "" -#: methods/http.cc:1141 +#: methods/http.cc:1146 msgid "Bad header data" msgstr "" -#: methods/http.cc:1158 methods/http.cc:1213 +#: methods/http.cc:1163 methods/http.cc:1218 msgid "Connection failed" msgstr "" -#: methods/http.cc:1305 +#: methods/http.cc:1310 msgid "Internal error" msgstr "" |