rpms
/
policycoreutils
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Wed Jun 21 2006 Dan Walsh <dwalsh@redhat.com> 1.30.14-4 

- Don't use translations with matchpathcon
This commit is contained in:
Daniel J Walsh 2006-06-21 19:58:48 +00:00
parent 90f5b53a4d
commit 30ac94943b
2 changed files with 67 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
policycoreutils-rhat.patch
View File

@ -192,6 +192,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/mr.po policycoreutils
#: ../newrole/newrole.c:481
#, c-format
3b
+#, fuzzy
msgid "Error: multiple roles specified\n"
-msgstr ""
@ -893,6 +894,68 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ms.po policycoreutils
msgid "Options Error: %s "
msgstr "Ralat Pilihan: %s"
+
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.30.14/restorecon/restorecon.c
--- nsapolicycoreutils/restorecon/restorecon.c 2006-05-15 09:42:56.000000000 -0400
+++ policycoreutils-1.30.14/restorecon/restorecon.c 2006-06-21 15:51:43.000000000 -0400
@@ -185,7 +185,7 @@
fprintf(stderr,"matchpathcon(%s) failed %s\n", filename,strerror(errno));
return 1;
}
- retcontext=lgetfilecon(filename,&prev_context);
+ retcontext=lgetfilecon_raw(filename,&prev_context);
if (retcontext >= 0 || errno == ENODATA) {
int customizable=0;
@@ -306,6 +306,7 @@
progname=argv[0];
if (is_selinux_enabled() <= 0 )
exit(0);
+ set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
while ((opt = getopt(argc, argv, "FrRnvf:o:e:")) > 0) {
switch (opt) {
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.30.14/restorecond/restorecond.c
--- nsapolicycoreutils/restorecond/restorecond.c 2006-05-15 09:42:57.000000000 -0400
+++ policycoreutils-1.30.14/restorecond/restorecond.c 2006-06-21 15:56:15.000000000 -0400
@@ -182,7 +182,7 @@
syslog(LOG_ERR,"matchpathcon(%s) failed %s\n", filename,strerror(errno));
return;
}
- retcontext=fgetfilecon(fd,&prev_context);
+ retcontext=fgetfilecon_raw(fd,&prev_context);
if (retcontext >= 0 || errno == ENODATA) {
if (retcontext < 0) prev_context=NULL;
@@ -420,6 +420,8 @@
sigemptyset( &sa.sa_mask ) ;
sigaction( SIGTERM, &sa, NULL );
+ set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
+
master_fd = inotify_init ();
if (master_fd < 0)
exitApp("inotify_init");
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-1.30.14/setfiles/setfiles.c
--- nsapolicycoreutils/setfiles/setfiles.c 2006-06-16 15:08:24.000000000 -0400
+++ policycoreutils-1.30.14/setfiles/setfiles.c 2006-06-21 15:54:16.000000000 -0400
@@ -301,7 +301,7 @@
}
/* Get the current context of the file. */
- ret = lgetfilecon(my_file, &context);
+ ret = lgetfilecon_raw(my_file, &context);
if (ret < 0) {
if (errno == ENODATA) {
context = NULL;
@@ -485,7 +485,7 @@
memset(excludeArray,0, sizeof(excludeArray));
/* Validate all file contexts during matchpathcon_init. */
- set_matchpathcon_flags(MATCHPATHCON_VALIDATE);
+ set_matchpathcon_flags(MATCHPATHCON_VALIDATE | MATCHPATHCON_NOTRANS);
/* Process any options. */
while ((opt = getopt(argc, argv, "Fc:dlnqrsvWe:o:")) > 0) {
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setsebool/setsebool.8 policycoreutils-1.30.14/setsebool/setsebool.8
--- nsapolicycoreutils/setsebool/setsebool.8 2006-05-15 09:42:58.000000000 -0400
+++ policycoreutils-1.30.14/setsebool/setsebool.8 2006-06-19 10:32:36.000000000 -0400

5
policycoreutils.spec
View File

@ -5,7 +5,7 @@
Summary: SELinux policy core utilities.
Name: policycoreutils
Version: 1.30.14
Release: 3
Release: 4
License: GPL
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@ -111,6 +111,9 @@ rm -rf %{buildroot}
[ -x /sbin/service ] && /sbin/service restorecond condrestart
%changelog
* Wed Jun 21 2006 Dan Walsh <dwalsh@redhat.com> 1.30.14-4
- Don't use translations with matchpathcon
* Tue Jun 20 2006 Dan Walsh <dwalsh@redhat.com> 1.30.14-3
- Prompt for selinux-policy-devel package in audit2allow