From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by sourceware.org (Postfix) with ESMTPS id 6DA333858D1E for ; Thu, 19 Oct 2023 18:15:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6DA333858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 6DA333858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::633 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697739332; cv=none; b=YJNzqQ7EMGm03rzpjCoELHEuU89otjk9naIjaMfk6zF8k+3JaD2JJb3oY+m5tYaqwVZc8muPflwk14exjx690ANPmS1DMuyclNlJUCwK6NucEoQaXqJkKDO49Z7uJ1/VmWJdSA3NtE5xcx22AzHotDV8+4M6XsqdrHBEsxOIj8Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697739332; c=relaxed/simple; bh=PiUc0a2DQlKgZigAy9XlWxFeNMJIGZZ+B5HDXuTlGbo=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=AUI96UGEDcHzh5fepAkSY5SfX3n5CHNyBHBCTM1PBUtSlYg8Xtm0nF1jLtlxouJbQop/jUryAVp0ISnOeoUBUypReSmh1Uv5wXV4HR69xMFJ9rBWGZdk6r6nRAup2Cl/vVvFjOpUqJNNIQxBbblSwH8AS+25yWplghxjXEVllUc= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-1c9d7a98abbso59440035ad.1 for ; Thu, 19 Oct 2023 11:15:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697739329; x=1698344129; darn=sourceware.org; h=content-transfer-encoding:in-reply-to:organization:from:references :to:content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=BMd8Ab/ynzDHADquzy1gLgiv8wybrGflwfo7VqNjfnU=; b=lcOIZfrjxOz86xsNZr6PblvnXNVVk/8ENnvFC8WqHBe41/McVgVS/Lnw8IQG+E3HIO ay4d9LyblRRFHywB7sE5HVQYog4FT+ZB3ZN8i5ZM+0W2j0hyiQ/McDucYF2M2DUYidz/ UxXmNkGVXANaHNfPjcJT9jjNr5KGgEXrlUJRb4HBYdpyVhImCnagFQNwk4BjTQKg6wd8 CZK9PJ9gHiChXSQNfFfuBMOAFSnkZJU5LG/5LKtapPa1WevFiNBs+FYE89ticoVlLxT/ a2bQg4711wnH3JBH1y5ybKiKQhQWHUtQAzoBgTW2VNk+zDWE67DGDACmdmg5Ih7uXzAG qGgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697739329; x=1698344129; h=content-transfer-encoding:in-reply-to:organization:from:references :to:content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=BMd8Ab/ynzDHADquzy1gLgiv8wybrGflwfo7VqNjfnU=; b=m81TUNaJ3kGacPXKpgs4ChrWoCNhOgZZcBwuDipWRlj4enYRpuYvj5suva8DWn5Ogx 69TWH6wb59KH2PQ6Dhf5gA3SSv81tBJ/YoxF9A+KFe7zIbNg930f+Cyd7h48WalAZb4b w09sYyw32fzIinpMK05VSsCSs+jIfHOFj+q2HCwxhquGCI+a2zduSdB6SpOiJGWX4812 GISbtA50H+AbCEuKuDl42Pj6/vhtxTbRNQCHq7FrF3lHtc8M5lH5QDkZowuytGwaK/WZ iAXL1s0RCeqbtr0yBGJ/NGnBlR3dl8h2JFnENHUK6vzBW2eKV9hUvqd1tROh9CGuZOrM KuYA== X-Gm-Message-State: AOJu0Yyqko70T/TqsA3YRcjYHXDeAL90dIXByoqI4qcnI4snWGT1JuW/ HwYGxKw2bGn2BkrbvpLyxSwbxw== X-Google-Smtp-Source: AGHT+IHNrglVSWzoE4/zCq9pIJVEic2ZuSYJR8/dilcJt/sYIktZRyVHRA549o1oho70JTa0kmr95w== X-Received: by 2002:a17:902:ecc1:b0:1ca:72f9:2547 with SMTP id a1-20020a170902ecc100b001ca72f92547mr3132599plh.66.1697739329278; Thu, 19 Oct 2023 11:15:29 -0700 (PDT) Received: from ?IPV6:2804:1b3:a7c3:a647:51c8:7d15:99b:dc36? ([2804:1b3:a7c3:a647:51c8:7d15:99b:dc36]) by smtp.gmail.com with ESMTPSA id e12-20020a170902ed8c00b001b7ffca7dbcsm3225plj.148.2023.10.19.11.15.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 19 Oct 2023 11:15:28 -0700 (PDT) Message-ID: <9c499af3-86ca-41b4-9c70-aa3c45063f12@linaro.org> Date: Thu, 19 Oct 2023 15:15:24 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 04/16] Remove 'gshadow' and merge into 'nss' Content-Language: en-US To: Arjun Shankar , libc-alpha@sourceware.org References: <20231002130150.1497733-1-arjun@redhat.com> <20231002130150.1497733-5-arjun@redhat.com> From: Adhemerval Zanella Netto Organization: Linaro In-Reply-To: <20231002130150.1497733-5-arjun@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 02/10/23 09:55, Arjun Shankar wrote: > The majority of gshadow routines are entry points for nss functionality. > This commit removes the 'gshadow' subdirectory and moves all > functionality and tests to 'nss'. References to gshadow/ are > accordingly changed. LGTM, thanks. Reviewed-by: Adhemerval Zanella > --- > Makeconfig | 2 +- > gshadow/Makefile | 39 ------------------------------ > gshadow/Versions | 21 ---------------- > include/gshadow.h | 2 +- > nss/Makefile | 28 +++++++++++++++++++++ > nss/Versions | 19 +++++++++++++++ > {gshadow => nss}/fgetsgent.c | 0 > {gshadow => nss}/fgetsgent_r.c | 0 > {gshadow => nss}/getsgent.c | 0 > {gshadow => nss}/getsgent_r.c | 0 > {gshadow => nss}/getsgnam.c | 0 > {gshadow => nss}/getsgnam_r.c | 0 > {gshadow => nss}/gshadow.h | 0 > {gshadow => nss}/putsgent.c | 0 > {gshadow => nss}/sgetsgent.c | 0 > {gshadow => nss}/sgetsgent_r.c | 0 > {gshadow => nss}/tst-fgetsgent_r.c | 0 > {gshadow => nss}/tst-gshadow.c | 0 > {gshadow => nss}/tst-putsgent.c | 0 > {gshadow => nss}/tst-sgetsgent.c | 0 > 20 files changed, 49 insertions(+), 62 deletions(-) > delete mode 100644 gshadow/Makefile > delete mode 100644 gshadow/Versions > rename {gshadow => nss}/fgetsgent.c (100%) > rename {gshadow => nss}/fgetsgent_r.c (100%) > rename {gshadow => nss}/getsgent.c (100%) > rename {gshadow => nss}/getsgent_r.c (100%) > rename {gshadow => nss}/getsgnam.c (100%) > rename {gshadow => nss}/getsgnam_r.c (100%) > rename {gshadow => nss}/gshadow.h (100%) > rename {gshadow => nss}/putsgent.c (100%) > rename {gshadow => nss}/sgetsgent.c (100%) > rename {gshadow => nss}/sgetsgent_r.c (100%) > rename {gshadow => nss}/tst-fgetsgent_r.c (100%) > rename {gshadow => nss}/tst-gshadow.c (100%) > rename {gshadow => nss}/tst-putsgent.c (100%) > rename {gshadow => nss}/tst-sgetsgent.c (100%) > > diff --git a/Makeconfig b/Makeconfig > index 9ff6a902e9..ac7fa3dbb3 100644 > --- a/Makeconfig > +++ b/Makeconfig > @@ -1353,7 +1353,7 @@ endif > all-subdirs = csu assert ctype locale intl catgets math setjmp signal \ > stdlib stdio-common libio malloc string wcsmbs time dirent \ > pwd posix io termios resource misc socket sysvipc gmon \ > - gnulib iconv iconvdata wctype manual shadow gshadow po argp \ > + gnulib iconv iconvdata wctype manual shadow po argp \ > localedata timezone rt conform debug mathvec support \ > dlfcn elf > > diff --git a/gshadow/Makefile b/gshadow/Makefile > deleted file mode 100644 > index a95524593a..0000000000 > --- a/gshadow/Makefile > +++ /dev/null > @@ -1,39 +0,0 @@ > -# Copyright (C) 2009-2023 Free Software Foundation, Inc. > -# This file is part of the GNU C Library. > - > -# The GNU C Library is free software; you can redistribute it and/or > -# modify it under the terms of the GNU Lesser General Public > -# License as published by the Free Software Foundation; either > -# version 2.1 of the License, or (at your option) any later version. > - > -# The GNU C Library is distributed in the hope that it will be useful, > -# but WITHOUT ANY WARRANTY; without even the implied warranty of > -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > -# Lesser General Public License for more details. > - > -# You should have received a copy of the GNU Lesser General Public > -# License along with the GNU C Library; if not, see > -# . > - > -# > -# Makefile for gshadow. > -# > -subdir := gshadow > - > -include ../Makeconfig > - > -headers = gshadow.h > -routines = getsgent getsgnam sgetsgent fgetsgent putsgent \ > - getsgent_r getsgnam_r sgetsgent_r fgetsgent_r > - > -tests = tst-gshadow tst-putsgent tst-fgetsgent_r tst-sgetsgent > - > -CFLAGS-getsgent_r.c += -fexceptions > -CFLAGS-getsgent.c += -fexceptions > -CFLAGS-fgetsgent.c += -fexceptions > -CFLAGS-fgetsgent_r.c += -fexceptions $(libio-mtsafe) > -CFLAGS-putsgent.c += -fexceptions $(libio-mtsafe) > -CFLAGS-getsgnam.c += -fexceptions > -CFLAGS-getsgnam_r.c += -fexceptions > - > -include ../Rules > diff --git a/gshadow/Versions b/gshadow/Versions > deleted file mode 100644 > index 1dba0c5f19..0000000000 > --- a/gshadow/Versions > +++ /dev/null > @@ -1,21 +0,0 @@ > -libc { > - GLIBC_2.10 { > - # e* > - endsgent; > - > - # f* > - fgetsgent; fgetsgent_r; > - > - # g* > - getsgent; getsgent_r; getsgnam; getsgnam_r; > - > - # p* > - putsgent; > - > - # s* > - setsgent; > - > - # s* > - sgetsgent; sgetsgent_r; > - } > -} > diff --git a/include/gshadow.h b/include/gshadow.h > index 1cefcfc641..95f8f950a9 100644 > --- a/include/gshadow.h > +++ b/include/gshadow.h > @@ -1,5 +1,5 @@ > #ifndef _GSHADOW_H > -#include > +#include > > # ifndef _ISOMAC > > diff --git a/nss/Makefile b/nss/Makefile > index baf7d9d0ab..5256b90f8b 100644 > --- a/nss/Makefile > +++ b/nss/Makefile > @@ -24,6 +24,7 @@ include ../Makeconfig > > headers := \ > grp.h \ > + gshadow.h \ > nss.h \ > # headers > > @@ -79,6 +80,29 @@ CFLAGS-initgroups.c += -fexceptions > CFLAGS-putgrent.c += -fexceptions $(libio-mtsafe) > endif > > +# gshadow routines: > +routines += \ > + fgetsgent \ > + fgetsgent_r \ > + getsgent \ > + getsgent_r \ > + getsgnam \ > + getsgnam_r \ > + putsgent \ > + sgetsgent \ > + sgetsgent_r \ > + # routines > + > +ifeq ($(have-thread-library),yes) > +CFLAGS-getsgent_r.c += -fexceptions > +CFLAGS-getsgent.c += -fexceptions > +CFLAGS-fgetsgent.c += -fexceptions > +CFLAGS-fgetsgent_r.c += -fexceptions $(libio-mtsafe) > +CFLAGS-putsgent.c += -fexceptions $(libio-mtsafe) > +CFLAGS-getsgnam.c += -fexceptions > +CFLAGS-getsgnam_r.c += -fexceptions > +endif > + > # These are the databases that go through nss dispatch. > # Caution: if you add a database here, you must add its real name > # in databases.def, too. > @@ -118,6 +142,8 @@ tests := \ > test-digits-dots \ > test-netdb \ > testgrp \ > + tst-fgetsgent_r \ > + tst-gshadow \ > tst-nss-getpwent \ > tst-nss-hash \ > tst-nss-test1 \ > @@ -126,6 +152,8 @@ tests := \ > tst-nss-test5 \ > tst-nss-test_errno \ > tst-putgrent \ > + tst-putsgent \ > + tst-sgetsgent \ > # tests > > xtests = bug-erange > diff --git a/nss/Versions b/nss/Versions > index 5401829911..6204ac0af1 100644 > --- a/nss/Versions > +++ b/nss/Versions > @@ -37,6 +37,25 @@ libc { > # g* > getgrouplist; > } > + GLIBC_2.10 { > + # e* > + endsgent; > + > + # f* > + fgetsgent; fgetsgent_r; > + > + # g* > + getsgent; getsgent_r; getsgnam; getsgnam_r; > + > + # p* > + putsgent; > + > + # s* > + setsgent; > + > + # s* > + sgetsgent; sgetsgent_r; > + } > GLIBC_2.27 { > } > GLIBC_PRIVATE { > diff --git a/gshadow/fgetsgent.c b/nss/fgetsgent.c > similarity index 100% > rename from gshadow/fgetsgent.c > rename to nss/fgetsgent.c > diff --git a/gshadow/fgetsgent_r.c b/nss/fgetsgent_r.c > similarity index 100% > rename from gshadow/fgetsgent_r.c > rename to nss/fgetsgent_r.c > diff --git a/gshadow/getsgent.c b/nss/getsgent.c > similarity index 100% > rename from gshadow/getsgent.c > rename to nss/getsgent.c > diff --git a/gshadow/getsgent_r.c b/nss/getsgent_r.c > similarity index 100% > rename from gshadow/getsgent_r.c > rename to nss/getsgent_r.c > diff --git a/gshadow/getsgnam.c b/nss/getsgnam.c > similarity index 100% > rename from gshadow/getsgnam.c > rename to nss/getsgnam.c > diff --git a/gshadow/getsgnam_r.c b/nss/getsgnam_r.c > similarity index 100% > rename from gshadow/getsgnam_r.c > rename to nss/getsgnam_r.c > diff --git a/gshadow/gshadow.h b/nss/gshadow.h > similarity index 100% > rename from gshadow/gshadow.h > rename to nss/gshadow.h > diff --git a/gshadow/putsgent.c b/nss/putsgent.c > similarity index 100% > rename from gshadow/putsgent.c > rename to nss/putsgent.c > diff --git a/gshadow/sgetsgent.c b/nss/sgetsgent.c > similarity index 100% > rename from gshadow/sgetsgent.c > rename to nss/sgetsgent.c > diff --git a/gshadow/sgetsgent_r.c b/nss/sgetsgent_r.c > similarity index 100% > rename from gshadow/sgetsgent_r.c > rename to nss/sgetsgent_r.c > diff --git a/gshadow/tst-fgetsgent_r.c b/nss/tst-fgetsgent_r.c > similarity index 100% > rename from gshadow/tst-fgetsgent_r.c > rename to nss/tst-fgetsgent_r.c > diff --git a/gshadow/tst-gshadow.c b/nss/tst-gshadow.c > similarity index 100% > rename from gshadow/tst-gshadow.c > rename to nss/tst-gshadow.c > diff --git a/gshadow/tst-putsgent.c b/nss/tst-putsgent.c > similarity index 100% > rename from gshadow/tst-putsgent.c > rename to nss/tst-putsgent.c > diff --git a/gshadow/tst-sgetsgent.c b/nss/tst-sgetsgent.c > similarity index 100% > rename from gshadow/tst-sgetsgent.c > rename to nss/tst-sgetsgent.c