From: jbj Date: Thu, 26 Oct 2000 15:32:03 +0000 (+0000) Subject: Add base64 fiddles to get at signature contents to librpmio.a. X-Git-Tag: rpm-4.4-release~1807 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=12dd80dc37fef861ada690fa0c7ffcc8a47d4fa4;p=platform%2Fupstream%2Frpm.git Add base64 fiddles to get at signature contents to librpmio.a. parsePrep.c: fix typo's. CVS patchset: 4227 CVS date: 2000/10/26 15:32:03 --- diff --git a/Doxyfile.in b/Doxyfile.in index e8e3386..e2b1c22 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -322,6 +322,8 @@ INPUT = \ ./lib/transaction.c \ ./lib/uninstall.c \ ./lib/verify.c \ + ./rpmio/base64.c \ + ./rpmio/base64.h \ ./rpmio/macro.c \ ./rpmio/md5.c \ ./rpmio/rpmlog.c \ diff --git a/build/parsePrep.c b/build/parsePrep.c index 4e13f67..11553e7 100644 --- a/build/parsePrep.c +++ b/build/parsePrep.c @@ -54,7 +54,6 @@ static int checkOwners(const char *urlfn) * @param removeEmpties include -E? * @return expanded %patch macro (NULL on error) */ - */ /*@observer@*/ static char *doPatch(Spec spec, int c, int strip, const char *db, int reverse, int removeEmpties) { @@ -145,7 +144,6 @@ static int checkOwners(const char *urlfn) * @param quietly should -vv be omitted from tar? * @return expanded %setup macro (NULL on error) */ - */ /*@observer@*/ static const char *doUntar(Spec spec, int c, int quietly) { const char *fn, *urlfn; diff --git a/po/cs.po b/po/cs.po index 069b2dc..e86a18c 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-24 09:32-0400\n" +"POT-Creation-Date: 2000-10-26 11:14-0400\n" "PO-Revision-Date: 2000-08-08 22:37+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -1762,7 +1762,7 @@ msgstr " msgid "Bad file: %s: %s" msgstr "©patný soubor: %s: %s" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "©patný vlastník/skupina: %s" @@ -2109,63 +2109,63 @@ msgstr " msgid "Spec file can't use BuildRoot" msgstr "Spec soubor nemù¾e pou¾ít BuildRoot" -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, c-format msgid "Bad source: %s: %s" msgstr "©patný zdroj: %s: %s" -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, c-format msgid "No patch number %d" msgstr "Patch èíslo %d neexistuje" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "Zdroj èíslo %d neexistuje" -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, c-format msgid "Couldn't download nosource %s: %s" msgstr "Nemohu naèíst nosource %s: %s" -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "Chyba pøi parsování %%setup: %s" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "øádek %d: ©patný parametr v %%setup %c: %s" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "øádek %d: ©patná volba v %%setup %s: %s" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "øádek %d: K %%patch -b potøebuji parametr: %s" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "øádek %d: K %%patch -z potøebuji parametr: %s" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "øádek %d: K %%patch -p potøebuji parametr: %s" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "øádek %d: ©patný parametr pro %%patch -p: %s" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "Pøíli¹ mnoho patchù!" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "øádek %d: ©patný parametr pro %%patch: %s" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "øádek %d: druhý %%prep" diff --git a/po/da.po b/po/da.po index 1b6af0b..ccb742a 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-24 09:32-0400\n" +"POT-Creation-Date: 2000-10-26 11:14-0400\n" "PO-Revision-Date: 2000-03-07 05:17+01:00\n" "Last-Translator: K. Christiansen \n" "Language-Team: Danish/Dansk \n" @@ -1731,7 +1731,7 @@ msgstr "" msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "" @@ -2078,63 +2078,63 @@ msgstr "" msgid "Spec file can't use BuildRoot" msgstr "" -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, c-format msgid "Bad source: %s: %s" msgstr "" -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, c-format msgid "No patch number %d" msgstr "" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "" -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, c-format msgid "Couldn't download nosource %s: %s" msgstr "" -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "" diff --git a/po/de.po b/po/de.po index 924aede..b567fec 100644 --- a/po/de.po +++ b/po/de.po @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-24 09:32-0400\n" +"POT-Creation-Date: 2000-10-26 11:14-0400\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -1943,7 +1943,7 @@ msgstr "" msgid "Bad file: %s: %s" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "" @@ -2306,64 +2306,64 @@ msgid "Spec file can't use BuildRoot" msgstr "" # , c-format -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, fuzzy, c-format msgid "Bad source: %s: %s" msgstr "Lesen von %s fehlgeschlagen: %s." -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, fuzzy, c-format msgid "No patch number %d" msgstr "(keine Zahl)" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "" # , c-format -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, fuzzy, c-format msgid "Couldn't download nosource %s: %s" msgstr "Lesen von %s fehlgeschlagen: %s." -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "" diff --git a/po/es.po b/po/es.po index 3b757b9..9e1c28e 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-24 09:32-0400\n" +"POT-Creation-Date: 2000-10-26 11:14-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1699,7 +1699,7 @@ msgstr "" msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "" @@ -2046,63 +2046,63 @@ msgstr "" msgid "Spec file can't use BuildRoot" msgstr "" -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, c-format msgid "Bad source: %s: %s" msgstr "" -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, c-format msgid "No patch number %d" msgstr "" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "" -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, c-format msgid "Couldn't download nosource %s: %s" msgstr "" -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "" diff --git a/po/fi.po b/po/fi.po index b0d9dc1..d3ef9d9 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2000-10-24 09:32-0400\n" +"POT-Creation-Date: 2000-10-26 11:14-0400\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=\n" @@ -1893,7 +1893,7 @@ msgstr "" msgid "Bad file: %s: %s" msgstr "en voinut avata %s: %s" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "" @@ -2240,63 +2240,63 @@ msgstr "" msgid "Spec file can't use BuildRoot" msgstr "" -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, fuzzy, c-format msgid "Bad source: %s: %s" msgstr "En voi lukea %s: %s." -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, fuzzy, c-format msgid "No patch number %d" msgstr "(ei ole luku)" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "" -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, fuzzy, c-format msgid "Couldn't download nosource %s: %s" msgstr "En voi lukea %s: %s." -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "" diff --git a/po/fr.po b/po/fr.po index a78a804..d149432 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,5 +1,5 @@ msgid "" -msgstr "POT-Creation-Date: 2000-10-24 09:32-0400\n" +msgstr "POT-Creation-Date: 2000-10-26 11:14-0400\n" #: build.c:25 lib/rpminstall.c:460 #, c-format @@ -1900,7 +1900,7 @@ msgstr "" msgid "Bad file: %s: %s" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "" @@ -2247,63 +2247,63 @@ msgstr "" msgid "Spec file can't use BuildRoot" msgstr "" -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, fuzzy, c-format msgid "Bad source: %s: %s" msgstr "impossible d'ouvrir: %s\n" -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, c-format msgid "No patch number %d" msgstr "" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "" -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, fuzzy, c-format msgid "Couldn't download nosource %s: %s" msgstr "impossible d'ouvrir: %s\n" -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "" diff --git a/po/gl.po b/po/gl.po index 3b757b9..9e1c28e 100644 --- a/po/gl.po +++ b/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-24 09:32-0400\n" +"POT-Creation-Date: 2000-10-26 11:14-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1699,7 +1699,7 @@ msgstr "" msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "" @@ -2046,63 +2046,63 @@ msgstr "" msgid "Spec file can't use BuildRoot" msgstr "" -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, c-format msgid "Bad source: %s: %s" msgstr "" -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, c-format msgid "No patch number %d" msgstr "" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "" -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, c-format msgid "Couldn't download nosource %s: %s" msgstr "" -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "" diff --git a/po/hu.po b/po/hu.po index 3b757b9..9e1c28e 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-24 09:32-0400\n" +"POT-Creation-Date: 2000-10-26 11:14-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1699,7 +1699,7 @@ msgstr "" msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "" @@ -2046,63 +2046,63 @@ msgstr "" msgid "Spec file can't use BuildRoot" msgstr "" -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, c-format msgid "Bad source: %s: %s" msgstr "" -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, c-format msgid "No patch number %d" msgstr "" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "" -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, c-format msgid "Couldn't download nosource %s: %s" msgstr "" -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "" diff --git a/po/id.po b/po/id.po index 3b757b9..9e1c28e 100644 --- a/po/id.po +++ b/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-24 09:32-0400\n" +"POT-Creation-Date: 2000-10-26 11:14-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1699,7 +1699,7 @@ msgstr "" msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "" @@ -2046,63 +2046,63 @@ msgstr "" msgid "Spec file can't use BuildRoot" msgstr "" -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, c-format msgid "Bad source: %s: %s" msgstr "" -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, c-format msgid "No patch number %d" msgstr "" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "" -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, c-format msgid "Couldn't download nosource %s: %s" msgstr "" -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "" diff --git a/po/is.po b/po/is.po index fcba843..60462ad 100644 --- a/po/is.po +++ b/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 1.37\n" -"POT-Creation-Date: 2000-10-24 09:32-0400\n" +"POT-Creation-Date: 2000-10-26 11:14-0400\n" "PO-Revision-Date: 2000-08-02 13:00+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -1726,7 +1726,7 @@ msgstr "" msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "" @@ -2073,63 +2073,63 @@ msgstr "" msgid "Spec file can't use BuildRoot" msgstr "" -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, c-format msgid "Bad source: %s: %s" msgstr "" -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, c-format msgid "No patch number %d" msgstr "" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "" -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, c-format msgid "Couldn't download nosource %s: %s" msgstr "" -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "" diff --git a/po/it.po b/po/it.po index 3b757b9..9e1c28e 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-24 09:32-0400\n" +"POT-Creation-Date: 2000-10-26 11:14-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1699,7 +1699,7 @@ msgstr "" msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "" @@ -2046,63 +2046,63 @@ msgstr "" msgid "Spec file can't use BuildRoot" msgstr "" -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, c-format msgid "Bad source: %s: %s" msgstr "" -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, c-format msgid "No patch number %d" msgstr "" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "" -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, c-format msgid "Couldn't download nosource %s: %s" msgstr "" -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "" diff --git a/po/ja.po b/po/ja.po index 20f33c3..2d9e646 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-24 09:32-0400\n" +"POT-Creation-Date: 2000-10-26 11:14-0400\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -88,7 +88,7 @@ msgstr " # build root [BuildRoot] # net share [¥Í¥Ã¥È¶¦Í­] # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë] -# $Id: ja.po,v 1.116 2000/10/24 13:46:52 jbj Exp $ +# $Id: ja.po,v 1.117 2000/10/26 15:32:04 jbj Exp $ #: rpm.c:184 rpmqv.c:267 #, c-format msgid "rpm: %s\n" @@ -1837,7 +1837,7 @@ msgstr " msgid "Bad file: %s: %s" msgstr "¥Õ¥¡¥¤¥ë %s: %s\n" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "ÉÔÀµ¤Ê½êÍ­¼Ô/¥°¥ë¡¼¥×: %s" @@ -2184,63 +2184,63 @@ msgstr "%d msgid "Spec file can't use BuildRoot" msgstr "¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë¤Ï BuildRoot ¤ò»ÈÍѤǤ­¤Þ¤»¤ó" -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, c-format msgid "Bad source: %s: %s" msgstr "ÉÔÀµ¤Ê¥½¡¼¥¹: %s : %s" -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, c-format msgid "No patch number %d" msgstr "¥Ñ¥Ã¥ÁÈÖ¹æ %d ¤Ï¤¢¤ê¤Þ¤»¤ó" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "¥½¡¼¥¹ÈÖ¹æ %d ¤Ï¤¢¤ê¤Þ¤»¤ó" -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, fuzzy, c-format msgid "Couldn't download nosource %s: %s" msgstr "nosource %s ¤ò¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó: %s" -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "%%setup ¤Î¹½Ê¸²òÀÏ¥¨¥é¡¼: %s" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "%d ¹ÔÌÜ: %%setup %c ¤Ø¤ÎÉÔÀµ¤Ê°ú¿ô: %s" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "%d ¹ÔÌÜ: ÉÔÀµ¤Ê %%setup ¥ª¥×¥·¥ç¥ó %s: %s" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "%d ¹ÔÌÜ: %%patch -b ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹: %s" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "%d ¹ÔÌÜ: %%patch -z ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹: %s" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "%d ¹ÔÌÜ: %%patch -p ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹: %s" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "%d ¹ÔÌÜ: ÉÔÀµ¤Ê %%patch -p ¤Ø¤Î°ú¿ô: %s" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "¥Ñ¥Ã¥Á¤¬Â¿¤¹¤®¤Þ¤¹" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "%d ¹ÔÌÜ: %%patch ¤Ø¤ÎÉÔÀµ¤Ê°ú¿ô: %s" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "%d ¹ÔÌÜ: 2ÈÖÌܤΠ%%prep" diff --git a/po/ko.po b/po/ko.po index 3b757b9..9e1c28e 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-24 09:32-0400\n" +"POT-Creation-Date: 2000-10-26 11:14-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1699,7 +1699,7 @@ msgstr "" msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "" @@ -2046,63 +2046,63 @@ msgstr "" msgid "Spec file can't use BuildRoot" msgstr "" -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, c-format msgid "Bad source: %s: %s" msgstr "" -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, c-format msgid "No patch number %d" msgstr "" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "" -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, c-format msgid "Couldn't download nosource %s: %s" msgstr "" -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "" diff --git a/po/no.po b/po/no.po index 7bc7b0a..0c88dc1 100644 --- a/po/no.po +++ b/po/no.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-24 09:32-0400\n" +"POT-Creation-Date: 2000-10-26 11:14-0400\n" "PO-Revision-Date: 2000-08-04 02:59+02:00\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -1732,7 +1732,7 @@ msgstr "" msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "" @@ -2079,63 +2079,63 @@ msgstr "" msgid "Spec file can't use BuildRoot" msgstr "" -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, c-format msgid "Bad source: %s: %s" msgstr "" -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, c-format msgid "No patch number %d" msgstr "" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "" -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, c-format msgid "Couldn't download nosource %s: %s" msgstr "" -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "" diff --git a/po/pl.po b/po/pl.po index fa595a3..143f59e 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-24 09:32-0400\n" +"POT-Creation-Date: 2000-10-26 11:14-0400\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -1853,7 +1853,7 @@ msgstr "linia: %s" msgid "Bad file: %s: %s" msgstr "plik %s: %s\n" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "B³êdny u¿ytkownik/grupa: %s" @@ -2200,63 +2200,63 @@ msgstr "linia %d: Nieznana etykieta: %s" msgid "Spec file can't use BuildRoot" msgstr "W pliku spec nie mo¿na u¿ywaæ wpisów BuildRoot" -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, c-format msgid "Bad source: %s: %s" msgstr "B³êdne ¼ród³o: %s: %s" -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, c-format msgid "No patch number %d" msgstr "Brak ³aty numer %d" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "Brak ¼ród³a numer %d" -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, c-format msgid "Couldn't download nosource %s: %s" msgstr "" -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "B³±d przetwarzania %%setup: %s" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "linia %d: B³êdny argument dla %%setup %c: %s" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "linia %d: B³êdna opcja %%setup %s: %s" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "linia %d: Wymagany argument dla %%patch -b: %s" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "linia %d: Wymagany argument dla %%patch -z: %s" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "linia %d: Wymagany argument dla %%patch -p: %s" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "linia %d: B³êdny argument dla %%patch -p: %s" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "Zbyt wiele ³at!" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "linia %d: B³êdny argument dla %%patch: %s" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "linia %d: druga sekcja %%prep" diff --git a/po/pt.po b/po/pt.po index d0c98a0..17e0e5d 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-24 09:32-0400\n" +"POT-Creation-Date: 2000-10-26 11:14-0400\n" "PO-Revision-Date: 2000-08-01 21:11+01:00\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt \n" @@ -1696,7 +1696,7 @@ msgstr "" msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "" @@ -2043,63 +2043,63 @@ msgstr "" msgid "Spec file can't use BuildRoot" msgstr "" -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, c-format msgid "Bad source: %s: %s" msgstr "" -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, c-format msgid "No patch number %d" msgstr "" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "" -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, c-format msgid "Couldn't download nosource %s: %s" msgstr "" -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 59ef31e..dcf7ea7 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2,7 +2,7 @@ # Revised by Arnaldo Carvalho de Melo , 1998. # msgid "" -msgstr "POT-Creation-Date: 2000-10-24 09:32-0400\n" +msgstr "POT-Creation-Date: 2000-10-26 11:14-0400\n" #: build.c:25 lib/rpminstall.c:460 #, c-format @@ -1944,7 +1944,7 @@ msgstr "" msgid "Bad file: %s: %s" msgstr "Não consegui ler o arquivo spec de %s\n" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "" @@ -2309,64 +2309,64 @@ msgid "Spec file can't use BuildRoot" msgstr "" # , c-format -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, fuzzy, c-format msgid "Bad source: %s: %s" msgstr "Não consegui ler o arquivo spec de %s\n" -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, c-format msgid "No patch number %d" msgstr "" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "" # , c-format -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, fuzzy, c-format msgid "Couldn't download nosource %s: %s" msgstr "Não consegui ler o arquivo spec de %s\n" -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "" diff --git a/po/ro.po b/po/ro.po index d878e20..0228a63 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-24 09:32-0400\n" +"POT-Creation-Date: 2000-10-26 11:14-0400\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" @@ -1694,7 +1694,7 @@ msgstr "" msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "" @@ -2041,63 +2041,63 @@ msgstr "" msgid "Spec file can't use BuildRoot" msgstr "" -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, c-format msgid "Bad source: %s: %s" msgstr "" -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, c-format msgid "No patch number %d" msgstr "" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "" -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, c-format msgid "Couldn't download nosource %s: %s" msgstr "" -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index cc8f771..8b34a2a 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-10-24 09:32-0400\n" +"POT-Creation-Date: 2000-10-26 11:14-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1699,7 +1699,7 @@ msgstr "" msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "" @@ -2046,63 +2046,63 @@ msgstr "" msgid "Spec file can't use BuildRoot" msgstr "" -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, c-format msgid "Bad source: %s: %s" msgstr "" -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, c-format msgid "No patch number %d" msgstr "" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "" -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, c-format msgid "Couldn't download nosource %s: %s" msgstr "" -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "" diff --git a/po/ru.po b/po/ru.po index 9900bdd..7df9dd3 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.1\n" -"POT-Creation-Date: 2000-10-24 09:32-0400\n" +"POT-Creation-Date: 2000-10-26 11:14-0400\n" "PO-Revision-Date: 2000-08-08 01:20+0300\n" "Last-Translator: Leon Kanter \n" "Language-Team: Black Cat Linux Team \n" @@ -1778,7 +1778,7 @@ msgstr " msgid "Bad file: %s: %s" msgstr "îÅ×ÅÒÎÙÊ ÆÁÊÌ %s: %s" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "îÅ×ÅÒÎÁÑ ÐÁÒÁ ÈÏÚÑÉÎ/ÇÒÕÐÐÁ: %s" @@ -2125,63 +2125,63 @@ msgstr " msgid "Spec file can't use BuildRoot" msgstr "æÁÊÌ spec ÎÅ ÍÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØ BuildRoot" -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, c-format msgid "Bad source: %s: %s" msgstr "îÅ×ÅÒÎÙÊ ÉÓÈÏÄÎÉË: %s: %s" -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, c-format msgid "No patch number %d" msgstr "îÅÔ ÚÁÐÌÁÔÙ ÎÏÍÅÒ %d" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "îÅÔ ÉÓÈÏÄÎÉËÁ ÎÏÍÅÒ %d" -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, c-format msgid "Couldn't download nosource %s: %s" msgstr "îÅ ÍÏÇÕ ÐÏÌÕÞÉÔØ nosource %s: %s" -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "ïÛÉÂËÁ ÁÎÁÌÉÚÁ %%setup: %s" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ ÄÌÑ %%setup %c: %s" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÁÑ ÏÐÃÉÑ %%setup %s: %s" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "ÓÔÒÏËÁ %d: äÌÑ %%patch -b ÎÕÖÅÎ ÁÒÇÕÍÅÎÔ: %s" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "ÓÔÒÏËÁ %d: äÌÑ %%patch -z ÎÕÖÅÎ ÁÒÇÕÍÅÎÔ: %s" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "ÓÔÒÏËÁ %d: äÌÑ %%patch -p ÎÕÖÅÎ ÁÒÇÕÍÅÎÔ: %s" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ ÄÌÑ %%patch -p: %s" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÚÁÐÌÁÔ!" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ ÄÌÑ %%patch: %s" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "ÓÔÒÏËÁ %d: ×ÔÏÒÏÊ %%prep" diff --git a/po/sk.po b/po/sk.po index 70ec326..75fec68 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-24 09:32-0400\n" +"POT-Creation-Date: 2000-10-26 11:14-0400\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -1862,7 +1862,7 @@ msgstr "riadok: %s" msgid "Bad file: %s: %s" msgstr "súbor %s: %s\n" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "Chybný vlastník/skupina: %s" @@ -2209,63 +2209,63 @@ msgstr "riadok %d: Nezn msgid "Spec file can't use BuildRoot" msgstr "Spec súbor nemô¾e pou¾i» BuildRoot" -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, c-format msgid "Bad source: %s: %s" msgstr "Chybný zdroj %s: %s" -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, c-format msgid "No patch number %d" msgstr "Neexistuje patch èíslo %d" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "Neexistuje zdroj èíslo %d" -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, c-format msgid "Couldn't download nosource %s: %s" msgstr "Nebolo mo¾né prenies» nie-zdroj %s: %s" -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "Chyba pri analýze %%setup: %s" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "riadok %d: Chybný argument pre %%setup %c: %s" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "riadok %d: Chybná voµba pre %%setup %s: %s" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "riadok %d: %%patch -b potrebuje argument: %s" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "riadok %d: %%patch -z potrebuje argument: %s" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "riadok %d: %%patch -p potrebuje argument: %s" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "riadok %d: Chybný argument pre %%patch -p: %s" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "Priveµa záplat!" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "riadok %d: Chybný argument pre %%patch: %s" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "riadok %d: druhý %%prep" diff --git a/po/sl.po b/po/sl.po index 69137c2..d3a3249 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,12 +1,12 @@ # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr. # Copyright (C) 2000 Free Software Foundation, Inc. # Primo¾ Peterlin , 2000. -# $Id: sl.po,v 1.101 2000/10/24 13:46:55 jbj Exp $ +# $Id: sl.po,v 1.102 2000/10/26 15:32:14 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-24 09:32-0400\n" +"POT-Creation-Date: 2000-10-26 11:14-0400\n" "PO-Revision-Date: 2000-02-17 22:25+01:00\n" "Last-Translator: Primo¾ Peterlin \n" "Language-Team: Slovenian \n" @@ -1844,7 +1844,7 @@ msgstr "vrstica: %s" msgid "Bad file: %s: %s" msgstr "Okvarjena datoteka: %s: %s" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "Okvarjen lastnik/skupina: %s" @@ -2191,63 +2191,63 @@ msgstr "vrstica %d: Neznana zna msgid "Spec file can't use BuildRoot" msgstr "Datoteka spec ne more uporabiti BuildRoot" -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, c-format msgid "Bad source: %s: %s" msgstr "Okvarjen izvor: %s: %s" -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, c-format msgid "No patch number %d" msgstr "Krparija ¹t. %d manjka" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "Izvorna koda ¹t. %d manjka" -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, c-format msgid "Couldn't download nosource %s: %s" msgstr "Ni mo¾no nalo¾iti nosource %s: %s" -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "Napaka pri razèlembi %%setup: %s" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "vrstica %d: Okvarjen argument za %%setup %c: %s" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "vrstica %d: Okvarjena izbira %%setup %s: %s" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "vrstica %d: Manjkajoè argument za %%patch -b: %s" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "vrstica %d: Manjkajoè argument za %%patch -z: %s" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "vrstica %d: Manjkajoè argument za %%patch -p: %s" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "vrstica %d: Okvarjen argument za %%patch -p: %s" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "Preveè krparij!" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "vrstica %d: Okvarjen argument za %%patch: %s" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "vrstica %d: drugi %%prep" diff --git a/po/sr.po b/po/sr.po index 2cf9574..35f985b 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2000-10-24 09:32-0400\n" +"POT-Creation-Date: 2000-10-26 11:14-0400\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" "From: Erik Troan \n" @@ -1850,7 +1850,7 @@ msgstr "" msgid "Bad file: %s: %s" msgstr "neuspelo otvaranje %s: %s" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "" @@ -2197,63 +2197,63 @@ msgstr "" msgid "Spec file can't use BuildRoot" msgstr "" -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, fuzzy, c-format msgid "Bad source: %s: %s" msgstr "Neuspelo èitanje %s: %s." -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, fuzzy, c-format msgid "No patch number %d" msgstr "(nije broj)" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "" -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, fuzzy, c-format msgid "Couldn't download nosource %s: %s" msgstr "Neuspelo èitanje %s: %s." -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "" diff --git a/po/sv.po b/po/sv.po index 398dcac..b71996a 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-24 09:32-0400\n" +"POT-Creation-Date: 2000-10-26 11:14-0400\n" "PO-Revision-Date: 2000-08-07 16:53+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -1753,7 +1753,7 @@ msgstr "rad: %s" msgid "Bad file: %s: %s" msgstr "Felaktig fil: %s: %s" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "Felaktig ägare/grupp: %s" @@ -2100,63 +2100,63 @@ msgstr "rad %d: Ok msgid "Spec file can't use BuildRoot" msgstr "Spec-fil kan inte använda BuildRoot" -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, c-format msgid "Bad source: %s: %s" msgstr "Dålig källa: %s: %s" -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, c-format msgid "No patch number %d" msgstr "Inget patch-nummer %d" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "Inget källkodsnummer %d" -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, c-format msgid "Couldn't download nosource %s: %s" msgstr "Kunde inte hämta nosource %s: %s" -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "Fel i parsning av %%setup: %s" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "rad %d: Felaktigt argument till %%setup %c: %s" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "rad %d: Felaktig %%setup-flagga %s: %s" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "rad %d: Behöver argument till %%patch -b: %s" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "rad %d: Behöver argument till %%patch -z: %s" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "rad %d: Behöver argument till %%patch -p: %s" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "rad %d: Felaktigt argument till %%patch -p: %s" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "För många patchar!" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "rad %d: Felaktigt argument till %%patch: %s" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "rad %d: andra %%prep" diff --git a/po/tr.po b/po/tr.po index 212a51d..f879f3f 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-24 09:32-0400\n" +"POT-Creation-Date: 2000-10-26 11:14-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1900,7 +1900,7 @@ msgstr "" msgid "Bad file: %s: %s" msgstr "%s açýlamadý: %s" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "" @@ -2248,63 +2248,63 @@ msgstr "" msgid "Spec file can't use BuildRoot" msgstr "" -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, fuzzy, c-format msgid "Bad source: %s: %s" msgstr "%s okunamadý: %s" -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, fuzzy, c-format msgid "No patch number %d" msgstr "(üye deðil)" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "" -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, fuzzy, c-format msgid "Couldn't download nosource %s: %s" msgstr "%s okunamadý: %s" -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "" diff --git a/po/uk.po b/po/uk.po index 3b757b9..9e1c28e 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-24 09:32-0400\n" +"POT-Creation-Date: 2000-10-26 11:14-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1699,7 +1699,7 @@ msgstr "" msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "" @@ -2046,63 +2046,63 @@ msgstr "" msgid "Spec file can't use BuildRoot" msgstr "" -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, c-format msgid "Bad source: %s: %s" msgstr "" -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, c-format msgid "No patch number %d" msgstr "" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "" -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, c-format msgid "Couldn't download nosource %s: %s" msgstr "" -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "" diff --git a/po/wa.po b/po/wa.po index 3b757b9..9e1c28e 100644 --- a/po/wa.po +++ b/po/wa.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-24 09:32-0400\n" +"POT-Creation-Date: 2000-10-26 11:14-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1699,7 +1699,7 @@ msgstr "" msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "" @@ -2046,63 +2046,63 @@ msgstr "" msgid "Spec file can't use BuildRoot" msgstr "" -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, c-format msgid "Bad source: %s: %s" msgstr "" -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, c-format msgid "No patch number %d" msgstr "" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "" -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, c-format msgid "Couldn't download nosource %s: %s" msgstr "" -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "" diff --git a/po/zh.po b/po/zh.po index 3b757b9..9e1c28e 100644 --- a/po/zh.po +++ b/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-24 09:32-0400\n" +"POT-Creation-Date: 2000-10-26 11:14-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1699,7 +1699,7 @@ msgstr "" msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "" @@ -2046,63 +2046,63 @@ msgstr "" msgid "Spec file can't use BuildRoot" msgstr "" -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, c-format msgid "Bad source: %s: %s" msgstr "" -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, c-format msgid "No patch number %d" msgstr "" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "" -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, c-format msgid "Couldn't download nosource %s: %s" msgstr "" -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "" diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index 3b757b9..9e1c28e 100644 --- a/po/zh_CN.GB2312.po +++ b/po/zh_CN.GB2312.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0\n" -"POT-Creation-Date: 2000-10-24 09:32-0400\n" +"POT-Creation-Date: 2000-10-26 11:14-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1699,7 +1699,7 @@ msgstr "" msgid "Bad file: %s: %s" msgstr "" -#: build/files.c:1583 build/parsePrep.c:35 +#: build/files.c:1583 build/parsePrep.c:40 #, c-format msgid "Bad owner/group: %s" msgstr "" @@ -2046,63 +2046,63 @@ msgstr "" msgid "Spec file can't use BuildRoot" msgstr "" -#: build/parsePrep.c:31 +#: build/parsePrep.c:36 #, c-format msgid "Bad source: %s: %s" msgstr "" -#: build/parsePrep.c:58 +#: build/parsePrep.c:73 #, c-format msgid "No patch number %d" msgstr "" -#: build/parsePrep.c:140 +#: build/parsePrep.c:162 #, c-format msgid "No source number %d" msgstr "" -#: build/parsePrep.c:159 +#: build/parsePrep.c:181 #, c-format msgid "Couldn't download nosource %s: %s" msgstr "" -#: build/parsePrep.c:225 +#: build/parsePrep.c:254 msgid "Error parsing %%setup: %s" msgstr "" -#: build/parsePrep.c:240 +#: build/parsePrep.c:269 msgid "line %d: Bad arg to %%setup %c: %s" msgstr "" -#: build/parsePrep.c:258 +#: build/parsePrep.c:287 msgid "line %d: Bad %%setup option %s: %s" msgstr "" -#: build/parsePrep.c:385 +#: build/parsePrep.c:420 msgid "line %d: Need arg to %%patch -b: %s" msgstr "" -#: build/parsePrep.c:393 +#: build/parsePrep.c:428 msgid "line %d: Need arg to %%patch -z: %s" msgstr "" -#: build/parsePrep.c:405 +#: build/parsePrep.c:440 msgid "line %d: Need arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:411 +#: build/parsePrep.c:446 msgid "line %d: Bad arg to %%patch -p: %s" msgstr "" -#: build/parsePrep.c:418 +#: build/parsePrep.c:453 msgid "Too many patches!" msgstr "" -#: build/parsePrep.c:422 +#: build/parsePrep.c:457 msgid "line %d: Bad arg to %%patch: %s" msgstr "" -#: build/parsePrep.c:458 +#: build/parsePrep.c:493 msgid "line %d: second %%prep" msgstr "" diff --git a/rpmio/.cvsignore b/rpmio/.cvsignore index cdaf0e3..6e78333 100644 --- a/rpmio/.cvsignore +++ b/rpmio/.cvsignore @@ -6,3 +6,4 @@ Makefile.in *.la *.lo trpmio +tkey diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am index 09e361e..d64b7cd 100644 --- a/rpmio/Makefile.am +++ b/rpmio/Makefile.am @@ -7,10 +7,11 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build -I$(top_srcdir)/lib \ pkgincdir = $(pkgincludedir) pkginc_HEADERS = rpmio.h rpmurl.h rpmmacro.h rpmlog.h rpmmessages.h rpmerr.h -noinst_HEADERS = rpmio_internal.h ugid.h +noinst_HEADERS = base64.h rpmio_internal.h ugid.h lib_LTLIBRARIES = librpmio.la -librpmio_la_SOURCES = rpmrpc.c rpmio.c rpmio_api.c url.c macro.c md5.c \ +librpmio_la_SOURCES = rpmrpc.c rpmio.c rpmio_api.c url.c macro.c \ + base64.c md5.c \ ugid.c rpmmalloc.c rpmlog.c # XXX Add internal libtool dependence @@ -27,3 +28,5 @@ lclint: trpmio: librpmio.la trpmio.o $(LINK) -o $@ trpmio.o librpmio.la $(top_builddir)/popt/libpopt.la +tkey: librpmio.la tkey.o + $(LINK) -o $@ tkey.o librpmio.la $(top_builddir)/popt/libpopt.la diff --git a/rpmio/base64.c b/rpmio/base64.c new file mode 100644 index 0000000..03e40c9 --- /dev/null +++ b/rpmio/base64.c @@ -0,0 +1,122 @@ +/** \ingroup signature + * \file rpmio/base64.c + * + */ + +static int _debug = 0; + +#include "system.h" + +#include "base64.h" + +int B64decode (const char * s, void ** datap, size_t *lenp) +{ + static char * b64dec = NULL; + unsigned char *t, *te; + size_t ns, nt; + int a, b, c, d; + + if (s == NULL) return 1; + ns = strlen(s); + if (ns & 0x3) return 2; + + if (b64dec == NULL) { + b64dec = xmalloc(255); + memset(b64dec, 0x80, 255); + for (c = 'A'; c <= 'Z'; c++) + b64dec[ c ] = 0 + (c - 'A'); + for (c = 'a'; c <= 'z'; c++) + b64dec[ c ] = 26 + (c - 'a'); + for (c = '0'; c <= '9'; c++) + b64dec[ c ] = 52 + (c - '0'); + b64dec['+'] = 62; + b64dec['/'] = 63; + b64dec['='] = 0; + } + + nt = (ns / 4) * 3; + t = te = xmalloc(nt + 1); + + while (ns > 0) { + if ((a = b64dec[ *s++ ]) == 0x80) + break; + if ((b = b64dec[ *s++ ]) == 0x80) + break; + if ((c = b64dec[ *s++ ]) == 0x80) + break; + if ((d = b64dec[ *s++ ]) == 0x80) + break; +if (_debug) +fprintf(stderr, "%7u %02x %02x %02x %02x -> %02x %02x %02x\n", +(unsigned)ns, a, b, c, d, +(((a << 2) | (b >> 4)) & 0xff), +(((b << 4) | (c >> 2)) & 0xff), +(((c << 6) | d) & 0xff)); + ns -= 4; + *te++ = (a << 2) | (b >> 4); + if (s[-2] == '=') break; + *te++ = (b << 4) | (c >> 2); + if (s[-1] == '=') break; + *te++ = (c << 6) | d; + } + + if (ns > 0) { + free(t); + return 3; + } + if (lenp) + *lenp = (te - t); + if (datap) + *datap = t; + else + free(t); + + return 0; +} + +char * B64encode (const void * str, size_t ns) +{ + static char b64enc[] = + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + const unsigned char *s = str; + unsigned char *t, *te; + size_t nt; + unsigned c; + + if (s == NULL) return NULL; + if (*s == '\0') return xstrdup(""); + + if (ns == 0) ns = strlen(s); + nt = ((ns + 2) / 3) * 4; + t = te = xmalloc(nt + 1); + + while (ns) { + +if (_debug) +fprintf(stderr, "%7u %02x %02x %02x -> %02x %02x %02x %02x\n", +(unsigned)ns, s[0], s[1], s[2], +(s[0] >> 2), +((s[0] & 0x3) << 4) | (s[1] >> 4), +((s[1] & 0xf) << 2) | (s[2] >> 6), +(s[2]& 0x3f)); + c = *s++; + *te++ = b64enc[ (c >> 2) ]; + *te++ = b64enc[ ((c & 0x3) << 4) | (*s >> 4) ]; + if (--ns <= 0) { + *te++ = '='; + *te++ = '='; + continue; + } + c = *s++; + *te++ = b64enc[ ((c & 0xf) << 2) | (*s >> 6) ]; + if (--ns <= 0) { + *te++ = '='; + continue; + } + *te++ = b64enc[ (*s & 0x3f) ]; + s++; + --ns; + } + *te = '\0'; + return t; +} diff --git a/rpmio/base64.h b/rpmio/base64.h new file mode 100644 index 0000000..47092ec --- /dev/null +++ b/rpmio/base64.h @@ -0,0 +1,33 @@ +#ifndef H_BASE64 +#define H_BASE64 + +/** \ingroup rpmio + * \file rpmio/base64.h + */ + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * Decode chunks of 4 bytes of base64 input into 3 bytes of binary output. + * @param s base64 string + * @retval datap address of (malloc'd) binary data + * @retval lenp address of no. bytes of binary data + * @return 0 on success + */ +int B64decode (const char * s, /*@out@*/ void ** datap, /*@out@*/ size_t *lenp); + +/** + * Encode chunks of 3 bytes of binary input into 4 bytes of base64 output. + * @param data binary data + * @param ns no. bytes of data (0 uses strlen(data)) + * @return (malloc'd) base64 string + */ +char * B64encode (const void * data, size_t ns); + +#ifdef __cplusplus +} +#endif + +#endif /* H_RPMURL */ diff --git a/rpmio/md5.c b/rpmio/md5.c index 9a2ac8c..4cb54b3 100644 --- a/rpmio/md5.c +++ b/rpmio/md5.c @@ -1,5 +1,5 @@ /** \ingroup signature - * \file rpmio/md5hash.c + * \file rpmio/md5.c * * This code implements the MD5 message-digest algorithm. * The algorithm is due to Ron Rivest. This code was @@ -54,6 +54,7 @@ static union _mendian { int i; char b[4]; } *_endian = (union _mendian *)&_ie; * The core of the MD5 algorithm. * This alters an existing MD5 hash to reflect the addition of 16 longwords * of new data. + * @param private MD5 private data */ static void MD5Transform(void * private) diff --git a/rpmio/tkey.c b/rpmio/tkey.c new file mode 100644 index 0000000..49b8871 --- /dev/null +++ b/rpmio/tkey.c @@ -0,0 +1,730 @@ +/** \ingroup signature + * \file rpmio/base64.c + * + */ + +static int _debug = 0; + +#include "system.h" + +#include "base64.h" + +typedef unsigned char byte; + +static inline int grab(const byte *s, int nbytes) +{ + int i = 0; + int nb = (nbytes <= sizeof(i) ? nbytes : sizeof(i)); + while (nb--) + i = (i << 8) | *s++; + return i; +} + +#define GRAB(_a) grab((_a), sizeof(_a)) + +typedef struct { + byte nbits[2]; + byte bits[1]; +} MPI_t; + +static inline int mpi_nbits(const byte *p) { return ((p[0] << 8) | p[1]); } +static inline int mpi_len(const byte *p) { return (2 + ((mpi_nbits(p)+7)>>3)); } + +static char * pr_pfmt(char *t, const byte *s, int nbytes) +{ + static char hex[] = "0123456789abcdef"; + while (nbytes-- > 0) { + *t++ = hex[ (*s >> 4) & 0xf ]; + *t++ = hex[ (*s++ ) & 0xf ]; + } + *t = '\0'; + return t; +} + +static char prbuf[2048]; + +static char * pr_hex(const byte *p, unsigned plen) +{ + char *t = prbuf; + + t = pr_pfmt(t, p, plen); + return prbuf; +} + +static const char * pr_mpi(const byte *p) +{ + char *t = prbuf; + + sprintf(t, "[%d]: ", grab(p,2)); + t += strlen(t); + t = pr_pfmt(t, p+2, mpi_len(p)-2); + return prbuf; +} + +static const char * pr_sigtype(byte sigtype) { + switch (sigtype) { + case 0x00: return("Signature of a binary document"); break; + case 0x01: return("Signature of a canonical text document"); break; + case 0x02: return("Standalone signature"); break; + case 0x10: return("Generic certification of a User ID and Public Key"); break; + case 0x11: return("Persona certification of a User ID and Public Key"); break; + case 0x12: return("Casual certification of a User ID and Public Key"); break; + case 0x13: return("Positive certification of a User ID and Public Key"); break; + case 0x18: return("Subkey Binding Signature"); break; + case 0x1F: return("Signature directly on a key"); break; + case 0x20: return("Key revocation signature"); break; + case 0x28: return("Subkey revocation signature"); break; + case 0x30: return("Certification revocation signature"); break; + case 0x40: return("Timestamp signature"); break; + } + return "Unknown signature type"; +} + +static const char * pr_pubkey_algo(byte pubkey_algo) { + switch (pubkey_algo) { + case 1: return("RSA"); break; + case 2: return("RSA(Encrypt-Only)"); break; + case 3 : return("RSA(Sign-Only)"); break; + case 16: return("Elgamal(Encrypt-Only)"); break; + case 17: return("DSA"); break; + case 18: return("Elliptic Curve"); break; + case 19: return("ECDSA"); break; + case 20: return("Elgamal"); break; + case 21: return("Diffie-Hellman (X9.42)"); break; + } + return "Unknown public key algorithm"; +} + +static const char * pr_symkey_algo(byte symkey_algo) { + switch (symkey_algo) { + case 0: return("Plaintext"); break; + case 1: return("IDEA"); break; + case 2: return("DES-EDE"); break; + case 3: return("CAST5"); break; + case 4: return("BLOWFISH"); break; + case 5: return("SAFER"); break; + case 10: return("TWOFISH"); break; + } + return "Unknown symmetric key algorithm"; +}; + +static const char * pr_compression_algo(byte compression_algo) { + switch (compression_algo) { + case 0: return("Uncompressed"); break; + case 1: return("ZIP"); break; + case 2: return("ZLIB"); break; + } + return "Unknown compression algorithm"; +}; + +static const char * pr_hash_algo(byte hash_algo) { + switch (hash_algo) { + case 1: return("MD5"); break; + case 2: return("SHA1"); break; + case 3: return("RIPEMD160"); break; + case 5: return("MD2"); break; + case 6: return("TIGER192"); break; + case 7: return("HAVAL-5-160"); break; + } + return "Unknown hash algorithm"; +} + +static const char * pr_keyserv_pref (byte keyserv_pref) { + switch(keyserv_pref) { + case 0x80: return("No-modify"); break; + } + return "Unknown key server preference"; +}; + +static const char * pr_sigsubkeytype (byte sigsubkeytype) { + switch(sigsubkeytype) { + case 2: return("signature creation time"); break; + case 3: return("signature expiration time"); break; + case 4: return("exportable certification"); break; + case 5: return("trust signature"); break; + case 6: return("regular expression"); break; + case 7: return("revocable"); break; + case 9: return("key expiration time"); break; + case 10: return("placeholder for backward compatibility"); break; + case 11: return("preferred symmetric algorithms"); break; + case 12: return("revocation key"); break; + case 16: return("issuer key ID"); break; + case 20: return("notation data"); break; + case 21: return("preferred hash algorithms"); break; + case 22: return("preferred compression algorithms"); break; + case 23: return("key server preferences"); break; + case 24: return("preferred key server"); break; + case 25: return("primary user id"); break; + case 26: return("policy URL"); break; + case 27: return("key flags"); break; + case 28: return("signer's user id"); break; + case 29: return("reason for revocation"); break; + } + return "Unknown signature subkey type"; +} + +const char *ptags[] = { + "Reserved - a packet tag must not have this value", + "Public-Key Encrypted Session Key", + "Signature", + "Symmetric-Key Encrypted Session Key", + "One-Pass Signature", + "Secret Key", + "Public Key", + "Secret Subkey", + "Compressed Data", + "Symmetrically Encrypted Data", + "Marker", + "Literal Data", + "Trust", + "User ID", + "Public Subkey", + "??? TAG15 ???", +}; + +typedef enum { + RPMKEYPKT_SIGNATURE = 2, + RPMKEYPKT_SECRET_KEY = 5, + RPMKEYPKT_PUBLIC_KEY = 6, + RPMKEYPKT_SECRET_SUBKEY = 7, + RPMKEYPKT_USER_ID = 13, + RPMKEYPKT_PUBLIC_SUBKEY = 14 +} rpmKeyPkt; + +/* +5.2.2. Version 3 Signature Packet Format + The body of a version 3 Signature Packet contains: + - One-octet version number (3). + - One-octet length of following hashed material. MUST be 5. + - One-octet signature type. + - Four-octet creation time. + - Eight-octet key ID of signer. + - One-octet public key algorithm. + - One-octet hash algorithm. + - Two-octet field holding left 16 bits of signed hash value. + - One or more multi-precision integers comprising the signature. + This portion is algorithm specific, as described below. +*/ + +struct signature_v3 { + byte version; /*!< version number (3). */ + byte hashlen; /*!< length of following hashed material. MUST be 5. */ + byte sigtype; /*!< signature type. */ + byte time[4]; /*!< 4 byte creation time. */ + byte signer[8]; /*!< key ID of signer. */ + byte pubkey_algo; /*!< public key algorithm. */ + byte hash_algo; /*!< hash algorithm. */ + byte signhash16[2]; /*!< left 16 bits of signed hash value. */ + byte data[1]; /*!< One or more multi-precision integers. */ +}; + +static int pr_signature_v3(rpmKeyPkt ptag, const byte *h, unsigned hlen) +{ + struct signature_v3 *v = (struct signature_v3 *)h; + byte *p; + unsigned plen; + int i; + +fprintf(stderr, "%s(%d)", ptags[ptag], ptag); + if (v->version != 3) { + fprintf(stderr, " version(%d) != 3\n", v->version); + return 1; + } + if (v->hashlen != 5) { + fprintf(stderr, " hashlen(%d) != 5\n", v->hashlen); + return 1; + } +fprintf(stderr, " %s(%d)", pr_pubkey_algo(v->pubkey_algo), v->pubkey_algo); +fprintf(stderr, " %s(%d)", pr_hash_algo(v->hash_algo), v->hash_algo); + +fprintf(stderr, " %s(%d)", pr_sigtype(v->sigtype), v->sigtype); + + plen = GRAB(v->time); +fprintf(stderr, " time %08x", plen); +fprintf(stderr, " signer keyid %02x%02x%02x%02x%02x%02x%02x%02x", + v->signer[0], v->signer[1], v->signer[2], v->signer[3], + v->signer[4], v->signer[5], v->signer[6], v->signer[7]); + plen = GRAB(v->signhash16); +fprintf(stderr, " signhash16 %04x", plen); +fprintf(stderr, "\n"); + + p = &v->data[0]; + for (i = 0; p < &h[hlen]; i++, p += mpi_len(p)) + fprintf(stderr, "%7d %s\n", i, pr_mpi(p)); + + return 0; +} + +/* +5.2.3.1. Signature Subpacket Specification + + The subpacket fields consist of zero or more signature subpackets. + Each set of subpackets is preceded by a two-octet scalar count of the + length of the set of subpackets. + + Each subpacket consists of a subpacket header and a body. The header + consists of: + + - the subpacket length (1, 2, or 5 octets) + + - the subpacket type (1 octet) + + and is followed by the subpacket specific data. + + The length includes the type octet but not this length. Its format is + similar to the "new" format packet header lengths, but cannot have + partial body lengths. That is: + + if the 1st octet < 192, then + lengthOfLength = 1 + subpacketLen = 1st_octet + + if the 1st octet >= 192 and < 255, then + lengthOfLength = 2 + subpacketLen = ((1st_octet - 192) << 8) + (2nd_octet) + 192 + + if the 1st octet = 255, then + lengthOfLength = 5 + subpacket length = [four-octet scalar starting at 2nd_octet] + +*/ + +static int pr_sigsubkeys(const byte *h, unsigned hlen) +{ + const byte *p = h; + unsigned plen; + int i; + + while (hlen > 0) { + if (*p < 192) { + plen = *p++; + hlen -= 1; + } else if (*p < 255) { + plen = ((p[0] - 192) << 8) + p[1] + 192; + p += 2; + hlen -= 2; + } else { + p++; + plen = grab(p, 4); + p += 4; + hlen -= 5; + } +fprintf(stderr, " %s(%d)", pr_sigsubkeytype(*p), *p); + switch (*p) { + case 11: /* preferred symmetric algorithms */ + for (i = 1; i < plen; i++) + fprintf(stderr, " %s(%d)", pr_symkey_algo(p[i]), p[i]); + fprintf(stderr, "\n"); + break; + case 21: /* preferred hash algorithms */ + for (i = 1; i < plen; i++) + fprintf(stderr, " %s(%d)", pr_hash_algo(p[i]), p[i]); + fprintf(stderr, "\n"); + break; + case 22: /* preferred compression algorithms */ + for (i = 1; i < plen; i++) + fprintf(stderr, " %s(%d)", pr_compression_algo(p[i]), p[i]); + fprintf(stderr, "\n"); + break; + case 23: /* key server preferences */ + for (i = 1; i < plen; i++) + fprintf(stderr, " %s(%d)", pr_keyserv_pref(p[i]), p[i]); + fprintf(stderr, "\n"); + break; + case 16: /* issuer key ID */ + default: + fprintf(stderr, " %s", pr_hex(p+1, plen-1)); + fprintf(stderr, "\n"); + break; + } + p += plen; + hlen -= plen; + } + return 0; +} + +/* +5.2.3. Version 4 Signature Packet Format + The body of a version 4 Signature Packet contains: + - One-octet version number (4). + - One-octet signature type. + - One-octet public key algorithm. + - One-octet hash algorithm. + - Two-octet scalar octet count for following hashed subpacket + data. Note that this is the length in octets of all of the hashed + subpackets; a pointer incremented by this number will skip over + the hashed subpackets. + - Hashed subpacket data. (zero or more subpackets) + - Two-octet scalar octet count for following unhashed subpacket + data. Note that this is the length in octets of all of the + unhashed subpackets; a pointer incremented by this number will + skip over the unhashed subpackets. + - Unhashed subpacket data. (zero or more subpackets) + - Two-octet field holding left 16 bits of signed hash value. + - One or more multi-precision integers comprising the signature. + This portion is algorithm specific, as described above. +*/ + +struct signature_v4 { + byte version; /*!< version number (4). */ + byte sigtype; /*!< signature type. */ + byte pubkey_algo; /*!< public key algorithm. */ + byte hash_algo; /*!< hash algorithm. */ + byte hashlen[2]; /*!< length of following hashed material. */ + byte data[1]; /*!< Hashed subpacket data. (zero or more subpackets) */ +}; + +static int pr_signature_v4(rpmKeyPkt ptag, const byte *h, unsigned hlen) +{ + struct signature_v4 *v = (struct signature_v4 *)h; + byte * p; + unsigned plen; + int i; + +fprintf(stderr, "%s(%d)", ptags[ptag], ptag); + if (v->version != 4) { + fprintf(stderr, " version(%d) != 4\n", v->version); + return 1; + } +fprintf(stderr, " %s(%d)", pr_pubkey_algo(v->pubkey_algo), v->pubkey_algo); +fprintf(stderr, " %s(%d)", pr_hash_algo(v->hash_algo), v->hash_algo); + +fprintf(stderr, " %s(%d)", pr_sigtype(v->sigtype), v->sigtype); +fprintf(stderr, "\n"); + + p = &v->hashlen[0]; + plen = GRAB(v->hashlen); + p += 2; +fprintf(stderr, " hash[%d] -- %s\n", plen, pr_hex(p, plen)); + pr_sigsubkeys(p, plen); + p += plen; + plen = grab(p,2); + p += 2; +fprintf(stderr, " unhash[%d] -- %s\n", plen, pr_hex(p, plen)); + pr_sigsubkeys(p, plen); + p += plen; + plen = grab(p,2); + p += 2; +fprintf(stderr, " signhash16 %04x\n", plen); + + for (i = 0; p < &h[hlen]; i++, p += mpi_len(p)) + fprintf(stderr, "%7d %s\n", i, pr_mpi(p)); + + return 0; +} + +static int pr_signature(rpmKeyPkt ptag, const byte *h, unsigned hlen) +{ + byte version = *h; + switch (version) { + case 3: + pr_signature_v3(ptag, h, hlen); + break; + case 4: + pr_signature_v4(ptag, h, hlen); + break; + } + return 0; +} + +/* + A version 3 public key or public subkey packet contains: + - A one-octet version number (3). + - A four-octet number denoting the time that the key was created. + - A two-octet number denoting the time in days that this key is + valid. If this number is zero, then it does not expire. + - A one-octet number denoting the public key algorithm of this key + - A series of multi-precision integers comprising the key + material: + - MPI of RSA public modulus n; + - MPI of RSA public encryption exponent e. + + Algorithm Specific Fields for RSA signatures: + - multiprecision integer (MPI) of RSA signature value m**d. + + Algorithm Specific Fields for DSA signatures: + - MPI of DSA value r. + - MPI of DSA value s. + +*/ + +struct key_v3 { + byte version; /*!< version number (3). */ + byte time[4]; /*!< time that the key was created. */ + byte valid[2]; /*!< time in days that this key is valid. */ + byte pubkey_algo; /*!< public key algorithm. */ + byte data[1]; /*!< One or more multi-precision integers. */ +}; + +static int pr_key_v3(rpmKeyPkt ptag, const byte *h, unsigned hlen) +{ + struct key_v3 *v = (struct key_v3 *)h; + byte * p; + unsigned plen; + int i; + +fprintf(stderr, "%s(%d)", ptags[ptag], ptag); + if (v->version != 3) { + fprintf(stderr, " version(%d) != 3\n", v->version); + return 1; + } + plen = GRAB(v->time); +fprintf(stderr, " time %08x", plen); +fprintf(stderr, " %s(%d)", pr_pubkey_algo(v->pubkey_algo), v->pubkey_algo); + + plen = GRAB(v->valid); + if (plen != 0) + fprintf(stderr, " valid %d days", plen); + +fprintf(stderr, "\n"); + + p = &v->data[0]; + for (i = 0; p < &h[hlen]; i++, p += mpi_len(p)) + fprintf(stderr, "%7d %s\n", i, pr_mpi(p)); + + return 0; +} + +/* + A version 4 packet contains: + - A one-octet version number (4). + - A four-octet number denoting the time that the key was created. + - A one-octet number denoting the public key algorithm of this key + - A series of multi-precision integers comprising the key + material. This algorithm-specific portion is: + + Algorithm Specific Fields for RSA public keys: + - MPI of RSA public modulus n; + - MPI of RSA public encryption exponent e. + + Algorithm Specific Fields for DSA public keys: + - MPI of DSA prime p; + - MPI of DSA group order q (q is a prime divisor of p-1); + - MPI of DSA group generator g; + - MPI of DSA public key value y (= g**x where x is secret). + + Algorithm Specific Fields for Elgamal public keys: + - MPI of Elgamal prime p; + - MPI of Elgamal group generator g; + - MPI of Elgamal public key value y (= g**x where x is + secret). +*/ + +struct key_v4 { + byte version; /*!< version number (4). */ + byte time[4]; /*!< time that the key was created. */ + byte pubkey_algo; /*!< public key algorithm. */ + byte data[1]; /*!< One or more multi-precision integers. */ +}; + +static int pr_key_v4(rpmKeyPkt ptag, const byte *h, unsigned hlen) +{ + struct key_v4 *v = (struct key_v4 *)h; + byte * p; + unsigned plen; + int i; + +fprintf(stderr, "%s(%d)", ptags[ptag], ptag); + if (v->version != 4) { + fprintf(stderr, " version(%d) != 4\n", v->version); + return 1; + } + plen = GRAB(v->time); +fprintf(stderr, " time %08x", plen); +fprintf(stderr, " %s(%d)", pr_pubkey_algo(v->pubkey_algo), v->pubkey_algo); +fprintf(stderr, "\n"); + + p = &v->data[0]; + for (i = 0; p < &h[hlen]; i++, p += mpi_len(p)) + fprintf(stderr, "%7d %s\n", i, pr_mpi(p)); + + return 0; +} + +static int pr_key(rpmKeyPkt ptag, const byte *h, unsigned hlen) +{ + byte version = *h; + switch (version) { + case 3: + pr_key_v3(ptag, h, hlen); + break; + case 4: + pr_key_v4(ptag, h, hlen); + break; + } + return 0; +} + +/* +5.11. User ID Packet (Tag 13) + + A User ID packet consists of data that is intended to represent the + name and email address of the key holder. By convention, it includes + an RFC 822 mail name, but there are no restrictions on its content. + The packet length in the header specifies the length of the user id. + If it is text, it is encoded in UTF-8. +*/ + +static int pr_user_id(rpmKeyPkt ptag, const byte *h, unsigned hlen) +{ +fprintf(stderr, "%s(%d)", ptags[ptag], ptag); +fprintf(stderr, " \"%*s\"\n", hlen, h); + return 0; +} + +static int pr_keypkt(const byte *p) +{ + unsigned int val = *p; + unsigned int mark = (val >> 7) & 0x1; + unsigned int new = (val >> 6) & 0x1; + rpmKeyPkt ptag = (val >> 2) & 0xf; + unsigned int plen = (1 << (val & 0x3)); + const byte *h; + unsigned int hlen = 0; + unsigned int i; + + /* XXX can't deal with these. */ + if (!mark || new || plen > 8) + return -1; + + for (i = 1; i <= plen; i++) + hlen = (hlen << 8) | p[i]; + + h = p + plen + 1; + switch (ptag) { + case RPMKEYPKT_SIGNATURE: + pr_signature(ptag, h, hlen); + break; + case RPMKEYPKT_PUBLIC_KEY: + case RPMKEYPKT_PUBLIC_SUBKEY: + case RPMKEYPKT_SECRET_KEY: + case RPMKEYPKT_SECRET_SUBKEY: + pr_key(ptag, h, hlen); + break; + case RPMKEYPKT_USER_ID: + pr_user_id(ptag, h, hlen); + break; + default: + fprintf(stderr, "%s(%d) plen %02x hlen %x\n", + ptags[ptag], ptag, plen, hlen); + break; + } + + return plen+hlen+1; +} + +/* This is the unarmored RPM-GPG-KEY public key. */ +const char * gpgsig = "\ +mQGiBDfqVDgRBADBKr3Bl6PO8BQ0H8sJoD6p9U7Yyl7pjtZqioviPwXP+DCWd4u8\ +HQzcxAZ57m8ssA1LK1Fx93coJhDzM130+p5BG9mYSWShLabR3N1KXdXQYYcowTOM\ +GxdwYRGr1Spw8QydLhjVfU1VSl4xt6bupPbWJbyjkg5Z3P7BlUOUJmrx3wCgobNV\ +EDGaWYJcch5z5B1of/41G8kEAKii6q7Gu/vhXXnLS6m15oNnPVybyngiw/23dKjS\ +ZVG7rKANEK2mxg1VB+vc/uUc4k49UxJJfCZg1gu1sPFV3GSa+Y/7jsiLktQvCiLP\ +lncQt1dV+ENmHR5BdIDPWDzKBVbgWnSDnqQ6KrZ7T6AlZ74VMpjGxxkWU6vV2xsW\ +XCLPA/9P/vtImA8CZN3jxGgtK5GGtDNJ/cMhhuv5tnfwFg4b/VGo2Jr8mhLUqoIb\ +E6zeGAmZbUpdckDco8D5fiFmqTf5+++pCEpJLJkkzel/32N2w4qzPrcRMCiBURES\ +PjCLd4Y5rPoU8E4kOHc/4BuHN903tiCsCPloCrWsQZ7UdxfQ5LQiUmVkIEhhdCwg\ +SW5jIDxzZWN1cml0eUByZWRoYXQuY29tPohVBBMRAgAVBQI36lQ4AwsKAwMVAwID\ +FgIBAheAAAoJECGRgM3bQqYOsBQAnRVtg7B25Hm11PHcpa8FpeddKiq2AJ9aO8sB\ +XmLDmPOEFI75mpTrKYHF6rkCDQQ36lRyEAgAokgI2xJ+3bZsk8jRA8ORIX8DH05U\ +lMH27qFYzLbT6npXwXYIOtVn0K2/iMDj+oEB1Aa2au4OnddYaLWp06v3d+XyS0t+\ +5ab2ZfIQzdh7wCwxqRkzR+/H5TLYbMG+hvtTdylfqIX0WEfoOXMtWEGSVwyUsnM3\ +Jy3LOi48rQQSCKtCAUdV20FoIGWhwnb/gHU1BnmES6UdQujFBE6EANqPhp0coYoI\ +hHJ2oIO8ujQItvvNaU88j/s/izQv5e7MXOgVSjKe/WX3s2JtB/tW7utpy12wh1J+\ +JsFdbLV/t8CozUTpJgx5mVA3RKlxjTA+On+1IEUWioB+iVfT7Ov/0kcAzwADBQf9\ +E4SKCWRand8K0XloMYgmipxMhJNnWDMLkokvbMNTUoNpSfRoQJ9EheXDxwMpTPwK\ +ti/PYrrL2J11P2ed0x7zm8v3gLrY0cue1iSba+8glY+p31ZPOr5ogaJw7ZARgoS8\ +BwjyRymXQp+8Dete0TELKOL2/itDOPGHW07SsVWOR6cmX4VlRRcWB5KejaNvdrE5\ +4XFtOd04NMgWI63uqZc4zkRa+kwEZtmbz3tHSdRCCE+Y7YVP6IUf/w6YPQFQriWY\ +FiA6fD10eB+BlIUqIw80VgjsBKmCwvKkn4jg8kibXgj4/TzQSx77uYokw1EqQ2wk\ +OZoaEtcubsNMquuLCMWijYhGBBgRAgAGBQI36lRyAAoJECGRgM3bQqYOhyYAnj7h\ +VDY/FJAGqmtZpwVp9IlitW5tAJ4xQApr/jNFZCTksnI+4O1765F7tA==\ +"; + +/* This is the unarmored RPM-PGP-KEY public key. */ +const char * pgpsig = "\ +mQCNAzEpXjUAAAEEAKG4/V9oUSiDc9wIge6Bmg6erDGCLzmFyioAho8kDIJSrcmi\ +F9qTdPq+fj726pgW1iSb0Y7syZn9Y2lgQm5HkPODfNi8eWyTFSxbr8ygosLRClTP\ +xqHVhtInGrfZNLoSpv1LdWOme0yOpOQJnghdOMzKXpgf5g84vaUg6PHLopv5AAUR\ +tCpSZWQgSGF0IFNvZnR3YXJlLCBJbmMuIDxyZWRoYXRAcmVkaGF0LmNvbT6JAJUD\ +BRAyA5tUoyDApfg4JKEBAUzSA/9QdcVsu955vVyZDk8uvOXWV0X3voT9B3aYMFvj\ +UNHUD6F1VFruwQHVKbGJEq1o5MOA6OXKR3vJZStXEMF47TWXJfQaflgl8ywZTH5W\ ++eMlKau6Nr0labUV3lmsAE4Vsgu8NCkzIrp2wNVbeW2ZAXtrKswV+refLquUhp7l\ +wMpH9IkAdQMFEDGttkRNdXhbO1TgGQEBAGoC/j6C22PqXIyqZc6fG6J6Jl/T5kFG\ +xH1pKIzua5WCDDugAgnuOJgywa4pegT4UqwEZiMTAlwT6dmG1CXgKB+5V7lnCjDc\ +JZLni0iztoe08ig6fJrjNGXljf7KYXzgwBftQokAlQMFEDMQzo2MRVM9rfPulQEB\ +pLoD/1/MWv3u0Paiu14XRvDrBaJ7BmG2/48bA5vKOzpvvoNRO95YS7ZEtqErXA7Y\ +DRO8+C8f6PAILMk7kCk4lNMscS/ZRzu5+J8cv4ejsFvxgJBBU3Zgp8AWdWOpvZ0I\ +wW//HoDUGhOxlEtymljIMFBkj4SysHWhCBUfA9Xy86kouTJQiQCVAwUQMxDOQ50a\ +feTWLUSJAQFnYQQAkt9nhMTeioREB1DvJt+vsFyOj//o3ThqK5ySEP3dgj62iaQp\ +JrBmAe5XZPw25C/TXAf+x27H8h2QbKgq49VtsElFexc6wO+uq85fAPDdyE+2XyNE\ +njGZkY/TP2F/jTB0sAwJO+xFCHmSYkcBjzxK/2LMD+O7rwp2UCUhhl9QhhqJAJUD\ +BRAx5na6pSDo8cuim/kBARmjA/4lDVnV2h9KiNabp9oE38wmGgu5m5XgUHW8L6du\ +iQDnwO5IgXN2vDpKGxbgtwv6iYYmGd8IRQ66uJvOsxSv3OR7J7LkCHuI2b/s0AZn\ +c79DZaJ2ChUCZlbNQBMeEdrFWif9NopY+d5+2tby1onu9XOFMMvomxL3NhctElYR\ +HC8Xw4kAlQMFEDHmdTtURTdEKY1MpQEBEtEEAMZbp1ZFrjiHkj2aLFC1S8dGRbSH\ +GUdnLP9qLPFgmWekp9E0o8ZztALGVdqPfPF3N/JJ+AL4IMrfojd7+eZKw36Mdvtg\ +dPI+Oz4sxHDbDynZ2qspD9Om5yYuxuz/Xq+9nO2IlsAnEYw3ag3cxat0kvxpOPRe\ +Yy+vFpgfDNizr3MgiQBVAwUQMXNMXCjtrosVMemRAQEDnwH7BsJrnnh91nI54LAK\ +Gcq3pr8ld0PAtWJmNRGQvUlpEMXUSnu59j2P1ogPNjL3PqKdVxk5Jqgcr8TPQMf3\ +V4fqXokAlQMFEDFy+8YiEmsRQ3LyzQEB+TwD/03QDslXLg5F3zj4zf0yI6ikT0be\ +5OhZv2pnkb80qgdHzFRxBOYmSoueRKdQJASd8F9ue4b3bmf/Y7ikiY0DblvxcXB2\ +sz1Pu8i2Zn9u8SKuxNIoVvM8/STRVkgPfvL5QjAWMHT9Wvg81XcI2yXJzrt/2f2g\ +mNpWIvVOOT85rVPIiQCVAwUQMVPRlBlzviMjNHElAQG1nwP/fpVX6nKRWJCSFeB7\ +leZ4lb+y1uMsMVv0n7agjJVw13SXaA267y7VWCBlnhsCemxEugqEIkI4lu/1mgtw\ +WPWSE0BOIVjj0AA8zp2T0H3ZCCMbiFAFJ1P2Gq2rKr8QrOb/08oH1lEzyz0j/jKh\ +qiXAxdlB1wojQB6yLbHvTIe3rZGJAHUDBRAxKetfzauiKSJ6LJEBAed/AvsEiGgj\ +TQzhsZcUuRNrQpV0cDGH9Mpril7P7K7yFIzju8biB+Cu6nEknSOHlMLl8usObVlk\ +d8Wf14soHC7SjItiGSKtI8JhauzBJPl6fDDeyHGsJKo9f9adKeBMCipCFOuJAJUD\ +BRAxKeqWRHFTaIK/x+0BAY6eA/4m5X4gs1UwOUIRnljo9a0cVs6ITL554J9vSCYH\ +Zzd87kFwdf5W1Vd82HIkRzcr6cp33E3IDkRzaQCMVw2me7HePP7+4Ry2q3EeZMbm\ +NE++VzkxjikzpRb2+F5nGB2UdsElkgbXinswebiuOwOrocLbz6JFdDsJPcT5gVfi\ +z15FuA==\ +"; + +int +main (int argc, char *argv[]) +{ + const char *sig = gpgsig; + unsigned char * dec; + unsigned char * d; + size_t declen; + char * enc; + int rc; + int len = 0; + int i; + +if (_debug) +fprintf(stderr, "*** sig is\n%s\n", sig); + + if ((rc = B64decode(sig, (void **)&dec, &declen)) != 0) { + fprintf(stderr, "*** B64decode returns %d\n", rc); + exit(rc); + } + + for (d = dec; d < (dec + declen); d += len) { + len = pr_keypkt(d); + if (len <= 0) + exit(len); + } + + if ((enc = B64encode(dec, declen)) == NULL) { + fprintf(stderr, "*** B64encode returns %d\n", rc); + exit(4); + } + +if (_debug) +fprintf(stderr, "*** enc is\n%s\n", enc); + +len = strlen(sig); +for (i = 0; i < len; i++) { + if (sig[i] == enc[i]) continue; +fprintf(stderr, "??? %5d %02x %02x\n", i, (sig[i] & 0xff), (enc[i] & 0xff)); +} + + if (strcmp(sig, enc)) { + fprintf(stderr, "*** BAD\n"); + exit(5); + } + return 0; +}