From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1426084-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9CAD7158095 for <garchives@archives.gentoo.org>; Mon, 8 Aug 2022 20:14:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9EAD9E0935; Mon, 8 Aug 2022 20:14:28 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 77AF9E0935 for <gentoo-commits@lists.gentoo.org>; Mon, 8 Aug 2022 20:14:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4E8AF340E33 for <gentoo-commits@lists.gentoo.org>; Mon, 8 Aug 2022 20:14:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9D0BE526 for <gentoo-commits@lists.gentoo.org>; Mon, 8 Aug 2022 20:14:25 +0000 (UTC) From: "Sam James" <sam@gentoo.org> 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" <sam@gentoo.org> Message-ID: <1659989646.7ffbf9bf0eaf52e9e96e4ed81e934edea01f617f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd/Manifest sys-apps/systemd/systemd-251.4.ebuild sys-apps/systemd/systemd-9999.ebuild X-VCS-Directories: sys-apps/systemd/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7ffbf9bf0eaf52e9e96e4ed81e934edea01f617f X-VCS-Branch: master Date: Mon, 8 Aug 2022 20:14:25 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 772161a8-df42-4a9f-8c77-c78dd0731c3f X-Archives-Hash: 8a47fd8fc53020562dc486e0fe0468bf commit: 7ffbf9bf0eaf52e9e96e4ed81e934edea01f617f Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Aug 8 20:11:08 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Aug 8 20:14:06 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ffbf9bf sys-apps/systemd: add 251.4 Closes: https://bugs.gentoo.org/863872 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-apps/systemd/Manifest | 1 + sys-apps/systemd/{systemd-9999.ebuild => systemd-251.4.ebuild} | 7 +++++-- sys-apps/systemd/systemd-9999.ebuild | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index 8fb49d5c1324..23ca1233d0c1 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -1,2 +1,3 @@ DIST systemd-stable-251.2.tar.gz 11434645 BLAKE2B a7e118649a7d27b789206ea9f6f2d0314e44561367506ee763a9e98fb97579b3fc49c7a402c8da142945dc98444558f0e311557f52c50863cebc7532c17c651f SHA512 0c4011b685a1e8d535af123cbaf79ab53d59ea665ca5350ab1077ad4e962b49c1fd5b1b5bb3f28c3e28145dfd02aa83023f78de5edec15afe84e3e06e742a67c DIST systemd-stable-251.3.tar.gz 11435458 BLAKE2B 544238536848ab390b2476d5ad95d33998674be50020b8db0627bb9d0c86be6576c404ce786b01ceec86f1c75b174c6fc2d7e0d7fbab802a78f48c9d0915c2b8 SHA512 fb5b8dc1742562ef95469e90d406cfb6dfcb337860ad1208b460414b88ff0565071bde797d195faa62761206abc881829de6b1009e5d727cad2dfe0764310d5f +DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 58a0ee4adcc9d35b15b9cc98b3da81d1103b61a6c0bee722468a5113cd7d6de1d40c46ef964ba9ecc4746e81b516ae4b2f1d046874d62db066735c652592612e SHA512 7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738 diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-251.4.ebuild similarity index 98% copy from sys-apps/systemd/systemd-9999.ebuild copy to sys-apps/systemd/systemd-251.4.ebuild index 1a8b1c931c45..064778e7f0c7 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-251.4.ebuild @@ -168,8 +168,8 @@ BDEPEND=" " python_check_deps() { - has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" && - has_version -b "dev-python/lxml[${PYTHON_USEDEP}]" + python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" && + python_has_version "dev-python/lxml[${PYTHON_USEDEP}]" } QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*" @@ -235,6 +235,9 @@ src_unpack() { src_prepare() { local PATCHES=( + # Breaks Clang. Revert the commit for now and force off F_S=3. + # bug #841770. + "${FILESDIR}/251-revert-fortify-source-3-fix.patch" ) if ! use vanilla; then diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 1a8b1c931c45..c8aea75e5c3e 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -168,8 +168,8 @@ BDEPEND=" " python_check_deps() { - has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" && - has_version -b "dev-python/lxml[${PYTHON_USEDEP}]" + python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" && + python_has_version "dev-python/lxml[${PYTHON_USEDEP}]" } QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"