Page MenuHomeFreeBSD
Files F144390575

D43121.id132507.diff
No OneTemporary
Actions

D43121.id132507.diff
View Options

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,6 @@
PORTNAME= containernetworking-plugins
DISTVERSION= 0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MAINTAINER= dfr@FreeBSD.org
diff --git a/net/containernetworking-plugins/pkg-descr b/net/containernetworking-plugins/pkg-descr
--- a/net/containernetworking-plugins/pkg-descr
+++ b/net/containernetworking-plugins/pkg-descr
@@ -1,3 +1,3 @@
CNI plugins for container networking support. This is used by
-container engines such as podman and buildah to setup and teardown
+container engines such as Podman and Buildah to setup and teardown
network access for containers.
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
@@ -4,7 +4,7 @@
# cp /usr/local/etc/containers/pf.conf.sample /etc/pf.conf
...
-Edit /etc/pf.conf and set v4egress_if, v6egress_if to your network interface(s)s
+Edit /etc/pf.conf and set v4egress_if, v6egress_if to your network interface(s)
...
# sysrc pf_enable=YES
# service pf start
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.32.2
-PORTREVISION= 1
+DISTVERSION= 1.33.2
CATEGORIES= sysutils
MAINTAINER= dfr@FreeBSD.org
@@ -12,7 +11,8 @@
BUILD_DEPENDS= bash:shells/bash \
go-md2man:textproc/go-md2man \
- gsed:textproc/gsed
+ gsed:textproc/gsed \
+ as:devel/binutils
LIB_DEPENDS= libgpgme.so:security/gpgme
RUN_DEPENDS= containernetworking-plugins>=0:net/containernetworking-plugins \
containers-common>=0:sysutils/containers-common \
diff --git a/sysutils/buildah/distinfo b/sysutils/buildah/distinfo
--- a/sysutils/buildah/distinfo
+++ b/sysutils/buildah/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1699001163
-SHA256 (containers-buildah-v1.32.2_GH0.tar.gz) = 4e6c4b2186d6ef5195334f6979d3f7484664a5a3df425b6524a19b14774efc20
-SIZE (containers-buildah-v1.32.2_GH0.tar.gz) = 18451694
+TIMESTAMP = 1702140631
+SHA256 (containers-buildah-v1.33.2_GH0.tar.gz) = 5e0bc3044158649983051c61330fe55e6e1f06ef98eed53861682ae54c2734ba
+SIZE (containers-buildah-v1.33.2_GH0.tar.gz) = 18580150
diff --git a/sysutils/buildah/files/patch-Makefile b/sysutils/buildah/files/patch-Makefile
new file mode 100644
--- /dev/null
+++ b/sysutils/buildah/files/patch-Makefile
@@ -0,0 +1,12 @@
+--- Makefile.orig 2024-01-05 15:47:24 UTC
++++ Makefile
+@@ -78,7 +78,8 @@ internal/mkcw/embed/entrypoint: internal/mkcw/embed/en
+ $(LD) -o $@ $(patsubst %.s,%.o,$^)
+ strip $@
+ else
+-.PHONY: internal/mkcw/embed/entrypoint
++internal/mkcw/embed/entrypoint:
++ touch $@
+ endif
+
+ internal/mkcw/embed/entrypoint.gz: internal/mkcw/embed/entrypoint
diff --git a/sysutils/buildah/pkg-descr b/sysutils/buildah/pkg-descr
--- a/sysutils/buildah/pkg-descr
+++ b/sysutils/buildah/pkg-descr
@@ -1,4 +1,4 @@
-The buildah package provides a command line tool which can be used to
+The Buildah package provides a command line tool which can be used to
* create a working container from scratch
or
* create a working container from an image as a starting point
diff --git a/sysutils/buildah/pkg-message b/sysutils/buildah/pkg-message
--- a/sysutils/buildah/pkg-message
+++ b/sysutils/buildah/pkg-message
@@ -1,4 +1,4 @@
-The FreeBSD port of the buildah image building tool is experimental and should
+The FreeBSD port of the Buildah image building tool is experimental and should
be used for evaluation and testing purposes only.
Basic usage follows:
diff --git a/sysutils/conmon/Makefile b/sysutils/conmon/Makefile
--- a/sysutils/conmon/Makefile
+++ b/sysutils/conmon/Makefile
@@ -1,7 +1,6 @@
PORTNAME= conmon
DISTVERSIONPREFIX= v
-DISTVERSION= 2.1.7
-PORTREVISION= 6
+DISTVERSION= 2.1.10
CATEGORIES= sysutils
MAINTAINER= dfr@FreeBSD.org
diff --git a/sysutils/conmon/distinfo b/sysutils/conmon/distinfo
--- a/sysutils/conmon/distinfo
+++ b/sysutils/conmon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678090049
-SHA256 (containers-conmon-v2.1.7_GH0.tar.gz) = 7d0f9a2f7cb8a76c51990128ac837aaf0cc89950b6ef9972e94417aa9cf901fe
-SIZE (containers-conmon-v2.1.7_GH0.tar.gz) = 158201
+TIMESTAMP = 1702974978
+SHA256 (containers-conmon-v2.1.10_GH0.tar.gz) = 455fabcbd4a5a5dc5e05374a71b62dc0b08ee865c2ba398e9dc9acac1ea1836a
+SIZE (containers-conmon-v2.1.10_GH0.tar.gz) = 121047
diff --git a/sysutils/conmon/files/patch-src_close__fds.c b/sysutils/conmon/files/patch-src_close__fds.c
deleted file mode 100644
--- a/sysutils/conmon/files/patch-src_close__fds.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/close_fds.c.orig 2023-02-28 02:39:11 UTC
-+++ src/close_fds.c
-@@ -22,6 +22,12 @@
-
- #include <sys/stat.h>
-
-+#ifdef __FreeBSD__
-+#define OPEN_FILES_DIR "/dev/fd"
-+#else
-+#define OPEN_FILES_DIR "/proc/self/fd"
-+#endif
-+
- static int open_files_max_fd;
- static fd_set *open_files_set;
-
-@@ -31,7 +37,7 @@ static void __attribute__((constructor)) init()
- ssize_t size = 0;
- DIR *d;
-
-- d = opendir("/proc/self/fd");
-+ d = opendir(OPEN_FILES_DIR);
- if (!d)
- return;
-
-@@ -85,7 +91,7 @@ void close_all_fds_ge_than(int firstfd)
- struct dirent *ent;
- DIR *d;
-
-- d = opendir("/proc/self/fd");
-+ d = opendir(OPEN_FILES_DIR);
- if (!d)
- return;
-
diff --git a/sysutils/conmon/files/patch-src_conn__sock.c b/sysutils/conmon/files/patch-src_conn__sock.c
deleted file mode 100644
--- a/sysutils/conmon/files/patch-src_conn__sock.c
+++ /dev/null
@@ -1,44 +0,0 @@
---- src/conn_sock.c.orig 2023-07-07 12:04:59 UTC
-+++ src/conn_sock.c
-@@ -110,6 +110,14 @@ static void bind_relative_to_dir(int dir_fd, int sock_
- if (bind(sock_fd, (struct sockaddr *)&addr, sizeof(addr)) < 0)
- pexit("Failed to bind to console-socket");
- }
-+
-+static void set_socket_buffers(G_GNUC_UNUSED int fd)
-+{
-+ /*
-+ * Nothing needed here for Linux - the default buffer sizes for unix domain sockets are large enough.
-+ */
-+}
-+
- #endif
-
- #ifdef __FreeBSD__
-@@ -135,6 +143,18 @@ static void bind_relative_to_dir(int dir_fd, int sock_
- if (fchmodat(dir_fd, addr.sun_path, 0700, AT_SYMLINK_NOFOLLOW))
- pexit("Failed to change console-socket permissions");
- }
-+
-+static void set_socket_buffers(int fd)
-+{
-+ int sz = CONN_SOCK_BUF_SIZE;
-+ if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &sz, sizeof(sz))) {
-+ nwarn("failed to set socket receive buffer size");
-+ }
-+ if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &sz, sizeof(sz))) {
-+ nwarn("failed to set socket send buffer size");
-+ }
-+}
-+
- #endif
-
- static char *setup_socket(int *fd, const char *path)
-@@ -357,6 +377,7 @@ static gboolean attach_cb(int fd, G_GNUC_UNUSED GIOCon
- nwarn("Failed to accept client connection on attach socket");
- } else {
- struct remote_sock_s *remote_sock;
-+ set_socket_buffers(new_fd);
- if (srcsock->dest->readers == NULL) {
- srcsock->dest->readers = g_ptr_array_new_with_free_func(free);
- }
diff --git a/sysutils/conmon/pkg-message b/sysutils/conmon/pkg-message
--- a/sysutils/conmon/pkg-message
+++ b/sysutils/conmon/pkg-message
@@ -2,7 +2,7 @@
{ type: install
message: <<EOM
-To properly support podman's container restart policy, conmon needs fdescfs(5)
+To properly support Podman's container restart policy, conmon needs fdescfs(5)
to be mounted on /dev/fd.
If /dev/fd is not already mounted:
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.56.0
+DISTVERSION= 0.57.1
CATEGORIES= sysutils
MAINTAINER= dfr@FreeBSD.org
@@ -24,9 +24,9 @@
NO_ARCH= yes
-IMAGEVERSION= 5.28.0
-STORAGEVERSION= 1.50.2
-SKOPEOVERSION= 1.13.3
+IMAGEVERSION= 5.29.0
+STORAGEVERSION= 1.51.0
+SKOPEOVERSION= 1.14.0
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 = 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
+TIMESTAMP = 1702140414
+SHA256 (containers-common-v0.57.1_GH0.tar.gz) = f041a2b83d8c0be207d0e9d65e2a1a36e0fdd35ac0a0b0b5fa29833748aa3c93
+SIZE (containers-common-v0.57.1_GH0.tar.gz) = 12701086
+SHA256 (containers-image-v5.29.0_GH0.tar.gz) = f6839ff611421bb8eeeb6563f4a48c876abf17eaa4fcbedd181aa5cdf7fcfe4c
+SIZE (containers-image-v5.29.0_GH0.tar.gz) = 706774
+SHA256 (containers-storage-v1.51.0_GH0.tar.gz) = 383bf3d7ef5eec3afee20ae37ca0caf8f2c2ef0ec14104cba2476f73db571c5e
+SIZE (containers-storage-v1.51.0_GH0.tar.gz) = 4283732
+SHA256 (containers-skopeo-v1.14.0_GH0.tar.gz) = 062ca24dcc106c3758e90a4af207b67166437ab71128bd33749b0414e0a42f79
+SIZE (containers-skopeo-v1.14.0_GH0.tar.gz) = 10548883
diff --git a/sysutils/containers-common/pkg-descr b/sysutils/containers-common/pkg-descr
--- a/sysutils/containers-common/pkg-descr
+++ b/sysutils/containers-common/pkg-descr
@@ -1 +1 @@
-Common manpages and config files for podman and buildah.
+Common manpages and config files for Podman and Buildah.
diff --git a/sysutils/ocijail/Makefile b/sysutils/ocijail/Makefile
--- a/sysutils/ocijail/Makefile
+++ b/sysutils/ocijail/Makefile
@@ -1,6 +1,7 @@
PORTNAME= ocijail
DISTVERSIONPREFIX= v
DISTVERSION= 0.3.0
+PORTREVISION= 1
CATEGORIES= sysutils
MAINTAINER= dfr@FreeBSD.org
diff --git a/sysutils/ocijail/pkg-descr b/sysutils/ocijail/pkg-descr
--- a/sysutils/ocijail/pkg-descr
+++ b/sysutils/ocijail/pkg-descr
@@ -1,3 +1,3 @@
Experimental, proof-of-concept OCI-compatible runtime for jails. This
-is used by container engines such as buildah or podman to manage the
+is used by container engines such as Buildah or Podman to manage the
container lifecycle
diff --git a/sysutils/podman-suite/Makefile b/sysutils/podman-suite/Makefile
--- a/sysutils/podman-suite/Makefile
+++ b/sysutils/podman-suite/Makefile
@@ -1,9 +1,9 @@
PORTNAME= podman-suite
-PORTVERSION= 20231103
+PORTVERSION= 20240109
CATEGORIES= sysutils
MAINTAINER= dfr@FreeBSD.org
-COMMENT= Metaport of podman and buildah toolkit
+COMMENT= Metaport of Podman and Buildah toolkit
WWW= https://podman.io/
USES= metaport
diff --git a/sysutils/podman-suite/pkg-descr b/sysutils/podman-suite/pkg-descr
--- a/sysutils/podman-suite/pkg-descr
+++ b/sysutils/podman-suite/pkg-descr
@@ -1,4 +1,4 @@
-buildah, podman and skopeo, comprise a modern container-based workflow
+Buildah, Podman and Skopeo, comprise a modern container-based workflow
toolkit, now available on FreeBSD.
This meta-package doesn't preclude users from combining these
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.7.2
-PORTREVISION= 1
+DISTVERSION= 4.8.3
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 = 1699000346
-SHA256 (containers-podman-v4.7.2_GH0.tar.gz) = 10346c5603546427bd809b4d855d1e39b660183232309128ad17a64969a0193d
-SIZE (containers-podman-v4.7.2_GH0.tar.gz) = 20554551
+TIMESTAMP = 1704471600
+SHA256 (containers-podman-v4.8.3_GH0.tar.gz) = 3a99b6c82644fa52929cf4143943c63d6784c84094892bc0e14197fa38a1c7fa
+SIZE (containers-podman-v4.8.3_GH0.tar.gz) = 21565162
diff --git a/sysutils/podman/files/patch-libpod_container__inspect.go b/sysutils/podman/files/patch-libpod_container__inspect.go
new file mode 100644
--- /dev/null
+++ b/sysutils/podman/files/patch-libpod_container__inspect.go
@@ -0,0 +1,11 @@
+--- libpod/container_inspect.go.orig 2024-01-07 16:19:52 UTC
++++ libpod/container_inspect.go
+@@ -316,7 +316,7 @@ func (c *Container) GetSecurityOptions() []string {
+ if apparmor, ok := ctrSpec.Annotations[define.InspectAnnotationApparmor]; ok {
+ SecurityOpt = append(SecurityOpt, fmt.Sprintf("apparmor=%s", apparmor))
+ }
+- if c.config.Spec.Linux.MaskedPaths == nil {
++ if c.config.Spec.Linux != nil && c.config.Spec.Linux.MaskedPaths == nil {
+ SecurityOpt = append(SecurityOpt, "unmask=all")
+ }
+
diff --git a/sysutils/podman/pkg-descr b/sysutils/podman/pkg-descr
--- a/sysutils/podman/pkg-descr
+++ b/sysutils/podman/pkg-descr
@@ -1,9 +1,9 @@
-podman (Pod Manager) is a fully featured container engine that is a
-simple daemonless tool. podman provides a Docker-CLI comparable
+Podman (Pod Manager) is a fully featured container engine that is a
+simple daemonless tool. Podman provides a Docker-CLI comparable
command line that eases the transition from other container engines
and allows the management of pods, containers and images. Simply put:
alias docker=podman.
-podman uses Buildah(1) internally to create container images. Both
+Podman uses Buildah(1) internally to create container images. Both
tools share image (not container) storage, hence each can use or
manipulate images (but not containers) created by the other.
diff --git a/sysutils/podman/pkg-message b/sysutils/podman/pkg-message
--- a/sysutils/podman/pkg-message
+++ b/sysutils/podman/pkg-message
@@ -2,12 +2,12 @@
{
type: install
message: <<EOM
-The FreeBSD port of the podman container engine is experimental and should be
+The FreeBSD port of the Podman container engine is experimental and should be
used for evaluation and testing purposes only.
$ sudo podman run --rm docker.io/dougrabson/hello
-podman can restart containers after a host is rebooted. To enable this, use:
+Podman can restart containers after a host is rebooted. To enable this, use:
$ sudo sysrc podman_enable=YES
@@ -27,7 +27,7 @@
type: upgrade
maximum_version: 4.7.1
message: <<EOM
-In podman-4.7.0 and later, registry authentication creds moved from
+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/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.3
-PORTREVISION= 1
+DISTVERSION= 1.14.0
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 = 1697293143
-SHA256 (containers-skopeo-v1.13.3_GH0.tar.gz) = 0b788fc5725ac79327f7c29797821a2bafc1c3c87bbfcb2998c2a1be949e314d
-SIZE (containers-skopeo-v1.13.3_GH0.tar.gz) = 7923961
+TIMESTAMP = 1702140468
+SHA256 (containers-skopeo-v1.14.0_GH0.tar.gz) = 062ca24dcc106c3758e90a4af207b67166437ab71128bd33749b0414e0a42f79
+SIZE (containers-skopeo-v1.14.0_GH0.tar.gz) = 10548883

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 9, 5:00 AM (19 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28539907
Default Alt Text
D43121.id132507.diff (15 KB)

Event Timeline