Typo (t->num rather than tnum causes segfault while re-reading rpmrc on exit).

CVS patchset: 3491
CVS date: 1999/12/19 18:59:46

diff --git a/build.c b/build.c
index 63322e7..5992975 100644 (file)
--- a/build.c
+++ b/build.c
@@ -258,9 +258,9 @@ exit:
     return rc;
 }
 
-int build(const char *arg, struct rpmBuildArguments *ba, const char *passPhrase,
-         int fromTarball, char *cookie, const char * rcfile, int force,
-         int nodeps)
+int build(const char * arg, struct rpmBuildArguments * ba,
+       const char * passPhrase, int fromTarball, char * cookie,
+       const char * rcfile, int force, int nodeps)
 {
     char *t, *te;
     int rc = 0;

diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index 926fc3c..350537d 100644 (file)
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -282,8 +282,8 @@ static void machFindEquivs(struct machCache * cache,
     machCacheEntryVisit(cache, table, key, 2);
 }
 
-static int addCanon(struct canonEntry **table, int *tableLen, char *line,
-                   const char *fn, int lineNum)
+static int addCanon(struct canonEntry ** table, int * tableLen, char * line,
+                   const char * fn, int lineNum)
 {
     struct canonEntry *t;
     char *s, *s1;
@@ -314,7 +314,7 @@ static int addCanon(struct canonEntry **table, int *tableLen, char *line,
     }
 
     tnum = strtoul(s, &s1, 10);
-    if ((*s1) || (s1 == s) || (t->num == ULONG_MAX)) {
+    if ((*s1) || (s1 == s) || (tnum == ULONG_MAX)) {
        rpmError(RPMERR_RPMRC, _("Bad arch/os number: %s (%s:%d)"), s,
              fn, lineNum);
        return(RPMERR_RPMRC);

diff --git a/po/cs.po b/po/cs.po
index 8762316..f21a620 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-12-16 15:59-0500\n"
+"POT-Creation-Date: 1999-12-19 13:47-0500\n"
 "PO-Revision-Date: 1998-10-10 10:10+0200\n"
 "Last-Translator: Pavel Makovec <pavelm@terminal.cz>\n"
 "Language-Team: Czech <pavelm@terminal.cz>\n"
@@ -2594,7 +2594,7 @@ msgstr " koliduje s %s-%s-%s\n"
 
 #: lib/problems.c:98
 #, fuzzy, c-format
-msgid "package %s-%s-%s (which is newer then %s-%s-%s) is already installed"
+msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
 msgstr "balíèek %s-%s-%s obsahuje sdílení soubory\n"
 
 #: lib/problems.c:104

diff --git a/po/de.po b/po/de.po
index 72fc189..33a09bf 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.5.2\n"
-"POT-Creation-Date: 1999-12-16 15:59-0500\n"
+"POT-Creation-Date: 1999-12-19 13:47-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"
@@ -2705,7 +2705,7 @@ msgstr " steht im Konflikt mit %s-%s-%s\n"
 # FIXME shared, besser: "mit anderen geteilte ..."
 #: lib/problems.c:98
 #, fuzzy, c-format
-msgid "package %s-%s-%s (which is newer then %s-%s-%s) is already installed"
+msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
 msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
 
 #: lib/problems.c:104

diff --git a/po/fi.po b/po/fi.po
index 6229e25..5adc0d6 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-12-16 15:59-0500\n"
+"POT-Creation-Date: 1999-12-19 13:47-0500\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -2631,7 +2631,7 @@ msgstr " on ristiriidassa %s-%s-%s:n kanssa\n"
 
 #: lib/problems.c:98
 #, fuzzy, c-format
-msgid "package %s-%s-%s (which is newer then %s-%s-%s) is already installed"
+msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
 msgstr "paketti %s-%s-%s  sisältää jaettuja tiedostoja\n"
 
 #: lib/problems.c:104

diff --git a/po/fr.po b/po/fr.po
index f93d868..c7a17ca 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 1999-12-16 15:59-0500\n"
+msgstr "POT-Creation-Date: 1999-12-19 13:47-0500\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:424
 #, c-format
@@ -2631,7 +2631,7 @@ msgstr ""
 
 #: lib/problems.c:98
 #, fuzzy, c-format
-msgid "package %s-%s-%s (which is newer then %s-%s-%s) is already installed"
+msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
 #: lib/problems.c:104

diff --git a/po/pl.po b/po/pl.po
index dcb6fed..838b80d 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm-3.0.2\n"
-"POT-Creation-Date: 1999-12-16 15:59-0500\n"
+"POT-Creation-Date: 1999-12-19 13:47-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"
@@ -2546,8 +2546,8 @@ msgstr ""
 "plik %s z pakietu %s-%s-%s jest w konflikcie z plikiem z pakietu %s-%s-%s"
 
 #: lib/problems.c:98
-#, c-format
-msgid "package %s-%s-%s (which is newer then %s-%s-%s) is already installed"
+#, fuzzy, c-format
+msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
 msgstr ""
 "pakiet %s-%s-%s (który jest nowszy ni¿ %s-%s-%s) jest ju¿ zainstalowany"
 

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 07702a1..eeb72e8 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,7 +2,7 @@
 # Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998.
 #
 msgid ""
-msgstr "POT-Creation-Date: 1999-12-16 15:59-0500\n"
+msgstr "POT-Creation-Date: 1999-12-19 13:47-0500\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:424
 #, c-format
@@ -2699,7 +2699,7 @@ msgstr ""
 
 #: lib/problems.c:98
 #, fuzzy, c-format
-msgid "package %s-%s-%s (which is newer then %s-%s-%s) is already installed"
+msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
 msgstr "não foi passado pacote para instalação"
 
 #: lib/problems.c:104

diff --git a/po/rpm.pot b/po/rpm.pot
index 27a1f54..2bf760e 100644 (file)
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-12-18 14:33-0500\n"
+"POT-Creation-Date: 1999-12-19 13:47-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"

diff --git a/po/ru.po b/po/ru.po
index 85cbf61..d91700c 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-12-16 15:59-0500\n"
+"POT-Creation-Date: 1999-12-19 13:47-0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -2551,8 +2551,8 @@ msgid ""
 msgstr "ÆÁÊÌ %s ÉÚ ÐÁËÅÔÁ %s-%s-%s ËÏÎÆÌÉËÔÕÅÔ Ó ÆÁÊÌÏÍ ÉÚ ÐÁËÅÔÁ %s-%s-%s"
 
 #: lib/problems.c:98
-#, c-format
-msgid "package %s-%s-%s (which is newer then %s-%s-%s) is already installed"
+#, fuzzy, c-format
+msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
 msgstr "ÐÁËÅÔ %s-%s-%s (ËÏÔÏÒÙÊ ÎÏ×ÅÅ, ÞÅÍ %s-%s-%s) ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
 
 #: lib/problems.c:104

diff --git a/po/sk.po b/po/sk.po
index 427a8bd..178c821 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.93\n"
-"POT-Creation-Date: 1999-12-16 15:59-0500\n"
+"POT-Creation-Date: 1999-12-19 13:47-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"
@@ -2555,9 +2555,9 @@ msgid ""
 msgstr ""
 
 #: lib/problems.c:98
-#, c-format
-msgid "package %s-%s-%s (which is newer then %s-%s-%s) is already installed"
-msgstr ""
+#, fuzzy, c-format
+msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+msgstr "balík %s nie je nain¹talovaný\n"
 
 #: lib/problems.c:104
 #, c-format

diff --git a/po/sr.po b/po/sr.po
index a83a2a2..932b2f3 100644 (file)
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-12-16 15:59-0500\n"
+"POT-Creation-Date: 1999-12-19 13:47-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"
@@ -2591,7 +2591,7 @@ msgstr " se sudara sa %s-%s-%s\n"
 
 #: lib/problems.c:98
 #, fuzzy, c-format
-msgid "package %s-%s-%s (which is newer then %s-%s-%s) is already installed"
+msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
 msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
 
 #: lib/problems.c:104

diff --git a/po/sv.po b/po/sv.po
index 7f2a3ca..11f4d9d 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 1999-12-16 15:59-0500\n"
+msgstr "POT-Creation-Date: 1999-12-19 13:47-0500\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:424
 #, c-format
@@ -2645,7 +2645,7 @@ msgstr ""
 
 #: lib/problems.c:98
 #, fuzzy, c-format
-msgid "package %s-%s-%s (which is newer then %s-%s-%s) is already installed"
+msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
 msgstr "inga paket angivna för installation"
 
 #: lib/problems.c:104

diff --git a/po/tr.po b/po/tr.po
index 2330a8e..63edb9f 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-12-16 15:59-0500\n"
+"POT-Creation-Date: 1999-12-19 13:47-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"
@@ -2630,7 +2630,7 @@ msgstr ", %s-%s-%s ile 
 
 #: lib/problems.c:98
 #, fuzzy, c-format
-msgid "package %s-%s-%s (which is newer then %s-%s-%s) is already installed"
+msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
 msgstr "Paket %s-%s-%s ortak (shared) dosyalar içeriyor\n"
 
 #: lib/problems.c:104

diff --git a/rpm.spec b/rpm.spec
index 1df9e7e..0ee8e2f 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -2,7 +2,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version 3.0.4
 Version: %{version}
-Release: 0.18
+Release: 0.19
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz
 Copyright: GPL