[arch-commits] Commit in coreutils/trunk (7 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Wed Apr 1 14:46:13 EDT 2009


    Date: Wednesday, April 1, 2009 @ 14:46:13
  Author: andyrtr
Revision: 32851

upgpkg: coreutils 7.2-1
    new version 7.2

Modified:
  coreutils/trunk/PKGBUILD
  coreutils/trunk/coreutils-6.10-configuration.patch
  coreutils/trunk/coreutils-i18n.patch
  coreutils/trunk/coreutils-pam.patch
Deleted:
  coreutils/trunk/coreutils-7.1-cp-recursiveinfloop.patch
  coreutils/trunk/coreutils-7.1-sort-endoffields.patch
  coreutils/trunk/futimes.patch

-----------------------------------------+
 PKGBUILD                                |   20 +--
 coreutils-6.10-configuration.patch      |   38 -------
 coreutils-7.1-cp-recursiveinfloop.patch |  154 ------------------------------
 coreutils-7.1-sort-endoffields.patch    |  102 -------------------
 coreutils-i18n.patch                    |    7 -
 coreutils-pam.patch                     |    9 -
 futimes.patch                           |   47 ---------
 7 files changed, 13 insertions(+), 364 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-04-01 18:40:23 UTC (rev 32850)
+++ PKGBUILD	2009-04-01 18:46:13 UTC (rev 32851)
@@ -3,8 +3,8 @@
 # Contributor: judd <jvinet at zeroflux.org>
 
 pkgname=coreutils
-pkgver=7.1
-pkgrel=2
+pkgver=7.2
+pkgrel=1
 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system"
 arch=(i686 x86_64)
 license=('GPL3')
@@ -22,16 +22,12 @@
 	coreutils-uname.patch
 	coreutils-pam.patch
 	coreutils-6.10-configuration.patch
-	coreutils-7.1-sort-endoffields.patch
-	coreutils-7.1-cp-recursiveinfloop.patch
 	su)
-md5sums=('cbb2b3d1718ee1237b808e00b5c11b1e'
-         'e6270eca92e2f6d1b258e9930c6316c8'
+md5sums=('427c2914d3eab956f317c9ec6a45e62a'
+         'a395b29ce00b0f6effcfdd7ab760f95b'
          '18d3ba178e2691242287b59bd81aedb9'
-         '51a063ea50e4a8a1be7fcf170c7e27e3'
-         'f79b54afdecd38bcd9421db3d1f5c913'
-         'ac21779cfc0f02e656614975633809b4'
-         '719d6e07176292628589188f84ffb5f1'
+         '2127eb34886396b8361c9ab39acfe01c'
+         '081aeb04487d1445d0dc3fc98cf41260'
          'fa85e5cce5d723275b14365ba71a8aad')
 
 build() {
@@ -45,10 +41,6 @@
   # from gentoo portage
   patch -Np1 -i ../coreutils-uname.patch || return 1
 
-  # bugfix patches from fedora
-  patch -Np1 -i ../coreutils-7.1-sort-endoffields.patch || return 1
-  patch -Np1 -i ../coreutils-7.1-cp-recursiveinfloop.patch || return 1
-
   # only needed if new autoconf 2.62 is used
   sed -i 's/1.10a/1.10.2/' configure.ac || return 1 # aclocal fix
   sed -i 's/dist-xz/dist-lzma/' configure.ac || return 1

Modified: coreutils-6.10-configuration.patch
===================================================================
--- coreutils-6.10-configuration.patch	2009-04-01 18:40:23 UTC (rev 32850)
+++ coreutils-6.10-configuration.patch	2009-04-01 18:46:13 UTC (rev 32851)
@@ -23,43 +23,6 @@
        skip_test_ "this system (or maybe just" \
          "the current file system) lacks SELinux support"
      ;;
-diff -urNp coreutils-7.1-orig/gnulib-tests/test-getaddrinfo.c coreutils-7.1/gnulib-tests/test-getaddrinfo.c
---- coreutils-7.1-orig/gnulib-tests/test-getaddrinfo.c	2009-01-27 21:33:19.000000000 +0100
-+++ coreutils-7.1/gnulib-tests/test-getaddrinfo.c	2009-02-25 13:52:59.000000000 +0100
-@@ -36,6 +36,8 @@
- # define dbgprintf if (0) printf
- #endif
- 
-+static int skip = 0;
-+
- /* BeOS does not have AF_UNSPEC.  */
- #ifndef AF_UNSPEC
- # define AF_UNSPEC 0
-@@ -52,6 +54,9 @@ int simple (char *host, char *service)
-   struct addrinfo *ai0, *ai;
-   int res;
- 
-+  if (skip)
-+    return 0;
-+
-   dbgprintf ("Finding %s service %s...\n", host, service);
- 
-   /* This initializes "hints" but does not use it.  Is there a reason
-@@ -72,8 +77,12 @@ int simple (char *host, char *service)
- 	 in-law's farm. */
-       if (res == EAI_AGAIN)
- 	{
--	  fprintf (stderr, "skipping getaddrinfo test: no network?\n");
--	  return 77;
-+	if (!skip)
-+	  {
-+	    skip++;
-+	    fprintf (stderr, "skipping getaddrinfo test: no network?\n");
-+	    return 77;
-+	  }
- 	}
-       /* IRIX reports EAI_NONAME for "https".  Don't fail the test
- 	 merely because of this.  */
 diff -urNp coreutils-7.1-orig/src/ls.c coreutils-7.1/src/ls.c
 --- coreutils-7.1-orig/src/ls.c	2009-02-25 13:23:59.000000000 +0100
 +++ coreutils-7.1/src/ls.c	2009-02-25 13:25:20.000000000 +0100
@@ -85,4 +48,3 @@
  #include "acl.h"
  #include "argmatch.h"
  #include "dev-ino.h"
-

Deleted: coreutils-7.1-cp-recursiveinfloop.patch
===================================================================
--- coreutils-7.1-cp-recursiveinfloop.patch	2009-04-01 18:40:23 UTC (rev 32850)
+++ coreutils-7.1-cp-recursiveinfloop.patch	2009-04-01 18:46:13 UTC (rev 32851)
@@ -1,154 +0,0 @@
-diff -urNp coreutils-7.1-orig/src/copy.c coreutils-7.1/src/copy.c
---- coreutils-7.1-orig/src/copy.c	2009-02-27 12:07:29.000000000 +0100
-+++ coreutils-7.1/src/copy.c	2009-02-27 12:14:29.000000000 +0100
-@@ -104,6 +104,7 @@ static bool copy_internal (char const *s
- 			   struct dir_list *ancestors,
- 			   const struct cp_options *x,
- 			   bool command_line_arg,
-+			   bool *first_dir_created_per_command_line_arg,
- 			   bool *copy_into_self,
- 			   bool *rename_succeeded);
- static bool owner_failure_ok (struct cp_options const *x);
-@@ -201,13 +202,16 @@ copy_attr_by_name (char const *src_path,
-    DST_NAME_IN is a directory that was created previously in the
-    recursion.   SRC_SB and ANCESTORS describe SRC_NAME_IN.
-    Set *COPY_INTO_SELF if SRC_NAME_IN is a parent of
-+   FIRST_DIR_CREATED_PER_COMMAND_LINE_ARG  FIXME
-    (or the same as) DST_NAME_IN; otherwise, clear it.
-    Return true if successful.  */
- 
- static bool
- copy_dir (char const *src_name_in, char const *dst_name_in, bool new_dst,
- 	  const struct stat *src_sb, struct dir_list *ancestors,
--	  const struct cp_options *x, bool *copy_into_self)
-+	  const struct cp_options *x,
-+	  bool *first_dir_created_per_command_line_arg,
-+	  bool *copy_into_self)
- {
-   char *name_space;
-   char *namep;
-@@ -237,12 +241,20 @@ copy_dir (char const *src_name_in, char 
- 
-       ok &= copy_internal (src_name, dst_name, new_dst, src_sb->st_dev,
- 			   ancestors, &non_command_line_options, false,
-+			   first_dir_created_per_command_line_arg,
- 			   &local_copy_into_self, NULL);
-       *copy_into_self |= local_copy_into_self;
- 
-       free (dst_name);
-       free (src_name);
- 
-+      /* If we're copying into self, there's no point in continuing,
-+        and in fact, that would even infloop, now that we record only
-+        the first created directory per command line argument.  */
-+      if (local_copy_into_self)
-+       break;
-+
-+
-       namep += strlen (namep) + 1;
-     }
-   free (name_space);
-@@ -1125,6 +1137,7 @@ restore_default_fscreatecon_or_die (void
-    not known.  ANCESTORS points to a linked, null terminated list of
-    devices and inodes of parent directories of SRC_NAME.  COMMAND_LINE_ARG
-    is true iff SRC_NAME was specified on the command line.
-+   FIRST_DIR_CREATED_PER_COMMAND_LINE_ARG is both input and output.
-    Set *COPY_INTO_SELF if SRC_NAME is a parent of (or the
-    same as) DST_NAME; otherwise, clear it.
-    Return true if successful.  */
-@@ -1135,6 +1148,7 @@ copy_internal (char const *src_name, cha
- 	       struct dir_list *ancestors,
- 	       const struct cp_options *x,
- 	       bool command_line_arg,
-+	       bool *first_dir_created_per_command_line_arg,
- 	       bool *copy_into_self,
- 	       bool *rename_succeeded)
- {
-@@ -1815,11 +1829,15 @@ copy_internal (char const *src_name, cha
- 		}
- 	    }
- 
--	  /* Insert the created directory's inode and device
--             numbers into the search structure, so that we can
--             avoid copying it again.  */
--	  if (!x->hard_link)
--	    remember_copied (dst_name, dst_sb.st_ino, dst_sb.st_dev);
-+         /* Record the created directory's inode and device numbers into
-+            the search structure, so that we can avoid copying it again.
-+            Do this only for the first directory that is created for each
-+            source command line argument.  */
-+         if (!*first_dir_created_per_command_line_arg)
-+           {
-+             remember_copied (dst_name, dst_sb.st_ino, dst_sb.st_dev);
-+             *first_dir_created_per_command_line_arg = true;
-+           }
- 
- 	  if (x->verbose)
- 	    emit_verbose (src_name, dst_name, NULL);
-@@ -1840,6 +1858,7 @@ copy_internal (char const *src_name, cha
- 	     in a source directory would cause the containing destination
- 	     directory not to have owner/perms set properly.  */
- 	  delayed_ok = copy_dir (src_name, dst_name, new_dst, &src_sb, dir, x,
-+				 first_dir_created_per_command_line_arg,
- 				 copy_into_self);
- 	}
-     }
-@@ -2187,8 +2206,11 @@ copy (char const *src_name, char const *
-   top_level_src_name = src_name;
-   top_level_dst_name = dst_name;
- 
-+  bool first_dir_created_per_command_line_arg = false;
-   return copy_internal (src_name, dst_name, nonexistent_dst, 0, NULL,
--			options, true, copy_into_self, rename_succeeded);
-+			options, true,
-+			&first_dir_created_per_command_line_arg,
-+			copy_into_self, rename_succeeded);
- }
- 
- /* Set *X to the default options for a value of type struct cp_options.  */
-diff -urNp coreutils-7.1-orig/tests/cp/into-self coreutils-7.1/tests/cp/into-self
---- coreutils-7.1-orig/tests/cp/into-self	2008-09-18 09:06:57.000000000 +0200
-+++ coreutils-7.1/tests/cp/into-self	2009-02-27 12:16:21.000000000 +0100
-@@ -1,7 +1,7 @@
- #!/bin/sh
- # Confirm that copying a directory into itself gets a proper diagnostic.
- 
--# Copyright (C) 2001, 2002, 2004, 2006-2008 Free Software Foundation, Inc.
-+# Copyright (C) 2001, 2002, 2004, 2006-2009 Free Software Foundation, Inc.
- 
- # This program is free software: you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -28,15 +28,32 @@ fi
- 
- . $srcdir/test-lib.sh
- 
--mkdir dir || framework_failure
-+mkdir a dir || framework_failure
- 
- fail=0
- 
- # This command should exit nonzero.
- cp -R dir dir 2> out && fail=1
-+echo 1 >> out
-+
-+# This should, too.  However, with coreutils-7.1 it would infloop.
-+cp -rl dir dir 2>> out && fail=1
-+echo 2 >> out
-+
-+cp -rl a dir dir 2>> out && fail=1
-+echo 3 >> out
-+cp -rl a dir dir 2>> out && fail=1
-+echo 4 >> out
- 
- cat > exp <<\EOF
- cp: cannot copy a directory, `dir', into itself, `dir/dir'
-+1
-+cp: cannot copy a directory, `dir', into itself, `dir/dir'
-+2
-+cp: cannot copy a directory, `dir', into itself, `dir/dir'
-+3
-+cp: cannot copy a directory, `dir', into itself, `dir/dir'
-+4
- EOF
- #'
- 

Deleted: coreutils-7.1-sort-endoffields.patch
===================================================================
--- coreutils-7.1-sort-endoffields.patch	2009-04-01 18:40:23 UTC (rev 32850)
+++ coreutils-7.1-sort-endoffields.patch	2009-04-01 18:46:13 UTC (rev 32851)
@@ -1,102 +0,0 @@
-diff -urNp coreutils-7.1-orig/src/sort.c coreutils-7.1/src/sort.c
---- coreutils-7.1-orig/src/sort.c	2009-02-25 16:15:52.000000000 +0100
-+++ coreutils-7.1/src/sort.c	2009-02-25 16:20:35.000000000 +0100
-@@ -1598,6 +1598,9 @@ limfield_uni (const struct line *line, c
-   size_t eword = key->eword, echar = key->echar;
-   size_t remaining_bytes;
- 
-+  if (echar == 0)
-+    eword++; /* skip all of end field. */
-+
-   /* Move PTR past EWORD fields or to one past the last byte on LINE,
-      whichever comes first.  If there are more than EWORD fields, leave
-      PTR pointing at the beginning of the field having zero-based index,
-@@ -1673,19 +1676,22 @@ limfield_uni (const struct line *line, c
-     }
- #endif
- 
--  /* If we're ignoring leading blanks when computing the End
--     of the field, don't start counting bytes until after skipping
--     past any leading blanks. */
--  if (key->skipeblanks)
--    while (ptr < lim && blanks[to_uchar (*ptr)])
--      ++ptr;
- 
--  /* Advance PTR by ECHAR (if possible), but no further than LIM.  */
--  remaining_bytes = lim - ptr;
--  if (echar < remaining_bytes)
--    ptr += echar;
--  else
--    ptr = lim;
-+  if (echar != 0) /* We need to skip over a portion of the end field.  */
-+    {
-+      if (key->skipeblanks) /* blanks not counted in echar.  */
-+        {
-+          while (ptr < lim && blanks[to_uchar (*ptr)])
-+            ++ptr;
-+        }
-+
-+      /* Advance PTR by ECHAR (if possible), but no further than LIM.  */
-+      remaining_bytes = lim - ptr;
-+      if (echar < remaining_bytes)
-+        ptr += echar;
-+      else
-+        ptr = lim;
-+    }
- 
-   return ptr;
- }
-@@ -3736,12 +3742,9 @@ main (int argc, char **argv)
- 		  badfieldspec (optarg, N_("field number is zero"));
- 		}
- 	      if (*s == '.')
--		s = parse_field_count (s + 1, &key->echar,
--				       N_("invalid number after `.'"));
--	      else
- 		{
--		  /* `-k 2,3' is equivalent to `+1 -3'.  */
--		  key->eword++;
-+                 s = parse_field_count (s + 1, &key->echar,
-+                                        N_("invalid number after `.'"));
- 		}
- 	      s = set_ordering (s, key, bl_end);
- 	    }
-diff -urNp coreutils-7.1-orig/tests/misc/sort coreutils-7.1/tests/misc/sort
---- coreutils-7.1-orig/tests/misc/sort	2009-01-27 22:11:25.000000000 +0100
-+++ coreutils-7.1/tests/misc/sort	2009-02-25 16:21:48.000000000 +0100
-@@ -24,6 +24,10 @@ my $prog = 'sort';
- # Turn off localization of executable's output.
- @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
- 
-+my $mb_locale = $ENV{LOCALE_FR_UTF8};
-+! defined $mb_locale || $mb_locale eq 'none'
-+ and $mb_locale = 'C';
-+
- # Since each test is run with a file name and with redirected stdin,
- # the name in the diagnostic is either the file name or "-".
- # Normalize each diagnostic to use '-'.
-@@ -110,6 +114,8 @@ my @Tests =
- ["07b", '-k 2,3', {IN=>"a a b\nz a a\n"}, {OUT=>"z a a\na a b\n"}],
- ["07c", '-k 2,3', {IN=>"y k b\nz k a\n"}, {OUT=>"z k a\ny k b\n"}],
- ["07d", '+1 -3', {IN=>"y k b\nz k a\n"}, {OUT=>"z k a\ny k b\n"}],
-+["07e", '-k 2,3.0', {IN=>"a a b\nz a a\n"}, {OUT=>"z a a\na a b\n"}],
-+
- #
- # report an error for `.' without following char spec
- ["08a", '-k 2.,3', {EXIT=>2},
-@@ -210,6 +216,15 @@ my @Tests =
- # key start and key end.
- ["18e", '-nb -k1.1,1.2', {IN=>" 901\n100\n"}, {OUT=>"100\n 901\n"}],
- 
-+# When ignoring leading blanks for end position, ensure blanks from
-+# next field are not included in the sort. I.E. order should not change here.
-+["18f", '-k1,1b', {IN=>"a  y\na z\n"}, {OUT=>"a  y\na z\n"}],
-+
-+# When ignoring leading blanks for start position, ensure blanks from
-+# next field are not included in the sort. I.E. order should not change here.
-+# This was noticed as an issue on fedora 8 (only in multibyte locales).
-+["18g", '-k1b,1', {IN=>"a y\na z\n"}, {OUT=>"a y\na z\n"},
-+ {ENV => "LC_ALL=$mb_locale"}],
- # This looks odd, but works properly -- 2nd keyspec is never
- # used because all lines are different.
- ["19a", '+0 +1nr', {IN=>"b 2\nb 1\nb 3\n"}, {OUT=>"b 1\nb 2\nb 3\n"}],

Modified: coreutils-i18n.patch
===================================================================
--- coreutils-i18n.patch	2009-04-01 18:40:23 UTC (rev 32850)
+++ coreutils-i18n.patch	2009-04-01 18:46:13 UTC (rev 32851)
@@ -114,13 +114,13 @@
 --- coreutils-6.12-orig/tests/Makefile.am	2008-05-27 13:47:53.000000000 +0200
 +++ coreutils-6.12/tests/Makefile.am	2008-06-02 10:06:03.000000000 +0200
 @@ -192,6 +192,7 @@
-   misc/sort					\
    misc/sort-compress				\
+   misc/sort-continue				\
    misc/sort-files0-from				\
 +  misc/sort-mb-tests				\
    misc/sort-merge				\
+   misc/sort-merge-fdlimit			\
    misc/sort-rand				\
-   misc/sort-version				\
 @@ -391,6 +392,10 @@
    $(root_tests)
  
@@ -2786,7 +2786,7 @@
  
 @@ -416,7 +454,20 @@
  
- #define NULLCOL (COLUMN *)0
+ typedef struct COLUMN COLUMN;
  
 -static int char_to_clump (char c);
 +/* Funtion pointers to switch functions for single byte locale or for
@@ -4062,4 +4062,3 @@
    xfields (line);
  
    if (prevline[which - 1])
-

Modified: coreutils-pam.patch
===================================================================
--- coreutils-pam.patch	2009-04-01 18:40:23 UTC (rev 32850)
+++ coreutils-pam.patch	2009-04-01 18:46:13 UTC (rev 32851)
@@ -404,11 +404,11 @@
  @node timeout invocation
  @section @command{timeout}: Run a command with a time limit
  
---- coreutils-6.7/configure.ac.pam	2006-12-07 21:30:24.000000000 +0000
-+++ coreutils-6.7/configure.ac	2007-01-09 17:18:04.000000000 +0000
+--- coreutils-7.1/configure.ac.pam
++++ coreutils-7.1/configure.ac
 @@ -44,6 +44,13 @@
- gl_INIT
- coreutils_MACROS
+   AC_DEFINE([GNULIB_PORTCHECK], [1], [enable some gnulib portability checks])
+ fi
  
 +dnl Give the chance to enable PAM
 +AC_ARG_ENABLE(pam, dnl
@@ -420,4 +420,3 @@
  AC_FUNC_FORK
 
  optional_bin_progs=
-

Deleted: futimes.patch
===================================================================
--- futimes.patch	2009-04-01 18:40:23 UTC (rev 32850)
+++ futimes.patch	2009-04-01 18:46:13 UTC (rev 32851)
@@ -1,47 +0,0 @@
---- coreutils-6.9/lib/utimens.h.futimens	2007-02-23 18:25:21.000000000 +0000
-+++ coreutils-6.9/lib/utimens.h	2007-06-13 11:40:37.000000000 +0100
-@@ -1,3 +1,3 @@
- #include <time.h>
--int futimens (int, char const *, struct timespec const [2]);
-+int gl_futimens (int, char const *, struct timespec const [2]);
- int utimens (char const *, struct timespec const [2]);
---- coreutils-6.9/lib/utimens.c.futimens	2007-01-18 08:33:34.000000000 +0000
-+++ coreutils-6.9/lib/utimens.c	2007-06-13 11:40:37.000000000 +0100
-@@ -75,7 +75,7 @@ struct utimbuf
-    Return 0 on success, -1 (setting errno) on failure.  */
- 
- int
--futimens (int fd ATTRIBUTE_UNUSED,
-+gl_futimens (int fd ATTRIBUTE_UNUSED,
- 	  char const *file, struct timespec const timespec[2])
- {
-   /* Some Linux-based NFS clients are buggy, and mishandle time stamps
-@@ -185,5 +185,5 @@ futimens (int fd ATTRIBUTE_UNUSED,
- int
- utimens (char const *file, struct timespec const timespec[2])
- {
--  return futimens (-1, file, timespec);
-+  return gl_futimens (-1, file, timespec);
- }
---- coreutils-6.9/src/copy.c.futimens	2007-06-13 11:56:44.000000000 +0100
-+++ coreutils-6.9/src/copy.c	2007-06-13 11:57:00.000000000 +0100
-@@ -547,7 +547,7 @@ copy_reg (char const *src_name, char con
-       timespec[0] = get_stat_atime (src_sb);
-       timespec[1] = get_stat_mtime (src_sb);
- 
--      if (futimens (dest_desc, dst_name, timespec) != 0)
-+      if (gl_futimens (dest_desc, dst_name, timespec) != 0)
- 	{
- 	  error (0, errno, _("preserving times for %s"), quote (dst_name));
- 	  if (x->require_preserve)
---- coreutils-6.9/src/touch.c.futimens	2007-06-13 11:58:00.000000000 +0100
-+++ coreutils-6.9/src/touch.c	2007-06-13 11:58:06.000000000 +0100
-@@ -182,7 +182,7 @@ touch (const char *file)
-       t = timespec;
-     }
- 
--  ok = (futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0);
-+  ok = (gl_futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0);
- 
-   if (fd == STDIN_FILENO)
-     {



More information about the arch-commits mailing list