From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 540781580E0 for ; Mon, 02 Jun 2025 21:42:13 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 3EB2E343174 for ; Mon, 02 Jun 2025 21:42:13 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id BD3901104B8; Mon, 02 Jun 2025 21:41:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id ACF891104B8 for ; Mon, 02 Jun 2025 21:41:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 64EF4342FF8 for ; Mon, 02 Jun 2025 21:41:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4AF1128FD for ; Mon, 02 Jun 2025 21:41:47 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1748900372.9c2b1d35b8cde790b8850c5c04d500bbec880892.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/, sys-apps/apparmor/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/apparmor/apparmor-4.0.3.ebuild sys-apps/apparmor/files/apparmor-4.0.3-convert-uint-to-unsigned-int.patch X-VCS-Directories: sys-apps/apparmor/files/ sys-apps/apparmor/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 9c2b1d35b8cde790b8850c5c04d500bbec880892 X-VCS-Branch: master Date: Mon, 02 Jun 2025 21:41:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 11e44603-302f-4b14-9a8b-51067462332b X-Archives-Hash: 6f1ba8ec26308eceb41ad75585854dcf commit: 9c2b1d35b8cde790b8850c5c04d500bbec880892 Author: Z. Liu gmail com> AuthorDate: Sun Jun 1 15:34:13 2025 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jun 2 21:39:32 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c2b1d35 sys-apps/apparmor: fix musl build Signed-off-by: Z. Liu gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42389 Closes: https://github.com/gentoo/gentoo/pull/42389 Signed-off-by: Sam James gentoo.org> sys-apps/apparmor/apparmor-4.0.3.ebuild | 4 +++ ...parmor-4.0.3-convert-uint-to-unsigned-int.patch | 37 ++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/sys-apps/apparmor/apparmor-4.0.3.ebuild b/sys-apps/apparmor/apparmor-4.0.3.ebuild index f595c4dc1d0c..3c166b8d56ff 100644 --- a/sys-apps/apparmor/apparmor-4.0.3.ebuild +++ b/sys-apps/apparmor/apparmor-4.0.3.ebuild @@ -33,6 +33,10 @@ BDEPEND=" " CONFIG_CHECK="SECURITY_APPARMOR" +PATCHES=( + "${FILESDIR}/${PN}-4.0.3-convert-uint-to-unsigned-int.patch" +) + src_prepare() { default diff --git a/sys-apps/apparmor/files/apparmor-4.0.3-convert-uint-to-unsigned-int.patch b/sys-apps/apparmor/files/apparmor-4.0.3-convert-uint-to-unsigned-int.patch new file mode 100644 index 000000000000..bcdd95d8c4b6 --- /dev/null +++ b/sys-apps/apparmor/files/apparmor-4.0.3-convert-uint-to-unsigned-int.patch @@ -0,0 +1,37 @@ +inspired by upstream fix in commit ff03702fdebb6c6c55532a6768b404706823c339 +https://gitlab.com/apparmor/apparmor/-/commit/ff03702fdebb6c6c55532a6768b404706823c339 + +diff --git a/parser/rule.h b/parser/rule.h +index 05dbed1..e041f31 100644 +--- a/rule.h ++++ b/rule.h +@@ -208,13 +208,13 @@ public: + } + + int cmp(prefixes const &rhs) const { +- if ((uint) audit < (uint) rhs.audit) ++ if ((unsigned int) audit < (unsigned int) rhs.audit) + return -1; +- if ((uint) audit > (uint) rhs.audit) ++ if ((unsigned int) audit > (unsigned int) rhs.audit) + return 1; +- if ((uint) rule_mode < (uint) rhs.rule_mode) ++ if ((unsigned int) rule_mode < (unsigned int) rhs.rule_mode) + return -1; +- if ((uint) rule_mode > (uint) rhs.rule_mode) ++ if ((unsigned int) rule_mode > (unsigned int) rhs.rule_mode) + return 1; + if (owner < rhs.owner) + return -1; +@@ -224,9 +224,9 @@ public: + } + + bool operator<(prefixes const &rhs) const { +- if ((uint) audit < (uint) rhs.audit) ++ if ((unsigned int) audit < (unsigned int) rhs.audit) + return true; +- if ((uint) rule_mode < (uint) rhs.rule_mode) ++ if ((unsigned int) rule_mode < (unsigned int) rhs.rule_mode) + return true; + if (owner < rhs.owner) + return true;