folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fix: find-requires.perl needed update (#23450). 

CVS patchset: 4424
CVS date: 2001/01/10 22:19:55
This commit is contained in:
jbj 2001-01-10 22:19:55 +00:00
parent dcbf7492f2
commit 67aa235565
35 changed files with 198 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -99,6 +99,7 @@
- fix: digests on input FD_t dinna work.
- fix: remove rebuilddb debugging leakage.
- successors from tsort are processed in presentation order.
- fix: find-requires.perl needed update (#23450).
3.0.6 -> 4.0
- use DIRNAMES/BASENAMES/DIRINDICES not FILENAMES in packages and db.

99
lib/depends.c
View File

@ -1631,14 +1631,14 @@ static void addQ(struct availablePackage * p,
}
}
int rpmdepOrder(rpmTransactionSet rpmdep)
int rpmdepOrder(rpmTransactionSet ts)
{
int npkgs = ts->addedPackages.size;
struct availablePackage * p;
struct availablePackage * q;
struct availablePackage * r;
struct tsortInfo * tsi;
struct tsortInfo * tsi_next;
int npkgs = rpmdep->addedPackages.size;
int * ordering = alloca(sizeof(*ordering) * (npkgs + 1));
int orderingCount = 0;
unsigned char * selected = alloca(sizeof(*selected) * (npkgs + 1));
@ -1650,18 +1650,15 @@ int rpmdepOrder(rpmTransactionSet rpmdep)
int qlen;
int i, j;
alMakeIndex(&rpmdep->addedPackages);
alMakeIndex(&rpmdep->availablePackages);
alMakeIndex(&ts->addedPackages);
alMakeIndex(&ts->availablePackages);
/* T1. Initialize. */
loopcheck = npkgs;
/* Record all relations. */
rpmMessage(RPMMESS_DEBUG, _("========== recording tsort relations\n"));
for (i = 0, p = rpmdep->addedPackages.list;
i < rpmdep->addedPackages.size;
i++, p++)
{
for (i = 0, p = ts->addedPackages.list; i < npkgs; i++, p++) {
int matchNum;
if (p->requiresCount <= 0)
@ -1670,7 +1667,7 @@ int rpmdepOrder(rpmTransactionSet rpmdep)
memset(selected, 0, sizeof(*selected) * npkgs);
/* Avoid narcisstic relations. */
matchNum = p - rpmdep->addedPackages.list;
matchNum = p - ts->addedPackages.list;
selected[matchNum] = 1;
/* T2. Next "q <- p" relation. */
@ -1686,7 +1683,7 @@ int rpmdepOrder(rpmTransactionSet rpmdep)
continue;
/* T3. Record next "q <- p" relation (i.e. "p" requires "q"). */
(void) addRelation(rpmdep, p, selected, j);
(void) addRelation(ts, p, selected, j);
}
@ -1701,7 +1698,7 @@ int rpmdepOrder(rpmTransactionSet rpmdep)
continue;
/* T3. Record next "q <- p" relation (i.e. "p" requires "q"). */
(void) addRelation(rpmdep, p, selected, j);
(void) addRelation(ts, p, selected, j);
}
}
@ -1711,11 +1708,8 @@ int rpmdepOrder(rpmTransactionSet rpmdep)
rescan:
q = r = NULL;
npkgs = qlen = 0;
for (i = 0, p = rpmdep->addedPackages.list;
i < rpmdep->addedPackages.size;
i++, p++)
{
qlen = 0;
for (i = 0, p = ts->addedPackages.list; i < npkgs; i++, p++) {
if (p->tsi.tsi_count != 0)
continue;
p->tsi.tsi_suc = NULL;
@ -1728,7 +1722,7 @@ rescan:
rpmMessage(RPMMESS_DEBUG, "%5d (%d,%d) %s-%s-%s\n", orderingCount,
qlen, q->tsi.tsi_qcnt, q->name, q->version, q->release);
ordering[orderingCount++] = q - rpmdep->addedPackages.list;
ordering[orderingCount++] = q - ts->addedPackages.list;
qlen--;
loopcheck--;
@ -1759,15 +1753,12 @@ rescan:
rpmMessage(RPMMESS_DEBUG,
_("========== successors only (presentation order\n"));
for (i = 0, q = rpmdep->addedPackages.list;
i < rpmdep->addedPackages.size;
i++, q++)
{
for (i = 0, q = ts->addedPackages.list; i < npkgs; i++, q++) {
if (q->tsi.tsi_qcnt == -1234)
continue;
rpmMessage(RPMMESS_DEBUG, "%5d (%d,%d) %s-%s-%s\n", orderingCount,
qlen, q->tsi.tsi_qcnt, q->name, q->version, q->release);
ordering[orderingCount++] = q - rpmdep->addedPackages.list;
ordering[orderingCount++] = q - ts->addedPackages.list;
qlen--;
loopcheck--;
}
@ -1779,10 +1770,7 @@ rescan:
/* T9. Initialize predecessor chain. */
nzaps = 0;
for (i = 0, q = rpmdep->addedPackages.list;
i < rpmdep->addedPackages.size;
i++, q++)
{
for (i = 0, q = ts->addedPackages.list; i < npkgs; i++, q++) {
q->tsi.tsi_pkg = NULL;
q->tsi.tsi_reqx = 0;
/* Mark packages already sorted. */
@ -1791,10 +1779,7 @@ rescan:
}
/* T10. Mark all packages with their predecessors. */
for (i = 0, q = rpmdep->addedPackages.list;
i < rpmdep->addedPackages.size;
i++, q++)
{
for (i = 0, q = ts->addedPackages.list; i < npkgs; i++, q++) {
if ((tsi = q->tsi.tsi_next) == NULL)
continue;
q->tsi.tsi_next = NULL;
@ -1803,10 +1788,7 @@ rescan:
}
/* T11. Print all dependency loops. */
for (i = 0, r = rpmdep->addedPackages.list;
i < rpmdep->addedPackages.size;
i++, r++)
{
for (i = 0, r = ts->addedPackages.list; i < npkgs; i++, r++) {
int printed;
printed = 0;
@ -1870,50 +1852,48 @@ rescan:
* the new package. This would be easier if we could sort the
* addedPackages array, but we store indexes into it in various places.
*/
orderList = xmalloc(sizeof(*orderList) * rpmdep->addedPackages.size);
for (i = 0, j = 0; i < rpmdep->orderCount; i++) {
if (rpmdep->order[i].type == TR_ADDED) {
orderList[j].alIndex = rpmdep->order[i].u.addedIndex;
orderList = xmalloc(sizeof(*orderList) * npkgs);
for (i = 0, j = 0; i < ts->orderCount; i++) {
if (ts->order[i].type == TR_ADDED) {
orderList[j].alIndex = ts->order[i].u.addedIndex;
orderList[j].orIndex = i;
j++;
}
}
if (j > rpmdep->addedPackages.size) abort();
assert(j <= npkgs);
qsort(orderList, rpmdep->addedPackages.size, sizeof(*orderList),
orderListIndexCmp);
qsort(orderList, npkgs, sizeof(*orderList), orderListIndexCmp);
newOrder = xmalloc(sizeof(*newOrder) * rpmdep->orderCount);
newOrder = xmalloc(sizeof(*newOrder) * ts->orderCount);
for (i = 0, newOrderCount = 0; i < orderingCount; i++) {
struct orderListIndex * needle, key;
key.alIndex = ordering[i];
needle = bsearch(&key, orderList, rpmdep->addedPackages.size,
sizeof(key), orderListIndexCmp);
needle = bsearch(&key, orderList, npkgs, sizeof(key),orderListIndexCmp);
/* bsearch should never, ever fail */
newOrder[newOrderCount++] = rpmdep->order[needle->orIndex];
for (j = needle->orIndex + 1; j < rpmdep->orderCount; j++) {
if (rpmdep->order[j].type == TR_REMOVED &&
rpmdep->order[j].u.removed.dependsOnIndex == needle->alIndex) {
newOrder[newOrderCount++] = rpmdep->order[j];
newOrder[newOrderCount++] = ts->order[needle->orIndex];
for (j = needle->orIndex + 1; j < ts->orderCount; j++) {
if (ts->order[j].type == TR_REMOVED &&
ts->order[j].u.removed.dependsOnIndex == needle->alIndex) {
newOrder[newOrderCount++] = ts->order[j];
} else {
break;
}
}
}
for (i = 0; i < rpmdep->orderCount; i++) {
if (rpmdep->order[i].type == TR_REMOVED &&
rpmdep->order[i].u.removed.dependsOnIndex == -1) {
newOrder[newOrderCount++] = rpmdep->order[i];
for (i = 0; i < ts->orderCount; i++) {
if (ts->order[i].type == TR_REMOVED &&
ts->order[i].u.removed.dependsOnIndex == -1) {
newOrder[newOrderCount++] = ts->order[i];
}
}
if (newOrderCount != rpmdep->orderCount) abort();
assert(newOrderCount == ts->orderCount);
free(rpmdep->order);
rpmdep->order = newOrder;
rpmdep->orderAlloced = rpmdep->orderCount;
free(ts->order);
ts->order = newOrder;
ts->orderAlloced = ts->orderCount;
free(orderList);
return 0;
@ -1922,6 +1902,7 @@ rescan:
int rpmdepCheck(rpmTransactionSet rpmdep,
struct rpmDependencyConflict ** conflicts, int * numConflicts)
{
int npkgs = rpmdep->addedPackages.size;
struct availablePackage * p;
int i, j;
int rc;
@ -1945,9 +1926,7 @@ int rpmdepCheck(rpmTransactionSet rpmdep,
/* Look at all of the added packages and make sure their dependencies
* are satisfied.
*/
for (i = 0, p = rpmdep->addedPackages.list;
i < rpmdep->addedPackages.size;
i++, p++)
for (i = 0, p = rpmdep->addedPackages.list; i < npkgs; i++, p++)
{
rc = checkPackageDeps(rpmdep, &ps, p->h, NULL, p->multiLib);

10
po/cs.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
"POT-Creation-Date: 2001-01-10 15:41-0500\n"
"POT-Creation-Date: 2001-01-10 17:13-0500\n"
"PO-Revision-Date: 2000-08-23 22:24+0100\n"
"Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@ -2460,19 +2460,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

10
po/da.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
"POT-Creation-Date: 2001-01-10 15:41-0500\n"
"POT-Creation-Date: 2001-01-10 17:13-0500\n"
"PO-Revision-Date: 2000-03-07 05:17+01:00\n"
"Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
"Language-Team: Danish/Dansk <dansk@klid.dk>\n"
@ -2421,19 +2421,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

10
po/de.po
View File

@ -37,7 +37,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
"POT-Creation-Date: 2001-01-10 15:41-0500\n"
"POT-Creation-Date: 2001-01-10 17:13-0500\n"
"PO-Revision-Date: 1998-08-03 18:02+02:00\n"
"Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
"Language-Team: German <de@li.org>\n"
@ -2656,19 +2656,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

10
po/es.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
"POT-Creation-Date: 2001-01-10 15:41-0500\n"
"POT-Creation-Date: 2001-01-10 17:13-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -2388,19 +2388,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

10
po/eu_ES.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2001-01-10 15:41-0500\n"
"POT-Creation-Date: 2001-01-10 17:13-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -2388,19 +2388,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

10
po/fi.po
View File

@ -1,6 +1,6 @@
msgid ""
msgstr ""
"POT-Creation-Date: 2001-01-10 15:41-0500\n"
"POT-Creation-Date: 2001-01-10 17:13-0500\n"
"Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
"Language-Team: Finnish <linux@sot.com>\n"
"Content-Type: text/plain; charset=\n"
@ -2578,19 +2578,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

10
po/fr.po
View File

@ -1,5 +1,5 @@
msgid ""
msgstr "POT-Creation-Date: 2001-01-10 15:41-0500\n"
msgstr "POT-Creation-Date: 2001-01-10 17:13-0500\n"
#: build.c:26
#, fuzzy, c-format
@ -2590,19 +2590,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

10
po/gl.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
"POT-Creation-Date: 2001-01-10 15:41-0500\n"
"POT-Creation-Date: 2001-01-10 17:13-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -2388,19 +2388,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

10
po/hu.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
"POT-Creation-Date: 2001-01-10 15:41-0500\n"
"POT-Creation-Date: 2001-01-10 17:13-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -2388,19 +2388,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

10
po/id.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
"POT-Creation-Date: 2001-01-10 15:41-0500\n"
"POT-Creation-Date: 2001-01-10 17:13-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -2388,19 +2388,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

10
po/is.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
"POT-Creation-Date: 2001-01-10 15:41-0500\n"
"POT-Creation-Date: 2001-01-10 17:13-0500\n"
"PO-Revision-Date: 2000-08-02 13:00+0000\n"
"Last-Translator: Richard Allen <ra@hp.is>\n"
"Language-Team: is <kde-isl@mmedia.is>\n"
@ -2421,19 +2421,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

10
po/it.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
"POT-Creation-Date: 2001-01-10 15:41-0500\n"
"POT-Creation-Date: 2001-01-10 17:13-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -2388,19 +2388,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

12
po/ja.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
"POT-Creation-Date: 2001-01-10 15:41-0500\n"
"POT-Creation-Date: 2001-01-10 17:13-0500\n"
"PO-Revision-Date: 1999-12-01 22:49 +JST\n"
"Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
"Language-Team: JRPM <jrpm@linux.or.jp>\n"
@ -88,7 +88,7 @@ msgstr "
# build root [BuildRoot]
# net share [ネット共有]
# reloate [再配置/移動する]
# $Id: ja.po,v 1.145 2001/01/10 20:42:34 jbj Exp $
# $Id: ja.po,v 1.146 2001/01/10 22:19:57 jbj Exp $
#: rpm.c:185 rpmqv.c:386
#, c-format
msgid "rpm: %s\n"
@ -2541,19 +2541,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

10
po/ko.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
"POT-Creation-Date: 2001-01-10 15:41-0500\n"
"POT-Creation-Date: 2001-01-10 17:13-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -2388,19 +2388,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

10
po/no.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
"POT-Creation-Date: 2001-01-10 15:41-0500\n"
"POT-Creation-Date: 2001-01-10 17:13-0500\n"
"PO-Revision-Date: 2000-08-17 20:22+02:00\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian <no@li.org>\n"
@ -2442,19 +2442,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

10
po/pl.po
View File

@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
"POT-Creation-Date: 2001-01-10 15:41-0500\n"
"POT-Creation-Date: 2001-01-10 17:13-0500\n"
"PO-Revision-Date: 1999-05-25 17:00+0100\n"
"Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
"Language-Team: Polish <pl@li.org>\n"
@ -2539,19 +2539,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

10
po/pt.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
"POT-Creation-Date: 2001-01-10 15:41-0500\n"
"POT-Creation-Date: 2001-01-10 17:13-0500\n"
"PO-Revision-Date: 2000-08-01 21:11+01:00\n"
"Last-Translator: Pedro Morais <morais@poli.org>\n"
"Language-Team: pt <morais@poli.org>\n"
@ -2385,19 +2385,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

10
po/pt_BR.po
View File

@ -2,7 +2,7 @@
# Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998.
#
msgid ""
msgstr "POT-Creation-Date: 2001-01-10 15:41-0500\n"
msgstr "POT-Creation-Date: 2001-01-10 17:13-0500\n"
# , c-format
#: build.c:26
@ -2657,19 +2657,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

10
po/ro.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
"POT-Creation-Date: 2001-01-10 15:41-0500\n"
"POT-Creation-Date: 2001-01-10 17:13-0500\n"
"PO-Revision-Date: 1999-04-10 12:00+EST\n"
"Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
"Language-Team: Romanian <ro@li.org>\n"
@ -2383,19 +2383,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

10
po/rpm.pot
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2001-01-10 15:41-0500\n"
"POT-Creation-Date: 2001-01-10 17:13-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -2388,19 +2388,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

10
po/ru.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
"POT-Creation-Date: 2001-01-10 15:41-0500\n"
"POT-Creation-Date: 2001-01-10 17:13-0500\n"
"PO-Revision-Date: 2000-08-08 01:20+0300\n"
"Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
"Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@ -2475,19 +2475,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

10
po/sk.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
"POT-Creation-Date: 2001-01-10 15:41-0500\n"
"POT-Creation-Date: 2001-01-10 17:13-0500\n"
"PO-Revision-Date: 1999-04-08 21:37+02:00\n"
"Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
"Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@ -2548,19 +2548,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

12
po/sl.po
View File

@ -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 <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
# $Id: sl.po,v 1.130 2001/01/10 20:42:37 jbj Exp $
# $Id: sl.po,v 1.131 2001/01/10 22:20:01 jbj Exp $
#
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
"POT-Creation-Date: 2001-01-10 15:41-0500\n"
"POT-Creation-Date: 2001-01-10 17:13-0500\n"
"PO-Revision-Date: 2000-10-08 19:05+0200\n"
"Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@ -2532,19 +2532,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

10
po/sr.po
View File

@ -1,6 +1,6 @@
msgid ""
msgstr ""
"POT-Creation-Date: 2001-01-10 15:41-0500\n"
"POT-Creation-Date: 2001-01-10 17:13-0500\n"
"Content-Type: text/plain; charset=\n"
"Date: 1998-05-02 21:41:47-0400\n"
"From: Erik Troan <ewt@lacrosse.redhat.com>\n"
@ -2542,19 +2542,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

10
po/sv.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
"POT-Creation-Date: 2001-01-10 15:41-0500\n"
"POT-Creation-Date: 2001-01-10 17:13-0500\n"
"PO-Revision-Date: 2000-10-09 22:31+0200\n"
"Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
@ -2450,19 +2450,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

10
po/tr.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
"POT-Creation-Date: 2001-01-10 15:41-0500\n"
"POT-Creation-Date: 2001-01-10 17:13-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -2590,19 +2590,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

10
po/uk.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
"POT-Creation-Date: 2001-01-10 15:41-0500\n"
"POT-Creation-Date: 2001-01-10 17:13-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -2388,19 +2388,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

10
po/wa.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
"POT-Creation-Date: 2001-01-10 15:41-0500\n"
"POT-Creation-Date: 2001-01-10 17:13-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -2388,19 +2388,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

10
po/zh.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
"POT-Creation-Date: 2001-01-10 15:41-0500\n"
"POT-Creation-Date: 2001-01-10 17:13-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -2388,19 +2388,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

10
po/zh_CN.GB2312.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
"POT-Creation-Date: 2001-01-10 15:41-0500\n"
"POT-Creation-Date: 2001-01-10 17:13-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -2388,19 +2388,19 @@ msgid "========== recording tsort relations\n"
msgstr ""
#. T4. Scan for zeroes.
#: lib/depends.c:1710
#: lib/depends.c:1707
msgid "========== tsorting packages\n"
msgstr ""
#: lib/depends.c:1760
#: lib/depends.c:1754
msgid "========== successors only (presentation order\n"
msgstr ""
#: lib/depends.c:1830
#: lib/depends.c:1812
msgid "LOOP:\n"
msgstr ""
#: lib/depends.c:1861
#: lib/depends.c:1843
msgid "========== continuing tsort ...\n"
msgstr ""

3
rpm.spec
View File

@ -13,7 +13,7 @@ Summary: The Red Hat package management system.
Name: rpm
%define version 4.0.2
Version: %{version}
Release: 0.21
Release: 0.22
Group: System Environment/Base
Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{version}.tar.gz
Copyright: GPL
@ -311,6 +311,7 @@ fi
%changelog
* Wed Jan 10 2001 Jeff Johnson <jbj@redhat.com>
- successors from tsort are processed in presentation order.
- fix: find-requires.perl needed update (#23450).
* Tue Jan 9 2001 Jeff Johnson <jbj@redhat.com>
- fix: digests on input FD_t dinna work.

3
rpm.spec.in
View File

@ -13,7 +13,7 @@ Summary: The Red Hat package management system.
Name: rpm
%define version @VERSION@
Version: %{version}
Release: 0.21
Release: 0.22
Group: System Environment/Base
Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{version}.tar.gz
Copyright: GPL
@ -311,6 +311,7 @@ fi
%changelog
* Wed Jan 10 2001 Jeff Johnson <jbj@redhat.com>
- successors from tsort are processed in presentation order.
- fix: find-requires.perl needed update (#23450).
* Tue Jan 9 2001 Jeff Johnson <jbj@redhat.com>
- fix: digests on input FD_t dinna work.

28
scripts/find-requires.perl
View File

@ -6,19 +6,7 @@
ulimit -c 0
filelist=`sed "s/['\"]/\\\&/g"`
exelist=`echo $filelist | xargs -r file | fgrep executable | cut -d: -f1 `
scriptlist=`echo $filelist | xargs -r file | egrep ":.* (commands|script) " | cut -d: -f1 `
liblist=`echo $filelist | xargs -r file | grep "shared object" | cut -d : -f1 `
for f in $exelist; do
if [ -x $f ]; then
ldd $f | awk '/=>/ { print $1 }'
fi
done | sort -u | sed "s/['\"]/\\\&/g" | xargs -r -n 1 basename | grep -v 'libNoVersion.so' | grep -v '4[um]lib.so' | sort -u
for f in $liblist; do
ldd $f | awk '/=>/ { print $1 }'
done | sort -u | sed "s/['\"]/\\\&/g" | xargs -r -n 1 basename | grep -v 'libNoVersion.so' | grep -v '4[um]lib.so' | sort -u
perllist=
for f in $scriptlist; do
@ -27,20 +15,6 @@ for f in $scriptlist; do
case $interp in
*/perl) perllist="$perllist $f" ;;
esac
echo $interp
done | sort -u
for f in $liblist $exelist ; do
objdump -p $f | awk '
BEGIN { START=0; LIBNAME=""; }
/Version References:/ { START=1; }
/required from/ && (START==1) {
sub(/:/, "", $3);
LIBNAME=$3;
}
(START==1) && (LIBNAME!="") && ($4!="") { print LIBNAME "(" $4 ")"; }
/^$/ { START=0; }
'
done | sort -u
#
@ -48,3 +22,5 @@ done | sort -u
set -x
[ -x /usr/lib/rpm/perl.req -a -n "$perllist" ] && \
echo $perllist | tr [:blank:] \\n | /usr/lib/rpm/perl.req | sort -u
set +x
echo $filelist | /usr/lib/rpm/find-requires