From nobody Sun Jan 14 17:24:03 2024 X-Original-To: dev-commits-ports-all@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 4TChvl58nYz56jVp; Sun, 14 Jan 2024 17:24: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 4TChvl4hGlz4VNJ; Sun, 14 Jan 2024 17:24:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705253043; 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=o0M+MT+BT/69csfavDV2KWnii0JcAHGNACfQmwcHmZk=; b=i59lPrxrdD3z6mDGyvAYpWQJrYD+KQEQPStfH2oEpsIU8lSs1W3NqhAYt6J4VTjJoFjZyO 1mA521dNanMWyrEJa1gyE0YhiC/oJ6eBFoEqHtgJ9UYhD1U1PjK7R7I/yA6pFflb0N5/0s cVA71xKZr/68wjZdI6tc/FWbbbne0qbSio04FcER8b65rHq/2jC1pPbHIMopesL7cBwtB2 DDeoiKY6yd77wvMUzKl21wouXeE2lU6yW1IV7DdwtYMqOvZ6hSFifbvzqjc2+CpuaeDoOn E1Lu2ArQZzcLVDl22IjbeV5gYsZFn5hUU/KC7u71CtTJcOOC68Myv4LWyAWC4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705253043; 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=o0M+MT+BT/69csfavDV2KWnii0JcAHGNACfQmwcHmZk=; b=t7o3Wqun0ctTvwPpO/+Gvd9aXWw/xJrqhPM/e6NZuO+HvYLM6/sC8fe91uZXntLkcnx8/I ZQp8n5Wwv3aQiCj5d/dSw4d6+O3lw+CFsy03oxdnQRnA5WrBqzEvMhoi2sTqM8qztOXcb2 3CksqB2jlsKzQ9+F6RcfiqQsCgn/K8aMRvSJb8sGX6vZZTMCMeL83cXqyKIIVqn7GTWE6Y hGbuwQj9YOqdhwoVcfaEn3agOewsADNBvT0Ur0EOsUiOqZ6i3nYQe+Tfwf+uCnamMSsTko mco/0t40GJGqNtmYmbaTGF5yc/PcZUMIifr368cbUDCqFgTAgloqCqOxzEEbjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705253043; a=rsa-sha256; cv=none; b=DaFgOCfrpil0hM7KziOtEwMp/4xVgIRwtx4NzfMHqMvh1kU74ZiaeoSpywgG2352pkuLY1 IyStTdy/87EYawXlI76hDcgk4PztLhRi4asRQ5C5xPauWZ8jTu8rqBn+cYuPGpiZUe8Z9O UH6/rO52L1/maHeD63eO5Bd1AJqwpj7hbZWGpHqG5pzRHP5VJEaEUuiD0anqsK9CgSCbxt /gDC4q1I/vgGBxMmzZe2imG0n4nYlIYmHHYDHy2J5e1x3hLGiWqciOb7WAKZUQsmULSsR/ dJUNEOzV42sAFvKPR+TkoUYc0Q/7rLcuv0t8a40c2o1eFlnNYa1T+HlsEkjcSA== 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 4TChvl3nDnzMnf; Sun, 14 Jan 2024 17:24: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 40EHO3E0087620; Sun, 14 Jan 2024 17:24:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40EHO38N087617; Sun, 14 Jan 2024 17:24:03 GMT (envelope-from git) Date: Sun, 14 Jan 2024 17:24:03 GMT Message-Id: <202401141724.40EHO38N087617@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Olivier Cochard Subject: git: 9684f42bbe0a - main - net/frr9: Fix rc script with staticd List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olivier X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9684f42bbe0a2951c1327a5619734a753dc3e64d Auto-Submitted: auto-generated The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/ports/commit/?id=9684f42bbe0a2951c1327a5619734a753dc3e64d commit 9684f42bbe0a2951c1327a5619734a753dc3e64d Author: Olivier Cochard AuthorDate: 2024-01-14 17:20:54 +0000 Commit: Olivier Cochard CommitDate: 2024-01-14 17:23:19 +0000 net/frr9: Fix rc script with staticd PR: 276333 Reported by: pi --- net/frr9/Makefile | 1 + net/frr9/files/frr.in | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/net/frr9/Makefile b/net/frr9/Makefile index b8477ab81ec5..0a5b032b2f62 100644 --- a/net/frr9/Makefile +++ b/net/frr9/Makefile @@ -1,6 +1,7 @@ PORTNAME= frr PORTVERSION= 9.1 DISTVERSIONPREFIX= frr- +PORTREVISION= 1 CATEGORIES= net .if defined(PYTHONTOOLS) PKGNAMESUFFIX= 9-pythontools diff --git a/net/frr9/files/frr.in b/net/frr9/files/frr.in index 45de683c547b..a62055d75d3e 100644 --- a/net/frr9/files/frr.in +++ b/net/frr9/files/frr.in @@ -53,8 +53,8 @@ check_config() { echo "Checking $daemon.conf" # pimd doesn't support -C - if [ "$daemon" = "pimd" ]; then - echo "Ignored" + if [ "$daemon" = "pimd" -o "$daemon" = "staticd" ]; then + echo "confchk $daemon ignored" else $command $daemon_flags -C result=$?