rpms/rpm/FC-4 rpm-4.4.1-contextverify.patch, NONE, 1.1 rpm-4.4.1-db3-param.patch, NONE, 1.1 rpm.spec, 1.172, 1.173

[fedora-cvs-commits redhat com]

Author: pnasrat

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

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.4.1-contextverify.patch rpm-4.4.1-db3-param.patch 
Log Message:
fix selinux double free

rpm-4.4.1-contextverify.patch:
 verify.c |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

--- NEW FILE rpm-4.4.1-contextverify.patch ---
--- rpm-4.4.2/lib/verify.c.contextverify	2005-09-22 13:24:09.000000000 -0400
+++ rpm-4.4.2/lib/verify.c	2005-09-22 13:38:17.000000000 -0400
@@ -122,24 +122,29 @@
      */
 /* -branchstate@*/
     if (selinuxEnabled == 1 && (flags & RPMVERIFY_CONTEXTS)) {
-	security_context_t con;
+	security_context_t con = NULL;
 
 	rc = lgetfilecon(fn, &con);
 	if (rc == -1)
 	    *res |= (RPMVERIFY_LGETFILECONFAIL|RPMVERIFY_CONTEXTS);
 	else {
-	    security_context_t fcontext;
+	    security_context_t fcontext = NULL;
              
 	    /* Get file security context from patterns. */
 	    if (matchpathcon(fn,fmode,&fcontext) != 0)  {
 		/* Get file security context from package. */
-		fcontext = rpmfiFContext(fi);
+ 		char * ficontext = NULL;
+		ficontext = rpmfiFContext(fi);
+		fcontext = xmalloc(sizeof(ficontext));
+		strncpy(fcontext, ficontext, sizeof(ficontext));
 	    }
 
 	    if (fcontext == NULL || strcmp(fcontext, con))
 		*res |= RPMVERIFY_CONTEXTS;
-	    freecon(con);
-            freecon(fcontext); 
+            if (con != NULL)
+	        freecon(con);
+            if (fcontext != NULL)
+                freecon(fcontext); 
 
 	}
     }

rpm-4.4.1-db3-param.patch:
 configure |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rpm-4.4.1-db3-param.patch ---
--- rpm-4.4.1/db3/configure.param	2005-08-26 10:05:34.000000000 -0400
+++ rpm-4.4.1/db3/configure	2005-08-26 10:06:05.000000000 -0400
@@ -8,7 +8,7 @@
 rm -f config.cache
 
 # XXX edit CFLAGS= ... out of invocation args ???
-ARGS="`echo $* | sed -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's%--cache-file=.*$%%'`"
+ARGS="`echo $* | sed -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's% --param=[^ ]*%%g' -e 's%--cache-file=.*$%%'`"
 
 CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure $ARGS \
 	--enable-shared --enable-static --enable-rpc \


Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/FC-4/rpm.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- rpm.spec	13 Jul 2005 15:34:47 -0000	1.172
+++ rpm.spec	29 Mar 2006 22:07:54 -0000	1.173
@@ -20,7 +20,7 @@
 %define version 4.4.1
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 22
+Release: 23
 Group: System Environment/Base
 Source: ftp://jbj.org/pub/rpm-devel/rpm-%{rpm_version}.tar.gz
 Source1: popt_zh_TW.po
@@ -37,6 +37,8 @@
 Patch9: rpm-4.4.1-matchpathcon.patch
 Patch10: rpm-4.4.1-check-symlinks.patch
 Patch11: rpm-4.4.1-zlib-can-2005-2096.patch
+Patch12: rpm-4.4.1-db3-param.patch
+Patch13: rpm-4.4.1-contextverify.patch
 License: GPL
 Conflicts: patch < 2.5
 %ifos linux
@@ -157,6 +159,8 @@
 %patch9 -p1  -b .matchpathcon
 %patch10 -p1  -b .checklinks
 %patch11 -p1  -b .zlib
+%patch12 -p1  -b .param
+%patch13 -p1  -b .contextverify
 
 # XXX move zh_CN
 sed -i 's/zh_CN.GB2312/zh_CN zh_TW/' popt/configure*
@@ -562,6 +566,10 @@
 %{__includedir}/popt.h
 
 %changelog
+* Wed Mar 29 2006 Paul Nasrat <pnasrat redhat com> - 4.4.1-23
+- Makefile fix db3 param
+- Fix selinux verification
+
 * Wed Jul 13 2005 Paul Nasrat <pnasrat redhat com> - 4.4.1-22
 - zlib fix for CAN-2005-2096