From 7ac30031a8a18d97c8b7aa79f4f560c18599cea0 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 3 Jan 2005 19:18:21 +0000 Subject: [PATCH] * Mon Jan 3 2005 Dan Walsh 1.19.2-3 - Fix fixfiles handling of rpm - Fix restorecon to not warn on symlinks unless -v -v - Fix output of verbose to show old context as well as new context --- policycoreutils-rhat.patch | 35 ++++++++++++++++++++++++++++++++++- policycoreutils.spec | 6 ++++-- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 1ef590a..cb20c47 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -1,6 +1,39 @@ +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.19.2/restorecon/restorecon.c +--- nsapolicycoreutils/restorecon/restorecon.c 2004-12-29 12:18:11.000000000 -0500 ++++ policycoreutils-1.19.2/restorecon/restorecon.c 2005-01-03 14:14:12.256118904 -0500 +@@ -68,7 +68,8 @@ + return 1; + } + if (S_ISLNK(st.st_mode)) { +- fprintf(stderr,"Warning! %s refers to a symbolic link, not following last component.\n", filename); ++ if (verbose>1) ++ fprintf(stderr,"Warning! %s refers to a symbolic link, not following last component.\n", filename); + char *p = NULL, *file_sep; + char *tmp_path = strdup(filename); + if (!tmp_path) { +@@ -129,8 +130,8 @@ + return 1; + } else + if (verbose) +- fprintf(stderr,"%s reset context %s->%s\n", +- progname, filename, scontext); ++ fprintf(stderr,"%s reset context %s:%s->%s\n", ++ progname, filename, prev_context, scontext); + } + if (retcontext >= 0) + freecon(prev_context); +@@ -198,7 +199,7 @@ + } + break; + case 'v': +- verbose = 1; ++ verbose++; + break; + case 'f': + file = 1; diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.19.2/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2004-10-26 11:15:41.000000000 -0400 -+++ policycoreutils-1.19.2/scripts/fixfiles 2005-01-03 13:30:04.708085304 -0500 ++++ policycoreutils-1.19.2/scripts/fixfiles 2005-01-03 13:30:04.000000000 -0500 @@ -53,10 +53,13 @@ echo $1 >> $LOGFILE fi diff --git a/policycoreutils.spec b/policycoreutils.spec index cb58dc4..e2eb2d5 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -1,7 +1,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.19.2 -Release: 2 +Release: 3 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -76,8 +76,10 @@ rm -rf ${RPM_BUILD_ROOT} %changelog -* Mon Dec 29 2004 Dan Walsh 1.19.2-2 +* Mon Jan 3 2005 Dan Walsh 1.19.2-3 - Fix fixfiles handling of rpm +- Fix restorecon to not warn on symlinks unless -v -v +- Fix output of verbose to show old context as well as new context * Mon Dec 29 2004 Dan Walsh 1.19.2-1 - Update to latest from NSA