[arch-commits] Commit in coreutils/trunk (PKGBUILD coreutils-i18n.patch)

Allan McRae allan at archlinux.org
Sun May 3 05:31:33 EDT 2009


    Date: Sunday, May 3, 2009 @ 05:31:32
  Author: allan
Revision: 37576

upgpkg: coreutils 7.3-1
    upstream update, update i18n patch from Fedora, fix automake issues, compress info pages

Modified:
  coreutils/trunk/PKGBUILD
  coreutils/trunk/coreutils-i18n.patch

----------------------+
 PKGBUILD             |   40 +++++++++++++++++++++-------------------
 coreutils-i18n.patch |   48 ++++++++++++++++++++++++------------------------
 2 files changed, 45 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-05-03 08:32:25 UTC (rev 37575)
+++ PKGBUILD	2009-05-03 09:31:32 UTC (rev 37576)
@@ -1,16 +1,16 @@
 # $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Maintainer: Allan McRae <allan at archlinux.org>
 # Contributor: judd <jvinet at zeroflux.org>
 
 pkgname=coreutils
-pkgver=7.2
+pkgver=7.3
 pkgrel=1
 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL3')
 url="http://www.gnu.org/software/coreutils"
 groups=('base')
-depends=('glibc>=2.9-4' 'shadow>=4.1.2.1-2' 'pam>=1.0.3' 'acl>=2.2.47-1' 'gmp>=4.2.4')
+depends=('glibc>=2.9-4' 'shadow>=4.1.3.1-1' 'pam>=1.0.4' 'acl>=2.2.47-2' 'gmp>=4.2.4')
 provides=('mktemp')
 conflicts=('mktemp')
 replaces=('sh-utils' 'fileutils' 'textutils' 'mktemp')
@@ -22,28 +22,29 @@
 	coreutils-uname.patch
 	coreutils-pam.patch
 	coreutils-6.10-configuration.patch
+	coreutils-7.3-automake.patch
 	su)
-md5sums=('427c2914d3eab956f317c9ec6a45e62a'
-         'a395b29ce00b0f6effcfdd7ab760f95b'
+md5sums=('b72c35e4872cf04c2b7642ef8248d0ea'
+         '950b2fabf2004dbc65cfe2fd7d560523'
          '18d3ba178e2691242287b59bd81aedb9'
          '2127eb34886396b8361c9ab39acfe01c'
          '081aeb04487d1445d0dc3fc98cf41260'
+         'd35708c63564fb302e4c9208323ee823'
          'fa85e5cce5d723275b14365ba71a8aad')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   # 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
-  patch -Np1 -i ../coreutils-6.10-configuration.patch || return 1
+  patch -Np1 -i $srcdir/coreutils-pam.patch || return 1
+  patch -Np1 -i $srcdir/coreutils-i18n.patch || return 1
+  patch -Np1 -i $srcdir/coreutils-6.10-configuration.patch || return 1
 
   # from gentoo portage
-  patch -Np1 -i ../coreutils-uname.patch || return 1
+  patch -Np1 -i $srcdir/coreutils-uname.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
+  # we do not use the beta automake...
+  patch -Np1 -i $srcdir/coreutils-7.3-automake.patch || return 1
   autoreconf -v
 
   ./configure --prefix=/usr \
@@ -57,17 +58,18 @@
   rm -f ${pkgdir}/usr/bin/groups ${pkgdir}/usr/share/man/man1/groups.1 || return 1
   rm -f ${pkgdir}/usr/bin/kill ${pkgdir}/usr/share/man/man1/kill.1|| return 1
   cd ${pkgdir}/usr/bin
-  mkdir -p ${pkgdir}/bin ${pkgdir}/sbin ${pkgdir}/usr/sbin
-  mv su date echo false pwd stty true uname cat tr cut readlink ../../bin
-  mv dd cp df du ln ls mv rm dir sync vdir chgrp chmod chown ../../bin
-  mv mkdir mknod rmdir shred touch mkfifo dircolors install sleep ../../bin
-  mv chroot ../sbin
+  install -dm755 ${pkgdir}/{bin,sbin,usr/sbin}
+  mv su date echo false pwd stty true uname cat tr cut readlink $pkgdir/bin
+  mv dd cp df du ln ls mv rm dir sync vdir chgrp chmod chown $pkgdir/bin
+  mv mkdir mknod rmdir shred touch mkfifo dircolors install sleep $pkgdir/bin
+  mv chroot $pkgdir/usr/sbin
   ln -sf test [
   ln -sf /bin/sleep ${pkgdir}/usr/bin/sleep
-  install -D -m644 $startdir/src/su ${pkgdir}/etc/pam.d/su
+  install -Dm644 $srcdir/su ${pkgdir}/etc/pam.d/su
 
   ls -lha ${pkgdir}/bin/su
   chmod -v 4555 ${pkgdir}/bin/su
 
   rm -f ${pkgdir}/usr/share/info/dir
+  gzip -9 ${pkgdir}/usr/share/info/*
 }

Modified: coreutils-i18n.patch
===================================================================
--- coreutils-i18n.patch	2009-05-03 08:32:25 UTC (rev 37575)
+++ coreutils-i18n.patch	2009-05-03 09:31:32 UTC (rev 37576)
@@ -39,7 +39,7 @@
 +locale -k LC_CTYPE 2>&1 | grep -q charmap.*UTF-8 || exit 77
 +errors=0
 +
-+$xx -t @ -k2 -n misc/mb1.I > misc/mb1.O
++$xx -t ï¼  -k2 -n misc/mb1.I > misc/mb1.O
 +code=$?
 +if test $code != 0; then
 +  $echo "Test mb1 failed: $xx return code $code differs from expected value 0" 1>&2
@@ -57,7 +57,7 @@
 +  esac
 +fi
 +
-+$xx -t @ -k4 -n misc/mb2.I > misc/mb2.O
++$xx -t ï¼  -k4 -n misc/mb2.I > misc/mb2.O
 +code=$?
 +if test $code != 0; then
 +  $echo "Test mb2 failed: $xx return code $code differs from expected value 0" 1>&2
@@ -85,31 +85,31 @@
 --- /dev/null	2007-03-01 09:16:39.219409909 +0000
 +++ coreutils-6.8+/tests/misc/mb2.I	2007-03-01 15:08:24.000000000 +0000
 @@ -0,0 +1,4 @@
-+Apple@AA10@@20
-+Banana@AA5@@30
-+Citrus@AA20@@5
-+Cherry@AA30@@10
++Appleï¼ ï¼¡ï¼¡10ï¼ ï¼ 20
++Bananaï¼ ï¼¡ï¼¡5ï¼ ï¼ 30
++Citrusï¼ ï¼¡ï¼¡20ï¼ ï¼ 5
++Cherryï¼ ï¼¡ï¼¡30ï¼ ï¼ 10
 --- /dev/null	2007-03-01 09:16:39.219409909 +0000
 +++ coreutils-6.8+/tests/misc/mb2.X	2007-03-01 15:08:24.000000000 +0000
 @@ -0,0 +1,4 @@
-+Citrus@AA20@@5
-+Cherry@AA30@@10
-+Apple@AA10@@20
-+Banana@AA5@@30
++Citrusï¼ ï¼¡ï¼¡20ï¼ ï¼ 5
++Cherryï¼ ï¼¡ï¼¡30ï¼ ï¼ 10
++Appleï¼ ï¼¡ï¼¡10ï¼ ï¼ 20
++Bananaï¼ ï¼¡ï¼¡5ï¼ ï¼ 30
 --- /dev/null	2007-03-01 09:16:39.219409909 +0000
 +++ coreutils-6.8+/tests/misc/mb1.I	2007-03-01 15:08:24.000000000 +0000
 @@ -0,0 +1,4 @@
-+Apple@10
-+Banana@5
-+Citrus@20
-+Cherry@30
++Appleï¼ 10
++Bananaï¼ 5
++Citrusï¼ 20
++Cherryï¼ 30
 --- /dev/null	2007-03-01 09:16:39.219409909 +0000
 +++ coreutils-6.8+/tests/misc/mb1.X	2007-03-01 15:08:24.000000000 +0000
 @@ -0,0 +1,4 @@
-+Banana@5
-+Apple@10
-+Citrus@20
-+Cherry@30
++Bananaï¼ 5
++Appleï¼ 10
++Citrusï¼ 20
++Cherryï¼ 30
 diff -urN coreutils-6.12-orig/tests/Makefile.am coreutils-6.12/tests/Makefile.am
 --- 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
@@ -433,7 +433,7 @@
 +
 +  memset (&state, 0, sizeof (mbstate_t));
 +
-+  if (ptr == lim)
++  if (ptr >= lim)
 +    return;
 +
 +  if (tab != NULL)
@@ -464,7 +464,7 @@
 +		}
 +	    }
 +
-+	  if (sep == lim)
++	  if (sep >= lim)
 +	    break;
 +
 +	  extract_field (line, ptr, sep - ptr);
@@ -505,7 +505,7 @@
 +	  mblength = (mblength < 1) ? 1 : mblength;
 +
 +	  sep = ptr + mblength;
-+	  while (sep != lim)
++	  while (sep < lim)
 +	    {
 +	      state_bak = state;
 +	      mblength = mbrtowc (&wc, sep, lim - sep + 1, &state);
@@ -524,7 +524,7 @@
 +	    }
 +
 +	  extract_field (line, ptr, sep - ptr);
-+	  if (sep == lim)
++	  if (sep >= lim)
 +	    return;
 +
 +	  state_bak = state;
@@ -538,7 +538,7 @@
 +	  mblength = (mblength < 1) ? 1 : mblength;
 +
 +	  ptr = sep + mblength;
-+	  while (ptr != lim)
++	  while (ptr < lim)
 +	    {
 +	      state_bak = state;
 +	      mblength = mbrtowc (&wc, ptr, lim - ptr + 1, &state);
@@ -556,7 +556,7 @@
 +	      ptr += mblength;
 +	    }
 +	}
-+      while (ptr != lim);
++      while (ptr < lim);
 +    }
 +
 +  extract_field (line, ptr, lim - ptr);



More information about the arch-commits mailing list