OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 24-Mar-2004 16:10:20
Branch: HEAD Handle: 2004032415102000
Modified files:
openpkg-src/coreutils coreutils.patch coreutils.spec
Log:
preserve legacy options
Summary:
Revision Changes Path
1.7 +164 -0 openpkg-src/coreutils/coreutils.patch
1.39 +1 -1 openpkg-src/coreutils/coreutils.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/coreutils/coreutils.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 coreutils.patch
--- openpkg-src/coreutils/coreutils.patch 17 Jan 2004 20:05:11 -0000 1.6
+++ openpkg-src/coreutils/coreutils.patch 24 Mar 2004 15:10:20 -0000 1.7
@@ -65,3 +65,167 @@
#include "system.h"
+--- src/date.c.orig 2004-02-05 10:36:07.000000000 +0100
++++ src/date.c 2004-03-24 15:22:04.000000000 +0100
+@@ -299,7 +299,8 @@
+ int n_args;
+ int status;
+ int option_specified_date;
+- char const *short_options = (posix2_version () < 200112
++ char const *short_options = (posix2_version () < 200112 ||
++ !getenv ("POSIXLY_CORRECT")
+ ? COMMON_SHORT_OPTIONS "I::"
+ : COMMON_SHORT_OPTIONS "I:");
+
+--- src/expand.c.orig 2004-01-21 23:27:02.000000000 +0100
++++ src/expand.c 2004-03-24 15:23:21.000000000 +0100
+@@ -406,6 +406,8 @@
+ }
+
+ if (obsolete_tablist && 200112 <= posix2_version ())
++ if (obsolete_tablist && 200112 <= posix2_version () &&
++ getenv ("POSIXLY_CORRECT"))
+ {
+ error (0, 0, _("`-LIST' option is obsolete; use `-t LIST'"));
+ usage (EXIT_FAILURE);
+--- src/fold.c.orig 2004-01-21 23:27:02.000000000 +0100
++++ src/fold.c 2004-03-24 15:26:20.000000000 +0100
+@@ -270,6 +270,7 @@
+ memcpy (s + 2, a + 1, len_a);
+ argv[i] = s;
+ if (200112 <= posix2_version ())
++ if (200112 <= posix2_version () && getenv ("POSIXLY_CORRECT"))
+ {
+ error (0, 0, _("`%s' option is obsolete; use `%s'"), a, s);
+ usage (EXIT_FAILURE);
+--- src/head.c.orig 2004-01-21 23:27:02.000000000 +0100
++++ src/head.c 2004-03-24 15:27:04.000000000 +0100
+@@ -996,6 +996,7 @@
+ }
+
+ if (200112 <= posix2_version ())
++ if (200112 <= posix2_version () && getenv ("POSIXLY_CORRECT"))
+ {
+ error (0, 0, _("`-%s' option is obsolete; use `-%c %.*s%.*s%s'"),
+ n_string, count_lines ? 'n' : 'c',
+--- src/nice.c.orig 2004-01-22 00:23:24.000000000 +0100
++++ src/nice.c 2004-03-24 15:28:51.000000000 +0100
+@@ -107,7 +107,7 @@
+ char *s = argv[i];
+
+ if (s[0] == '-' && s[1] == '-' && ISDIGIT (s[2])
+- && posix2_version () < 200112)
++ && (posix2_version () < 200112 || !getenv ("POSIXLY_CORRECT")))
+ {
+ if (xstrtol (&s[2], NULL, 10, &adjustment, "") != LONGINT_OK)
+ error (EXIT_FAIL, 0, _("invalid option `%s'"), s);
+@@ -118,7 +118,7 @@
+ }
+ else if (s[0] == '-'
+ && (ISDIGIT (s[1]) || (s[1] == '+' && ISDIGIT (s[2])))
+- && posix2_version () < 200112)
++ && (posix2_version () < 200112 || !getenv ("POSIXLY_CORRECT")))
+ {
+ if (s[1] == '+')
+ ++s;
+--- src/od.c.orig 2004-01-21 23:27:02.000000000 +0100
++++ src/od.c 2004-03-24 15:29:59.000000000 +0100
+@@ -1621,7 +1621,8 @@
+ int width_specified = 0;
+ int n_failed_decodes = 0;
+ int err;
+- char const *short_options = (posix2_version () < 200112
++ char const *short_options = (posix2_version () < 200112 ||
++ !getenv ("POSIXLY_CORRECT")
+ ? COMMON_SHORT_OPTIONS "s::w::"
+ : COMMON_SHORT_OPTIONS "s:w:");
+
+--- src/pr.c.orig 2004-01-21 23:27:02.000000000 +0100
++++ src/pr.c 2004-03-24 15:30:48.000000000 +0100
+@@ -854,7 +854,8 @@
+ int old_w = FALSE;
+ int old_s = FALSE;
+ char **file_names;
+- char const *short_options = (posix2_version () < 200112
++ char const *short_options = (posix2_version () < 200112 ||
++ !getenv ("POSIXLY_CORRECT")
+ ? COMMON_SHORT_OPTIONS "S::"
+ : COMMON_SHORT_OPTIONS "S:");
+
+--- src/sort.c.orig 2004-02-17 11:47:35.000000000 +0100
++++ src/sort.c 2004-03-24 15:31:54.000000000 +0100
+@@ -2219,7 +2219,7 @@
+ bool mergeonly = false;
+ int nfiles = 0;
+ bool posixly_correct = (getenv ("POSIXLY_CORRECT") != NULL);
+- bool obsolete_usage = (posix2_version () < 200112);
++ bool obsolete_usage = (posix2_version () < 200112) || !posixly_correct;
+ char const *short_options = (obsolete_usage
+ ? COMMON_SHORT_OPTIONS "y::"
+ : COMMON_SHORT_OPTIONS "y:");
+--- src/split.c.orig 2004-01-21 23:27:02.000000000 +0100
++++ src/split.c 2004-03-24 15:32:48.000000000 +0100
+@@ -498,6 +498,8 @@
+ }
+
+ if (digits_optind && 200112 <= posix2_version ())
++ if (digits_optind && 200112 <= posix2_version ()
++ && getenv ("POSIXLY_CORRECT"))
+ {
+ char buffer[INT_BUFSIZE_BOUND (uintmax_t)];
+ char const *a = umaxtostr (n_units, buffer);
+--- src/tail.c.orig 2004-01-21 23:27:02.000000000 +0100
++++ src/tail.c 2004-03-24 15:33:32.000000000 +0100
+@@ -1364,7 +1364,7 @@
+ if (argc < 2)
+ return 0;
+
+- obsolete_usage = (posix2_version () < 200112);
++ obsolete_usage = (posix2_version () < 200112) || !getenv ("POSIXLY_CORRECT");
+
+ /* If P starts with `+' and the POSIX version predates 1003.1-2001,
+ or if P starts with `-N' (where N is a digit), or `-l', then it
+--- src/touch.c.orig 2004-01-21 23:27:02.000000000 +0100
++++ src/touch.c 2004-03-24 15:34:28.000000000 +0100
+@@ -385,7 +385,7 @@
+ /* The obsolete `MMDDhhmm[YY]' form is valid IFF there are
+ two or more non-option arguments. */
+ if (!date_set && 2 <= argc - optind && !STREQ (argv[optind - 1], "--")
+- && posix2_version () < 200112)
++ && (posix2_version () < 200112 || !getenv ("POSIXLY_CORRECT")))
+ {
+ if (posixtime (&newtime.tv_sec, argv[optind], PDS_TRAILING_YEAR))
+ {
+--- src/unexpand.c.orig 2004-01-21 23:27:02.000000000 +0100
++++ src/unexpand.c 2004-03-24 15:35:09.000000000 +0100
+@@ -461,7 +461,8 @@
+ }
+ }
+
+- if (obsolete_tablist && 200112 <= posix2_version ())
++ if (obsolete_tablist && 200112 <= posix2_version ()
++ && getenv ("POSIXLY_CORRECT"))
+ {
+ error (0, 0,
+ _("`-LIST' option is obsolete; use `--first-only -t LIST'"));
+--- src/uniq.c.orig 2004-01-21 23:27:02.000000000 +0100
++++ src/uniq.c 2004-03-24 15:36:59.000000000 +0100
+@@ -446,7 +446,7 @@
+ {
+ unsigned long int size;
+ if (optarg[0] == '+'
+- && posix2_version () < 200112
++ && (posix2_version () < 200112 || !getenv ("POSIXLY_CORRECT"))
+ && xstrtoul (optarg, NULL, 10, &size, "") == LONGINT_OK
+ && size <= SIZE_MAX)
+ skip_chars = size;
+@@ -531,7 +531,8 @@
+ }
+ }
+
+- if (obsolete_skip_fields && 200112 <= posix2_version ())
++ if (obsolete_skip_fields && 200112 <= posix2_version ()
++ && getenv ("POSIXLY_CORRECT"))
+ {
+ error (0, 0, _("`-%lu' option is obsolete; use `-f %lu'"),
+ (unsigned long) skip_fields, (unsigned long) skip_fields);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/coreutils/coreutils.spec
============================================================================
$ cvs diff -u -r1.38 -r1.39 coreutils.spec
--- openpkg-src/coreutils/coreutils.spec 13 Mar 2004 07:28:06 -0000 1.38
+++ openpkg-src/coreutils/coreutils.spec 24 Mar 2004 15:10:20 -0000 1.39
@@ -38,7 +38,7 @@
Group: Utility
License: GPL
Version: %{V_release}
-Release: 20040313
+Release: 20040324
# package options
%option with_legacy no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
