git: f9da5bfbccc2 - main - sysutils/squashfs-tools: the port had been updated to version 4.6.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Alexey Dokuchaev <danfe_at_FreeBSD.org>
Date: Thu, 01 Jun 2023 06:16:44 UTC
The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f9da5bfbccc2de69159107e1237a334b893aa607

commit f9da5bfbccc2de69159107e1237a334b893aa607
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2023-06-01 06:15:38 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2023-06-01 06:15:38 +0000

    sysutils/squashfs-tools: the port had been updated to version 4.6.1
    
    This release fixes race condition which can cause corruption of the
    "fragment table" (regression introduced in August 2022) and several
    bugs with the extended attributes code.
    
    On the port's side, garbage-collect patches merged upstream, follow
    HTTP/1.1 301 Moved Permanently redirection in the WWW line, and add
    missing dependency on `misc/help2man' so that manpages are properly
    generated against configured compressors (selected options).
---
 sysutils/squashfs-tools/Makefile                 | 17 ++++++------
 sysutils/squashfs-tools/distinfo                 |  6 ++---
 sysutils/squashfs-tools/files/patch-Makefile     |  8 +++---
 sysutils/squashfs-tools/files/patch-mksquashfs.c | 34 ------------------------
 sysutils/squashfs-tools/files/patch-unsquashfs.c | 16 -----------
 5 files changed, 15 insertions(+), 66 deletions(-)

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,17 +1,17 @@
 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
@@ -30,8 +30,9 @@ 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
@@ -49,14 +50,12 @@ ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 ZSTD_MAKE_ARGS=	ZSTD_SUPPORT=1
 
 post-patch:
-	@${REINPLACE_CMD} -e '/^#include <unistd\.h>/ { x; \
-		s,^,#include <signal.h>,; 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}
 
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
@@ -66,10 +66,10 @@
 -	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 <stddef.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <sys/sysmacros.h>
- #include <fcntl.h>
- #include <errno.h>
- #include <dirent.h>
-@@ -50,7 +49,6 @@
- #include <sys/wait.h>
- #include <limits.h>
- #include <ctype.h>
--#include <sys/sysinfo.h>
- 
- #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 <sys/sysinfo.h>
- #include <sys/sysmacros.h>
-+#endif
-+#ifdef __FreeBSD__
-+#include <sys/sysctl.h>
-+#endif
- #include <sys/types.h>
- #include <sys/time.h>
- #include <sys/resource.h>