- copy compressFilelist to convertdb1.c, remove internal legacy.h.

CVS patchset: 5954
CVS date: 2002/12/20 18:36:23

diff --git a/CHANGES b/CHANGES
index 79a7b2c..33532a8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -63,6 +63,7 @@
        - dynamically link /bin/rpm, link against good old -lpthread.
        - test pthread_{mutex,cond}attr_setpshared(), add DB_ENV_PRIVATE if not.
        - error on exclusive Packages fcntl lock if DB_ENV_PRIVATE is set.
+       - copy compressFilelist to convertdb1.c, remove internal legacy.h.
 
 4.0.4 -> 4.1:
        - loosely wire beecrypt library into rpm.

diff --git a/po/cs.po b/po/cs.po
index 1352c66..a1ff546 100644 (file)
--- 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-12-20 11:00-0500\n"
+"POT-Creation-Date: 2002-12-20 13:33-0500\n"
 "PO-Revision-Date: 2001-07-24 10:02+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -3146,21 +3146,21 @@ msgstr ""
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: rpmdb/db3.c:1299
+#: rpmdb/db3.c:1303
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "nemohu vytvoøit %s: %s\n"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "exclusive"
 msgstr ""
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 #, fuzzy
 msgid "shared"
 msgstr "sdílen v síti "
 
-#: rpmdb/db3.c:1305
+#: rpmdb/db3.c:1309
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr ""

diff --git a/po/da.po b/po/da.po
index cac835f..c62e374 100644 (file)
--- 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-12-20 11:00-0500\n"
+"POT-Creation-Date: 2002-12-20 13:33-0500\n"
 "PO-Revision-Date: 2001-04-05 23:03GMT\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -3158,20 +3158,20 @@ msgstr "lukkede db-indeks %s/%s\n"
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "åbner   db-indeks %s/%s %s mode=0x%x\n"
 
-#: rpmdb/db3.c:1299
+#: rpmdb/db3.c:1303
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "kan ikke opnå %s lås på %s/%s\n"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "exclusive"
 msgstr "eksklusiv"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "shared"
 msgstr "delt"
 
-#: rpmdb/db3.c:1305
+#: rpmdb/db3.c:1309
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "låste   db-index  %s/%s\n"

diff --git a/po/de.po b/po/de.po
index c00cb2b..ed822d5 100644 (file)
--- 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-12-20 11:00-0500\n"
+"POT-Creation-Date: 2002-12-20 13:33-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"
@@ -3335,20 +3335,20 @@ msgstr "Datenbank aus der vorhandenen neu erstellen"
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: rpmdb/db3.c:1299
+#: rpmdb/db3.c:1303
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "kann %s lock für die Datenbank nicht bekommen"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "exclusive"
 msgstr "exklusiv"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "shared"
 msgstr "geteilt"
 
-#: rpmdb/db3.c:1305
+#: rpmdb/db3.c:1309
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"

diff --git a/po/fi.po b/po/fi.po
index 642680c..85f2c5d 100644 (file)
--- 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-12-20 11:00-0500\n"
+"POT-Creation-Date: 2002-12-20 13:33-0500\n"
 "PO-Revision-Date: 1998-05-02 21:41:47-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
@@ -3200,20 +3200,20 @@ msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: rpmdb/db3.c:1299
+#: rpmdb/db3.c:1303
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "en voi saada %s lukitusta tietokantaan"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "exclusive"
 msgstr "poissulkevaa"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "shared"
 msgstr "jaettua"
 
-#: rpmdb/db3.c:1305
+#: rpmdb/db3.c:1309
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"

diff --git a/po/fr.po b/po/fr.po
index e9de596..62b1ca4 100644 (file)
--- 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-12-20 11:00-0500\n"
+"POT-Creation-Date: 2002-12-20 13:33-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"
@@ -3236,20 +3236,20 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/db3.c:1299
+#: rpmdb/db3.c:1303
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "aucun package n'a t spcifi pour la dsinstallation"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "exclusive"
 msgstr ""
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "shared"
 msgstr ""
 
-#: rpmdb/db3.c:1305
+#: rpmdb/db3.c:1309
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "impossible d'ouvrir: %s\n"

diff --git a/po/gl.po b/po/gl.po
index df945fa..7dbe4cf 100644 (file)
--- 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-12-20 11:00-0500\n"
+"POT-Creation-Date: 2002-12-20 13:33-0500\n"
 "PO-Revision-Date: 2001-01-13 22:31+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -3050,20 +3050,20 @@ msgstr ""
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: rpmdb/db3.c:1299
+#: rpmdb/db3.c:1303
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "exclusive"
 msgstr ""
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "shared"
 msgstr ""
 
-#: rpmdb/db3.c:1305
+#: rpmdb/db3.c:1309
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr ""

diff --git a/po/is.po b/po/is.po
index cde67dd..ad56bb7 100644 (file)
--- 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-12-20 11:00-0500\n"
+"POT-Creation-Date: 2002-12-20 13:33-0500\n"
 "PO-Revision-Date: 2001-07-12 13:25+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -3080,20 +3080,20 @@ msgstr ""
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: rpmdb/db3.c:1299
+#: rpmdb/db3.c:1303
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "exclusive"
 msgstr "einka"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "shared"
 msgstr "deildann"
 
-#: rpmdb/db3.c:1305
+#: rpmdb/db3.c:1309
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr ""

diff --git a/po/ja.po b/po/ja.po
index 7eacfd1..bf481cd 100644 (file)
--- 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-12-20 11:00-0500\n"
+"POT-Creation-Date: 2002-12-20 13:33-0500\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"
@@ -3249,20 +3249,20 @@ msgstr "%s 
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥â¡¼¥É 0x%x ¤Î¥ª¡¼¥×¥ó (%s)\n"
 
-#: rpmdb/db3.c:1299
+#: rpmdb/db3.c:1303
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î %s ¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "exclusive"
 msgstr "½ü³°"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "shared"
 msgstr "¶¦Í­"
 
-#: rpmdb/db3.c:1305
+#: rpmdb/db3.c:1309
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"

diff --git a/po/ko.po b/po/ko.po
index 0e7a0d0..4ff8be0 100644 (file)
--- 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-12-20 11:00-0500\n"
+"POT-Creation-Date: 2002-12-20 13:33-0500\n"
 "PO-Revision-Date: 2002-03-04 17:17+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -3134,20 +3134,20 @@ msgstr "
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "¿©´ÂÁß  db À妽º      %s/%s %s ¸ðµå=0x%x\n"
 
-#: rpmdb/db3.c:1299
+#: rpmdb/db3.c:1303
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "%2$s/%3$sÀÇ Àá±ÝµÈ(lock) %1$s(À»)¸¦ ¾òÀ» ¼ö ¾ø½À´Ï´Ù\n"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "exclusive"
 msgstr "Æó¼âÀû(exclusive)"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "shared"
 msgstr "°øÀ¯µÊ"
 
-#: rpmdb/db3.c:1305
+#: rpmdb/db3.c:1309
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "Àá±ÝµÈ  db À妽º      %s/%s\n"

diff --git a/po/no.po b/po/no.po
index 4e9d09c..e4466b2 100644 (file)
--- 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-12-20 11:00-0500\n"
+"POT-Creation-Date: 2002-12-20 13:33-0500\n"
 "PO-Revision-Date: 2001-06-27 12:24+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -3112,20 +3112,20 @@ msgstr ""
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: rpmdb/db3.c:1299
+#: rpmdb/db3.c:1303
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "exclusive"
 msgstr ""
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "shared"
 msgstr ""
 
-#: rpmdb/db3.c:1305
+#: rpmdb/db3.c:1309
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr ""

diff --git a/po/pl.po b/po/pl.po
index 4e6d651..3710c8e 100644 (file)
--- 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-12-20 11:00-0500\n"
+"POT-Creation-Date: 2002-12-20 13:33-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"
@@ -3203,20 +3203,20 @@ msgstr "usuwanie indeksu plik
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "otwiernie bazê danych w trybie 0x%x w %s\n"
 
-#: rpmdb/db3.c:1299
+#: rpmdb/db3.c:1303
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "utworzenie blokady %s na bazie danych nie jest mo¿liwe"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "exclusive"
 msgstr ""
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "shared"
 msgstr ""
 
-#: rpmdb/db3.c:1305
+#: rpmdb/db3.c:1309
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "usuwanie indeksu plików dla %s\n"

diff --git a/po/pt.po b/po/pt.po
index 556550f..3aae06e 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
-"POT-Creation-Date: 2002-12-20 11:00-0500\n"
+"POT-Creation-Date: 2002-12-20 13:33-0500\n"
 "PO-Revision-Date: 2002-02-14 10:51+0000\n"
 "Last-Translator: José Nuno Coelho Sanarra Pires <jncp@rnl.ist.utl.pt>\n"
 "Language-Team: pt <morais@kde.org\n"
@@ -3145,20 +3145,20 @@ msgstr "verifiquei o 
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "a abrir o índice do db  %s/%s %s modo=0x%x\n"
 
-#: rpmdb/db3.c:1299
+#: rpmdb/db3.c:1303
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "não consigo trancar o %s no %s/%s\n"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "exclusive"
 msgstr "exclusivo"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "shared"
 msgstr "partilhado"
 
-#: rpmdb/db3.c:1305
+#: rpmdb/db3.c:1309
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "tranquei o índice do db %s/%s\n"

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3d7c1d8..0ab3f9c 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-20 11:00-0500\n"
+"POT-Creation-Date: 2002-12-20 13:33-0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -3401,20 +3401,20 @@ msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 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"
 
-#: rpmdb/db3.c:1299
+#: rpmdb/db3.c:1303
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "no foi passado pacote para desinstalao"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "exclusive"
 msgstr ""
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "shared"
 msgstr ""
 
-#: rpmdb/db3.c:1305
+#: rpmdb/db3.c:1309
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"

diff --git a/po/ro.po b/po/ro.po
index 0999849..e9a3421 100644 (file)
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-20 11:00-0500\n"
+"POT-Creation-Date: 2002-12-20 13:33-0500\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -3050,20 +3050,20 @@ msgstr ""
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: rpmdb/db3.c:1299
+#: rpmdb/db3.c:1303
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "exclusive"
 msgstr ""
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "shared"
 msgstr ""
 
-#: rpmdb/db3.c:1305
+#: rpmdb/db3.c:1309
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr ""

diff --git a/po/rpm.pot b/po/rpm.pot
index 957e6bd..9da8f07 100644 (file)
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-12-20 11:00-0500\n"
+"POT-Creation-Date: 2002-12-20 13:33-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"
@@ -3056,20 +3056,20 @@ msgstr ""
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: rpmdb/db3.c:1299
+#: rpmdb/db3.c:1303
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "exclusive"
 msgstr ""
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "shared"
 msgstr ""
 
-#: rpmdb/db3.c:1305
+#: rpmdb/db3.c:1309
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr ""

diff --git a/po/ru.po b/po/ru.po
index 6758748..5588f23 100644 (file)
--- 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-12-20 11:00-0500\n"
+"POT-Creation-Date: 2002-12-20 13:33-0500\n"
 "PO-Revision-Date: 2002-08-27 13:36-0400\n"
 "Last-Translator: Eugene Kanter, <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -3101,20 +3101,20 @@ msgstr "
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s %s mode=0x%x\n"
 
-#: rpmdb/db3.c:1299
+#: rpmdb/db3.c:1303
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÂÌÏËÉÒÏ×ËÕ %s ÎÁ %s/%s\n"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "exclusive"
 msgstr "ÉÓËÌÀÞÉÔÅÌØÎÙÊ"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "shared"
 msgstr "ÒÁÚÄÅÌÑÅÍÙÊ"
 
-#: rpmdb/db3.c:1305
+#: rpmdb/db3.c:1309
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "ÚÁÂÌÏËÉÒÏ×ÁÎ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n"

diff --git a/po/sk.po b/po/sk.po
index eb83a75..e0fdd3b 100644 (file)
--- 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-12-20 11:00-0500\n"
+"POT-Creation-Date: 2002-12-20 13:33-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"
@@ -3199,20 +3199,20 @@ msgstr "odstra
 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"
 
-#: rpmdb/db3.c:1299
+#: rpmdb/db3.c:1303
 #, 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"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "exclusive"
 msgstr "výhradný"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "shared"
 msgstr "zdieµaný"
 
-#: rpmdb/db3.c:1305
+#: rpmdb/db3.c:1309
 #, 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 9123f29..d404dce 100644 (file)
--- 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.340 2002/12/20 16:09:46 jbj Exp $
+# $Id: sl.po,v 1.341 2002/12/20 18:36:55 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-20 11:00-0500\n"
+"POT-Creation-Date: 2002-12-20 13:33-0500\n"
 "PO-Revision-Date: 2000-10-08 19:05+0200\n"
 "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -3202,20 +3202,20 @@ msgstr "zaprto  db kazalo       %s/%s\n"
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "odpiranje db kazala       %s/%s %s naèin=0x%x\n"
 
-#: rpmdb/db3.c:1299
+#: rpmdb/db3.c:1303
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "ni mo¾no zakleniti z %s datotek %s/%s\n"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "exclusive"
 msgstr "izkljuèujoèe"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "shared"
 msgstr "skupno"
 
-#: rpmdb/db3.c:1305
+#: rpmdb/db3.c:1309
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "zaklenjeno  db kazalo       %s/%s\n"

diff --git a/po/sr.po b/po/sr.po
index 5aa3b58..b115a50 100644 (file)
--- 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-12-20 11:00-0500\n"
+"POT-Creation-Date: 2002-12-20 13:33-0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3191,20 +3191,20 @@ msgstr "rekreiraj bazu podataka iz postoje
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: rpmdb/db3.c:1299
+#: rpmdb/db3.c:1303
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "ne mogu da dobijem %s zakljuèavanje baze podataka"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "exclusive"
 msgstr "ekskluzivno"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "shared"
 msgstr "deljeno"
 
-#: rpmdb/db3.c:1305
+#: rpmdb/db3.c:1309
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"

diff --git a/po/sv.po b/po/sv.po
index c9f67c0..19f6b95 100644 (file)
--- 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-12-20 11:00-0500\n"
+"POT-Creation-Date: 2002-12-20 13:33-0500\n"
 "PO-Revision-Date: 2002-08-19 22:26+0200\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -3085,20 +3085,20 @@ msgstr "verifierade db-index %s/%s\n"
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "öppnar      db-index %s/%s %s rättighet=0x%x\n"
 
-#: rpmdb/db3.c:1299
+#: rpmdb/db3.c:1303
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "kan inte få %s lås på %s/%s\n"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "exclusive"
 msgstr "uteslutande"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "shared"
 msgstr "delat"
 
-#: rpmdb/db3.c:1305
+#: rpmdb/db3.c:1309
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "låste       db-index %s/%s\n"

diff --git a/po/tr.po b/po/tr.po
index 385a7bd..0f5aab5 100644 (file)
--- 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-12-20 11:00-0500\n"
+"POT-Creation-Date: 2002-12-20 13:33-0500\n"
 "PO-Revision-Date: 2001-07-05 08:02+300\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -3157,20 +3157,20 @@ msgstr "do
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "açýlýyor       db endeks %s/%s %s kip=0x%x\n"
 
-#: rpmdb/db3.c:1299
+#: rpmdb/db3.c:1303
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "%s kilit  %s/%s'den alýnamadý\n"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "exclusive"
 msgstr "baðdaþýk"
 
-#: rpmdb/db3.c:1301
+#: rpmdb/db3.c:1305
 msgid "shared"
 msgstr "paylaþýmlý"
 
-#: rpmdb/db3.c:1305
+#: rpmdb/db3.c:1309
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "kilitli      db endeks %s/%s\n"

diff --git a/rpm.spec.in b/rpm.spec.in
index 6606284..946f566 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -460,6 +460,7 @@ exit 0
 - dynamically link /bin/rpm, link against good old -lpthread.
 - test pthread_{mutex,cond}attr_setpshared(), add DB_ENV_PRIVATE if not.
 - error on exclusive Packages fcntl lock if DB_ENV_PRIVATE is set.
+- copy compressFilelist to convertdb1.c, remove internal legacy.h.
 
 * Thu Dec 19 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.31
 - statically link against /usr/lib/nptl/libpthread.a, if present.

diff --git a/tools/convertdb1.c b/tools/convertdb1.c
index 10d9daa..2ac4322 100644 (file)
--- a/tools/convertdb1.c
+++ b/tools/convertdb1.c
@@ -3,7 +3,6 @@
 #include <rpmlib.h>
 #include <rpmdb.h>
 #include <rpmmacro.h>
-#include "legacy.h"
 #include "debug.h"
 
 #define FA_MAGIC      0x02050920
@@ -106,6 +105,109 @@ static int fadFirstOffset(FD_t fd)
     return fadNextOffset(fd, 0);
 }
 
+/*@-boundsread@*/
+static int dncmp(const void * a, const void * b)
+       /*@*/
+{
+    const char *const * first = a;
+    const char *const * second = b;
+    return strcmp(*first, *second);
+}
+/*@=boundsread@*/
+
+/*@-bounds@*/
+void compressFilelist(Header h)
+{
+    HGE_t hge = (HGE_t)headerGetEntryMinMemory;
+    HAE_t hae = (HAE_t)headerAddEntry;
+    HRE_t hre = (HRE_t)headerRemoveEntry;
+    HFD_t hfd = headerFreeData;
+    char ** fileNames;
+    const char ** dirNames;
+    const char ** baseNames;
+    int_32 * dirIndexes;
+    rpmTagType fnt;
+    int count;
+    int i, xx;
+    int dirIndex = -1;
+
+    /*
+     * This assumes the file list is already sorted, and begins with a
+     * single '/'. That assumption isn't critical, but it makes things go
+     * a bit faster.
+     */
+
+    if (headerIsEntry(h, RPMTAG_DIRNAMES)) {
+       xx = hre(h, RPMTAG_OLDFILENAMES);
+       return;         /* Already converted. */
+    }
+
+    if (!hge(h, RPMTAG_OLDFILENAMES, &fnt, (void **) &fileNames, &count))
+       return;         /* no file list */
+    if (fileNames == NULL || count <= 0)
+       return;
+
+    dirNames = alloca(sizeof(*dirNames) * count);      /* worst case */
+    baseNames = alloca(sizeof(*dirNames) * count);
+    dirIndexes = alloca(sizeof(*dirIndexes) * count);
+
+    if (fileNames[0][0] != '/') {
+       /* HACK. Source RPM, so just do things differently */
+       dirIndex = 0;
+       dirNames[dirIndex] = "";
+       for (i = 0; i < count; i++) {
+           dirIndexes[i] = dirIndex;
+           baseNames[i] = fileNames[i];
+       }
+       goto exit;
+    }
+
+    /*@-branchstate@*/
+    for (i = 0; i < count; i++) {
+       const char ** needle;
+       char savechar;
+       char * baseName;
+       int len;
+
+       if (fileNames[i] == NULL)       /* XXX can't happen */
+           continue;
+       baseName = strrchr(fileNames[i], '/') + 1;
+       len = baseName - fileNames[i];
+       needle = dirNames;
+       savechar = *baseName;
+       *baseName = '\0';
+/*@-compdef@*/
+       if (dirIndex < 0 ||
+           (needle = bsearch(&fileNames[i], dirNames, dirIndex + 1, sizeof(dirNames[0]), dncmp)) == NULL) {
+           char *s = alloca(len + 1);
+           memcpy(s, fileNames[i], len + 1);
+           s[len] = '\0';
+           dirIndexes[i] = ++dirIndex;
+           dirNames[dirIndex] = s;
+       } else
+           dirIndexes[i] = needle - dirNames;
+/*@=compdef@*/
+
+       *baseName = savechar;
+       baseNames[i] = baseName;
+    }
+    /*@=branchstate@*/
+
+exit:
+    if (count > 0) {
+       xx = hae(h, RPMTAG_DIRINDEXES, RPM_INT32_TYPE, dirIndexes, count);
+       xx = hae(h, RPMTAG_BASENAMES, RPM_STRING_ARRAY_TYPE,
+                       baseNames, count);
+       xx = hae(h, RPMTAG_DIRNAMES, RPM_STRING_ARRAY_TYPE,
+                       dirNames, dirIndex + 1);
+    }
+
+    fileNames = hfd(fileNames, fnt);
+
+    xx = hre(h, RPMTAG_OLDFILENAMES);
+}
+/*@=bounds@*/
+
 static rpmdb db;
 
 int