[2/9] treewide: remove remnants of libnss_ldap

Message ID 20260919100444.2316950-3-xry111@xry111.site (mailing list archive)
State Superseded
Delegated to: Adhemerval Zanella Netto
Headers
Series Make test-installation.pl work |

Checks

Context Check Description
redhat-pt-bot/TryBot-apply_patch success Patch applied to master at the time it was sent
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 success Build passed
linaro-tcwg-bot/tcwg_glibc_build--master-arm success Build passed
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 success Test passed
linaro-tcwg-bot/tcwg_glibc_check--master-arm success Test passed

Commit Message

Xi Ruoyao Sept. 19, 2026, 10:04 a.m. UTC
  The library has been removed from glibc since the commit 520e73a231f0
(28 years ago).

Signed-off-by: Xi Ruoyao <xry111@xry111.site>
---
 scripts/test-installation.pl                | 4 ++--
 shlib-versions                              | 1 -
 sysdeps/unix/sysv/linux/mips/shlib-versions | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)
  

Comments

Adhemerval Zanella Sept. 24, 2026, 4:40 p.m. UTC | #1
On 19/09/26 07:04, Xi Ruoyao wrote:
> The library has been removed from glibc since the commit 520e73a231f0
> (28 years ago).
> 
> Signed-off-by: Xi Ruoyao <xry111@xry111.site>
> ---
>  scripts/test-installation.pl                | 4 ++--
>  shlib-versions                              | 1 -
>  sysdeps/unix/sysv/linux/mips/shlib-versions | 1 -
>  3 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/scripts/test-installation.pl b/scripts/test-installation.pl
> index 57897a9efd..9388e11ba1 100755
> --- a/scripts/test-installation.pl
> +++ b/scripts/test-installation.pl
> @@ -122,8 +122,8 @@ while (<SOVERSIONS>) {
>        "thread_db",
>        # is just a test NSS module
>        "nss_test1",
> -      # are not provided by glibc
> -      "libgcc_s", "nss_ldap",
> +      # is not provided by glibc
> +      "libgcc_s",
>      );
>      next if (grep { $_ eq $name } @skip);
>      # libmvec if it wasn't built
> diff --git a/shlib-versions b/shlib-versions
> index 32093228c4..b1f8606a09 100644
> --- a/shlib-versions
> +++ b/shlib-versions
> @@ -43,7 +43,6 @@ libresolv=2
>  libnss_files=2
>  libnss_dns=2
>  libnss_compat=2
> -libnss_ldap=2
>  libnss_hesiod=2
>  libnss_db=2
>  

<gnu/lib-names.h> is generated from all-sonames, so this also removes
LIBNSS_LDAP_SO from an installed header.  I think that is fine, since
ae7a94e5e3e dropped LIBNSS_NIS_SO and LIBNSS_NISPLUS_SO the same way,
but please mention it in the commit message.

LGTM with the commit message update.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

> diff --git a/sysdeps/unix/sysv/linux/mips/shlib-versions b/sysdeps/unix/sysv/linux/mips/shlib-versions
> index c57674deec..2eb78330d1 100644
> --- a/sysdeps/unix/sysv/linux/mips/shlib-versions
> +++ b/sysdeps/unix/sysv/linux/mips/shlib-versions
> @@ -15,7 +15,6 @@ libresolv=2		GLIBC_2.0 GLIBC_2.2
>  libnss_files=2		GLIBC_2.0 GLIBC_2.2
>  libnss_dns=2		GLIBC_2.0 GLIBC_2.2
>  libnss_compat=2		GLIBC_2.0 GLIBC_2.2
> -libnss_ldap=2		GLIBC_2.0 GLIBC_2.2
>  libnss_hesiod=2		GLIBC_2.0 GLIBC_2.2
>  
>  libnsl=1		GLIBC_2.0 GLIBC_2.2
  

Patch

diff --git a/scripts/test-installation.pl b/scripts/test-installation.pl
index 57897a9efd..9388e11ba1 100755
--- a/scripts/test-installation.pl
+++ b/scripts/test-installation.pl
@@ -122,8 +122,8 @@  while (<SOVERSIONS>) {
       "thread_db",
       # is just a test NSS module
       "nss_test1",
-      # are not provided by glibc
-      "libgcc_s", "nss_ldap",
+      # is not provided by glibc
+      "libgcc_s",
     );
     next if (grep { $_ eq $name } @skip);
     # libmvec if it wasn't built
diff --git a/shlib-versions b/shlib-versions
index 32093228c4..b1f8606a09 100644
--- a/shlib-versions
+++ b/shlib-versions
@@ -43,7 +43,6 @@  libresolv=2
 libnss_files=2
 libnss_dns=2
 libnss_compat=2
-libnss_ldap=2
 libnss_hesiod=2
 libnss_db=2
 
diff --git a/sysdeps/unix/sysv/linux/mips/shlib-versions b/sysdeps/unix/sysv/linux/mips/shlib-versions
index c57674deec..2eb78330d1 100644
--- a/sysdeps/unix/sysv/linux/mips/shlib-versions
+++ b/sysdeps/unix/sysv/linux/mips/shlib-versions
@@ -15,7 +15,6 @@  libresolv=2		GLIBC_2.0 GLIBC_2.2
 libnss_files=2		GLIBC_2.0 GLIBC_2.2
 libnss_dns=2		GLIBC_2.0 GLIBC_2.2
 libnss_compat=2		GLIBC_2.0 GLIBC_2.2
-libnss_ldap=2		GLIBC_2.0 GLIBC_2.2
 libnss_hesiod=2		GLIBC_2.0 GLIBC_2.2
 
 libnsl=1		GLIBC_2.0 GLIBC_2.2