From nobody Fri Jul 19 18:04:37 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 4WQcyG15qrz5S3nm; Fri, 19 Jul 2024 18:04:38 +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 4WQcyG0cwCz44st; Fri, 19 Jul 2024 18:04:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721412278; 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=Ak+WClCT4kHsGkNAE2qsShzdzExbiZi99p2mPnZ47FQ=; b=hG/SLydvS4ufDf6Z06Mq4mCWNi54drqwsuvq8l5AYMEYEdvR0LcT4baj++f6zwgKmjgnb1 h3YfgS4HWNah9zbRRV1sKWb96nRaGnr4lINoez0mWsT4CH9MaPaVk97bH1ypyFJ75QdIAa RyLw/gHzRNzvjlvLxXG1Yqj3efl7RN8VY5YCvypta+wiRzDWT/nza0GaIvCEWVNMh+jWCD mKaaV4NeDznqqvSlv5m1h/i5lOFmm8Si0zU1HfRewisKSewgbam8w1KwVrxrzqB8qD/Kf3 lDyw2UnuUBD8ixnyMMb/VouSAeznf+nk3ZL72FoRurHtt/SBoHj97SOr3hBrUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721412278; a=rsa-sha256; cv=none; b=mRD20Ka25A3JAC/pSMLJIbvd6bGRV7Lt7pqi9J9hO6ZxWcaMzzHP42hm0IGzn9w9e+a2df whIeXcZsboCInO/3owqa5LFlffGgIiCFl74exeHi2Lr1zzdgUofmBb5VsDdcpAKohaLc/E Ea9tpkCIXXZ7k1IVh3h56JILDl3Rbz4VkFT3ykGyPeAQginFEZ3U0QvAXsGhEswXvV+Rmf 3DQmYJXosPRjzaxy9yNZJYDPqsU54ZJq6ACik0f1fa4hbLsunaHJWwyg+sQ4Iu0Mym3onF nuJTz7hsd/mEl6/4AKcCWMOnb36m1VhZS9G1CpJuTWV9LNNCHgNjj79SKOrljQ== 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=1721412278; 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=Ak+WClCT4kHsGkNAE2qsShzdzExbiZi99p2mPnZ47FQ=; b=GmXBb0QUVA1vb/B0OieCnHTA1HD8s6AlzUFG3H4eFki2ZzyyrTU073d+29E0pcWTIPRKMu lO82KFblvfUMl8p8Q/1ds13mray33nErE4IeNo+WkCKbGPNVFl+D3NEqeIC59JvjcJ6NCr 3KXrfXbxgL2jhZxGia2IYlRH4WMdFGnmNlL8589iHSAJjS9txkY3+W/mAt7DHpxdqkg5P9 c8X8WpQ+lurXjIxeMwwXxiDGDKVkZCU4yD7jbSHmruiB+AQ7AkgMbD4Vnim1B65vFYqJxd z5z84zxxP/YOAdhvmfvJDla8N/A0VFoof8IOYhcdni65GGO0oqG3xXI84le4Eg== 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 4WQcyG0CFDzjbm; Fri, 19 Jul 2024 18:04:38 +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 46JI4b1Z029829; Fri, 19 Jul 2024 18:04:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46JI4bjT029826; Fri, 19 Jul 2024 18:04:37 GMT (envelope-from git) Date: Fri, 19 Jul 2024 18:04:37 GMT Message-Id: <202407191804.46JI4bjT029826@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ryan Steinmetz Subject: git: 9364edfdf092 - main - net-mgmt/net-snmp: Fix scenario where a user does not have a config in the default location 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: zi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9364edfdf092ee1edc0401518e89d0340ef535ca Auto-Submitted: auto-generated The branch main has been updated by zi: URL: https://cgit.FreeBSD.org/ports/commit/?id=9364edfdf092ee1edc0401518e89d0340ef535ca commit 9364edfdf092ee1edc0401518e89d0340ef535ca Author: Ryan Steinmetz AuthorDate: 2024-07-19 18:03:04 +0000 Commit: Ryan Steinmetz CommitDate: 2024-07-19 18:04:28 +0000 net-mgmt/net-snmp: Fix scenario where a user does not have a config in the default location PR: 280284 Reported by: gebhart@secnetix.de --- net-mgmt/net-snmp/Makefile | 2 +- net-mgmt/net-snmp/files/snmpd.in | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile index e6b4d2ba83d9..e7558608e1b8 100644 --- a/net-mgmt/net-snmp/Makefile +++ b/net-mgmt/net-snmp/Makefile @@ -1,7 +1,7 @@ PORTNAME= snmp PORTVERSION= 5.9.4 PORTEPOCH= 1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt MASTER_SITES= SF/net-${PORTNAME}/net-${PORTNAME}/${PORTVERSION} \ ZI diff --git a/net-mgmt/net-snmp/files/snmpd.in b/net-mgmt/net-snmp/files/snmpd.in index 575086a381cd..b3e02f1a5586 100644 --- a/net-mgmt/net-snmp/files/snmpd.in +++ b/net-mgmt/net-snmp/files/snmpd.in @@ -77,7 +77,10 @@ net_snmpd_precmd() { done # -c does not override the default config file. - check_conffile %%PREFIX%%/share/snmp/snmpd.conf + # if it exists, sanity check + if [ -f %%PREFIX%%/share/snmp/snmpd.conf ]; then + check_conffile %%PREFIX%%/share/snmp/snmpd.conf + fi for conffile in ${snmpd_conffile}; do check_conffile ${conffile} if [ -f "${conffile}" -a -s "${conffile}" ]; then