[arch-commits] CVS update of arch/build/base/coreutils (PKGBUILD ls.patch)

Jan de Groot jgc at archlinux.org
Sun Aug 5 12:03:47 EDT 2007


    Date: Sunday, August 5, 2007 @ 12:03:47
  Author: jgc
    Path: /home/cvs-arch/arch/build/base/coreutils

Modified: PKGBUILD (1.24 -> 1.25)
 Removed: ls.patch (1.1)

Cleanup PKGBUILDs, remove old patches, add licenses, fix source URLs


----------+
 PKGBUILD |   12 +++-
 ls.patch |  157 -------------------------------------------------------------
 2 files changed, 8 insertions(+), 161 deletions(-)


Index: arch/build/base/coreutils/PKGBUILD
diff -u arch/build/base/coreutils/PKGBUILD:1.24 arch/build/base/coreutils/PKGBUILD:1.25
--- arch/build/base/coreutils/PKGBUILD:1.24	Sat Mar 24 12:23:27 2007
+++ arch/build/base/coreutils/PKGBUILD	Sun Aug  5 12:03:46 2007
@@ -1,19 +1,23 @@
-# $Id: PKGBUILD,v 1.24 2007/03/24 16:23:27 tpowa Exp $
+# $Id: PKGBUILD,v 1.25 2007/08/05 16:03:46 jgc Exp $
 # Maintainer: judd <jvinet at zeroflux.org>
 pkgname=coreutils
 pkgver=6.9
 pkgrel=1
 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system"
 arch=(i686 x86_64)
+license=('GPL')
 url="http://www.gnu.org/software/coreutils"
 depends=('bash' 'glibc' 'shadow>=4.0.4.1-3' 'pam' 'acl')
 replaces=('sh-utils' 'fileutils' 'textutils')
 backup=('etc/pam.d/su')
-source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz coreutils-i18n.patch \
-	coreutils-uname.patch coreutils-pam.patch su)
+options=('!makeflags')
+source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
+	coreutils-i18n.patch
+	coreutils-uname.patch
+	coreutils-pam.patch
+	su)
 
 build() {
-  export MAKEFLAGS="-j1"
   cd $startdir/src/$pkgname-$pkgver
   # added pam patch and i18n patch from fedora cvs
   patch -Np1 -i ../coreutils-pam.patch || return 1
Index: arch/build/base/coreutils/ls.patch
diff -u arch/build/base/coreutils/ls.patch:1.1 arch/build/base/coreutils/ls.patch:removed
--- arch/build/base/coreutils/ls.patch:1.1	Tue Nov 21 15:22:14 2006
+++ arch/build/base/coreutils/ls.patch	Sun Aug  5 12:03:47 2007
@@ -1,157 +0,0 @@
-diff -u -p -r1.18 idcache.c
---- lib/idcache.c   6 Nov 2006 22:02:53 -0000       1.18
-+++ lib/idcache.c   20 Nov 2006 09:15:25 -0000
-@@ -55,24 +55,32 @@ static struct userid *nouser_alist;
- char *
- getuser (uid_t uid)
- {
--  register struct userid *tail;
--  struct passwd *pwent;
--  char const *name;
-+  struct userid *tail;
-+  struct userid *match = NULL;
-
-   for (tail = user_alist; tail; tail = tail->next)
--    if (tail->id.u == uid)
--      return tail->name;
-+    {
-+      if (tail->id.u == uid)
-+       {
-+         match = tail;
-+         break;
-+       }
-+    }
-
--  pwent = getpwuid (uid);
--  name = pwent ? pwent->pw_name : "";
--  tail = xmalloc (offsetof (struct userid, name) + strlen (name) + 1);
--  tail->id.u = uid;
--  strcpy (tail->name, name);
-+  if (match == NULL)
-+    {
-+      struct passwd *pwent = getpwuid (uid);
-+      char const *name = pwent ? pwent->pw_name : "";
-+      match = xmalloc (offsetof (struct userid, name) + strlen (name) + 1);
-+      match->id.u = uid;
-+      strcpy (match->name, name);
-+
-+      /* Add to the head of the list, so most recently used is first.  */
-+      match->next = user_alist;
-+      user_alist = match;
-+    }
-
--  /* Add to the head of the list, so most recently used is first.  */
--  tail->next = user_alist;
--  user_alist = tail;
--  return tail->name;
-+  return match->name[0] ? match->name : NULL;
- }
-
- /* Translate USER to a UID, with cache.
-@@ -83,7 +91,7 @@ getuser (uid_t uid)
- uid_t *
- getuidbyname (const char *user)
- {
--  register struct userid *tail;
-+  struct userid *tail;
-   struct passwd *pwent;
-
-   for (tail = user_alist; tail; tail = tail->next)
-@@ -94,7 +102,7 @@ getuidbyname (const char *user)
-   for (tail = nouser_alist; tail; tail = tail->next)
-     /* Avoid a function call for the most common case.  */
-     if (*tail->name == *user && !strcmp (tail->name, user))
--      return 0;
-+      return NULL;
-
-   pwent = getpwnam (user);
- #ifdef __DJGPP__
-@@ -121,7 +129,7 @@ getuidbyname (const char *user)
-
-   tail->next = nouser_alist;
-   nouser_alist = tail;
--  return 0;
-+  return NULL;
- }
-
- /* Use the same struct as for userids.  */
-@@ -133,24 +141,32 @@ static struct userid *nogroup_alist;
- char *
- getgroup (gid_t gid)
- {
--  register struct userid *tail;
--  struct group *grent;
--  char const *name;
-+  struct userid *tail;
-+  struct userid *match = NULL;
-
-   for (tail = group_alist; tail; tail = tail->next)
--    if (tail->id.g == gid)
--      return tail->name;
-+    {
-+      if (tail->id.g == gid)
-+       {
-+         match = tail;
-+         break;
-+       }
-+    }
-
--  grent = getgrgid (gid);
--  name = grent ? grent->gr_name : NULL;
--  tail = xmalloc (offsetof (struct userid, name) + strlen (name) + 1);
--  tail->id.g = gid;
--  strcpy (tail->name, name);
-+  if (match == NULL)
-+    {
-+      struct group *grent = getgrgid (gid);
-+      char const *name = grent ? grent->gr_name : "";
-+      match = xmalloc (offsetof (struct userid, name) + strlen (name) + 1);
-+      match->id.g = gid;
-+      strcpy (match->name, name);
-+
-+      /* Add to the head of the list, so most recently used is first.  */
-+      match->next = group_alist;
-+      group_alist = match;
-+    }
-
--  /* Add to the head of the list, so most recently used is first.  */
--  tail->next = group_alist;
--  group_alist = tail;
--  return tail->name;
-+  return match->name[0] ? match->name : NULL;
- }
-
- /* Translate GROUP to a GID, with cache.
-@@ -161,7 +177,7 @@ getgroup (gid_t gid)
- gid_t *
- getgidbyname (const char *group)
- {
--  register struct userid *tail;
-+  struct userid *tail;
-   struct group *grent;
-
-   for (tail = group_alist; tail; tail = tail->next)
-@@ -172,12 +188,12 @@ getgidbyname (const char *group)
-   for (tail = nogroup_alist; tail; tail = tail->next)
-     /* Avoid a function call for the most common case.  */
-     if (*tail->name == *group && !strcmp (tail->name, group))
--      return 0;
-+      return NULL;
-
-   grent = getgrnam (group);
- #ifdef __DJGPP__
-   /* We need to pretend to belong to group GROUP, to make
--     grp functions know about any arbitrary group name.  */
-+     grp functions know about an arbitrary group name.  */
-   if (!grent && strspn (group, digits) < strlen (group))
-     {
-       setenv ("GROUP", group, 1);
-@@ -199,5 +215,5 @@ getgidbyname (const char *group)
-
-   tail->next = nogroup_alist;
-   nogroup_alist = tail;
--  return 0;
-+  return NULL;
- }
-
- 




More information about the arch-commits mailing list