From 785c0a0cdfe45c92608a61a092733df9cecb2e66f5f679120436cb05e67fd330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Schr=C3=B6der?= <mls@suse.com>
Date: Wed, 11 Sep 2013 17:14:54 +0000
Subject: [PATCH] more fixes

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=291
---
 ignore_poolstr_dummy_entries.diff | 11 +++++++++++
 rpm.spec                          |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 ignore_poolstr_dummy_entries.diff

diff --git a/ignore_poolstr_dummy_entries.diff b/ignore_poolstr_dummy_entries.diff
new file mode 100644
index 0000000..0a90ab5
--- /dev/null
+++ b/ignore_poolstr_dummy_entries.diff
@@ -0,0 +1,11 @@
+--- build/rpmfc.c.orig	2013-09-11 17:13:39.165560997 +0000
++++ build/rpmfc.c	2013-09-11 17:13:52.171560974 +0000
+@@ -848,6 +848,8 @@ rpmRC rpmfcApply(rpmfc fc)
+     previx = -1;
+     for (rpmsid id = 1; id <= nddict; id++) {
+ 	s = rpmstrPoolStr(fc->ddict, id);
++	if (!s || !*s)
++	    continue;
+ 
+ 	/* Parse out (file#,deptype,N,EVR,Flags) */
+ 	ix = strtol(s, &se, 10);
diff --git a/rpm.spec b/rpm.spec
index 3823682..6316ce8 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -138,6 +138,7 @@ Patch83:        debug_gdb_scripts.diff
 Patch84:        beedigest.diff
 Patch85:        brp-compress-no-img.patch
 Patch86:        strpoolrehash.diff
+Patch87:        ignore_poolstr_dummy_entries.diff
 Patch6464:      auto-config-update-aarch64.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #
@@ -224,7 +225,7 @@ rm -f rpmdb/db.h
 %patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59
 %patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69
 %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
-%patch -P 80 -P 81 -P 82 -P 83 -P 84 -P 85 -P 86
+%patch -P 80 -P 81 -P 82 -P 83 -P 84 -P 85 -P 86 -P 87
 %ifarch aarch64
 %patch6464
 %endif