274dc2d
diff -up patch-2.7/src/common.h.selinux patch-2.7/src/common.h
274dc2d
--- patch-2.7/src/common.h.selinux	2012-04-17 21:13:36.000000000 +0100
274dc2d
+++ patch-2.7/src/common.h	2012-10-18 17:04:21.215420195 +0100
274dc2d
@@ -30,6 +30,8 @@
ffc4fff
 #include <sys/types.h>
ffc4fff
 #include <time.h>
3db4109
 
ffc4fff
+#include <selinux/selinux.h>
ffc4fff
+
ffc4fff
 #include <sys/stat.h>
274dc2d
 
274dc2d
 #include <limits.h>
274dc2d
@@ -80,6 +82,7 @@ XTERN char *outfile;
ffc4fff
 XTERN int inerrno;
ffc4fff
 XTERN int invc;
ffc4fff
 XTERN struct stat instat;
ffc4fff
+XTERN security_context_t incontext;
ffc4fff
 XTERN bool dry_run;
ffc4fff
 XTERN bool posixly_correct;
ffc4fff
 
274dc2d
diff -up patch-2.7/src/inp.c.selinux patch-2.7/src/inp.c
274dc2d
--- patch-2.7/src/inp.c.selinux	2012-08-07 20:46:33.000000000 +0100
274dc2d
+++ patch-2.7/src/inp.c	2012-10-18 17:18:31.335799300 +0100
274dc2d
@@ -138,7 +138,22 @@ get_input_file (char const *filename, ch
638a40a
     char *getbuf;
638a40a
 
274dc2d
     if (inerrno == -1)
274dc2d
-      inerrno = lstat (filename, &instat) == 0 ? 0 : errno;
638a40a
+      {
274dc2d
+	inerrno = lstat (filename, &instat) == 0 ? 0 : errno;
274dc2d
+	if (inerrno == 0)
274dc2d
+	  {
274dc2d
+	    inerrno = getfilecon (inname, &incontext) == -1 ? errno : 0;
274dc2d
+	    if (inerrno == ENODATA || inerrno == ENOTSUP)
274dc2d
+	      {
274dc2d
+		inerrno = 0;
274dc2d
+		incontext = NULL;
274dc2d
+	      }
274dc2d
+	  }
274dc2d
+	else
274dc2d
+	  incontext = NULL;
638a40a
+      }
1151a30
+    else
1151a30
+      incontext = NULL;
638a40a
 
638a40a
     /* Perhaps look for RCS or SCCS versions.  */
274dc2d
     if (S_ISREG (mode)
274dc2d
@@ -183,7 +198,7 @@ get_input_file (char const *filename, ch
638a40a
 	    }
638a40a
 
638a40a
 	    if (cs && version_get (filename, cs, ! inerrno, elsewhere, getbuf,
638a40a
-				   &instat))
638a40a
+				   &instat, &incontext))
638a40a
 	      inerrno = 0;
638a40a
 
638a40a
 	    free (getbuf);
274dc2d
@@ -194,6 +209,7 @@ get_input_file (char const *filename, ch
638a40a
       {
638a40a
 	instat.st_mode = S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH;
638a40a
 	instat.st_size = 0;
638a40a
+	incontext = NULL;
638a40a
       }
274dc2d
     else if (! ((S_ISREG (mode) || S_ISLNK (mode))
274dc2d
 	        && (mode & S_IFMT) == (instat.st_mode & S_IFMT)))
274dc2d
diff -up patch-2.7/src/Makefile.am.selinux patch-2.7/src/Makefile.am
274dc2d
--- patch-2.7/src/Makefile.am.selinux	2012-04-17 08:59:41.000000000 +0100
274dc2d
+++ patch-2.7/src/Makefile.am	2012-10-18 17:04:21.216420199 +0100
274dc2d
@@ -34,7 +34,7 @@ patch_SOURCES = \
274dc2d
 
274dc2d
 AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
274dc2d
 patch_LDADD = $(LDADD) $(top_builddir)/lib/libpatch.a $(LIB_CLOCK_GETTIME) \
274dc2d
-	      $(LIB_XATTR)
274dc2d
+	      $(LIB_XATTR) -lselinux
274dc2d
 
274dc2d
 if ENABLE_MERGE
274dc2d
   patch_SOURCES += merge.c
274dc2d
diff -up patch-2.7/src/Makefile.in.selinux patch-2.7/src/Makefile.in
274dc2d
--- patch-2.7/src/Makefile.in.selinux	2012-09-12 02:40:57.000000000 +0100
274dc2d
+++ patch-2.7/src/Makefile.in	2012-10-18 17:04:21.217420203 +0100
274dc2d
@@ -989,7 +989,7 @@ patch_SOURCES = bestmatch.h common.h inp
274dc2d
 AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib \
274dc2d
 	$(am__append_2)
274dc2d
 patch_LDADD = $(LDADD) $(top_builddir)/lib/libpatch.a $(LIB_CLOCK_GETTIME) \
274dc2d
-	      $(LIB_XATTR)
274dc2d
+	      $(LIB_XATTR) -lselinux
274dc2d
 
274dc2d
 all: all-am
274dc2d
 
274dc2d
diff -up patch-2.7/src/patch.c.selinux patch-2.7/src/patch.c
274dc2d
--- patch-2.7/src/patch.c.selinux	2012-08-08 12:24:46.000000000 +0100
274dc2d
+++ patch-2.7/src/patch.c	2012-10-18 17:04:21.219420213 +0100
274dc2d
@@ -552,7 +552,7 @@ main (int argc, char **argv)
274dc2d
 					     mode, &new_time);
274dc2d
 		      else
274dc2d
 			{
274dc2d
-			  attr |= FA_IDS | FA_MODE | FA_XATTRS;
274dc2d
+			  attr |= FA_IDS | FA_MODE | FA_XATTRS | FA_SECCONTEXT;
274dc2d
 			  set_file_attributes (TMPOUTNAME, attr, inname, &instat,
274dc2d
 					       mode, &new_time);
4c70b2a
 			}
274dc2d
diff -up patch-2.7/src/pch.c.selinux patch-2.7/src/pch.c
274dc2d
--- patch-2.7/src/pch.c.selinux	2012-08-11 09:19:49.000000000 +0100
274dc2d
+++ patch-2.7/src/pch.c	2012-10-18 17:04:21.220420217 +0100
274dc2d
@@ -295,7 +295,12 @@ there_is_another_patch (bool need_header
4c70b2a
 	    inname[t - buf - 1] = 0;
274dc2d
 	    if (lstat (inname, &instat) == 0)
3db4109
 	      {
3db4109
-		inerrno = 0;
638a40a
+		inerrno = getfilecon (inname, &incontext) == -1 ? errno : 0;
274dc2d
+		if (errno == ENODATA || inerrno == ENOTSUP)
3db4109
+		  {
3db4109
+		    inerrno = 0;
3db4109
+		    incontext = NULL;
3db4109
+		  }
3db4109
 		invc = -1;
3db4109
 	      }
3db4109
 	    else
274dc2d
@@ -927,7 +932,7 @@ intuit_diff_type (bool need_header, mode
3db4109
 			  if (cs)
3db4109
 			    {
4c70b2a
 			      if (version_get (p_name[i], cs, false, readonly,
3db4109
-					       getbuf, &st[i]))
3db4109
+					       getbuf, &st[i], NULL))
3db4109
 				stat_errno[i] = 0;
3db4109
 			      else
3db4109
 				version_controlled[i] = 0;
274dc2d
@@ -993,6 +998,9 @@ intuit_diff_type (bool need_header, mode
274dc2d
 	inerrno = stat_errno[i];
638a40a
 	invc = version_controlled[i];
638a40a
 	instat = st[i];
dd69faf
+	if (getfilecon (inname, &incontext) == -1)
dd69faf
+	  if (errno == ENODATA || errno == ENOTSUP)
1370409
+	    incontext = NULL;
638a40a
       }
638a40a
 
4c70b2a
     return retval;
274dc2d
diff -up patch-2.7/src/util.c.selinux patch-2.7/src/util.c
274dc2d
--- patch-2.7/src/util.c.selinux	2012-08-11 09:20:49.000000000 +0100
274dc2d
+++ patch-2.7/src/util.c	2012-10-18 17:20:25.397226771 +0100
274dc2d
@@ -291,6 +291,19 @@ set_file_attributes (char const *to, enu
274dc2d
 		S_ISLNK (mode) ? "symbolic link" : "file",
274dc2d
 		quotearg (to));
274dc2d
     }
274dc2d
+  if (attr & FA_SECCONTEXT)
274dc2d
+    {
274dc2d
+      security_context_t outcontext;
274dc2d
+      if (incontext && getfilecon (to, &outcontext) != -1 &&
274dc2d
+	  outcontext &&
274dc2d
+	  strcmp (outcontext, incontext) &&
274dc2d
+	  setfilecon (to, incontext) != 0)
274dc2d
+	{
274dc2d
+	  if (errno != ENOTSUP && errno != EPERM)
274dc2d
+	    pfatal ("Can't set security context on file %s",
274dc2d
+		    quotearg (to));
274dc2d
+	}
274dc2d
+    }
274dc2d
 }
274dc2d
 
274dc2d
 static void
274dc2d
@@ -807,7 +820,8 @@ version_controller (char const *filename
4c70b2a
    Return true if successful.  */
4c70b2a
 bool
4c70b2a
 version_get (char const *filename, char const *cs, bool exists, bool readonly,
ffc4fff
-	     char const *getbuf, struct stat *filestat)
ffc4fff
+	     char const *getbuf, struct stat *filestat,
ffc4fff
+	     security_context_t *filecontext)
ffc4fff
 {
ffc4fff
   if (patch_get < 0)
ffc4fff
     {
274dc2d
@@ -832,6 +846,13 @@ version_get (char const *filename, char
ffc4fff
 	fatal ("Can't get file %s from %s", quotearg (filename), cs);
ffc4fff
       if (stat (filename, filestat) != 0)
ffc4fff
 	pfatal ("%s", quotearg (filename));
ffc4fff
+      if (filecontext && getfilecon (filename, filecontext) == -1)
ffc4fff
+	{
ffc4fff
+	  if (errno == ENODATA || errno == ENOTSUP)
ffc4fff
+	    *filecontext = NULL;
ffc4fff
+	  else
ffc4fff
+	    pfatal ("%s", quotearg (filename));
ffc4fff
+	}
ffc4fff
     }
638a40a
 
ffc4fff
   return 1;
274dc2d
diff -up patch-2.7/src/util.h.selinux patch-2.7/src/util.h
274dc2d
--- patch-2.7/src/util.h.selinux	2012-08-11 09:20:01.000000000 +0100
274dc2d
+++ patch-2.7/src/util.h	2012-10-18 17:04:21.220420217 +0100
274dc2d
@@ -45,7 +45,7 @@ char *parse_name (char const *, int, cha
4c70b2a
 char *savebuf (char const *, size_t);
4c70b2a
 char *savestr (char const *);
4c70b2a
 char const *version_controller (char const *, bool, struct stat const *, char **, char **);
4c70b2a
-bool version_get (char const *, char const *, bool, bool, char const *, struct stat *);
4c70b2a
+bool version_get (char const *, char const *, bool, bool, char const *, struct stat *, security_context_t *);
4c70b2a
 int create_file (char const *, int, mode_t, bool);
4c70b2a
 int systemic (char const *);
274dc2d
 char *format_linenum (char[LINENUM_LENGTH_BOUND + 1], lin);
274dc2d
@@ -73,7 +73,8 @@ enum file_attributes {
274dc2d
   FA_TIMES = 1,
274dc2d
   FA_IDS = 2,
274dc2d
   FA_MODE = 4,
274dc2d
-  FA_XATTRS = 8
274dc2d
+  FA_XATTRS = 8,
274dc2d
+  FA_SECCONTEXT = 16
274dc2d
 };
274dc2d
 
274dc2d
 void set_file_attributes (char const *, enum file_attributes, char const *,