OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Nov-2005 10:41:01
Branch: HEAD Handle: 2005112109410100
Modified files:
openpkg-src/coreutils coreutils.patch coreutils.spec
Log:
upgrading package: coreutils 5.2.1 -> 5.93
Summary:
Revision Changes Path
1.10 +11 -217 openpkg-src/coreutils/coreutils.patch
1.46 +2 -2 openpkg-src/coreutils/coreutils.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/coreutils/coreutils.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 coreutils.patch
--- openpkg-src/coreutils/coreutils.patch 26 May 2004 12:50:18 -0000
1.9
+++ openpkg-src/coreutils/coreutils.patch 21 Nov 2005 09:41:01 -0000
1.10
@@ -1,3 +1,14 @@
+--- doc/Makefile.in.orig 2004-03-11 09:57:59.000000000 +0100
++++ doc/Makefile.in 2004-04-21 15:11:16.000000000 +0200
+@@ -600,7 +600,7 @@
+ mv t-$@ $@
+
+ $(DVIS): $(EXTRA_DIST)
+-$(INFO_DEPS): $(EXTRA_DIST)
++###$(INFO_DEPS): $(EXTRA_DIST)
+
+ # List words/regexps here that should not appear in the texinfo
documentation.
+ check-texinfo:
--- src/stat.c.orig Sun Dec 1 10:48:21 2002
+++ src/stat.c Sun Jan 12 11:30:01 2003
@@ -43,6 +43,12 @@
@@ -13,47 +24,6 @@
#include "system.h"
#include "closeout.h"
---- src/test.c.orig Mon Feb 10 10:19:09 2003
-+++ src/test.c Sun Feb 23 20:44:50 2003
-@@ -139,7 +139,7 @@
- /* Do the same thing access(2) does, but use the effective uid and gid. */
-
- static int
--eaccess (char const *file, int mode)
-+my_eaccess (char const *file, int mode)
- {
- static int have_ids;
- static uid_t uid, euid;
-@@ -172,7 +172,7 @@
- return result;
- }
- #else
--# define eaccess(F, M) euidaccess (F, M)
-+# define my_eaccess(F, M) euidaccess (F, M)
- #endif
-
- /* Increment our position in the argument list. Check that we're not
-@@ -635,17 +635,17 @@
-
- case 'r': /* file is readable? */
- unary_advance ();
-- value = -1 != eaccess (argv[pos - 1], R_OK);
-+ value = -1 != my_eaccess (argv[pos - 1], R_OK);
- return (TRUE == value);
-
- case 'w': /* File is writable? */
- unary_advance ();
-- value = -1 != eaccess (argv[pos - 1], W_OK);
-+ value = -1 != my_eaccess (argv[pos - 1], W_OK);
- return (TRUE == value);
-
- case 'x': /* File is executable? */
- unary_advance ();
-- value = -1 != eaccess (argv[pos - 1], X_OK);
-+ value = -1 != my_eaccess (argv[pos - 1], X_OK);
- return (TRUE == value);
-
- case 'O': /* File is owned by you? */
--- src/nice.c.orig 2003-08-10 19:43:35.000000000 +0200
+++ src/nice.c 2003-09-10 20:03:27.000000000 +0200
@@ -23,6 +23,7 @@
@@ -65,179 +35,3 @@
#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);
-Index: doc/Makefile.in
---- doc/Makefile.in.orig 2004-03-11 09:57:59.000000000 +0100
-+++ doc/Makefile.in 2004-04-21 15:11:16.000000000 +0200
-@@ -600,7 +600,7 @@
- mv t-$@ $@
-
- $(DVIS): $(EXTRA_DIST)
--$(INFO_DEPS): $(EXTRA_DIST)
-+###$(INFO_DEPS): $(EXTRA_DIST)
-
- # List words/regexps here that should not appear in the texinfo
documentation.
- check-texinfo:
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/coreutils/coreutils.spec
============================================================================
$ cvs diff -u -r1.45 -r1.46 coreutils.spec
--- openpkg-src/coreutils/coreutils.spec 7 Oct 2005 05:51:37 -0000
1.45
+++ openpkg-src/coreutils/coreutils.spec 21 Nov 2005 09:41:01 -0000
1.46
@@ -32,8 +32,8 @@
Class: BASE
Group: Utility
License: GPL
-Version: 5.2.1
-Release: 20051007
+Version: 5.93
+Release: 20051121
# package options
%option with_legacy no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]