rpms/rpm/devel rpm-4.4.1-matchpathcon.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: pnasrat

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

Modified Files:
	rpm-4.4.1-matchpathcon.patch 
Log Message:
rediff - fix rpmbuild brain fart

rpm-4.4.1-matchpathcon.patch:
 build/Makefile.am |    1 +
 build/files.c     |   21 ++++++++-------------
 lib/rpmfi.c       |   13 ++++++-------
 lib/rpminstall.c  |   14 ++++----------
 lib/verify.c      |   30 ++++++++++++------------------
 python/rpmts-py.c |   13 ++++---------
 6 files changed, 35 insertions(+), 57 deletions(-)

Index: rpm-4.4.1-matchpathcon.patch
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm-4.4.1-matchpathcon.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpm-4.4.1-matchpathcon.patch	3 May 2005 14:07:04 -0000	1.1
+++ rpm-4.4.1-matchpathcon.patch	3 May 2005 16:01:02 -0000	1.2
@@ -1,5 +1,5 @@
 --- rpm-4.4.1/lib/rpmfi.c.matchpathcon	2005-02-10 03:30:28.000000000 -0500
-+++ rpm-4.4.1/lib/rpmfi.c	2005-05-02 13:39:34.545636000 -0400
++++ rpm-4.4.1/lib/rpmfi.c	2005-05-02 16:15:24.000000000 -0400
 @@ -16,7 +16,7 @@
  #define	_RPMFI_INTERNAL
  #include "rpmfi.h"
@@ -58,7 +58,7 @@
      if (fcontextp)
  	*fcontextp = av;
 --- rpm-4.4.1/lib/verify.c.matchpathcon	2004-10-24 15:36:30.000000000 -0400
-+++ rpm-4.4.1/lib/verify.c	2005-05-02 13:39:34.568609000 -0400
++++ rpm-4.4.1/lib/verify.c	2005-05-02 16:15:24.000000000 -0400
 @@ -128,20 +128,19 @@
  	if (rc == -1)
  	    *res |= (RPMVERIFY_LGETFILECONFAIL|RPMVERIFY_CONTEXTS);
@@ -109,8 +109,8 @@
      }
  
      ovsflags = rpmtsSetVSFlags(ts, vsflags);
---- rpm-4.4.1/lib/rpminstall.c.matchpathcon	2005-05-02 13:39:34.528651000 -0400
-+++ rpm-4.4.1/lib/rpminstall.c	2005-05-02 13:39:34.579599000 -0400
+--- rpm-4.4.1/lib/rpminstall.c.matchpathcon	2005-05-02 16:15:24.000000000 -0400
++++ rpm-4.4.1/lib/rpminstall.c	2005-05-02 16:15:24.000000000 -0400
 @@ -310,16 +310,10 @@
  
      /* Initialize security context patterns (if not already done). */
@@ -133,7 +133,7 @@
      (void) rpmtsSetFlags(ts, ia->transFlags);
  
 --- rpm-4.4.1/build/Makefile.am.matchpathcon	2005-01-17 13:46:16.000000000 -0500
-+++ rpm-4.4.1/build/Makefile.am	2005-05-02 13:39:34.585591000 -0400
++++ rpm-4.4.1/build/Makefile.am	2005-05-02 16:15:24.000000000 -0400
 @@ -35,6 +35,7 @@
  	$(top_builddir)/lib/librpm.la \
  	$(top_builddir)/rpmdb/librpmdb.la \
@@ -143,7 +143,7 @@
  
  rpmfile.h:
 --- rpm-4.4.1/build/files.c.matchpathcon	2005-01-04 11:35:05.000000000 -0500
-+++ rpm-4.4.1/build/files.c	2005-05-02 15:07:28.691340000 -0400
++++ rpm-4.4.1/build/files.c	2005-05-03 11:59:10.528669000 -0400
 @@ -23,7 +23,7 @@
  #define	_RPMFI_INTERNAL
  #include "rpmfi.h"
@@ -171,12 +171,11 @@
  
      for (i = 0, flp = fl->fileList; i < fl->fileListRecsUsed; i++, flp++) {
  	const char *s;
-@@ -1324,18 +1324,16 @@
+@@ -1324,18 +1324,13 @@
  			       &(flp->flags), 1);
  
  	/* Add file security context to package. */
-+	mode_t fmode = (uint_16)flp->fl_mode;
- /*@-branchstate@*/
+-/*@-branchstate@*/
 -	if (sx != NULL) {
 -	    mode_t fmode = (uint_16)flp->fl_mode;
 -	    s = rpmsxFContext(sx, flp->fileURL, fmode);
@@ -184,11 +183,11 @@
 -	    (void) headerAddOrAppendEntry(h, RPMTAG_FILECONTEXTS, RPM_STRING_ARRAY_TYPE,
 -			       &s, 1);
 -	}
-+	if (matchpathcon(flp->fileURL, fmode, &scon) != 0)
-+	    scon = "";
- /*@=branchstate@*/
-+	(void) headerAddOrAppendEntry(h, RPMTAG_FILECONTEXTS, RPM_STRING_ARRAY_TYPE,
-+			       scon, 1);
+-/*@=branchstate@*/
++	mode_t fmode = (uint_16)flp->fl_mode;
++	matchpathcon(flp->fileURL, fmode, &scon);
++        if (scon == NULL) scon = ""; 
++	(void) headerAddOrAppendEntry(h, RPMTAG_FILECONTEXTS, RPM_STRING_ARRAY_TYPE, &scon, 1);
 +	freecon(scon);
  
      }
@@ -197,7 +196,7 @@
  
      (void) headerAddEntry(h, RPMTAG_SIZE, RPM_INT32_TYPE,
 --- rpm-4.4.1/python/rpmts-py.c.matchpathcon	2005-02-12 22:12:07.000000000 -0500
-+++ rpm-4.4.1/python/rpmts-py.c	2005-05-02 13:39:34.606575000 -0400
++++ rpm-4.4.1/python/rpmts-py.c	2005-05-02 16:15:24.000000000 -0400
 @@ -1182,16 +1182,11 @@
  
      /* Initialize security context patterns (if not already done). */