rpms/rpm/devel rpm-4.4.2-matchpathcon.patch, 1.1, 1.2 rpm.spec, 1.205, 1.206

[fedora-cvs-commits at redhat.com]

Author: pnasrat

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

Modified Files:
	rpm-4.4.2-matchpathcon.patch rpm.spec 
Log Message:
Remove SELinux context verification (#193488)


rpm-4.4.2-matchpathcon.patch:
 build/Makefile.am  |    1 +
 build/files.c      |   27 ++++++++++++++-------------
 lib/fsm.c          |    7 +++----
 lib/rpmfi.c        |   13 ++++++-------
 lib/rpminstall.c   |   14 ++++----------
 python/Makefile.am |    3 ++-
 python/rpmts-py.c  |   13 ++++---------
 7 files changed, 34 insertions(+), 44 deletions(-)

Index: rpm-4.4.2-matchpathcon.patch
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm-4.4.2-matchpathcon.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpm-4.4.2-matchpathcon.patch	21 Jul 2005 21:37:42 -0000	1.1
+++ rpm-4.4.2-matchpathcon.patch	28 Jun 2006 19:59:23 -0000	1.2
@@ -56,58 +56,6 @@
      }
      (void) rpmtsSetFlags(ts, ia->transFlags);
  
---- rpm-4.4.2/lib/verify.c.matchpathcon	2004-10-24 15:36:30.000000000 -0400
-+++ rpm-4.4.2/lib/verify.c	2005-07-21 16:47:11.000000000 -0400
-@@ -128,20 +128,19 @@
- 	if (rc == -1)
- 	    *res |= (RPMVERIFY_LGETFILECONFAIL|RPMVERIFY_CONTEXTS);
- 	else {
--	    rpmsx sx = rpmtsREContext(ts);
--	    const char * fcontext;
--
--	    if (sx != NULL) {
--		/* Get file security context from patterns. */
--		fcontext = rpmsxFContext(sx, fn, fmode);
--		sx = rpmsxFree(sx);
--	    } else {
-+	    security_context_t fcontext;
-+             
-+	    /* Get file security context from patterns. */
-+	    if (matchpathcon(fn,fmode,&fcontext) != 0)  {
- 		/* Get file security context from package. */
- 		fcontext = rpmfiFContext(fi);
- 	    }
-+
- 	    if (fcontext == NULL || strcmp(fcontext, con))
- 		*res |= RPMVERIFY_CONTEXTS;
- 	    freecon(con);
-+            freecon(fcontext); 
-+
- 	}
-     }
- /*@=branchstate@*/
-@@ -524,16 +523,11 @@
- 
-     /* Initialize security context patterns (if not already done). */
-     if (qva->qva_flags & VERIFY_CONTEXTS) {
--	rpmsx sx = rpmtsREContext(ts);
--	if (sx == NULL) {
--	    arg = rpmGetPath("%{?_verify_file_context_path}", NULL);
--	    if (arg != NULL && *arg != '\0') {
--		sx = rpmsxNew(arg);
--		(void) rpmtsSetREContext(ts, sx);
--	    }
--	    arg = _free(arg);
--	}
--	sx = rpmsxFree(sx);
-+	arg = rpmGetPath("%{?_verify_file_context_path}", NULL);
-+	if (arg != NULL && *arg != '\0') {
-+           matchpathcon_init(arg);	
-+	   }
-+	arg = _free(arg);
-     }
- 
-     ovsflags = rpmtsSetVSFlags(ts, vsflags);
 --- rpm-4.4.2/lib/rpmfi.c.matchpathcon	2005-02-10 03:30:28.000000000 -0500
 +++ rpm-4.4.2/lib/rpmfi.c	2005-07-21 16:47:11.000000000 -0400
 @@ -16,7 +16,7 @@


Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- rpm.spec	12 May 2006 14:45:21 -0000	1.205
+++ rpm.spec	28 Jun 2006 19:59:23 -0000	1.206
@@ -20,7 +20,7 @@
 %define version 4.4.2
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 24
+Release: 25
 Group: System Environment/Base
 Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz
 Source1: mono-find-provides
@@ -52,6 +52,7 @@
 Patch24: rpm-4.4.2-trust.patch
 Patch25: rpm-4.4.2-devel-autodep.patch
 Patch26: rpm-4.4.2-rpmfc-skip.patch
+Patch27: rpm-4.4.2-noselinux-verify.patch
 License: GPL
 Conflicts: patch < 2.5
 %ifos linux
@@ -167,10 +168,9 @@
 %patch3 -p1  -b .rpmal
 %patch4 -p1  -b .prepostun
 %patch5 -p1  -b .ordererase
-%patch6 -p1  -b .matchpathcon
+# patch 6 moved
 %patch7 -p1  -b .perlreq
 %patch8 -p1  -b .param
-%patch9 -p1  -b .contextverify
 %patch10 -p1  -b .charset
 %patch11 -p1  -b .ghostconflicts
 #patch12 -p1  -b .exclude
@@ -188,6 +188,8 @@
 %patch24 -p1 -b .trust
 %patch25 -p1 -b .develdeps
 %patch26 -p1 -b .fcskip
+%patch27 -p0 -b .nosever
+%patch6 -p1  -b .matchpathcon
 
 %build
 
@@ -581,6 +583,9 @@
 %{__includedir}/popt.h
 
 %changelog
+* Wed Jun 28 2006 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-25
+- Remove SELinux context verification (#193488)
+
 * Thu May 04 2006 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-24
 - File classification with autoReq off (#190488)