c4ce44d Merge pull request #1495 from jrmarino/master — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Merge pull request #1495 from jrmarino/master

Baptiste Daroussin committed 9 years ago

commit c4ce44d885d23b1bc9d06e294ff8bae02eb73f65
parent c05c940

2 files changed +5 -1

modified libpkg/elfhints.c

@@ -310,7 +310,7 @@ int shlib_list_from_rpath(const char *rpath_str, const char *dirpath)

 int
 shlib_list_from_elf_hints(const char *hintsfile)
 {
 #ifndef __linux__
 #if !(defined __linux__ || defined __NetBSD__)
 	read_elf_hints(hintsfile, 1);
 #endif

modified libpkg/private/ldconfig.h

@@ -55,7 +55,11 @@ struct elfhints_hdr

 #define ELFHINTS_MAGIC  0x746e6845
 # ifdef __NetBSD__
 #define _PATH_ELF_HINTS "/var/run/ld.so.hints"
 # else
 #define _PATH_ELF_HINTS "/var/run/ld-elf.so.hints"
 # endif
 #endif
 extern int	insecure;	/* -i flag, needed here for elfhints.c */