Hello community, here is the log from the commit of package coreutils checked in at Thu Dec 14 01:50:54 CET 2006. -------- --- coreutils/coreutils.changes 2006-12-11 01:37:02.000000000 +0100 +++ /mounts/work_src_done/STABLE/coreutils/coreutils.changes 2006-12-13 13:27:47.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 13 13:27:36 CET 2006 - schwab@suse.de + +- Fix acl tests. + +------------------------------------------------------------------- New: ---- acl-test.diff getcwd.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ coreutils.spec ++++++ --- /var/tmp/diff_new_pack.CvRtNV/_old 2006-12-14 01:50:29.000000000 +0100 +++ /var/tmp/diff_new_pack.CvRtNV/_new 2006-12-14 01:50:29.000000000 +0100 @@ -21,7 +21,7 @@ Autoreqprov: on PreReq: %{install_info_prereq} Version: 6.7 -Release: 1 +Release: 3 Summary: GNU Core Utilities Source: coreutils-%{version}.tar.bz2 Source1: su.pamd @@ -34,6 +34,8 @@ Patch6: i18n-infloop.diff Patch7: coreutils-5.0-pam-env.patch Patch8: coreutils-sysinfo.diff +Patch9: acl-test.diff +Patch10: getcwd.diff Patch16: invalid-ids.diff Patch17: no-no.diff Patch20: coreutils-5.3.0-pie.diff @@ -99,6 +101,8 @@ %patch %patch7 -p1 %patch8 -p1 +%patch9 -p1 +%patch10 %patch16 -p1 %patch17 %patch20 @@ -107,8 +111,6 @@ %build AUTOPOINT=true autoreconf -fi -# We don't want to use the slow getcwd replacement. -gl_cv_func_getcwd_path_max=yes \ ./configure CFLAGS="-DUSE_PAM $RPM_OPT_FLAGS -Wall" \ DEFAULT_POSIX2_VERSION=199209 \ --prefix=%{_prefix} --mandir=%{_mandir} \ @@ -169,6 +171,8 @@ %dir %{_prefix}/share/locale/*/LC_TIME %changelog -n coreutils +* Wed Dec 13 2006 - schwab@suse.de +- Fix acl tests. * Sat Dec 09 2006 - schwab@suse.de - Update to coreutils 6.7. ** Bug fixes ++++++ acl-test.diff ++++++ 2006-12-13 Andreas Schwab <schwab@suse.de> * tests/mv/acl (skip): Check for acl support in the file system. * tests/mv/Makefile.am (XFAIL_TESTS): Remove. (TESTS_ENVIRONMENT): Pass CONFIG_HEADER. 2006-12-12 Jim Meyering <jim@meyering.net> * m4/acl.m4 (gl_ACL_GET_FILE): Fix logic error. Reported by Andreas Schwab <schwab@suse.de>. diff --git a/tests/mv/Makefile.am b/tests/mv/Makefile.am index 57581cd..0a1f2db 100644 --- a/tests/mv/Makefile.am +++ b/tests/mv/Makefile.am @@ -20,7 +20,6 @@ AUTOMAKE_OPTIONS = 1.3 gnits -XFAIL_TESTS = acl TESTS = \ hard-verbose \ backup-dir \ @@ -48,4 +47,5 @@ TESTS_ENVIRONMENT = \ PERL="$(PERL)" \ EGREP="$(EGREP)" \ PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \ + CONFIG_HEADER=$(CONFIG_HEADER) \ PROG=mv diff --git a/tests/mv/acl b/tests/mv/acl index f570656..df3bb01 100755 --- a/tests/mv/acl +++ b/tests/mv/acl @@ -24,6 +24,13 @@ # Make sure we get English translations. . $srcdir/../lang-default +# Skip this test if cp was built without ACL support: +grep '^#define USE_ACL 0' $CONFIG_HEADER > /dev/null && \ + { + echo 1>&2 "$0: insufficient ACL support, so skipping this test" + (exit 77); exit 77 + } + if test "$VERBOSE" = yes; then set -x mv --version @@ -46,15 +53,26 @@ framework_failure=0 mkdir -p $tmp || framework_failure=1 cd $tmp || framework_failure=1 +touch file || framework_failure=1 + if test $framework_failure = 1; then echo 'failure in testing framework' (exit 1); exit 1 fi +skip=no +# Ensure that setfacl and getfacl work on this file system. +setfacl -m user:bin:rw file 2> /dev/null || skip=yes +acl1=`getfacl file` || skip=yes + +test $skip = yes && + { + echo "$0: '.' is not on a suitable file system for this test" 1>&2 + echo "$0: skipping this test" 1>&2 + (exit 77); exit 77 + } + # move the access acl of a file -touch file || framework_failure=1 -setfacl -m user:bin:rw file || framework_failure=1 -acl1=`getfacl file` || framework_failure=1 mv file $other_partition_tmpdir || fail=1 acl2=`cd $other_partition_tmpdir && getfacl file` || framework_failure=1 test "$acl1" = "$acl2" || fail=1 --- a/m4/acl.m4 +++ b/m4/acl.m4 @@ -53,7 +53,7 @@ #include <errno.h> ]], [[return !! (!acl_get_file (".", ACL_TYPE_ACCESS) - || errno == ENOENT);]])], + && errno == ENOENT);]])], [gl_cv_func_working_acl_get_file=yes], [gl_cv_func_working_acl_get_file=no], [gl_cv_func_working_acl_get_file=cross-compiling])]) ++++++ getcwd.diff ++++++ --- lib/getcwd.c +++ lib/getcwd.c @@ -137,7 +137,7 @@ size_t allocated = size; size_t used; -#if HAVE_PARTLY_WORKING_GETCWD && !defined AT_FDCWD +#if HAVE_PARTLY_WORKING_GETCWD /* The system getcwd works, except it sometimes fails when it shouldn't, setting errno to ERANGE, ENAMETOOLONG, or ENOENT. If AT_FDCWD is not defined, the algorithm below is O(N**2) and this ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org