Remove 'gshadow' and merge into 'nss'

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.
Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

20 files changed, 49 insertions, 62 deletions

diff --git a/Makeconfig b/Makeconfig
index 9ff6a90..ac7fa3d 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 a955245..0000000
--- 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
-# <https://www.gnu.org/licenses/>.
-
-#
-#	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 1dba0c5..0000000
--- 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 1cefcfc..95f8f95 100644
--- a/include/gshadow.h
+++ b/include/gshadow.h
@@ -1,5 +1,5 @@
 #ifndef _GSHADOW_H
-#include <gshadow/gshadow.h>
+#include <nss/gshadow.h>
 
 # ifndef _ISOMAC
 
diff --git a/nss/Makefile b/nss/Makefile
index baf7d9d..5256b90 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 5401829..6204ac0 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
index dc26b24..dc26b24 100644
--- a/gshadow/fgetsgent.c
+++ b/nss/fgetsgent.c
diff --git a/gshadow/fgetsgent_r.c b/nss/fgetsgent_r.c
index 54616b9..54616b9 100644
--- a/gshadow/fgetsgent_r.c
+++ b/nss/fgetsgent_r.c
diff --git a/gshadow/getsgent.c b/nss/getsgent.c
index 68f67c0..68f67c0 100644
--- a/gshadow/getsgent.c
+++ b/nss/getsgent.c
diff --git a/gshadow/getsgent_r.c b/nss/getsgent_r.c
index b24ebe1..b24ebe1 100644
--- a/gshadow/getsgent_r.c
+++ b/nss/getsgent_r.c
diff --git a/gshadow/getsgnam.c b/nss/getsgnam.c
index 3177c86..3177c86 100644
--- a/gshadow/getsgnam.c
+++ b/nss/getsgnam.c
diff --git a/gshadow/getsgnam_r.c b/nss/getsgnam_r.c
index a7bc0b0..a7bc0b0 100644
--- a/gshadow/getsgnam_r.c
+++ b/nss/getsgnam_r.c
diff --git a/gshadow/gshadow.h b/nss/gshadow.h
index 078e145..078e145 100644
--- a/gshadow/gshadow.h
+++ b/nss/gshadow.h
diff --git a/gshadow/putsgent.c b/nss/putsgent.c
index cd48eb2..cd48eb2 100644
--- a/gshadow/putsgent.c
+++ b/nss/putsgent.c
diff --git a/gshadow/sgetsgent.c b/nss/sgetsgent.c
index 92302f7..92302f7 100644
--- a/gshadow/sgetsgent.c
+++ b/nss/sgetsgent.c
diff --git a/gshadow/sgetsgent_r.c b/nss/sgetsgent_r.c
index c75624e..c75624e 100644
--- a/gshadow/sgetsgent_r.c
+++ b/nss/sgetsgent_r.c
diff --git a/gshadow/tst-fgetsgent_r.c b/nss/tst-fgetsgent_r.c
index 17558fa..17558fa 100644
--- a/gshadow/tst-fgetsgent_r.c
+++ b/nss/tst-fgetsgent_r.c
diff --git a/gshadow/tst-gshadow.c b/nss/tst-gshadow.c
index 8b469b7..8b469b7 100644
--- a/gshadow/tst-gshadow.c
+++ b/nss/tst-gshadow.c
diff --git a/gshadow/tst-putsgent.c b/nss/tst-putsgent.c
index 2ee0253..2ee0253 100644
--- a/gshadow/tst-putsgent.c
+++ b/nss/tst-putsgent.c
diff --git a/gshadow/tst-sgetsgent.c b/nss/tst-sgetsgent.c
index 0370c10..0370c10 100644
--- a/gshadow/tst-sgetsgent.c
+++ b/nss/tst-sgetsgent.c