workaround strange koji failures(#449910, #442352), fixed ls -ZC

segfault(#449866)
This commit is contained in:
Ondrej Vasik 2008-06-04 17:56:55 +00:00
parent 393646c215
commit 98cf8da1e8
3 changed files with 22 additions and 2 deletions

View File

@ -1,3 +1,18 @@
diff --git a/lib/utimens.c b/lib/utimens.c
index 134310b..18a8e7c 100644
--- a/lib/utimens.c
+++ b/lib/utimens.c
@@ -103,6 +103,10 @@ gl_futimens (int fd ATTRIBUTE_UNUSED,
if (fd < 0)
{
int result = utimensat (AT_FDCWD, file, timespec, 0);
+ /* Work around what might be a koji xen kernel bug):
+ http://bugzilla.redhat.com/442352 */
+ if (result == 280)
+ result = 0;
if (result == 0 || errno != ENOSYS)
return result;
}
diff -urN coreutils-6.12-orig/tests/misc/cut coreutils-6.12/tests/misc/cut
--- coreutils-6.12-orig/tests/misc/cut 2008-05-17 08:41:11.000000000 +0200
+++ coreutils-6.12/tests/misc/cut 2008-06-02 11:13:08.000000000 +0200

View File

@ -743,7 +743,7 @@ diff -urp coreutils-6.10-orig/src/ls.c coreutils-6.10/src/ls.c
f->stat_ok = true;
- if (format == long_format || print_scontext)
+ if (format == long_format || format == security_format)
+ if (format == long_format || format == security_format || print_scontext)
{
bool have_acl = false;
int attr_len = (do_deref

View File

@ -1,7 +1,7 @@
Summary: The GNU core utilities: a set of tools commonly used in shell scripts
Name: coreutils
Version: 6.12
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv3+
Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/
@ -307,6 +307,11 @@ fi
/sbin/runuser
%changelog
* Wed Jun 04 2008 Ondrej Vasik <ovasik@redhat.com> - 6.12-2
- workaround for strange koji failures(#449910,#442352)
- fixed ls -ZC segfault(#449866, introduced by 6.10-1
SELinux patch reworking)
* Mon Jun 02 2008 Ondrej Vasik <ovasik@redhat.com> - 6.12-1
- New upstream release 6.12, adapted patches