head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.20 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.18 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.16 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.14 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.12 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.10 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.8 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.6 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.4 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.2 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.3.0.28 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.26 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.24 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.22 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.20 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.18 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.16 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.14 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.12 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.10 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.8 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.6 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.4 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.2 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.2.0.6 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.28 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.24 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.22 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.20 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.18 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.16 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.14 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.12 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.10 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.8 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.4 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.2 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.1.0.4 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.2 pkgsrc-2016Q3-base:1.1; locks; strict; comment @# @; 1.4 date 2023.10.03.19.26.20; author scole; state Exp; branches; next 1.3; commitid mPavBZTkN1AwndHE; 1.3 date 2020.06.19.21.17.46; author scole; state Exp; branches; next 1.2; commitid dk9841wbRaTdBScC; 1.2 date 2017.02.09.18.16.08; author scole; state Exp; branches; next 1.1; commitid AfxeNP97oqGc0jFz; 1.1 date 2016.09.09.15.40.17; author scole; state Exp; branches; next ; commitid oZoed9Sp9QTE3Dlz; desc @@ 1.4 log @4.6.1 25 MAR 2023 Bug fix release to fix race condition and XATTRs code 1. Race condition which can cause corruption of the "fragment table" fixed. This is a regression introduced in August 2022, and it has been seen when tailend packing is used (-tailends option). 2. Fix build failure when the tools are being built without extended attribute (XATTRs) support. 3. Fix XATTR error message when an unrecognised prefix is found (Christian Hesse). 4. Fix incorrect free of pointer when an unrecognised XATTR prefix is found. @ text @$NetBSD: patch-Makefile,v 1.3 2020/06/19 21:17:46 scole Exp $ use options framework and libtool --- Makefile.orig 2023-03-25 20:53:37.000000000 +0000 +++ Makefile @@@@ -22,7 +22,7 @@@@ ifndef CONFIG # Obviously, you must select at least one of the available gzip, xz, lzo, # lz4, zstd or lzma (deprecated) compression types. # -GZIP_SUPPORT = 1 +#GZIP_SUPPORT = 1 ########### Building XZ support ############# # @@@@ -92,7 +92,7 @@@@ GZIP_SUPPORT = 1 # in Mksquashfs. Obviously the compression algorithm must have been # selected to be built # -COMP_DEFAULT = gzip +#COMP_DEFAULT = gzip ############################################### @@@@ -104,7 +104,7 @@@@ COMP_DEFAULT = gzip # If your C library or build/target environment doesn't support XATTRs then # comment out the next line to build Mksquashfs and Unsquashfs without XATTR # support -XATTR_SUPPORT = 1 +#XATTR_SUPPORT = 1 # Select whether you wish xattrs to be stored by Mksquashfs and extracted # by Unsquashfs by default. If selected users can disable xattr support by @@@@ -112,7 +112,7 @@@@ XATTR_SUPPORT = 1 # # If unselected, Mksquashfs/Unsquashfs won't store and extract xattrs by # default. Users can enable xattrs by using the -xattrs option. -XATTR_DEFAULT = 1 +#XATTR_DEFAULT = 1 ############################################### @@@@ -364,12 +364,15 @@@@ YEAR := $(firstword $(subst /, , $(DATE) CFLAGS += -DVERSION=\"$(VERSION)\" -DDATE=\"$(DATE)\" -DYEAR=\"$(YEAR)\" +%.lo : %.c + $(LIBTOOL) --mode=compile --tag=CC $(CC) -o $@@ -c $(CFLAGS) $(CPPFLAGS) $< + .PHONY: all all: mksquashfs unsquashfs -mksquashfs: $(MKSQUASHFS_OBJS) - $(CC) $(LDFLAGS) $(EXTRA_LDFLAGS) $(MKSQUASHFS_OBJS) $(LIBS) -o $@@ - ln -sf mksquashfs sqfstar +mksquashfs: $(MKSQUASHFS_OBJS:.o=.lo) + $(LIBTOOL) --tag=CC --mode=link $(CC) -o $@@ $(MKSQUASHFS_OBJS:.o=.lo) \ + $(LDFLAGS) $(EXTRA_LDFLAGS) $(LIBS) mksquashfs.o: Makefile mksquashfs.c squashfs_fs.h squashfs_swap.h mksquashfs.h \ sort.h pseudo.h compressor.h xattr.h action.h mksquashfs_error.h progressbar.h \ @@@@ -428,9 +431,9 @@@@ lz4_wrapper.o: lz4_wrapper.c squashfs_fs xz_wrapper.o: xz_wrapper.c squashfs_fs.h xz_wrapper.h compressor.h -unsquashfs: $(UNSQUASHFS_OBJS) - $(CC) $(LDFLAGS) $(EXTRA_LDFLAGS) $(UNSQUASHFS_OBJS) $(LIBS) -o $@@ - ln -sf unsquashfs sqfscat +unsquashfs: $(UNSQUASHFS_OBJS:.o=.lo) + $(LIBTOOL) --tag=CC --mode=link $(CC) -o $@@ $(UNSQUASHFS_OBJS:.o=.lo) \ + $(LDFLAGS) $(EXTRA_LDFLAGS) $(LIBS) unsquashfs.o: unsquashfs.h unsquashfs.c squashfs_fs.h squashfs_swap.h \ squashfs_compat.h xattr.h read_fs.h compressor.h unsquashfs_error.h @ 1.3 log @Welcome to Squashfs 4.4. This is the first release in over 5 years, and there are substantial improvements: reproducible builds, new compressors, CVE fixes, security hardening and new options for Mksquashfs/Unsquashfs. Please see the INSTALL file for instructions on installing the tools, and the USAGE file for documentation on how to use the tools. Summary of changes --------------------------------------- 1. Mksquashfs now generates reproducible images by default. Mkfs time and file timestamps can also be specified. 2. Support for the Zstandard (ZSTD) compression algorithm has been added. 3. Pseudo files now support symbolic links. 4. CVE-2015-4645 and CVE-2015-4646 have been fixed. 5. Unsquashfs has been further hardened against corrupted filestems. 6. Unsquashfs is now more strict about error handling. 7. Miscellaneous new options and major bug fixes for Mksquashfs. 8. Miscellaneous new options and major bug fixes for Unsquashfs. 9. Squashfs-tools 4.4 is compatible with all earlier 4.x filesystems and releases. For pkgsrc changes, now GitHub is now the main repository and using libtool @ text @d1 1 a1 1 $NetBSD: patch-Makefile,v 1.2 2017/02/09 18:16:08 scole Exp $ d5 1 a5 1 --- Makefile.orig 2019-08-29 01:58:04.000000000 +0000 d7 3 a9 3 @@@@ -15,7 +15,7 @@@@ # Obviously, you must select at least one of the available gzip, lzma, lzo # compression types. d16 1 a16 1 @@@@ -85,7 +85,7 @@@@ GZIP_SUPPORT = 1 d25 1 a25 1 @@@@ -97,7 +97,7 @@@@ COMP_DEFAULT = gzip d34 1 a34 1 @@@@ -105,7 +105,7 @@@@ XATTR_SUPPORT = 1 d43 3 a45 3 @@@@ -277,11 +277,15 @@@@ $(error "COMP_DEFAULT is set to ${COMP_D built!") endif d55 1 d61 2 a62 2 sort.h pseudo.h compressor.h xattr.h action.h error.h progressbar.h \ @@@@ -331,8 +335,9 @@@@ lz4_wrapper.o: lz4_wrapper.c squashfs_fs d68 1 d74 1 a74 1 squashfs_compat.h xattr.h read_fs.h compressor.h @ 1.2 log @Fix xattr and other options, "simplify" PLIST and other build files to make changing versions easier @ text @d1 1 a1 2 $NetBSD: patch-Makefile,v 1.1 2016/09/09 15:40:17 scole Exp $ Add fnm_extmatch.h dependency, use options framework d3 4 a6 2 --- Makefile.orig 2014-05-11 11:56:00.000000000 -0700 +++ Makefile 2017-02-06 12:08:05.000000000 -0800 d16 1 a16 1 @@@@ -81,7 +81,7 @@@@ d23 1 d25 1 a25 2 # Extended attribute (XATTRs) build options # @@@@ -92,7 +92,7 @@@@ d34 1 a34 1 @@@@ -100,7 +100,7 @@@@ d43 15 a57 1 @@@@ -229,7 +229,8 @@@@ d61 1 a61 9 - info.h caches-queues-lists.h read_fs.h restore.h process_fragments.h + info.h caches-queues-lists.h read_fs.h restore.h process_fragments.h \ + fnm_extmatch.h read_fs.o: read_fs.c squashfs_fs.h squashfs_swap.h compressor.h xattr.h \ error.h mksquashfs.h @@@@ -247,7 +248,7 @@@@ read_xattrs.o: read_xattrs.c squashfs_fs.h squashfs_swap.h xattr.h error.h d63 1 a63 2 -action.o: action.c squashfs_fs.h mksquashfs.h action.h error.h +action.o: action.c squashfs_fs.h mksquashfs.h action.h error.h fnm_extmatch.h d65 5 a69 4 progressbar.o: progressbar.c error.h @@@@ -279,7 +280,7 @@@@ $(CC) $(LDFLAGS) $(EXTRA_LDFLAGS) $(UNSQUASHFS_OBJS) $(LIBS) -o $@@ d72 1 a72 5 - squashfs_compat.h xattr.h read_fs.h compressor.h + squashfs_compat.h xattr.h read_fs.h compressor.h fnm_extmatch.h unsquash-1.o: unsquashfs.h unsquash-1.c squashfs_fs.h squashfs_compat.h @ 1.1 log @PR pkg/51058 Add filesystem/squashfs 4.3 Squashfs is a highly compressed read-only filesystem for Linux. It uses either gzip/xz/lzo/lz4 compression to compress both files, inodes and directories. Inodes in the system are very small and all blocks are packed to minimise data overhead. Block sizes greater than 4K are supported up to a maximum of 1Mbytes (default block size 128K). Squashfs is intended for general read-only filesystem use, for archival use (i.e. in cases where a .tar.gz file may be used), and in constrained block device/memory systems (e.g. embedded systems) where low overhead is needed. This package contains tools to manipulate squashfs archive files. @ text @d1 2 a2 2 $NetBSD$ Add fnm_extmatch.h dependency d4 2 a5 2 --- Makefile.orig 2014-05-11 18:56:00.000000000 +0000 +++ Makefile d15 28 a42 1 @@@@ -229,7 +229,8 @@@@ mksquashfs: $(MKSQUASHFS_OBJS) d52 1 a52 1 @@@@ -247,7 +248,7 @@@@ xattr.o: xattr.c squashfs_fs.h squashfs_ d61 1 a61 1 @@@@ -279,7 +280,7 @@@@ unsquashfs: $(UNSQUASHFS_OBJS) @