Page MenuHomeFreeBSD

D42482.id129777.diff
No OneTemporary

D42482.id129777.diff

diff --git a/net/containernetworking-plugins/Makefile b/net/containernetworking-plugins/Makefile
--- 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 @@
USE_GITHUB= yes
GH_ACCOUNT= dfr
GH_PROJECT= plugins
-GH_TAGNAME= freebsd-v0.4
+GH_TAGNAME= freebsd-v0.5
GH_TUPLE= golang:sys:v0.6.0:sys
pre-patch:
diff --git a/net/containernetworking-plugins/distinfo b/net/containernetworking-plugins/distinfo
--- 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
--- a/net/containernetworking-plugins/files/pf.conf.sample
+++ b/net/containernetworking-plugins/files/pf.conf.sample
@@ -6,4 +6,5 @@
nat on $v6egress_if inet6 from <cni-nat> to !ff00::/8 -> ($v6egress_if)
rdr-anchor "cni-rdr/*"
+nat-anchor "cni-rdr/*"
table <cni-nat>
diff --git a/net/containernetworking-plugins/pkg-message b/net/containernetworking-plugins/pkg-message
--- a/net/containernetworking-plugins/pkg-message
+++ b/net/containernetworking-plugins/pkg-message
@@ -21,10 +21,19 @@
# 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
diff --git a/sysutils/buildah/Makefile b/sysutils/buildah/Makefile
--- a/sysutils/buildah/Makefile
+++ b/sysutils/buildah/Makefile
@@ -1,7 +1,6 @@
PORTNAME= buildah
DISTVERSIONPREFIX= v
-DISTVERSION= 1.31.2
-PORTREVISION= 1
+DISTVERSION= 1.32.2
CATEGORIES= sysutils
MAINTAINER= dfr@FreeBSD.org
diff --git a/sysutils/buildah/distinfo b/sysutils/buildah/distinfo
--- a/sysutils/buildah/distinfo
+++ b/sysutils/buildah/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1692268372
-SHA256 (containers-buildah-v1.31.2_GH0.tar.gz) = 03137dc0952c242cfe8030d1667e5459b8f3fd2291a15117592fcf974ba09f8b
-SIZE (containers-buildah-v1.31.2_GH0.tar.gz) = 15712827
+TIMESTAMP = 1699001163
+SHA256 (containers-buildah-v1.32.2_GH0.tar.gz) = 4e6c4b2186d6ef5195334f6979d3f7484664a5a3df425b6524a19b14774efc20
+SIZE (containers-buildah-v1.32.2_GH0.tar.gz) = 18451694
diff --git a/sysutils/buildah/pkg-plist b/sysutils/buildah/pkg-plist
--- a/sysutils/buildah/pkg-plist
+++ b/sysutils/buildah/pkg-plist
@@ -22,6 +22,7 @@
share/man/man1/buildah-manifest-remove.1.gz
share/man/man1/buildah-manifest-rm.1.gz
share/man/man1/buildah-manifest.1.gz
+share/man/man1/buildah-mkcw.1.gz
share/man/man1/buildah-mount.1.gz
share/man/man1/buildah-prune.1.gz
share/man/man1/buildah-pull.1.gz
diff --git a/sysutils/containers-common/Makefile b/sysutils/containers-common/Makefile
--- a/sysutils/containers-common/Makefile
+++ b/sysutils/containers-common/Makefile
@@ -1,6 +1,6 @@
PORTNAME= containers-common
DISTVERSIONPREFIX= v
-DISTVERSION= 0.55.3
+DISTVERSION= 0.56.0
CATEGORIES= sysutils
MAINTAINER= dfr@FreeBSD.org
@@ -24,9 +24,9 @@
NO_ARCH= yes
-IMAGEVERSION= 5.27.0
-STORAGEVERSION= 1.48.0
-SKOPEOVERSION= 1.13.2
+IMAGEVERSION= 5.28.0
+STORAGEVERSION= 1.50.2
+SKOPEOVERSION= 1.13.3
WRKSRC= ${WRKDIR}/common-${DISTVERSION}
IMAGESRC= ${WRKDIR}/image-${IMAGEVERSION}
diff --git a/sysutils/containers-common/distinfo b/sysutils/containers-common/distinfo
--- a/sysutils/containers-common/distinfo
+++ b/sysutils/containers-common/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1692269249
-SHA256 (containers-common-v0.55.3_GH0.tar.gz) = c2e4e940174c95ac61f50fc609330736b26b1bdc38dd9f26d58f7b553cbdb906
-SIZE (containers-common-v0.55.3_GH0.tar.gz) = 9958525
-SHA256 (containers-image-v5.27.0_GH0.tar.gz) = 6e47ea5b81a8ffe234d00deca8ad6653ebd044cd9827350e22f3a352146fb684
-SIZE (containers-image-v5.27.0_GH0.tar.gz) = 699340
-SHA256 (containers-storage-v1.48.0_GH0.tar.gz) = 5a59739d545d2cb054c5079a9fa1beb3a4611c0aef617c65792f1e3d9739fe19
-SIZE (containers-storage-v1.48.0_GH0.tar.gz) = 4090366
-SHA256 (containers-skopeo-v1.13.2_GH0.tar.gz) = 1b5e7b4fcbc3b0ba5637793605a5bdc6372ec11e60306aef0ed29ec1fd64893f
-SIZE (containers-skopeo-v1.13.2_GH0.tar.gz) = 7924019
+TIMESTAMP = 1697293001
+SHA256 (containers-common-v0.56.0_GH0.tar.gz) = a981ff8746cf193fda0caccb9cd0deac121e334dfa0de6f441ad7ebb267f1109
+SIZE (containers-common-v0.56.0_GH0.tar.gz) = 12616120
+SHA256 (containers-image-v5.28.0_GH0.tar.gz) = 89f0aa574f65b1849c57ed2be660fac2cbaec5f43e2e14cdfebb3ff15556fd78
+SIZE (containers-image-v5.28.0_GH0.tar.gz) = 688100
+SHA256 (containers-storage-v1.50.2_GH0.tar.gz) = 8ed20cea8cd9bb6ecb63220a0b3f32df63445fe06fb8074c50e3c942e7d1ca0f
+SIZE (containers-storage-v1.50.2_GH0.tar.gz) = 4278269
+SHA256 (containers-skopeo-v1.13.3_GH0.tar.gz) = 0b788fc5725ac79327f7c29797821a2bafc1c3c87bbfcb2998c2a1be949e314d
+SIZE (containers-skopeo-v1.13.3_GH0.tar.gz) = 7923961
diff --git a/sysutils/ocijail/Makefile b/sysutils/ocijail/Makefile
--- a/sysutils/ocijail/Makefile
+++ b/sysutils/ocijail/Makefile
@@ -1,6 +1,6 @@
PORTNAME= ocijail
DISTVERSIONPREFIX= v
-DISTVERSION= 0.2.0
+DISTVERSION= 0.3.0
CATEGORIES= sysutils
MAINTAINER= dfr@FreeBSD.org
diff --git a/sysutils/ocijail/distinfo b/sysutils/ocijail/distinfo
--- a/sysutils/ocijail/distinfo
+++ b/sysutils/ocijail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1692268183
-SHA256 (dfr-ocijail-v0.2.0_GH0.tar.gz) = 0b1ab2fd3d22f93378e853e301c980acc60c0390cdc1e6964ec9ece55a95b469
-SIZE (dfr-ocijail-v0.2.0_GH0.tar.gz) = 48056443
+TIMESTAMP = 1697295208
+SHA256 (dfr-ocijail-v0.3.0_GH0.tar.gz) = b371b432ceea1bfed33cca1fe3721e7bb9dfe363700f428f40850f66faac7877
+SIZE (dfr-ocijail-v0.3.0_GH0.tar.gz) = 48057253
diff --git a/sysutils/podman-suite/Makefile b/sysutils/podman-suite/Makefile
--- a/sysutils/podman-suite/Makefile
+++ b/sysutils/podman-suite/Makefile
@@ -1,5 +1,5 @@
PORTNAME= podman-suite
-PORTVERSION= 20230817
+PORTVERSION= 20231103
CATEGORIES= sysutils
MAINTAINER= dfr@FreeBSD.org
diff --git a/sysutils/podman/Makefile b/sysutils/podman/Makefile
--- a/sysutils/podman/Makefile
+++ b/sysutils/podman/Makefile
@@ -1,7 +1,6 @@
PORTNAME= podman
DISTVERSIONPREFIX= v
-DISTVERSION= 4.6.1
-PORTREVISION= 1
+DISTVERSION= 4.7.2
CATEGORIES= sysutils
MAINTAINER= dfr@FreeBSD.org
diff --git a/sysutils/podman/distinfo b/sysutils/podman/distinfo
--- a/sysutils/podman/distinfo
+++ b/sysutils/podman/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1692268708
-SHA256 (containers-podman-v4.6.1_GH0.tar.gz) = 6b3bfdc5ea9ca91f19b569d5a0763403823bde64be895060ec81dde4df692745
-SIZE (containers-podman-v4.6.1_GH0.tar.gz) = 17643650
+TIMESTAMP = 1699000346
+SHA256 (containers-podman-v4.7.2_GH0.tar.gz) = 10346c5603546427bd809b4d855d1e39b660183232309128ad17a64969a0193d
+SIZE (containers-podman-v4.7.2_GH0.tar.gz) = 20554551
diff --git a/sysutils/podman/pkg-message b/sysutils/podman/pkg-message
--- a/sysutils/podman/pkg-message
+++ b/sysutils/podman/pkg-message
@@ -1,3 +1,7 @@
+[
+{
+ type: install
+ message: <<EOM
The FreeBSD port of the podman container engine is experimental and should be
used for evaluation and testing purposes only.
@@ -10,3 +14,22 @@
and start the container with a restart policy:
$ sudo podman run -d --restart=always myimage
+
+It is possible to run many Linux container images using FreeBSD's Linux emulation:
+
+$ sudo sysrc linux_enable=YES
+$ sudo service linux start
+$ sudo podman run --rm --os=linux alpine cat /etc/os-release | head -1
+NAME="Alpine Linux"
+EOM
+}
+{
+ type: upgrade
+ maximum_version: 4.7.1
+ message: <<EOM
+In podman-4.7.0 and later, registry authentication creds moved from
+/run/containers/0/auth.json to /root/.config/containers/auth.json. Either move
+the file to the new location or just re-authenticate to the required registries.
+EOM
+}
+]
diff --git a/sysutils/podman/pkg-plist b/sysutils/podman/pkg-plist
--- a/sysutils/podman/pkg-plist
+++ b/sysutils/podman/pkg-plist
@@ -11,6 +11,7 @@
share/man/man1/podman-build.1.gz
share/man/man1/podman-commit.1.gz
share/man/man1/podman-completion.1.gz
+share/man/man1/podman-compose.1.gz
share/man/man1/podman-container-attach.1.gz
share/man/man1/podman-container-checkpoint.1.gz
share/man/man1/podman-container-cleanup.1.gz
@@ -55,6 +56,11 @@
share/man/man1/podman-events.1.gz
share/man/man1/podman-exec.1.gz
share/man/man1/podman-export.1.gz
+share/man/man1/podman-farm-create.1.gz
+share/man/man1/podman-farm-list.1.gz
+share/man/man1/podman-farm-remove.1.gz
+share/man/man1/podman-farm-update.1.gz
+share/man/man1/podman-farm.1.gz
share/man/man1/podman-generate-kube.1.gz
share/man/man1/podman-generate-spec.1.gz
share/man/man1/podman-generate-systemd.1.gz
diff --git a/sysutils/skopeo/Makefile b/sysutils/skopeo/Makefile
--- a/sysutils/skopeo/Makefile
+++ b/sysutils/skopeo/Makefile
@@ -1,7 +1,6 @@
PORTNAME= skopeo
DISTVERSIONPREFIX= v
-DISTVERSION= 1.13.2
-PORTREVISION= 1
+DISTVERSION= 1.13.3
CATEGORIES= sysutils
MAINTAINER= dfr@FreeBSD.org
diff --git a/sysutils/skopeo/distinfo b/sysutils/skopeo/distinfo
--- a/sysutils/skopeo/distinfo
+++ b/sysutils/skopeo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1692268533
-SHA256 (containers-skopeo-v1.13.2_GH0.tar.gz) = 1b5e7b4fcbc3b0ba5637793605a5bdc6372ec11e60306aef0ed29ec1fd64893f
-SIZE (containers-skopeo-v1.13.2_GH0.tar.gz) = 7924019
+TIMESTAMP = 1697293143
+SHA256 (containers-skopeo-v1.13.3_GH0.tar.gz) = 0b788fc5725ac79327f7c29797821a2bafc1c3c87bbfcb2998c2a1be949e314d
+SIZE (containers-skopeo-v1.13.3_GH0.tar.gz) = 7923961

File Metadata

Mime Type
text/plain
Expires
Sun, Dec 21, 5:08 PM (10 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27116493
Default Alt Text
D42482.id129777.diff (10 KB)

Event Timeline