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 - -+#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: <