From nobody Thu Nov 9 13:14:35 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 4SR2VM3JlLz50rDM; Thu, 9 Nov 2023 13:14:35 +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 4SR2VM2rx8z3CJZ; Thu, 9 Nov 2023 13:14:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699535675; 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=nBt5LS1bG3eoeN4tTnufr/GGhh2IJNyMQsEZBlpw+G0=; b=yGwiM1O7UBbt1RnoRChN719UkA7YbALQg/8HP01Ey4XagE/J3fmqrPl3NhMDIKXY12eo5d 21+B3ka/r22MypIsCoTi8QKfxRki1WAVEObHV9oLqqMAok8q9qtbexNr+IrF+ylwDE0KHN ONmvAO/FX/DqOenUeKUlyl8bNh/SyAVRCZYpKGhlQMfjxxfpbqfx4xK/FyR7F8j+ueNOSb unCO9aUtILEMca9AeX+RaNZDMA55lE27uY/Ion/6gTrXad0KTgzms9Zkb5LP2XOZH+knU/ Syh0j3SQAsxwwwbNmytwFQVzCTsmnbeRXunVCunpptcNrauWyM6w33jYKSBBnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699535675; 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=nBt5LS1bG3eoeN4tTnufr/GGhh2IJNyMQsEZBlpw+G0=; b=RkDdOdGyqDR1sBVtl4yKAUECo0X9uLaR1SHQChlw5ZyJdKOWE6Q3y7EDTH61Dm8ystrdvX 6qy1SVFnlZ0ZZAQkyYKXqcDpaQD3h/VMV5t7HS+KWEEahnGtOlD0q4XlTXcecc0U6TNEWl 6DPOyMG8uJ/QpqQhoIZCdsatbzvsWHI3QO6gGIsqwbX/6JiZVPd6PNmDykt9Ib9iD8xHQA RFmEndjDYzezEMl5x21XtbJd00XoT78BKirgoM8R3p79xSUJNkcTjTpBZUuEWQ/j95fCa5 Gh0so4sRfPATX2jADkcyIYDojNR+xsjjqlAh/g2kQ98W1EUAanMfqpI/M2P0xA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699535675; a=rsa-sha256; cv=none; b=Sn2L10IsDP4VIUTpYOwq8EFcprKHG4bs5+Fm95Nqfzqy32qTJTe2fBaR7nmPn+zR5bclQZ zNYUv3yk1C4yd3mBZuZYgJAk7TXBtrKU/y7uUlHWEZEMGsYaRCeRQTe6bsnmaKNj5HdEUw bHwBiXZq9xZmXO1DTeS6zNxcEaAyLt/ZbXLNjCmVRomahwSglCP/7cMXaiRY9uiEr3PIKs 3SkifZzUAb3ewjBp/y81ISMkMjJ41RVvi86oj2nXBPzLgWd/p3+iaa8oSz6YgM30PWkJGB PHzrfkOsgM2DEdwHXDl+7fyWxGHcID8LBcicEzg1NQ8tKUe/N7N5yB60VUCjYQ== 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 4SR2VM1vwKz2H9; Thu, 9 Nov 2023 13:14:35 +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 3A9DEZZK030546; Thu, 9 Nov 2023 13:14:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A9DEZq0030543; Thu, 9 Nov 2023 13:14:35 GMT (envelope-from git) Date: Thu, 9 Nov 2023 13:14:35 GMT Message-Id: <202311091314.3A9DEZq0030543@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Doug Rabson Subject: git: a6e55286a659 - main - net/containernetworking-plugins: update to 0.5 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: dfr X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a6e55286a659b62bf3e8d610c0c84fdff307603b Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/ports/commit/?id=a6e55286a659b62bf3e8d610c0c84fdff307603b commit a6e55286a659b62bf3e8d610c0c84fdff307603b Author: Doug Rabson AuthorDate: 2023-11-04 08:43:35 +0000 Commit: Doug Rabson CommitDate: 2023-11-09 13:12:01 +0000 net/containernetworking-plugins: update to 0.5 --- net/containernetworking-plugins/Makefile | 5 ++--- net/containernetworking-plugins/distinfo | 6 +++--- net/containernetworking-plugins/files/pf.conf.sample | 1 + net/containernetworking-plugins/pkg-message | 19 ++++++++++++++----- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/net/containernetworking-plugins/Makefile b/net/containernetworking-plugins/Makefile index 87d632f5aa83..ba646e5cfd92 100644 --- a/net/containernetworking-plugins/Makefile +++ b/net/containernetworking-plugins/Makefile @@ -1,6 +1,5 @@ PORTNAME= containernetworking-plugins -DISTVERSION= 0.4 -PORTREVISION= 1 +DISTVERSION= 0.5 CATEGORIES= net MAINTAINER= dfr@FreeBSD.org @@ -15,7 +14,7 @@ BUILD_DEPENDS= bash:shells/bash USE_GITHUB= yes GH_ACCOUNT= dfr GH_PROJECT= plugins -GH_TAGNAME= freebsd-v0.4 +GH_TAGNAME= freebsd-v${DISTVERSION} GH_TUPLE= golang:sys:v0.6.0:sys pre-patch: diff --git a/net/containernetworking-plugins/distinfo b/net/containernetworking-plugins/distinfo index 09b16c918d5c..9c34a809eb56 100644 --- a/net/containernetworking-plugins/distinfo +++ b/net/containernetworking-plugins/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1692269530 -SHA256 (dfr-plugins-0.4-freebsd-v0.4_GH0.tar.gz) = 475d9e194d0fb84ba1b8a3c5ad363a016f75c6adddef02fb71aefb7e705413f9 -SIZE (dfr-plugins-0.4-freebsd-v0.4_GH0.tar.gz) = 4198780 +TIMESTAMP = 1697295741 +SHA256 (dfr-plugins-0.5-freebsd-v0.5_GH0.tar.gz) = ae97b270a350a291e96a57a964df84cf7a3d82311e3a8b0476f1e0e95b9bbb7f +SIZE (dfr-plugins-0.5-freebsd-v0.5_GH0.tar.gz) = 4198686 SHA256 (golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54 SIZE (golang-sys-v0.6.0_GH0.tar.gz) = 1434234 diff --git a/net/containernetworking-plugins/files/pf.conf.sample b/net/containernetworking-plugins/files/pf.conf.sample index c2d99f2a3bbf..71976cdb0c66 100644 --- a/net/containernetworking-plugins/files/pf.conf.sample +++ b/net/containernetworking-plugins/files/pf.conf.sample @@ -6,4 +6,5 @@ nat on $v4egress_if inet from to any -> ($v4egress_if) nat on $v6egress_if inet6 from to !ff00::/8 -> ($v6egress_if) rdr-anchor "cni-rdr/*" +nat-anchor "cni-rdr/*" table diff --git a/net/containernetworking-plugins/pkg-message b/net/containernetworking-plugins/pkg-message index 47db23aecfd1..bae89ef8843a 100644 --- a/net/containernetworking-plugins/pkg-message +++ b/net/containernetworking-plugins/pkg-message @@ -21,10 +21,19 @@ enable PF support for these redirections using sysctl: # sysctl net.pf.filter_local=1 # service pf restart -These redirect rules do not currently work if the destination address is -localhost (e.g. 127.0.0.1 or ::1) - always use the hosts IP address when -connecting to a service inside a container using a port redirection. For example -if host port 1234 is redirected to an http service running in a container, you -could connect to it using: +Redirect rules will work if the destination address is localhost (e.g. 127.0.0.1 +or ::1) - to enable this, the following line must be included in your +/etc/pf.conf: + +nat-anchor "cni-rdr/*" + +if upgrading from an older version, this needs to be added to /etc/pf.conf. + +For example if host port 1234 is redirected to an http service running in a +container, you could connect to it using: # fetch -o- http://$(hostname):1234 + +or + +# fetch -o- http://localhost:1234