27 files changed, 772 insertions, 473 deletions

diff --git a/CHANGES b/CHANGES
index 4b7810824..1c53dd223 100644
--- a/CHANGES
+++ b/CHANGES
@@ -82,6 +82,7 @@
 	- ignore ENOENT return from db->close (#80514,#79314).
 	- fix builddir relative inclusion, add %%pubkeys to rpm header.
 	- fix: package relocations were broken (#75057).
+	- error if querying with iterator on different sized arrays.
 
 4.0.4 -> 4.1:
 	- loosely wire beecrypt library into rpm.
diff --git a/lib/formats.c b/lib/formats.c
index 62d86aa8e..065a7c4b7 100644
--- a/lib/formats.c
+++ b/lib/formats.c
@@ -242,7 +242,7 @@ static /*@only@*/ char * armorFormat(int_32 type, const void * data,
  * @param data		tag value
  * @param formatPrefix
  * @param padding
- * @param element	(unused)
+ * @param element
  * @return		formatted string
  */
 static /*@only@*/ char * base64Format(int_32 type, const void * data, 
@@ -431,7 +431,7 @@ static /*@only@*/ char * depflagsFormat(int_32 type, const void * data,
  * Retrieve mounted file system paths.
  * @param h		header
  * @retval *type	tag type
- * @retval *data	tag value pointer
+ * @retval *data	tag value
  * @retval *count	no. of data items
  * @retval *freeData	data-was-malloc'ed indicator
  * @return		0 on success
@@ -463,7 +463,7 @@ static int fsnamesTag( /*@unused@*/ Header h, /*@out@*/ int_32 * type,
  * Retrieve install prefixes.
  * @param h		header
  * @retval *type	tag type
- * @retval *data	tag value pointer
+ * @retval *data	tag value
  * @retval *count	no. of data items
  * @retval *freeData	data-was-malloc'ed indicator
  * @return		0 on success
@@ -501,7 +501,7 @@ static int instprefixTag(Header h, /*@null@*/ /*@out@*/ rpmTagType * type,
  * Retrieve mounted file system space.
  * @param h		header
  * @retval *type	tag type
- * @retval *data	tag value pointer
+ * @retval *data	tag value
  * @retval *count	no. of data items
  * @retval *freeData	data-was-malloc'ed indicator
  * @return		0 on success
@@ -561,7 +561,7 @@ static int fssizesTag(Header h, /*@out@*/ rpmTagType * type,
  * Retrieve trigger info.
  * @param h		header
  * @retval *type	tag type
- * @retval *data	tag value pointer
+ * @retval *data	tag value
  * @retval *count	no. of data items
  * @retval *freeData	data-was-malloc'ed indicator
  * @return		0 on success
@@ -638,7 +638,7 @@ static int triggercondsTag(Header h, /*@out@*/ rpmTagType * type,
  * Retrieve trigger type info.
  * @param h		header
  * @retval *type	tag type
- * @retval *data	tag value pointer
+ * @retval *data	tag value
  * @retval *count	no. of data items
  * @retval *freeData	data-was-malloc'ed indicator
  * @return		0 on success
@@ -698,7 +698,7 @@ static int triggertypeTag(Header h, /*@out@*/ rpmTagType * type,
  * Retrieve file paths.
  * @param h		header
  * @retval *type	tag type
- * @retval *data	tag value pointer
+ * @retval *data	tag value
  * @retval *count	no. of data items
  * @retval *freeData	data-was-malloc'ed indicator
  * @return		0 on success
@@ -724,7 +724,7 @@ static int filenamesTag(Header h, /*@out@*/ rpmTagType * type,
  * Retrieve file classes.
  * @param h		header
  * @retval *type	tag type
- * @retval *data	tag value pointer
+ * @retval *data	tag value
  * @retval *count	no. of data items
  * @retval *freeData	data-was-malloc'ed indicator
  * @return		0 on success
@@ -746,7 +746,7 @@ static int fileclassTag(Header h, /*@out@*/ rpmTagType * type,
  * Retrieve file provides.
  * @param h		header
  * @retval *type	tag type
- * @retval *data	tag value pointer
+ * @retval *data	tag value
  * @retval *count	no. of data items
  * @retval *freeData	data-was-malloc'ed indicator
  * @return		0 on success
@@ -768,7 +768,7 @@ static int fileprovideTag(Header h, /*@out@*/ rpmTagType * type,
  * Retrieve file requires.
  * @param h		header
  * @retval *type	tag type
- * @retval *data	tag value pointer
+ * @retval *data	tag value
  * @retval *count	no. of data items
  * @retval *freeData	data-was-malloc'ed indicator
  * @return		0 on success
@@ -803,7 +803,7 @@ static const char * _macro_i18ndomains = "%{?_i18ndomains}";
  * @param h		header
  * @param tag		tag
  * @retval *type	tag type
- * @retval *data	tag value pointer
+ * @retval *data	tag value
  * @retval *count	no. of data items
  * @retval *freeData	data-was-malloc'ed indicator
  * @return		0 on success
@@ -893,7 +893,7 @@ static int i18nTag(Header h, int_32 tag, /*@out@*/ rpmTagType * type,
  * Retrieve summary text.
  * @param h		header
  * @retval *type	tag type
- * @retval *data	tag value pointer
+ * @retval *data	tag value
  * @retval *count	no. of data items
  * @retval *freeData	data-was-malloc'ed indicator
  * @return		0 on success
@@ -913,7 +913,7 @@ static int summaryTag(Header h, /*@out@*/ rpmTagType * type,
  * Retrieve description text.
  * @param h		header
  * @retval *type	tag type
- * @retval *data	tag value pointer
+ * @retval *data	tag value
  * @retval *count	no. of data items
  * @retval *freeData	data-was-malloc'ed indicator
  * @return		0 on success
@@ -933,7 +933,7 @@ static int descriptionTag(Header h, /*@out@*/ rpmTagType * type,
  * Retrieve group text.
  * @param h		header
  * @retval *type	tag type
- * @retval *data	tag value pointer
+ * @retval *data	tag value
  * @retval *count	no. of data items
  * @retval *freeData	data-was-malloc'ed indicator
  * @return		0 on success
diff --git a/po/cs.po b/po/cs.po
index 0bcb5f156..1c4695b52 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-27 19:22-0500\n"
+"POT-Creation-Date: 2002-12-28 14:25-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"
@@ -1431,7 +1431,7 @@ msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
 #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:405
-#: rpmdb/header.c:3237 rpmdb/header.c:3260 rpmdb/header.c:3284
+#: rpmdb/header.c:3327 rpmdb/header.c:3356 rpmdb/header.c:3380
 msgid "(not a number)"
 msgstr "(není číslo)"
 
@@ -3201,75 +3201,83 @@ msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2408
+#: rpmdb/header.c:2428
 msgid "missing { after %"
 msgstr "chybí { po %"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2438
+#: rpmdb/header.c:2458
 msgid "missing } after %{"
 msgstr "po %{ chybí }"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2452
+#: rpmdb/header.c:2472
 msgid "empty tag format"
 msgstr "prázdný formát značky"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2466
+#: rpmdb/header.c:2486
 msgid "empty tag name"
 msgstr "prázdné jméno značky"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2483
+#: rpmdb/header.c:2503
 msgid "unknown tag"
 msgstr "neznámá značka"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2510
+#: rpmdb/header.c:2530
 msgid "] expected at end of array"
 msgstr "na konci pole očekáváno ]"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2528
+#: rpmdb/header.c:2545
 msgid "unexpected ]"
 msgstr "neočekávaná ]"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2532
+#: rpmdb/header.c:2558
 msgid "unexpected }"
 msgstr "neočekávaná }"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2601
+#: rpmdb/header.c:2624
 msgid "? expected in expression"
 msgstr "ve výrazu očekáván ?"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2610
+#: rpmdb/header.c:2633
 msgid "{ expected after ? in expression"
 msgstr "ve výrazu je po ? očekávána {"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2624 rpmdb/header.c:2671
+#: rpmdb/header.c:2647 rpmdb/header.c:2694
 msgid "} expected in expression"
 msgstr "ve výrazu je očekávána }"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2634
+#: rpmdb/header.c:2657
 msgid ": expected following ? subexpression"
 msgstr "v podvýrazu je po ? očekávána :"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2654
+#: rpmdb/header.c:2677
 msgid "{ expected after : in expression"
 msgstr "ve výrazu je po : očekávána {"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2681
+#: rpmdb/header.c:2704
 msgid "| expected at end of expression"
 msgstr "na konci výrazu je očekáváno |"
 
+#: rpmdb/header.c:2828
+msgid "(index out of range)"
+msgstr ""
+
+#: rpmdb/header.c:3132
+msgid "array iterator used with different sized arrays"
+msgstr ""
+
 #: rpmdb/poptDB.c:18
 msgid "initialize database"
 msgstr ""
diff --git a/po/da.po b/po/da.po
index 6469835f8..d045aa876 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-27 19:22-0500\n"
+"POT-Creation-Date: 2002-12-28 14:25-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"
@@ -1430,7 +1430,7 @@ msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
 #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:405
-#: rpmdb/header.c:3237 rpmdb/header.c:3260 rpmdb/header.c:3284
+#: rpmdb/header.c:3327 rpmdb/header.c:3356 rpmdb/header.c:3380
 msgid "(not a number)"
 msgstr "(ikke et tal)"
 
@@ -3212,75 +3212,83 @@ msgid "%s has too large or too small integer value, skipped\n"
 msgstr "%s har for stor eller lille heltalsvćrdi, overspringes\n"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2408
+#: rpmdb/header.c:2428
 msgid "missing { after %"
 msgstr "manglende { efter %"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2438
+#: rpmdb/header.c:2458
 msgid "missing } after %{"
 msgstr "manglende } efter %{"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2452
+#: rpmdb/header.c:2472
 msgid "empty tag format"
 msgstr "tomt mćrkeformat"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2466
+#: rpmdb/header.c:2486
 msgid "empty tag name"
 msgstr "tomt mćrkenavn"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2483
+#: rpmdb/header.c:2503
 msgid "unknown tag"
 msgstr "ukendt mćrke"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2510
+#: rpmdb/header.c:2530
 msgid "] expected at end of array"
 msgstr "] forventet ved slutningen af tabel"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2528
+#: rpmdb/header.c:2545
 msgid "unexpected ]"
 msgstr "uventet ]"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2532
+#: rpmdb/header.c:2558
 msgid "unexpected }"
 msgstr "uventet }"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2601
+#: rpmdb/header.c:2624
 msgid "? expected in expression"
 msgstr "? forventet i udtryk"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2610
+#: rpmdb/header.c:2633
 msgid "{ expected after ? in expression"
 msgstr "{ forventet efter ? i udtryk"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2624 rpmdb/header.c:2671
+#: rpmdb/header.c:2647 rpmdb/header.c:2694
 msgid "} expected in expression"
 msgstr "} forventet i udtryk"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2634
+#: rpmdb/header.c:2657
 msgid ": expected following ? subexpression"
 msgstr ": forventet efter ?-underudtryk"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2654
+#: rpmdb/header.c:2677
 msgid "{ expected after : in expression"
 msgstr "{ forventet efter : i udtryk"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2681
+#: rpmdb/header.c:2704
 msgid "| expected at end of expression"
 msgstr "| forventet ved slutningen af udtryk"
 
+#: rpmdb/header.c:2828
+msgid "(index out of range)"
+msgstr ""
+
+#: rpmdb/header.c:3132
+msgid "array iterator used with different sized arrays"
+msgstr ""
+
 #: rpmdb/poptDB.c:18
 msgid "initialize database"
 msgstr "initialisér database"
diff --git a/po/de.po b/po/de.po
index c1e11df51..a5c064d24 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-27 19:22-0500\n"
+"POT-Creation-Date: 2002-12-28 14:25-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"
@@ -1557,7 +1557,7 @@ msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
 #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:405
-#: rpmdb/header.c:3237 rpmdb/header.c:3260 rpmdb/header.c:3284
+#: rpmdb/header.c:3327 rpmdb/header.c:3356 rpmdb/header.c:3380
 msgid "(not a number)"
 msgstr "(keine Zahl)"
 
@@ -3389,78 +3389,86 @@ msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2408
+#: rpmdb/header.c:2428
 msgid "missing { after %"
 msgstr "fehlende { nach %{"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2438
+#: rpmdb/header.c:2458
 msgid "missing } after %{"
 msgstr "fehlende } nach %{"
 
 # »Tag« übersetzen??? -ke-
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2452
+#: rpmdb/header.c:2472
 msgid "empty tag format"
 msgstr "leeres »Tag«-Format"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2466
+#: rpmdb/header.c:2486
 msgid "empty tag name"
 msgstr "leerer »Tag«-Name"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2483
+#: rpmdb/header.c:2503
 msgid "unknown tag"
 msgstr "unbekannter »Tag«"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2510
+#: rpmdb/header.c:2530
 msgid "] expected at end of array"
 msgstr "] am Ende des Arrays erwartet"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2528
+#: rpmdb/header.c:2545
 msgid "unexpected ]"
 msgstr "unerwartete ]"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2532
+#: rpmdb/header.c:2558
 msgid "unexpected }"
 msgstr "unerwartete }"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2601
+#: rpmdb/header.c:2624
 msgid "? expected in expression"
 msgstr "? im Ausdruck erwartet"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2610
+#: rpmdb/header.c:2633
 #, fuzzy
 msgid "{ expected after ? in expression"
 msgstr "{ nach ? im Ausdruck erwartet"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2624 rpmdb/header.c:2671
+#: rpmdb/header.c:2647 rpmdb/header.c:2694
 msgid "} expected in expression"
 msgstr "} im Ausdruck erwartet"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2634
+#: rpmdb/header.c:2657
 msgid ": expected following ? subexpression"
 msgstr ": nach ? Unterausdruck erwartet"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2654
+#: rpmdb/header.c:2677
 #, fuzzy
 msgid "{ expected after : in expression"
 msgstr "{ nach : im Ausdruck erwartet"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2681
+#: rpmdb/header.c:2704
 msgid "| expected at end of expression"
 msgstr "| am Ende des Ausdrucks erwartet"
 
+#: rpmdb/header.c:2828
+msgid "(index out of range)"
+msgstr ""
+
+#: rpmdb/header.c:3132
+msgid "array iterator used with different sized arrays"
+msgstr ""
+
 #: rpmdb/poptDB.c:18
 msgid "initialize database"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 7165337fb..5dc89e6f1 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-27 19:22-0500\n"
+"POT-Creation-Date: 2002-12-28 14:25-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"
@@ -1452,7 +1452,7 @@ msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
 #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:405
-#: rpmdb/header.c:3237 rpmdb/header.c:3260 rpmdb/header.c:3284
+#: rpmdb/header.c:3327 rpmdb/header.c:3356 rpmdb/header.c:3380
 msgid "(not a number)"
 msgstr "(ei ole luku)"
 
@@ -3254,77 +3254,85 @@ msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2408
+#: rpmdb/header.c:2428
 msgid "missing { after %"
 msgstr "puuttuva '{' '%':n jälkeen"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2438
+#: rpmdb/header.c:2458
 msgid "missing } after %{"
 msgstr "puuttuva '{' '%{':n jälkeen"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2452
+#: rpmdb/header.c:2472
 msgid "empty tag format"
 msgstr "tyhjä nimiön formaatti"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2466
+#: rpmdb/header.c:2486
 msgid "empty tag name"
 msgstr "tyhjä nimiön nimi"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2483
+#: rpmdb/header.c:2503
 msgid "unknown tag"
 msgstr "tuntematon nimiö"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2510
+#: rpmdb/header.c:2530
 msgid "] expected at end of array"
 msgstr "']' puuttuu taulukkomäärittelyn lopusta"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2528
+#: rpmdb/header.c:2545
 msgid "unexpected ]"
 msgstr "odottamaton ']'"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2532
+#: rpmdb/header.c:2558
 msgid "unexpected }"
 msgstr "odottamaton '}'"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2601
+#: rpmdb/header.c:2624
 msgid "? expected in expression"
 msgstr "odotin '?'-merkkiä ilmauksessa"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2610
+#: rpmdb/header.c:2633
 #, fuzzy
 msgid "{ expected after ? in expression"
 msgstr "odotin '{' '?'-merkin jälkeen ilmauksessa "
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2624 rpmdb/header.c:2671
+#: rpmdb/header.c:2647 rpmdb/header.c:2694
 msgid "} expected in expression"
 msgstr "odotin '}'-merkkiä ilmauksessa"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2634
+#: rpmdb/header.c:2657
 msgid ": expected following ? subexpression"
 msgstr "odotin ':' '?'-merkin jälkeen ali-ilmauksessa "
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2654
+#: rpmdb/header.c:2677
 #, fuzzy
 msgid "{ expected after : in expression"
 msgstr "odotin '{' ':'-merkin jälkeen ilmauksessa "
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2681
+#: rpmdb/header.c:2704
 msgid "| expected at end of expression"
 msgstr "odotin '}'-merkkiä ilmauksen lopussa"
 
+#: rpmdb/header.c:2828
+msgid "(index out of range)"
+msgstr ""
+
+#: rpmdb/header.c:3132
+msgid "array iterator used with different sized arrays"
+msgstr ""
+
 #: rpmdb/poptDB.c:18
 msgid "initialize database"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index b887f3930..0f7cc6612 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-27 19:22-0500\n"
+"POT-Creation-Date: 2002-12-28 14:25-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"
@@ -1478,7 +1478,7 @@ msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
 #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:405
-#: rpmdb/header.c:3237 rpmdb/header.c:3260 rpmdb/header.c:3284
+#: rpmdb/header.c:3327 rpmdb/header.c:3356 rpmdb/header.c:3380
 msgid "(not a number)"
 msgstr ""
 
@@ -3292,77 +3292,85 @@ msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2408
+#: rpmdb/header.c:2428
 msgid "missing { after %"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2438
+#: rpmdb/header.c:2458
 msgid "missing } after %{"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2452
+#: rpmdb/header.c:2472
 msgid "empty tag format"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2466
+#: rpmdb/header.c:2486
 msgid "empty tag name"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2483
+#: rpmdb/header.c:2503
 msgid "unknown tag"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2510
+#: rpmdb/header.c:2530
 msgid "] expected at end of array"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2528
+#: rpmdb/header.c:2545
 #, fuzzy
 msgid "unexpected ]"
 msgstr "source de requte inattendue"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2532
+#: rpmdb/header.c:2558
 #, fuzzy
 msgid "unexpected }"
 msgstr "source de requte inattendue"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2601
+#: rpmdb/header.c:2624
 msgid "? expected in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2610
+#: rpmdb/header.c:2633
 msgid "{ expected after ? in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2624 rpmdb/header.c:2671
+#: rpmdb/header.c:2647 rpmdb/header.c:2694
 msgid "} expected in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2634
+#: rpmdb/header.c:2657
 msgid ": expected following ? subexpression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2654
+#: rpmdb/header.c:2677
 msgid "{ expected after : in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2681
+#: rpmdb/header.c:2704
 msgid "| expected at end of expression"
 msgstr ""
 
+#: rpmdb/header.c:2828
+msgid "(index out of range)"
+msgstr ""
+
+#: rpmdb/header.c:3132
+msgid "array iterator used with different sized arrays"
+msgstr ""
+
 #: rpmdb/poptDB.c:18
 msgid "initialize database"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 1aedf733f..7ab4d76f0 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2002-12-27 19:22-0500\n"
+"POT-Creation-Date: 2002-12-28 14:25-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"
@@ -1390,7 +1390,7 @@ msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
 #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:405
-#: rpmdb/header.c:3237 rpmdb/header.c:3260 rpmdb/header.c:3284
+#: rpmdb/header.c:3327 rpmdb/header.c:3356 rpmdb/header.c:3380
 msgid "(not a number)"
 msgstr ""
 
@@ -3103,75 +3103,83 @@ msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2408
+#: rpmdb/header.c:2428
 msgid "missing { after %"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2438
+#: rpmdb/header.c:2458
 msgid "missing } after %{"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2452
+#: rpmdb/header.c:2472
 msgid "empty tag format"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2466
+#: rpmdb/header.c:2486
 msgid "empty tag name"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2483
+#: rpmdb/header.c:2503
 msgid "unknown tag"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2510
+#: rpmdb/header.c:2530
 msgid "] expected at end of array"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2528
+#: rpmdb/header.c:2545
 msgid "unexpected ]"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2532
+#: rpmdb/header.c:2558
 msgid "unexpected }"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2601
+#: rpmdb/header.c:2624
 msgid "? expected in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2610
+#: rpmdb/header.c:2633
 msgid "{ expected after ? in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2624 rpmdb/header.c:2671
+#: rpmdb/header.c:2647 rpmdb/header.c:2694
 msgid "} expected in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2634
+#: rpmdb/header.c:2657
 msgid ": expected following ? subexpression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2654
+#: rpmdb/header.c:2677
 msgid "{ expected after : in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2681
+#: rpmdb/header.c:2704
 msgid "| expected at end of expression"
 msgstr ""
 
+#: rpmdb/header.c:2828
+msgid "(index out of range)"
+msgstr ""
+
+#: rpmdb/header.c:3132
+msgid "array iterator used with different sized arrays"
+msgstr ""
+
 #: rpmdb/poptDB.c:18
 msgid "initialize database"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 0e5e6de40..a333c1dc2 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-27 19:22-0500\n"
+"POT-Creation-Date: 2002-12-28 14:25-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"
@@ -1402,7 +1402,7 @@ msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
 #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:405
-#: rpmdb/header.c:3237 rpmdb/header.c:3260 rpmdb/header.c:3284
+#: rpmdb/header.c:3327 rpmdb/header.c:3356 rpmdb/header.c:3380
 msgid "(not a number)"
 msgstr ""
 
@@ -3134,75 +3134,83 @@ msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2408
+#: rpmdb/header.c:2428
 msgid "missing { after %"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2438
+#: rpmdb/header.c:2458
 msgid "missing } after %{"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2452
+#: rpmdb/header.c:2472
 msgid "empty tag format"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2466
+#: rpmdb/header.c:2486
 msgid "empty tag name"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2483
+#: rpmdb/header.c:2503
 msgid "unknown tag"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2510
+#: rpmdb/header.c:2530
 msgid "] expected at end of array"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2528
+#: rpmdb/header.c:2545
 msgid "unexpected ]"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2532
+#: rpmdb/header.c:2558
 msgid "unexpected }"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2601
+#: rpmdb/header.c:2624
 msgid "? expected in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2610
+#: rpmdb/header.c:2633
 msgid "{ expected after ? in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2624 rpmdb/header.c:2671
+#: rpmdb/header.c:2647 rpmdb/header.c:2694
 msgid "} expected in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2634
+#: rpmdb/header.c:2657
 msgid ": expected following ? subexpression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2654
+#: rpmdb/header.c:2677
 msgid "{ expected after : in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2681
+#: rpmdb/header.c:2704
 msgid "| expected at end of expression"
 msgstr ""
 
+#: rpmdb/header.c:2828
+msgid "(index out of range)"
+msgstr ""
+
+#: rpmdb/header.c:3132
+msgid "array iterator used with different sized arrays"
+msgstr ""
+
 #: rpmdb/poptDB.c:18
 msgid "initialize database"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 4847f497f..823f33a8b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-27 19:22-0500\n"
+"POT-Creation-Date: 2002-12-28 14:25-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"
@@ -1475,7 +1475,7 @@ msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
 #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:405
-#: rpmdb/header.c:3237 rpmdb/header.c:3260 rpmdb/header.c:3284
+#: rpmdb/header.c:3327 rpmdb/header.c:3356 rpmdb/header.c:3380
 msgid "(not a number)"
 msgstr "(żô»ú¤Ç¤Ď¤˘¤ę¤Ţ¤»¤ó)"
 
@@ -3303,75 +3303,83 @@ msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2408
+#: rpmdb/header.c:2428
 msgid "missing { after %"
 msgstr "% ¤Î¸ĺ¤Ë { ¤¬¤˘¤ę¤Ţ¤»¤ó"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2438
+#: rpmdb/header.c:2458
 msgid "missing } after %{"
 msgstr "%{ ¤Î¸ĺ¤Ë } ¤¬¤˘¤ę¤Ţ¤»¤ó"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2452
+#: rpmdb/header.c:2472
 msgid "empty tag format"
 msgstr "¶ő¤ÎĄżĄ°ĄŐĄ©ˇĽĄŢĄĂĄČ"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2466
+#: rpmdb/header.c:2486
 msgid "empty tag name"
 msgstr "¶ő¤ÎĄżĄ°Ěľ"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2483
+#: rpmdb/header.c:2503
 msgid "unknown tag"
 msgstr "ÉÔĚŔ¤ĘĄżĄ°"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2510
+#: rpmdb/header.c:2530
 msgid "] expected at end of array"
 msgstr "ÇŰÎó¤Î¸ĺ¤Ë ] ¤¬´üÂÔ¤µ¤ě¤Ţ¤ą"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2528
+#: rpmdb/header.c:2545
 msgid "unexpected ]"
 msgstr "Í˝´ü¤»¤Ě ]"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2532
+#: rpmdb/header.c:2558
 msgid "unexpected }"
 msgstr "Í˝´ü¤»¤Ě }"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2601
+#: rpmdb/header.c:2624
 msgid "? expected in expression"
 msgstr "Ľ°Ăć¤Ç ? ¤¬´üÂÔ¤µ¤ě¤Ţ¤ą"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2610
+#: rpmdb/header.c:2633
 msgid "{ expected after ? in expression"
 msgstr "Ľ°Ăć¤Ç ? ¤Î¸ĺ¤Ë { ¤¬´üÂÔ¤µ¤ě¤Ţ¤ą"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2624 rpmdb/header.c:2671
+#: rpmdb/header.c:2647 rpmdb/header.c:2694
 msgid "} expected in expression"
 msgstr "Ľ°Ăć¤Ë } ¤¬´üÂÔ¤µ¤ě¤Ţ¤ą"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2634
+#: rpmdb/header.c:2657
 msgid ": expected following ? subexpression"
 msgstr "°Ę˛Ľ¤Î ? ĄµĄÖĽ°¤Î ¤Ë: ¤¬´üÂÔ¤µ¤ě¤Ţ¤ą"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2654
+#: rpmdb/header.c:2677
 msgid "{ expected after : in expression"
 msgstr "Ľ°Ăć¤Ç : ¤Î¸ĺ¤Ë { ¤¬´üÂÔ¤µ¤ě¤Ţ¤ą"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2681
+#: rpmdb/header.c:2704
 msgid "| expected at end of expression"
 msgstr "Ľ°¤Î˝Ş¤ę¤Ë | ¤¬´üÂÔ¤µ¤ě¤Ţ¤ą"
 
+#: rpmdb/header.c:2828
+msgid "(index out of range)"
+msgstr ""
+
+#: rpmdb/header.c:3132
+msgid "array iterator used with different sized arrays"
+msgstr ""
+
 #: rpmdb/poptDB.c:18
 msgid "initialize database"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index aa2fa5115..057053a6c 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.4\n"
-"POT-Creation-Date: 2002-12-27 19:22-0500\n"
+"POT-Creation-Date: 2002-12-28 14:25-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"
@@ -1418,7 +1418,7 @@ msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
 #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:405
-#: rpmdb/header.c:3237 rpmdb/header.c:3260 rpmdb/header.c:3284
+#: rpmdb/header.c:3327 rpmdb/header.c:3356 rpmdb/header.c:3380
 msgid "(not a number)"
 msgstr "(ĽýŔÚ°ˇ ľĆ´Ő´Ď´Ů)"
 
@@ -3188,75 +3188,83 @@ msgid "%s has too large or too small integer value, skipped\n"
 msgstr "%s(Ŕş)´Â łĘą« Ĺ©°ĹłŞ łĘą« ŔűŔş Á¤Ľö(int) °ŞŔÔ´Ď´Ů, »ý·«ÇŐ´Ď´Ů\n"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2408
+#: rpmdb/header.c:2428
 msgid "missing { after %"
 msgstr "'%' µÚżˇ '{' °ˇ ľř˝Ŕ´Ď´Ů"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2438
+#: rpmdb/header.c:2458
 msgid "missing } after %{"
 msgstr "'%{' µÚżˇ '}' °ˇ ľř˝Ŕ´Ď´Ů"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2452
+#: rpmdb/header.c:2472
 msgid "empty tag format"
 msgstr "ĹÂ±× Çü˝ÄŔĚ şńľîŔÖ˝Ŕ´Ď´Ů"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2466
+#: rpmdb/header.c:2486
 msgid "empty tag name"
 msgstr "ĹÂ±× Ŕ̸§ŔĚ şńľîŔÖ˝Ŕ´Ď´Ů"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2483
+#: rpmdb/header.c:2503
 msgid "unknown tag"
 msgstr "ľË Ľö ľř´Â ĹÂ±× ŔÔ´Ď´Ů"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2510
+#: rpmdb/header.c:2530
 msgid "] expected at end of array"
 msgstr "ąčż­ŔÇ łˇşÎşĐżˇ ']' °ˇ żÍľßÇŐ´Ď´Ů"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2528
+#: rpmdb/header.c:2545
 msgid "unexpected ]"
 msgstr "şŇÇĘżäÇŃ ']' °ˇ ŔÖ˝Ŕ´Ď´Ů"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2532
+#: rpmdb/header.c:2558
 msgid "unexpected }"
 msgstr "şŇÇĘżäÇŃ '}' °ˇ ŔÖ˝Ŕ´Ď´Ů"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2601
+#: rpmdb/header.c:2624
 msgid "? expected in expression"
 msgstr "ÇĄÇö˝Äżˇ '?' °ˇ żÍľßÇŐ´Ď´Ů"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2610
+#: rpmdb/header.c:2633
 msgid "{ expected after ? in expression"
 msgstr "ÇĄÇö˝ÄŔÇ '?' µÚżˇ '{' °ˇ żÍľßÇŐ´Ď´Ů"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2624 rpmdb/header.c:2671
+#: rpmdb/header.c:2647 rpmdb/header.c:2694
 msgid "} expected in expression"
 msgstr "ÇĄÇö˝Äżˇ '}' °ˇ żÍľßÇŐ´Ď´Ů"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2634
+#: rpmdb/header.c:2657
 msgid ": expected following ? subexpression"
 msgstr "'?' ÇĎşÎÇĄÇö˝Ä(subexpression) µÚżˇ ':' ŔĚ żÍľßÇŐ´Ď´Ů"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2654
+#: rpmdb/header.c:2677
 msgid "{ expected after : in expression"
 msgstr "ÇĄÇö˝ÄŔÇ ':' µÚżˇ '{' °ˇ żÍľßÇŐ´Ď´Ů"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2681
+#: rpmdb/header.c:2704
 msgid "| expected at end of expression"
 msgstr "ÇĄÇö˝ÄŔÇ łˇşÎşĐżˇ '|' °ˇ żÍľßÇŐ´Ď´Ů"
 
+#: rpmdb/header.c:2828
+msgid "(index out of range)"
+msgstr ""
+
+#: rpmdb/header.c:3132
+msgid "array iterator used with different sized arrays"
+msgstr ""
+
 #: rpmdb/poptDB.c:18
 msgid "initialize database"
 msgstr "µĄŔĚĹÍşŁŔĚ˝ş¸¦ ĂʱâČ­ ÇŐ´Ď´Ů"
diff --git a/po/no.po b/po/no.po
index 9bf67abf3..855c36de1 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-27 19:22-0500\n"
+"POT-Creation-Date: 2002-12-28 14:25-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"
@@ -1417,7 +1417,7 @@ msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
 #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:405
-#: rpmdb/header.c:3237 rpmdb/header.c:3260 rpmdb/header.c:3284
+#: rpmdb/header.c:3327 rpmdb/header.c:3356 rpmdb/header.c:3380
 msgid "(not a number)"
 msgstr ""
 
@@ -3166,75 +3166,83 @@ msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2408
+#: rpmdb/header.c:2428
 msgid "missing { after %"
 msgstr "mangler { etter %"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2438
+#: rpmdb/header.c:2458
 msgid "missing } after %{"
 msgstr "mangler } etter %{"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2452
+#: rpmdb/header.c:2472
 msgid "empty tag format"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2466
+#: rpmdb/header.c:2486
 msgid "empty tag name"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2483
+#: rpmdb/header.c:2503
 msgid "unknown tag"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2510
+#: rpmdb/header.c:2530
 msgid "] expected at end of array"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2528
+#: rpmdb/header.c:2545
 msgid "unexpected ]"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2532
+#: rpmdb/header.c:2558
 msgid "unexpected }"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2601
+#: rpmdb/header.c:2624
 msgid "? expected in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2610
+#: rpmdb/header.c:2633
 msgid "{ expected after ? in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2624 rpmdb/header.c:2671
+#: rpmdb/header.c:2647 rpmdb/header.c:2694
 msgid "} expected in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2634
+#: rpmdb/header.c:2657
 msgid ": expected following ? subexpression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2654
+#: rpmdb/header.c:2677
 msgid "{ expected after : in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2681
+#: rpmdb/header.c:2704
 msgid "| expected at end of expression"
 msgstr ""
 
+#: rpmdb/header.c:2828
+msgid "(index out of range)"
+msgstr ""
+
+#: rpmdb/header.c:3132
+msgid "array iterator used with different sized arrays"
+msgstr ""
+
 #: rpmdb/poptDB.c:18
 msgid "initialize database"
 msgstr "initier database"
diff --git a/po/pl.po b/po/pl.po
index 88135736f..77ed79a53 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-27 19:22-0500\n"
+"POT-Creation-Date: 2002-12-28 14:25-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"
@@ -1457,7 +1457,7 @@ msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
 #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:405
-#: rpmdb/header.c:3237 rpmdb/header.c:3260 rpmdb/header.c:3284
+#: rpmdb/header.c:3327 rpmdb/header.c:3356 rpmdb/header.c:3380
 msgid "(not a number)"
 msgstr "(nie jest liczb±)"
 
@@ -3257,75 +3257,83 @@ msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2408
+#: rpmdb/header.c:2428
 msgid "missing { after %"
 msgstr "brak { po %"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2438
+#: rpmdb/header.c:2458
 msgid "missing } after %{"
 msgstr "brak } po %{"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2452
+#: rpmdb/header.c:2472
 msgid "empty tag format"
 msgstr "pusty format etykiety"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2466
+#: rpmdb/header.c:2486
 msgid "empty tag name"
 msgstr "pusta nazwa etykiety"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2483
+#: rpmdb/header.c:2503
 msgid "unknown tag"
 msgstr "nieznana etykieta"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2510
+#: rpmdb/header.c:2530
 msgid "] expected at end of array"
 msgstr "spodziewany ] na końcu tablicy"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2528
+#: rpmdb/header.c:2545
 msgid "unexpected ]"
 msgstr "nie spodziewany ]"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2532
+#: rpmdb/header.c:2558
 msgid "unexpected }"
 msgstr "nie spodziewany }"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2601
+#: rpmdb/header.c:2624
 msgid "? expected in expression"
 msgstr "spodziewany ? w wyrażeniu"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2610
+#: rpmdb/header.c:2633
 msgid "{ expected after ? in expression"
 msgstr "spodziewany { po ? w wyrażeniu"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2624 rpmdb/header.c:2671
+#: rpmdb/header.c:2647 rpmdb/header.c:2694
 msgid "} expected in expression"
 msgstr "spodziewany } w wyrażeniu"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2634
+#: rpmdb/header.c:2657
 msgid ": expected following ? subexpression"
 msgstr "spodziewany : po podwyrażeniu ?"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2654
+#: rpmdb/header.c:2677
 msgid "{ expected after : in expression"
 msgstr "spodziewany { po : w wyrażeniu"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2681
+#: rpmdb/header.c:2704
 msgid "| expected at end of expression"
 msgstr "spodziewany | na końcu wyrażenia"
 
+#: rpmdb/header.c:2828
+msgid "(index out of range)"
+msgstr ""
+
+#: rpmdb/header.c:3132
+msgid "array iterator used with different sized arrays"
+msgstr ""
+
 #: rpmdb/poptDB.c:18
 msgid "initialize database"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 8b1c4028f..c14feaad6 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
-"POT-Creation-Date: 2002-12-27 19:22-0500\n"
+"POT-Creation-Date: 2002-12-28 14:25-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"
@@ -1432,7 +1432,7 @@ msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
 #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:405
-#: rpmdb/header.c:3237 rpmdb/header.c:3260 rpmdb/header.c:3284
+#: rpmdb/header.c:3327 rpmdb/header.c:3356 rpmdb/header.c:3380
 msgid "(not a number)"
 msgstr "(năo é um número)"
 
@@ -3199,75 +3199,83 @@ msgid "%s has too large or too small integer value, skipped\n"
 msgstr "O %s tem um valor inteiro demasiado elevado ou pequeno, foi ignorado\n"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2408
+#: rpmdb/header.c:2428
 msgid "missing { after %"
 msgstr "falta um { depois do %"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2438
+#: rpmdb/header.c:2458
 msgid "missing } after %{"
 msgstr "falta um } depois do %{"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2452
+#: rpmdb/header.c:2472
 msgid "empty tag format"
 msgstr "formato da opçăo em branco"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2466
+#: rpmdb/header.c:2486
 msgid "empty tag name"
 msgstr "nome da opçăo em branco"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2483
+#: rpmdb/header.c:2503
 msgid "unknown tag"
 msgstr "opçăo desconhecida"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2510
+#: rpmdb/header.c:2530
 msgid "] expected at end of array"
 msgstr "] esperado no fim do vector"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2528
+#: rpmdb/header.c:2545
 msgid "unexpected ]"
 msgstr "] inesperado"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2532
+#: rpmdb/header.c:2558
 msgid "unexpected }"
 msgstr "} inesperado"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2601
+#: rpmdb/header.c:2624
 msgid "? expected in expression"
 msgstr "esperado um ? na expressăo"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2610
+#: rpmdb/header.c:2633
 msgid "{ expected after ? in expression"
 msgstr "esperado um { a seguir ao ? na expressăo"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2624 rpmdb/header.c:2671
+#: rpmdb/header.c:2647 rpmdb/header.c:2694
 msgid "} expected in expression"
 msgstr "esperado um } na expressăo"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2634
+#: rpmdb/header.c:2657
 msgid ": expected following ? subexpression"
 msgstr "esperado um : a seguir ŕ sub-expressăo ?"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2654
+#: rpmdb/header.c:2677
 msgid "{ expected after : in expression"
 msgstr "esperado um { a seguir ao : na expressăo"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2681
+#: rpmdb/header.c:2704
 msgid "| expected at end of expression"
 msgstr "esperado um | no fim da expressăo"
 
+#: rpmdb/header.c:2828
+msgid "(index out of range)"
+msgstr ""
+
+#: rpmdb/header.c:3132
+msgid "array iterator used with different sized arrays"
+msgstr ""
+
 #: rpmdb/poptDB.c:18
 msgid "initialize database"
 msgstr "inicializar a base de dados"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index dce52d5a8..038bfabf5 100644
--- 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-27 19:22-0500\n"
+"POT-Creation-Date: 2002-12-28 14:25-0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -1568,7 +1568,7 @@ msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
 #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:405
-#: rpmdb/header.c:3237 rpmdb/header.c:3260 rpmdb/header.c:3284
+#: rpmdb/header.c:3327 rpmdb/header.c:3356 rpmdb/header.c:3380
 msgid "(not a number)"
 msgstr ""
 
@@ -3456,77 +3456,85 @@ msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2408
+#: rpmdb/header.c:2428
 msgid "missing { after %"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2438
+#: rpmdb/header.c:2458
 msgid "missing } after %{"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2452
+#: rpmdb/header.c:2472
 msgid "empty tag format"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2466
+#: rpmdb/header.c:2486
 msgid "empty tag name"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2483
+#: rpmdb/header.c:2503
 msgid "unknown tag"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2510
+#: rpmdb/header.c:2530
 msgid "] expected at end of array"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2528
+#: rpmdb/header.c:2545
 #, fuzzy
 msgid "unexpected ]"
 msgstr "fonte de pesquisa no esperado"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2532
+#: rpmdb/header.c:2558
 #, fuzzy
 msgid "unexpected }"
 msgstr "fonte de pesquisa no esperado"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2601
+#: rpmdb/header.c:2624
 msgid "? expected in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2610
+#: rpmdb/header.c:2633
 msgid "{ expected after ? in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2624 rpmdb/header.c:2671
+#: rpmdb/header.c:2647 rpmdb/header.c:2694
 msgid "} expected in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2634
+#: rpmdb/header.c:2657
 msgid ": expected following ? subexpression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2654
+#: rpmdb/header.c:2677
 msgid "{ expected after : in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2681
+#: rpmdb/header.c:2704
 msgid "| expected at end of expression"
 msgstr ""
 
+#: rpmdb/header.c:2828
+msgid "(index out of range)"
+msgstr ""
+
+#: rpmdb/header.c:3132
+msgid "array iterator used with different sized arrays"
+msgstr ""
+
 #: rpmdb/poptDB.c:18
 msgid "initialize database"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index e4dff34c8..0101c2247 100644
--- 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-27 19:22-0500\n"
+"POT-Creation-Date: 2002-12-28 14:25-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"
@@ -1390,7 +1390,7 @@ msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
 #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:405
-#: rpmdb/header.c:3237 rpmdb/header.c:3260 rpmdb/header.c:3284
+#: rpmdb/header.c:3327 rpmdb/header.c:3356 rpmdb/header.c:3380
 msgid "(not a number)"
 msgstr ""
 
@@ -3103,75 +3103,83 @@ msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2408
+#: rpmdb/header.c:2428
 msgid "missing { after %"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2438
+#: rpmdb/header.c:2458
 msgid "missing } after %{"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2452
+#: rpmdb/header.c:2472
 msgid "empty tag format"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2466
+#: rpmdb/header.c:2486
 msgid "empty tag name"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2483
+#: rpmdb/header.c:2503
 msgid "unknown tag"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2510
+#: rpmdb/header.c:2530
 msgid "] expected at end of array"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2528
+#: rpmdb/header.c:2545
 msgid "unexpected ]"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2532
+#: rpmdb/header.c:2558
 msgid "unexpected }"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2601
+#: rpmdb/header.c:2624
 msgid "? expected in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2610
+#: rpmdb/header.c:2633
 msgid "{ expected after ? in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2624 rpmdb/header.c:2671
+#: rpmdb/header.c:2647 rpmdb/header.c:2694
 msgid "} expected in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2634
+#: rpmdb/header.c:2657
 msgid ": expected following ? subexpression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2654
+#: rpmdb/header.c:2677
 msgid "{ expected after : in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2681
+#: rpmdb/header.c:2704
 msgid "| expected at end of expression"
 msgstr ""
 
+#: rpmdb/header.c:2828
+msgid "(index out of range)"
+msgstr ""
+
+#: rpmdb/header.c:3132
+msgid "array iterator used with different sized arrays"
+msgstr ""
+
 #: rpmdb/poptDB.c:18
 msgid "initialize database"
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index e16e54d26..6653be412 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-12-27 19:22-0500\n"
+"POT-Creation-Date: 2002-12-28 14:25-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"
@@ -1396,7 +1396,7 @@ msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
 #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:405
-#: rpmdb/header.c:3237 rpmdb/header.c:3260 rpmdb/header.c:3284
+#: rpmdb/header.c:3327 rpmdb/header.c:3356 rpmdb/header.c:3380
 msgid "(not a number)"
 msgstr ""
 
@@ -3109,75 +3109,83 @@ msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2408
+#: rpmdb/header.c:2428
 msgid "missing { after %"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2438
+#: rpmdb/header.c:2458
 msgid "missing } after %{"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2452
+#: rpmdb/header.c:2472
 msgid "empty tag format"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2466
+#: rpmdb/header.c:2486
 msgid "empty tag name"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2483
+#: rpmdb/header.c:2503
 msgid "unknown tag"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2510
+#: rpmdb/header.c:2530
 msgid "] expected at end of array"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2528
+#: rpmdb/header.c:2545
 msgid "unexpected ]"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2532
+#: rpmdb/header.c:2558
 msgid "unexpected }"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2601
+#: rpmdb/header.c:2624
 msgid "? expected in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2610
+#: rpmdb/header.c:2633
 msgid "{ expected after ? in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2624 rpmdb/header.c:2671
+#: rpmdb/header.c:2647 rpmdb/header.c:2694
 msgid "} expected in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2634
+#: rpmdb/header.c:2657
 msgid ": expected following ? subexpression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2654
+#: rpmdb/header.c:2677
 msgid "{ expected after : in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2681
+#: rpmdb/header.c:2704
 msgid "| expected at end of expression"
 msgstr ""
 
+#: rpmdb/header.c:2828
+msgid "(index out of range)"
+msgstr ""
+
+#: rpmdb/header.c:3132
+msgid "array iterator used with different sized arrays"
+msgstr ""
+
 #: rpmdb/poptDB.c:18
 msgid "initialize database"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 05253fdb6..6eaa5eb3d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-27 19:22-0500\n"
+"POT-Creation-Date: 2002-12-28 14:25-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"
@@ -1428,7 +1428,7 @@ msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr "ĎŰÉÂËÁ rpmtsOrder, ĎÓÔÁĚĎÓŘ %d ÜĚĹÍĹÎÔĎ×\n"
 
 #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:405
-#: rpmdb/header.c:3237 rpmdb/header.c:3260 rpmdb/header.c:3284
+#: rpmdb/header.c:3327 rpmdb/header.c:3356 rpmdb/header.c:3380
 msgid "(not a number)"
 msgstr "(ÎĹ ŢÉÓĚĎ)"
 
@@ -3156,75 +3156,83 @@ msgstr ""
 "%s ÉÍĹĹÔ ÓĚÉŰËĎÍ ÍÁĚŐŔ ÉĚÉ ÓĚÉŰËĎÍ ÂĎĚŘŰŐŔ ×ĹĚÉŢÉÎŐ integer, ĐŇĎĐŐÝĹÎĎ\n"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2408
+#: rpmdb/header.c:2428
 msgid "missing { after %"
 msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ \"{\" ĐĎÓĚĹ \"%\""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2438
+#: rpmdb/header.c:2458
 msgid "missing } after %{"
 msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ \"}\" ĐĎÓĚĹ \"%{\""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2452
+#: rpmdb/header.c:2472
 msgid "empty tag format"
 msgstr "ĐŐÓÔĎĘ ĆĎŇÍÁÔ ÔÜÇÁ"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2466
+#: rpmdb/header.c:2486
 msgid "empty tag name"
 msgstr "ĐŐÓÔĎĹ ÉÍŃ ÔÜÇÁ"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2483
+#: rpmdb/header.c:2503
 msgid "unknown tag"
 msgstr "ÎĹÉÚ×ĹÓÔÎŮĘ ÔÜÇ"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2510
+#: rpmdb/header.c:2530
 msgid "] expected at end of array"
 msgstr "× ËĎÎĂĹ ÍÁÓÓÉ×Á ĎÖÉÄÁĚÁÓŘ \"]\""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2528
+#: rpmdb/header.c:2545
 msgid "unexpected ]"
 msgstr "ÎĹĎÖÉÄÁÎÎÁŃ \"]\""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2532
+#: rpmdb/header.c:2558
 msgid "unexpected }"
 msgstr "ÎĹĎÖÉÄÁÎÎÁŃ \"}\""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2601
+#: rpmdb/header.c:2624
 msgid "? expected in expression"
 msgstr "× ×ŮŇÁÖĹÎÉÉ ĎÖÉÄÁĚĎÓŘ \"?\""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2610
+#: rpmdb/header.c:2633
 msgid "{ expected after ? in expression"
 msgstr "× ×ŮŇÁÖĹÎÉÉ ĐĎÓĚĹ \"?\" ĎÖÉÄÁĚĎÓŘ \"{\""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2624 rpmdb/header.c:2671
+#: rpmdb/header.c:2647 rpmdb/header.c:2694
 msgid "} expected in expression"
 msgstr "× ×ŮŇÁÖĹÎÉÉ ĎÖÉÄÁĚĎÓŘ \"}\""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2634
+#: rpmdb/header.c:2657
 msgid ": expected following ? subexpression"
 msgstr "× ×ŮŇÁÖĹÎÉÉ ĐĎÓĚĹ \"?\" ĎÖÉÄÁĚĎÓŘ \":\""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2654
+#: rpmdb/header.c:2677
 msgid "{ expected after : in expression"
 msgstr "× ×ŮŇÁÖĹÎÉÉ ĐĎÓĚĹ \":\" ĎÖÉÄÁĚĎÓŘ \"{\""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2681
+#: rpmdb/header.c:2704
 msgid "| expected at end of expression"
 msgstr "× ËĎÎĂĹ ×ŮŇÁÖĹÎÉŃ ĎÖÉÄÁĚÓŃ \"|\""
 
+#: rpmdb/header.c:2828
+msgid "(index out of range)"
+msgstr ""
+
+#: rpmdb/header.c:3132
+msgid "array iterator used with different sized arrays"
+msgstr ""
+
 #: rpmdb/poptDB.c:18
 msgid "initialize database"
 msgstr "ÉÎÉĂÉÁĚÉÚÉŇĎ×ÁÔŘ ÂÁÚŐ ÄÁÎÎŮČ"
diff --git a/po/sk.po b/po/sk.po
index f327d3972..5536f52fd 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-27 19:22-0500\n"
+"POT-Creation-Date: 2002-12-28 14:25-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"
@@ -1455,7 +1455,7 @@ msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
 #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:405
-#: rpmdb/header.c:3237 rpmdb/header.c:3260 rpmdb/header.c:3284
+#: rpmdb/header.c:3327 rpmdb/header.c:3356 rpmdb/header.c:3380
 msgid "(not a number)"
 msgstr "(nie je číslo)"
 
@@ -3253,75 +3253,83 @@ msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2408
+#: rpmdb/header.c:2428
 msgid "missing { after %"
 msgstr "chýbajúce { po %"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2438
+#: rpmdb/header.c:2458
 msgid "missing } after %{"
 msgstr "chýbajúce } po %{"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2452
+#: rpmdb/header.c:2472
 msgid "empty tag format"
 msgstr "prázdny tag formát"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2466
+#: rpmdb/header.c:2486
 msgid "empty tag name"
 msgstr "prázdne meno tagu"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2483
+#: rpmdb/header.c:2503
 msgid "unknown tag"
 msgstr "neznámy tag"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2510
+#: rpmdb/header.c:2530
 msgid "] expected at end of array"
 msgstr "] očakávané na konci poµa"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2528
+#: rpmdb/header.c:2545
 msgid "unexpected ]"
 msgstr "neočakávané ]"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2532
+#: rpmdb/header.c:2558
 msgid "unexpected }"
 msgstr "neočakávané }"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2601
+#: rpmdb/header.c:2624
 msgid "? expected in expression"
 msgstr "? očakávané vo výraze"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2610
+#: rpmdb/header.c:2633
 msgid "{ expected after ? in expression"
 msgstr "{ očakávané po ? vo výraze"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2624 rpmdb/header.c:2671
+#: rpmdb/header.c:2647 rpmdb/header.c:2694
 msgid "} expected in expression"
 msgstr "} očakávané vo výraze"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2634
+#: rpmdb/header.c:2657
 msgid ": expected following ? subexpression"
 msgstr ": očakávané po ? podvýraze"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2654
+#: rpmdb/header.c:2677
 msgid "{ expected after : in expression"
 msgstr "{ očakávané po : vo výraze"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2681
+#: rpmdb/header.c:2704
 msgid "| expected at end of expression"
 msgstr "| očakávené na konci výrazu"
 
+#: rpmdb/header.c:2828
+msgid "(index out of range)"
+msgstr ""
+
+#: rpmdb/header.c:3132
+msgid "array iterator used with different sized arrays"
+msgstr ""
+
 #: rpmdb/poptDB.c:18
 msgid "initialize database"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index e2c276b29..8a1c919fd 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.353 2002/12/28 00:24:51 jbj Exp $
+# $Id: sl.po,v 1.354 2002/12/28 19:31:55 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-27 19:22-0500\n"
+"POT-Creation-Date: 2002-12-28 14:25-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"
@@ -1458,7 +1458,7 @@ msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
 #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:405
-#: rpmdb/header.c:3237 rpmdb/header.c:3260 rpmdb/header.c:3284
+#: rpmdb/header.c:3327 rpmdb/header.c:3356 rpmdb/header.c:3380
 msgid "(not a number)"
 msgstr "(ni ątevilo)"
 
@@ -3258,75 +3258,83 @@ msgstr ""
 "ątevila, prezrto\n"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2408
+#: rpmdb/header.c:2428
 msgid "missing { after %"
 msgstr "manjkajoči { za %"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2438
+#: rpmdb/header.c:2458
 msgid "missing } after %{"
 msgstr "manjkajoči } za %{"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2452
+#: rpmdb/header.c:2472
 msgid "empty tag format"
 msgstr "oblika značke manjka"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2466
+#: rpmdb/header.c:2486
 msgid "empty tag name"
 msgstr "ime značke manjka"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2483
+#: rpmdb/header.c:2503
 msgid "unknown tag"
 msgstr "neznana značka"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2510
+#: rpmdb/header.c:2530
 msgid "] expected at end of array"
 msgstr "na koncu polja je pričakovan ]"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2528
+#: rpmdb/header.c:2545
 msgid "unexpected ]"
 msgstr "nepričakovan ]"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2532
+#: rpmdb/header.c:2558
 msgid "unexpected }"
 msgstr "nepričakovan }"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2601
+#: rpmdb/header.c:2624
 msgid "? expected in expression"
 msgstr "v izrazu je pričakovan ?"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2610
+#: rpmdb/header.c:2633
 msgid "{ expected after ? in expression"
 msgstr "v izrazu je za { pričakovan ?"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2624 rpmdb/header.c:2671
+#: rpmdb/header.c:2647 rpmdb/header.c:2694
 msgid "} expected in expression"
 msgstr "v izrazu je pričakovan }"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2634
+#: rpmdb/header.c:2657
 msgid ": expected following ? subexpression"
 msgstr "za podizrazom ? je pričakovano :"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2654
+#: rpmdb/header.c:2677
 msgid "{ expected after : in expression"
 msgstr "v izrazu je za : pričakovan {"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2681
+#: rpmdb/header.c:2704
 msgid "| expected at end of expression"
 msgstr "na koncu izraza je pričakovan |"
 
+#: rpmdb/header.c:2828
+msgid "(index out of range)"
+msgstr ""
+
+#: rpmdb/header.c:3132
+msgid "array iterator used with different sized arrays"
+msgstr ""
+
 #: rpmdb/poptDB.c:18
 msgid "initialize database"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index a6ea26966..05f0fdba6 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-27 19:22-0500\n"
+"POT-Creation-Date: 2002-12-28 14:25-0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1445,7 +1445,7 @@ msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
 #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:405
-#: rpmdb/header.c:3237 rpmdb/header.c:3260 rpmdb/header.c:3284
+#: rpmdb/header.c:3327 rpmdb/header.c:3356 rpmdb/header.c:3380
 msgid "(not a number)"
 msgstr "(nije broj)"
 
@@ -3245,77 +3245,85 @@ msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2408
+#: rpmdb/header.c:2428
 msgid "missing { after %"
 msgstr "nedostaje { posle %"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2438
+#: rpmdb/header.c:2458
 msgid "missing } after %{"
 msgstr "nedostaje } posle %"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2452
+#: rpmdb/header.c:2472
 msgid "empty tag format"
 msgstr "prazan 'tag' format'"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2466
+#: rpmdb/header.c:2486
 msgid "empty tag name"
 msgstr "prazno ime tag-a"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2483
+#: rpmdb/header.c:2503
 msgid "unknown tag"
 msgstr "nepoznat tag"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2510
+#: rpmdb/header.c:2530
 msgid "] expected at end of array"
 msgstr "] očekivano na kraju niza"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2528
+#: rpmdb/header.c:2545
 msgid "unexpected ]"
 msgstr "neočekivano ]"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2532
+#: rpmdb/header.c:2558
 msgid "unexpected }"
 msgstr "neočekivano }"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2601
+#: rpmdb/header.c:2624
 msgid "? expected in expression"
 msgstr "očekivan znak ? u izrazu"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2610
+#: rpmdb/header.c:2633
 #, fuzzy
 msgid "{ expected after ? in expression"
 msgstr "{ očekivano posle ? u izrazu"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2624 rpmdb/header.c:2671
+#: rpmdb/header.c:2647 rpmdb/header.c:2694
 msgid "} expected in expression"
 msgstr "} očekivano u izrazu"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2634
+#: rpmdb/header.c:2657
 msgid ": expected following ? subexpression"
 msgstr "očekivano : praćeno ? podizrazom"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2654
+#: rpmdb/header.c:2677
 #, fuzzy
 msgid "{ expected after : in expression"
 msgstr "{ očekivano posle : u izrazu"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2681
+#: rpmdb/header.c:2704
 msgid "| expected at end of expression"
 msgstr "| očekivano na kraju izraza"
 
+#: rpmdb/header.c:2828
+msgid "(index out of range)"
+msgstr ""
+
+#: rpmdb/header.c:3132
+msgid "array iterator used with different sized arrays"
+msgstr ""
+
 #: rpmdb/poptDB.c:18
 msgid "initialize database"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 2cea73a25..eb8db36c4 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.1\n"
-"POT-Creation-Date: 2002-12-27 19:22-0500\n"
+"POT-Creation-Date: 2002-12-28 14:25-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"
@@ -1414,7 +1414,7 @@ msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr "rpmtsOrder misslyckades, %d element ĺterstĺr\n"
 
 #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:405
-#: rpmdb/header.c:3237 rpmdb/header.c:3260 rpmdb/header.c:3284
+#: rpmdb/header.c:3327 rpmdb/header.c:3356 rpmdb/header.c:3380
 msgid "(not a number)"
 msgstr "(inte ett tal)"
 
@@ -3139,75 +3139,83 @@ msgid "%s has too large or too small integer value, skipped\n"
 msgstr "%s har för stort eller för litet heltalsvärde, hoppar över\n"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2408
+#: rpmdb/header.c:2428
 msgid "missing { after %"
 msgstr "{ saknas efter %"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2438
+#: rpmdb/header.c:2458
 msgid "missing } after %{"
 msgstr "} saknas efter %{"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2452
+#: rpmdb/header.c:2472
 msgid "empty tag format"
 msgstr "tomt taggformat"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2466
+#: rpmdb/header.c:2486
 msgid "empty tag name"
 msgstr "tomt taggnamn"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2483
+#: rpmdb/header.c:2503
 msgid "unknown tag"
 msgstr "okänd tagg"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2510
+#: rpmdb/header.c:2530
 msgid "] expected at end of array"
 msgstr "] förväntades vid slutet pĺ vektor"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2528
+#: rpmdb/header.c:2545
 msgid "unexpected ]"
 msgstr "oväntad ]"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2532
+#: rpmdb/header.c:2558
 msgid "unexpected }"
 msgstr "oväntad }"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2601
+#: rpmdb/header.c:2624
 msgid "? expected in expression"
 msgstr "? förväntades i uttryck"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2610
+#: rpmdb/header.c:2633
 msgid "{ expected after ? in expression"
 msgstr "{ förväntades efter ? i uttryck"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2624 rpmdb/header.c:2671
+#: rpmdb/header.c:2647 rpmdb/header.c:2694
 msgid "} expected in expression"
 msgstr "} förväntades i uttryck"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2634
+#: rpmdb/header.c:2657
 msgid ": expected following ? subexpression"
 msgstr ": förväntades efter ? i deluttryck"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2654
+#: rpmdb/header.c:2677
 msgid "{ expected after : in expression"
 msgstr "{ förväntades efter : i uttryck"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2681
+#: rpmdb/header.c:2704
 msgid "| expected at end of expression"
 msgstr "| förväntades vid slutet pĺ uttryck"
 
+#: rpmdb/header.c:2828
+msgid "(index out of range)"
+msgstr ""
+
+#: rpmdb/header.c:3132
+msgid "array iterator used with different sized arrays"
+msgstr ""
+
 #: rpmdb/poptDB.c:18
 msgid "initialize database"
 msgstr "initiera databas"
diff --git a/po/tr.po b/po/tr.po
index e6d4e1dfc..4ec59a61d 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-27 19:22-0500\n"
+"POT-Creation-Date: 2002-12-28 14:25-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"
@@ -1445,7 +1445,7 @@ msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
 #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:405
-#: rpmdb/header.c:3237 rpmdb/header.c:3260 rpmdb/header.c:3284
+#: rpmdb/header.c:3327 rpmdb/header.c:3356 rpmdb/header.c:3380
 msgid "(not a number)"
 msgstr "(bir sayý deđil)"
 
@@ -3211,75 +3211,83 @@ msgid "%s has too large or too small integer value, skipped\n"
 msgstr "%s ya çok büyük ya da çok küçük 'integer' deđer içeriyor, atlandý\n"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2408
+#: rpmdb/header.c:2428
 msgid "missing { after %"
 msgstr "%% den sonraki { yok"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2438
+#: rpmdb/header.c:2458
 msgid "missing } after %{"
 msgstr "%%{ den sonraki } yok"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2452
+#: rpmdb/header.c:2472
 msgid "empty tag format"
 msgstr "etiket biçemi boţ"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2466
+#: rpmdb/header.c:2486
 msgid "empty tag name"
 msgstr "etiket ismi boţ"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2483
+#: rpmdb/header.c:2503
 msgid "unknown tag"
 msgstr "bilinmeyen etiket"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2510
+#: rpmdb/header.c:2530
 msgid "] expected at end of array"
 msgstr "dizinin sonunda ] gerekli"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2528
+#: rpmdb/header.c:2545
 msgid "unexpected ]"
 msgstr "beklenmeyen ]"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2532
+#: rpmdb/header.c:2558
 msgid "unexpected }"
 msgstr "beklenmeyen }"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2601
+#: rpmdb/header.c:2624
 msgid "? expected in expression"
 msgstr "ifade içerisinde ? gerekli"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2610
+#: rpmdb/header.c:2633
 msgid "{ expected after ? in expression"
 msgstr "ifade içerisinde ? dan sonra { gerekli"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2624 rpmdb/header.c:2671
+#: rpmdb/header.c:2647 rpmdb/header.c:2694
 msgid "} expected in expression"
 msgstr "ifade içinde } gerekli"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2634
+#: rpmdb/header.c:2657
 msgid ": expected following ? subexpression"
 msgstr "? alt ifadesinden sonra : gerekli"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2654
+#: rpmdb/header.c:2677
 msgid "{ expected after : in expression"
 msgstr "ifade içersinde : den sonra { gerekli"
 
 #. @-observertrans -readonlytrans@
-#: rpmdb/header.c:2681
+#: rpmdb/header.c:2704
 msgid "| expected at end of expression"
 msgstr "ifadenin sonunda | gerekli"
 
+#: rpmdb/header.c:2828
+msgid "(index out of range)"
+msgstr ""
+
+#: rpmdb/header.c:3132
+msgid "array iterator used with different sized arrays"
+msgstr ""
+
 #: rpmdb/poptDB.c:18
 msgid "initialize database"
 msgstr "veritabanýný baţlangýç durumuna getirir"
diff --git a/rpm.spec.in b/rpm.spec.in
index 650aa8b2f..475b5f63f 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -15,7 +15,7 @@ Name: rpm
 %define version @VERSION@
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 0.42
+Release: 0.44
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 Copyright: GPL
@@ -232,9 +232,10 @@ exit 0
 %files
 %defattr(-,root,root)
 %doc RPM-PGP-KEY RPM-GPG-KEY BETA-GPG-KEY CHANGES GROUPS doc/manual/[a-z]*
-%pubkey RPM-PGP-KEY
-%pubkey RPM-GPG-KEY
-%pubkey BETA-GPG-KEY
+# XXX comment these lines out if building with rpm that knows not %pubkey attr
+#%pubkey RPM-PGP-KEY
+#%pubkey RPM-GPG-KEY
+#%pubkey BETA-GPG-KEY
 %attr(0755, @RPMUSER@, @RPMGROUP@)	/bin/rpm
 
 %ifos linux
@@ -458,6 +459,9 @@ exit 0
 %{__prefix}/include/popt.h
 
 %changelog
+* Sat Dec 28 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.44
+- error if querying with iterator on different sized arrays.
+
 * Fri Dec 27 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.42
 - add BETA-GPG-KEY (but not in headers using %%pubkey yet).
 - disable perl module magic rule.
diff --git a/rpmdb/header.c b/rpmdb/header.c
index 1f4464fc1..fe4f619e8 100644
--- a/rpmdb/header.c
+++ b/rpmdb/header.c
@@ -26,7 +26,7 @@ int _hdr_debug = 0;
 /*@access entryInfo @*/
 /*@access indexEntry @*/
 
-/*@access extensionCache @*/
+/*@access rpmec @*/
 /*@access sprintfTag @*/
 /*@access sprintfToken @*/
 /*@access HV_t @*/
@@ -604,6 +604,9 @@ static int regionSwab(/*@null@*/ indexEntry entry, int il, int dl,
 }
 
 /** \ingroup header
+ * @param h		header
+ * @retval *lengthPtr	no. bytes in unloaded header blob
+ * @return		unloaded header blob (NULL on error)
  */
 static /*@only@*/ /*@null@*/ void * doHeaderUnload(Header h,
 		/*@out@*/ int * lengthPtr)
@@ -2228,6 +2231,7 @@ freeFormat( /*@only@*/ /*@null@*/ sprintfToken format, int num)
     int i;
 
     if (format == NULL) return NULL;
+
     for (i = 0; i < num; i++) {
 	switch (format[i].type) {
 	case PTOK_ARRAY:
@@ -2288,7 +2292,7 @@ static void findTag(char * name, const headerTagTableEntry tags,
     ext = extensions;
     while (ext->type != HEADER_EXT_LAST) {
 	if (ext->name != NULL && ext->type == HEADER_EXT_TAG
-	&& !xstrcasecmp(ext->name, tagname))
+	 && !xstrcasecmp(ext->name, tagname))
 	    break;
 
 	if (ext->type == HEADER_EXT_MORE)
@@ -2314,6 +2318,16 @@ static void findTag(char * name, const headerTagTableEntry tags,
 }
 
 /* forward ref */
+/**
+ * @param token
+ * @param str
+ * @param tags
+ * @param extensions
+ * @retval *endPtr
+ * @param state
+ * @retval *errmsg	error message (if any)
+ * @return		0 on success
+ */
 static int parseExpression(sprintfToken token, char * str, 
 		const headerTagTableEntry tags, 
 		const headerSprintfExtension extensions,
@@ -2322,6 +2336,15 @@ static int parseExpression(sprintfToken token, char * str,
 	/*@requires maxSet(endPtr) >= 0 /\ maxSet(errmsg) >= 0 @*/;
 
 /**
+ * @param str
+ * @param tags
+ * @param extensions
+ * @retval *formatPtr
+ * @retval *numTokensPtr
+ * @retval *endPtr
+ * @param state
+ * @retval *errmsg	error message (if any)
+ * @return		0 on success
  */
 /*@-boundswrite@*/
 static int parseFormat(/*@null@*/ char * str, const headerTagTableEntry tags,
@@ -2368,11 +2391,8 @@ static int parseFormat(/*@null@*/ char * str, const headerTagTableEntry tags,
 		    dst = format[currToken].u.string.string = start;
 		    /*@=temptrans =assignexpose@*/
 		}
-
 		start++;
-
 		*dst++ = *start++;
-
 		/*@switchbreak@*/ break;
 	    } 
 
@@ -2520,18 +2540,23 @@ static int parseFormat(/*@null@*/ char * str, const headerTagTableEntry tags,
 	    /*@switchbreak@*/ break;
 
 	case ']':
+	    if (state != PARSER_IN_ARRAY) {
+		/*@-observertrans -readonlytrans@*/
+		if (errmsg) *errmsg = _("unexpected ]");
+		/*@=observertrans =readonlytrans@*/
+		format = freeFormat(format, numTokens);
+		return 1;
+	    }
+	    *start++ = '\0';
+	    if (endPtr) *endPtr = start;
+	    done = 1;
+	    /*@switchbreak@*/ break;
+
 	case '}':
-	    if ((*start == ']' && state != PARSER_IN_ARRAY) ||
-	        (*start == '}' && state != PARSER_IN_EXPR)) {
-		if (*start == ']') {
-		    /*@-observertrans -readonlytrans@*/
-		    if (errmsg) *errmsg = _("unexpected ]");
-		    /*@=observertrans =readonlytrans@*/
-		} else {
-		    /*@-observertrans -readonlytrans@*/
-		    if (errmsg) *errmsg = _("unexpected }");
-		    /*@=observertrans =readonlytrans@*/
-		}
+	    if (state != PARSER_IN_EXPR) {
+		/*@-observertrans -readonlytrans@*/
+		if (errmsg) *errmsg = _("unexpected }");
+		/*@=observertrans =readonlytrans@*/
 		format = freeFormat(format, numTokens);
 		return 1;
 	    }
@@ -2578,8 +2603,6 @@ static int parseFormat(/*@null@*/ char * str, const headerTagTableEntry tags,
 }
 /*@=boundswrite@*/
 
-/**
- */
 /*@-boundswrite@*/
 static int parseExpression(sprintfToken token, char * str, 
 		const headerTagTableEntry tags, 
@@ -2712,44 +2735,55 @@ static int parseExpression(sprintfToken token, char * str,
 /*@=boundswrite@*/
 
 /**
- * @param h
+ * @param h		header
  * @param fn
- * @retval typeptr
- * @retval data
- * @retval countptr
- * @param ext
+ * @retval *typeptr
+ * @retval *data
+ * @retval *countptr
+ * @param ec		extension cache
  * @return		0 on success, 1 on failure
  */
 static int getExtension(Header h, headerTagTagFunction fn,
 		/*@out@*/ hTYP_t typeptr,
 		/*@out@*/ hPTR_t * data,
 		/*@out@*/ hCNT_t countptr,
-		extensionCache ext)
+		rpmec ec)
 	/*@modifies *typeptr, *data, *countptr, ext @*/
 	/*@requires maxSet(typeptr) >= 0 /\ maxSet(data) >= 0
 		/\ maxSet(countptr) >= 0 @*/
 {
-    if (!ext->avail) {
-	if (fn(h, &ext->type, &ext->data, &ext->count, &ext->freeit))
+    if (!ec->avail) {
+	if (fn(h, &ec->type, &ec->data, &ec->count, &ec->freeit))
 	    return 1;
-	ext->avail = 1;
+	ec->avail = 1;
     }
 
-    if (typeptr) *typeptr = ext->type;
-    if (data) *data = ext->data;
-    if (countptr) *countptr = ext->count;
+    if (typeptr) *typeptr = ec->type;
+    if (data) *data = ec->data;
+    if (countptr) *countptr = ec->count;
 
     return 0;
 }
 
 /**
- */
-/*@observer@*/
+ * @param tag
+ * @param h		header
+ * @param etensions
+ * @param ec		extension cache
+ * @param element
+ * @retval *valp
+ * @retval *vallenp
+ * @retval *allocedp
+ * @retval *errmsg	error message (if any)
+ * @return		end of formatted string (NULL on error)
+ */
+/*@observer@*/ /*@null@*/
 static char * formatValue(sprintfTag tag, Header h, 
 		const headerSprintfExtension extensions,
-		extensionCache extCache, int element,
-		char ** valp, int * vallenp, int * allocedp)
-	/*@modifies extCache, *valp, *vallenp, *allocedp @*/
+		rpmec ec, int element,
+		char ** valp, int * vallenp, int * allocedp,
+		/*@null@*/ /*@out@*/ errmsg_t * errmsg)
+	/*@modifies ec, *valp, *vallenp, *allocedp, *errmsg @*/
 	/*@requires maxSet(valp) >= 0 /\ maxSet(vallenp) >= 0
 		/\ maxSet(allocedp) >= 0 @*/
 {
@@ -2770,8 +2804,7 @@ static char * formatValue(sprintfTag tag, Header h,
     /*@-branchstate@*/
     if (tag->ext) {
 /*@-boundswrite@*/
-	if (getExtension(h, tag->ext, &type, &data, &count, 
-			 extCache + tag->extNum))
+	if (getExtension(h, tag->ext, &type, &data, &count, ec + tag->extNum))
 	{
 	    count = 1;
 	    type = RPM_STRING_TYPE;	
@@ -2785,8 +2818,22 @@ static char * formatValue(sprintfTag tag, Header h,
 	    type = RPM_STRING_TYPE;	
 	    data = "(none)";
 	}
-/*@=boundswrite@*/
 
+	/* XXX this test is unnecessary, array sizes are checked */
+	switch (type) {
+	default:
+	    if (element >= count) {
+		data = headerFreeData(data, type);
+		if (errmsg)
+		    errmsg = _("(index out of range)");
+		return NULL;
+	    }
+	    break;
+	case RPM_BIN_TYPE:
+	case RPM_STRING_TYPE:
+	    break;
+	}
+/*@=boundswrite@*/
 	datafree = 1;
     }
     /*@=branchstate@*/
@@ -2844,10 +2891,6 @@ static char * formatValue(sprintfTag tag, Header h,
 	    /*@=formatconst@*/
 	}
 
-	/*@-observertrans -modobserver@*/
-	if (datafree) data = _free(data);
-	/*@=observertrans =modobserver@*/
-
 	break;
 
     case RPM_STRING_TYPE:
@@ -2935,6 +2978,11 @@ static char * formatValue(sprintfTag tag, Header h,
     }
     /*@=branchstate@*/
 
+    /*@-observertrans -modobserver@*/
+    if (datafree)
+	data = headerFreeData(data, type);
+    /*@=observertrans =modobserver@*/
+
     /*@-branchstate@*/
     if (val && need > 0) {
 	if (((*vallenp) + need) >= (*allocedp)) {
@@ -2960,21 +3008,33 @@ static char * formatValue(sprintfTag tag, Header h,
 }
 
 /**
+ * @param h		header
+ * @param token
+ * @param extensions
+ * @param ec		extension cache
+ * @param element
+ * @retval *valp
+ * @retval *vallenp
+ * @retval *allocedp
+ * @retval *errmsg	error message (if any)
+ * @return		end of formatted string (NULL on error)
  */
 /*@observer@*/
 static char * singleSprintf(Header h, sprintfToken token,
 		const headerSprintfExtension extensions,
-		extensionCache extCache, int element,
-		char ** valp, int * vallenp, int * allocedp)
-	/*@modifies h, extCache, *valp, *vallenp, *allocedp @*/
+		rpmec ec, int element,
+		char ** valp, int * vallenp, int * allocedp,
+		/*@null@*/ /*@out@*/ errmsg_t * errmsg)
+	/*@modifies h, ec, *valp, *vallenp, *allocedp, *errmsg @*/
 	/*@requires maxSet(valp) >= 0 /\ maxSet(vallenp) >= 0
 		/\ maxSet(allocedp) >= 0 @*/
 {
     char * t, * te;
     int i, j;
     int numElements;
-    int type;
-    sprintfToken condFormat;
+    int_32 type;
+    int_32 count;
+    sprintfToken spft;
     int condNumFormats;
     int need;
 
@@ -3006,23 +3066,24 @@ static char * singleSprintf(Header h, sprintfToken token,
 
     case PTOK_TAG:
 	t = (*valp) + (*vallenp);
-	te = formatValue(&token->u.tag, h, extensions, extCache,
+	te = formatValue(&token->u.tag, h, extensions, ec,
 			(token->u.tag.justOne ? 0 : element),
-			valp, vallenp, allocedp);
+			valp, vallenp, allocedp, errmsg);
+	if (te == NULL)
+	    return NULL;
 	break;
 
     case PTOK_COND:
-	if (token->u.cond.tag.ext ||
-	    headerIsEntry(h, token->u.cond.tag.tag)) {
-	    condFormat = token->u.cond.ifFormat;
+	if (token->u.cond.tag.ext || headerIsEntry(h, token->u.cond.tag.tag)) {
+	    spft = token->u.cond.ifFormat;
 	    condNumFormats = token->u.cond.numIfTokens;
 	} else {
-	    condFormat = token->u.cond.elseFormat;
+	    spft = token->u.cond.elseFormat;
 	    condNumFormats = token->u.cond.numElseTokens;
 	}
 
 	need = condNumFormats * 20;
-	if (condFormat == NULL || need <= 0) break;
+	if (spft == NULL || need <= 0) break;
 	if (((*vallenp) + need) >= (*allocedp)) {
 	    if ((*allocedp) <= need)
 		(*allocedp) += need;
@@ -3035,35 +3096,48 @@ static char * singleSprintf(Header h, sprintfToken token,
 	}
 
 	t = (*valp) + (*vallenp);
-	for (i = 0; i < condNumFormats; i++)
-	    te = singleSprintf(h, condFormat + i, extensions, extCache,
-				element, valp, vallenp, allocedp);
+	for (i = 0; i < condNumFormats; i++, spft++) {
+	    te = singleSprintf(h, spft, extensions, ec,
+				element, valp, vallenp, allocedp, errmsg);
+	    if (te == NULL)
+		return NULL;
+	}
 	break;
 
     case PTOK_ARRAY:
 	numElements = -1;
-	for (i = 0; i < token->u.array.numTokens; i++) {
-	    if (token->u.array.format[i].type != PTOK_TAG ||
-		token->u.array.format[i].u.tag.arrayCount ||
-		token->u.array.format[i].u.tag.justOne) continue;
+	spft = token->u.array.format;
+	for (i = 0; i < token->u.array.numTokens; i++, spft++) {
+	    if (spft->type != PTOK_TAG ||
+		spft->u.tag.arrayCount ||
+		spft->u.tag.justOne) continue;
 
-	    if (token->u.array.format[i].u.tag.ext) {
-		const void * data;
+	    if (spft->u.tag.ext) {
 /*@-boundswrite@*/
-		if (getExtension(h, token->u.array.format[i].u.tag.ext,
-				 &type, &data, &numElements, 
-				 extCache + 
-				   token->u.array.format[i].u.tag.extNum))
+		if (getExtension(h, spft->u.tag.ext, &type, NULL, &count, 
+				 ec + spft->u.tag.extNum))
 		     continue;
 /*@=boundswrite@*/
 	    } else {
 /*@-boundswrite@*/
-		if (!headerGetEntry(h, token->u.array.format[i].u.tag.tag, 
-				    &type, NULL, &numElements))
+		if (!headerGetEntry(h, spft->u.tag.tag, &type, NULL, &count))
 		    continue;
 /*@=boundswrite@*/
 	    } 
-	    /*@loopbreak@*/ break;
+	    if (numElements > 1 && count != numElements)
+	    switch (type) {
+	    default:
+		if (errmsg)
+		    *errmsg =
+			_("array iterator used with different sized arrays");
+		return NULL;
+		/*@notreached@*/ break;
+	    case RPM_BIN_TYPE:
+	    case RPM_STRING_TYPE:
+		break;
+	    }
+	    if (count > numElements)
+		numElements = count;
 	}
 
 	if (numElements == -1) {
@@ -3099,10 +3173,13 @@ static char * singleSprintf(Header h, sprintfToken token,
 
 	    t = (*valp) + (*vallenp);
 	    for (j = 0; j < numElements; j++) {
-		for (i = 0; i < token->u.array.numTokens; i++)
-		    te = singleSprintf(h, token->u.array.format + i, 
-					extensions, extCache, j,
-					valp, vallenp, allocedp);
+		spft = token->u.array.format;
+		for (i = 0; i < token->u.array.numTokens; i++, spft++) {
+		    te = singleSprintf(h, spft, extensions, ec, j,
+					valp, vallenp, allocedp, errmsg);
+		    if (te == NULL)
+			return NULL;
+		}
 	    }
 	}
 	break;
@@ -3112,12 +3189,16 @@ static char * singleSprintf(Header h, sprintfToken token,
 }
 
 /**
+ * Create an extension cache.
+ * @param extensions
+ * @return		new extension cache
  */
-static /*@only@*/ extensionCache
-allocateExtensionCache(const headerSprintfExtension extensions)
+static /*@only@*/ rpmec
+rpmecNew(const headerSprintfExtension extensions)
 	/*@*/
 {
     headerSprintfExtension ext = extensions;
+    rpmec ec;
     int i = 0;
 
     while (ext->type != HEADER_EXT_LAST) {
@@ -3127,26 +3208,26 @@ allocateExtensionCache(const headerSprintfExtension extensions)
 	else
 	    ext++;
     }
-
-    /*@-sizeoftype@*/
-    return xcalloc(i, sizeof(struct extensionCache_s));
-    /*@=sizeoftype@*/
+    ec = xcalloc(i, sizeof(*ec));
+    return ec;
 }
 
 /**
+ * Destroy an extension cache.
+ * @param extensions
+ * @param ec		extension cache
  * @return		NULL always
  */
-static /*@null@*/ extensionCache
-freeExtensionCache(const headerSprintfExtension extensions,
-		        /*@only@*/ extensionCache cache)
-	/*@*/
+static /*@null@*/ rpmec
+rpmecFree(const headerSprintfExtension extensions, /*@only@*/ rpmec ec)
+	/*@modifies ec @*/
 {
     headerSprintfExtension ext = extensions;
     int i = 0;
 
     while (ext->type != HEADER_EXT_LAST) {
 /*@-boundswrite@*/
-	if (cache[i].freeit) cache[i].data = _free(cache[i].data);
+	if (ec[i].freeit) ec[i].data = _free(ec[i].data);
 /*@=boundswrite@*/
 
 	i++;
@@ -3156,7 +3237,7 @@ freeExtensionCache(const headerSprintfExtension extensions,
 	    ext++;
     }
 
-    cache = _free(cache);
+    ec = _free(ec);
     return NULL;
 }
 
@@ -3168,7 +3249,7 @@ freeExtensionCache(const headerSprintfExtension extensions,
  * @param fmt		format to use
  * @param tbltags	array of tag name/value pairs
  * @param extensions	chained table of formatting extensions.
- * @retval errmsg	error message (if any)
+ * @retval *errmsg	error message (if any)
  * @return		formatted output string (malloc'ed)
  */
 static /*@only@*/ /*@null@*/
@@ -3178,11 +3259,11 @@ char * headerSprintf(Header h, const char * fmt,
 		     /*@null@*/ /*@out@*/ errmsg_t * errmsg)
 	/*@modifies *errmsg @*/
 {
-    /*@-castexpose@*/	/* FIX: legacy API shouldn't change. */
+/*@-castexpose@*/	/* FIX: legacy API shouldn't change. */
     headerSprintfExtension exts = (headerSprintfExtension) extensions;
     headerTagTableEntry tags = (headerTagTableEntry) tbltags;
-    /*@=castexpose@*/
-    char * t;
+/*@=castexpose@*/
+    char * te;
     char * fmtString;
     sprintfToken format;
     int numTokens;
@@ -3190,42 +3271,51 @@ char * headerSprintf(Header h, const char * fmt,
     int vallen = 0;
     int alloced = 0;
     int i;
-    extensionCache extCache;
+    rpmec ec;
  
     /*fmtString = escapeString(fmt);*/
     fmtString = xstrdup(fmt);
    
 /*@-boundswrite@*/
     if (parseFormat(fmtString, tags, exts, &format, &numTokens, 
-		    NULL, PARSER_BEGIN, errmsg)) {
-	fmtString = _free(fmtString);
-	return NULL;
-    }
+		    NULL, PARSER_BEGIN, errmsg))
+	goto exit;
 /*@=boundswrite@*/
 
-    extCache = allocateExtensionCache(exts);
+    ec = rpmecNew(exts);
 
     val = xstrdup("");
     for (i = 0; i < numTokens; i++) {
 /*@-boundswrite@*/
 	/*@-mods@*/
-	t = singleSprintf(h, format + i, exts, extCache, 0,
-		&val, &vallen, &alloced);
+	te = singleSprintf(h, format + i, exts, ec, 0,
+		&val, &vallen, &alloced, errmsg);
 	/*@=mods@*/
+	if (te == NULL) {
+	    val = _free(val);
+	    break;
+	}
 /*@=boundswrite@*/
     }
 
     if (val != NULL && vallen < alloced)
 	val = xrealloc(val, vallen+1);	
 
-    fmtString = _free(fmtString);
-    extCache = freeExtensionCache(exts, extCache);
+    ec = rpmecFree(exts, ec);
     format = freeFormat(format, numTokens);
 
+exit:
+    fmtString = _free(fmtString);
     return val;
 }
 
 /**
+ * @param type		tag type
+ * @param data		tag value
+ * @param formatPrefix	sprintf format string
+ * @param padding	no. additional bytes needed by format string
+ * @param element	(unused)
+ * @return		formatted string
  */
 static char * octalFormat(int_32 type, hPTR_t data, 
 		char * formatPrefix, int padding, /*@unused@*/int element)
@@ -3249,6 +3339,12 @@ static char * octalFormat(int_32 type, hPTR_t data,
 }
 
 /**
+ * @param type		tag type
+ * @param data		tag value
+ * @param formatPrefix	sprintf format string
+ * @param padding	no. additional bytes needed by format string
+ * @param element	(unused)
+ * @return		formatted string
  */
 static char * hexFormat(int_32 type, hPTR_t data, 
 		char * formatPrefix, int padding, /*@unused@*/int element)
@@ -3307,6 +3403,12 @@ static char * realDateFormat(int_32 type, hPTR_t data,
 }
 
 /**
+ * @param type		tag type
+ * @param data		tag value
+ * @param formatPrefix	sprintf format string
+ * @param padding	no. additional bytes needed by format string
+ * @param element	(unused)
+ * @return		formatted string
  */
 static char * dateFormat(int_32 type, hPTR_t data, 
 		         char * formatPrefix, int padding, int element)
@@ -3316,6 +3418,12 @@ static char * dateFormat(int_32 type, hPTR_t data,
 }
 
 /**
+ * @param type		tag type
+ * @param data		tag value
+ * @param formatPrefix	sprintf format string
+ * @param padding	no. additional bytes needed by format string
+ * @param element	(unused)
+ * @return		formatted string
  */
 static char * dayFormat(int_32 type, hPTR_t data, 
 		         char * formatPrefix, int padding, int element)
@@ -3326,6 +3434,12 @@ static char * dayFormat(int_32 type, hPTR_t data,
 }
 
 /**
+ * @param type		tag type
+ * @param data		tag value
+ * @param formatPrefix	sprintf format string
+ * @param padding	no. additional bytes needed by format string
+ * @param element	(unused)
+ * @return		formatted string
  */
 static char * shescapeFormat(int_32 type, hPTR_t data, 
 		char * formatPrefix, int padding, /*@unused@*/int element)
diff --git a/rpmdb/header.h b/rpmdb/header.h
index 1abdbc90c..f5d14bae1 100644
--- a/rpmdb/header.h
+++ b/rpmdb/header.h
@@ -153,7 +153,7 @@ enum headerSprintfExtensionType {
  * @param data		tag value
  * @param formatPrefix
  * @param padding
- * @param element
+ * @param element	RPM_BIN_TYPE: no. bytes of data
  * @return		formatted string
  */
 typedef /*only@*/ char * (*headerTagFormatFunction)(int_32 type,
@@ -166,10 +166,10 @@ typedef /*only@*/ char * (*headerTagFormatFunction)(int_32 type,
  * This is allowed to fail, which indicates the tag doesn't exist.
  *
  * @param h		header
- * @retval type		address of tag type
- * @retval data		address of tag value pointer
- * @retval count	address of no. of data items
- * @retval freedata	address of data-was-malloc'ed indicator
+ * @retval *type	tag type
+ * @retval *data	tag value
+ * @retval *count	no. of data items
+ * @retval *freedata	data-was-malloc'ed indicator
  * @return		0 on success
  */
 typedef int (*headerTagTagFunction) (Header h,
diff --git a/rpmdb/header_internal.h b/rpmdb/header_internal.h
index f26be7f2c..2f0f33de3 100644
--- a/rpmdb/header_internal.h
+++ b/rpmdb/header_internal.h
@@ -43,7 +43,8 @@ struct entryInfo_s {
 typedef /*@abstract@*/ struct indexEntry_s * indexEntry;
 struct indexEntry_s {
     struct entryInfo_s info;	/*!< Description of tag data. */
-/*@owned@*/ void * data; 	/*!< Location of tag data. */
+/*@owned@*/
+    void * data; 		/*!< Location of tag data. */
     int length;			/*!< No. bytes of data. */
     int rdlen;			/*!< No. bytes of data in region. */
 };
@@ -52,7 +53,8 @@ struct indexEntry_s {
  * The Header data structure.
  */
 struct headerToken {
-/*@unused@*/ struct HV_s hv;	/*!< Header public methods. */
+/*@unused@*/
+    struct HV_s hv;		/*!< Header public methods. */
 /*@only@*/ /*@null@*/
     void * blob;		/*!< Header region blob. */
 /*@owned@*/ indexEntry index;	/*!< Array of tags. */
@@ -63,32 +65,38 @@ struct headerToken {
 #define	HEADERFLAG_ALLOCATED	(1 << 1) /*!< Is 1st header region allocated? */
 #define	HEADERFLAG_LEGACY	(1 << 2) /*!< Header came from legacy source? */
 #define HEADERFLAG_DEBUG	(1 << 3) /*!< Debug this header? */
-/*@refs@*/ int nrefs;		/*!< Reference count. */
+/*@refs@*/
+    int nrefs;			/*!< Reference count. */
 };
 
 /** \ingroup header
  */
 typedef /*@abstract@*/ struct sprintfTag_s * sprintfTag;
 struct sprintfTag_s {
-/*@null@*/ headerTagTagFunction ext;   /*!< if NULL tag element is invalid */
+/*@null@*/
+    headerTagTagFunction ext;   /*!< NULL if tag element is invalid */
     int extNum;
     int_32 tag;
     int justOne;
     int arrayCount;
-/*@kept@*/ char * format;
-/*@kept@*/ /*@null@*/ char * type;
+/*@kept@*/
+    char * format;
+/*@kept@*/ /*@null@*/
+    char * type;
     int pad;
 };
 
 /** \ingroup header
+ * Extension cache.
  */
-typedef /*@abstract@*/ struct extensionCache_s * extensionCache;
-struct extensionCache_s {
+typedef /*@abstract@*/ struct rpmec_s * rpmec;
+struct rpmec_s {
     int_32 type;
     int_32 count;
     int avail;
     int freeit;
-/*@owned@*/ const void * data;
+/*@owned@*/
+    const void * data;
 };
 
 /** \ingroup header
@@ -105,18 +113,22 @@ struct sprintfToken {
     } type;
     union {
 	struct {
-	/*@only@*/ sprintfToken format;
+	/*@only@*/
+	    sprintfToken format;
 	    int numTokens;
 	} array;
 	struct sprintfTag_s tag;
 	struct {
-	/*@dependent@*/ char * string;
+	/*@dependent@*/
+	    char * string;
 	    int len;
 	} string;
 	struct {
-	/*@only@*/ /*@null@*/ sprintfToken ifFormat;
+	/*@only@*/ /*@null@*/
+	    sprintfToken ifFormat;
 	    int numIfTokens;
-	/*@only@*/ /*@null@*/ sprintfToken elseFormat;
+	/*@only@*/ /*@null@*/
+	    sprintfToken elseFormat;
 	    int numElseTokens;
 	    struct sprintfTag_s tag;
 	} cond;