From nobody Fri May 03 11:13:57 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VW7Tx43hdz5JqCQ; Fri, 3 May 2024 11:13:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VW7Tx3VPdz4cn7; Fri, 3 May 2024 11:13:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714734837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ws2qvhLk8PIh8Kl1iwGDWKL0gXx0mKEPp9LRWwU/6l4=; b=IFUnCOxAOI166v1R6q/g2Z4m9odfFzXMOfhyKP5qzBx9VN4laYDp6ReD4roeAXwGX2WlwH LmHjESZd2LzafVVxnDikbrZ0aiQSHoL3hiiyi7pQv3Qnca9Z8vZy9CiIA1GBWhjg8cFaL0 cUpOGAI4U375wDbu2iByKQkQeN2MzuX0TE04wdxwDN5JfToFaR9zYqnCT6je59epm8TrLq MTIU2YRbohSP2IdLQPMYZYPS7mui6kIXL7Xm1XshoiSLG5oqpQ2etXTx5al7Wa4tRA4TAC Poygwv9X9MFCsce80yNXPTgAVZ7qYvUWdbQZ/2pb/AU9xeSMESrPawbFZJaCvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714734837; a=rsa-sha256; cv=none; b=aIjxf4WsU5cUvLs4a5p3bTl2V5ieBgHw1yJTJd0mEl86IMOvv3dpQO626YnwYyMMVfq6b1 yerU+hRB4CjdsnBqSiezjsdhfJuysUmB6xY7Dk/E2mHXmr1v1fDw8BlQ9uMc8DRbaL2wO/ mJAsF4jthGZj0Q275pXSnXoY/ABAB+Td4XvIH0WWVspYUPCzqMp93exIvOmW3RtGpLhe7o eMnDWhT2yVe9o23oEmfuhg4lAHTsDhmcXXvcND/QHNSXwZGlB7/GlPD57Hl4qYGnOFeRec htcHqBr0ZJEHNKi+aw1a66Uo/FtvezbcDAk6ucP2hd/21tWaCBMuoi1wnVrrGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714734837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ws2qvhLk8PIh8Kl1iwGDWKL0gXx0mKEPp9LRWwU/6l4=; b=C+brYhdN3adK6Ns1T89B+1UEzeefHUnvngrkYuoQARLYRV4Mm904A/PsjI+xLdRX/97MuN PHJR2ycxkTQG8Q0tnU+z5BqGawNIPD1tbOe+gFo0TyfVK+rCZ2VWGn9dgHrpI4/52YttS+ NjD/wRDbmxQ1f11FG5cTArnsGTs8BXzlA71ixMvqs11Sw6kria2eoof0r+UXmYwyXcXig8 tr534ikeKXf7v7TbwyH1BkSdxrrAzxNVLCZyx7U2WplkwNSIK+pxxVmnOh/iuANXvKvQvr iFrafs3cw4lC9uyn+YKk1yo7Gn+SiYsboGhHSmHNTn33eGfw5+wPLJw/luJ4ng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VW7Tx35nqzk6n; Fri, 3 May 2024 11:13:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 443BDvCb096699; Fri, 3 May 2024 11:13:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 443BDvMA096696; Fri, 3 May 2024 11:13:57 GMT (envelope-from git) Date: Fri, 3 May 2024 11:13:57 GMT Message-Id: <202405031113.443BDvMA096696@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 63d61cd13513 - main - sysutils/squashfs-tools-ng: update the port to version 1.3.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 63d61cd135131df4b6567b6ebd2dfdd619ded9c6 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=63d61cd135131df4b6567b6ebd2dfdd619ded9c6 commit 63d61cd135131df4b6567b6ebd2dfdd619ded9c6 Author: Alexey Dokuchaev AuthorDate: 2024-05-03 11:12:48 +0000 Commit: Alexey Dokuchaev 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; - } -