From e3f6270ff75cbd3f616b691c08cb671a6efb6ea4 Mon Sep 17 00:00:00 2001
From: Ned Ludd <solar@gentoo.org>
Date: Thu, 21 Apr 2005 15:47:59 +0000
Subject: - update getent script in FILESDIR (Portage version: 2.0.51.19)

---
 sys-libs/uclibc/ChangeLog            |  5 ++++-
 sys-libs/uclibc/Manifest             |  6 +++---
 sys-libs/uclibc/files/getent         | 15 ++++++++++-----
 sys-libs/uclibc/uclibc-0.9.27.ebuild |  5 +++--
 4 files changed, 20 insertions(+), 11 deletions(-)

(limited to 'sys-libs/uclibc')

diff --git a/sys-libs/uclibc/ChangeLog b/sys-libs/uclibc/ChangeLog
index fa5f46b81596..5e839a4b3477 100644
--- a/sys-libs/uclibc/ChangeLog
+++ b/sys-libs/uclibc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/uclibc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.4 2005/01/17 23:08:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.5 2005/04/21 15:47:59 solar Exp $
+
+  21 Apr 2005; <solar@gentoo.org> files/getent, uclibc-0.9.27.ebuild:
+  - update getent script in FILESDIR
 
   17 Jan 2005; Mike Frysinger <vapier@gentoo.org> uclibc-0.9.26-r8.ebuild,
   uclibc-0.9.27.ebuild:
diff --git a/sys-libs/uclibc/Manifest b/sys-libs/uclibc/Manifest
index bce9810626df..f88e22c180e7 100644
--- a/sys-libs/uclibc/Manifest
+++ b/sys-libs/uclibc/Manifest
@@ -1,5 +1,5 @@
-MD5 c9800c105dd5709742b374c335560842 ChangeLog 8488
+MD5 6eb0edbbd9af9ff3d49536b2a7927fc4 uclibc-0.9.27.ebuild 10421
+MD5 223f80f71804a744d5ff4a68115535cc ChangeLog 8596
 MD5 e96b4dfc373a1cdf7735aeae52c4cf7e metadata.xml 999
-MD5 327b091d3a1d3bc0f8adb665b611b39d uclibc-0.9.27.ebuild 10393
-MD5 0b733285f186f31c1be9ffcc42f1064e files/getent 973
+MD5 685fd35b1f34a7dd2e5c173d7e388aae files/getent 1096
 MD5 8801c8a97f025fb426cba64a5b9a4501 files/digest-uclibc-0.9.27 229
diff --git a/sys-libs/uclibc/files/getent b/sys-libs/uclibc/files/getent
index 5617cb0c6e0f..f1b8590ed862 100755
--- a/sys-libs/uclibc/files/getent
+++ b/sys-libs/uclibc/files/getent
@@ -1,4 +1,5 @@
 #!/bin/sh
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/files/getent,v 1.2 2005/04/21 15:47:59 solar Exp $
 
 search_entry() {
   if [ -e "$1" ] ; then
@@ -15,12 +16,16 @@ string="dummy"
 
 #aliases|ethers|group|hosts|netgroup|networks|passwd|protocols|rpc|services|shadow)
 # dns based search is not supported for hosts|networks
-# networks searches ^string
-# protocols|rpc|services searches string anywhere
-# ethers|netgroup ?
+# ethers|netgroup (not done, needed)?
 # it returns only the first match
 case $1 in
-  group|passwd|shadow)
+  passwd)
+    string="(^\<$2\>:|^.*:.*:\<$2\>:.*:.*:.*:.*)"
+    ;;
+  group)
+    string="(^|:)\<$2\>:"
+    ;;
+  shadow)
     string="^\<$2\>:"
     ;;
   aliases)
@@ -34,7 +39,7 @@ case $1 in
   networks)
     string="^\<$2\>"
     ;;
-  hosts|protocol|rpc|services)
+  hosts|protocols|rpc|services)
     string="\<$2\>"
     ;;
   *)
diff --git a/sys-libs/uclibc/uclibc-0.9.27.ebuild b/sys-libs/uclibc/uclibc-0.9.27.ebuild
index 11e961ecb57c..cea18d0855c3 100644
--- a/sys-libs/uclibc/uclibc-0.9.27.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.27.ebuild,v 1.14 2005/03/19 22:56:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.27.ebuild,v 1.15 2005/04/21 15:47:59 solar Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -298,7 +298,8 @@ src_install() {
 		emake PREFIX="${D}" install_utils || die "install-utils failed"
 		dodir /usr/bin
 		exeinto /usr/bin
-		doexe extra/scripts/getent
+		#doexe extra/scripts/getent
+		doexe ${FILESDIR}/getent
 	fi
 
 	if ! use build ; then
-- 
cgit v1.2.3-65-gdbad