rpms/policycoreutils
5
0
Fork 0
Code Issues Pull Requests Releases Activity

* Mon Jan 3 2005 Dan Walsh <dwalsh@redhat.com> 1.19.2-3

Browse Source 
- 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
This commit is contained in:
Daniel J Walsh 2005-01-03 19:18:21 +00:00
parent 3673618fbf
commit 7ac30031a8
2 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
policycoreutils-rhat.patch
View File

@ -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

6
policycoreutils.spec
View File

@ -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 <dwalsh@redhat.com> 1.19.2-2
* Mon Jan 3 2005 Dan Walsh <dwalsh@redhat.com> 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 <dwalsh@redhat.com> 1.19.2-1
- Update to latest from NSA