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 026B31582EF for ; Sat, 22 Feb 2025 09:39:10 +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 D7A07343209 for ; Sat, 22 Feb 2025 09:39:09 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 713B4110477; Sat, 22 Feb 2025 09:38: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 641BF110477 for ; Sat, 22 Feb 2025 09:38: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 1CE9D343200 for ; Sat, 22 Feb 2025 09:38:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C5338279A for ; Sat, 22 Feb 2025 09:38:47 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1740217095.6d1dc832394480bed290016c3da1686894c80071.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-firewall/shorewall/shorewall-5.2.8-r1.ebuild X-VCS-Directories: net-firewall/shorewall/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 6d1dc832394480bed290016c3da1686894c80071 X-VCS-Branch: master Date: Sat, 22 Feb 2025 09:38: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: ef4b8883-3131-46ac-a82a-79275a75a703 X-Archives-Hash: 02593b1215d306a810f96e599bf3cdd9 commit: 6d1dc832394480bed290016c3da1686894c80071 Author: Ulrich Müller gentoo org> AuthorDate: Fri Feb 14 14:11:32 2025 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sat Feb 22 09:38:15 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d1dc832 net-firewall/shorewall: Port to ver_replacing Signed-off-by: Ulrich Müller gentoo.org> net-firewall/shorewall/shorewall-5.2.8-r1.ebuild | 52 +++++++++++------------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/net-firewall/shorewall/shorewall-5.2.8-r1.ebuild b/net-firewall/shorewall/shorewall-5.2.8-r1.ebuild index a6be3bc94a36..2d8268652faa 100644 --- a/net-firewall/shorewall/shorewall-5.2.8-r1.ebuild +++ b/net-firewall/shorewall/shorewall-5.2.8-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -inherit linux-info prefix systemd +inherit eapi9-ver linux-info prefix systemd DESCRIPTION='A high-level tool for configuring Netfilter' HOMEPAGE="https://shorewall.org/" @@ -426,39 +426,33 @@ pkg_postinst() { fi - local v - for v in ${REPLACING_VERSIONS}; do - if ! ver_test ${v} -ge ${MY_MAJOR_RELEASE_NUMBER}; then - # This is an upgrade + if ver_replacing -lt ${MY_MAJOR_RELEASE_NUMBER}; then + # This is an upgrade - elog "You are upgrading from a previous major version. It is highly recommended that you read" - elog "" - elog " - /usr/share/doc/shorewall*/releasenotes.tx*" - elog " - https://shorewall.org/Shorewall-5.html#idm214" - - if use ipv4; then - elog "" - elog "You can auto-migrate your configuration using" - elog "" - elog " # shorewall update -A" - - if use ipv6; then - elog " # shorewall6 update -A" - fi + elog "You are upgrading from a previous major version. It is highly recommended that you read" + elog "" + elog " - /usr/share/doc/shorewall*/releasenotes.tx*" + elog " - https://shorewall.org/Shorewall-5.html#idm214" - elog "" - elog "*after* you have merged the changed files using one of the configuration" - elog "files update tools of your choice (dispatch-conf, etc-update...)." + if use ipv4; then + elog "" + elog "You can auto-migrate your configuration using" + elog "" + elog " # shorewall update -A" - elog "" - elog "But if you are not familiar with the \"shorewall[6] update\" command," - elog "please read the shorewall[6] man page first." + if use ipv6; then + elog " # shorewall6 update -A" fi - # Show this elog only once - break + elog "" + elog "*after* you have merged the changed files using one of the configuration" + elog "files update tools of your choice (dispatch-conf, etc-update...)." + + elog "" + elog "But if you are not familiar with the \"shorewall[6] update\" command," + elog "please read the shorewall[6] man page first." fi - done + fi if ! use init; then elog ""