[arch-commits] Commit in coreutils/repos (4 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Tue May 6 12:10:24 EDT 2008


    Date: Tuesday, May 6, 2008 @ 12:10:24
  Author: andyrtr
Revision: 1367

Merged revisions 2-1366 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/coreutils/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fr, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r896 | andyrtr | 2008-04-24 20:34:53 +0000 (Do, 24 Apr 2008) | 1 line
  
  prepare coreutils update
........
  r1090 | andyrtr | 2008-04-30 15:39:06 +0000 (Mi, 30 Apr 2008) | 2 lines
  
  upgpkg: coreutils 6.11-1
      update to new version; patches from Fedora updated; prepared it for new autoconf
........

Modified:
  coreutils/repos/core-i686/	(properties)
  coreutils/repos/core-i686/PKGBUILD
  coreutils/repos/core-i686/coreutils-6.10-configuration.patch
  coreutils/repos/core-i686/coreutils-i18n.patch

------------------------------------+
 PKGBUILD                           |   17 +-
 coreutils-6.10-configuration.patch |   59 +++++--
 coreutils-i18n.patch               |  285 +++++++++++++++++------------------
 3 files changed, 198 insertions(+), 163 deletions(-)


Property changes on: coreutils/repos/core-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /coreutils/trunk:1
   + /coreutils/trunk:1-1366

Modified: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD	2008-05-06 16:09:34 UTC (rev 1366)
+++ core-i686/PKGBUILD	2008-05-06 16:10:24 UTC (rev 1367)
@@ -1,14 +1,14 @@
 # $Id$
 # Maintainer: judd <jvinet at zeroflux.org>
 pkgname=coreutils
-pkgver=6.10
-pkgrel=2
+pkgver=6.11
+pkgrel=1
 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system"
 arch=(i686 x86_64)
 license=('GPL3')
 url="http://www.gnu.org/software/coreutils"
 groups=('base')
-depends=('glibc>=2.7-7' 'shadow>=4.0.18.2-2' 'pam>=0.99.9.0-2' 'acl>=2.2.45-2')
+depends=('glibc>=2.7-9' 'shadow>=4.0.18.2-2' 'pam>=1.0.1-1' 'acl>=2.2.47-1')
 provides=('mktemp')
 conflicts=('mktemp')
 replaces=('sh-utils' 'fileutils' 'textutils' 'mktemp')
@@ -20,15 +20,19 @@
 	coreutils-pam.patch
 	coreutils-6.10-configuration.patch
 	su)
-md5sums=('eca0de1bf7389694305d7e52cd76a472'
-         '3beb1fcdd7374239a7584efa9fbc4885'
+md5sums=('4b638a895f6c7d0d4a8f62d60189fd9b'
+         '0d70afbfe41462c200af6a9aa549bf32'
          '18d3ba178e2691242287b59bd81aedb9'
          '8810a22cdc05d502a69b59511e9abf79'
-         '65f3338712893b282694d4601507b355'
+         '20460d4b04bd4f51d1c3236d96fd8df7'
          'fa85e5cce5d723275b14365ba71a8aad')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
+
+  # only needed if new autoconf 2.62 is used
+  autoreconf
+
   # added pam patch and i18n patch from fedora cvs
   patch -Np1 -i ../coreutils-pam.patch || return 1
   patch -Np1 -i ../coreutils-i18n.patch || return 1
@@ -37,6 +41,7 @@
   patch -Np1 -i ../coreutils-uname.patch || return 1
   # make head and tail recognize the old syntax (eg, tail -10)
   export DEFAULT_POSIX2_VERSION=199209
+
   autoconf
   ./configure --prefix=/usr ac_cv_func_openat=no --enable-install-program=su --enable-pam
   make || return 1

Modified: core-i686/coreutils-6.10-configuration.patch
===================================================================
--- core-i686/coreutils-6.10-configuration.patch	2008-05-06 16:09:34 UTC (rev 1366)
+++ core-i686/coreutils-6.10-configuration.patch	2008-05-06 16:10:24 UTC (rev 1367)
@@ -1,20 +1,45 @@
-diff -urp coreutils-6.10-orig/src/Makefile.am coreutils-6.10/src/Makefile.am
---- coreutils-6.10-orig/src/Makefile.am	2008-01-11 11:34:22.000000000 +0100
-+++ coreutils-6.10/src/Makefile.am	2008-01-23 14:52:26.000000000 +0100
-@@ -170,7 +170,7 @@ install_su =						\
-     echo " chown root $(installed_su)";			\
-     chown root $(installed_su);				\
-     echo " chmod $(setuid_root_mode) $(installed_su)";	\
--    chmod $(setuid_root_mode) $(installed_su)		\
-+    chmod $(setuid_root_mode) $(installed_su);		\
-   else							\
-     :;							\
-   fi
-diff -urp coreutils-6.10-orig/gnulib-tests/test-getaddrinfo.c coreutils-6.10/gnulib-tests/test-getaddrinfo.c
---- coreutils-6.10-orig/gnulib-tests/test-getaddrinfo.c	2007-11-17 07:59:42.000000000 +0100
-+++ coreutils-6.10/gnulib-tests/test-getaddrinfo.c	2008-01-25 19:19:43.000000000 +0100
-@@ -61,6 +61,10 @@ int simple (char *host, char *service)
-       if (res == EAI_SERVICE)
+diff -urNp coreutils-6.11-orig/tests/touch/no-create-missing coreutils-6.11/tests/touch/no-create-missing
+--- coreutils-6.11-orig/tests/touch/no-create-missing	2008-04-19 23:34:23.000000000 +0200
++++ coreutils-6.11/tests/touch/no-create-missing	2008-04-24 12:34:52.000000000 +0200
+@@ -36,7 +36,7 @@ test="$abs_top_builddir/src/test"
+ # This test is ineffective unless /dev/stdout also works.
+ if "$test" -w /dev/stdout >/dev/null &&
+    "$test" ! -w /dev/stdout >&-; then
+-  touch -c - >&- 2> /dev/null || fail=1
++  strace touch -c - >&- || fail=1
+   touch -cm - >&- 2> /dev/null || fail=1
+   touch -ca - >&- 2> /dev/null || fail=1
+ fi
+diff -urNp coreutils-6.11-orig/tests/mkdir/selinux coreutils-6.11/tests/mkdir/selinux
+--- coreutils-6.11-orig/tests/mkdir/selinux	2008-04-19 23:34:23.000000000 +0200
++++ coreutils-6.11/tests/mkdir/selinux	2008-04-22 13:23:50.000000000 +0200
+@@ -30,6 +30,7 @@ fi
+ . $srcdir/../envvar-check
+ . $srcdir/../lang-default
+ . $srcdir/../test-lib.sh
++require_selinux_
+ 
+ c=invalid-selinux-context
+ msg="failed to set default file creation context to \`$c':"
+diff -urNp coreutils-6.11-orig/tests/test-lib.sh coreutils-6.11/tests/test-lib.sh
+--- coreutils-6.11-orig/tests/test-lib.sh	2008-04-19 23:34:23.000000000 +0200
++++ coreutils-6.11/tests/test-lib.sh	2008-04-24 14:18:59.000000000 +0200
+@@ -97,8 +97,8 @@ skip_if_()
+ 
+ require_selinux_()
+ {
+-  case `ls -Zd .` in
+-    '? .'|'unlabeled .')
++  case `ls --scontext -d . | cut -f1 -d" "` in
++    '?'|'unlabeled')
+       skip_test_ "this system (or maybe just" \
+         "the current file system) lacks SELinux support"
+     ;;
+diff -urp coreutils-6.11-orig/gnulib-tests/test-getaddrinfo.c coreutils-6.11/gnulib-tests/test-getaddrinfo.c
+--- coreutils-6.11-orig/gnulib-tests/test-getaddrinfo.c
++++ coreutils-6.11/gnulib-tests/test-getaddrinfo.c
+@@ -70,6 +70,10 @@ int simple (char *host, char *service)
+       if (res == EAI_NODATA)
  	return 0;
  
 +      /* Do not fail this test for temporary name resolution errors. */

Modified: core-i686/coreutils-i18n.patch
===================================================================
--- core-i686/coreutils-i18n.patch	2008-05-06 16:09:34 UTC (rev 1366)
+++ core-i686/coreutils-i18n.patch	2008-05-06 16:10:24 UTC (rev 1367)
@@ -329,7 +329,7 @@
      error (EXIT_FAILURE, errno, "-");
 --- coreutils-6.8+/src/join.c.i18n	2007-01-14 15:41:28.000000000 +0000
 +++ coreutils-6.8+/src/join.c	2007-03-01 15:08:24.000000000 +0000
-@@ -23,16 +23,30 @@
+@@ -23,17 +23,31 @@
  #include <sys/types.h>
  #include <getopt.h>
  
@@ -352,6 +352,7 @@
  #include "stdio--.h"
  #include "xmemcoll.h"
  #include "xstrtol.h"
+ #include "argmatch.h"
  
 +/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t.  */
 +#if HAVE_MBRTOWC && defined mbstate_t
@@ -562,144 +563,6 @@
    xfields (line);
    return true;
  }
-@@ -303,56 +469,114 @@
- keycmp (struct line const *line1, struct line const *line2)
- {
-   /* Start of field to compare in each file.  */
--  char *beg1;
--  char *beg2;
--
--  size_t len1;
--  size_t len2;		/* Length of fields to compare.  */
-+  char *beg[2];
-+  char *copy[2];
-+  size_t len[2];	/* Length of fields to compare.  */
-   int diff;
-+  int i, j;
- 
-   if (join_field_1 < line1->nfields)
-     {
--      beg1 = line1->fields[join_field_1].beg;
--      len1 = line1->fields[join_field_1].len;
-+      beg[0] = line1->fields[join_field_1].beg;
-+      len[0] = line1->fields[join_field_1].len;
-     }
-   else
-     {
--      beg1 = NULL;
--      len1 = 0;
-+      beg[0] = NULL;
-+      len[0] = 0;
-     }
- 
-   if (join_field_2 < line2->nfields)
-     {
--      beg2 = line2->fields[join_field_2].beg;
--      len2 = line2->fields[join_field_2].len;
-+      beg[1] = line2->fields[join_field_2].beg;
-+      len[1] = line2->fields[join_field_2].len;
-     }
-   else
-     {
--      beg2 = NULL;
--      len2 = 0;
-+      beg[1] = NULL;
-+      len[1] = 0;
-     }
- 
--  if (len1 == 0)
--    return len2 == 0 ? 0 : -1;
--  if (len2 == 0)
-+  if (len[0] == 0)
-+    return len[1] == 0 ? 0 : -1;
-+  if (len[1] == 0)
-     return 1;
- 
-   if (ignore_case)
-     {
--      /* FIXME: ignore_case does not work with NLS (in particular,
--         with multibyte chars).  */
--      diff = memcasecmp (beg1, beg2, MIN (len1, len2));
-+#ifdef HAVE_MBRTOWC
-+      if (MB_CUR_MAX > 1)
-+      {
-+        size_t mblength;
-+        wchar_t wc, uwc;
-+        mbstate_t state, state_bak;
-+
-+        memset (&state, '\0', sizeof (mbstate_t));
-+
-+        for (i = 0; i < 2; i++)
-+          {
-+            copy[i] = alloca (len[i] + 1);
-+
-+            for (j = 0; j < MIN (len[0], len[1]);)
-+              {
-+                state_bak = state;
-+                mblength = mbrtowc (&wc, beg[i] + j, len[i] - j, &state);
-+
-+                switch (mblength)
-+                  {
-+                  case (size_t) -1:
-+                  case (size_t) -2:
-+                    state = state_bak;
-+                    /* Fall through */
-+                  case 0:
-+                    mblength = 1;
-+                    break;
-+
-+                  default:
-+                    uwc = towupper (wc);
-+
-+                    if (uwc != wc)
-+                      {
-+                        mbstate_t state_wc;
-+
-+                        memset (&state_wc, '\0', sizeof (mbstate_t));
-+                        wcrtomb (copy[i] + j, uwc, &state_wc);
-+                      }
-+                    else
-+                      memcpy (copy[i] + j, beg[i] + j, mblength);
-+                  }
-+                j += mblength;
-+              }
-+            copy[i][j] = '\0';
-+          }
-+      }
-+      else
-+#endif
-+      {
-+        for (i = 0; i < 2; i++)
-+          {
-+            copy[i] = alloca (len[i] + 1);
-+
-+            for (j = 0; j < MIN (len[0], len[1]); j++)
-+              copy[i][j] = toupper (beg[i][j]);
-+
-+            copy[i][j] = '\0';
-+          }
-+      }
-     }
-   else
-     {
--      if (hard_LC_COLLATE)
--	return xmemcoll (beg1, len1, beg2, len2);
--      diff = memcmp (beg1, beg2, MIN (len1, len2));
-+      copy[0] = (unsigned char *) beg[0];
-+      copy[1] = (unsigned char *) beg[1];
-     }
- 
-+  if (hard_LC_COLLATE)
-+    return xmemcoll ((char *) copy[0], len[0], (char *) copy[1], len[1]);
-+  diff = memcmp (copy[0], copy[1], MIN (len[0], len[1]));
-+
-   if (diff)
-     return diff;
--  return len1 < len2 ? -1 : len1 != len2;
-+  return len[0] - len[1];
- }
- 
- /* Print field N of LINE if it exists and is nonempty, otherwise
 @@ -377,11 +601,18 @@
  
  /* Print the join of LINE1 and LINE2.  */
@@ -823,7 +686,149 @@
 +	    tablen = newtablen;
  	  }
  	  break;
+
+diff -urNp coreutils-6.11-orig/src/join.c coreutils-6.11/src/join.c
+--- coreutils-6.11-orig/src/join.c	2008-04-21 13:44:32.000000000 +0200
++++ coreutils-6.11/src/join.c	2008-04-21 14:03:22.000000000 +0200
+@@ -324,56 +324,115 @@ keycmp (struct line const *line1, struct
+ 	size_t jf_1, size_t jf_2)
+ {
+   /* Start of field to compare in each file.  */
+-  char *beg1;
+-  char *beg2;
+-
+-  size_t len1;
+-  size_t len2;		/* Length of fields to compare.  */
++  char *beg[2];
++  char *copy[2];
++  size_t len[2]; /* Length of fields to compare.  */
+   int diff;
++  int i, j;
  
+   if (jf_1 < line1->nfields)
+     {
+-      beg1 = line1->fields[jf_1].beg;
+-      len1 = line1->fields[jf_1].len;
++      beg[0] = line1->fields[jf_1].beg;
++      len[0] = line1->fields[jf_1].len;
+     }
+   else
+     {
+-      beg1 = NULL;
+-      len1 = 0;
++      beg[0] = NULL;
++      len[0] = 0;
+     }
+ 
+   if (jf_2 < line2->nfields)
+     {
+-      beg2 = line2->fields[jf_2].beg;
+-      len2 = line2->fields[jf_2].len;
++      beg[1] = line2->fields[jf_2].beg;
++      len[1] = line2->fields[jf_2].len;
+     }
+   else
+     {
+-      beg2 = NULL;
+-      len2 = 0;
++      beg[1] = NULL;
++      len[1] = 0;
+     }
+ 
+-  if (len1 == 0)
+-    return len2 == 0 ? 0 : -1;
+-  if (len2 == 0)
++  if (len[0] == 0)
++    return len[1] == 0 ? 0 : -1;
++  if (len[1] == 0)
+     return 1;
+ 
+   if (ignore_case)
+     {
+-      /* FIXME: ignore_case does not work with NLS (in particular,
+-         with multibyte chars).  */
+-      diff = memcasecmp (beg1, beg2, MIN (len1, len2));
++#ifdef HAVE_MBRTOWC
++      if (MB_CUR_MAX > 1)
++      {
++        size_t mblength;
++        wchar_t wc, uwc;
++        mbstate_t state, state_bak;
++
++        memset (&state, '\0', sizeof (mbstate_t));
++
++        for (i = 0; i < 2; i++)
++          {
++            copy[i] = alloca (len[i] + 1);
++
++            for (j = 0; j < MIN (len[0], len[1]);)
++              {
++                state_bak = state;
++                mblength = mbrtowc (&wc, beg[i] + j, len[i] - j, &state);
++
++                switch (mblength)
++                  {
++                  case (size_t) -1:
++                  case (size_t) -2:
++                    state = state_bak;
++                    /* Fall through */
++                  case 0:
++                    mblength = 1;
++                    break;
++
++                  default:
++                    uwc = towupper (wc);
++
++                    if (uwc != wc)
++                      {
++                        mbstate_t state_wc;
++
++                        memset (&state_wc, '\0', sizeof (mbstate_t));
++                        wcrtomb (copy[i] + j, uwc, &state_wc);
++                      }
++                    else
++                      memcpy (copy[i] + j, beg[i] + j, mblength);
++                  }
++                j += mblength;
++              }
++            copy[i][j] = '\0';
++          }
++      }
++      else
++#endif
++      {
++        for (i = 0; i < 2; i++)
++          {
++            copy[i] = alloca (len[i] + 1);
++
++            for (j = 0; j < MIN (len[0], len[1]); j++)
++              copy[i][j] = toupper (beg[i][j]);
++
++            copy[i][j] = '\0';
++          }
++      }
+     }
+   else
+     {
+-      if (hard_LC_COLLATE)
+-	return xmemcoll (beg1, len1, beg2, len2);
+-      diff = memcmp (beg1, beg2, MIN (len1, len2));
++      copy[0] = (unsigned char *) beg[0];
++      copy[1] = (unsigned char *) beg[1];  
+     }
+ 
++  if (hard_LC_COLLATE)
++    return xmemcoll ((char *) copy[0], len[0], (char *) copy[1], len[1]);
++  diff = memcmp (copy[0], copy[1], MIN (len[0], len[1]));
++
++
+   if (diff)
+     return diff;
+-  return len1 < len2 ? -1 : len1 != len2;
++  return len[0] - len[1];
+ }
+ 
+ /* Check that successive input lines PREV and CURRENT from input file 
 --- coreutils-6.8+/src/uniq.c.i18n	2007-01-14 15:41:28.000000000 +0000
 +++ coreutils-6.8+/src/uniq.c	2007-03-01 15:08:24.000000000 +0000
 @@ -23,6 +23,16 @@
@@ -3946,8 +3951,8 @@
 -	    FATAL_ERROR (_("the delimiter must be a single character"));
 -	  delim = optarg[0];
 -	  delim_specified = true;
++	    {
 +#if HAVE_MBRTOWC
-+	    {
 +	      if(MB_CUR_MAX > 1)
 +		{
 +		  mbstate_t state;





More information about the arch-commits mailing list