From nobody Thu Jan 23 14:13:52 2025 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 4Yf2xD52s4z5l0pT; Thu, 23 Jan 2025 14:13:52 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yf2xD3zfbz3f61; Thu, 23 Jan 2025 14:13:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737641632; 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=zz5Tx8gh4tSR4P5I/E1rpQhdwvCUw4/1q1XPL1qgqS8=; b=wy/L/iBX7vPpkwufdSIzgNrtI6ZPJkYef0DsjMIxK3HHBG4niIujhyrWYEaww4TbKPFDDO ISOfXnjxwtaEgk9584awVMDWC+4sS47llkW37+OWADuwyFpH2PWRHnax5j5Gi7pFEK7Qcn IVP1Bk2wBsPD++jLB9CoqtlwsBZV93EeX8J5IfupvE+pmRY0hTxLEAqR0slzmTIdHxSkxP WIoH/edV5DV3VmAdaw2QcDZ6mRrDu6Q1Uq9RDDNDT4SJM/1tsYaess19K5Fwjt99PFA/nH k9ASKbKPls56TN0QtjQQyulVoNfXmlaq2nZSLybAwwgUtKARHafsy8NhPDOTEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737641632; 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=zz5Tx8gh4tSR4P5I/E1rpQhdwvCUw4/1q1XPL1qgqS8=; b=ulSivstpROYKZjaHpNY854DaPocLC2UIPPf3jSqmyLKVrZk3mIZoLneeGFPAjsi09H/1cC xQ/qZ1RurFg27zY681ZZ17ArlKngXBIcu7S1B1YQ7MuSsA1H4wbh5XZFZZ02feuw5044N2 O/iwFDp/wKw2QiCuZtelQf6JcQOIbKfSoH7Gf97/3yOHFX/3t8nZV4M3+JjnpAMHn//VW/ X8UGkYSGlyObrx4J61PDZltIWcavbcJhNuuX6+PKBP1XYBqOIm5eDiuPjC8LiSjbCWSAkI aOjcYe5NOu0yp3FdA3luajcALXbHv6o8SxiDWwCax4lDdkBuV65Fy0rkXk81BQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737641632; a=rsa-sha256; cv=none; b=GbVkwAZnMJdrROMH7l88CToRVJzTX5PTnAuXcA15bGXXuLHscnFb326MgdyDwpFsTXs02P PQWU3CH4DtAbQh3+BneHuvK9fSy3CGcLcK1zRLJEYnjz8MDPgTv7gkbfeN0PbwrwJirpLX ZC3430qSQew2yoJKsJmrwEx+jXN6eOp74A587U+ZmAsUpx1VU2JIWjhtqWSBNISRt2WzNh 0wCuYqwQ37cc5+cGVU4f/qdB1TiLzlGsIxKkRlAbdmSNrZjRDbGcvmZKA/i57JyGY2+zPG AnSe374Bxz/REzW+/nF1beGzpTl4+/q+k0FLzdeq6OOhqPP2rWx2Cgz3b4Ro4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yf2xD3VW3zjtZ; Thu, 23 Jan 2025 14:13:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50NEDqgQ063669; Thu, 23 Jan 2025 14:13:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50NEDqtW063666; Thu, 23 Jan 2025 14:13:52 GMT (envelope-from git) Date: Thu, 23 Jan 2025 14:13:52 GMT Message-Id: <202501231413.50NEDqtW063666@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: bb1d819e2327 - 2025Q1 - dns/knot3: Workaround due to bug in service(8): /usr/sbin/service: ERROR: USAGE: load_rc_config_var name var 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q1 X-Git-Reftype: branch X-Git-Commit: bb1d819e23277bedefc431f8c43d2f3e785f6895 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=bb1d819e23277bedefc431f8c43d2f3e785f6895 commit bb1d819e23277bedefc431f8c43d2f3e785f6895 Author: Tomáš Čiernik AuthorDate: 2025-01-23 13:41:20 +0000 Commit: Vladimir Druzenko CommitDate: 2025-01-23 14:13:32 +0000 dns/knot3: Workaround due to bug in service(8): /usr/sbin/service: ERROR: USAGE: load_rc_config_var name var /usr/sbin/service: ERROR: USAGE: load_rc_config_var name var This is very old and known bug in service(8) from 2016: https://bugs.freebsd.org/208534 https://reviews.freebsd.org/D5833 PR: 284100 Approved by: Leo Vandewoestijne (maintainer) MFH: 2025Q1 (cherry picked from commit b7b2320af6f78ddc1a92a0a605ceee49183ab6fc) --- dns/knot3/Makefile | 1 + dns/knot3/files/knot.in | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/dns/knot3/Makefile b/dns/knot3/Makefile index 18fbd0e13dab..56bff20d0635 100644 --- a/dns/knot3/Makefile +++ b/dns/knot3/Makefile @@ -1,5 +1,6 @@ PORTNAME= knot DISTVERSION= ${KNOT_VERSION} +PORTREVISION= 1 CATEGORIES= dns MASTER_SITES= https://secure.nic.cz/files/knot-dns/ \ https://dns.company/downloads/knot-dns/ diff --git a/dns/knot3/files/knot.in b/dns/knot3/files/knot.in index df885ed7c9c2..5c7807beca32 100644 --- a/dns/knot3/files/knot.in +++ b/dns/knot3/files/knot.in @@ -45,12 +45,18 @@ . /etc/rc.subr +# Workaround due to bug in service(8) +name="$file" ; + case "$0" in /etc/rc*) # during boot (shutdown) $0 is /etc/rc (/etc/rc.shutdown), # so get the name of the script from $_file name="$_file" ;; +*/service) + # do not use this as $0 + ;; *) name="$0" ;;