From 5362b272cbe6124519616052bf61a6faee60cd2b Mon Sep 17 00:00:00 2001 From: Volker Christian Date: Sat, 8 Jul 2023 16:04:27 +0200 Subject: [PATCH] File: Fix segfault Executables depending on binary package libmagic segfault in case package file is not installed. Libmagic needs file /usr/share/misc/magic to not segfault. Thus, install /usr/share/misc/magic along with libmagic and not with file. Signed-off-by: Volker Christian --- libs/file/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libs/file/Makefile b/libs/file/Makefile index 7b502bfab6..25941eccec 100644 --- a/libs/file/Makefile +++ b/libs/file/Makefile @@ -82,20 +82,22 @@ define Build/InstallDev $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/magic.h $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libmagic.{a,so*} $(1)/usr/lib/ + ${INSTALL_DIR} $(1)/usr/lib/pkgconfig + $(INSTALL_DATA) $(PKG_BUILD_DIR)/libmagic.pc $(1)/usr/lib/pkgconfig/ endef define Package/file/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/file $(1)/usr/bin/ - $(INSTALL_DIR) $(1)/usr/share/misc - $(SED) "/^#/d" $(PKG_INSTALL_DIR)/usr/share/file/magic - $(SED) "/^$$$$/d" $(PKG_INSTALL_DIR)/usr/share/file/magic - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/file/magic $(1)/usr/share/misc/ endef define Package/libmagic/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmagic.so.* $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/share/misc + $(SED) "/^#/d" $(PKG_INSTALL_DIR)/usr/share/file/magic + $(SED) "/^$$$$/d" $(PKG_INSTALL_DIR)/usr/share/file/magic + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/file/magic $(1)/usr/share/misc/ endef $(eval $(call BuildPackage,file)) -- 2.30.2