From 6c603be5b5b6c728a4e502d1c57ccc964b3cbe51 Mon Sep 17 00:00:00 2001
From: Paul Nasrat <pnasrat@fedoraproject.org>
Date: Aug 26 2005 22:33:31 +0000
Subject: fix build, context verification


---

diff --git a/rpm-4.4.2-contextverify.patch b/rpm-4.4.2-contextverify.patch
new file mode 100644
index 0000000..8685c34
--- /dev/null
+++ b/rpm-4.4.2-contextverify.patch
@@ -0,0 +1,16 @@
+diff -u rpm-4.4.2/lib/verify.c rpm-4.4.2/lib/verify.c
+--- rpm-4.4.2/lib/verify.c	2005-07-21 16:47:11.000000000 -0400
++++ rpm-4.4.2/lib/verify.c	2005-08-26 12:23:35.000000000 -0400
+@@ -138,8 +138,10 @@
+ 
+ 	    if (fcontext == NULL || strcmp(fcontext, con))
+ 		*res |= RPMVERIFY_CONTEXTS;
+-	    freecon(con);
+-            freecon(fcontext); 
++            if (con != NULL)
++	        freecon(con);
++            if (fcontext != NULL)
++                freecon(fcontext); 
+ 
+ 	}
+     }
diff --git a/rpm.spec b/rpm.spec
index 08f71d0..4f59673 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -20,7 +20,7 @@ Name: rpm
 %define version 4.4.2
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 3
+Release: 4
 Group: System Environment/Base
 Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz
 Patch0: rpm-4.4.1-hkp-disable.patch
@@ -31,6 +31,8 @@ Patch4: rpm-4.4.1-prepostun.patch
 Patch5: rpm-4.4.1-ordererase.patch
 Patch6: rpm-4.4.2-matchpathcon.patch
 Patch7: rpm-4.4.2-perlreq.patch
+Patch8: rpm-4.4.2-db3-param.patch
+Patch9: rpm-4.4.2-contextverify.patch
 License: GPL
 Conflicts: patch < 2.5
 %ifos linux
@@ -149,6 +151,8 @@ shell-like rules.
 %patch5 -p1  -b .ordererase
 %patch6 -p1  -b .matchpathcon
 %patch7 -p1  -b .perlreq
+%patch8 -p1  -b .param
+%patch9 -p1  -b .contextverify
 
 
 %build
@@ -540,7 +544,11 @@ exit 0
 %{__includedir}/popt.h
 
 %changelog
-* Wed Jul 27 2005 Paul Nasrat <pnasrat@redhat.com> - 4.4.2-2
+* Fri Aug 26 2005 Paul Nasrat <pnasrat@redhat.com> - 4.4.2-4
+- Fix build with CFLAGS having --param
+- Fix for context verification in /tmp (#162037)
+
+* Wed Jul 27 2005 Paul Nasrat <pnasrat@redhat.com> - 4.4.2-3
 - popt minor version requires
 
 * Tue Jul 26 2005 Paul Nasrat <pnasrat@redhat.com> - 4.4.2-2