From 6f8d76967a7cd27cbee01e5262fa37e2d1b38e96 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: May 18 2007 14:44:34 +0000 Subject: * Fri May 19 2007 Dan Walsh 2.0.19-1 - Update to match NSA --- diff --git a/.cvsignore b/.cvsignore index 6a25069..2235854 100644 --- a/.cvsignore +++ b/.cvsignore @@ -150,3 +150,4 @@ policycoreutils-2.0.13.tgz policycoreutils-2.0.14.tgz policycoreutils-2.0.15.tgz policycoreutils-2.0.16.tgz +policycoreutils-2.0.19.tgz diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index e95043a..a0bf94c 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -1,6 +1,6 @@ -diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-2.0.14/audit2allow/Makefile +diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-2.0.16/audit2allow/Makefile --- nsapolicycoreutils/audit2allow/Makefile 2007-02-07 12:11:49.000000000 -0500 -+++ policycoreutils-2.0.14/audit2allow/Makefile 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/audit2allow/Makefile 2007-05-17 13:43:57.000000000 -0400 @@ -1,6 +1,7 @@ # Installation directories. PREFIX ?= ${DESTDIR}/usr @@ -18,76 +18,18 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -mkdir -p $(MANDIR)/man1 install -m 644 audit2allow.1 $(MANDIR)/man1/ -diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.14/Makefile ---- nsapolicycoreutils/Makefile 2006-11-16 17:15:00.000000000 -0500 -+++ policycoreutils-2.0.14/Makefile 2007-04-30 08:57:42.000000000 -0400 +diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.16/Makefile +--- nsapolicycoreutils/Makefile 2007-05-18 09:58:33.000000000 -0400 ++++ policycoreutils-2.0.16/Makefile 2007-05-17 13:43:57.000000000 -0400 @@ -1,4 +1,4 @@ --SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po -+SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui +-SUBDIRS=setfiles semanage load_policy newrole run_init restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po ++SUBDIRS=setfiles semanage load_policy newrole run_init restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui all install relabel clean indent: @for subdir in $(SUBDIRS); do \ -diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-2.0.14/restorecon/restorecon.c ---- nsapolicycoreutils/restorecon/restorecon.c 2007-04-24 10:36:17.000000000 -0400 -+++ policycoreutils-2.0.14/restorecon/restorecon.c 2007-04-30 08:57:42.000000000 -0400 -@@ -16,6 +16,7 @@ - * -v Show changes in file labels. - * -o filename save list of files with incorrect context - * -F Force reset of context to match file_context for customizable files -+ * -l Limit directory tree walk to a single filesystem - * - * pathname... The file(s) to label - * -@@ -50,6 +51,7 @@ - static int recurse = 0; - static int file_exist = 1; - static int force = 0; -+static int onefs = 0; - #define STAT_BLOCK_SIZE 1 - static int pipe_fds[2] = { -1, -1 }; - static unsigned long long count = 0; -@@ -326,17 +328,19 @@ - rc = fork(); - if (rc == 0) { - close(pipe_fds[0]); -- nftw(buf, pre_stat, 1024, FTW_PHYS); -+ nftw(buf, pre_stat, 1024, -+ FTW_PHYS | (onefs ? FTW_MOUNT : 0)); - exit(1); - } - if (rc > 0) - close(pipe_fds[1]); - if (rc == -1 || rc > 0) { -- if (nftw(buf, apply_spec, 1024, FTW_PHYS)) { -+ if (nftw(buf, apply_spec, 1024, -+ FTW_PHYS | (onefs ? FTW_MOUNT : 0))) { - if (!file_exist && errno == ENOENT) - return; - fprintf(stderr, -- "%s: error while traversing %s: %s\n", -+ "%s: %s: %s\n", - progname, buf, strerror(errno)); - errors++; - } -@@ -367,11 +371,14 @@ - - set_matchpathcon_flags(MATCHPATHCON_NOTRANS); - -- while ((opt = getopt(argc, argv, "ipFrRnvf:o:e:")) > 0) { -+ while ((opt = getopt(argc, argv, "ipFrRnvf:lo:e:")) > 0) { - switch (opt) { - case 'n': - change = 0; - break; -+ case 'l': -+ onefs = 1; -+ break; - case 'i': - file_exist = 0; - break; -diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.14/restorecond/restorecond.c +diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.16/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 2007-02-22 08:53:22.000000000 -0500 -+++ policycoreutils-2.0.14/restorecond/restorecond.c 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/restorecond/restorecond.c 2007-05-17 13:43:57.000000000 -0400 @@ -210,9 +210,10 @@ } @@ -114,21 +56,9 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po } free(scontext); close(fd); -diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-2.0.14/scripts/genhomedircon ---- nsapolicycoreutils/scripts/genhomedircon 2007-04-25 11:08:44.000000000 -0400 -+++ policycoreutils-2.0.14/scripts/genhomedircon 2007-05-04 09:14:57.000000000 -0400 -@@ -302,7 +302,7 @@ - - regex = re.sub("\(\/\.\*\)\?", "", regex) - regex = regex + "/*$" -- if re.search(home, regex, 0): -+ if re.search(regex,home, 0): - return 1 - except: - continue -diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.14/semanage/seobject.py +diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.16/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2007-04-12 12:43:06.000000000 -0400 -+++ policycoreutils-2.0.14/semanage/seobject.py 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/semanage/seobject.py 2007-05-17 13:43:57.000000000 -0400 @@ -210,6 +210,7 @@ os.write(fd, self.out()) os.close(fd) diff --git a/policycoreutils.spec b/policycoreutils.spec index 20d5618..8c9f8f9 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -5,8 +5,8 @@ %define sepolgenver 1.0.8 Summary: SELinux policy core utilities. Name: policycoreutils -Version: 2.0.16 -Release: 2%{?dist} +Version: 2.0.19 +Release: 1%{?dist} License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -192,6 +192,9 @@ if [ "$1" -ge "1" ]; then fi %changelog +* Fri May 19 2007 Dan Walsh 2.0.19-1 +- Update to match NSA + * Thu May 17 2007 Dan Walsh 2.0.16-2 - Fixes for polgentool templates file diff --git a/sources b/sources index ceb78b7..6a1654d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 4d6e57c7fc396efbcf96b7accab4ba30 sepolgen-1.0.8.tgz -19c4fbfa60756282d78012fd8695c821 policycoreutils-2.0.16.tgz +bd32594844a81cb3116ecd131bce027c policycoreutils-2.0.19.tgz