From c4f6f42f9458f0b20f16138ddc6f91f201c6ef03 Mon Sep 17 00:00:00 2001 From: jbj Date: Wed, 24 Jul 2002 18:52:22 +0000 Subject: [PATCH] - fix: segfault if given a text file as 2nd arg to -Uvh (#69508). CVS patchset: 5569 CVS date: 2002/07/24 18:52:22 --- CHANGES | 1 + lib/package.c | 2 +- po/cs.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/en_RN.po | 2 +- po/es.po | 2 +- po/eu_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 | 2 +- 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.in | 3 ++- 34 files changed, 36 insertions(+), 34 deletions(-) diff --git a/CHANGES b/CHANGES index 52f8052..6d7b91c 100644 --- a/CHANGES +++ b/CHANGES @@ -178,6 +178,7 @@ - add methods to make signature handling opaque wrto rpmts. - verify signatures/digests retrieved through rpmdbNextIterator(). - imbue %ghost with missingok attribute with --verify (#68933). + - fix: segfault if given a text file as 2nd arg to -Uvh (#69508). 4.0.3 -> 4.0.4: - solaris: translate i86pc to i386 (#57182). diff --git a/lib/package.c b/lib/package.c index c54c5c2..4b48d1f 100644 --- a/lib/package.c +++ b/lib/package.c @@ -551,7 +551,7 @@ int rpmReadPackageFile(rpmts ts, FD_t fd, byte buf[8*BUFSIZ]; ssize_t count; struct rpmlead * l = alloca(sizeof(*l)); - Header sigh; + Header sigh = NULL; int_32 sigtag; int_32 sigtype; const void * sig; diff --git a/po/cs.po b/po/cs.po index 30bebc6..9354dd4 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-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" diff --git a/po/da.po b/po/da.po index abeaf13..9d0ed53 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-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" diff --git a/po/de.po b/po/de.po index 9636cea..97ebe89 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-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\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/en_RN.po b/po/en_RN.po index 14b69f8..1fa9205 100644 --- a/po/en_RN.po +++ b/po/en_RN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/es.po b/po/es.po index 14b69f8..1fa9205 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/eu_ES.po b/po/eu_ES.po index 14b69f8..1fa9205 100644 --- a/po/eu_ES.po +++ b/po/eu_ES.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\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 6c42c35..8196788 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-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\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 1c25906..7691876 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-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/gl.po b/po/gl.po index 36e5b10..8085ec8 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-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" diff --git a/po/hu.po b/po/hu.po index 14b69f8..1fa9205 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\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 14b69f8..1fa9205 100644 --- a/po/id.po +++ b/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\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 92f00cb..86c8e42 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-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" diff --git a/po/it.po b/po/it.po index 14b69f8..1fa9205 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\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 7c07537..ea5cfd0 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-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" diff --git a/po/ko.po b/po/ko.po index 03d2c31..5b56953 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-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\n" "PO-Revision-Date: 2002-03-04 17:17+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" diff --git a/po/no.po b/po/no.po index c0b75fc..c036d40 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-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" diff --git a/po/pl.po b/po/pl.po index 4162cb4..64cb0b4 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-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\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 89e6fb8..f52e851 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm\n" -"POT-Creation-Date: 2002-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\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" diff --git a/po/rpm.pot b/po/rpm.pot index f8463ac..55ca51c 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-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\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 6273068..6ed5b70 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-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\n" "PO-Revision-Date: 2002-04-09 16:44-0400\n" "Last-Translator: Eugene Kanter, \n" "Language-Team: Black Cat Linux Team \n" diff --git a/po/sk.po b/po/sk.po index 0008fa0..016b575 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-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\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 2eb3bf3..6d606e3 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.285 2002/07/24 16:21:57 jbj Exp $ +# $Id: sl.po,v 1.286 2002/07/24 18:53:25 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\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 09c7621..6ba9d76 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-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" diff --git a/po/sv.po b/po/sv.po index ba4da8f..301f876 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-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\n" "PO-Revision-Date: 2002-07-11 22:49+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" diff --git a/po/tr.po b/po/tr.po index 07a90bc..f1aa54b 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-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" diff --git a/po/uk.po b/po/uk.po index 14b69f8..1fa9205 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\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 14b69f8..1fa9205 100644 --- a/po/wa.po +++ b/po/wa.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\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 14b69f8..1fa9205 100644 --- a/po/zh.po +++ b/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\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 14b69f8..1fa9205 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.3\n" -"POT-Creation-Date: 2002-07-24 12:18-0400\n" +"POT-Creation-Date: 2002-07-24 14:49-0400\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.in b/rpm.spec.in index 8302300..935a622 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -17,7 +17,7 @@ Name: rpm %define version @VERSION@ Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 0.54 +Release: 0.55 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz Copyright: GPL @@ -516,6 +516,7 @@ fi %changelog * Wed Jul 24 2002 Jeff Johnson 4.1-0.54 - imbue %ghost with missingok attribute with --verify (#68933). +- fix: segfault if given a text file as 2nd arg to -Uvh (#69508). * Tue Jul 23 2002 Jeff Johnson 4.1-0.53 - verify signatures/digests retrieved through rpmdbNextIterator(). -- 2.7.4