Author: peroyvind Date: Wed Jan 31 22:57:58 2007 New Revision: 115785 Added: packages/cooker/coreutils/current/SOURCES/coreutils-5.97-force-option--override--interactive-option.patch Modified: packages/cooker/coreutils/current/SPECS/coreutils.spec
Log: reintroduce interactive override (-if) and rather fix check (P1155, real fix for #16209) Added: packages/cooker/coreutils/current/SOURCES/coreutils-5.97-force-option--override--interactive-option.patch ============================================================================== --- (empty file) +++ packages/cooker/coreutils/current/SOURCES/coreutils-5.97-force-option--override--interactive-option.patch Wed Jan 31 22:57:58 2007 @@ -0,0 +1,29 @@ +--- coreutils-5.97/src/cp.c.override 2005-09-16 09:50:33.000000000 +0200 ++++ coreutils-5.97/src/cp.c 2007-01-31 21:42:55.000000000 +0100 +@@ -848,6 +848,7 @@ main (int argc, char **argv) + break; + + case 'f': ++ x.interactive = I_ALWAYS_YES; + x.unlink_dest_after_failed_open = true; + break; + +--- coreutils-5.97/tests/mv/i-2.override 2001-09-15 13:18:40.000000000 +0200 ++++ coreutils-5.97/tests/mv/i-2 2007-01-31 22:41:15.000000000 +0100 +@@ -42,11 +42,12 @@ mv -fi c d < y >/dev/null 2>&1 || fail=1 + # Before 4.0s, this would not prompt. + cp -if e f < y > out 2>&1 || fail=1 + ++#(peroyvind) this test is bogus, we don't want to be prompted when forcing + # Make sure out contains the prompt. +-case "`cat out`" in +- "cp: overwrite \`f', overriding mode 0000?"*) ;; +- *) fail=1 ;; +-esac ++#case "`cat out`" in ++# "cp: overwrite \`f', overriding mode 0000?"*) ;; ++# *) fail=1 ;; ++#esac + + test -f e || fail=1 + test -f f || fail=1 Modified: packages/cooker/coreutils/current/SPECS/coreutils.spec ============================================================================== --- packages/cooker/coreutils/current/SPECS/coreutils.spec (original) +++ packages/cooker/coreutils/current/SPECS/coreutils.spec Wed Jan 31 22:57:58 2007 @@ -4,7 +4,7 @@ Summary: The GNU core utilities: a set of tools commonly used in shell scripts Name: coreutils Version: 5.97 -Release: %mkrel 4 +Release: %mkrel 5 License: GPL Group: System/Base Url: ftp://alpha.gnu.org/gnu/coreutils/ @@ -22,6 +22,7 @@ Patch101: coreutils-5.93-spacedir.patch.bz2 Patch102: coreutils-5.1.1-sparc.patch.bz2 Patch107: fileutils-4.1.10-timestyle.patch.bz2 +Patch1155: coreutils-5.97-force-option--override--interactive-option.patch Patch118: fileutils-4.1-ls_h.patch.bz2 Patch152: coreutils-4.5.7-touch_errno.patch.bz2 Patch500: textutils-2.0.17-mem.patch.bz2 @@ -110,6 +111,7 @@ %patch101 -p1 -b .space %patch102 -p1 -b .sparc %patch107 -p1 -b .timestyle +%patch1155 -p1 -b .override %patch118 -p1 %patch152 -p1
