From a1562ef77202c4c783d6bdc26d4d7b3aeac2d023 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Tue, 23 Sep 2025 16:22:05 +0300 Subject: [PATCH] squashfs-tools: bump to version 4.7.2 Contains backported patch '0001-print_pager-add-missing-includes.patch' so we can remove it. Signed-off-by: Alexandru Ardelean --- utils/squashfs-tools/Makefile | 4 +-- ...001-print_pager-add-missing-includes.patch | 34 ------------------- 2 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 utils/squashfs-tools/patches/0001-print_pager-add-missing-includes.patch diff --git a/utils/squashfs-tools/Makefile b/utils/squashfs-tools/Makefile index 56db9bf026..6b9a9aae8b 100644 --- a/utils/squashfs-tools/Makefile +++ b/utils/squashfs-tools/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=squashfs-tools -PKG_VERSION:=4.7 +PKG_VERSION:=4.7.2 PKG_RELEASE:=1 PKG_LICENSE:=GPL-2.0-only @@ -18,7 +18,7 @@ PKG_CPE_ID:=cpe:/a:squashfs-tools_project:squashfs-tools PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/plougher/squashfs-tools/tar.gz/${PKG_VERSION}? -PKG_HASH:=f1605ef720aa0b23939a49ef4491f6e734333ccc4bda4324d330da647e105328 +PKG_HASH:=4672b5c47d9418d3a5ae5b243defc6d9eae8275b9771022247c6a6082c815914 PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk diff --git a/utils/squashfs-tools/patches/0001-print_pager-add-missing-includes.patch b/utils/squashfs-tools/patches/0001-print_pager-add-missing-includes.patch deleted file mode 100644 index 4e29c1e2f5..0000000000 --- a/utils/squashfs-tools/patches/0001-print_pager-add-missing-includes.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 05a895b3f996d1ac157d95b04980f5f047e7dbf7 Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Fri, 6 Jun 2025 15:23:07 +0100 -Subject: [PATCH] print_pager: add missing includes - -When building with musl: - - print_pager.h:33:25: error: unknown type name 'pid_t' - 33 | extern void wait_to_die(pid_t process); - | ^~~~~ - print_pager.h:34:25: error: unknown type name 'pid_t' - 34 | extern FILE *exec_pager(pid_t *process); - | ^~~~~ - -print_pager.h uses pid_t and FILE, so add the required #includes to -ensure that these are defined. - -Signed-off-by: Ross Burton ---- - squashfs-tools/print_pager.h | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/squashfs-tools/print_pager.h -+++ b/squashfs-tools/print_pager.h -@@ -30,6 +30,9 @@ - #define MORE_PAGER 2 - #define UNKNOWN_PAGER 3 - -+#include -+#include -+ - extern void wait_to_die(pid_t process); - extern FILE *exec_pager(pid_t *process); - extern int get_column_width();