From 97c49fbdc62c5c5c7ec8ff7c7c25f8bf94d2c190 Mon Sep 17 00:00:00 2001 From: Ondrej Vasik Date: Mon, 19 May 2008 11:31:08 +0000 Subject: [PATCH] added arch utility (from util-linux-ng) + do not show executable file types without executable bit in colored ls as executable --- coreutils-6.10-configuration.patch | 12 ------------ coreutils-DIR_COLORS | 14 +++++++------- coreutils-DIR_COLORS.256color | 14 +++++++------- coreutils-DIR_COLORS.xterm | 14 +++++++------- coreutils.spec | 13 +++++++++---- 5 files changed, 30 insertions(+), 37 deletions(-) diff --git a/coreutils-6.10-configuration.patch b/coreutils-6.10-configuration.patch index 36680b1..f5a12cf 100644 --- a/coreutils-6.10-configuration.patch +++ b/coreutils-6.10-configuration.patch @@ -1,15 +1,3 @@ -diff -urNp coreutils-6.11-orig/tests/touch/no-create-missing coreutils-6.11/tests/touch/no-create-missing ---- coreutils-6.11-orig/tests/touch/no-create-missing 2008-04-19 23:34:23.000000000 +0200 -+++ coreutils-6.11/tests/touch/no-create-missing 2008-04-24 12:34:52.000000000 +0200 -@@ -36,7 +36,7 @@ test="$abs_top_builddir/src/test" - # This test is ineffective unless /dev/stdout also works. - if "$test" -w /dev/stdout >/dev/null && - "$test" ! -w /dev/stdout >&-; then -- touch -c - >&- 2> /dev/null || fail=1 -+ strace touch -c - >&- || fail=1 - touch -cm - >&- 2> /dev/null || fail=1 - touch -ca - >&- 2> /dev/null || fail=1 - fi diff -urNp coreutils-6.11-orig/tests/mkdir/selinux coreutils-6.11/tests/mkdir/selinux --- coreutils-6.11-orig/tests/mkdir/selinux 2008-04-19 23:34:23.000000000 +0200 +++ coreutils-6.11/tests/mkdir/selinux 2008-04-22 13:23:50.000000000 +0200 diff --git a/coreutils-DIR_COLORS b/coreutils-DIR_COLORS index 0583c2f..95aea7a 100644 --- a/coreutils-DIR_COLORS +++ b/coreutils-DIR_COLORS @@ -95,13 +95,13 @@ EXEC 01;32 # to colorize below. Put the extension, a space, and the color init string. # (and any comments you want to add after a '#') # executables (bright green) -.cmd 01;32 -.exe 01;32 -.com 01;32 -.btm 01;32 -.bat 01;32 -.sh 01;32 -.csh 01;32 +#.cmd 01;32 +#.exe 01;32 +#.com 01;32 +#.btm 01;32 +#.bat 01;32 +#.sh 01;32 +#.csh 01;32 # archives or compressed (bright red) .tar 01;31 .tgz 01;31 diff --git a/coreutils-DIR_COLORS.256color b/coreutils-DIR_COLORS.256color index 896667e..ec7e1e9 100644 --- a/coreutils-DIR_COLORS.256color +++ b/coreutils-DIR_COLORS.256color @@ -73,13 +73,13 @@ EXEC 01;38;5;34 # to colorize below. Put the extension, a space, and the color init string. # (and any comments you want to add after a '#') # executables (bright green) -.cmd 01;38;5;34 -.exe 01;38;5;34 -.com 01;38;5;34 -.btm 01;38;5;34 -.bat 01;38;5;34 -.sh 01;38;5;34 -.csh 01;38;5;34 +#.cmd 01;38;5;34 +#.exe 01;38;5;34 +#.com 01;38;5;34 +#.btm 01;38;5;34 +#.bat 01;38;5;34 +#.sh 01;38;5;34 +#.csh 01;38;5;34 # archives or compressed (bright red) .tar 01;38;5;9 .tgz 01;38;5;9 diff --git a/coreutils-DIR_COLORS.xterm b/coreutils-DIR_COLORS.xterm index 0aa54d2..535c732 100644 --- a/coreutils-DIR_COLORS.xterm +++ b/coreutils-DIR_COLORS.xterm @@ -76,13 +76,13 @@ EXEC 00;32 # List any file extensions like '.gz' or '.tar' that you would like ls # to colorize below. Put the extension, a space, and the color init string. # (and any comments you want to add after a '#') -.cmd 00;32 # executables (green) -.exe 00;32 -.com 00;32 -.btm 00;32 -.bat 00;32 -.sh 00;32 -.csh 00;32 +#.cmd 00;32 # executables (green) +#.exe 00;32 +#.com 00;32 +#.btm 00;32 +#.bat 00;32 +#.sh 00;32 +#.csh 00;32 # archives or compressed (red) .tar 00;31 .tgz 00;31 diff --git a/coreutils.spec b/coreutils.spec index e05babe..8fcf200 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -1,7 +1,7 @@ Summary: The GNU core utilities: a set of tools commonly used in shell scripts Name: coreutils Version: 6.11 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -58,7 +58,6 @@ BuildRequires: gettext bison BuildRequires: texinfo >= 4.3 BuildRequires: lzma BuildRequires: autoconf >= 2.58 -BuildRequires: strace #dist-lzma required BuildRequires: automake >= 1.10.1 %{?!nopam:BuildRequires: pam-devel} @@ -155,7 +154,7 @@ autoconf --force automake --copy --add-missing %configure --enable-largefile --with-afs %{?!nopam:--enable-pam} \ --enable-selinux \ - --enable-install-program=su,hostname \ + --enable-install-program=su,hostname,arch \ DEFAULT_POSIX2_VERSION=200112 alternative=199209 || : make all %{?_smp_mflags} \ %{?!nopam:CPPFLAGS="-DUSE_PAM"} \ @@ -187,7 +186,7 @@ bzip2 -9f ChangeLog # let be compatible with old fileutils, sh-utils and textutils packages : mkdir -p $RPM_BUILD_ROOT{/bin,%_bindir,%_sbindir,/sbin} %{?!nopam:mkdir -p $RPM_BUILD_ROOT%_sysconfdir/pam.d} -for f in basename cat chgrp chmod chown cp cut date dd df echo env false link ln ls mkdir mknod mktemp mv nice pwd rm rmdir sleep sort stty sync touch true uname unlink +for f in arch basename cat chgrp chmod chown cp cut date dd df echo env false link ln ls mkdir mknod mktemp mv nice pwd rm rmdir sleep sort stty sync touch true uname unlink do mv $RPM_BUILD_ROOT{%_bindir,/bin}/$f done @@ -267,6 +266,7 @@ fi %{?!nopam:%config(noreplace) %{_sysconfdir}/pam.d/runuser} %{?!nopam:%config(noreplace) %{_sysconfdir}/pam.d/runuser-l} %doc COPYING ABOUT-NLS ChangeLog.bz2 NEWS README THANKS TODO old/* +/bin/arch /bin/basename /bin/cat /bin/chgrp @@ -307,6 +307,11 @@ fi /sbin/runuser %changelog +* Mon May 19 2008 Ondrej Vasik - 6.11-3 +- added arch utility (from util-linux-ng) +- do not show executable file types without executable bit + in colored ls as executable + * Wed Apr 23 2008 Ondrej Vasik - 6.11-2 - Do not show misleading scontext in id command when user is specified (#443485)