From nobody Fri Dec 1 21:17:00 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 4Shm8r6VXJz53CTH; Fri, 1 Dec 2023 21:17:00 +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 4Shm8r62M4z4YFY; Fri, 1 Dec 2023 21:17:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701465420; 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=vQ1ZtY5z8e7eXD1m6218UF6AgOX35eXSJmV92Uq8ut8=; b=n4Bjxu2m8ExVfdDMvU6J30lJ5F2AxpaskjJpYSEoz896rWZVZ8sgz95XTRmoyelpbp4fX3 M0gzh0OhU2HxU4A28daPOtKYFgjLe4IInk6x5SSGe/UoXHlJxt+ilE4/k6xrJsoW23usxw ySPLtO5YpniaX69UGTIVFVFZ0hm6lBKI6zM9EGLNYRMJTdOJfVIJMvsUXJmIbi450SXAmk rW9vbDFv1fqCMJDPh1xMrseHVYNPi0wwX8lCyk3RWrkGwW8Hb4x397T9gEAaAoGWW03t29 0s40gC9iL+xF02nurPxvygaZpa1tOTPKsqsT8hYo3eqf5PH9RT8EVaaKQmaspQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701465420; 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=vQ1ZtY5z8e7eXD1m6218UF6AgOX35eXSJmV92Uq8ut8=; b=OcFgP1UJJXCm7VJ7eMIFJZrgFOb+JTjhyqN1Wo7oQegsGbK6xPho+wK//QDmHUo7gQT/pI BmCxoVsQzRFwCGPsdhkOqRLpinUMX1TGgi888YlT7isquT0mPG4Xo1KjgU+Iiia0UZb+S7 5rQDlkIwuSxQ4jzI8pl0gqPV/HMgasJLiiGxRMBWIu+D5NPiryzOi1vbW9IqhDIMn7qqmR arLO6kR6Wmk5RPpOoXYxk2iyU+O6U9Qtf/xANeEtKlplsX0iaijs+tYFoiVUBSKQUtnzGL OZRUszMg8dWvw5Sahp6tm3kuZRW0PBBkvOjqV8j6P7hedgLuCHlCRP+1L25wRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701465420; a=rsa-sha256; cv=none; b=u9aTEumOfAfqVhF9wtuSR2SqsbBaL2AbyY35p85akmaAARBU+ecPWtRGV9PU6rm4RRTbTB 0wpfS6xFVYdSvwmQQXLfqetZQDiteheNuRr/EnKRvqYzWhRClwTycIwCXD6b9DoSpnagBB 0+YH2c0jtjob4BrwDE+2IBdKA97QEUxYwWT5yAuBqGXdPZyvKsqx4CQfySk6SHU4eoQmMr lLGWG60YFl7zmLJVHSdhu2ZtBZA1XdWkCQCjFboh6nowOB/Fjb+uGSV1R6iV0xI8gJ7CnT Y7uvr/v3Ul6ae2f6mp37agK7765Ekzod7fHlnQztWxBMrzaE3wBlEnAhuD1peA== 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 4Shm8r55Gxzpjp; Fri, 1 Dec 2023 21:17:00 +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 3B1LH0Ad031607; Fri, 1 Dec 2023 21:17:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B1LH0tQ031604; Fri, 1 Dec 2023 21:17:00 GMT (envelope-from git) Date: Fri, 1 Dec 2023 21:17:00 GMT Message-Id: <202312012117.3B1LH0tQ031604@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brad Davis Subject: git: 996b407b205a - main - net-mgmt/collectd5: Fix patch paths preventing this from applying properly 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: brd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 996b407b205a96d37d5be90be6e8a42d020d2b2e Auto-Submitted: auto-generated The branch main has been updated by brd: URL: https://cgit.FreeBSD.org/ports/commit/?id=996b407b205a96d37d5be90be6e8a42d020d2b2e commit 996b407b205a96d37d5be90be6e8a42d020d2b2e Author: Brad Davis AuthorDate: 2023-12-01 21:08:27 +0000 Commit: Brad Davis CommitDate: 2023-12-01 21:16:26 +0000 net-mgmt/collectd5: Fix patch paths preventing this from applying properly Fixes: 5b63443a6e Pointy hat to: brd (me) --- net-mgmt/collectd5/files/patch-src__pf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net-mgmt/collectd5/files/patch-src__pf.c b/net-mgmt/collectd5/files/patch-src__pf.c index 79ffa899938b..136a8d307c6b 100644 --- a/net-mgmt/collectd5/files/patch-src__pf.c +++ b/net-mgmt/collectd5/files/patch-src__pf.c @@ -4,10 +4,10 @@ Date: Tue Nov 7 03:35:47 2023 -0700 FreeBSD's PF has a new interface so leverage libpfctl to access it so the right interface is used depending on the version -diff --git a/src/pf.c b/src/pf.c +diff --git src/pf.c src/pf.c index 9681d366..eef9540d 100644 ---- a/src/pf.c -+++ b/src/pf.c +--- src/pf.c ++++ src/pf.c @@ -35,6 +35,9 @@ #endif