revert echo behaviour changes not accepted by upstream

This commit is contained in:
Ondrej Vasik 2008-03-17 11:44:11 +00:00
parent 4d6a38f126
commit f0d582d4d6
2 changed files with 9 additions and 17 deletions

View File

@ -1,17 +1,3 @@
diff -urp coreutils-6.10-orig/src/echo.c coreutils-6.10/src/echo.c
--- coreutils-6.10-orig/src/echo.c 2007-11-25 14:23:31.000000000 +0100
+++ coreutils-6.10/src/echo.c 2008-01-31 14:01:52.000000000 +0100
@@ -163,6 +163,10 @@ main (int argc, char **argv)
{
case 'e': case 'E': case 'n':
break;
+ case '-':
+ /* end of short options(allows to print -n,-e or -E) */
+ argc--;
+ argv++;
default:
goto just_echo;
}
diff -urp coreutils-6.10-orig/lib/long-options.c coreutils-6.10/lib/long-options.c
--- coreutils-6.10-orig/lib/long-options.c 2007-10-17 15:47:26.000000000 +0200
+++ coreutils-6.10/lib/long-options.c 2008-01-31 14:28:01.000000000 +0100

View File

@ -1,7 +1,7 @@
Summary: The GNU core utilities: a set of tools commonly used in shell scripts
Name: coreutils
Version: 6.10
Release: 12%{?dist}
Release: 13%{?dist}
License: GPLv3+
Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/
@ -25,7 +25,7 @@ Patch2: coreutils-dddoubleclose.patch
Patch100: coreutils-chgrp.patch
Patch101: coreutils-6.10-configuration.patch
Patch102: coreutils-6.10-manpages.patch
Patch103: coreutils-6.10-longoptions.patch
#Patch103: coreutils-6.10-longoptions.patch
# sh-utils
Patch703: sh-utils-2.0.11-dateman.patch
@ -104,7 +104,7 @@ cd %name-%version
%patch100 -p1 -b .chgrp
%patch101 -p1 -b .configure
%patch102 -p1 -b .manpages
%patch103 -p1 -b .longopt
#%patch103 -p1 -b .longopt
# sh-utils
%patch703 -p1 -b .dateman
@ -295,6 +295,12 @@ fi
/sbin/runuser
%changelog
* Mon Mar 17 2008 Ondrej Vasik <ovasik@redhat.com> - 6.10-13
- disable echo option separator behavior(added by #431005,
request for removal #437653 + upstream)
- temporarily disabled longoptions change until full
clarification upstreamery (#431005)
* Tue Mar 11 2008 Ondrej Vasik <ovasik@redhat.com> - 6.10-12
- fixed harmless double close of stdout in dd(#436368)