Authentication-Results: name.execsw.org; dkim=pass (1024-bit key) header.d=netbsd.org header.i=@netbsd.org header.b=ARWIHm0Q; dkim=pass (1024-bit key) header.d=netbsd.org header.i=@netbsd.org header.b=CYL8iF/r Received: by mail.netbsd.org (Postfix, from userid 605) id 9540084E77; Tue, 23 Apr 2024 07:38:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netbsd.org; s=20240131; t=1713857896; bh=myYQTfDo064MMazi+b3wY5FXwG+rHGdxT5gN8tBeaw4=; h=Date:From:Subject:To:Reply-To:List-Id:List-Unsubscribe; b=ARWIHm0QIaHAkaRfgFcOIZuu7O+Jn0DTUuub7XnkE6Nx3mz+M2YK+pMCkCCcfkK7h UZXRaMjP/zKYd5Truznt+aO+eQdXFeyJiNnxkfaTURHtVfUnEanIQo2OFiHq4TSfoo F9XO2tibsLfP4cqXJF7n+BKMxGW5YgElGjcUeHz0= Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 85DFB84D69 for ; Tue, 23 Apr 2024 07:38:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Authentication-Results: mail.netbsd.org (amavisd-new); dkim=pass (1024-bit key) header.d=netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id fYYMx5N_iv8W for ; Tue, 23 Apr 2024 07:38:15 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id D5F3384D4B for ; Tue, 23 Apr 2024 07:38:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netbsd.org; s=20240131; t=1713857895; bh=myYQTfDo064MMazi+b3wY5FXwG+rHGdxT5gN8tBeaw4=; h=Date:From:Subject:To:Reply-To; b=CYL8iF/rCFG5ZyK4YrUZFxjjxjtaM7jGlH0Re/v5FxaiLO/9UKitpqVtyR8+90M+U TkSoB8DXq5++fPOhOTcqhztSnogyXZeQRGIzIqVx0ALmAI4L3SKvcaDPaqWMPo8aPy WiBVqVik2GNPg44Y+a5s/lY0QekWDDKqJeZQmlU4= Received: by cvs.NetBSD.org (Postfix, from userid 500) id C8335FA2C; Tue, 23 Apr 2024 07:38:14 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1713857894224970" MIME-Version: 1.0 Date: Tue, 23 Apr 2024 07:38:14 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/bootstrap To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20240423073814.C8335FA2C@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1713857894224970 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Tue Apr 23 07:38:14 UTC 2024 Modified Files: pkgsrc/bootstrap: bootstrap Log Message: bootstrap: Support Linux setups without groups(1), whoami(1) Allows initial support for OpenWRT. from Saulius Krasuckas via tech-pkg. To generate a diff of this commit: cvs rdiff -u -r1.323 -r1.324 pkgsrc/bootstrap/bootstrap Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1713857894224970 Content-Disposition: inline Content-Length: 849 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/bootstrap/bootstrap diff -u pkgsrc/bootstrap/bootstrap:1.323 pkgsrc/bootstrap/bootstrap:1.324 --- pkgsrc/bootstrap/bootstrap:1.323 Fri Mar 22 23:34:00 2024 +++ pkgsrc/bootstrap/bootstrap Tue Apr 23 07:38:14 2024 @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.323 2024/03/22 23:34:00 gutteridge Exp $ +# $NetBSD: bootstrap,v 1.324 2024/04/23 07:38:14 nia Exp $ # # Copyright (c) 2001-2011 Alistair Crooks # All rights reserved. @@ -749,6 +749,13 @@ Linux) need_awk=yes need_sed=yes fi + # Some distros, eg. OpenWRT provide no groups(1), whoami(1) by default: + if ! groups >/dev/null 2>&1; then + groupsprog="id -gn" + fi + if ! whoami >/dev/null 2>&1; then + whoamiprog="id -un" + fi machine_arch=`uname -m` # Override machine_arch where required. case "$machine_arch" in --_----------=_1713857894224970--