fix: missing strdup when overriding buildroot from command line

     argument (#1026,#5006).

CVS patchset: 3487
CVS date: 1999/12/16 19:38:28

16 files changed, 304 insertions, 279 deletions

diff --git a/CHANGES b/CHANGES
index dc47c618d..b251a20e6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -25,6 +25,8 @@
 	- fix: compressFileList was over-generating dirNames.
 	- fix: alAddPackage sorted dirNames too soon, destroying dirMapping.
 	- expose enough of legacy fdio interface to compile gnorpm.
+	- fix: missing strdup when overriding buildroot from command line
+	  argument (#1026,#5006).
 
 3.0.2 -> 3.0.3
 	- add --eval to find result of macro expansion.
diff --git a/build/parseSpec.c b/build/parseSpec.c
index f914ffee8..bd037f45b 100644
--- a/build/parseSpec.c
+++ b/build/parseSpec.c
@@ -364,10 +364,10 @@ int parseSpec(Spec *specp, const char *specFile, const char *rootURL,
             return RPMERR_BADSPEC;
         }
 	spec->gotBuildRootURL = 1;
-	spec->buildRootURL = buildRootURL;
+	spec->buildRootURL = xstrdup(buildRootURL);
 	addMacro(spec->macros, "buildroot", NULL, buildRoot, RMIL_SPEC);
 if (_debug)
-fprintf(stderr, "*** PS buildRootURL %s macro set to %s\n", buildRootURL, buildRoot);
+fprintf(stderr, "*** PS buildRootURL(%s) %p macro set to %s\n", spec->buildRootURL, spec->buildRootURL, buildRoot);
     }
     addMacro(NULL, "_docdir", NULL, "%{_defaultdocdir}", RMIL_SPEC);
     spec->inBuildArchitectures = inBuildArch;
diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index 7814c602e..926fc3caa 100644
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -16,9 +16,9 @@
 static const char *defrcfiles = LIBRPMRC_FILENAME ":/etc/rpmrc:~/.rpmrc";
 
 struct machCacheEntry {
-    char * name;
+    const char * name;
     int count;
-    char ** equivs;
+    const char ** equivs;
     int visited;
 };
 
@@ -28,7 +28,7 @@ struct machCache {
 };
 
 struct machEquivInfo {
-    char * name;
+    const char * name;
     int score;
 };
 
@@ -66,8 +66,9 @@ struct canonEntry {
 
    for giggles, 'key'_canon, 'key'_compat, and 'key'_canon will also work */
 struct tableType {
-    char * key;
-    int hasCanon, hasTranslate;
+    const char * const key;
+    const int hasCanon;
+    const int hasTranslate;
     struct machEquivTable equiv;
     struct machCache cache;
     struct defaultEntry * defaults;
@@ -102,6 +103,7 @@ static int optionTableSize = sizeof(optionTable) / sizeof(*optionTable);
 static char * current[2];
 static int currTables[2] = { RPM_MACHTABLE_INSTOS, RPM_MACHTABLE_INSTARCH };
 static struct rpmvarValue values[RPMVAR_NUM];
+static int defaultsInitialized = 0;
 
 /* prototypes */
 static int doReadRC(FD_t fd, const char * urlfn);
@@ -159,8 +161,9 @@ static int machCompatCacheAdd(char * name, const char * fn, int linenum,
 	entry = machCacheFindEntry(cache, name);
 	if (entry) {
 	    for (i = 0; i < entry->count; i++)
-		free(entry->equivs[i]);
-	    if (entry->count) free(entry->equivs);
+		xfree(entry->equivs[i]);
+	    xfree(entry->equivs);
+	    entry->equivs = NULL;
 	    entry->count = 0;
 	}
     }
@@ -284,6 +287,9 @@ static int addCanon(struct canonEntry **table, int *tableLen, char *line,
 {
     struct canonEntry *t;
     char *s, *s1;
+    const char * tname;
+    const char * tshort_name;
+    int tnum;
 
     if (! *tableLen) {
 	*tableLen = 2;
@@ -294,10 +300,10 @@ static int addCanon(struct canonEntry **table, int *tableLen, char *line,
     }
     t = & ((*table)[*tableLen - 2]);
 
-    t->name = strtok(line, ": \t");
-    t->short_name = strtok(NULL, " \t");
+    tname = strtok(line, ": \t");
+    tshort_name = strtok(NULL, " \t");
     s = strtok(NULL, " \t");
-    if (! (t->name && t->short_name && s)) {
+    if (! (tname && tshort_name && s)) {
 	rpmError(RPMERR_RPMRC, _("Incomplete data line at %s:%d"), fn, lineNum);
 	return RPMERR_RPMRC;
     }
@@ -307,21 +313,22 @@ static int addCanon(struct canonEntry **table, int *tableLen, char *line,
 	return RPMERR_RPMRC;
     }
 
-    t->num = strtoul(s, &s1, 10);
+    tnum = strtoul(s, &s1, 10);
     if ((*s1) || (s1 == s) || (t->num == ULONG_MAX)) {
 	rpmError(RPMERR_RPMRC, _("Bad arch/os number: %s (%s:%d)"), s,
 	      fn, lineNum);
 	return(RPMERR_RPMRC);
     }
 
-    t->name = xstrdup(t->name);
-    t->short_name = xstrdup(t->short_name);
+    t[0].name = xstrdup(tname);
+    t[0].short_name = xstrdup(tshort_name);
+    t[0].num = tnum;
 
     /* From A B C entry */
     /* Add  B B C entry */
-    t[1].name = xstrdup(t->short_name);
-    t[1].short_name = xstrdup(t->short_name);
-    t[1].num = t->num;
+    t[1].name = xstrdup(tshort_name);
+    t[1].short_name = xstrdup(tshort_name);
+    t[1].num = tnum;
 
     return 0;
 }
@@ -504,11 +511,10 @@ int rpmReadRC(const char * rcfiles)
 {
     char *myrcfiles, *r, *re;
     int rc;
-    static int first = 1;
 
-    if (first) {
+    if (!defaultsInitialized) {
 	setDefaults();
-	first = 0;
+	defaultsInitialized = 1;
     }
 
     if (rcfiles == NULL)
@@ -1270,6 +1276,8 @@ void rpmFreeRpmrc(void)
 		if (t->equiv.list[j].name)	xfree(t->equiv.list[j].name);
 	    }
 	    xfree(t->equiv.list);
+	    t->equiv.list = NULL;
+	    t->equiv.count = 0;
 	}
 	if (t->cache.cache) {
 	    for (j = 0; j < t->cache.size; j++) {
@@ -1279,12 +1287,14 @@ void rpmFreeRpmrc(void)
 		if (e->name)		xfree(e->name);
 		if (e->equivs) {
 		    for (k = 0; k < e->count; k++) {
-		    if (e->equivs[k])	xfree(e->equivs[k]);
+			if (e->equivs[k])	xfree(e->equivs[k]);
 		    }
 		    xfree(e->equivs);
 		}
 	    }
 	    xfree(t->cache.cache);
+	    t->cache.cache = NULL;
+	    t->cache.size = 0;
 	}
 	if (t->defaults) {
 	    for (j = 0; j < t->defaultsLength; j++) {
@@ -1292,6 +1302,8 @@ void rpmFreeRpmrc(void)
 		if (t->defaults[j].defName)	xfree(t->defaults[j].defName);
 	    }
 	    xfree(t->defaults);
+	    t->defaults = NULL;
+	    t->defaultsLength = 0;
 	}
 	if (t->canons) {
 	    for (j = 0; j < t->canonsLength; j++) {
@@ -1299,6 +1311,8 @@ void rpmFreeRpmrc(void)
 		if (t->canons[j].short_name)	xfree(t->canons[j].short_name);
 	    }
 	    xfree(t->canons);
+	    t->canons = NULL;
+	    t->canonsLength = 0;
 	}
     }
 
@@ -1310,11 +1324,20 @@ void rpmFreeRpmrc(void)
 	    if (this->arch)	xfree(this->arch);
 	    xfree(this);
 	}
-	if (values[i].value)	xfree(values[i].value);
-	if (values[i].arch)	xfree(values[i].arch);
+	if (values[i].value)
+	    xfree(values[i].value);
+	values[i].value = NULL;
+	if (values[i].arch)
+	    xfree(values[i].arch);
+	values[i].arch = NULL;
     }
-    if (current[OS])	xfree(current[OS]);
-    if (current[ARCH])	xfree(current[ARCH]);
+    if (current[OS])
+	xfree(current[OS]);
+    current[OS] = NULL;
+    if (current[ARCH])
+	xfree(current[ARCH]);
+    current[ARCH] = NULL;
+    defaultsInitialized = 0;
     return;
 }
 
diff --git a/po/cs.po b/po/cs.po
index 10f068906..e86cee362 100644
--- 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-15 10:33-0500\n"
+"POT-Creation-Date: 1999-12-16 14:22-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"
@@ -3234,93 +3234,93 @@ msgstr "probíhá pøihla¹ování na %s jako %s, h. %s\n"
 msgid "read failed: %s (%d)"
 msgstr "nelze èíst: %s (%d)"
 
-#: lib/rpmrc.c:142
+#: lib/rpmrc.c:144
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr "chybí druhá ':' u %s:%d"
 
-#: lib/rpmrc.c:145
+#: lib/rpmrc.c:147
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr "chybí název architektury u %s:%d"
 
-#: lib/rpmrc.c:301
+#: lib/rpmrc.c:307
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr "Neúplný datový øádek u %s:%d"
 
-#: lib/rpmrc.c:305
+#: lib/rpmrc.c:311
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr "Pøíli¹ mnoho argumentù v datovém øádku u %s:%d"
 
-#: lib/rpmrc.c:312
+#: lib/rpmrc.c:318
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr "Chybné èíslo arch/os: %s (%s:%d)"
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr "Neúplný výchozí øádek u %s:%d"
 
-#: lib/rpmrc.c:351
+#: lib/rpmrc.c:358
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr "Pøíli¹ mnoho argumentù ve výchozím øádku u %s:%d"
 
-#: lib/rpmrc.c:541
+#: lib/rpmrc.c:547
 #, c-format
 msgid "Cannot expand %s"
 msgstr ""
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:562
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr "Nelze otevøít %s pro ètení: %s."
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:601
+#: lib/rpmrc.c:607
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr "Nelze èíst %s: %s."
 
-#: lib/rpmrc.c:638
+#: lib/rpmrc.c:644
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr "chybí ':' u %s:%d"
 
-#: lib/rpmrc.c:655 lib/rpmrc.c:729
+#: lib/rpmrc.c:661 lib/rpmrc.c:735
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr "chybí argument pro %s u %s:%d"
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:694
+#: lib/rpmrc.c:678 lib/rpmrc.c:700
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr "nelze otevøít %s: %s"
 
-#: lib/rpmrc.c:681
+#: lib/rpmrc.c:687
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr "nelze otevøít soubor %s: "
 
-#: lib/rpmrc.c:721
+#: lib/rpmrc.c:727
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr "chybí architektura pro %s u %s:%d"
 
-#: lib/rpmrc.c:788
+#: lib/rpmrc.c:794
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr "chybná volba '%s' u %s:%d"
 
-#: lib/rpmrc.c:1156
+#: lib/rpmrc.c:1162
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Neznámý systém: %s\n"
 
-#: lib/rpmrc.c:1157
+#: lib/rpmrc.c:1163
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Zkontaktujte rpm-list@redhat.com\n"
 
@@ -3523,11 +3523,11 @@ msgstr "odstraní se soubory test = %d\n"
 msgid "running postuninstall script (if any)\n"
 msgstr "spou¹tí se pøípadný poinstalaèní skript\n"
 
-#: lib/uninstall.c:221
+#: lib/uninstall.c:222
 msgid "removing database entry\n"
 msgstr "odstraòuje se polo¾ka databáze\n"
 
-#: lib/uninstall.c:394
+#: lib/uninstall.c:400
 msgid "execution of script failed"
 msgstr "skript nelze spustit"
 
diff --git a/po/de.po b/po/de.po
index 038767631..975a7baf3 100644
--- 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-15 10:33-0500\n"
+"POT-Creation-Date: 1999-12-16 14:22-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"
@@ -3362,96 +3362,96 @@ msgstr ""
 msgid "read failed: %s (%d)"
 msgstr "lesen fehlgeschlagen: %s (%d)"
 
-#: lib/rpmrc.c:142
+#: lib/rpmrc.c:144
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr "fehlendes zweites ':' bei %s:%d"
 
-#: lib/rpmrc.c:145
+#: lib/rpmrc.c:147
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr "fehlender Name cer Architektur bei %s:%d"
 
-#: lib/rpmrc.c:301
+#: lib/rpmrc.c:307
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr "Unvollständige Datenzeile bei %s:%d"
 
-#: lib/rpmrc.c:305
+#: lib/rpmrc.c:311
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr "Zu viele Argumente in der Datenzeile bei %s:%d"
 
-#: lib/rpmrc.c:312
+#: lib/rpmrc.c:318
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr "Unzureichende arch/os Zahl: %s (%s:%d)"
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr "Unvollständige Standardzeile bei %s:%d"
 
-#: lib/rpmrc.c:351
+#: lib/rpmrc.c:358
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr "Zu viele Argumente in der Standardzeile bei %s:%d"
 
-#: lib/rpmrc.c:541
+#: lib/rpmrc.c:547
 #, c-format
 msgid "Cannot expand %s"
 msgstr ""
 
 # , c-format
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:562
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s."
 
 # , c-format
 #. XXX Feof(fd)
-#: lib/rpmrc.c:601
+#: lib/rpmrc.c:607
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
-#: lib/rpmrc.c:638
+#: lib/rpmrc.c:644
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr "fehlender ':' bei %s:%d"
 
-#: lib/rpmrc.c:655 lib/rpmrc.c:729
+#: lib/rpmrc.c:661 lib/rpmrc.c:735
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr "fehlendes Argument für %s bei %s:%d"
 
 # , c-format
-#: lib/rpmrc.c:672 lib/rpmrc.c:694
+#: lib/rpmrc.c:678 lib/rpmrc.c:700
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/rpmrc.c:681
+#: lib/rpmrc.c:687
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/rpmrc.c:721
+#: lib/rpmrc.c:727
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr "fehlende Architektur für %s bei %s:%d"
 
-#: lib/rpmrc.c:788
+#: lib/rpmrc.c:794
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr "unzureichende Option '%s' bei %s:%d"
 
-#: lib/rpmrc.c:1156
+#: lib/rpmrc.c:1162
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1157
+#: lib/rpmrc.c:1163
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
@@ -3659,11 +3659,11 @@ msgstr ""
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:221
+#: lib/uninstall.c:222
 msgid "removing database entry\n"
 msgstr ""
 
-#: lib/uninstall.c:394
+#: lib/uninstall.c:400
 msgid "execution of script failed"
 msgstr "Ausführung des Skripts fehlgeschlagen"
 
diff --git a/po/fi.po b/po/fi.po
index e16295e04..8f957a4e1 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-12-15 10:33-0500\n"
+"POT-Creation-Date: 1999-12-16 14:22-0500\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -3277,93 +3277,93 @@ msgstr ""
 msgid "read failed: %s (%d)"
 msgstr "luku epäonnistui: %s (%d)"
 
-#: lib/rpmrc.c:142
+#: lib/rpmrc.c:144
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr "toinen ':' puuttuu, %s:%d"
 
-#: lib/rpmrc.c:145
+#: lib/rpmrc.c:147
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr "puuttuva arkkitehtuurin nimi, %s:%d"
 
-#: lib/rpmrc.c:301
+#: lib/rpmrc.c:307
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr "Epätäydellinen datarivi, %s:%d"
 
-#: lib/rpmrc.c:305
+#: lib/rpmrc.c:311
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr "liian monta parametriä datarivillä %s:%d"
 
-#: lib/rpmrc.c:312
+#: lib/rpmrc.c:318
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr "Huono arkkitehtuuri/käyttöjärjestelmä numero: %s (%s:%d)"
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr "Epätäydellinen oletusrivi, %s:%d"
 
-#: lib/rpmrc.c:351
+#: lib/rpmrc.c:358
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr "liian monta parametriä oletusrivillä %s:%d"
 
-#: lib/rpmrc.c:541
+#: lib/rpmrc.c:547
 #, c-format
 msgid "Cannot expand %s"
 msgstr ""
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:562
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr "En voi avata %s luettavaksi: %s."
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:601
+#: lib/rpmrc.c:607
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr "En voi lukea %s: %s."
 
-#: lib/rpmrc.c:638
+#: lib/rpmrc.c:644
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr "puuttuva ':', %s:%d"
 
-#: lib/rpmrc.c:655 lib/rpmrc.c:729
+#: lib/rpmrc.c:661 lib/rpmrc.c:735
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr "%s:n puuttuva parametri %s:%d"
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:694
+#: lib/rpmrc.c:678 lib/rpmrc.c:700
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr "en voinut avata %s: %s"
 
-#: lib/rpmrc.c:681
+#: lib/rpmrc.c:687
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/rpmrc.c:721
+#: lib/rpmrc.c:727
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr "%s:n puuttuva arkkitehtuuri %s:%d"
 
-#: lib/rpmrc.c:788
+#: lib/rpmrc.c:794
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr "huono parametri '%s', %s:%d"
 
-#: lib/rpmrc.c:1156
+#: lib/rpmrc.c:1162
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1157
+#: lib/rpmrc.c:1163
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
@@ -3570,11 +3570,11 @@ msgstr ""
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:221
+#: lib/uninstall.c:222
 msgid "removing database entry\n"
 msgstr ""
 
-#: lib/uninstall.c:394
+#: lib/uninstall.c:400
 msgid "execution of script failed"
 msgstr "skriptin ajo epäonnistui"
 
diff --git a/po/fr.po b/po/fr.po
index a53a693e3..dd56ca114 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 1999-12-15 10:33-0500\n"
+msgstr "POT-Creation-Date: 1999-12-16 14:22-0500\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:424
 #, c-format
@@ -3269,93 +3269,93 @@ msgstr ""
 msgid "read failed: %s (%d)"
 msgstr ""
 
-#: lib/rpmrc.c:142
+#: lib/rpmrc.c:144
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:145
+#: lib/rpmrc.c:147
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:301
+#: lib/rpmrc.c:307
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:305
+#: lib/rpmrc.c:311
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:312
+#: lib/rpmrc.c:318
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr ""
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:351
+#: lib/rpmrc.c:358
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:541
+#: lib/rpmrc.c:547
 #, c-format
 msgid "Cannot expand %s"
 msgstr ""
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:562
 #, fuzzy, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr "impossible d'ouvrir: %s\n"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:601
+#: lib/rpmrc.c:607
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr ""
 
-#: lib/rpmrc.c:638
+#: lib/rpmrc.c:644
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:655 lib/rpmrc.c:729
+#: lib/rpmrc.c:661 lib/rpmrc.c:735
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:694
+#: lib/rpmrc.c:678 lib/rpmrc.c:700
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmrc.c:681
+#: lib/rpmrc.c:687
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmrc.c:721
+#: lib/rpmrc.c:727
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:788
+#: lib/rpmrc.c:794
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:1156
+#: lib/rpmrc.c:1162
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1157
+#: lib/rpmrc.c:1163
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
@@ -3556,11 +3556,11 @@ msgstr ""
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:221
+#: lib/uninstall.c:222
 msgid "removing database entry\n"
 msgstr ""
 
-#: lib/uninstall.c:394
+#: lib/uninstall.c:400
 msgid "execution of script failed"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 265683f2f..ed5877319 100644
--- 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-15 10:33-0500\n"
+"POT-Creation-Date: 1999-12-16 14:22-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"
@@ -3168,93 +3168,93 @@ msgstr "logowanie do %s jako %s, has³o %s\n"
 msgid "read failed: %s (%d)"
 msgstr "odczyt nie powiód³ siê: %s (%d)"
 
-#: lib/rpmrc.c:142
+#: lib/rpmrc.c:144
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr "brak drugiego ':' przy %s:%d"
 
-#: lib/rpmrc.c:145
+#: lib/rpmrc.c:147
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr "brak nazwy architektury przy %s:%d"
 
-#: lib/rpmrc.c:301
+#: lib/rpmrc.c:307
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr "Niekompletna linia danych przy %s:%d"
 
-#: lib/rpmrc.c:305
+#: lib/rpmrc.c:311
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr "Zbyt wiele argumentów w linii danych przy %s:%d"
 
-#: lib/rpmrc.c:312
+#: lib/rpmrc.c:318
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr "B³êdny numer arch/os: %s (%s:%d)"
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr "Niekompletna domy¶lna linia przy %s:%d"
 
-#: lib/rpmrc.c:351
+#: lib/rpmrc.c:358
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr "Zbyt wiele argumentów w linii domy¶lnej przy %s:%d"
 
-#: lib/rpmrc.c:541
+#: lib/rpmrc.c:547
 #, c-format
 msgid "Cannot expand %s"
 msgstr "Nie mo¿na rozszerzyæ %s"
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:562
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr "Nie mo¿na otworzyæ %s do odczytu: %s."
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:601
+#: lib/rpmrc.c:607
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr "Odczytanie %s nie powiod³o siê: %s."
 
-#: lib/rpmrc.c:638
+#: lib/rpmrc.c:644
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr "brak ':' przy %s:%d"
 
-#: lib/rpmrc.c:655 lib/rpmrc.c:729
+#: lib/rpmrc.c:661 lib/rpmrc.c:735
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr "brak argumentu dla %s przy %s:%d"
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:694
+#: lib/rpmrc.c:678 lib/rpmrc.c:700
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr ""
 
-#: lib/rpmrc.c:681
+#: lib/rpmrc.c:687
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr "nie mo¿na otworzyæ %s przy %s:%d"
 
-#: lib/rpmrc.c:721
+#: lib/rpmrc.c:727
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr "brak architektury dla %s przy %s:%d"
 
-#: lib/rpmrc.c:788
+#: lib/rpmrc.c:794
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr "b³êdna opcja '%s' przy %s:%d"
 
-#: lib/rpmrc.c:1156
+#: lib/rpmrc.c:1162
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Nieznany system: %s\n"
 
-#: lib/rpmrc.c:1157
+#: lib/rpmrc.c:1163
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Skontaktuj siê, proszê, z rpm-list@redhat.com\n"
 
@@ -3451,11 +3451,11 @@ msgstr "usunie pliki test = %d\n"
 msgid "running postuninstall script (if any)\n"
 msgstr "uruchamianie skryptu postinstalacyjnego (je¦li istnieje)\n"
 
-#: lib/uninstall.c:221
+#: lib/uninstall.c:222
 msgid "removing database entry\n"
 msgstr "usuwanie wpisu w bazie\n"
 
-#: lib/uninstall.c:394
+#: lib/uninstall.c:400
 msgid "execution of script failed"
 msgstr "wykonanie skryptu nie powiod³o siê"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1fabe4476..e3dcf9acd 100644
--- 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-15 10:33-0500\n"
+msgstr "POT-Creation-Date: 1999-12-16 14:22-0500\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:424
 #, c-format
@@ -3352,97 +3352,97 @@ msgstr ""
 msgid "read failed: %s (%d)"
 msgstr ""
 
-#: lib/rpmrc.c:142
+#: lib/rpmrc.c:144
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:145
+#: lib/rpmrc.c:147
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:301
+#: lib/rpmrc.c:307
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:305
+#: lib/rpmrc.c:311
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:312
+#: lib/rpmrc.c:318
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr ""
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:351
+#: lib/rpmrc.c:358
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:541
+#: lib/rpmrc.c:547
 #, c-format
 msgid "Cannot expand %s"
 msgstr ""
 
 # , c-format
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:562
 #, fuzzy, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr "Não consegui abrir: %s\n"
 
 # , c-format
 #. XXX Feof(fd)
-#: lib/rpmrc.c:601
+#: lib/rpmrc.c:607
 #, fuzzy, c-format
 msgid "Failed to read %s: %s."
 msgstr "Não consegui ler o arquivo spec de %s\n"
 
-#: lib/rpmrc.c:638
+#: lib/rpmrc.c:644
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:655 lib/rpmrc.c:729
+#: lib/rpmrc.c:661 lib/rpmrc.c:735
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr ""
 
 # , c-format
-#: lib/rpmrc.c:672 lib/rpmrc.c:694
+#: lib/rpmrc.c:678 lib/rpmrc.c:700
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr "Não consegui abrir: %s\n"
 
 # , c-format
-#: lib/rpmrc.c:681
+#: lib/rpmrc.c:687
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/rpmrc.c:721
+#: lib/rpmrc.c:727
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:788
+#: lib/rpmrc.c:794
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:1156
+#: lib/rpmrc.c:1162
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1157
+#: lib/rpmrc.c:1163
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
@@ -3661,11 +3661,11 @@ msgstr ""
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:221
+#: lib/uninstall.c:222
 msgid "removing database entry\n"
 msgstr ""
 
-#: lib/uninstall.c:394
+#: lib/uninstall.c:400
 msgid "execution of script failed"
 msgstr ""
 
diff --git a/po/rpm.pot b/po/rpm.pot
index b1944f4f8..1173c0327 100644
--- 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-15 10:33-0500\n"
+"POT-Creation-Date: 1999-12-16 14:22-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"
@@ -3094,93 +3094,93 @@ msgstr ""
 msgid "read failed: %s (%d)"
 msgstr ""
 
-#: lib/rpmrc.c:142
+#: lib/rpmrc.c:144
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:145
+#: lib/rpmrc.c:147
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:301
+#: lib/rpmrc.c:307
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:305
+#: lib/rpmrc.c:311
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:312
+#: lib/rpmrc.c:318
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr ""
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:351
+#: lib/rpmrc.c:358
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:541
+#: lib/rpmrc.c:547
 #, c-format
 msgid "Cannot expand %s"
 msgstr ""
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:562
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:601
+#: lib/rpmrc.c:607
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr ""
 
-#: lib/rpmrc.c:638
+#: lib/rpmrc.c:644
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:655 lib/rpmrc.c:729
+#: lib/rpmrc.c:661 lib/rpmrc.c:735
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:694
+#: lib/rpmrc.c:678 lib/rpmrc.c:700
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr ""
 
-#: lib/rpmrc.c:681
+#: lib/rpmrc.c:687
 #, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr ""
 
-#: lib/rpmrc.c:721
+#: lib/rpmrc.c:727
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:788
+#: lib/rpmrc.c:794
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:1156
+#: lib/rpmrc.c:1162
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1157
+#: lib/rpmrc.c:1163
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
@@ -3375,11 +3375,11 @@ msgstr ""
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:221
+#: lib/uninstall.c:222
 msgid "removing database entry\n"
 msgstr ""
 
-#: lib/uninstall.c:394
+#: lib/uninstall.c:400
 msgid "execution of script failed"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index c947c8e3f..4723e15a5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-12-15 10:33-0500\n"
+"POT-Creation-Date: 1999-12-16 14:22-0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3172,93 +3172,93 @@ msgstr "ÒÅÇÉÓÔÒÉÒÕÀÓØ × %s ËÁË %s, ÐÁÒÏÌØ %s\n"
 msgid "read failed: %s (%d)"
 msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ: %s (%d)"
 
-#: lib/rpmrc.c:142
+#: lib/rpmrc.c:144
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ×ÔÏÒÏÅ ':' × %s:%d"
 
-#: lib/rpmrc.c:145
+#: lib/rpmrc.c:147
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ÎÁÚ×ÁÎÉÅ ÁÒÈÉÔÅËÔÕÒÙ × %s:%d"
 
-#: lib/rpmrc.c:301
+#: lib/rpmrc.c:307
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr "îÅÐÏÌÎÁÑ ÓÔÒÏËÁ ÄÁÎÎÙÈ × %s:%d"
 
-#: lib/rpmrc.c:305
+#: lib/rpmrc.c:311
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÁÒÇÕÍÅÎÔÏ× × ÓÔÒÏËÅ ÄÁÎÎÙÈ × %s:%d"
 
-#: lib/rpmrc.c:312
+#: lib/rpmrc.c:318
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr "îÅ×ÅÒÎÙÊ ÎÏÍÅÒ arch/os: %s (%s:%d)"
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr "îÅÐÏÌÎÁÑ ÓÔÒÏËÁ ÐÏ ÕÍÏÌÞÁÎÉÀ × %s:%d"
 
-#: lib/rpmrc.c:351
+#: lib/rpmrc.c:358
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÁÒÇÕÍÅÎÔÏ× × ÓÔÒÏËÅ ÐÏ ÕÍÏÌÞÁÎÉÀ × %s:%d"
 
-#: lib/rpmrc.c:541
+#: lib/rpmrc.c:547
 #, c-format
 msgid "Cannot expand %s"
 msgstr "îÅ ÍÏÇÕ ÒÁÓËÒÙÔØ %s"
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:562
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ %s ÄÌÑ ÞÔÅÎÉÑ: %s."
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:601
+#: lib/rpmrc.c:607
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr "îÅ ÍÏÇÕ ÐÒÏÞÅÓÔØ %s: %s."
 
-#: lib/rpmrc.c:638
+#: lib/rpmrc.c:644
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ':' × %s:%d"
 
-#: lib/rpmrc.c:655 lib/rpmrc.c:729
+#: lib/rpmrc.c:661 lib/rpmrc.c:735
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ÁÒÇÕÍÅÎÔ ÄÌÑ %s × %s:%d"
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:694
+#: lib/rpmrc.c:678 lib/rpmrc.c:700
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr "ÏÛÉÂËÁ ÒÁÓËÒÙÔÉÑ %s ÎÁ %s:%d \"%s\""
 
-#: lib/rpmrc.c:681
+#: lib/rpmrc.c:687
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s ÎÁ %s:%d"
 
-#: lib/rpmrc.c:721
+#: lib/rpmrc.c:727
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ÁÒÈÉÔÅËÔÕÒÁ ÄÌÑ %s × %s:%d"
 
-#: lib/rpmrc.c:788
+#: lib/rpmrc.c:794
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr "ÎÅ×ÅÒÎÁÑ ÏÐÃÉÑ '%s' × %s:%d"
 
-#: lib/rpmrc.c:1156
+#: lib/rpmrc.c:1162
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÓÉÓÔÅÍÁ: %s\n"
 
-#: lib/rpmrc.c:1157
+#: lib/rpmrc.c:1163
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "ó×ÑÖÉÔÅÓØ Ó rpm-list@redhat.com\n"
 
@@ -3458,11 +3458,11 @@ msgstr "ÕÄÁÌÉÔ ÆÁÊÌÙ; test = %d\n"
 msgid "running postuninstall script (if any)\n"
 msgstr "ÉÓÐÏÌÎÑÀ ÓËÒÉÐÔ postuninstall (ÅÓÌÉ ÅÓÔØ)\n"
 
-#: lib/uninstall.c:221
+#: lib/uninstall.c:222
 msgid "removing database entry\n"
 msgstr "ÕÄÁÌÑÀ ÚÁÐÉÓØ ÂÁÚÙ ÄÁÎÎÙÈ\n"
 
-#: lib/uninstall.c:394
+#: lib/uninstall.c:400
 msgid "execution of script failed"
 msgstr "ÏÛÉÂËÁ ÉÓÐÏÌÎÅÎÉÑ ÓËÒÉÐÔÁ"
 
diff --git a/po/sk.po b/po/sk.po
index 13100118e..d2abf0da1 100644
--- 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-15 10:33-0500\n"
+"POT-Creation-Date: 1999-12-16 14:22-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"
@@ -3177,93 +3177,93 @@ msgstr "prihlasuje sa na %s ako %s, heslo %s\n"
 msgid "read failed: %s (%d)"
 msgstr "èítanie zlyhalo: %s (%d)"
 
-#: lib/rpmrc.c:142
+#: lib/rpmrc.c:144
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr "chýbajúce druhé ':' na %s:%d"
 
-#: lib/rpmrc.c:145
+#: lib/rpmrc.c:147
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr "chýba názov architektúry na %s:%d"
 
-#: lib/rpmrc.c:301
+#: lib/rpmrc.c:307
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr "Neúplný riadok údajov na %s:%d"
 
-#: lib/rpmrc.c:305
+#: lib/rpmrc.c:311
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr "Priveµa argumentov v riadku údajov na %s:%d"
 
-#: lib/rpmrc.c:312
+#: lib/rpmrc.c:318
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr "Chybné èíslo arch/os: %s (%s:%d)"
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr "Neúplný implicitný riadok na %s:%d"
 
-#: lib/rpmrc.c:351
+#: lib/rpmrc.c:358
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr "Priveµa argumentov v implicitnom riadku na %s:%d"
 
-#: lib/rpmrc.c:541
+#: lib/rpmrc.c:547
 #, c-format
 msgid "Cannot expand %s"
 msgstr "Nie je mo¾né expandova» %s"
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:562
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr "Nie je mo¾né otvori» %s pre èítanie: %s."
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:601
+#: lib/rpmrc.c:607
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr "Nie je mo¾né preèíta» %s: %s."
 
-#: lib/rpmrc.c:638
+#: lib/rpmrc.c:644
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr "chýbajúca ':' na %s:%d"
 
-#: lib/rpmrc.c:655 lib/rpmrc.c:729
+#: lib/rpmrc.c:661 lib/rpmrc.c:735
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr "chýbajúci argument pre %s na %s:%d"
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:694
+#: lib/rpmrc.c:678 lib/rpmrc.c:700
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr "expanzia %s zlyhala na %s:%d \"%s\""
 
-#: lib/rpmrc.c:681
+#: lib/rpmrc.c:687
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr "nie je mo¾né otvori» %s na %s:%d"
 
-#: lib/rpmrc.c:721
+#: lib/rpmrc.c:727
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr "chýbajúca architektúra pre %s na %s:%d"
 
-#: lib/rpmrc.c:788
+#: lib/rpmrc.c:794
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr "chybná voµba '%s' na %s:%d"
 
-#: lib/rpmrc.c:1156
+#: lib/rpmrc.c:1162
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Neznámy systém: %s\n"
 
-#: lib/rpmrc.c:1157
+#: lib/rpmrc.c:1163
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Kontaktujte prosím rpm-list@redhat.com\n"
 
@@ -3460,11 +3460,11 @@ msgstr "budú sa odstraòova» súbory test = %d\n"
 msgid "running postuninstall script (if any)\n"
 msgstr "vykonávajú sa postdein¹talaèné skripty (ak existujú)\n"
 
-#: lib/uninstall.c:221
+#: lib/uninstall.c:222
 msgid "removing database entry\n"
 msgstr "odstraòuje sa záznam z databázy\n"
 
-#: lib/uninstall.c:394
+#: lib/uninstall.c:400
 msgid "execution of script failed"
 msgstr "vykonanie skriptu zlyhalo"
 
diff --git a/po/sr.po b/po/sr.po
index e8ba34984..9d9363111 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-12-15 10:33-0500\n"
+"POT-Creation-Date: 1999-12-16 14:22-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"
@@ -3237,93 +3237,93 @@ msgstr ""
 msgid "read failed: %s (%d)"
 msgstr "neuspelo èitanje: %s (%d)"
 
-#: lib/rpmrc.c:142
+#: lib/rpmrc.c:144
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr "nedostaje drugo ':' na %s:%d"
 
-#: lib/rpmrc.c:145
+#: lib/rpmrc.c:147
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr "nedostaje ime arhitekture na %s:%d"
 
-#: lib/rpmrc.c:301
+#: lib/rpmrc.c:307
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr "Nepotpuna linija podataka na %s:%d"
 
-#: lib/rpmrc.c:305
+#: lib/rpmrc.c:311
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr "Premnogo argumenata u liniji podataka na %s:%d"
 
-#: lib/rpmrc.c:312
+#: lib/rpmrc.c:318
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr "Lo¹ broj arhitekture/oper.sist.: %s (%s:%d)"
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr "Nepotpuna podrazumevana linija na %s:%d"
 
-#: lib/rpmrc.c:351
+#: lib/rpmrc.c:358
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr "Premnogo argumenata u podrazumevanoj liniji na %s:%d"
 
-#: lib/rpmrc.c:541
+#: lib/rpmrc.c:547
 #, c-format
 msgid "Cannot expand %s"
 msgstr ""
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:562
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr "Ne mogu da otvorim %s za èitanje: %s"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:601
+#: lib/rpmrc.c:607
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr "Neuspelo èitanje %s: %s."
 
-#: lib/rpmrc.c:638
+#: lib/rpmrc.c:644
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr "nedostaje ':' na %s:%d"
 
-#: lib/rpmrc.c:655 lib/rpmrc.c:729
+#: lib/rpmrc.c:661 lib/rpmrc.c:735
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr "nedostaje argument za %s na %s:%d"
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:694
+#: lib/rpmrc.c:678 lib/rpmrc.c:700
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/rpmrc.c:681
+#: lib/rpmrc.c:687
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/rpmrc.c:721
+#: lib/rpmrc.c:727
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr "nedostaje arhitektura za %s na %s:%d"
 
-#: lib/rpmrc.c:788
+#: lib/rpmrc.c:794
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr "lo¹a opcija '%s' na %s:%d"
 
-#: lib/rpmrc.c:1156
+#: lib/rpmrc.c:1162
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1157
+#: lib/rpmrc.c:1163
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
@@ -3530,11 +3530,11 @@ msgstr ""
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:221
+#: lib/uninstall.c:222
 msgid "removing database entry\n"
 msgstr ""
 
-#: lib/uninstall.c:394
+#: lib/uninstall.c:400
 msgid "execution of script failed"
 msgstr "neuspelo izvr¹avanje skripta"
 
diff --git a/po/sv.po b/po/sv.po
index 3d593a5f7..2617bf89f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 1999-12-15 10:33-0500\n"
+msgstr "POT-Creation-Date: 1999-12-16 14:22-0500\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:424
 #, c-format
@@ -3280,93 +3280,93 @@ msgstr ""
 msgid "read failed: %s (%d)"
 msgstr ""
 
-#: lib/rpmrc.c:142
+#: lib/rpmrc.c:144
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:145
+#: lib/rpmrc.c:147
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:301
+#: lib/rpmrc.c:307
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:305
+#: lib/rpmrc.c:311
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:312
+#: lib/rpmrc.c:318
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr ""
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:351
+#: lib/rpmrc.c:358
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:541
+#: lib/rpmrc.c:547
 #, c-format
 msgid "Cannot expand %s"
 msgstr ""
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:562
 #, fuzzy, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr "kan inte öppna: %s\n"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:601
+#: lib/rpmrc.c:607
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr ""
 
-#: lib/rpmrc.c:638
+#: lib/rpmrc.c:644
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:655 lib/rpmrc.c:729
+#: lib/rpmrc.c:661 lib/rpmrc.c:735
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:694
+#: lib/rpmrc.c:678 lib/rpmrc.c:700
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr "kan inte öppna: %s\n"
 
-#: lib/rpmrc.c:681
+#: lib/rpmrc.c:687
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr "kan inte öppna: %s\n"
 
-#: lib/rpmrc.c:721
+#: lib/rpmrc.c:727
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:788
+#: lib/rpmrc.c:794
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:1156
+#: lib/rpmrc.c:1162
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1157
+#: lib/rpmrc.c:1163
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
@@ -3567,11 +3567,11 @@ msgstr ""
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:221
+#: lib/uninstall.c:222
 msgid "removing database entry\n"
 msgstr ""
 
-#: lib/uninstall.c:394
+#: lib/uninstall.c:400
 msgid "execution of script failed"
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index d4791bbd5..391db4376 100644
--- 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-15 10:33-0500\n"
+"POT-Creation-Date: 1999-12-16 14:22-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"
@@ -3278,93 +3278,93 @@ msgstr ""
 msgid "read failed: %s (%d)"
 msgstr "okuma hatasý: %s (%d)"
 
-#: lib/rpmrc.c:142
+#: lib/rpmrc.c:144
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr "%s te ikinci ':' eksik:%d"
 
-#: lib/rpmrc.c:145
+#: lib/rpmrc.c:147
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr "%s te eksik mimari tanýmlamasý:%d"
 
-#: lib/rpmrc.c:301
+#: lib/rpmrc.c:307
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr "%s te eksik data satýrý:%d"
 
-#: lib/rpmrc.c:305
+#: lib/rpmrc.c:311
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr "%s te data satýrýnda çok fazla argüman:%d"
 
-#: lib/rpmrc.c:312
+#: lib/rpmrc.c:318
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr "Kötü arch/os numarasý %s: (%s:%d)"
 
-#: lib/rpmrc.c:346
+#: lib/rpmrc.c:353
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr "%s te eksik default satýrý:%d"
 
-#: lib/rpmrc.c:351
+#: lib/rpmrc.c:358
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr "%s te default satýrýnda çok fazla argüman:%d"
 
-#: lib/rpmrc.c:541
+#: lib/rpmrc.c:547
 #, c-format
 msgid "Cannot expand %s"
 msgstr ""
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:562
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr "%s okuma eriþimi için açýlamadý:%s."
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:601
+#: lib/rpmrc.c:607
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr "%s okunamadý: %s"
 
-#: lib/rpmrc.c:638
+#: lib/rpmrc.c:644
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr "%s te eksik ':' :%d"
 
-#: lib/rpmrc.c:655 lib/rpmrc.c:729
+#: lib/rpmrc.c:661 lib/rpmrc.c:735
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr "%s için %s te eksik argüman :%d"
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:694
+#: lib/rpmrc.c:678 lib/rpmrc.c:700
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr "%s açýlamadý: %s"
 
-#: lib/rpmrc.c:681
+#: lib/rpmrc.c:687
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr "%s dosyasý açýlamýyor: "
 
-#: lib/rpmrc.c:721
+#: lib/rpmrc.c:727
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr "%s için %s te eksik mimari:%d"
 
-#: lib/rpmrc.c:788
+#: lib/rpmrc.c:794
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr "%s geçersiz seçenek %s:%d"
 
-#: lib/rpmrc.c:1156
+#: lib/rpmrc.c:1162
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1157
+#: lib/rpmrc.c:1163
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
@@ -3571,11 +3571,11 @@ msgstr ""
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:221
+#: lib/uninstall.c:222
 msgid "removing database entry\n"
 msgstr ""
 
-#: lib/uninstall.c:394
+#: lib/uninstall.c:400
 msgid "execution of script failed"
 msgstr "betik (script) çalýþtýrýlamadý "
 
diff --git a/rpm.spec b/rpm.spec
index cc3df3931..683274b69 100644
--- 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.15
+Release: 0.16
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz
 Copyright: GPL