rpms/coreutils/devel coreutils-selinux.patch, 1.36, 1.37 coreutils.spec, 1.182, 1.183
Ondrej Vasik (ovasik)
fedora-extras-commits at redhat.com
Tue Nov 13 15:11:43 UTC 2007
- Previous message: rpms/less/devel less.spec,1.43,1.44 lesspipe.sh,1.9,1.10
- Next message: rpms/metacity/devel .cvsignore, 1.60, 1.61 metacity.spec, 1.135, 1.136 sources, 1.60, 1.61
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ovasik
Update of /cvs/extras/rpms/coreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19835
Modified Files:
coreutils-selinux.patch coreutils.spec
Log Message:
fix of wrong preserving of security context in install - by upstream(#319231)
coreutils-selinux.patch:
Index: coreutils-selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-selinux.patch,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- coreutils-selinux.patch 29 Oct 2007 11:36:16 -0000 1.36
+++ coreutils-selinux.patch 13 Nov 2007 15:11:37 -0000 1.37
@@ -2223,18 +2223,32 @@
+#endif
case_GETOPT_HELP_CHAR;
case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
- default:
-@@ -523,6 +613,10 @@
+ default:
+@@ -503,6 +591,7 @@
+ static bool
+ change_attributes (char const *name)
+ {
++ bool ok = false;
+ /* chown must precede chmod because on some systems,
+ chown clears the set[ug]id bits for non-superusers,
+ resulting in incorrect permissions.
+@@ -521,9 +610,14 @@
+ else if (chmod (name, mode) != 0)
+ error (0, errno, _("cannot change permissions of %s"), quote (name));
else
- return true;
-
+- return true;
++ ok = true;
++
+#ifdef WITH_SELINUX
+ if (use_default_selinux_context)
-+ setdefaultfilecon(name);
++ setdefaultfilecon (name);
+#endif
- return false;
+
+- return false;
++ return ok;
}
+ /* Set the timestamps of file TO to match those of file FROM.
@@ -687,6 +781,11 @@
-T, --no-target-directory treat DEST as a normal file\n\
-v, --verbose print the name of each directory as it is created\n\
Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- coreutils.spec 2 Nov 2007 14:27:20 -0000 1.182
+++ coreutils.spec 13 Nov 2007 15:11:37 -0000 1.183
@@ -1,7 +1,7 @@
Summary: The GNU core utilities: a set of tools commonly used in shell scripts
Name: coreutils
Version: 6.9
-Release: 12%{?dist}
+Release: 13%{?dist}
License: GPLv2+
Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/
@@ -287,6 +287,10 @@
/sbin/runuser
%changelog
+* Tue Nov 13 2007 Ondrej Vasik <ovasik at redhat.com> - 6.9-13
+- fixed bug in selinux patch which caused bad preserving
+ of security context in install(#319231)
+
* Fri Nov 02 2007 Ondrej Vasik <ovasik at redhat.com> - 6.9-12
- added some upstream supported dircolors TERMs(#239266)
- fixed du output for unaccesible dirs(#250089)
- Previous message: rpms/less/devel less.spec,1.43,1.44 lesspipe.sh,1.9,1.10
- Next message: rpms/metacity/devel .cvsignore, 1.60, 1.61 metacity.spec, 1.135, 1.136 sources, 1.60, 1.61
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list