- include RPM-GPG-KEY in file manifest.

- simplify --last popt alias, date like -qi (bjerrick@easystreet.com).
- fix: alloca'd memory used outside of scope (alpha segfault).

CVS patchset: 3723
CVS date: 2000/05/10 15:36:29

18 files changed, 107 insertions, 94 deletions

diff --git a/CHANGES b/CHANGES
index 1c9fb65fd..692e3ee1e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -33,6 +33,10 @@
 	- Rename db0.c to db1.c, resurrect db2.c (from db3.c).
 	- Add ia64 and sparc64 changes.
 	- rpm.spec: add per-platform sub-directories.
+	- FreeBSD fixes (bero@redhat.com).
+	- include RPM-GPG-KEY in file manifest.
+	- simplify --last popt alias, date like -qi (bjerrick@easystreet.com).
+	- fix: alloca'd memory used outside of scope (alpha segfault).
 	
 3.0.3 -> 3.0.4
 	- use compressed filenames on install side.
diff --git a/lib/db3.c b/lib/db3.c
index a3ff66672..3279c516f 100644
--- a/lib/db3.c
+++ b/lib/db3.c
@@ -915,7 +915,6 @@ static int db3open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip)
     const char * dbhome;
     const char * dbfile;
     const char * dbsubfile;
-    const char * dbpath;
     extern struct _dbiVec db3vec;
     dbiIndex dbi = NULL;
     int rc = 0;
@@ -1031,6 +1030,7 @@ static int db3open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip)
 	    dbi->dbi_dbinfo = NULL;
 
 	    {	const char * dbfullpath;
+		const char * dbpath;
 		char * t;
 		int nb;
 
@@ -1043,10 +1043,11 @@ static int db3open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip)
 		    t = stpcpy( stpcpy( t, "/"), dbfile);
 		dbpath = (!dbi->dbi_use_dbenv && !dbi->dbi_temporary)
 			? dbfullpath : dbfile;
-	    }
 
-	    rc = db->open(db, dbpath, dbsubfile,
+		rc = db->open(db, dbpath, dbsubfile,
 		    dbi->dbi_type, oflags, dbi->dbi_perms);
+	    }
+
 	    /* XXX return rc == errno without printing */
 	    _printit = (rc > 0 ? 0 : _debug);
 	    xx = cvtdberr(dbi, "db->open", rc, _printit);
diff --git a/po/cs.po b/po/cs.po
index f60079406..0c6aedc75 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-06 19:31-0400\n"
+"POT-Creation-Date: 2000-05-10 11:32-0400\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"
@@ -2216,11 +2216,11 @@ msgstr "nelze otevøít %s: %s"
 msgid "cannot get %s lock on database"
 msgstr "nelze získat %s zámek k databázi"
 
-#: lib/db1.c:451 lib/db3.c:1080
+#: lib/db1.c:451 lib/db3.c:1081
 msgid "exclusive"
 msgstr "výhradní"
 
-#: lib/db1.c:451 lib/db3.c:1080
+#: lib/db1.c:451 lib/db3.c:1081
 msgid "shared"
 msgstr "sdílený"
 
@@ -2289,17 +2289,17 @@ msgstr "otevírá se databáze v %s\n"
 msgid "closed  db index       %s/%s\n"
 msgstr "odstraòuje se rejstøík souborù pro %s\n"
 
-#: lib/db3.c:975
+#: lib/db3.c:974
 #, fuzzy, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr "probíhá otevírání databázového re¾imu: 0%o\n"
 
-#: lib/db3.c:1078
+#: lib/db3.c:1079
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "nelze získat %s zámek k databázi"
 
-#: lib/db3.c:1085
+#: lib/db3.c:1086
 #, fuzzy, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr "odstraòuje se rejstøík souborù pro %s\n"
diff --git a/po/de.po b/po/de.po
index fdcc8ea59..da5819aae 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: 2000-05-06 19:31-0400\n"
+"POT-Creation-Date: 2000-05-10 11:32-0400\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"
@@ -2319,11 +2319,11 @@ msgstr "Öffnen von %s fehlgeschlagen: %s"
 msgid "cannot get %s lock on database"
 msgstr "kann %s lock für die Datenbank nicht bekommen"
 
-#: lib/db1.c:451 lib/db3.c:1080
+#: lib/db1.c:451 lib/db3.c:1081
 msgid "exclusive"
 msgstr "exklusiv"
 
-#: lib/db1.c:451 lib/db3.c:1080
+#: lib/db1.c:451 lib/db3.c:1081
 msgid "shared"
 msgstr "geteilt"
 
@@ -2392,17 +2392,17 @@ msgstr ""
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:975
+#: lib/db3.c:974
 #, fuzzy, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: lib/db3.c:1078
+#: lib/db3.c:1079
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "kann %s lock für die Datenbank nicht bekommen"
 
-#: lib/db3.c:1085
+#: lib/db3.c:1086
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index f7bbd9828..c5e1d39c4 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-05-06 19:31-0400\n"
+"POT-Creation-Date: 2000-05-10 11:32-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -2254,11 +2254,11 @@ msgstr "en voinut avata %s: %s"
 msgid "cannot get %s lock on database"
 msgstr "en voi saada %s lukitusta tietokantaan"
 
-#: lib/db1.c:451 lib/db3.c:1080
+#: lib/db1.c:451 lib/db3.c:1081
 msgid "exclusive"
 msgstr "poissulkevaa"
 
-#: lib/db1.c:451 lib/db3.c:1080
+#: lib/db1.c:451 lib/db3.c:1081
 msgid "shared"
 msgstr "jaettua"
 
@@ -2327,17 +2327,17 @@ msgstr ""
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:975
+#: lib/db3.c:974
 #, fuzzy, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: lib/db3.c:1078
+#: lib/db3.c:1079
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "en voi saada %s lukitusta tietokantaan"
 
-#: lib/db3.c:1085
+#: lib/db3.c:1086
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 598728861..08e92ecdd 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 2000-05-06 19:31-0400\n"
+msgstr "POT-Creation-Date: 2000-05-10 11:32-0400\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:422
 #, c-format
@@ -2255,11 +2255,11 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "cannot get %s lock on database"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: lib/db1.c:451 lib/db3.c:1080
+#: lib/db1.c:451 lib/db3.c:1081
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:451 lib/db3.c:1080
+#: lib/db1.c:451 lib/db3.c:1081
 msgid "shared"
 msgstr ""
 
@@ -2328,17 +2328,17 @@ msgstr ""
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:975
+#: lib/db3.c:974
 #, fuzzy, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/db3.c:1078
+#: lib/db3.c:1079
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: lib/db3.c:1085
+#: lib/db3.c:1086
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index d16744d6d..c6a061138 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm-3.0.4\n"
-"POT-Creation-Date: 2000-05-06 19:31-0400\n"
+"POT-Creation-Date: 2000-05-10 11:32-0400\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"
@@ -193,7 +193,7 @@ msgstr "copyright ¤¬¤¢¤ê¤Þ¤»¤ó!\n"
 # build root [BuildRoot]
 # net share [¥Í¥Ã¥È¶¦Í­]
 # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë]
-# $Id: ja.po,v 1.54 2000/05/07 00:53:12 jbj Exp $
+# $Id: ja.po,v 1.55 2000/05/10 15:36:30 jbj Exp $
 #: rpm.c:200
 #, c-format
 msgid "rpm: %s\n"
@@ -2224,11 +2224,11 @@ msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s"
 msgid "cannot get %s lock on database"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î %s ¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó"
 
-#: lib/db1.c:451 lib/db3.c:1080
+#: lib/db1.c:451 lib/db3.c:1081
 msgid "exclusive"
 msgstr "½ü³°"
 
-#: lib/db1.c:451 lib/db3.c:1080
+#: lib/db1.c:451 lib/db3.c:1081
 msgid "shared"
 msgstr "¶¦Í­"
 
@@ -2297,17 +2297,17 @@ msgstr ""
 msgid "closed  db index       %s/%s\n"
 msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
 
-#: lib/db3.c:975
+#: lib/db3.c:974
 #, fuzzy, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥â¡¼¥É 0x%x ¤Î¥ª¡¼¥×¥ó (%s)\n"
 
-#: lib/db3.c:1078
+#: lib/db3.c:1079
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î %s ¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó"
 
-#: lib/db3.c:1085
+#: lib/db3.c:1086
 #, fuzzy, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
diff --git a/po/pl.po b/po/pl.po
index 128394e57..8ff3aa5fb 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: 2000-05-06 19:31-0400\n"
+"POT-Creation-Date: 2000-05-10 11:32-0400\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"
@@ -2175,11 +2175,11 @@ msgstr "nie mo¿na otworzyæ %s: %s"
 msgid "cannot get %s lock on database"
 msgstr "utworzenie blokady %s na bazie danych nie jest mo¿liwe"
 
-#: lib/db1.c:451 lib/db3.c:1080
+#: lib/db1.c:451 lib/db3.c:1081
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:451 lib/db3.c:1080
+#: lib/db1.c:451 lib/db3.c:1081
 msgid "shared"
 msgstr ""
 
@@ -2248,17 +2248,17 @@ msgstr ""
 msgid "closed  db index       %s/%s\n"
 msgstr "usuwanie indeksu plików dla %s\n"
 
-#: lib/db3.c:975
+#: lib/db3.c:974
 #, fuzzy, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr "otwiernie bazê danych w trybie 0x%x w %s\n"
 
-#: lib/db3.c:1078
+#: lib/db3.c:1079
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "utworzenie blokady %s na bazie danych nie jest mo¿liwe"
 
-#: lib/db3.c:1085
+#: lib/db3.c:1086
 #, fuzzy, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr "usuwanie indeksu plików dla %s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4f9234ea1..cbd62bdaf 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: 2000-05-06 19:31-0400\n"
+msgstr "POT-Creation-Date: 2000-05-10 11:32-0400\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:422
 #, c-format
@@ -2318,11 +2318,11 @@ msgstr "Não consegui abrir: %s\n"
 msgid "cannot get %s lock on database"
 msgstr "não foi passado pacote para desinstalação"
 
-#: lib/db1.c:451 lib/db3.c:1080
+#: lib/db1.c:451 lib/db3.c:1081
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:451 lib/db3.c:1080
+#: lib/db1.c:451 lib/db3.c:1081
 msgid "shared"
 msgstr ""
 
@@ -2391,17 +2391,17 @@ msgstr ""
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:975
+#: lib/db3.c:974
 #, fuzzy, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: lib/db3.c:1078
+#: lib/db3.c:1079
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "não foi passado pacote para desinstalação"
 
-#: lib/db3.c:1085
+#: lib/db3.c:1086
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index 529274ad0..b1cba664e 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-05-06 19:31-0400\n"
+"POT-Creation-Date: 2000-05-10 11:32-0400\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"
@@ -2106,11 +2106,11 @@ msgstr ""
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:451 lib/db3.c:1080
+#: lib/db1.c:451 lib/db3.c:1081
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:451 lib/db3.c:1080
+#: lib/db1.c:451 lib/db3.c:1081
 msgid "shared"
 msgstr ""
 
@@ -2179,17 +2179,17 @@ msgstr ""
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:975
+#: lib/db3.c:974
 #, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:1078
+#: lib/db3.c:1079
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1085
+#: lib/db3.c:1086
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 040519615..6c176ddc5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-05-06 19:31-0400\n"
+"POT-Creation-Date: 2000-05-10 11:32-0400\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -2182,11 +2182,11 @@ msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s: %s"
 msgid "cannot get %s lock on database"
 msgstr "ÎÅ ÍÏÇÕ ÐÏÌÕÞÉÔØ %s ÄÏÓÔÕÐ Ë ÂÁÚÅ ÄÁÎÎÙÈ"
 
-#: lib/db1.c:451 lib/db3.c:1080
+#: lib/db1.c:451 lib/db3.c:1081
 msgid "exclusive"
 msgstr "ÉÓËÌÀÞÉÔÅÌØÎÙÊ"
 
-#: lib/db1.c:451 lib/db3.c:1080
+#: lib/db1.c:451 lib/db3.c:1081
 msgid "shared"
 msgstr "ÒÁÚÄÅÌÑÅÍÙÊ"
 
@@ -2255,17 +2255,17 @@ msgstr ""
 msgid "closed  db index       %s/%s\n"
 msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÆÁÊÌÏ× ÄÌÑ %s\n"
 
-#: lib/db3.c:975
+#: lib/db3.c:974
 #, fuzzy, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr "ÏÔËÒÙ×ÁÀ ÂÁÚÕ × ÒÅÖÉÍÅ 0x%x × %s\n"
 
-#: lib/db3.c:1078
+#: lib/db3.c:1079
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "ÎÅ ÍÏÇÕ ÐÏÌÕÞÉÔØ %s ÄÏÓÔÕÐ Ë ÂÁÚÅ ÄÁÎÎÙÈ"
 
-#: lib/db3.c:1085
+#: lib/db3.c:1086
 #, fuzzy, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÆÁÊÌÏ× ÄÌÑ %s\n"
diff --git a/po/sk.po b/po/sk.po
index 169bb9c03..ba63d8565 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: 2000-05-06 19:31-0400\n"
+"POT-Creation-Date: 2000-05-10 11:32-0400\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"
@@ -2185,11 +2185,11 @@ msgstr "nepodarilo sa otvori» %s: %s"
 msgid "cannot get %s lock on database"
 msgstr "nie je mo¾né získa» %s zámok pre databázu"
 
-#: lib/db1.c:451 lib/db3.c:1080
+#: lib/db1.c:451 lib/db3.c:1081
 msgid "exclusive"
 msgstr "výhradný"
 
-#: lib/db1.c:451 lib/db3.c:1080
+#: lib/db1.c:451 lib/db3.c:1081
 msgid "shared"
 msgstr "zdieµaný"
 
@@ -2258,17 +2258,17 @@ msgstr ""
 msgid "closed  db index       %s/%s\n"
 msgstr "odstraòuje sa index súborov pre %s\n"
 
-#: lib/db3.c:975
+#: lib/db3.c:974
 #, fuzzy, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr "otvára sa databáza s právami 0x%x v %s\n"
 
-#: lib/db3.c:1078
+#: lib/db3.c:1079
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "nie je mo¾né získa» %s zámok pre databázu"
 
-#: lib/db3.c:1085
+#: lib/db3.c:1086
 #, fuzzy, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr "odstraòuje sa index súborov pre %s\n"
diff --git a/po/sl.po b/po/sl.po
index a6d622e37..33839373b 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 <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
-# $Id: sl.po,v 1.39 2000/05/07 00:53:15 jbj Exp $
+# $Id: sl.po,v 1.40 2000/05/10 15:36:30 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-05-06 19:31-0400\n"
+"POT-Creation-Date: 2000-05-10 11:32-0400\n"
 "PO-Revision-Date: 2000-02-17 22:25+01:00\n"
 "Last-Translator: Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -2168,11 +2168,11 @@ msgstr "neuspe¹no odpiranje %s: %s\n"
 msgid "cannot get %s lock on database"
 msgstr "datoteke ni mo¾no %s zakleniti"
 
-#: lib/db1.c:451 lib/db3.c:1080
+#: lib/db1.c:451 lib/db3.c:1081
 msgid "exclusive"
 msgstr "izkljuèujoèe"
 
-#: lib/db1.c:451 lib/db3.c:1080
+#: lib/db1.c:451 lib/db3.c:1081
 msgid "shared"
 msgstr "deljeno"
 
@@ -2241,17 +2241,17 @@ msgstr ""
 msgid "closed  db index       %s/%s\n"
 msgstr "odstranjujemo seznam datotek za %s\n"
 
-#: lib/db3.c:975
+#: lib/db3.c:974
 #, fuzzy, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr "odpiramo datoteko z naèinom 0x%x v %s\n"
 
-#: lib/db3.c:1078
+#: lib/db3.c:1079
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "datoteke ni mo¾no %s zakleniti"
 
-#: lib/db3.c:1085
+#: lib/db3.c:1086
 #, fuzzy, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr "odstranjujemo seznam datotek za %s\n"
diff --git a/po/sr.po b/po/sr.po
index 385f0bef6..8e2a68953 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-05-06 19:31-0400\n"
+"POT-Creation-Date: 2000-05-10 11:32-0400\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 "From: Erik Troan <ewt@lacrosse.redhat.com>\n"
@@ -2215,11 +2215,11 @@ msgstr "neuspelo otvaranje %s: %s"
 msgid "cannot get %s lock on database"
 msgstr "ne mogu da dobijem %s zakljuèavanje baze podataka"
 
-#: lib/db1.c:451 lib/db3.c:1080
+#: lib/db1.c:451 lib/db3.c:1081
 msgid "exclusive"
 msgstr "ekskluzivno"
 
-#: lib/db1.c:451 lib/db3.c:1080
+#: lib/db1.c:451 lib/db3.c:1081
 msgid "shared"
 msgstr "deljeno"
 
@@ -2288,17 +2288,17 @@ msgstr ""
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:975
+#: lib/db3.c:974
 #, fuzzy, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: lib/db3.c:1078
+#: lib/db3.c:1079
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "ne mogu da dobijem %s zakljuèavanje baze podataka"
 
-#: lib/db3.c:1085
+#: lib/db3.c:1086
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 598418542..b53a08ef2 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,12 +1,12 @@
 # Swedish messages for RPM
 # Copyright © 1999 Free Software Foundation, Inc.
 # Göran Uddeborg <göran@uddeborg.pp.se>, 1999, 2000.
-# $Revision: 1.99 $
+# $Revision: 1.100 $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-05-06 19:31-0400\n"
+"POT-Creation-Date: 2000-05-10 11:32-0400\n"
 "PO-Revision-Date: 2000-02-21 12:20+0100\n"
 "Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -2157,11 +2157,11 @@ msgstr "kunde inte öppna %s: %s\n"
 msgid "cannot get %s lock on database"
 msgstr "kan inte få %s lås på databas"
 
-#: lib/db1.c:451 lib/db3.c:1080
+#: lib/db1.c:451 lib/db3.c:1081
 msgid "exclusive"
 msgstr "uteslutande"
 
-#: lib/db1.c:451 lib/db3.c:1080
+#: lib/db1.c:451 lib/db3.c:1081
 msgid "shared"
 msgstr "delat"
 
@@ -2230,17 +2230,17 @@ msgstr ""
 msgid "closed  db index       %s/%s\n"
 msgstr "tar bort filindex för %s\n"
 
-#: lib/db3.c:975
+#: lib/db3.c:974
 #, fuzzy, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr "öppnar databas med rättighet 0x%x i %s\n"
 
-#: lib/db3.c:1078
+#: lib/db3.c:1079
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "kan inte få %s lås på databas"
 
-#: lib/db3.c:1085
+#: lib/db3.c:1086
 #, fuzzy, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr "tar bort filindex för %s\n"
diff --git a/po/tr.po b/po/tr.po
index faac7fcb9..50bb017c7 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-06 19:31-0400\n"
+"POT-Creation-Date: 2000-05-10 11:32-0400\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"
@@ -2253,11 +2253,11 @@ msgstr "%s açýlamadý: %s"
 msgid "cannot get %s lock on database"
 msgstr "Veritabaný için %s kilit (lock) alýnamadý"
 
-#: lib/db1.c:451 lib/db3.c:1080
+#: lib/db1.c:451 lib/db3.c:1081
 msgid "exclusive"
 msgstr "özel"
 
-#: lib/db1.c:451 lib/db3.c:1080
+#: lib/db1.c:451 lib/db3.c:1081
 msgid "shared"
 msgstr "paylaþýlan (shared)"
 
@@ -2326,17 +2326,17 @@ msgstr ""
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:975
+#: lib/db3.c:974
 #, fuzzy, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur"
 
-#: lib/db3.c:1078
+#: lib/db3.c:1079
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "Veritabaný için %s kilit (lock) alýnamadý"
 
-#: lib/db3.c:1085
+#: lib/db3.c:1086
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
diff --git a/rpm.spec b/rpm.spec
index 73469b0c6..2c8c6aa7d 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -2,7 +2,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version 3.1
 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
@@ -136,7 +136,7 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc RPM-PGP-KEY CHANGES GROUPS doc/manual/*
+%doc RPM-PGP-KEY RPM-GPG-KEY CHANGES GROUPS doc/manual/*
 /bin/rpm
 %dir /etc/rpm
 /usr/bin/rpm2cpio
@@ -236,6 +236,14 @@ fi
 /usr/include/popt.h
 
 %changelog
+* Wed May 10 2000 Jeff Johnson <jbj@redhat.com>
+- include RPM-GPG-KEY in file manifest.
+- simplify --last popt alias, date like -qi (bjerrick@easystreet.com).
+- fix: alloca'd memory used outside of scope (alpha segfault).
+
+* Mon May  8 2000 Jeff Johnson <jbj@redhat.com>
+- FreeBSD fixes (bero@redhat.com).
+
 * Sat May  6 2000 Jeff Johnson <jbj@redhat.com>
 - finish db1 and db3 cleanup.
 
diff --git a/rpmpopt.in b/rpmpopt.in
index 96ba0dcbc..b60beadce 100644
--- a/rpmpopt.in
+++ b/rpmpopt.in
@@ -63,8 +63,8 @@ rpm alias --triggerscripts --qf '\
 %{TRIGGERSCRIPTS}\n]'
 rpm alias --triggers --triggerscripts
 
-rpm alias --last --qf '%|INSTALLTIME?{%{INSTALLTIME}}:{000000000}| %{NAME}-%{VERSION}-%{RELEASE} %|INSTALLTIME?{%-27{INSTALLTIME:date}}:{(not installed)}|\n' \
-	--pipe "sort -r -n | sed 's,^..........,,' | awk '{printf(\"%-35s %-3s %-3s %2s %-8s %-4s\n\", $1, $2, $3, $4, $5, $6)}' "
+rpm alias --last --qf ''%|INSTALLTIME?{%{INSTALLTIME}}:{000000000}| %{NAME}-%{VERSION}-%{RELEASE} %|INSTALLTIME?{%{INSTALLTIME:date}}:{(not installed)}|\n' \
+	--pipe "sort -r -n | sed 's,^[0-9]\+ ,,' | awk '{printf(\"%-35s %-s\n\", $1, substr($0,length($1)+2))}' "
 
 rpm alias --filesbypkg --qf '[%-25{=NAME} %{FILENAMES}\n]'
 rpm exec --freshen freshen.sh