From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E9A2C139360 for ; Tue, 3 Aug 2021 02:25:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 04348E0917; Tue, 3 Aug 2021 02:25:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 51B1CE0917 for ; Tue, 3 Aug 2021 02:25:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B49E2335DB9 for ; Tue, 3 Aug 2021 02:25:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 00C767A7 for ; Tue, 3 Aug 2021 02:25:20 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1627957515.5457c96bb87bb85c64f74f872327a82df39d3a80.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/util-linux/util-linux-2.36.2-r1.ebuild sys-apps/util-linux/util-linux-2.37-r1.ebuild sys-apps/util-linux/util-linux-2.37.1.ebuild sys-apps/util-linux/util-linux-9999.ebuild X-VCS-Directories: sys-apps/util-linux/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 5457c96bb87bb85c64f74f872327a82df39d3a80 X-VCS-Branch: master Date: Tue, 3 Aug 2021 02:25:20 +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: bcaa3b86-d9c5-4245-b7c5-686b33b824ad X-Archives-Hash: 2e96f90b3b56a042fc749ba1cf82fed1 commit: 5457c96bb87bb85c64f74f872327a82df39d3a80 Author: Robin H. Johnson gentoo org> AuthorDate: Tue Aug 3 02:20:55 2021 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Tue Aug 3 02:25:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5457c96b sys-apps/util-linux: fixup cryptsetup dep for upgrades Upgrading an old system, and cryptsetup upgrade is scheduled for after util-linux, but util-linux requires symbol crypt_init_data_device which was only added in cryptsetup-2.1.0. Fix dep so cryptsetup is upgraded before util-linux. Signed-off-by: Robin H. Johnson gentoo.org> sys-apps/util-linux/util-linux-2.36.2-r1.ebuild | 2 +- sys-apps/util-linux/util-linux-2.37-r1.ebuild | 2 +- sys-apps/util-linux/util-linux-2.37.1.ebuild | 2 +- sys-apps/util-linux/util-linux-9999.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys-apps/util-linux/util-linux-2.36.2-r1.ebuild b/sys-apps/util-linux/util-linux-2.36.2-r1.ebuild index a33c67583ea..92191cf91ea 100644 --- a/sys-apps/util-linux/util-linux-2.36.2-r1.ebuild +++ b/sys-apps/util-linux/util-linux-2.36.2-r1.ebuild @@ -34,7 +34,7 @@ RDEPEND=" audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) - cryptsetup? ( sys-fs/cryptsetup ) + cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] diff --git a/sys-apps/util-linux/util-linux-2.37-r1.ebuild b/sys-apps/util-linux/util-linux-2.37-r1.ebuild index 22c0a4dea4b..5aa4349db6e 100644 --- a/sys-apps/util-linux/util-linux-2.37-r1.ebuild +++ b/sys-apps/util-linux/util-linux-2.37-r1.ebuild @@ -35,7 +35,7 @@ RDEPEND=" audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) - cryptsetup? ( sys-fs/cryptsetup ) + cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] diff --git a/sys-apps/util-linux/util-linux-2.37.1.ebuild b/sys-apps/util-linux/util-linux-2.37.1.ebuild index c12359853f4..c0b9a494a98 100644 --- a/sys-apps/util-linux/util-linux-2.37.1.ebuild +++ b/sys-apps/util-linux/util-linux-2.37.1.ebuild @@ -34,7 +34,7 @@ RDEPEND=" audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) - cryptsetup? ( sys-fs/cryptsetup ) + cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index 141bdf409cb..4f991bccc9a 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -34,7 +34,7 @@ RDEPEND=" audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) - cryptsetup? ( sys-fs/cryptsetup ) + cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?]