openwrtv4/tools/e2fsprogs/patches/010-old-libmagic.patch
Daniel Engberg 34ba64fe70 tools/e2fsprogs: Update to 1.43.4
* Update to 1.43.4
* Refresh patches
* xz tarball which saves about 2M in size

Changelog: http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.43.4

Tested by Etienne Haarsma (ar71xx), Daniel Engberg (kirkwood)

Signed-off-by: Etienne Haarsma <bladeoner112@gmail.com>
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
Signed-off-by: Felix Fietkau <nbd@nbd.name> [use @KERNEL instead of harcoded URL]
2017-02-09 12:26:13 +01:00

25 lines
876 B
Diff

From b482eb7af94885b6bbad9329e40702c958d5b448 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Thu, 30 Jun 2016 19:53:03 +0200
Subject: [PATCH] fix build problem with very old libmagic
The libmagic shipped with RedHat 5 does not define
MAGIC_NO_CHECK_ELF and MAGIC_NO_CHECK_COMPRESS. e2fsprogs should
check for that otherwise the build will fail.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
lib/support/plausible.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/lib/support/plausible.c
+++ b/lib/support/plausible.c
@@ -258,7 +258,7 @@ int check_plausibility(const char *devic
return 0;
}
-#ifdef HAVE_MAGIC_H
+#if defined(HAVE_MAGIC_H) && defined(MAGIC_NO_CHECK_ELF) && defined(MAGIC_NO_CHECK_COMPRESS)
if ((flags & CHECK_FS_EXIST) &&
!getenv("E2FSPROGS_LIBMAGIC_SUPPRESS") &&
magic_library_available()) {