From: jbj Date: Sun, 29 Dec 2002 18:19:19 +0000 (+0000) Subject: - don't segfault with packages produced by rpm-2.93 (#80618). X-Git-Tag: rpm-4.4-release~756 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4cac6608a15d6fa9e1ee7895ba86efc9f2e9922;p=platform%2Fupstream%2Frpm.git - don't segfault with packages produced by rpm-2.93 (#80618). CVS patchset: 5982 CVS date: 2002/12/29 18:19:19 --- diff --git a/CHANGES b/CHANGES index bfb1dd8..2014fb2 100644 --- a/CHANGES +++ b/CHANGES @@ -84,6 +84,7 @@ - fix: package relocations were broken (#75057). - error if querying with iterator on different sized arrays. - add rpmfi methods to access color, class, and dependencies. + - don't segfault with packages produced by rpm-2.93 (#80618). 4.0.4 -> 4.1: - loosely wire beecrypt library into rpm. diff --git a/lib/rpmds.c b/lib/rpmds.c index d3e78bf..444e7be 100644 --- a/lib/rpmds.c +++ b/lib/rpmds.c @@ -198,13 +198,15 @@ char * rpmdsNewDNEVR(const char * dspfx, const rpmds ds) if (dspfx) nb += strlen(dspfx) + 1; /*@-boundsread@*/ if (ds->N[ds->i]) nb += strlen(ds->N[ds->i]); - if (ds->Flags[ds->i] & RPMSENSE_SENSEMASK) { + /* XXX rpm prior to 3.0.2 did not always supply EVR and Flags. */ + if (ds->Flags != NULL && (ds->Flags[ds->i] & RPMSENSE_SENSEMASK)) { if (nb) nb++; if (ds->Flags[ds->i] & RPMSENSE_LESS) nb++; if (ds->Flags[ds->i] & RPMSENSE_GREATER) nb++; if (ds->Flags[ds->i] & RPMSENSE_EQUAL) nb++; } - if (ds->EVR[ds->i] && *ds->EVR[ds->i]) { + /* XXX rpm prior to 3.0.2 did not always supply EVR and Flags. */ + if (ds->EVR != NULL && ds->EVR[ds->i] && *ds->EVR[ds->i]) { if (nb) nb++; nb += strlen(ds->EVR[ds->i]); } @@ -218,13 +220,15 @@ char * rpmdsNewDNEVR(const char * dspfx, const rpmds ds) } if (ds->N[ds->i]) t = stpcpy(t, ds->N[ds->i]); - if (ds->Flags[ds->i] & RPMSENSE_SENSEMASK) { + /* XXX rpm prior to 3.0.2 did not always supply EVR and Flags. */ + if (ds->Flags != NULL && (ds->Flags[ds->i] & RPMSENSE_SENSEMASK)) { if (t != tbuf) *t++ = ' '; if (ds->Flags[ds->i] & RPMSENSE_LESS) *t++ = '<'; if (ds->Flags[ds->i] & RPMSENSE_GREATER) *t++ = '>'; if (ds->Flags[ds->i] & RPMSENSE_EQUAL) *t++ = '='; } - if (ds->EVR[ds->i] && *ds->EVR[ds->i]) { + /* XXX rpm prior to 3.0.2 did not always supply EVR and Flags. */ + if (ds->EVR != NULL && ds->EVR[ds->i] && *ds->EVR[ds->i]) { if (t != tbuf) *t++ = ' '; t = stpcpy(t, ds->EVR[ds->i]); } @@ -565,6 +569,11 @@ static rpmds rpmdsDup(const rpmds ods) : rpmdsDupArgv(ods->N, ods->Count) ); ds->Nt = ods->Nt; + /* XXX rpm prior to 3.0.2 did not always supply EVR and Flags. */ +/*@-nullderef@*/ +assert(ds->EVR != NULL); +assert(ds->Flags != NULL); + nb = (ds->Count+1) * sizeof(*ds->EVR); ds->EVR = (ds->h != NULL ? memcpy(xmalloc(nb), ods->EVR, nb) @@ -576,6 +585,7 @@ static rpmds rpmdsDup(const rpmds ods) ? ods->Flags : memcpy(xmalloc(nb), ods->Flags, nb) ); ds->Ft = ods->Ft; +/*@=nullderef@*/ /*@-compmempass@*/ /* FIX: ds->Flags is kept, not only */ return rpmdsLink(ds, (ds ? ds->Type : NULL)); @@ -596,10 +606,14 @@ int rpmdsFind(rpmds ds, rpmds ods) ds->i = (ds->l + ds->u) / 2; comparison = strcmp(ods->N[ods->i], ds->N[ds->i]); - if (comparison == 0) + + /* XXX rpm prior to 3.0.2 did not always supply EVR and Flags. */ +/*@-nullderef@*/ + if (comparison == 0 && ods->EVR && ds->EVR) comparison = strcmp(ods->EVR[ods->i], ds->EVR[ds->i]); - if (comparison == 0) + if (comparison == 0 && ods->Flags && ds->Flags) comparison = (ods->Flags[ods->i] - ds->Flags[ds->i]); +/*@=nullderef@*/ if (comparison < 0) ds->u = ds->i; @@ -657,6 +671,11 @@ save = ods->i; ds->N = _free(ds->N); ds->N = N; + /* XXX rpm prior to 3.0.2 did not always supply EVR and Flags. */ +/*@-nullderef@*/ +assert(ds->EVR != NULL); +assert(ds->Flags != NULL); + for (j = ds->Count; j > ds->u; j--) ds->EVR[j] = ds->EVR[j-1]; ds->EVR[ds->u] = ods->EVR[ods->i]; @@ -672,6 +691,7 @@ save = ods->i; Flags[ds->u] = ods->Flags[ods->i]; ds->Flags = _free(ds->Flags); ds->Flags = Flags; +/*@=nullderef@*/ ds->i = ds->Count; ds->Count++; @@ -748,6 +768,13 @@ int rpmdsCompare(const rpmds A, const rpmds B) goto exit; } + /* XXX rpm prior to 3.0.2 did not always supply EVR and Flags. */ +/*@-nullderef@*/ + if (!(A->EVR && A->Flags && B->EVR && B->Flags)) { + result = 1; + goto exit; + } + /* Same name. If either A or B is an existence test, always overlap. */ if (!((A->Flags[A->i] & RPMSENSE_SENSEMASK) && (B->Flags[B->i] & RPMSENSE_SENSEMASK))) { result = 1; @@ -805,6 +832,7 @@ int rpmdsCompare(const rpmds A, const rpmds B) ((A->Flags[A->i] & RPMSENSE_GREATER) && (B->Flags[B->i] & RPMSENSE_GREATER)))) { result = 1; } +/*@=nullderef@*/ exit: if (_noisy_range_comparison_debug_message) @@ -851,6 +879,10 @@ int rpmdsAnyMatchesDep (const Header h, const rpmds req, int nopromote) rpmds provides = NULL; int result = 0; + /* XXX rpm prior to 3.0.2 did not always supply EVR and Flags. */ + if (req->EVR == NULL || req->Flags == NULL) + return 1; + /*@-boundsread@*/ if (!(req->Flags[req->i] & RPMSENSE_SENSEMASK) || !req->EVR[req->i] || *req->EVR[req->i] == '\0') return 1; @@ -907,6 +939,10 @@ int rpmdsNVRMatchesDep(const Header h, const rpmds req, int nopromote) rpmds pkg; int rc = 1; /* XXX assume match, names already match here */ + /* XXX rpm prior to 3.0.2 did not always supply EVR and Flags. */ + if (req->EVR == NULL || req->Flags == NULL) + return rc; + /*@-boundsread@*/ if (!((req->Flags[req->i] & RPMSENSE_SENSEMASK) && req->EVR[req->i] && *req->EVR[req->i])) return rc; diff --git a/lib/rpmds.h b/lib/rpmds.h index f088e50..a09e7b2 100644 --- a/lib/rpmds.h +++ b/lib/rpmds.h @@ -35,9 +35,9 @@ struct rpmds_s { Header h; /*!< Header for dependency set (or NULL) */ /*@only@*/ const char ** N; /*!< Name. */ -/*@only@*/ +/*@only@*/ /*@null@*/ const char ** EVR; /*!< Epoch-Version-Release. */ -/*@only@*/ +/*@only@*/ /*@null@*/ int_32 * Flags; /*!< Flags identifying context/comparison. */ rpmTag tagN; /*!< Header tag. */ rpmTagType Nt, EVRt, Ft; /*!< Tag data types. */ diff --git a/po/cs.po b/po/cs.po index 1bdc49f..96791bc 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-28 20:04-0500\n" +"POT-Creation-Date: 2002-12-29 12:52-0500\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -2486,15 +2486,15 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "NO " msgstr "NE " -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "YES" msgstr "ANO" -#: lib/rpmds.c:778 +#: lib/rpmds.c:805 #, fuzzy, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2503,13 +2503,13 @@ msgstr "" "Závislost \"B\" potøebuje období (pøedpokládáno stejné jako \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:811 +#: lib/rpmds.c:839 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:835 +#: lib/rpmds.c:863 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n" diff --git a/po/da.po b/po/da.po index b03b0fd..a24fed2 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-28 20:04-0500\n" +"POT-Creation-Date: 2002-12-29 12:52-0500\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -2498,16 +2498,16 @@ msgstr ")" msgid "OK" msgstr "O.K." -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 #, fuzzy msgid "NO " msgstr "IKKE O.K." -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "YES" msgstr "" -#: lib/rpmds.c:778 +#: lib/rpmds.c:805 #, fuzzy, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2516,13 +2516,13 @@ msgstr "" "\"B\"-afhængighed kræver en epoke (antager samme som \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:811 +#: lib/rpmds.c:839 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:835 +#: lib/rpmds.c:863 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n" diff --git a/po/de.po b/po/de.po index 4365662..040a922 100644 --- a/po/de.po +++ b/po/de.po @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-28 20:04-0500\n" +"POT-Creation-Date: 2002-12-29 12:52-0500\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -2665,28 +2665,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "NO " msgstr "" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "YES" msgstr "" -#: lib/rpmds.c:778 +#: lib/rpmds.c:805 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:811 +#: lib/rpmds.c:839 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:835 +#: lib/rpmds.c:863 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "Paket %s wird nicht in %s aufgeführt" diff --git a/po/fi.po b/po/fi.po index 1233123..abbcdec 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-28 20:04-0500\n" +"POT-Creation-Date: 2002-12-29 12:52-0500\n" "PO-Revision-Date: 1998-05-02 21:41:47-0400\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" @@ -2544,28 +2544,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "NO " msgstr "" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "YES" msgstr "" -#: lib/rpmds.c:778 +#: lib/rpmds.c:805 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:811 +#: lib/rpmds.c:839 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:835 +#: lib/rpmds.c:863 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paketti %s ei ole %s:ssä" diff --git a/po/fr.po b/po/fr.po index 0c44dc7..4f639f2 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-28 20:04-0500\n" +"POT-Creation-Date: 2002-12-29 12:52-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2584,28 +2584,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "NO " msgstr "" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "YES" msgstr "" -#: lib/rpmds.c:778 +#: lib/rpmds.c:805 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:811 +#: lib/rpmds.c:839 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:835 +#: lib/rpmds.c:863 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "aucun package n'a t spcifi pour l'installation" diff --git a/po/gl.po b/po/gl.po index 792a701..ce74b70 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2002-12-28 20:04-0500\n" +"POT-Creation-Date: 2002-12-29 12:52-0500\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" @@ -2406,28 +2406,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "NO " msgstr "" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "YES" msgstr "" -#: lib/rpmds.c:778 +#: lib/rpmds.c:805 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:811 +#: lib/rpmds.c:839 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:835 +#: lib/rpmds.c:863 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" diff --git a/po/is.po b/po/is.po index acc25a2..9482075 100644 --- a/po/is.po +++ b/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-28 20:04-0500\n" +"POT-Creation-Date: 2002-12-29 12:52-0500\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -2434,28 +2434,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "NO " msgstr "" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "YES" msgstr "" -#: lib/rpmds.c:778 +#: lib/rpmds.c:805 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:811 +#: lib/rpmds.c:839 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:835 +#: lib/rpmds.c:863 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "get ekki opnað pakka gagnagrunn í\n" diff --git a/po/ja.po b/po/ja.po index 9de0925..cf2350f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-28 20:04-0500\n" +"POT-Creation-Date: 2002-12-29 12:52-0500\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -2581,15 +2581,15 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "NO " msgstr "" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "YES" msgstr "" -#: lib/rpmds.c:778 +#: lib/rpmds.c:805 #, fuzzy, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2598,13 +2598,13 @@ msgstr "" "\"B\" ¤Î°Í¸À­¤Ï epoch ¤òɬÍפȤ·¤Þ¤¹(\"A\"¤ÈƱ¤¸¤Ç¤¢¤ë¤È²¾Äꤷ¤Æ)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:811 +#: lib/rpmds.c:839 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:835 +#: lib/rpmds.c:863 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n" diff --git a/po/ko.po b/po/ko.po index a78cf57..b1fa23d 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.4\n" -"POT-Creation-Date: 2002-12-28 20:04-0500\n" +"POT-Creation-Date: 2002-12-29 12:52-0500\n" "PO-Revision-Date: 2002-03-04 17:17+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" @@ -2474,15 +2474,15 @@ msgstr ")" msgid "OK" msgstr "È®ÀÎ" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "NO " msgstr "¾Æ´Ï¿À" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "YES" msgstr "¿¹" -#: lib/rpmds.c:778 +#: lib/rpmds.c:805 #, fuzzy, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2491,13 +2491,13 @@ msgstr "" "\"B\" ÀÇÁ¸¼ºÀº Áß¿ä½Ã µÇ´Â °Í(epoch)À» ÇÊ¿ä·Î ÇÕ´Ï´Ù (\"A\" ·Î °¡Á¤ÇÕ´Ï´Ù)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:811 +#: lib/rpmds.c:839 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:835 +#: lib/rpmds.c:863 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "%s ÆÐÅ°ÁöÀÇ ÇÊ¿ä»çÇ×(³»¿ª)ÀÌ ¸¸Á·ÇÏÁö ¾ÊÀ½: %s\n" diff --git a/po/no.po b/po/no.po index 9ac6ed1..eac0536 100644 --- a/po/no.po +++ b/po/no.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-28 20:04-0500\n" +"POT-Creation-Date: 2002-12-29 12:52-0500\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -2461,28 +2461,28 @@ msgstr "" msgid "OK" msgstr "OK" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "NO " msgstr "NEI" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "YES" msgstr "JA" -#: lib/rpmds.c:778 +#: lib/rpmds.c:805 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:811 +#: lib/rpmds.c:839 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:835 +#: lib/rpmds.c:863 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "pakke %s er i konflikt: %s\n" diff --git a/po/pl.po b/po/pl.po index a48c9f0..19c5980 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-28 20:04-0500\n" +"POT-Creation-Date: 2002-12-29 12:52-0500\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -2543,29 +2543,29 @@ msgstr ")" msgid "OK" msgstr "OK" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 #, fuzzy msgid "NO " msgstr "NIE DOBRZE" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "YES" msgstr "" -#: lib/rpmds.c:778 +#: lib/rpmds.c:805 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:811 +#: lib/rpmds.c:839 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:835 +#: lib/rpmds.c:863 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n" diff --git a/po/pt.po b/po/pt.po index 2406f7d..040a18a 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm\n" -"POT-Creation-Date: 2002-12-28 20:04-0500\n" +"POT-Creation-Date: 2002-12-29 12:52-0500\n" "PO-Revision-Date: 2002-02-14 10:51+0000\n" "Last-Translator: José Nuno Coelho Sanarra Pires \n" "Language-Team: pt \n" "Language-Team: Romanian \n" @@ -2406,28 +2406,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "NO " msgstr "" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "YES" msgstr "" -#: lib/rpmds.c:778 +#: lib/rpmds.c:805 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:811 +#: lib/rpmds.c:839 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:835 +#: lib/rpmds.c:863 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index 92a6fdc..50474c0 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-12-28 20:04-0500\n" +"POT-Creation-Date: 2002-12-29 12:52-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2412,28 +2412,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "NO " msgstr "" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "YES" msgstr "" -#: lib/rpmds.c:778 +#: lib/rpmds.c:805 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:811 +#: lib/rpmds.c:839 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:835 +#: lib/rpmds.c:863 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index 9d56a5e..cf36687 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-28 20:04-0500\n" +"POT-Creation-Date: 2002-12-29 12:52-0500\n" "PO-Revision-Date: 2002-08-27 13:36-0400\n" "Last-Translator: Eugene Kanter, \n" "Language-Team: Black Cat Linux Team \n" @@ -2454,15 +2454,15 @@ msgstr ")" msgid "OK" msgstr "ïë" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "NO " msgstr "îåT" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "YES" msgstr "äá" -#: lib/rpmds.c:778 +#: lib/rpmds.c:805 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2472,13 +2472,13 @@ msgstr "" "\"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" -#: lib/rpmds.c:811 +#: lib/rpmds.c:839 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:835 +#: lib/rpmds.c:863 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "ÐÁËÅÔ %s ÓÏÄÅÒÖÉÔ ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ %s: %s\n" diff --git a/po/sk.po b/po/sk.po index eb74b9d..d74718f 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-28 20:04-0500\n" +"POT-Creation-Date: 2002-12-29 12:52-0500\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -2541,29 +2541,29 @@ msgstr ")" msgid "OK" msgstr "V PORIADKU" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 #, fuzzy msgid "NO " msgstr "NIE JE V PORIADKU" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "YES" msgstr "" -#: lib/rpmds.c:778 +#: lib/rpmds.c:805 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:811 +#: lib/rpmds.c:839 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:835 +#: lib/rpmds.c:863 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n" diff --git a/po/sl.po b/po/sl.po index 2e59bb9..fb91fb1 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.355 2002/12/29 01:07:11 jbj Exp $ +# $Id: sl.po,v 1.356 2002/12/29 18:19:50 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-28 20:04-0500\n" +"POT-Creation-Date: 2002-12-29 12:52-0500\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" @@ -2541,16 +2541,16 @@ msgstr ")" msgid "OK" msgstr "V REDU" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 #, fuzzy msgid "NO " msgstr "NI DOBRO" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "YES" msgstr "" -#: lib/rpmds.c:778 +#: lib/rpmds.c:805 #, fuzzy, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2559,13 +2559,13 @@ msgstr "" "odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:811 +#: lib/rpmds.c:839 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:835 +#: lib/rpmds.c:863 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n" diff --git a/po/sr.po b/po/sr.po index 4196c2a..13f1826 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-28 20:04-0500\n" +"POT-Creation-Date: 2002-12-29 12:52-0500\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-2\n" "Content-Transfer-Encoding: 8bit\n" @@ -2535,28 +2535,28 @@ msgstr "" msgid "OK" msgstr "" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "NO " msgstr "" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "YES" msgstr "" -#: lib/rpmds.c:778 +#: lib/rpmds.c:805 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" msgstr "" -#: lib/rpmds.c:811 +#: lib/rpmds.c:839 #, c-format msgid " %s A %s\tB %s\n" msgstr "" #. @=branchstate@ -#: lib/rpmds.c:835 +#: lib/rpmds.c:863 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s nije naveden u %s" diff --git a/po/sv.po b/po/sv.po index c5960dd..c493520 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.1\n" -"POT-Creation-Date: 2002-12-28 20:04-0500\n" +"POT-Creation-Date: 2002-12-29 12:52-0500\n" "PO-Revision-Date: 2002-08-19 22:26+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -2438,15 +2438,15 @@ msgstr ")" msgid "OK" msgstr "OK" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "NO " msgstr "NEJ " -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "YES" msgstr "JA" -#: lib/rpmds.c:778 +#: lib/rpmds.c:805 #, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2455,13 +2455,13 @@ msgstr "" "\"B\"-beroendet behöver en epok (antar samma epok som \"A\")\n" "\tA = \"%s\"\tB = \"%s\"\n" -#: lib/rpmds.c:811 +#: lib/rpmds.c:839 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:835 +#: lib/rpmds.c:863 #, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s har ouppfyllda %s: %s\n" diff --git a/po/tr.po b/po/tr.po index d826f02..b2de5c4 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-28 20:04-0500\n" +"POT-Creation-Date: 2002-12-29 12:52-0500\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" @@ -2503,15 +2503,15 @@ msgstr ")" msgid "OK" msgstr "Tamam" -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "NO " msgstr "HAYIR " -#: lib/rpmds.c:477 lib/rpmds.c:812 +#: lib/rpmds.c:481 lib/rpmds.c:840 msgid "YES" msgstr "EVET" -#: lib/rpmds.c:778 +#: lib/rpmds.c:805 #, fuzzy, c-format msgid "" "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n" @@ -2520,13 +2520,13 @@ msgstr "" "\"B\" baðýmlýlýðý bir dönemsellik gerektirir (tabii ki \"A\" da)\n" "\tA %s\tB %s\n" -#: lib/rpmds.c:811 +#: lib/rpmds.c:839 #, c-format msgid " %s A %s\tB %s\n" msgstr " %s A %s\tB %s\n" #. @=branchstate@ -#: lib/rpmds.c:835 +#: lib/rpmds.c:863 #, fuzzy, c-format msgid "package %s has unsatisfied %s: %s\n" msgstr "paket %s-%s-%s gereksinimi tatmin edici deðil: %s\n" diff --git a/rpm.spec.in b/rpm.spec.in index 039930a..0d0dbb0 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -15,7 +15,7 @@ Name: rpm %define version @VERSION@ Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 0.45 +Release: 0.46 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz Copyright: GPL @@ -459,6 +459,9 @@ exit 0 %{__prefix}/include/popt.h %changelog +* Sun Dec 29 2002 Jeff Johnson 4.2-0.46 +- don't segfault with packages produced by rpm-2.93 (#80618). + * Sat Dec 28 2002 Jeff Johnson 4.2-0.45 - error if querying with iterator on different sized arrays. - add rpmfi methods to access color, class, and dependencies.