rpms/coreutils/devel coreutils-6.10-configuration.patch, 1.31, 1.32 coreutils-selinux.patch, 1.65, 1.66 coreutils.spec, 1.303, 1.304

[Ondrej Vasik]

Author: ovasik

Update of /cvs/pkgs/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17078

Modified Files:
	coreutils-6.10-configuration.patch coreutils-selinux.patch 
	coreutils.spec 
Log Message:
do not depend on selinux patch application in _require_selinux tests(#556350)

coreutils-6.10-configuration.patch:
 gnulib-tests/gnulib.mk     |   32 ++++++++++++++++----------------
 tests/Makefile.am          |    1 -
 tests/cp/cp-a-selinux      |    9 ++++++---
 tests/touch/no-dereference |    2 ++
 4 files changed, 24 insertions(+), 20 deletions(-)

Index: coreutils-6.10-configuration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/coreutils/devel/coreutils-6.10-configuration.patch,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- coreutils-6.10-configuration.patch	29 Jan 2010 11:33:06 -0000	1.31
+++ coreutils-6.10-configuration.patch	5 Feb 2010 16:21:41 -0000	1.32
@@ -79,20 +79,6 @@ diff -urNp coreutils-8.4-orig/tests/Make
    tail-2/inotify-hash-abuse2			\
    tail-2/F-vs-rename				\
    tail-2/inotify-rotate				\
-diff -urNp coreutils-8.4-orig/tests/test-lib.sh coreutils-8.4/tests/test-lib.sh
---- coreutils-8.4-orig/tests/test-lib.sh	2010-01-03 18:06:20.000000000 +0100
-+++ coreutils-8.4/tests/test-lib.sh	2010-01-14 10:28:17.000000000 +0100
-@@ -218,8 +218,8 @@ skip_if_()
- 
- require_selinux_()
- {
--  case `ls -Zd .` in
--    '? .'|'unlabeled .')
-+  case `ls --scontext -d . | cut -f1 -d" "` in
-+    '?'|'unlabeled')
-       skip_test_ "this system (or maybe just" \
-         "the current file system) lacks SELinux support"
-     ;;
 diff -urNp coreutils-8.4-orig/tests/touch/no-dereference coreutils-8.4/tests/touch/no-dereference
 --- coreutils-8.4-orig/tests/touch/no-dereference	2010-01-12 15:36:17.000000000 +0100
 +++ coreutils-8.4/tests/touch/no-dereference	2010-01-14 10:28:17.000000000 +0100

coreutils-selinux.patch:
 coreutils-8.1/configure.ac       |    7 +
 coreutils-8.1/man/chcon.x        |    2 
 coreutils-8.1/man/runcon.x       |    2 
 coreutils-8.1/src/chcon.c        |    2 
 coreutils-8.1/src/copy.c         |    2 
 coreutils-8.1/src/copy.h         |    3 
 coreutils-8.1/src/cp.c           |   39 +++++++++
 coreutils-8.1/src/id.c           |    2 
 coreutils-8.1/src/install.c      |   13 ++-
 coreutils-8.1/src/ls.c           |  159 +++++++++++++++++++++++++++++++--------
 coreutils-8.1/src/mkdir.c        |    1 
 coreutils-8.1/src/mknod.c        |    2 
 coreutils-8.1/src/mv.c           |    1 
 coreutils-8.1/src/runcon.c       |    2 
 coreutils-8.1/src/stat.c         |   81 +++++++++++++------
 coreutils-8.1/tests/misc/selinux |    2 
 coreutils-8.4/tests/test-lib.sh  |    4 
 17 files changed, 257 insertions(+), 67 deletions(-)

Index: coreutils-selinux.patch
===================================================================
RCS file: /cvs/pkgs/rpms/coreutils/devel/coreutils-selinux.patch,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- coreutils-selinux.patch	27 Dec 2009 11:40:37 -0000	1.65
+++ coreutils-selinux.patch	5 Feb 2010 16:21:41 -0000	1.66
@@ -794,6 +794,20 @@ diff -urNp coreutils-8.1-orig/src/stat.c
  
    exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
  }
+diff -urNp coreutils-8.4-orig/tests/test-lib.sh coreutils-8.4/tests/test-lib.sh
+--- coreutils-8.4-orig/tests/test-lib.sh	2010-01-03 18:06:20.000000000 +0100
++++ coreutils-8.4/tests/test-lib.sh	2010-01-14 10:28:17.000000000 +0100
+@@ -218,8 +218,8 @@ skip_if_()
+ 
+ require_selinux_()
+ {
+-  case `ls -Zd .` in
+-    '? .'|'unlabeled .')
++  case `ls -Zd . | cut -f4 -d" "` in
++    '?'|'unlabeled')
+       skip_test_ "this system (or maybe just" \
+         "the current file system) lacks SELinux support"
+     ;;
 diff -urNp coreutils-8.1-orig/tests/misc/selinux coreutils-8.1/tests/misc/selinux
 --- coreutils-8.1-orig/tests/misc/selinux	2009-10-30 12:51:07.000000000 +0100
 +++ coreutils-8.1/tests/misc/selinux	2009-11-20 13:11:40.000000000 +0100


Index: coreutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -p -r1.303 -r1.304
--- coreutils.spec	29 Jan 2010 11:33:06 -0000	1.303
+++ coreutils.spec	5 Feb 2010 16:21:42 -0000	1.304
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 8.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -337,6 +337,10 @@ fi
 %{_libdir}/coreutils
 
 %changelog
+- Fri Feb 05 2010 Ondrej Vasik <ovasik at redhat.com> - 8.4-4
+- do not depend on selinux patch application in
+  _require_selinux tests(#556350)
+
 * Fri Jan 29 2010 Ondrej Vasik <ovasik at redhat.com> - 8.4-3
 - do not fail tests if there are no loopdevices left
   (#558898)