From 11c1180e67f19b9c0ef14a10c4062e35f8afd1ef Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 8 Jan 2013 18:26:58 +0100 Subject: doc/po/it.po: fix small XML errors --- doc/po/it.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/po/it.po b/doc/po/it.po index a4d8d0ccc..544263d0d 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -1001,7 +1001,7 @@ msgid "" "literal>, the option or per package with the " "pkg/release syntax, if possible." msgstr "" -"source fa sì che apt-get scarichi i " +"source fa sì che apt-get scarichi i " "pacchetti sorgente. APT esaminerà i pacchetti disponibili per decidere quali " "pacchetti sorgente scaricare. Poi, se possibile, troverà e scaricherà nella " "directory corrente la versione più recente disponibile di quel pacchetto " @@ -6965,7 +6965,7 @@ msgid "" msgstr "" "APT può essere esteso con ulteriori metodi forniti in altri pacchetti " "opzionali, i cui nomi devono seguire lo schema apt-" -"transport-metodo. Per esempio, il team di APT " +"transport-metodo. Per esempio, il team di APT " "mantiene anche il pacchetto apt-transport-https che " "fornisce i metodi di accesso per URI HTTPS con funzionalità simili a quelle " "del metodo http. Sono disponibili anche i metodi per usare, ad esempio, " -- cgit v1.2.3 From 0425a56bf14c2411534326a0d3410a512c5ddeaa Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 8 Jan 2013 18:42:09 +0100 Subject: add missing translated apt.8 manpages, thanks to Helge Kreutzmann. Closes: #696923 --- debian/changelog | 2 ++ debian/rules | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index dcc6e4d16..e308eb02c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ apt (0.9.7.8) UNRELEASED; urgency=low [ Michael Vogt ] * fix pkgProblemResolver::Scores, thanks to Paul Wise. Closes: #697577 + * add missing translated apt.8 manpages, thanks to Helge Kreutzmann. + Closes: #696923 -- Christian Perrier Mon, 24 Dec 2012 07:01:20 +0100 diff --git a/debian/rules b/debian/rules index 83e23881c..5051dab4f 100755 --- a/debian/rules +++ b/debian/rules @@ -172,7 +172,7 @@ apt-doc: build-debiandoc # Build architecture-dependent files here. binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-transport-https -apt_MANPAGES = apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list +apt_MANPAGES = apt apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list apt: build build-manpages dh_testdir -p$@ dh_testroot -p$@ -- cgit v1.2.3 From 291f47791d2c0d8521922c8d3090e2aa6f099d5b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 9 Jan 2013 06:33:56 +0100 Subject: * apt-pkg/contrib/progress.cc: - Make "..." translatable to fix inconsistencies in the output of e.g. apt-get update. While this adds new translatable strings, not having translations for them will not break anything. Thanks to Guillem Jover. Closes: #696225 --- apt-pkg/contrib/progress.cc | 4 ++-- debian/changelog | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc index 317048845..17a6b70e9 100644 --- a/apt-pkg/contrib/progress.cc +++ b/apt-pkg/contrib/progress.cc @@ -176,7 +176,7 @@ void OpTextProgress::Update() if (OldOp.empty() == false) cout << endl; OldOp = "a"; - cout << Op << "..." << flush; + cout << Op << _("...") << flush; } return; @@ -192,7 +192,7 @@ void OpTextProgress::Update() } // Print the spinner - snprintf(S,sizeof(S),"\r%s... %u%%",Op.c_str(),(unsigned int)Percent); + snprintf(S,sizeof(S),_("\r%s... %u%%"),Op.c_str(),(unsigned int)Percent); Write(S); OldOp = Op; diff --git a/debian/changelog b/debian/changelog index e308eb02c..02fcdaa8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,11 @@ apt (0.9.7.8) UNRELEASED; urgency=low Closes: #697577 * add missing translated apt.8 manpages, thanks to Helge Kreutzmann. Closes: #696923 + * apt-pkg/contrib/progress.cc: + - Make "..." translatable to fix inconsistencies in the output + of e.g. apt-get update. While this adds new translatable strings, + not having translations for them will not break anything. + Thanks to Guillem Jover. Closes: #696225 -- Christian Perrier Mon, 24 Dec 2012 07:01:20 +0100 -- cgit v1.2.3 From 50816ce74432f24135aefc590361bbb8ccfc71f1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 9 Jan 2013 06:57:13 +0100 Subject: * debian/apt.cron.daily: - when reading from /dev/urandom, use less entropy and fix a rare bug when the random number chksum is less than 1000. Closes: #695285 --- debian/apt.cron.daily | 2 +- debian/changelog | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 5c00f22db..27f08dd4a 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -289,7 +289,7 @@ random_sleep() fi if [ -z "$RANDOM" ] ; then # A fix for shells that do not have this bash feature. - RANDOM=$(dd if=/dev/urandom count=1 2> /dev/null | cksum | cut -c"1-5") + RANDOM=$(dd if=/dev/urandom bs=2 count=1 2> /dev/null | cksum | cut -d' ' -f1 | cut -c"1-5") fi TIME=$(($RANDOM % $RandomSleep)) debug_echo "sleeping for $TIME seconds" diff --git a/debian/changelog b/debian/changelog index 02fcdaa8b..d08dd8038 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,10 @@ apt (0.9.7.8) UNRELEASED; urgency=low of e.g. apt-get update. While this adds new translatable strings, not having translations for them will not break anything. Thanks to Guillem Jover. Closes: #696225 + * debian/apt.cron.daily: + - when reading from /dev/urandom, use less entropy and fix a rare + bug when the random number chksum is less than 1000. + Closes: #695285 -- Christian Perrier Mon, 24 Dec 2012 07:01:20 +0100 -- cgit v1.2.3 From 34c2a164242d06b206abfde18e28990908aa9c58 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 9 Jan 2013 08:24:42 +0100 Subject: fix missing translated apt.8 manpages, thanks to Helge Kreutzmann for the report. Closes: #696923 --- configure.in | 2 +- debian/changelog | 2 ++ doc/makefile | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index be3634abe..fa10058ef 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) PACKAGE="apt" -PACKAGE_VERSION="0.9.7.7" +PACKAGE_VERSION="0.9.7.8~20130109" PACKAGE_MAIL="APT Development Team " AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") diff --git a/debian/changelog b/debian/changelog index dcc6e4d16..46213d779 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ apt (0.9.7.8) UNRELEASED; urgency=low [ Michael Vogt ] * fix pkgProblemResolver::Scores, thanks to Paul Wise. Closes: #697577 + * fix missing translated apt.8 manpages, thanks to Helge Kreutzmann + for the report. Closes: #696923 -- Christian Perrier Mon, 24 Dec 2012 07:01:20 +0100 diff --git a/doc/makefile b/doc/makefile index 8021bce3f..be8357d80 100644 --- a/doc/makefile +++ b/doc/makefile @@ -87,7 +87,9 @@ update-po: --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf $(MANPAGEPOLIST) :: manpages-translation-% : %/makefile po4a.conf + # first line is for apt.8 (see Bug#696923) po4a --previous --no-backups --translate-only $(dir $<)apt.ent \ + $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.8,%.$(subst /,,$(dir $<)).8,$(wildcard *.8))) \ $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.1.xml,%.$(subst /,,$(dir $<)).1.xml,$(wildcard *.1.xml))) \ $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.2.xml,%.$(subst /,,$(dir $<)).2.xml,$(wildcard *.2.xml))) \ $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.3.xml,%.$(subst /,,$(dir $<)).3.xml,$(wildcard *.3.xml))) \ -- cgit v1.2.3 From cc41811512ba00f70738b70f0448c9172b71daf2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 9 Jan 2013 11:00:13 +0100 Subject: * methods/https.cc: - reuse connection in https, thanks to Thomas Bushnell, BSG for the patch. LP: #1087543, Closes: #695359 --- debian/changelog | 3 +++ methods/https.cc | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 840d9ebd9..0b20b03de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,9 @@ apt (0.9.7.8) UNRELEASED; urgency=low - when reading from /dev/urandom, use less entropy and fix a rare bug when the random number chksum is less than 1000. Closes: #695285 + * methods/https.cc: + - reuse connection in https, thanks to Thomas Bushnell, BSG for the + patch. LP: #1087543, Closes: #695359 -- Christian Perrier Mon, 24 Dec 2012 07:01:20 +0100 diff --git a/methods/https.cc b/methods/https.cc index c1a49ba60..11d4ba8aa 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -124,7 +124,6 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, progress_callback); curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, this); curl_easy_setopt(curl, CURLOPT_NOPROGRESS, false); - curl_easy_setopt(curl, CURLOPT_FAILONERROR, true); curl_easy_setopt(curl, CURLOPT_FILETIME, true); // SSL parameters are set by default to the common (non mirror-specific) value @@ -240,6 +239,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_setopt(curl, CURLOPT_VERBOSE, true); // error handling + curl_errorstr[0] = '\0'; curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curl_errorstr); // If we ask for uncompressed files servers might respond with content- @@ -288,7 +288,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm) File->Close(); // cleanup - if(success != 0) + if(success != 0 || (curl_responsecode != 200 && curl_responsecode != 304)) { _error->Error("%s", curl_errorstr); // unlink, no need keep 401/404 page content in partial/ -- cgit v1.2.3 From 45a9cc46a143cc2864bba910cff2d9dfc1172dec Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 9 Jan 2013 14:47:35 +0100 Subject: add missing curl_easy_cleanup() --- debian/changelog | 1 + methods/https.h | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0b20b03de..ec77904e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ apt (0.9.7.8) UNRELEASED; urgency=low * methods/https.cc: - reuse connection in https, thanks to Thomas Bushnell, BSG for the patch. LP: #1087543, Closes: #695359 + - add missing curl_easy_cleanup() -- Christian Perrier Mon, 24 Dec 2012 07:01:20 +0100 diff --git a/methods/https.h b/methods/https.h index b1961a870..293e288e0 100644 --- a/methods/https.h +++ b/methods/https.h @@ -41,6 +41,11 @@ class HttpsMethod : public pkgAcqMethod File = 0; curl = curl_easy_init(); }; + + ~HttpsMethod() + { + curl_easy_cleanup(curl); + }; }; #include -- cgit v1.2.3 From d925ac78f9068618bad0027fff56278d452a7c91 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 10 Jan 2013 16:46:06 +0100 Subject: instead of cut, use % 32767 --- debian/apt.cron.daily | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 27f08dd4a..2665b6579 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -289,7 +289,7 @@ random_sleep() fi if [ -z "$RANDOM" ] ; then # A fix for shells that do not have this bash feature. - RANDOM=$(dd if=/dev/urandom bs=2 count=1 2> /dev/null | cksum | cut -d' ' -f1 | cut -c"1-5") + RANDOM=$(( $(dd if=/dev/urandom bs=2 count=1 2> /dev/null | cksum | cut -d' ' -f1) % 32767 )) fi TIME=$(($RANDOM % $RandomSleep)) debug_echo "sleeping for $TIME seconds" -- cgit v1.2.3 From 72663b44179f4c6f3ec2e4ec25d8df3c4590b222 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 11 Jan 2013 09:51:00 +0100 Subject: * methods/http.cc: - quote spaces in filenames to ensure as the http method is also (potentially) used for non deb,dsc content that may contain spaces, thanks to Daniel Hartwig and Thomas Bushnell (LP: #1086997) --- debian/changelog | 5 +++++ methods/http.cc | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ec77904e7..c956f57d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,11 @@ apt (0.9.7.8) UNRELEASED; urgency=low - reuse connection in https, thanks to Thomas Bushnell, BSG for the patch. LP: #1087543, Closes: #695359 - add missing curl_easy_cleanup() + * methods/http.cc: + - quote spaces in filenames to ensure as the http method is also + (potentially) used for non deb,dsc content that may contain + spaces, thanks to Daniel Hartwig and Thomas Bushnell + (LP: #1086997) -- Christian Perrier Mon, 24 Dec 2012 07:01:20 +0100 diff --git a/methods/http.cc b/methods/http.cc index acf25a42a..b7e766004 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -686,7 +686,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out) and we expect the proxy to do this */ if (Proxy.empty() == true || Proxy.Host.empty()) sprintf(Buf,"GET %s HTTP/1.1\r\nHost: %s\r\nConnection: keep-alive\r\n", - QuoteString(Uri.Path,"~").c_str(),ProperHost.c_str()); + QuoteString(Uri.Path,"~ ").c_str(),ProperHost.c_str()); else { /* Generate a cache control header if necessary. We place a max -- cgit v1.2.3 From 1d12857c083b436fb88710cd8e87267ece7af8a9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 24 Jan 2013 18:52:25 +0100 Subject: quote plus in filenames to work around a bug in the S3 server (LP: #1003633) --- debian/changelog | 2 ++ methods/http.cc | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c956f57d3..6c1bb0877 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,8 @@ apt (0.9.7.8) UNRELEASED; urgency=low (potentially) used for non deb,dsc content that may contain spaces, thanks to Daniel Hartwig and Thomas Bushnell (LP: #1086997) + - quote plus in filenames to work around a bug in the S3 server + (LP: #1003633) -- Christian Perrier Mon, 24 Dec 2012 07:01:20 +0100 diff --git a/methods/http.cc b/methods/http.cc index b7e766004..fddf8a78e 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -685,8 +685,12 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out) pass it on, HTTP/1.1 says the connection should default to keep alive and we expect the proxy to do this */ if (Proxy.empty() == true || Proxy.Host.empty()) + { + // see LP bugs #1003633 and #1086997. The "+" is encoded as a workaround + // for a amazon S3 bug sprintf(Buf,"GET %s HTTP/1.1\r\nHost: %s\r\nConnection: keep-alive\r\n", - QuoteString(Uri.Path,"~ ").c_str(),ProperHost.c_str()); + QuoteString(Uri.Path,"+~ ").c_str(),ProperHost.c_str()); + } else { /* Generate a cache control header if necessary. We place a max -- cgit v1.2.3 From 8d326119082e239e17c4179de77a77911414d2df Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 24 Jan 2013 18:55:44 +0100 Subject: * apt-pkg/indexrecords.cc: - support '\r' in the Release file --- apt-pkg/indexrecords.cc | 5 +++-- debian/changelog | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc index af2639beb..649b6059d 100644 --- a/apt-pkg/indexrecords.cc +++ b/apt-pkg/indexrecords.cc @@ -173,7 +173,7 @@ bool indexRecords::parseSumData(const char *&Start, const char *End, /*{{{*/ Hash = ""; Size = 0; /* Skip over the first blank */ - while ((*Start == '\t' || *Start == ' ' || *Start == '\n') + while ((*Start == '\t' || *Start == ' ' || *Start == '\n' || *Start == '\r') && Start < End) Start++; if (Start >= End) @@ -215,7 +215,8 @@ bool indexRecords::parseSumData(const char *&Start, const char *End, /*{{{*/ EntryEnd = Start; /* Find the end of the third entry (the filename) */ - while ((*EntryEnd != '\t' && *EntryEnd != ' ' && *EntryEnd != '\n') + while ((*EntryEnd != '\t' && *EntryEnd != ' ' && + *EntryEnd != '\n' && *EntryEnd != '\r') && EntryEnd < End) EntryEnd++; diff --git a/debian/changelog b/debian/changelog index 6c1bb0877..9632a7691 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,8 @@ apt (0.9.7.8) UNRELEASED; urgency=low (LP: #1086997) - quote plus in filenames to work around a bug in the S3 server (LP: #1003633) + * apt-pkg/indexrecords.cc: + - support '\r' in the Release file -- Christian Perrier Mon, 24 Dec 2012 07:01:20 +0100 -- cgit v1.2.3 From 0597dcd8fa8f933d8bf0d7fbea395408bf3b7e5d Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Tue, 5 Feb 2013 07:00:04 +0100 Subject: Japanese (Kenshi Muto). Closes: #699783 --- debian/changelog | 3 +++ po/ja.po | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9632a7691..8f9f4b97d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ apt (0.9.7.8) UNRELEASED; urgency=low [ Manpages translation updates ] * Italian (Beatrice Torracca). Closes: #696601 + [ Programs translation updates ] + * Japanese (Kenshi Muto). Closes: #699783 + [ Michael Vogt ] * fix pkgProblemResolver::Scores, thanks to Paul Wise. Closes: #697577 diff --git a/po/ja.po b/po/ja.po index fb455abcc..9fe66d972 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: apt 0.9.7.1\n" "Report-Msgid-Bugs-To: APT Development Team \n" "POT-Creation-Date: 2012-10-15 09:49+0200\n" -"PO-Revision-Date: 2012-07-01 00:14+0900\n" +"PO-Revision-Date: 2013-02-05 09:41+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" "Language: ja\n" @@ -227,7 +227,7 @@ msgstr "" " -p=? パッケージキャッシュ\n" " -s=? ソースキャッシュ\n" " -q プログレス表示をしない\n" -" -i umnet コマンドで重要な依存情報のみを表示する\n" +" -i unmet コマンドで重要な依存情報のみを表示する\n" " -c=? 指定した設定ファイルを読み込む\n" " -o=? 指定した設定オプションを読み込む (例: -o dir::cache=/tmp)\n" "詳細は、apt-cache(8) や apt.conf(5) のマニュアルページを参照してください。\n" @@ -448,8 +448,8 @@ msgstr "'%s' のような仮想パッケージは削除できません\n" #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "" -"パッケージ %s はインストールされていないため、削除はできません。'%s' のことで" -"しょうか?\n" +"パッケージ '%s' はインストールされていないため、削除はできません。'%s' のこと" +"でしょうか?\n" #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 #, c-format @@ -679,7 +679,7 @@ msgstr[0] "" #: cmdline/apt-get.cc:1421 msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "注意: これは dpkg により自動でわざと行われれます。" +msgstr "注意: これは dpkg により自動でわざと行われます。" #: cmdline/apt-get.cc:1559 #, c-format @@ -2726,7 +2726,7 @@ msgstr "" #: apt-pkg/sourcelist.cc:116 #, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" -msgstr "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s にキーがありません)" +msgstr "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] にキーがありません)" #: apt-pkg/sourcelist.cc:119 #, c-format -- cgit v1.2.3