rpms/rpm/devel rpm-4.4.2-contextverify.patch, NONE, 1.1 rpm.spec, 1.177, 1.178

[fedora-cvs-commits at redhat.com]

Author: pnasrat

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3047

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.4.2-contextverify.patch 
Log Message:
fix build, context verification

rpm-4.4.2-contextverify.patch:
 verify.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE rpm-4.4.2-contextverify.patch ---
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); 
 
 	}
     }


Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- rpm.spec	30 Jul 2005 01:35:32 -0000	1.177
+++ rpm.spec	26 Aug 2005 22:33:31 -0000	1.178
@@ -20,7 +20,7 @@
 %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 @@
 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 @@
 %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 @@
 %{__includedir}/popt.h
 
 %changelog
-* Wed Jul 27 2005 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-2
+* Fri Aug 26 2005 Paul Nasrat <pnasrat at 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 at redhat.com> - 4.4.2-3
 - popt minor version requires
 
 * Tue Jul 26 2005 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-2