From nobody Fri Feb 24 15:35:57 2023 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 4PNYrY3Dmhz3tcYn; Fri, 24 Feb 2023 15:35:57 +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 4PNYrY2W3dz4JLg; Fri, 24 Feb 2023 15:35:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677252957; 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=qsSOeHB6NsKSTdLwpMI4F5NIHCkoZOu5uhQNhzesTR8=; b=XaES3gx5UsbucZxg+I8DgPwY8I1tK5oMgK/C7N6VPr98d1pWKqJxsJR6cztl3QK1btqDOv y582MBi8OqphPIxfbh8Kc5Zao1hmOnM1ktSWBbZhknGx4AhWu0FXKpTtnjSmziMQjIfk0j iA7WnWGlok2vPIZ5a9gqB1W14aXG/oULEuwRNkZC93tG6oa2a4NlUMjR1yF/RcHNMJmuZq zazVsUSt7LLY1Z0JUlH6IUE/AvFipz2sf8cOv93snrGftpgwDL61FNDHXDBT5k1yzJS8OB tunujG3bd0atfcBYTdKU48Fa/LbKZOnfINhmuX/R6/nvkEtNpBbToL2GlDisQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677252957; 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=qsSOeHB6NsKSTdLwpMI4F5NIHCkoZOu5uhQNhzesTR8=; b=tiowj16iVaZjqSZVT3mJSviOJ0MH0bNSVCFqeBnQpcxLuBXnnKxip6veSIsRERRL1/y/Ae Rpu32F0gBzaon7iFUEH4I151qcsYBLM/1cRiIiTxA9SeziH90gbaNw+EfdZFD2f6OSvW2p +ZkVEHVewdGpqetpuA1dK1LmUHyIrNhmUHYRAUrJa5er0/y7oFysGZs8ucLG9bMjljdV5W b5qBcas5I1Qpa6bgz299vA3oz3xjlj6l7bonAmUAqxM+WYi+nweCcyBGqzQ31aNVY14YCv 2UD+tHOqok5YrINnJCTztTytXwSZlI1PNdS4LtBTmUrKvEYo/n15UcIUpadlhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677252957; a=rsa-sha256; cv=none; b=Ji35eEmf4oco5vbYNmBT+yJJEMz/GsSfHcKelYUjvaH75plftl07Os1SVTWNNQB/h6FBRC 36BDqI8fvW7W16EramrZVYkp6otMREs4jFU6KWg7Qr/d9xn9CNkAsoJ06GgF1xmOCfsTNc JxQDeDdytPKZOhuNL587tOPKQ8NcNIxZPvccIJr5+4ZwKri6rVSq1Q7M4RnlQnavutJtsC tIqHXBUvKRvhf/VdpTWoSyesq1Rv8SJNAEs0U2h2o8g0qPWIHYtWZiODS1ZiCNBVDLYFan JMPFuz93UCkzxTyOdn9CrAtEyUUyldSyUNWSYIhBLyLizJ8O+2wfJYYWaQXUmg== 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 4PNYrY1Z8CzTHc; Fri, 24 Feb 2023 15:35:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31OFZveF034550; Fri, 24 Feb 2023 15:35:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31OFZvW4034549; Fri, 24 Feb 2023 15:35:57 GMT (envelope-from git) Date: Fri, 24 Feb 2023 15:35:57 GMT Message-Id: <202302241535.31OFZvW4034549@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dan Langille Subject: git: 7344c09f84ab - main - net-mgmt/net-snmp: fix net-snmp-config on jail hosts 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: dvl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7344c09f84ab44ed4cefe39f671b2b0b26449fe0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=7344c09f84ab44ed4cefe39f671b2b0b26449fe0 commit 7344c09f84ab44ed4cefe39f671b2b0b26449fe0 Author: Dan Langille AuthorDate: 2023-02-24 15:32:28 +0000 Commit: Dan Langille CommitDate: 2023-02-24 15:35:47 +0000 net-mgmt/net-snmp: fix net-snmp-config on jail hosts re https://github.com/net-snmp/net-snmp/issues/280 This patch allows 'net-snmp-config --create-snmpv3-user' to succeed if run on a jail host and snmpd is also running in one of the jails. Thhis patch limits the check to the host, ingnoring jails. PR: 269791 --- net-mgmt/net-snmp/Makefile | 2 +- net-mgmt/net-snmp/files/patch-net-snmp-create-v3-user.in | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile index 408c5a9a2baf..7c8700af94ee 100644 --- a/net-mgmt/net-snmp/Makefile +++ b/net-mgmt/net-snmp/Makefile @@ -1,6 +1,6 @@ PORTNAME= snmp PORTVERSION= 5.9.1 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= SF/net-${PORTNAME}/net-${PORTNAME}/${PORTVERSION} \ diff --git a/net-mgmt/net-snmp/files/patch-net-snmp-create-v3-user.in b/net-mgmt/net-snmp/files/patch-net-snmp-create-v3-user.in index 10afdc703070..7dbc8315504d 100644 --- a/net-mgmt/net-snmp/files/patch-net-snmp-create-v3-user.in +++ b/net-mgmt/net-snmp/files/patch-net-snmp-create-v3-user.in @@ -1,5 +1,14 @@ ---- net-snmp-create-v3-user.in.orig 2022-12-03 13:29:45 UTC +--- net-snmp-create-v3-user.in.orig 2021-05-25 22:19:35 UTC +++ net-snmp-create-v3-user.in +@@ -3,7 +3,7 @@ + # this shell script is designed to add new SNMPv3 users + # to Net-SNMP config file. + +-if @PSCMD@ | egrep ' snmpd *$' > /dev/null 2>&1 ; then ++if @PSCMD@ -J 0 | egrep ' snmpd *$' > /dev/null 2>&1 ; then + echo "Apparently at least one snmpd demon is already running." + echo "You must stop them in order to use this command." + exit 1 @@ -135,6 +135,7 @@ if test ! -d "$outfile"; then fi echo "$line" >> "$outfile"