From 555546e3d335256bf1d82abf16a94f999c248ff5 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Tue, 31 Aug 2021 12:18:20 +0200 Subject: [PATCH] ntfs-3g: bump to 2021.8.22 (CVE fixes) Upstream announced new release which includes fixes for 21 CVEs (see [1]). Upstream changed the symlink "mkfs.ntfs" to respect "--sbin-dir". So this commit adjusts this likewise in the Makefile. [1] https://www.openwall.com/lists/oss-security/2021/08/30/1 Signed-off-by: Sebastian Kemper --- utils/ntfs-3g/Makefile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/utils/ntfs-3g/Makefile b/utils/ntfs-3g/Makefile index 40d38e80e..e69c98663 100644 --- a/utils/ntfs-3g/Makefile +++ b/utils/ntfs-3g/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ntfs-3g -PKG_VERSION:=2017.3.23 -PKG_RELEASE:=4 +PKG_VERSION:=2021.8.22 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)_ntfsprogs-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://www.tuxera.com/opensource/ -PKG_HASH:=3e5a021d7b761261836dcb305370af299793eedbded731df3d6943802e1262d5 +PKG_HASH:=55b883aa05d94b2ec746ef3966cb41e66bed6db99f22ddd41d1b8b94bb202efb PKG_MAINTAINER:=Ted Hess PKG_LICENSE:=GPL-2.0-only LGPL-2.1-or-later @@ -205,12 +205,11 @@ fi endef define Package/ntfs-3g-utils/install - $(INSTALL_DIR) $(1)/sbin - $(LN) ../usr/sbin/mkntfs $(1)/sbin/mkfs.ntfs - $(INSTALL_DIR) $(1)/usr/bin + rm -f $(PKG_INSTALL_DIR)/usr/sbin/mkfs.ntfs + $(INSTALL_DIR) $(1)/usr/{bin,sbin} $(FIND) $(PKG_INSTALL_DIR)/usr/bin/ -type f ! -regex '.*[^/]*ntfs-3g[^/]*' -exec $(INSTALL_BIN) {} $(1)/usr/bin/ \; - $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ + $(LN) mkntfs $(1)/usr/sbin/mkfs.ntfs endef $(eval $(call BuildPackage,ntfs-3g))