SOURCES: coreutils-selinux.patch - updated to 6.9
baggins
baggins at pld-linux.org
Tue Mar 27 17:18:05 CEST 2007
Author: baggins Date: Tue Mar 27 15:18:05 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated to 6.9
---- Files affected:
SOURCES:
coreutils-selinux.patch (1.10 -> 1.11)
---- Diffs:
================================================================
Index: SOURCES/coreutils-selinux.patch
diff -u SOURCES/coreutils-selinux.patch:1.10 SOURCES/coreutils-selinux.patch:1.11
--- SOURCES/coreutils-selinux.patch:1.10 Sat Dec 9 20:12:12 2006
+++ SOURCES/coreutils-selinux.patch Tue Mar 27 17:17:59 2007
@@ -487,7 +487,7 @@
+msgid "conflicting security context specifiers given"
+msgstr "konflikt miêdzy podanymi okre¶leniami kontekstu bezpieczeñstwa"
+
- #: src/chgrp.c:95 src/install.c:612
+ #: src/chgrp.c:95 src/install.c:611
#, c-format
msgid "invalid group %s"
@@ -1540,6 +1629,21 @@
@@ -509,7 +509,7 @@
+msgid "cannot lgetfilecon %s"
+msgstr "nie mo¿na wykonaæ lgetfilecon %s"
+
- #: src/copy.c:1534
+ #: src/copy.c:1553
#, c-format
msgid "cannot copy cyclic symbolic link %s"
@@ -1688,6 +1792,10 @@
@@ -562,7 +562,7 @@
+msgid "cannot set default security context %s"
+msgstr "nie mo¿na ustawiæ domy¶lnego kontekstu bezpieczeñstwa %s"
+
- #: src/cp.c:1016
+ #: src/cp.c:1030
#, c-format
msgid "cannot make both hard and symbolic links"
@@ -3880,6 +4009,7 @@
@@ -655,7 +655,7 @@
+" -P, --preserve_context (SELinux) zachowanie kontekstu bezpieczeñstwa\n"
+" -Z, --context=KONTEKST (SELinux) ustawienie kontekstu plików i katalogów\n"
+
- #: src/install.c:693 src/ln.c:365 src/mv.c:318
+ #: src/install.c:692 src/ln.c:365 src/mv.c:318
msgid ""
"\n"
@@ -4468,6 +4648,11 @@
@@ -667,7 +667,7 @@
+msgid "Sorry, this option can only be used on a SELinux-enabled kernel.\n"
+msgstr "Niestety tej opcji mo¿na u¿yæ tylko na j±drze z obs³ug± SELinuksa.\n"
+
- #: src/ls.c:677
+ #: src/ls.c:684
msgid "%b %e %Y"
msgstr "%b %e %Y"
@@ -4841,6 +5026,34 @@
@@ -1375,23 +1375,17 @@
if (S_ISDIR (src_mode))
{
struct dir_list *dir;
-@@ -1544,8 +1577,14 @@
- }
-
- /* Are we crossing a file system boundary? */
-- if (x->one_file_system && device != 0 && device != src_sb.st_dev)
-- return true;
-+
-+ if (x->one_file_system && device != 0 && device != src_sb.st_dev) {
+@@ -1544,6 +1577,10 @@
+ {
+ /* Here, we are crossing a file system boundary and cp's -x option
+ is in effect: so don't copy the contents of this directory. */
+#ifdef WITH_SELINUX
+ if (x->preserve_security_context && selinux_enabled)
+ setfscreatecon(NULL);
+#endif
-+ return true;
-+ }
-
- /* Copy the contents of the directory. */
-
+ }
+ else
+ {
@@ -1689,6 +1728,11 @@
}
}
@@ -2017,19 +2011,19 @@
default:
usage (LS_FAILURE);
}
-@@ -2485,6 +2560,12 @@
- {
- free (files[i].name);
- free (files[i].linkname);
-+#ifdef WITH_SELINUX
-+ if (files[i].scontext) {
-+ freecon (files[i].scontext);
-+ files[i].scontext=NULL;
+@@ -2485,6 +2558,12 @@
+ struct fileinfo *f = sorted_file[i];
+ free (f->name);
+ free (f->linkname);
++#ifdef WITH_SELINUX
++ if (f->scontext) {
++ freecon (f->scontext);
++ f->scontext=NULL;
+ }
+#endif
}
- files_index = 0;
+ cwd_n_used = 0;
@@ -2527,6 +2608,9 @@
memset (f, '\0', sizeof *f);
f->stat.st_ino = inode;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/coreutils-selinux.patch?r1=1.10&r2=1.11&f=u
More information about the pld-cvs-commit
mailing list