From owner-dev-commits-ports-all@freebsd.org Wed Aug 18 13:08:39 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DC71C677323; Wed, 18 Aug 2021 13:08:39 +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 4GqSrl5gWhz4TLh; Wed, 18 Aug 2021 13:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 AAE8011DC7; Wed, 18 Aug 2021 13:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17ID8dnf043830; Wed, 18 Aug 2021 13:08:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17ID8d9P043829; Wed, 18 Aug 2021 13:08:39 GMT (envelope-from git) Date: Wed, 18 Aug 2021 13:08:39 GMT Message-Id: <202108181308.17ID8d9P043829@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Eugene Grosbein Subject: git: b69e9c3c4e6f - main - security/ipsec-tools: make upgrade less painful MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b69e9c3c4e6fd7b5d7b71676f0f16ce635cde6d0 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Aug 2021 13:08:39 -0000 The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/ports/commit/?id=b69e9c3c4e6fd7b5d7b71676f0f16ce635cde6d0 commit b69e9c3c4e6fd7b5d7b71676f0f16ce635cde6d0 Author: Eugene Grosbein AuthorDate: 2021-08-18 13:06:01 +0000 Commit: Eugene Grosbein CommitDate: 2021-08-18 13:06:01 +0000 security/ipsec-tools: make upgrade less painful Partially revert r516983 to make upgrade from old versions less painful. For example, upgrade path from 9.3 via 10.4 then to 11.0 and later should not break due to non-existing required module ipsec.ko. --- security/ipsec-tools/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile index 65a6daf78223..600ddc36b4bc 100644 --- a/security/ipsec-tools/Makefile +++ b/security/ipsec-tools/Makefile @@ -7,7 +7,7 @@ PORTNAME= ipsec-tools PORTVERSION= 0.8.2 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= security MASTER_SITES= SF @@ -76,7 +76,7 @@ WCPSKEY_EXTRA_PATCHES= ${FILESDIR}/wildcard-psk.diff ${FILESDIR}/wildcard-psk-oa .include -.if ${OPSYS} == FreeBSD +.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1100510 REQUIREMOD?= ipsec .endif