From nobody Sun Oct 22 13:15:02 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCzMC36c5z4xHX8; Sun, 22 Oct 2023 13:15:03 +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 4SCzMC1NC4z3dVT; Sun, 22 Oct 2023 13:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697980503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WNS7CwaMfedHksP4J+F/Ygzu2pUYZs+Ex/yuwfIr8jU=; b=lguzspmR5JV/tUkJJ4ITWhPjet+pBlBQv3qw7qCfuCJvzT7M9zfmwHosqO0DeAHbeNqTSW z4UpUr0WvMul0tuzJGpD6dXFhN6ffMMlQP8lXFLq/tceWxttHCWIEID/5dVEip4Q16oB6w 0DbchqX3lwUZO5mkZnNFohMZrGf+IxCRnUWqYloMwIZ57iSi46XaFvo/KaUWqdoakSH+bs lvxWPZ+6SkhuWlaaElrFKq9HC+mbr6oq016XIyJDsuuQFSLRZqEVbDrTIo1qPGa7o51dkD b8XB9jipIYviSYiTR4BHi75rsTjrZCePBuiVn/YHDO/schDPZQn4aG43IdGj4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697980503; a=rsa-sha256; cv=none; b=AcdhMIyN1TLJwOyFRhFlUFANbe6b/7JhCNEpWylO20lXJYG3+P0tsVNUzE6yanNcB3bF7w fIe/KAUZosF4AYTElXcbQtpKVrm4YGfjFVYMl9tpv+gL57Ldfr8yI2HQ4Vsn8Hcc3mka2C ynn0xyl83Pmh/w4R0vZV0X68XHg3QCnaxEKuY266vrzAWzaHJv0K//tDbcJnutOpdqiI4f xsU/ra8jdBmMi2Bq0AYKatTGDhHI9pNWgkjRIIXNhJhFQIiOUOdv9GUW3xTHOOLKtOwe60 1qADGrfspXwdZmMr+XI3svv/ZP2UPmdEWQpZIYizMR4y43NDh753ssVzeG4P1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697980503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WNS7CwaMfedHksP4J+F/Ygzu2pUYZs+Ex/yuwfIr8jU=; b=pcZjNrf0qAY90EXIjilwINSOqw4PlD6LpKNxme2D4IQNr5mk7u5bYWwaEn2/OfnyaB04VV YY3yEZagoCbPsI5QBOcWhWIXLbIUnA66R5LSvqcJYTrDJyzxEe04btXrUg/4mdNIOqJfLI dWFrgM0heS5jbUB71hgvjRVT28xxjRUpHOlw88hGnL/l5+gqpqnhmMTWGdzm0FLmqftYWN PHwufsJS7I0sj/rY3u/MCF6QhYrv0LYo3Cu2RJR2vz+QKzb5E0VEwFeXcmtk0lILSWzCP9 aTfrIg5ndRFwW8aHoaFqfNS+JQP/IqVl12FHT86rj69cyf+WhpK1U/PpsAOVCg== 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 4SCzMC0D7RzyKG; Sun, 22 Oct 2023 13:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39MDF2M2049677; Sun, 22 Oct 2023 13:15:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39MDF2Bc049674; Sun, 22 Oct 2023 13:15:02 GMT (envelope-from git) Date: Sun, 22 Oct 2023 13:15:02 GMT Message-Id: <202310221315.39MDF2Bc049674@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Florian Smeets Subject: git: 58f5f9ccf32b - main - net/corosync*: Make corosync3 the default corosync version List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: flo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 58f5f9ccf32b7fc01c903416880e0b9e1e0c3e47 Auto-Submitted: auto-generated The branch main has been updated by flo: URL: https://cgit.FreeBSD.org/ports/commit/?id=58f5f9ccf32b7fc01c903416880e0b9e1e0c3e47 commit 58f5f9ccf32b7fc01c903416880e0b9e1e0c3e47 Author: Florian Smeets AuthorDate: 2023-10-22 07:22:14 +0000 Commit: Florian Smeets CommitDate: 2023-10-22 13:13:04 +0000 net/corosync*: Make corosync3 the default corosync version --- Mk/Uses/corosync.mk | 7 ------- Mk/bsd.default-versions.mk | 2 +- net/corosync2/Makefile | 2 +- net/corosync3/Makefile | 2 +- net/{corosync2 => corosync3}/Makefile.common | 0 5 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Mk/Uses/corosync.mk b/Mk/Uses/corosync.mk index 634ff3cc3bb1..869f671c6bd6 100644 --- a/Mk/Uses/corosync.mk +++ b/Mk/Uses/corosync.mk @@ -22,13 +22,6 @@ _COROSYNC_INSTALLED_VER:= ${_COROSYNC_INSTALLED_VER:M'*':C/'//g} _COROSYNC_INSTALLED_VER_MAJOR= ${_COROSYNC_INSTALLED_VER:C/([0-9]*).[0-9]*.*/\1/g} _COROSYNC_INSTALLED_VER_MINOR= ${_COROSYNC_INSTALLED_VER:C/[0-9]*.([0-9]*).*/\1/g} -# Currently corosync 3 is tagged 2.99.x so this is a temporary -# work around until the final version is released. -. if ${_COROSYNC_INSTALLED_VER_MAJOR} == 2 && ${_COROSYNC_INSTALLED_VER_MINOR} == 99 -_COROSYNC_INSTALLED_VER_MAJOR= 3 -_COROSYNC_INSTALLED_VER_MINOR= 0 -. endif - . if ${COROSYNC_DEFAULT} != ${_COROSYNC_INSTALLED_VER_MAJOR} IGNORE= DEFAULT_VERSIONS=corosync=${COROSYNC_DEFAULT} but ${_COROSYNC_INSTALLED_VER} is installed . endif diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 01695995b5b8..8550328a468a 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -37,7 +37,7 @@ APACHE_DEFAULT?= 2.4 # Possible values: 5, 18 BDB_DEFAULT?= 5 # Possible values: 2, 3 -COROSYNC_DEFAULT?= 2 +COROSYNC_DEFAULT?= 3 # Possible values: rust, legacy . if empty(ARCH:Naarch64:Namd64:Narmv7:Ni386:Npowerpc64:Npowerpc64le:Npowerpc:Nriscv64) EBUR128_DEFAULT?= rust diff --git a/net/corosync2/Makefile b/net/corosync2/Makefile index a7d7a7f58ddb..8951bd0587b1 100644 --- a/net/corosync2/Makefile +++ b/net/corosync2/Makefile @@ -6,6 +6,6 @@ WWW= https://corosync.github.io/corosync/ CONFLICTS= corosync3 PORTSCOUT= limit:^2\.[0-9]\.[0-9] -.include "${.CURDIR}/Makefile.common" +.include "${.CURDIR}/../corosync3/Makefile.common" .include diff --git a/net/corosync3/Makefile b/net/corosync3/Makefile index 8440f12d3194..c12af546f7da 100644 --- a/net/corosync3/Makefile +++ b/net/corosync3/Makefile @@ -3,7 +3,7 @@ PKGNAMESUFFIX= 3 WWW= https://corosync.github.io/corosync/ -.include "${.CURDIR}/../corosync2/Makefile.common" +.include "${.CURDIR}/Makefile.common" LIB_DEPENDS+= libknet.so:devel/kronosnet diff --git a/net/corosync2/Makefile.common b/net/corosync3/Makefile.common similarity index 100% rename from net/corosync2/Makefile.common rename to net/corosync3/Makefile.common