File 0003-Revert-elf-Generalize-name-based-DSO-recog... of Package glibc

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-Revert-elf-Generalize-name-based-DSO-recognition-in-.patch of Package glibc (Revision 54a42f269ab94c8b3aa1d72b0fa020c6)

Currently displaying revision 54a42f269ab94c8b3aa1d72b0fa020c6 , Show latest

From c437d33f9b034b92de8ca0e211711ffa3df88d49 Mon Sep 17 00:00:00 2001
From: Thomas Crider <tcrider@localhost.localdomain>
Date: Wed, 16 Nov 2022 12:37:47 -0700
Subject: [PATCH 3/6] Revert 'elf: Generalize name-based DSO recognition in
 ldconfig'

---
 elf/Makefile   | 1 -
 elf/ldconfig.c | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/elf/Makefile b/elf/Makefile
index 83e3121f..656f4449 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -402,7 +402,6 @@ tests += \
   tst-big-note \
   tst-debug1 \
   tst-deep1 \
-  tst-dl-is_dso \
   tst-dlmodcount \
   tst-dlmopen1 \
   tst-dlmopen3 \
diff --git a/elf/ldconfig.c b/elf/ldconfig.c
index 9394ac64..6cd3c4a0 100644
--- a/elf/ldconfig.c
+++ b/elf/ldconfig.c
@@ -42,7 +42,6 @@
 #include <ldconfig.h>
 #include <dl-cache.h>
 #include <dl-hwcaps.h>
-#include <dl-is_dso.h>
 
 #include <dl-procinfo.h>
 
@@ -844,7 +843,9 @@ search_dir (const struct dir_entry *entry)
 	 subdirectory (if not already processing a glibc-hwcaps
 	 subdirectory)?  The dynamic linker is also considered as
 	 shared library.  */
-      if (!_dl_is_dso (direntry->d_name)
+      if (((strncmp (direntry->d_name, "lib", 3) != 0
+	    && strncmp (direntry->d_name, "ld-", 3) != 0)
+	   || strstr (direntry->d_name, ".so") == NULL)
 	  && (direntry->d_type == DT_REG
 	      || (entry->hwcaps == NULL
 		  && !is_hwcap_platform (direntry->d_name))))
-- 
2.38.1

Places

File 0003-Revert-elf-Generalize-name-based-DSO-recognition-in-.patch of Package glibc (Revision 54a42f269ab94c8b3aa1d72b0fa020c6)

Places