diff --git a/sysutils/squashfs-tools/Makefile b/sysutils/squashfs-tools/Makefile index 057d50a747c0..e3e684fe88b7 100644 --- a/sysutils/squashfs-tools/Makefile +++ b/sysutils/squashfs-tools/Makefile @@ -1,63 +1,62 @@ PORTNAME= squashfs-tools -PORTVERSION= 4.5.1 +PORTVERSION= 4.6.1 CATEGORIES= sysutils MASTER_SITES= SF/squashfs/squashfs/squashfs${PORTVERSION} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} +DISTFILES= squashfs${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= danfe@FreeBSD.org COMMENT= Set of tools to manipulate squashfs images -WWW= http://squashfs.sourceforge.net/ +WWW= https://squashfs.sourceforge.net/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/../COPYING -BUILD_DEPENDS= gsed:textproc/gsed +BUILD_DEPENDS= gsed:textproc/gsed help2man:misc/help2man USES= alias cpe gmake BINARY_ALIAS= sed=gsed PLIST_FILES= bin/mksquashfs bin/sqfscat bin/sqfstar bin/unsquashfs \ man/man1/mksquashfs.1.gz man/man1/sqfscat.1.gz \ man/man1/sqfstar.1.gz man/man1/unsquashfs.1.gz OPTIONS_DEFINE= DOCS LZ4 LZMA LZO XZ ZSTD OPTIONS_DEFAULT= LZ4 LZMA LZO XZ ZSTD LZMA_DESC= LZMA1 compression support (obsolete) XZ_DESC= XZ (LZMA2) compression support WRKSRC= ${WRKDIR}/${DISTNAME}/squashfs-tools CPE_PRODUCT= squashfs CPE_VENDOR= squashfs_project -PORTDOCS= ACKNOWLEDGEMENTS ACTIONS-README CHANGES DONATIONS \ - README-${PORTVERSION} USAGE pseudo-file.example +PORTDOCS= ACKNOWLEDGEMENTS ACTIONS-README CHANGES \ + README-${PORTVERSION} TECHNICAL-INFO USAGE-* \ + pseudo-file.example LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 LZ4_MAKE_ARGS= LZ4_SUPPORT=1 LZMA_MASTER_SITES= SF/sevenzip/LZMA%20SDK/:lzma LZMA_DISTFILES= lzma922.tar.bz2:lzma LZMA_MAKE_ARGS= LZMA_SUPPORT=1 LZMA_DIR=${WRKDIR} EXTRA_CFLAGS=-D_7ZIP_ST LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 LZO_MAKE_ARGS= LZO_SUPPORT=1 LZO_LIBDIR=-L${LOCALBASE}/lib XZ_MAKE_ARGS= XZ_SUPPORT=1 ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd ZSTD_MAKE_ARGS= ZSTD_SUPPORT=1 post-patch: - @${REINPLACE_CMD} -e '/^#include / { x; \ - s,^,#include ,; G; }' ${WRKSRC}/reader.c @${REINPLACE_CMD} -e '/^#include "squashfs_fs\.h"/ { x; \ s,^,typedef struct __sFILE FILE;,; G; }' \ ${WRKSRC}/lzma_wrapper.c post-install: - @${MV} ${WRKSRC:H}/RELEASE-READMEs/[Dp]* ${WRKSRC:H} + @${LN} -f ${WRKSRC:H}/examples/pseudo-file.example ${WRKSRC:H} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC:H}/|} ${STAGEDIR}${DOCSDIR} .include diff --git a/sysutils/squashfs-tools/distinfo b/sysutils/squashfs-tools/distinfo index ab5cc89605c1..4747eff52625 100644 --- a/sysutils/squashfs-tools/distinfo +++ b/sysutils/squashfs-tools/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1647547267 -SHA256 (squashfs-tools-4.5.1.tar.gz) = 277b6e7f75a4a57f72191295ae62766a10d627a4f5e5f19eadfbc861378deea7 -SIZE (squashfs-tools-4.5.1.tar.gz) = 270112 +TIMESTAMP = 1679779447 +SHA256 (squashfs4.6.1.tar.gz) = 94201754b36121a9f022a190c75f718441df15402df32c2b520ca331a107511c +SIZE (squashfs4.6.1.tar.gz) = 286848 SHA256 (lzma922.tar.bz2) = 9aade84f229fb25f7aef39d8866b375fe6d35a9e18098d7cd86a99e294902944 SIZE (lzma922.tar.bz2) = 546148 diff --git a/sysutils/squashfs-tools/files/patch-Makefile b/sysutils/squashfs-tools/files/patch-Makefile index 75b142228bc2..cb729b5d2dc4 100644 --- a/sysutils/squashfs-tools/files/patch-Makefile +++ b/sysutils/squashfs-tools/files/patch-Makefile @@ -1,75 +1,75 @@ --- Makefile.orig 2022-03-17 19:32:02 UTC +++ Makefile @@ -101,7 +101,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 @@ -109,7 +109,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 ############################################### @@ -177,7 +177,7 @@ UNSQUASHFS_OBJS = unsquashfs.o unsquash-1.o unsquash-2 CFLAGS ?= -O2 CFLAGS += $(EXTRA_CFLAGS) $(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 \ - -D_LARGEFILE_SOURCE -D_GNU_SOURCE -DCOMP_DEFAULT=\"$(COMP_DEFAULT)\" \ + -D_LARGEFILE_SOURCE -DFNM_EXTMATCH=0 -D_GNU_SOURCE -DCOMP_DEFAULT=\"$(COMP_DEFAULT)\" \ -Wall LIBS = -lpthread -lm @@ -217,6 +217,7 @@ endif ifeq ($(LZO_SUPPORT),1) CFLAGS += -DLZO_SUPPORT +INCLUDEDIR += -I$(LOCALBASE)/include MKSQUASHFS_OBJS += lzo_wrapper.o UNSQUASHFS_OBJS += lzo_wrapper.o LIBS += -llzo2 @@ -225,17 +226,19 @@ endif ifeq ($(LZ4_SUPPORT),1) CFLAGS += -DLZ4_SUPPORT +INCLUDEDIR += -I$(LOCALBASE)/include MKSQUASHFS_OBJS += lz4_wrapper.o UNSQUASHFS_OBJS += lz4_wrapper.o -LIBS += -llz4 +LIBS += -L$(LOCALBASE)/lib -llz4 COMPRESSORS += lz4 endif ifeq ($(ZSTD_SUPPORT),1) CFLAGS += -DZSTD_SUPPORT +INCLUDEDIR += -I$(LOCALBASE)/include MKSQUASHFS_OBJS += zstd_wrapper.o UNSQUASHFS_OBJS += zstd_wrapper.o -LIBS += -lzstd +LIBS += -L$(LOCALBASE)/lib -lzstd COMPRESSORS += zstd endif @@ -417,9 +420,9 @@ clean: .PHONY: install install: mksquashfs unsquashfs - mkdir -p $(INSTALL_DIR) - cp mksquashfs $(INSTALL_DIR) - cp unsquashfs $(INSTALL_DIR) - ln -fs unsquashfs $(INSTALL_DIR)/sqfscat - ln -fs mksquashfs $(INSTALL_DIR)/sqfstar -- ../generate-manpages/install-manpages.sh $(shell pwd)/.. "$(INSTALL_MANPAGES_DIR)" +- ../generate-manpages/install-manpages.sh $(shell pwd)/.. "$(INSTALL_MANPAGES_DIR)" "$(USE_PREBUILT_MANPAGES)" + mkdir -p $(DESTDIR)$(PREFIX)/bin -+ ${BSD_INSTALL_PROGRAM} mksquashfs $(DESTDIR)$(PREFIX)/bin -+ ${BSD_INSTALL_PROGRAM} unsquashfs $(DESTDIR)$(PREFIX)/bin ++ $(BSD_INSTALL_PROGRAM) mksquashfs $(DESTDIR)$(PREFIX)/bin ++ $(BSD_INSTALL_PROGRAM) unsquashfs $(DESTDIR)$(PREFIX)/bin + ln -fs unsquashfs $(DESTDIR)$(INSTALL_DIR)/sqfscat + ln -fs mksquashfs $(DESTDIR)$(INSTALL_DIR)/sqfstar -+ ../generate-manpages/install-manpages.sh $(shell pwd)/.. "$(DESTDIR)$(INSTALL_MANPAGES_DIR)" ++ ../generate-manpages/install-manpages.sh $(shell pwd)/.. "$(DESTDIR)$(INSTALL_MANPAGES_DIR)" "$(USE_PREBUILT_MANPAGES)" diff --git a/sysutils/squashfs-tools/files/patch-mksquashfs.c b/sysutils/squashfs-tools/files/patch-mksquashfs.c deleted file mode 100644 index d2357e73ab5c..000000000000 --- a/sysutils/squashfs-tools/files/patch-mksquashfs.c +++ /dev/null @@ -1,34 +0,0 @@ ---- mksquashfs.c.orig 2019-08-29 01:58:04 UTC -+++ mksquashfs.c -@@ -35,7 +35,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -50,7 +49,6 @@ - #include - #include - #include --#include - - #ifndef linux - #define __BYTE_ORDER BYTE_ORDER -@@ -5195,6 +5193,7 @@ int get_physical_memory() - long long page_size = sysconf(_SC_PAGESIZE); - int phys_mem; - -+#ifdef __linux__ - if(num_pages == -1 || page_size == -1) { - struct sysinfo sys; - int res = sysinfo(&sys); -@@ -5205,6 +5204,7 @@ int get_physical_memory() - num_pages = sys.totalram; - page_size = sys.mem_unit; - } -+#endif - - phys_mem = num_pages * page_size >> 20; - diff --git a/sysutils/squashfs-tools/files/patch-unsquashfs.c b/sysutils/squashfs-tools/files/patch-unsquashfs.c deleted file mode 100644 index 6c0edc4e515d..000000000000 --- a/sysutils/squashfs-tools/files/patch-unsquashfs.c +++ /dev/null @@ -1,16 +0,0 @@ ---- unsquashfs.c.orig 2019-08-29 01:58:04 UTC -+++ unsquashfs.c -@@ -32,8 +32,13 @@ - #include "stdarg.h" - #include "fnmatch_compat.h" - -+#ifdef __linux__ - #include - #include -+#endif -+#ifdef __FreeBSD__ -+#include -+#endif - #include - #include - #include