summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2018-05-12 22:56:13 +0200
committerGuillem Jover <guillem@debian.org>2018-06-22 03:22:00 +0200
commitaa0404293ff1a3d81353acb8c7495fe9eb382c92 (patch)
tree77eeb19becbde01f4db080e3554b37be0978e7be
parent178d8914519ead4113df423f2a275c21b712f666 (diff)
downloaddpkg-aa0404293ff1a3d81353acb8c7495fe9eb382c92.tar.gz
dpkg: Check for ldconfig command only on platforms that do have it
We should implement a whitelist here, instead of a blacklist. Not all ELF based libc do have a ldconfig command.
-rw-r--r--debian/changelog1
-rw-r--r--src/help.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index b286bab3c..01585aef7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -74,6 +74,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
them from the BSD types at configure time.
- Use MD5_CTX instead of struct MD5Context, as the prevalent more portable
type on system's <md5.h> headers.
+ - Check for ldconfig command in dpkg only on platforms that do have it.
* Perl modules:
- Check that $tarname is defined before use in Dpkg::Source::Package::V1.
Thanks to Christoph Biedl <debian.axhn@manchmal.in-ulm.de>.
diff --git a/src/help.c b/src/help.c
index aa9b11c38..c5b06b4b6 100644
--- a/src/help.c
+++ b/src/help.c
@@ -125,7 +125,8 @@ void checkpath(void) {
* an ldconfig. */
#if defined(__APPLE__) && defined(__MACH__)
"update_dyld_shared_cache",
-#else
+#elif defined(__GLIBC__) || defined(__UCLIBC__) || \
+ defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
"ldconfig",
#endif
#if BUILD_START_STOP_DAEMON