Date: Fri, 3 May 2024 11:13:57 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 63d61cd13513 - main - sysutils/squashfs-tools-ng: update the port to version 1.3.1 Message-ID: <202405031113.443BDvMA096696@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=63d61cd135131df4b6567b6ebd2dfdd619ded9c6 commit 63d61cd135131df4b6567b6ebd2dfdd619ded9c6 Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2024-05-03 11:12:48 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2024-05-03 11:12:48 +0000 sysutils/squashfs-tools-ng: update the port to version 1.3.1 Reported by: portscout --- sysutils/squashfs-tools-ng/Makefile | 2 +- sysutils/squashfs-tools-ng/distinfo | 6 +- .../files/patch-bin_gensquashfs_mkfs.c | 77 ---------------------- 3 files changed, 4 insertions(+), 81 deletions(-) diff --git a/sysutils/squashfs-tools-ng/Makefile b/sysutils/squashfs-tools-ng/Makefile index c7a2ffaa1a60..29ad592aa1fe 100644 --- a/sysutils/squashfs-tools-ng/Makefile +++ b/sysutils/squashfs-tools-ng/Makefile @@ -1,5 +1,5 @@ PORTNAME= squashfs-tools-ng -PORTVERSION= 1.3.0 +PORTVERSION= 1.3.1 CATEGORIES= sysutils MASTER_SITES= https://infraroot.at/pub/squashfs/ diff --git a/sysutils/squashfs-tools-ng/distinfo b/sysutils/squashfs-tools-ng/distinfo index 80049366d147..2062db4ea2a8 100644 --- a/sysutils/squashfs-tools-ng/distinfo +++ b/sysutils/squashfs-tools-ng/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1710194396 -SHA256 (squashfs-tools-ng-1.3.0.tar.xz) = 5f91df5eb4d4ae6b6f613e9b7cd346daf45373a1b065c6c1b0891a86abe13e8f -SIZE (squashfs-tools-ng-1.3.0.tar.xz) = 585800 +TIMESTAMP = 1714661362 +SHA256 (squashfs-tools-ng-1.3.1.tar.xz) = 0728e825f18ce1af0ec0090ae9892665e61590bb94910f12bf0810b874fdce7f +SIZE (squashfs-tools-ng-1.3.1.tar.xz) = 585916 diff --git a/sysutils/squashfs-tools-ng/files/patch-bin_gensquashfs_mkfs.c b/sysutils/squashfs-tools-ng/files/patch-bin_gensquashfs_mkfs.c deleted file mode 100644 index 66f9167e7fd2..000000000000 --- a/sysutils/squashfs-tools-ng/files/patch-bin_gensquashfs_mkfs.c +++ /dev/null @@ -1,77 +0,0 @@ ---- bin/gensquashfs/mkfs.c.orig 2024-01-24 08:55:22 UTC -+++ bin/gensquashfs/mkfs.c -@@ -70,7 +70,8 @@ static int pack_files(sqfs_block_processor_t *data, fs - } - - static int relabel_tree_dfs(const char *filename, sqfs_xattr_writer_t *xwr, -- tree_node_t *n, void *selinux_handle) -+ tree_node_t *n, void *selinux_handle, -+ void *xattrmap) - { - char *path = fstree_get_path(n); - int ret; -@@ -86,24 +87,28 @@ static int relabel_tree_dfs(const char *filename, sqfs - return -1; - } - -- if (selinux_relable_node(selinux_handle, xwr, n, path)) { -- free(path); -- return -1; -- } -+ if (xattrmap != NULL) -+ ret = xattr_apply_map_file(path, xattrmap, xwr); - -- ret = sqfs_xattr_writer_end(xwr, &n->xattr_idx); -+ if (ret == 0 && selinux_handle != NULL) -+ ret = selinux_relable_node(selinux_handle, xwr, n, path); -+ -+ free(path); -+ if (ret == 0) -+ ret = sqfs_xattr_writer_end(xwr, &n->xattr_idx); -+ - if (ret) { - sqfs_perror(filename, "flushing completed key-value pairs", - ret); - return -1; - } - -- free(path); -- - if (S_ISDIR(n->mode)) { - for (n = n->data.dir.children; n != NULL; n = n->next) { -- if (relabel_tree_dfs(filename, xwr, n, selinux_handle)) -+ if (relabel_tree_dfs(filename, xwr, n, -+ selinux_handle, xattrmap)) { - return -1; -+ } - } - } - -@@ -111,15 +116,15 @@ static int relabel_tree_dfs(const char *filename, sqfs - } - - static int read_fstree(fstree_t *fs, options_t *opt, sqfs_xattr_writer_t *xwr, -- void *selinux_handle) -+ void *selinux_handle, void *xattrmap) - { - int ret; - - ret = fstree_from_file(fs, opt->infile, opt->packdir); - -- if (ret == 0 && selinux_handle != NULL) -+ if (ret == 0 && (selinux_handle != NULL || xattrmap != NULL)) - ret = relabel_tree_dfs(opt->cfg.filename, xwr, -- fs->root, selinux_handle); -+ fs->root, selinux_handle, xattrmap); - - return ret; - } -@@ -175,7 +180,7 @@ int main(int argc, char **argv) - goto out; - } - } else { -- if (read_fstree(&sqfs.fs, &opt, sqfs.xwr, sehnd)) -+ if (read_fstree(&sqfs.fs, &opt, sqfs.xwr, sehnd, xattrmap)) - goto out; - } -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405031113.443BDvMA096696>