From nobody Sun Oct 22 13:15:01 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 4SCzMB0XvTz4xH8q; Sun, 22 Oct 2023 13:15:02 +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 4SCzMB07zFz3dXk; Sun, 22 Oct 2023 13:15:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697980502; 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=cb8B9dhYTCOTPJ3X5twbtiBk1ZLrRRLAWMxAEG0OOek=; b=OVlBsrrn+p4Xg+3NGcutT3xJfEPJHocK/t8xn7Ei/qQIb0OTJiSGaAfPXQoV4kK/tgeVlL UAyYQpDAMII1KRY7mTGQkAjUPvhJjTxuvyd8/ownTG5Az6HaAbiJ18MUR4yNEGdPHLeKaY g3UtqLbfP45pPFoH6SZkXFB7q23h6XLRT/z/m7qeFkrOsJcf/ZJMKrUJoSKQ4eV4gWZxrz eogx/VEaifthhO+n0ZmLwsZS+CvVQvyPgiZUbUXODSti/XKz1ohttPo3a/+dmtIOxdtzmo +DVaP05kEa3R0sBf7ZJsjaSBsRoyoLzw7PP4dbcmJzJJ87N4zwSUce+1xmVsQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697980502; a=rsa-sha256; cv=none; b=JmctUs84wIEu5M4CqRTBk4lq9IGmJVP7gpKRHsT7qqZtKCFQA5WhUfLK9XJKjphguAc7Fi A313qNxUJ2qDXRQJfIq+P5AvXPi4lv78Pc/L/PEDz7vTzrGiWhuNkbLJr6sUEcLIjoTl4I Nl/dOsiIDFiHWH14hcUqMqWMVR2GbukXJx3MOityKR1b0EdDYPQFYqMAwUaYkmUzmptfYF zwHC38rjRTCqjVYCbO5OzRcH0LTo1MdcaFk+AvX8Tcye4H7Tv1qGqQ4pSTSiZMLidOQxfU 1tXelENc2RhKznC4UuF2Ethar5y2UVmYxZWGDt3WFPTdjSSJ6nftyj2anfzUOQ== 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=1697980502; 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=cb8B9dhYTCOTPJ3X5twbtiBk1ZLrRRLAWMxAEG0OOek=; b=HHspxxXDwJk8T7AS0F656Yay/NZJHSzSm59HTcoOHl1XPM5QK/gx3iXTaUk02wb+q5QRmL l8svYHGKDIvUPVwYmkhSHpMw+ATSHnT9lKMinOwIz1b9JPxFDFhr/xgHj0ZL9puAPr+4uE JXtwbev26hXXNuhuU5+mwSD5MtzJSYCMpU6s3NHZHUmmCRpL0boyn2Yt10drP8inURHjHN Vb9bRaSADNP5sdCBlp7x49FjJKy0nXpGElrA2dADV+kwpoxTK2AcrkV9L230Rllw/G2CXP WQsEBO30PsYmVEVZQx2LlBWJ83jgtir5Ybbj2QxWYrwg5ruaTzgYfT6OFgnA5w== 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 4SCzM96JbPzyk6; Sun, 22 Oct 2023 13:15:01 +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 39MDF16o049626; Sun, 22 Oct 2023 13:15:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39MDF1Uh049622; Sun, 22 Oct 2023 13:15:01 GMT (envelope-from git) Date: Sun, 22 Oct 2023 13:15:01 GMT Message-Id: <202310221315.39MDF1Uh049622@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: ca4d114d277f - main - net/pacemaker1: Remove port 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: ca4d114d277f490233f5b431079a40cd3dcb8417 Auto-Submitted: auto-generated The branch main has been updated by flo: URL: https://cgit.FreeBSD.org/ports/commit/?id=ca4d114d277f490233f5b431079a40cd3dcb8417 commit ca4d114d277f490233f5b431079a40cd3dcb8417 Author: Florian Smeets AuthorDate: 2023-10-22 06:52:43 +0000 Commit: Florian Smeets CommitDate: 2023-10-22 13:13:04 +0000 net/pacemaker1: Remove port Pacemaker1 hasn't built in months, the last upstream commit to the 1.1 branch was more than two years ago. The last release was almost 3 years ago and net/pacemaker2 can be used instead. PR: 268722, 273188 --- MOVED | 1 + net/Makefile | 1 - net/pacemaker1/Makefile | 41 - net/pacemaker1/distinfo | 3 - net/pacemaker1/files/extra-patch-cts_remote.py | 11 - net/pacemaker1/files/extra-patch-cts_watcher.py | 13 - net/pacemaker1/files/pacemaker.in | 37 - net/pacemaker1/files/patch-crmd_pengine.c | 15 - net/pacemaker1/files/patch-lrmd_Makefile.am | 11 - net/pacemaker1/files/patch-mcp_Makefile.am | 11 - net/pacemaker1/files/patch-tools_cibsecret.in | 29 - net/pacemaker1/pkg-descr | 9 - net/pacemaker1/pkg-message | 15 - net/pacemaker1/pkg-plist | 4040 ----------------------- net/pacemaker2/Makefile | 4 +- net/{pacemaker1 => pacemaker2}/Makefile.common | 0 16 files changed, 2 insertions(+), 4239 deletions(-) diff --git a/MOVED b/MOVED index bd5c235b7cd7..27a71c9a06ff 100644 --- a/MOVED +++ b/MOVED @@ -7948,3 +7948,4 @@ graphics/tiffgt||2023-10-14|Has expired: Upstream support stopped security/openssl30|security/openssl|2023-10-14|Upgrade security/openssl to 3.0 x11-fonts/gnu-unifont-ttf|x11-fonts/gnu-unifont-otf|2023-10-16|Remove obsoleted port. Use x11-fonts/gnu-unifont-otf instead mail/slapd-cyrus||2023-10-20|Has expired: Last upstream release was in 2013 +net/pacemaker1|net/pacemaker2|2023-10-22|Hasn't built in a long time, last upstream release was a while ago, use pacemaker2 diff --git a/net/Makefile b/net/Makefile index ccd7880ddda8..bab5323e3d0c 100644 --- a/net/Makefile +++ b/net/Makefile @@ -929,7 +929,6 @@ SUBDIR += p5-ldap2pw SUBDIR += p5-perl-ldap SUBDIR += p5-srv2pf - SUBDIR += pacemaker1 SUBDIR += pacemaker2 SUBDIR += packetdrill SUBDIR += packter-agent diff --git a/net/pacemaker1/Makefile b/net/pacemaker1/Makefile deleted file mode 100644 index b978cea40f88..000000000000 --- a/net/pacemaker1/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -PORTVERSION= 1.1.24 -PORTREVISION= 4 -PKGNAMESUFFIX= 1 - -WWW= https://www.clusterlabs.org/pacemaker/ - -.include "${.CURDIR}/Makefile.common" - -CONFLICTS+= pacemaker2 - -SHEBANG_FILES+= cts/cts \ - cts/lxc_autogen.sh.in \ - fencing/* \ - lrmd/* \ - mcp/* \ - tools/* \ - xml/* \ - BasicSanity.sh \ - coverage.sh.in \ - cts/CTSlab.py \ - pengine/regression.sh - -REPLACE_ARGS_GETOPT= -e 's,getopt,${LOCALBASE}/bin/getopt,' - -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-cts_remote.py \ - ${PATCHDIR}/extra-patch-cts_watcher.py - -.include - -# Fix building it with clang 11 -.if ${OSVERSION} >= 1300000 -CFLAGS+= -fcommon -.endif - -post-patch: post-patch-common - @${REINPLACE_CMD} ${REPLACE_ARGS_GETOPT} ${WRKSRC}/tools/crm_failcount - @${REINPLACE_CMD} ${REPLACE_ARGS_GETOPT} ${WRKSRC}/tools/crm_master - @${REINPLACE_CMD} ${REPLACE_ARGS_GETOPT} ${WRKSRC}/tools/crm_report.in - @${REINPLACE_CMD} ${REPLACE_ARGS_GETOPT} ${WRKSRC}/tools/crm_standby - -.include diff --git a/net/pacemaker1/distinfo b/net/pacemaker1/distinfo deleted file mode 100644 index aeaab2c7e235..000000000000 --- a/net/pacemaker1/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1607332961 -SHA256 (ClusterLabs-pacemaker-Pacemaker-1.1.24_GH0.tar.gz) = 0b9ac529b5e6b3846dbb04af605d9a79958fc8cc80e2f4233a8609f64546c6a4 -SIZE (ClusterLabs-pacemaker-Pacemaker-1.1.24_GH0.tar.gz) = 5765945 diff --git a/net/pacemaker1/files/extra-patch-cts_remote.py b/net/pacemaker1/files/extra-patch-cts_remote.py deleted file mode 100644 index 2fb15372eb68..000000000000 --- a/net/pacemaker1/files/extra-patch-cts_remote.py +++ /dev/null @@ -1,11 +0,0 @@ ---- cts/remote.py.orig 2020-02-07 14:06:22 UTC -+++ cts/remote.py -@@ -125,7 +125,7 @@ class RemoteExec: - ''' - - def __init__(self, rsh, silent=False): -- self.async = [] -+ self.async_calls = [] - self.rsh = rsh - self.silent = silent - self.logger = LogFactory() diff --git a/net/pacemaker1/files/extra-patch-cts_watcher.py b/net/pacemaker1/files/extra-patch-cts_watcher.py deleted file mode 100644 index ea51bd49fa52..000000000000 --- a/net/pacemaker1/files/extra-patch-cts_watcher.py +++ /dev/null @@ -1,13 +0,0 @@ ---- cts/watcher.py.orig 2020-02-07 14:06:26 UTC -+++ cts/watcher.py -@@ -140,8 +140,8 @@ class SearchObj: - self.logger.debug(message) - - def harvest(self, delegate=None): -- async = self.harvest_async(delegate) -- async.join() -+ async_calls = self.harvest_async(delegate) -+ async_calls.join() - - def harvest_async(self, delegate=None): - self.log("Not implemented") diff --git a/net/pacemaker1/files/pacemaker.in b/net/pacemaker1/files/pacemaker.in deleted file mode 100644 index 1131ee19a7a3..000000000000 --- a/net/pacemaker1/files/pacemaker.in +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -# PROVIDE: pacemaker -# REQUIRE: corosync -# KEYWORD: shutdown - -. /etc/rc.subr - -name="pacemaker" -rcvar="pacemaker_enable" -start_precmd="pacemaker_precmd" - -load_rc_config $name - -: ${pacemaker_enable:=NO} -: ${pacemaker_ipc_buffer:=0} - -pidfile="/var/run/pacemakerd.pid" -procname="%%PREFIX%%/sbin/pacemakerd" -command="/usr/sbin/daemon" -command_args="-f -p ${pidfile} ${procname}" - -pacemaker_precmd() -{ - if [ `${SYSCTL_N} kern.ipc.maxsockbuf` -lt 18874368 ]; then - err 3 "sysctl:kern.ipc.maxsockbuf must be at least 18874368" - fi - - export PATH="${PATH}:/usr/local/sbin:/usr/local/bin" - export PCMK_ipc_buffer=${pacemaker_ipc_buffer} - - # https://bugs.clusterlabs.org/show_bug.cgi?id=5397 - # - #export PCMK_ipc_type=socket -} - -run_rc_command "$1" diff --git a/net/pacemaker1/files/patch-crmd_pengine.c b/net/pacemaker1/files/patch-crmd_pengine.c deleted file mode 100644 index 0da0c14b30c0..000000000000 --- a/net/pacemaker1/files/patch-crmd_pengine.c +++ /dev/null @@ -1,15 +0,0 @@ -On FreeBSD the maximum IPC buffer size is defined by the kern.ipc.maxsockbuf -sysctl which defaults to 2M. This patch simply lowers the max message size -in pengine from 5M to 1M to work out of the box without requiring any tuning. - ---- crmd/pengine.c.orig 2016-11-30 19:51:58 UTC -+++ crmd/pengine.c -@@ -165,7 +165,7 @@ do_pe_control(long long action, - - pe_subsystem->source = - mainloop_add_ipc_client(CRM_SYSTEM_PENGINE, G_PRIORITY_DEFAULT, -- 5 * 1024 * 1024 /* 5MB */ , NULL, &pe_callbacks); -+ 1024 * 1024 /* 1MB */ , NULL, &pe_callbacks); - - if (pe_subsystem->source == NULL) { - crm_warn("Setup of client connection failed, not adding channel to mainloop"); diff --git a/net/pacemaker1/files/patch-lrmd_Makefile.am b/net/pacemaker1/files/patch-lrmd_Makefile.am deleted file mode 100644 index 1ad6da0cc4b1..000000000000 --- a/net/pacemaker1/files/patch-lrmd_Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- lrmd/Makefile.am.orig 2019-12-09 13:20:05 UTC -+++ lrmd/Makefile.am -@@ -25,8 +25,6 @@ lrmdlib_PROGRAMS += lrmd_test - testdir = $(datadir)/$(PACKAGE)/tests/lrmd - test_SCRIPTS = regression.py - --initdir = $(INITDIR) --dist_init_SCRIPTS = pacemaker_remote - sbin_PROGRAMS = pacemaker_remoted - - if BUILD_SYSTEMD diff --git a/net/pacemaker1/files/patch-mcp_Makefile.am b/net/pacemaker1/files/patch-mcp_Makefile.am deleted file mode 100644 index 3cbe7e0bb309..000000000000 --- a/net/pacemaker1/files/patch-mcp_Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- mcp/Makefile.am.orig 2019-12-09 13:23:25 UTC -+++ mcp/Makefile.am -@@ -19,8 +19,6 @@ include $(top_srcdir)/Makefile.common - - if BUILD_CS_SUPPORT - --initdir = $(INITDIR) --dist_init_SCRIPTS = pacemaker - sbin_PROGRAMS = pacemakerd - - if BUILD_SYSTEMD diff --git a/net/pacemaker1/files/patch-tools_cibsecret.in b/net/pacemaker1/files/patch-tools_cibsecret.in deleted file mode 100644 index c301a16a3df5..000000000000 --- a/net/pacemaker1/files/patch-tools_cibsecret.in +++ /dev/null @@ -1,29 +0,0 @@ ---- tools/cibsecret.in.orig 2020-02-07 13:13:01 UTC -+++ tools/cibsecret.in -@@ -100,7 +100,7 @@ info() { - } - - check_env() { -- which md5sum >/dev/null 2>&1 || -+ which md5 >/dev/null 2>&1 || - fatal "please install md5sum to run $PROG" - if which pssh >/dev/null 2>&1; then - rsh=pssh_fun -@@ -251,7 +251,7 @@ localfiles() { - ;; - "set") - local md5sum -- md5sum=`printf $value | md5sum` || -+ md5sum=`printf $value | md5` || - fatal "md5sum failed to produce hash for resource $rsc parameter $param" - md5sum=`echo $md5sum | awk '{print $1}'` - mkdir -p `dirname $local_file` && -@@ -307,7 +307,7 @@ cibsecret_check() { - local_md5sum=`localfiles getsum $rsc $param` - [ "$local_md5sum" ] || - fatal "no MD5 hash for resource $rsc parameter $param" -- md5sum=`printf "$current_local" | md5sum | awk '{print $1}'` -+ md5sum=`printf "$current_local" | md5 | awk '{print $1}'` - [ "$md5sum" = "$local_md5sum" ] || - fatal "MD5 hash mismatch for resource $rsc parameter $param" - } diff --git a/net/pacemaker1/pkg-descr b/net/pacemaker1/pkg-descr deleted file mode 100644 index fb77fe5f67fc..000000000000 --- a/net/pacemaker1/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -Pacemaker is an advanced, scalable High-Availability cluster resource manager -for Linux-HA (Heartbeat) and/or Corosync. - -It supports "n-node" clusters with significant capabilities for managing -resources and dependencies. - -It will run scripts at initialization, when machines go up or down, when -related resources fail and can be configured to periodically check resource -health. diff --git a/net/pacemaker1/pkg-message b/net/pacemaker1/pkg-message deleted file mode 100644 index 4d3b8a9b5af7..000000000000 --- a/net/pacemaker1/pkg-message +++ /dev/null @@ -1,15 +0,0 @@ -[ -{ type: install - message: <