From 66671b9701767918dfc0541f15aca2e6abd0ac85 Mon Sep 17 00:00:00 2001 From: jbj Date: Wed, 13 Dec 2000 22:00:33 +0000 Subject: [PATCH] - fix: (transaction.c) assume file state normal if tag is missing. - fix: failed signature read headerFree segfault. - fix: revert ALPHA_LOSSAGE, breaks 6.2/i386. CVS patchset: 4343 CVS date: 2000/12/13 22:00:33 --- CHANGES | 2 ++ lib/depends.c | 4 ++-- lib/rpmchecksig.c | 2 +- lib/signature.c | 2 +- lib/transaction.c | 3 ++- po/cs.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/es.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/gl.po | 2 +- po/hu.po | 2 +- po/id.po | 2 +- po/is.po | 2 +- po/it.po | 2 +- po/ja.po | 4 ++-- po/ko.po | 2 +- po/no.po | 2 +- po/pl.po | 2 +- po/pt.po | 2 +- po/pt_BR.po | 2 +- po/ro.po | 2 +- po/rpm.pot | 2 +- po/ru.po | 2 +- po/sk.po | 2 +- po/sl.po | 4 ++-- po/sr.po | 2 +- po/sv.po | 2 +- po/tr.po | 2 +- po/uk.po | 2 +- po/wa.po | 2 +- po/zh.po | 2 +- po/zh_CN.GB2312.po | 2 +- rpm.spec | 8 ++++++-- rpm.spec.in | 11 +++++++++-- 36 files changed, 54 insertions(+), 40 deletions(-) diff --git a/CHANGES b/CHANGES index c801fcd..81c7ce5 100644 --- a/CHANGES +++ b/CHANGES @@ -63,6 +63,8 @@ - fix: headerUnload handles headers w/o regions correctly on rebuilddb. - resurrect rpmrc Provides: as well as implicit dependency on packge info. + - change dependency loop message to RPMMESS_WARNING to use stderr, not + stdout. 3.0.6 -> 4.0 - use DIRNAMES/BASENAMES/DIRINDICES not FILENAMES in packages and db. diff --git a/lib/depends.c b/lib/depends.c index 06a5990..4e7965a 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -1785,7 +1785,7 @@ rescan: p->tsi.tsi_pkg = NULL; if (!printed) { - rpmMessage(RPMMESS_NORMAL, _("LOOP:\n")); + rpmMessage(RPMMESS_WARNING, _("LOOP:\n")); printed = 1; } @@ -1794,7 +1794,7 @@ rescan: /* Print next member of loop. */ sprintf(buf, "%s-%s-%s", p->name, p->version, p->release); - rpmMessage(RPMMESS_NORMAL, " %-40s %s\n", buf, dp); + rpmMessage(RPMMESS_WARNING, " %-40s %s\n", buf, dp); if (dp) { free((void *)dp); diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c index 6f67eb0..d08fe9f 100644 --- a/lib/rpmchecksig.c +++ b/lib/rpmchecksig.c @@ -102,7 +102,7 @@ exit: * Otherwise, the (mis-compilation?!) symptom is the inability to pass sig_type- * correctly to rpmReadSignature(FD_t *fd, Header *header, short sig_type) * (Note: the short in both struct rpmlead and in the prototype). */ -#define ALPHA_LOSSAGE +#undef ALPHA_LOSSAGE int rpmReSign(rpmResignFlags add, char *passPhrase, const char **argv) { diff --git a/lib/signature.c b/lib/signature.c index 3887c1c..e5cf12b 100644 --- a/lib/signature.c +++ b/lib/signature.c @@ -188,7 +188,7 @@ int rpmReadSignature(FD_t fd, Header *headerp, short sigType) if (rc == 0 && headerp) *headerp = h; - else + else if (h) headerFree(h); return rc; diff --git a/lib/transaction.c b/lib/transaction.c index 14b1232..048378f 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -880,7 +880,8 @@ static int handleInstInstalledFiles(TFI_t * fi, rpmdb db, otherFileNum = shared->otherFileNum; fileNum = shared->pkgFileNum; - if (otherStates[otherFileNum] != RPMFILE_STATE_NORMAL) + /* XXX another tedious segfault, assume file state normal. */ + if (otherStates && otherStates[otherFileNum] != RPMFILE_STATE_NORMAL) continue; if (fi->actions[fileNum] == FA_SKIPMULTILIB) diff --git a/po/cs.po b/po/cs.po index 67e52fd..0fd2214 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-12 16:25-0500\n" +"POT-Creation-Date: 2000-12-12 20:42-0500\n" "PO-Revision-Date: 2000-08-23 22:24+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" diff --git a/po/da.po b/po/da.po index 6a7324a..6ff34a4 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-12 16:25-0500\n" +"POT-Creation-Date: 2000-12-12 20:42-0500\n" "PO-Revision-Date: 2000-03-07 05:17+01:00\n" "Last-Translator: K. Christiansen \n" "Language-Team: Danish/Dansk \n" diff --git a/po/de.po b/po/de.po index 7b3b2e4..7beccf1 100644 --- a/po/de.po +++ b/po/de.po @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-12 16:25-0500\n" +"POT-Creation-Date: 2000-12-12 20:42-0500\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" diff --git a/po/es.po b/po/es.po index d74c43f..b4bb499 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-12 16:25-0500\n" +"POT-Creation-Date: 2000-12-12 20:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/fi.po b/po/fi.po index ac44e88..4fb15a4 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2000-12-12 16:25-0500\n" +"POT-Creation-Date: 2000-12-12 20:42-0500\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=\n" diff --git a/po/fr.po b/po/fr.po index 26e4c10..cc8f9d9 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,5 +1,5 @@ msgid "" -msgstr "POT-Creation-Date: 2000-12-12 16:25-0500\n" +msgstr "POT-Creation-Date: 2000-12-12 20:42-0500\n" #: build.c:26 #, fuzzy, c-format diff --git a/po/gl.po b/po/gl.po index d74c43f..b4bb499 100644 --- a/po/gl.po +++ b/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-12 16:25-0500\n" +"POT-Creation-Date: 2000-12-12 20:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/hu.po b/po/hu.po index d74c43f..b4bb499 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-12 16:25-0500\n" +"POT-Creation-Date: 2000-12-12 20:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/id.po b/po/id.po index d74c43f..b4bb499 100644 --- a/po/id.po +++ b/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-12 16:25-0500\n" +"POT-Creation-Date: 2000-12-12 20:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/is.po b/po/is.po index 47c9430..e2bb62f 100644 --- a/po/is.po +++ b/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-12 16:25-0500\n" +"POT-Creation-Date: 2000-12-12 20:42-0500\n" "PO-Revision-Date: 2000-08-02 13:00+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" diff --git a/po/it.po b/po/it.po index d74c43f..b4bb499 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-12 16:25-0500\n" +"POT-Creation-Date: 2000-12-12 20:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/ja.po b/po/ja.po index 56bcd09..ec40066 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-12 16:25-0500\n" +"POT-Creation-Date: 2000-12-12 20:42-0500\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.123 2000/12/12 21:45:21 jbj Exp $ +# $Id: ja.po,v 1.124 2000/12/13 22:00:35 jbj Exp $ #: rpm.c:185 rpmqv.c:269 #, c-format msgid "rpm: %s\n" diff --git a/po/ko.po b/po/ko.po index d74c43f..b4bb499 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-12 16:25-0500\n" +"POT-Creation-Date: 2000-12-12 20:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/no.po b/po/no.po index b89370e..333aad9 100644 --- a/po/no.po +++ b/po/no.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-12 16:25-0500\n" +"POT-Creation-Date: 2000-12-12 20:42-0500\n" "PO-Revision-Date: 2000-08-17 20:22+02:00\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" diff --git a/po/pl.po b/po/pl.po index 41224a7..cfac169 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-12 16:25-0500\n" +"POT-Creation-Date: 2000-12-12 20:42-0500\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" diff --git a/po/pt.po b/po/pt.po index 62f6512..c859768 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-12 16:25-0500\n" +"POT-Creation-Date: 2000-12-12 20:42-0500\n" "PO-Revision-Date: 2000-08-01 21:11+01:00\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt \n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 87e7c47..8910f57 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-12-12 16:25-0500\n" +msgstr "POT-Creation-Date: 2000-12-12 20:42-0500\n" # , c-format #: build.c:26 diff --git a/po/ro.po b/po/ro.po index c67e54d..1c0a04a 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-12 16:25-0500\n" +"POT-Creation-Date: 2000-12-12 20:42-0500\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" diff --git a/po/rpm.pot b/po/rpm.pot index c382c77..a0b7f71 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-12-12 16:25-0500\n" +"POT-Creation-Date: 2000-12-13 16:59-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/ru.po b/po/ru.po index 27fd543..52d3857 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-12 16:25-0500\n" +"POT-Creation-Date: 2000-12-12 20:42-0500\n" "PO-Revision-Date: 2000-08-08 01:20+0300\n" "Last-Translator: Eugene Kanter \n" "Language-Team: Black Cat Linux Team \n" diff --git a/po/sk.po b/po/sk.po index fb6338b..d34ba4b 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-12 16:25-0500\n" +"POT-Creation-Date: 2000-12-12 20:42-0500\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" diff --git a/po/sl.po b/po/sl.po index 7032ec4..d602b4e 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.108 2000/12/12 21:45:26 jbj Exp $ +# $Id: sl.po,v 1.109 2000/12/13 22:00:38 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-12 16:25-0500\n" +"POT-Creation-Date: 2000-12-12 20:42-0500\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" diff --git a/po/sr.po b/po/sr.po index 8d639e2..80a0325 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2000-12-12 16:25-0500\n" +"POT-Creation-Date: 2000-12-12 20:42-0500\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" "From: Erik Troan \n" diff --git a/po/sv.po b/po/sv.po index 1399315..bc06911 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-12 16:25-0500\n" +"POT-Creation-Date: 2000-12-12 20:42-0500\n" "PO-Revision-Date: 2000-10-09 22:31+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" diff --git a/po/tr.po b/po/tr.po index 342703a..2b4f513 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-12 16:25-0500\n" +"POT-Creation-Date: 2000-12-12 20:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/uk.po b/po/uk.po index d74c43f..b4bb499 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-12 16:25-0500\n" +"POT-Creation-Date: 2000-12-12 20:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/wa.po b/po/wa.po index d74c43f..b4bb499 100644 --- a/po/wa.po +++ b/po/wa.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-12 16:25-0500\n" +"POT-Creation-Date: 2000-12-12 20:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/zh.po b/po/zh.po index d74c43f..b4bb499 100644 --- a/po/zh.po +++ b/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2000-12-12 16:25-0500\n" +"POT-Creation-Date: 2000-12-12 20:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index d74c43f..b4bb499 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.1\n" -"POT-Creation-Date: 2000-12-12 16:25-0500\n" +"POT-Creation-Date: 2000-12-12 20:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/rpm.spec b/rpm.spec index 4ebf828..3bf3f16 100644 --- a/rpm.spec +++ b/rpm.spec @@ -14,7 +14,7 @@ Summary: The Red Hat package management system. Name: rpm %define version 4.0.2 Version: %{version} -Release: 0.1 +Release: 0.3 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{version}.tar.gz Copyright: GPL @@ -96,7 +96,7 @@ programs that will manipulate RPM packages and databases. %package -n popt Summary: A C library for parsing command line parameters. Group: Development/Libraries -Version: 1.6.1 +Version: 1.6.2 %description -n popt Popt is a C library for parsing command line parameters. Popt was @@ -310,8 +310,12 @@ fi %{__prefix}/include/popt.h %changelog +* Wed Dec 13 2000 Jeff Johnson +- bump popt version. + * Tue Dec 12 2000 Jeff Johnson - bail on header regions. +- change dependency loop message to RPMMESS_WARNING to use stderr, not stdout. * Sun Dec 10 2000 Jeff Johnson - handle added dirtoken tags (mostly) correctly with header regions. diff --git a/rpm.spec.in b/rpm.spec.in index 815b1a8..385cffb 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -14,7 +14,7 @@ Summary: The Red Hat package management system. Name: rpm %define version @VERSION@ Version: %{version} -Release: 0.1 +Release: 0.3 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{version}.tar.gz Copyright: GPL @@ -96,7 +96,7 @@ programs that will manipulate RPM packages and databases. %package -n popt Summary: A C library for parsing command line parameters. Group: Development/Libraries -Version: 1.6.1 +Version: 1.6.2 %description -n popt Popt is a C library for parsing command line parameters. Popt was @@ -310,8 +310,15 @@ fi %{__prefix}/include/popt.h %changelog +* Wed Dec 13 2000 Jeff Johnson +- bump popt version. +- fix: (transaction.c) assume file state normal if tag is missing. +- fix: failed signature read headerFree segfault. +- fix: revert ALPHA_LOSSAGE, breaks 6.2/i386. + * Tue Dec 12 2000 Jeff Johnson - bail on header regions. +- change dependency loop message to RPMMESS_WARNING to use stderr, not stdout. * Sun Dec 10 2000 Jeff Johnson - handle added dirtoken tags (mostly) correctly with header regions. -- 2.7.4