diff -up patch-2.5.4/common.h.selinux patch-2.5.4/common.h --- patch-2.5.4/common.h.selinux 1999-08-30 07:20:08.000000000 +0100 +++ patch-2.5.4/common.h 2009-02-17 15:33:13.000000000 +0000 @@ -39,6 +39,8 @@ #include #include +#include + #include #if ! defined S_ISDIR && defined S_IFDIR # define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) @@ -168,6 +170,7 @@ XTERN char *outfile; XTERN int inerrno; XTERN int invc; XTERN struct stat instat; +XTERN security_context_t incontext; XTERN bool dry_run; XTERN bool posixly_correct; diff -up patch-2.5.4/inp.c.selinux patch-2.5.4/inp.c --- patch-2.5.4/inp.c.selinux 2009-02-17 15:33:13.000000000 +0000 +++ patch-2.5.4/inp.c 2009-02-17 15:33:13.000000000 +0000 @@ -154,7 +154,20 @@ get_input_file (char const *filename, ch char *getbuf; if (inerrno == -1) - inerrno = stat (inname, &instat) == 0 ? 0 : errno; + { + inerrno = stat (inname, &instat) == 0 ? 0 : errno; + if (inerrno == 0) + { + inerrno = getfilecon (inname, &incontext) == -1 ? errno : 0; + if (inerrno == ENODATA || inerrno == ENOTSUP) + { + inerrno = 0; + incontext = NULL; + } + } + else + incontext = NULL; + } /* Perhaps look for RCS or SCCS versions. */ if (patch_get @@ -196,7 +209,7 @@ get_input_file (char const *filename, ch } if (cs && version_get (filename, cs, ! inerrno, elsewhere, getbuf, - &instat)) + &instat, &incontext)) inerrno = 0; free (getbuf); @@ -213,6 +226,7 @@ get_input_file (char const *filename, ch { instat.st_mode = S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH; instat.st_size = 0; + incontext = NULL; } else if (! S_ISREG (instat.st_mode)) fatal ("File %s is not a regular file -- can't patch", diff -up patch-2.5.4/Makefile.in.selinux patch-2.5.4/Makefile.in --- patch-2.5.4/Makefile.in.selinux 1999-08-30 07:37:54.000000000 +0100 +++ patch-2.5.4/Makefile.in 2009-02-17 15:33:13.000000000 +0000 @@ -36,7 +36,7 @@ DEFS = @DEFS@ EXEEXT = @EXEEXT@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ +LIBS = @LIBS@ -lselinux PACKAGE = @PACKAGE@ U = @U@ VERSION = @VERSION@ diff -up patch-2.5.4/patch.c.selinux patch-2.5.4/patch.c --- patch-2.5.4/patch.c.selinux 2009-02-17 15:33:13.000000000 +0000 +++ patch-2.5.4/patch.c 2009-02-17 15:34:42.000000000 +0000 @@ -414,6 +414,16 @@ main (int argc, char **argv) if (! inerrno && chmod (outname, instat.st_mode) != 0) pfatal ("Can't set permissions on file %s", quotearg (outname)); + if (! inerrno && incontext) { + security_context_t outcontext; + if (! getfilecon (outname, &outcontext) && outcontext && + strcmp(outcontext, incontext) && + setfilecon (outname, incontext) != 0) { + if (errno != ENOTSUP && errno != EPERM) + pfatal ("Can't set security context on file %s", + quotearg (outname)); + } + } } } } diff -up patch-2.5.4/pch.c.selinux patch-2.5.4/pch.c --- patch-2.5.4/pch.c.selinux 2009-02-17 15:33:13.000000000 +0000 +++ patch-2.5.4/pch.c 2009-02-17 15:33:13.000000000 +0000 @@ -258,7 +258,12 @@ there_is_another_patch (void) { if (stat (inname, &instat) == 0) { - inerrno = 0; + inerrno = getfilecon (inname, &incontext) == -1 ? errno : 0; + if (inerrno == ENODATA || inerrno == ENOTSUP) + { + inerrno = 0; + incontext = NULL; + } invc = -1; } else @@ -573,7 +578,7 @@ intuit_diff_type (void) if (cs) { if (version_get (name[i], cs, 0, readonly, - getbuf, &st[i])) + getbuf, &st[i], NULL)) stat_errno[i] = 0; else version_controlled[i] = 0; @@ -641,6 +646,7 @@ intuit_diff_type (void) inerrno = stat_errno[i]; invc = version_controlled[i]; instat = st[i]; + getfilecon (inname, &incontext); } for (i = OLD; i <= INDEX; i++) diff -up patch-2.5.4/util.c.selinux patch-2.5.4/util.c --- patch-2.5.4/util.c.selinux 2009-02-17 15:33:13.000000000 +0000 +++ patch-2.5.4/util.c 2009-02-17 15:33:13.000000000 +0000 @@ -375,7 +375,8 @@ version_controller (char const *filename Return nonzero if successful. */ int version_get (char const *filename, char const *cs, int exists, int readonly, - char const *getbuf, struct stat *filestat) + char const *getbuf, struct stat *filestat, + security_context_t *filecontext) { if (patch_get < 0) { @@ -400,6 +401,13 @@ version_get (char const *filename, char fatal ("Can't get file %s from %s", quotearg (filename), cs); if (stat (filename, filestat) != 0) pfatal ("%s", quotearg (filename)); + if (filecontext && getfilecon (filename, filecontext) == -1) + { + if (errno == ENODATA || errno == ENOTSUP) + *filecontext = NULL; + else + pfatal ("%s", quotearg (filename)); + } } return 1; diff -up patch-2.5.4/util.h.selinux patch-2.5.4/util.h --- patch-2.5.4/util.h.selinux 1999-08-30 07:20:08.000000000 +0100 +++ patch-2.5.4/util.h 2009-02-17 15:33:13.000000000 +0000 @@ -21,7 +21,7 @@ char *fetchname PARAMS ((char *, int, ti char *savebuf PARAMS ((char const *, size_t)); char *savestr PARAMS ((char const *)); char const *version_controller PARAMS ((char const *, int, struct stat const *, char **, char **)); -int version_get PARAMS ((char const *, char const *, int, int, char const *, struct stat *)); +int version_get PARAMS ((char const *, char const *, int, int, char const *, struct stat *, security_context_t *)); int create_file PARAMS ((char const *, int, mode_t)); int systemic PARAMS ((char const *)); char *format_linenum PARAMS ((char[LINENUM_LENGTH_BOUND + 1], LINENUM));