From 05eaef6e8070c79904ac50ef7a815d433e9eaf2a Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Mon, 7 Feb 2011 09:21:01 +0200
Subject: [PATCH] - fix segfault when building more than one package at a time
 (#675565)

---
 rpm-4.9.0-beta1-rpmugfree.patch | 18 ++++++++++++++++++
 rpm.spec                        |  7 ++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 rpm-4.9.0-beta1-rpmugfree.patch

diff --git a/rpm-4.9.0-beta1-rpmugfree.patch b/rpm-4.9.0-beta1-rpmugfree.patch
new file mode 100644
index 0000000..916db53
--- /dev/null
+++ b/rpm-4.9.0-beta1-rpmugfree.patch
@@ -0,0 +1,18 @@
+commit ec031020eb7ed9a0cc3d086bcd7ae7611eb308fc
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date:   Mon Feb 7 09:15:29 2011 +0200
+
+    Fix segfault when building more than one rpm (RhBug:675565)
+    - Remember to set the static string cache pointer to NULL on free, duh
+
+diff --git a/lib/rpmug.c b/lib/rpmug.c
+index 2bb18e5..b365e4a 100644
+--- a/lib/rpmug.c
++++ b/lib/rpmug.c
+@@ -198,5 +198,5 @@ void rpmugFree(void)
+     rpmugGid(NULL, NULL);
+     rpmugUname(-1);
+     rpmugGname(-1);
+-    strCacheFree(strStash);
++    strStash = strCacheFree(strStash);
+ }
diff --git a/rpm.spec b/rpm.spec
index d54048c..137f647 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -22,7 +22,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: %{?snapver:0.%{snapver}.}6%{?dist}
+Release: %{?snapver:0.%{snapver}.}7%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/rpm-4.8.x/%{name}-%{srcver}.tar.bz2
@@ -50,6 +50,7 @@ Patch105: rpm-4.9.0-beta1-env-noremove.patch
 Patch106: rpm-4.9.0-beta1-open-cwd.patch
 Patch107: rpm-4.9.0-beta1-monodeps.patch
 Patch108: rpm-4.9.0-beta1-ocaml-magic.patch
+Patch109: rpm-4.9.0-beta1-rpmugfree.patch
 
 # These are not yet upstream
 Patch301: rpm-4.6.0-niagara.patch
@@ -223,6 +224,7 @@ packages on a system.
 %patch106 -p1 -b .open-cwd
 %patch107 -p1 -b .monodeps
 %patch108 -p1 -b .ocaml-magic
+%patch109 -p1 -b .rpmugfree
 
 %patch301 -p1 -b .niagara
 %patch302 -p1 -b .geode
@@ -433,6 +435,9 @@ exit 0
 %doc COPYING doc/librpm/html/*
 
 %changelog
+* Mon Feb 07 2011 Panu Matilainen <pmatilai@redhat.com> - 4.9.0-0.beta1.7
+- fix segfault when building more than one package at a time (#675565)
+
 * Sun Feb 06 2011 Panu Matilainen <pmatilai@redhat.com> - 4.9.0-0.beta1.6
 - adjust ocaml rule for libmagic string change