From e86080159e32b2dd2354c037441a49f1ee0a62dd Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 1 May 2006 16:38:49 +0200 Subject: * debian/postinst: - check for exmaple sources.list before coping it (Bug#361130) --- debian/postinst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/postinst b/debian/postinst index 891792111..1588f5241 100755 --- a/debian/postinst +++ b/debian/postinst @@ -12,7 +12,10 @@ set -e create_apt_conf () { - cp /usr/share/doc/apt/examples/sources.list /etc/apt/sources.list + EXAMPLE_SOURCE=/usr/share/doc/apt/examples/sources.list + if [ -f $EXAMPLE_SOURCE ]; then + cp $EXAMPLE_SOURCE /etc/apt/sources.list + fi } check_apt_conf () -- cgit v1.2.3-70-g09d2 From fc5f54175a514c31c9400d9f9d08e6496cf63823 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 8 May 2006 18:31:47 +0200 Subject: * methods/ftp.cc: remove a tried-to-downloaded file if the file is missing on the sever --- debian/changelog | 3 +++ methods/ftp.cc | 7 +++++-- po/apt-all.pot | 47 ++++++++++++++++++++++------------------------- 3 files changed, 30 insertions(+), 27 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b104e9666..034702090 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,9 @@ apt (0.6.44) unstable; urgency=low - i18n fixes (closes: #349298) * debian/postinst: dont fail on not available /usr/share/doc/apt/examples/sources.list (closes: #361130) + * methods/ftp.cc: + - unlink empty file in partial if the download failed because + the file is missing on the server (closes: #316337) -- diff --git a/methods/ftp.cc b/methods/ftp.cc index f595e0ca4..0c2aa00a7 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -1055,9 +1055,12 @@ bool FtpMethod::Fetch(FetchItem *Itm) UBuf.modtime = FailTime; utime(FailFile.c_str(),&UBuf); - // If the file is missing we hard fail otherwise transient fail - if (Missing == true) + // If the file is missing we hard fail and delete the destfile + // otherwise transient fail + if (Missing == true) { + unlink(FailFile.c_str()); return false; + } Fail(true); return true; } diff --git a/po/apt-all.pot b/po/apt-all.pot index dc455c7af..d2209487a 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-20 12:50+0200\n" +"POT-Creation-Date: 2006-05-08 11:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -417,7 +417,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr "" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "" @@ -1365,7 +1365,7 @@ msgstr "" msgid "Internal error getting a package name" msgstr "" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "" @@ -1409,10 +1409,6 @@ msgstr "" msgid "The pkg cache must be initialized first" msgstr "" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1483,12 +1479,12 @@ msgstr "" msgid "File not found" msgstr "" -#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "" @@ -1637,7 +1633,7 @@ msgstr "" msgid "Query" msgstr "" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "" @@ -1698,37 +1694,38 @@ msgstr "" msgid "Unable to connect to %s %s:" msgstr "" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." msgstr "" -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -msgid "Could not execute " -msgstr "" - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" +#: methods/gpgv.cc:207 +#, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" msgstr "" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2104,12 +2101,12 @@ msgstr "" msgid "Dependency generation" msgstr "" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" -- cgit v1.2.3-70-g09d2 From 9373b9752db017bc8458720f330dc9594ac8de17 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 8 May 2006 22:27:07 +0200 Subject: * apt-pkg/deb/debversion.cc: - applied patch from Lionel Elie Mamane to fix epoch handling (debian: #363358) --- apt-pkg/deb/debversion.cc | 23 ++++++++++++++++++++++- debian/changelog | 6 +++++- test/testdeb.cc | 2 +- test/versions.lst | 7 +++++++ 4 files changed, 35 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/apt-pkg/deb/debversion.cc b/apt-pkg/deb/debversion.cc index aeee61929..064d8fa5b 100644 --- a/apt-pkg/deb/debversion.cc +++ b/apt-pkg/deb/debversion.cc @@ -59,7 +59,7 @@ int debVersioningSystem::CmpFragment(const char *A,const char *AEnd, } /* Iterate over the whole string - What this does is to spilt the whole string into groups of + What this does is to split the whole string into groups of numeric and non numeric portions. For instance: a67bhgs89 Has 4 portions 'a', '67', 'bhgs', '89'. A more normal: @@ -140,6 +140,27 @@ int debVersioningSystem::DoCmpVersion(const char *A,const char *AEnd, if (rhs == BEnd) rhs = B; + // Special case: a zero epoch is the same as no epoch, + // so remove it. + if (lhs != A) + { + for (; *A == '0'; ++A); + if (A == lhs) + { + ++A; + ++lhs; + } + } + if (rhs != B) + { + for (; *B == '0'; ++B); + if (B == rhs) + { + ++B; + ++rhs; + } + } + // Compare the epoch int Res = CmpFragment(A,lhs,B,rhs); if (Res != 0) diff --git a/debian/changelog b/debian/changelog index 034702090..1412fe74e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,8 +22,12 @@ apt (0.6.44) unstable; urgency=low * methods/ftp.cc: - unlink empty file in partial if the download failed because the file is missing on the server (closes: #316337) + * apt-pkg/deb/debversion.cc: + - treats a version string with explicit zero epoch equal + than the same without epoch (Policy 5.6.12, closes: #363358) + Thanks to Lionel Elie Mamane for the patch - -- + -- Michael Vogt Mon, 8 May 2006 22:04:43 +0200 apt (0.6.43.3) unstable; urgency=low diff --git a/test/testdeb.cc b/test/testdeb.cc index 5986621bb..d28f20114 100644 --- a/test/testdeb.cc +++ b/test/testdeb.cc @@ -23,7 +23,7 @@ bool Test(const char *File) return false; // Extract it. - ExtractTar Tar(Deb.GetFile(),Member->Size); + ExtractTar Tar(Deb.GetFile(),Member->Size, "gzip"); NullStream Dir; if (Tar.Go(Dir) == false) return false; diff --git a/test/versions.lst b/test/versions.lst index 008a0f2d7..efc19c4f0 100644 --- a/test/versions.lst +++ b/test/versions.lst @@ -20,6 +20,13 @@ z . -1 # Epochs 1:0.4 10.3 1 1:1.25-4 1:1.25-8 -1 +0:1.18.36 1.18.36 0 + +# Funky, but allowed, characters in upstream version +9:1.18.36:5.4-20 10:0.5.1-22 -1 +9:1.18.36:5.4-20 9:1.18.36:5.5-1 -1 +9:1.18.36:5.4-20 9:1.18.37:4.3-22 -1 +1.18.36-0.17.35-18 1.18.36-19 1 # Junk 1:1.2.13-3 1:1.2.13-3.1 -1 -- cgit v1.2.3-70-g09d2 From 41ca14b3108dbb7b01d1adceee857b52bc955bd5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 8 May 2006 22:28:27 +0200 Subject: * unfinalize --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1412fe74e..772b8e2e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,7 +27,7 @@ apt (0.6.44) unstable; urgency=low than the same without epoch (Policy 5.6.12, closes: #363358) Thanks to Lionel Elie Mamane for the patch - -- Michael Vogt Mon, 8 May 2006 22:04:43 +0200 + -- apt (0.6.43.3) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 53fc30e68e4d588a6b04f3817044517d565c53dc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 11 May 2006 12:06:44 +0200 Subject: debian/changelog: synced with the debian version --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 772b8e2e9..60a302fdc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,7 +27,7 @@ apt (0.6.44) unstable; urgency=low than the same without epoch (Policy 5.6.12, closes: #363358) Thanks to Lionel Elie Mamane for the patch - -- + -- Michael Vogt Mon, 8 May 2006 22:28:53 +0200 apt (0.6.43.3) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 4bbffb86b668e067bf930ae8a57aebc4afa33de5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 16 May 2006 21:16:15 +0200 Subject: * apt-pkg/contrib/sha256.cc: The patch below fixes the problem by open-coding the ntohl() call and combining it with a byte-by-byte load of the 32-bit word. --- apt-pkg/contrib/sha256.cc | 5 ++++- debian/compat | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/apt-pkg/contrib/sha256.cc b/apt-pkg/contrib/sha256.cc index a4d258d26..ad2ddb2d3 100644 --- a/apt-pkg/contrib/sha256.cc +++ b/apt-pkg/contrib/sha256.cc @@ -61,7 +61,10 @@ static inline u32 Maj(u32 x, u32 y, u32 z) static inline void LOAD_OP(int I, u32 *W, const u8 *input) { - W[I] = ntohl( ((u32*)(input))[I] ); + W[I] = ( ((u32) input[I + 0] << 24) + | ((u32) input[I + 1] << 16) + | ((u32) input[I + 2] << 8) + | ((u32) input[I + 3])); } static inline void BLEND_OP(int I, u32 *W) diff --git a/debian/compat b/debian/compat index 00750edc0..7ed6ff82d 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -3 +5 -- cgit v1.2.3-70-g09d2 From 27d1643e70f2426afcf3d60fee5aa88eb6644022 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 16 May 2006 21:38:23 +0200 Subject: * merged cs.po translation --- debian/changelog | 1 + po/cs.po | 215 ++++++++++++++++++++++++++++++------------------------- 2 files changed, 117 insertions(+), 99 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 04c3f02ee..6ce11aafb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ apt (0.6.44.1) unstable; urgency=low - po/LINGUAS: added "bg" Closes: #360262 - po/gl.po: Galician translation update. Closes: #366849 - po/hu.po: Hungarian translation update. Closes: #365448 + - po/cs.po: Czech translation updated. Closes: #367244 -- diff --git a/po/cs.po b/po/cs.po index 1eb240882..837f78065 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,13 +1,13 @@ # Czech translation of APT # This file is put in the public domain. -# Miroslav Kure , 2004-2005. +# Miroslav Kure , 2004-2006. # msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-20 14:01+0100\n" -"PO-Revision-Date: 2005-12-30 15:44+0100\n" +"POT-Creation-Date: 2006-05-08 11:02+0200\n" +"PO-Revision-Date: 2006-05-14 18:36+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" @@ -145,14 +145,14 @@ msgstr " Tabulka verzí:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2378 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pro %s %s zkompilován na %s %s\n" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1659 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -510,7 +510,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr " Odlinkovací limit %sB dosažen.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "Nemohu vyhodnotit %s" @@ -628,7 +628,7 @@ msgstr "Selhalo přejmenování %s na %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba při kompilaci regulárního výrazu - %s" @@ -789,11 +789,11 @@ msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta." msgid "Internal error, Ordering didn't finish" msgstr "Vnitřní chyba, třídění nedoběhlo do konce" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" msgstr "Nemohu zamknout adresář pro stahování" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1890 cmdline/apt-get.cc:2126 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Nelze přečíst seznam zdrojů." @@ -823,7 +823,7 @@ msgstr "Po rozbalení bude na disku použito dalších %sB.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozbalení bude na disku uvolněno %sB.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nemohu určit volné místo v %s" @@ -860,7 +860,7 @@ msgstr "Přerušeno." msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovat [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Selhalo stažení %s %s\n" @@ -869,7 +869,7 @@ msgstr "Selhalo stažení %s %s\n" msgid "Some files failed to download" msgstr "Některé soubory nemohly být staženy" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" msgstr "Stahování dokončeno v režimu pouze stáhnout" @@ -970,7 +970,7 @@ msgstr "Vybraná verze %s (%s) pro %s\n" msgid "The update command takes no arguments" msgstr "Příkaz update neakceptuje žádné argumenty" -#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "Nemohu uzamknout list adresář" @@ -986,21 +986,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnitřní chyba, AllUpgrade pokazil věci" -#: cmdline/apt-get.cc:1502 cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "Nemohu najít balík %s" -#: cmdline/apt-get.cc:1525 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Pozn: vybírám %s pro regulární výraz '%s'\n" -#: cmdline/apt-get.cc:1555 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Pro opravení následujících můžete spustit `apt-get -f install':" -#: cmdline/apt-get.cc:1558 +#: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1008,7 +1008,7 @@ msgstr "" "Nesplněné závislosti. Zkuste spustit 'apt-get -f install' bez balíků (nebo " "navrhněte řešení)." -#: cmdline/apt-get.cc:1570 +#: cmdline/apt-get.cc:1561 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1019,7 +1019,7 @@ msgstr "" "nemožnou situaci, nebo, pokud používáte nestabilní distribuci, že\n" "vyžadované balíky ještě nebyly vytvořeny nebo přesunuty z Příchozí fronty." -#: cmdline/apt-get.cc:1578 +#: cmdline/apt-get.cc:1569 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1029,128 +1029,128 @@ msgstr "" "balík není instalovatelný a měl byste o tom zaslat hlášení o chybě\n" "(bug report)." -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:" -#: cmdline/apt-get.cc:1586 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "Poškozené balíky" -#: cmdline/apt-get.cc:1612 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "Následující extra balíky budou instalovány:" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:1684 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Doporučované balíky:" -#: cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " msgstr "Propočítávám aktualizaci... " -#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Selhalo" -#: cmdline/apt-get.cc:1712 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785 +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" msgstr "Vnitřní chyba, řešitel problémů pokazil věci" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1876 msgid "Must specify at least one package to fetch source for" msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty" -#: cmdline/apt-get.cc:1915 cmdline/apt-get.cc:2144 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" msgstr "Nemohu najít zdrojový balík pro %s" -#: cmdline/apt-get.cc:1959 -#, fuzzy, c-format +#: cmdline/apt-get.cc:1950 +#, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n" +msgstr "Přeskakuji dříve stažený soubor '%s'\n" -#: cmdline/apt-get.cc:1983 +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatek volného místa" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n" -#: cmdline/apt-get.cc:1991 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "Stáhnout zdroj %s\n" -#: cmdline/apt-get.cc:2028 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "Stažení některých archivů selhalo." -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2047 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Příkaz pro rozbalení '%s' selhal.\n" -#: cmdline/apt-get.cc:2069 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Zkontrolujte, zda je nainstalován balíček 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2086 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "Příkaz pro sestavení '%s' selhal.\n" -#: cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "Synovský proces selhal" -#: cmdline/apt-get.cc:2121 +#: cmdline/apt-get.cc:2112 msgid "Must specify at least one package to check builddeps for" msgstr "" "Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti " "pro sestavení" -#: cmdline/apt-get.cc:2149 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nemohu získat závislosti pro sestavení %s" -#: cmdline/apt-get.cc:2169 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žádné závislosti pro sestavení.\n" -#: cmdline/apt-get.cc:2221 +#: cmdline/apt-get.cc:2212 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen" -#: cmdline/apt-get.cc:2273 +#: cmdline/apt-get.cc:2264 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1159,31 +1159,31 @@ msgstr "" "%s závislost pro %s nemůže být splněna protože není k dispozici verze balíku " "%s, která odpovídá požadavku na verzi" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2299 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Selhalo splnění %s závislosti pro %s: Instalovaný balík %s je příliš nový" -#: cmdline/apt-get.cc:2333 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Selhalo splnění %s závislosti pro %s: %s" -#: cmdline/apt-get.cc:2347 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti pro sestavení %s nemohly být splněny." -#: cmdline/apt-get.cc:2351 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "Chyba při zpracování závislostí pro sestavení" -#: cmdline/apt-get.cc:2383 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2415 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1452,7 +1452,7 @@ msgstr "Rozbaluji %s vícekrát" #: apt-inst/extract.cc:137 #, c-format msgid "The directory %s is diverted" -msgstr "Adresář %s je divertován" +msgstr "Adresář %s je odkloněn" #: apt-inst/extract.cc:147 #, c-format @@ -1534,7 +1534,7 @@ msgstr "Nepodařilo se změnit na admin adresář %sinfo" msgid "Internal error getting a package name" msgstr "Vnitřní chyba při získávání jména balíku" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "Čtu výpis souborů" @@ -1581,10 +1581,6 @@ msgstr "Vnitřní chyba při přidávání diverze" msgid "The pkg cache must be initialized first" msgstr "Cache balíků se musí nejprve inicializovat" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "Čtu seznam souborů" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1657,12 +1653,12 @@ msgstr "Disk nebyl nalezen." msgid "File not found" msgstr "Soubor nebyl nalezen" -#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Selhalo vyhodnocení" -#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Nelze nastavit čas modifikace" @@ -1813,7 +1809,7 @@ msgstr "Přenos dat selhal, server řekl '%s'" msgid "Query" msgstr "Dotaz" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Nemohu vyvolat " @@ -1842,69 +1838,71 @@ msgstr "Nemohu navázat spojení na %s:%s (%s)." msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Nemohu se připojit k %s:%s (%s), čas spojení vypršel" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Nemohu se připojit k %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:134 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Připojuji se k %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "Nemohu zjistit '%s'" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Dočasné selhání při zjišťování '%s'" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Něco hodně ošklivého se přihodilo při zjišťování '%s:%s' (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "Nemohu se připojit k %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Nemohu přistoupit ke klíčence: '%s'" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Seznam argumentů Acquire::gpgv::Options je příliš dlouhý. Končím." -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Vnitřní chyba: Dobrý podpis, ale nemohu zjistit otisk klíče?!" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." msgstr "Byl zaznamenán nejméně jeden neplatný podpis. " -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -msgid "Could not execute " -msgstr "Nemohu spustit " - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" -msgstr " pro ověření podpisu (je gnupg nainstalováno?)" +#: methods/gpgv.cc:207 +#, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgstr "" +"Nepodařilo se spustit '%s' pro ověření podpisu (je gnupg nainstalováno?)" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" msgstr "Neznámá chyba při spouštění gpgv" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" msgstr "Následující podpisy jsou neplatné:\n" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2283,12 +2281,12 @@ msgstr "Kandidátské verze" msgid "Dependency generation" msgstr "Generování závislostí" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Nelze zpracovat soubor %s (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nelze zpracovat soubor %s (2)" @@ -2387,11 +2385,18 @@ msgstr "Adresář seznamů %spartial chybí." msgid "Archive directory %spartial is missing." msgstr "Archivní adresář %spartial chybí." -#: apt-pkg/acquire.cc:821 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 #, c-format -msgid "Downloading file %li of %li (%s remaining)" +msgid "Retrieving file %li of %li (%s remaining)" msgstr "Stahuji soubor %li z %li (%s zbývá)" +#: apt-pkg/acquire.cc:825 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "Stahuji soubor %li z %li" + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." @@ -2533,15 +2538,15 @@ msgstr "Chyba IO při ukládání zdrojové cache" msgid "rename failed, %s (%s -> %s)." msgstr "přejmenování selhalo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "Neshoda MD5 součtů" -#: apt-pkg/acquire-item.cc:645 +#: apt-pkg/acquire-item.cc:640 msgid "There are no public key available for the following key IDs:\n" -msgstr "" +msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n" -#: apt-pkg/acquire-item.cc:758 +#: apt-pkg/acquire-item.cc:753 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2550,7 +2555,7 @@ msgstr "" "Nebyl jsem schopen nalézt soubor s balíkem %s. To by mohlo znamenat, že " "tento balík je třeba opravit ručně (kvůli chybějící architektuře)" -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:812 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2559,14 +2564,14 @@ msgstr "" "Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík " "opravit ručně." -#: apt-pkg/acquire-item.cc:853 +#: apt-pkg/acquire-item.cc:848 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s." -#: apt-pkg/acquire-item.cc:940 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "Velikosti nesouhlasí" @@ -2712,14 +2717,26 @@ msgstr "Odstraněn %s" #: apt-pkg/deb/dpkgpm.cc:378 #, c-format -msgid "Preparing for remove with config %s" -msgstr "Připravuji odstranění %s včetně konfiguračních souborů" +msgid "Preparing to completely remove %s" +msgstr "Připravuji úplné odstranění %s" #: apt-pkg/deb/dpkgpm.cc:379 #, c-format -msgid "Removed with config %s" -msgstr "Odstraněn %s včetně konfiguračního souboru" +msgid "Completely removed %s" +msgstr "Kompletně odstraněn %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Spojení bylo předčasně ukončeno" + +#~ msgid "Reading file list" +#~ msgstr "Čtu seznam souborů" + +#~ msgid "Could not execute " +#~ msgstr "Nemohu spustit " + +#~ msgid "Preparing for remove with config %s" +#~ msgstr "Připravuji odstranění %s včetně konfiguračních souborů" + +#~ msgid "Removed with config %s" +#~ msgstr "Odstraněn %s včetně konfiguračního souboru" -- cgit v1.2.3-70-g09d2 From c08447c8eef91499920ca51276313526888939ec Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 9 Jun 2006 15:47:50 +0200 Subject: * merge the patch from Steinar --- apt-pkg/tagfile.cc | 2 +- configure.in | 2 +- debian/changelog | 8 ++++++++ po/apt-all.pot | 8 ++++---- 4 files changed, 14 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index dc1ba3f9e..9763d96a3 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -98,7 +98,7 @@ bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long Offset) iOffset = Offset; Start = Buffer + iOffset; - if (Tag.Scan(Start,End - Start) == false) + if (Start != End && Tag.Scan(Start,End - Start) == false) return _error->Error(_("Unable to parse package file %s (2)"),Fd.Name().c_str()); return true; diff --git a/configure.in b/configure.in index 96adad597..6d42f340e 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.6.44.1") +AC_DEFINE_UNQUOTED(VERSION,"0.6.44.1-0.1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 6ce11aafb..66b5df264 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.6.44.1-0.1) unstable; urgency=low + + * Non-maintainer upload. + * Don't give an error when parsing empty Packages/Sources files. + (Closes: #366931, #367086, #370160) + + -- Steinar H. Gunderson Fri, 9 Jun 2006 00:52:21 +0200 + apt (0.6.44.1) unstable; urgency=low * merged from diff --git a/po/apt-all.pot b/po/apt-all.pot index d2209487a..6929345af 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-08 11:02+0200\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2089,15 +2089,15 @@ msgstr "" msgid "extra" msgstr "" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "" -- cgit v1.2.3-70-g09d2 From 48d59831802223d7a18571dc31b880fa21032d59 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 9 Jun 2006 15:52:30 +0200 Subject: * changelog updates --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 66b5df264..5e1620b7e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.6.44.2) unstable; urgency=low + + * apt-pkg/depcache.cc: + - added Debug::pkgDepCache::AutoInstall (thanks to infinity) + + -- + apt (0.6.44.1-0.1) unstable; urgency=low * Non-maintainer upload. -- cgit v1.2.3-70-g09d2 From c64d1644ae0fd1af92c80a91a6c17b57f0b8f313 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 3 Jul 2006 18:29:57 +0200 Subject: * changelog merged with debian --- debian/changelog | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0c31db6bd..3d5e3c59a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,17 +1,20 @@ -apt (0.6.44.2) unstable; urgency=low - - * apt-pkg/depcache.cc: - - added Debug::pkgDepCache::AutoInstall (thanks to infinity) - * merged from - http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: - * sk.po: Completed to 512t - * eu.po: Completed to 512t - * fr.po: Completed to 512t - * sv.po: Completed to 512t - * Update all PO and the POT. Gives 506t6f for formerly - complete translations - - -- +apt (0.6.44.2) unstable; urgency=low + + * apt-pkg/depcache.cc: + - added Debug::pkgDepCache::AutoInstall (thanks to infinity) + * apt-pkg/acquire-item.cc: + - fix missing chmod() in the new aquire code + (thanks to Bastian Blank, Closes: #367425) + * merged from + http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: + * sk.po: Completed to 512t + * eu.po: Completed to 512t + * fr.po: Completed to 512t + * sv.po: Completed to 512t + * Update all PO and the POT. Gives 506t6f for formerly + complete translations + + -- Michael Vogt Wed, 14 Jun 2006 12:00:57 +0200 apt (0.6.44.1-0.1) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 592b401af9d2db3ba31b6d178fa5a4cf4c1989aa Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 24 Jul 2006 23:06:16 +0200 Subject: * ftparchive/cachedb.cc: - applied patch from ajt (#379576) --- debian/changelog | 3 +++ ftparchive/cachedb.cc | 13 ++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1febfe495..1cafdaa90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ apt (0.6.45) unstable; urgency=low * apt-pkg/contrib/sha256.cc: - fixed the sha256 generation (closes: #378183) + * ftparchive/cachedb.cc: + - applied patch from ajt to fix Clean() function + (closes: #379576) -- diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc index 0e6078642..8a4ca0236 100644 --- a/ftparchive/cachedb.cc +++ b/ftparchive/cachedb.cc @@ -453,15 +453,14 @@ bool CacheDB::Clean() memset(&Data,0,sizeof(Data)); while ((errno = Cursor->c_get(Cursor,&Key,&Data,DB_NEXT)) == 0) { - const char *Colon = (char *)Key.data; - for (; Colon != (char *)Key.data+Key.size && *Colon != ':'; Colon++); - if ((char *)Key.data+Key.size - Colon > 2) + const char *Colon = (char*)memrchr(Key.data, ':', Key.size); + if (Colon) { - if (stringcmp((char *)Key.data,Colon,"st") == 0 || - stringcmp((char *)Key.data,Colon,"cn") == 0 || - stringcmp((char *)Key.data,Colon,"cl") == 0) + if (stringcmp(Colon + 1, (char *)Key.data+Key.size,"st") == 0 || + stringcmp(Colon + 1, (char *)Key.data+Key.size,"cl") == 0 || + stringcmp(Colon + 1, (char *)Key.data+Key.size,"cn") == 0) { - if (FileExists(string(Colon+1,(const char *)Key.data+Key.size)) == true) + if (FileExists(string((const char *)Key.data,Colon)) == true) continue; } } -- cgit v1.2.3-70-g09d2 From 4d9fb6b0afc97d8bd8f4294a0e1791138ba3f799 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 25 Jul 2006 10:08:10 +0200 Subject: * doc/apt-get.8.xml: - point to the right dir for the user guide in the man-page --- debian/changelog | 4 +++- doc/apt-get.8.xml | 2 +- doc/apt.ent | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 04378ea50..6813980c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ apt (0.6.45) unstable; urgency=low * ftparchive/cachedb.cc: - applied patch from ajt to fix Clean() function (closes: #379576) + * doc/apt-get.8.xml: + - fix path to the apt user build (Closes: #375640) * Merged from Christian Perrier bzr branch: * ko.po: Updated to 512t. Closes: #378901 * hu.po: Updated to 512t. Closes: #376330 @@ -17,7 +19,7 @@ apt (0.6.45) unstable; urgency=low * eu.po: Updated * eu.po: Updated - -- + -- apt (0.6.44.2) unstable; urgency=low diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index ac84f342a..b98d58737 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -468,7 +468,7 @@ See Also &apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, &apt-config;, - The APT User's guide in &docdir;, &apt-preferences;, the APT Howto. + The APT User's guide in &guidesdir;, &apt-preferences;, the APT Howto. Diagnostics diff --git a/doc/apt.ent b/doc/apt.ent index cf22df6d2..99fe443cf 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -2,6 +2,7 @@ + &docdir;examples/configure-index.gz"> /etc/apt.conf"> -- cgit v1.2.3-70-g09d2 From 5e9179a6a301de5e6cb0f99098b467d5c35ab8d5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 25 Jul 2006 11:37:20 +0200 Subject: * apt-pkg/deb/dpkgpm.cc: - ignore lines that can't be split properly from dpkg (DpkgPM::Go) * doc/examples/configure-index: - documentation updates --- apt-pkg/deb/dpkgpm.cc | 8 +++++++- configure.in | 2 +- debian/changelog | 5 +++++ doc/examples/configure-index | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 667db8ff2..bf0434ccc 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -624,7 +624,13 @@ bool pkgDPkgPM::Go(int OutStatusFd) */ char* list[5]; - TokSplitString(':', line, list, sizeof(list)/sizeof(list[0])); + if(!TokSplitString(':', line, list, sizeof(list)/sizeof(list[0]))) + // FIXME: dpkg sends multiline error messages sometimes (see + // #374195 for a example. we should support this by + // either patching dpkg to not send multiline over the + // statusfd or by rewriting the code here to deal with + // it. for now we just ignore it and not crash + continue; char *pkg = list[1]; char *action = _strstrip(list[2]); diff --git a/configure.in b/configure.in index 8e1e9bf75..fc4eff203 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.6.44.1-0.1") +AC_DEFINE_UNQUOTED(VERSION,"0.6.45") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 6813980c5..ae12ac8d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,11 @@ apt (0.6.45) unstable; urgency=low (closes: #379576) * doc/apt-get.8.xml: - fix path to the apt user build (Closes: #375640) + * apt-pkg/deb/dpkgpm.cc: + - make progress reporting more robust against multiline error + messages (first half of a fix for #374195) + * doc/examples/configure-index: + - document Debug::pkgAcquire::Auth * Merged from Christian Perrier bzr branch: * ko.po: Updated to 512t. Closes: #378901 * hu.po: Updated to 512t. Closes: #376330 diff --git a/doc/examples/configure-index b/doc/examples/configure-index index b87e85030..f8abd75ed 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -247,6 +247,7 @@ Debug pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies pkgAcquire "false"; pkgAcquire::Worker "false"; + pkgAcquire::Auth "false"; pkgDPkgPM "false"; pkgDPkgProgressReporting "false"; pkgOrderList "false"; -- cgit v1.2.3-70-g09d2 From 7fcfa551824e25e63eb51ab39fe3f82fe47a706f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 25 Jul 2006 11:46:44 +0200 Subject: * added missing examples file --- debian/examples | 1 + 1 file changed, 1 insertion(+) create mode 100644 debian/examples (limited to 'debian') diff --git a/debian/examples b/debian/examples new file mode 100644 index 000000000..80a386c8a --- /dev/null +++ b/debian/examples @@ -0,0 +1 @@ +doc/examples/*.py -- cgit v1.2.3-70-g09d2 From 29a94ac60295f49f9f42099cd5c17b7100601240 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 25 Jul 2006 11:48:48 +0200 Subject: * undo the debian/examples add --- debian/examples | 1 - 1 file changed, 1 deletion(-) delete mode 100644 debian/examples (limited to 'debian') diff --git a/debian/examples b/debian/examples deleted file mode 100644 index 80a386c8a..000000000 --- a/debian/examples +++ /dev/null @@ -1 +0,0 @@ -doc/examples/*.py -- cgit v1.2.3-70-g09d2 From 2abb68b77d4be00173c0aaab7d05277a053d3c5f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 25 Jul 2006 11:55:17 +0200 Subject: * methods/gpgv.cc: - deal with gpgs NODATA message --- debian/changelog | 3 +++ methods/gpgv.cc | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ae12ac8d1..8a0093dcb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,9 @@ apt (0.6.45) unstable; urgency=low messages (first half of a fix for #374195) * doc/examples/configure-index: - document Debug::pkgAcquire::Auth + * methods/gpgv.cc: + - deal with gpg error "NODATA". Closes: #296103, Thanks to + Luis Rodrigo Gallardo Cruz for the patch * Merged from Christian Perrier bzr branch: * ko.po: Updated to 512t. Closes: #378901 * hu.po: Updated to 512t. Closes: #376330 diff --git a/methods/gpgv.cc b/methods/gpgv.cc index ba7389cba..227e08d63 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -17,6 +17,7 @@ #define GNUPGBADSIG "[GNUPG:] BADSIG" #define GNUPGNOPUBKEY "[GNUPG:] NO_PUBKEY" #define GNUPGVALIDSIG "[GNUPG:] VALIDSIG" +#define GNUPGNODATA "[GNUPG:] NODATA" class GPGVMethod : public pkgAcqMethod { @@ -171,7 +172,12 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, std::cerr << "Got NO_PUBKEY " << std::endl; NoPubKeySigners.push_back(string(buffer+sizeof(GNUPGPREFIX))); } - + if (strncmp(buffer, GNUPGNODATA, sizeof(GNUPGBADSIG)-1) == 0) + { + if (_config->FindB("Debug::Acquire::gpgv", false)) + std::cerr << "Got NODATA! " << std::endl; + BadSigners.push_back(string(buffer+sizeof(GNUPGPREFIX))); + } if (strncmp(buffer, GNUPGVALIDSIG, sizeof(GNUPGVALIDSIG)-1) == 0) { char *sig = buffer + sizeof(GNUPGPREFIX); -- cgit v1.2.3-70-g09d2 From a9be43ff002473c6a4c5197ba3767ee938ae3ed1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 25 Jul 2006 12:59:12 +0200 Subject: * apt-inst/contrib/extracttar.cc: - assign the return string value from Find() before calling c_str() on it, otherwise the string goes out of scope and is deleted --- apt-inst/contrib/extracttar.cc | 3 ++- debian/changelog | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc index d6da802fe..062c06fa4 100644 --- a/apt-inst/contrib/extracttar.cc +++ b/apt-inst/contrib/extracttar.cc @@ -136,7 +136,8 @@ bool ExtractTar::StartGzip() const char *Args[3]; string confvar = string("dir::bin::") + DecompressProg; - Args[0] = _config->Find(confvar.c_str(),DecompressProg.c_str()).c_str(); + string argv0 = _config->Find(confvar.c_str(),DecompressProg.c_str()); + Args[0] = argv0.c_str(); Args[1] = "-d"; Args[2] = 0; execvp(Args[0],(char **)Args); diff --git a/debian/changelog b/debian/changelog index 8a0093dcb..4de7f3f0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ apt (0.6.45) unstable; urgency=low * methods/gpgv.cc: - deal with gpg error "NODATA". Closes: #296103, Thanks to Luis Rodrigo Gallardo Cruz for the patch + * apt-inst/contrib/extracttar.cc: + - fix for string mangling, closes: #373864 * Merged from Christian Perrier bzr branch: * ko.po: Updated to 512t. Closes: #378901 * hu.po: Updated to 512t. Closes: #376330 @@ -27,7 +29,7 @@ apt (0.6.45) unstable; urgency=low * eu.po: Updated * eu.po: Updated - -- + -- Michael Vogt Tue, 25 Jul 2006 11:55:22 +0200 apt (0.6.44.2) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 584c10c51b4006c869bacf8d3d85e0019543478e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 25 Jul 2006 13:32:01 +0200 Subject: * typo fix --- debian/changelog | 2 ++ doc/apt-cache.8.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4de7f3f0d..4263750b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ apt (0.6.45) unstable; urgency=low (closes: #379576) * doc/apt-get.8.xml: - fix path to the apt user build (Closes: #375640) + * doc/apt-cache.8.xml: + - typo (Closes: #376408) * apt-pkg/deb/dpkgpm.cc: - make progress reporting more robust against multiline error messages (first half of a fix for #374195) diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 789c3d228..2779f2501 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -277,7 +277,7 @@ Reverse Provides: Select the file to store the source cache. The source is used only by gencaches and it stores a parsed version of the package information from remote sources. When building the package cache the - source cache is used to advoid reparsing all of the package files. + source cache is used to avoid reparsing all of the package files. Configuration Item: Dir::Cache::srcpkgcache. -- cgit v1.2.3-70-g09d2 From 4577fda2b5f2b21f5400d10f4db71a8095f0df58 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 25 Jul 2006 13:48:17 +0200 Subject: * apt-pkg/acquire-item.cc: - check "/bin/bzip2" instead of "/usr/bin/bzip2" --- apt-pkg/acquire-item.cc | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 1fa929aad..421288007 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -149,7 +149,7 @@ pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner, if(comprExt.empty()) { // autoselect the compression method - if(FileExists("/usr/bin/bzip2")) + if(FileExists("/bin/bzip2")) CompressionExtension = ".bz2"; else CompressionExtension = ".gz"; diff --git a/debian/changelog b/debian/changelog index 4263750b7..c658fe400 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ apt (0.6.45) unstable; urgency=low Luis Rodrigo Gallardo Cruz for the patch * apt-inst/contrib/extracttar.cc: - fix for string mangling, closes: #373864 + * apt-pkg/acquire-item.cc: + - check for bzip2 in /bin (closes: #377391) * Merged from Christian Perrier bzr branch: * ko.po: Updated to 512t. Closes: #378901 * hu.po: Updated to 512t. Closes: #376330 -- cgit v1.2.3-70-g09d2