Slirp: Remove for Podman6

.cirrus.yml

@@ -31,7 +31,7 @@ env:
     DEBIAN_NAME: "debian-14"
 
     # Image identifiers
-    IMAGE_SUFFIX: "c20251120t131229z-f42f41d14"
+    IMAGE_SUFFIX: "c20251122t211244z-f42f41d14"
 
     # EC2 images
     FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}"

.golangci.yml

@@ -73,6 +73,9 @@ linters:
       - linters:
           - recvcheck
         path: pkg/k8s.io/
+      - linters:
+          - unused
+        text: "(rootlessPortSyncR|rootlessPortSyncW)"
 
 issues:
   max-issues-per-linter: 0

.packit.yaml

@@ -113,7 +113,7 @@ jobs:
 
   - job: tests
     identifier: cockpit-revdeps
-    trigger: pull_request
+    trigger: ignore
     packages: [podman-fedora]
     notifications:
       failure_comment:
@@ -134,7 +134,7 @@ jobs:
 
   - job: tests
     identifier: tmt-revdeps
-    trigger: pull_request
+    trigger: ignore
     packages: [podman-fedora]
     notifications:
       failure_comment:

cmd/podman/common/completion.go

@@ -1327,26 +1327,10 @@ func AutocompleteNetworkFlag(cmd *cobra.Command, _ []string, toComplete string)
 		"none":    nil,
 		"host":    nil,
 		"private": nil,
-		"slirp4netns:": func(s string) ([]string, cobra.ShellCompDirective) {
-			skv := keyValueCompletion{
-				"allow_host_loopback=": getBoolCompletion,
-				"cidr=":                nil,
-				"enable_ipv6=":         getBoolCompletion,
-				"mtu=":                 nil,
-				"outbound_addr=":       nil,
-				"outbound_addr6=":      nil,
-				"port_handler=": func(_ string) ([]string, cobra.ShellCompDirective) {
-					return []string{"rootlesskit", "slirp4netns"}, cobra.ShellCompDirectiveNoFileComp
-				},
-			}
-			return completeKeyValues(s, skv)
-		},
 	}
 
 	networks, _ := getNetworks(cmd, toComplete, completeDefault)
 	suggestions, dir := completeKeyValues(toComplete, kv)
-	// add slirp4netns here it does not work correct if we add it to the kv map
-	suggestions = append(suggestions, "slirp4netns")
 	return append(networks, suggestions...), dir
 }
 

cmd/podman/root.go

@@ -582,12 +582,6 @@ func rootFlags(cmd *cobra.Command, podmanConfig *entities.PodmanConfig) {
 		pFlags.StringVar(&podmanConfig.ConmonPath, conmonFlagName, "", "Path of the conmon binary")
 		_ = cmd.RegisterFlagCompletionFunc(conmonFlagName, completion.AutocompleteDefault)
 
-		// TODO (6.0): --network-cmd-path is deprecated, remove this option with the next major release
-		// We need to find all the places that use r.config.Engine.NetworkCmdPath and remove it
-		networkCmdPathFlagName := "network-cmd-path"
-		pFlags.StringVar(&podmanConfig.ContainersConf.Engine.NetworkCmdPath, networkCmdPathFlagName, podmanConfig.ContainersConfDefaultsRO.Engine.NetworkCmdPath, "Path to the command for configuring the network")
-		_ = cmd.RegisterFlagCompletionFunc(networkCmdPathFlagName, completion.AutocompleteDefault)
-
 		networkConfigDirFlagName := "network-config-dir"
 		pFlags.StringVar(&podmanConfig.ContainersConf.Network.NetworkConfigDir, networkConfigDirFlagName, podmanConfig.ContainersConfDefaultsRO.Network.NetworkConfigDir, "Path of the configuration directory for networks")
 		_ = cmd.RegisterFlagCompletionFunc(networkConfigDirFlagName, completion.AutocompleteDefault)

cmd/podman/system/service_abi.go

@@ -125,7 +125,6 @@ func restService(flags *pflag.FlagSet, cfg *entities.PodmanConfig, opts entities
 
 	maybeMoveToSubCgroup()
 
-	maybeStartServiceReaper()
 	infra.StartWatcher(libpodRuntime)
 	server, err := api.NewServerWithSettings(libpodRuntime, listener, opts)
 	if err != nil {

cmd/podman/system/service_abi_common.go

@@ -2,9 +2,5 @@
 
 package system
 
-// Currently, we only need servicereaper on Linux to support slirp4netns.
-func maybeStartServiceReaper() {
-}
-
 // There is no cgroup on non linux.
 func maybeMoveToSubCgroup() {}

cmd/podman/system/service_abi_linux.go

@@ -5,14 +5,8 @@ package system
 import (
 	"github.com/sirupsen/logrus"
 	"go.podman.io/common/pkg/cgroups"
-	"go.podman.io/common/pkg/servicereaper"
 )
 
-// Currently, we only need servicereaper on Linux to support slirp4netns.
-func maybeStartServiceReaper() {
-	servicereaper.Start()
-}
-
 func maybeMoveToSubCgroup() {
 	if err := cgroups.MaybeMoveToSubCgroup(); err != nil {
 		// it is a best effort operation, so just print the

contrib/cirrus/logcollector.sh

@@ -47,7 +47,6 @@ case $1 in
                     passt
                     podman
                     skopeo
-                    slirp4netns
         )
         case $OS_RELEASE_ID in
             fedora)

contrib/packit-tmt/dnf-repo-setup.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -exo pipefail
+
+# This should work even when podman-next isn't installed. It'll fetch the
+# highest versions available across all repos.
+dnf -y upgrade --allowerasing --disable-repo=testing-farm-tag-repository --exclude=podman*

contrib/packit-tmt/packit-copr-rpm.sh

@@ -6,9 +6,9 @@
 
 set -exo pipefail
 
-TOP_GIT_DIR=$(git rev-parse --show-toplevel)
+GIT_TOPDIR=$(git rev-parse --show-toplevel)
 
-. "$TOP_GIT_DIR"/contrib/packit-tmt/packit-rpm-git-commit.sh
+. "$GIT_TOPDIR"/contrib/packit-tmt/packit-rpm-git-commit.sh
 
 # Get Version from HEAD
 VERSION=$(grep '^const RawVersion' version/rawversion/version.go | cut -d\" -f2)
@@ -18,7 +18,7 @@ VERSION=$(grep '^const RawVersion' version/rawversion/version.go | cut -d\" -f2)
 RPM_VERSION=$(echo "$VERSION" | sed -e 's/-/~/')
 
 # Generate source tarball from HEAD
-git-archive-all -C "$TOP_GIT_DIR" --prefix="$PACKAGE-$VERSION/" "$TOP_GIT_DIR/rpm/$PACKAGE-$VERSION.tar.gz"
+git-archive-all -C "$GIT_TOPDIR" --prefix="$PACKAGE-$VERSION/" "$GIT_TOPDIR/rpm/$PACKAGE-$VERSION.tar.gz"
 
 # RPM Spec modifications
 

docs/source/locale/ja/LC_MESSAGES/markdown.po

@@ -3257,29 +3257,6 @@ msgid ""
 "supported for rootful users."
 msgstr ""
 
-#: ../../source/markdown/podman-build.1.md:694
-#: ../../source/markdown/podman-create.1.md:1187
-#: ../../source/markdown/podman-kube-play.1.md:291
-#: ../../source/markdown/podman-pod-create.1.md:410
-#: ../../source/markdown/podman-run.1.md:1214
-msgid ""
-"**slirp4netns[:OPTIONS,...]**: use **slirp4netns**(1) to create a user "
-"network stack. This is the default for rootless containers. It is "
-"possible to specify these additional options, they can also be set with "
-"`network_cmd_options` in containers.conf:"
-msgstr ""
-
-#: ../../source/markdown/podman-build.1.md:695
-#: ../../source/markdown/podman-create.1.md:1188
-#: ../../source/markdown/podman-kube-play.1.md:292
-#: ../../source/markdown/podman-pod-create.1.md:411
-#: ../../source/markdown/podman-run.1.md:1215
-msgid ""
-"**allow_host_loopback=true|false**: Allow slirp4netns to reach the host "
-"loopback IP (default is 10.0.2.2 or the second IP from slirp4netns cidr "
-"subnet when changed, see the cidr option below). The default is false."
-msgstr ""
-
 #: ../../source/markdown/podman-build.1.md:696
 #: ../../source/markdown/podman-create.1.md:1189
 #: ../../source/markdown/podman-kube-play.1.md:293
@@ -3310,42 +3287,6 @@ msgid ""
 "`outbound_addr6`)."
 msgstr ""
 
-#: ../../source/markdown/podman-build.1.md:699
-#: ../../source/markdown/podman-create.1.md:1192
-#: ../../source/markdown/podman-kube-play.1.md:296
-#: ../../source/markdown/podman-pod-create.1.md:415
-#: ../../source/markdown/podman-run.1.md:1219
-msgid ""
-"**outbound_addr=INTERFACE**: Specify the outbound interface slirp binds "
-"to (ipv4 traffic only)."
-msgstr ""
-
-#: ../../source/markdown/podman-build.1.md:700
-#: ../../source/markdown/podman-create.1.md:1193
-#: ../../source/markdown/podman-kube-play.1.md:297
-#: ../../source/markdown/podman-pod-create.1.md:416
-#: ../../source/markdown/podman-run.1.md:1220
-msgid "**outbound_addr=IPv4**: Specify the outbound ipv4 address slirp binds to."
-msgstr ""
-
-#: ../../source/markdown/podman-build.1.md:701
-#: ../../source/markdown/podman-create.1.md:1194
-#: ../../source/markdown/podman-kube-play.1.md:298
-#: ../../source/markdown/podman-pod-create.1.md:417
-#: ../../source/markdown/podman-run.1.md:1221
-msgid ""
-"**outbound_addr6=INTERFACE**: Specify the outbound interface slirp binds "
-"to (ipv6 traffic only)."
-msgstr ""
-
-#: ../../source/markdown/podman-build.1.md:702
-#: ../../source/markdown/podman-create.1.md:1195
-#: ../../source/markdown/podman-kube-play.1.md:299
-#: ../../source/markdown/podman-pod-create.1.md:418
-#: ../../source/markdown/podman-run.1.md:1222
-msgid "**outbound_addr6=IPv6**: Specify the outbound ipv6 address slirp binds to."
-msgstr ""
-
 #: ../../source/markdown/podman-build.1.md:703
 msgid ""
 "**pasta[:OPTIONS,...]**: use **pasta**(1) to create a user-mode "
@@ -3394,8 +3335,8 @@ msgstr ""
 #: ../../source/markdown/podman-run.1.md:1252
 msgid ""
 "**pasta:--ipv4-only,-a,10.0.2.0,-n,24,-g,10.0.2.2,--dns-"
-"forward,10.0.2.3,-m,1500,--no-ndp,--no-dhcpv6,--no-dhcp**,   equivalent "
-"to default slirp4netns(1) options: disable IPv6, assign   `10.0.2.0/24` "
+"forward,10.0.2.3,-m,1500,--no-ndp,--no-dhcpv6,--no-dhcp**,   "
+"assign   `10.0.2.0/24` "
 "to the `tap0` interface in the container, with gateway   `10.0.2.3`, "
 "enable DNS forwarder reachable at `10.0.2.3`, set MTU to 1500   bytes, "
 "disable NDP, DHCPv6 and DHCP support."
@@ -3408,8 +3349,8 @@ msgstr ""
 #: ../../source/markdown/podman-run.1.md:1257
 msgid ""
 "**pasta:-I,tap0,--ipv4-only,-a,10.0.2.0,-n,24,-g,10.0.2.2,--dns-"
-"forward,10.0.2.3,--no-ndp,--no-dhcpv6,--no-dhcp**,   equivalent to "
-"default slirp4netns(1) options with Podman overrides: same as   above, "
+"forward,10.0.2.3,--no-ndp,--no-dhcpv6,--no-dhcp**,   "
+"same as   above, "
 "but leave the MTU to 65520 bytes"
 msgstr ""
 
@@ -9586,8 +9527,7 @@ msgstr ""
 #: ../../source/markdown/podman-run.1.md:1213
 msgid ""
 "**private**: Create a new namespace for the container. This uses the "
-"**bridge** mode for rootful containers and **slirp4netns** for rootless "
-"ones."
+"**bridge** mode for rootful containers."
 msgstr ""
 
 #: ../../source/markdown/podman-create.1.md:1196
@@ -9604,16 +9544,6 @@ msgid ""
 "defined networks."
 msgstr ""
 
-#: ../../source/markdown/podman-create.1.md:1198
-#: ../../source/markdown/podman-kube-play.1.md:302
-#: ../../source/markdown/podman-pod-create.1.md:421
-#: ../../source/markdown/podman-run.1.md:1225
-msgid ""
-"**port_handler=slirp4netns**: Use the slirp4netns port forwarding, it is "
-"slower than rootlesskit but preserves the correct source IP address. This"
-" port handler cannot be used for user-defined networks."
-msgstr ""
-
 #: ../../source/markdown/podman-create.1.md:1200
 #: ../../source/markdown/podman-kube-play.1.md:304
 #: ../../source/markdown/podman-pod-create.1.md:423
@@ -12214,7 +12144,7 @@ msgstr ""
 
 #: ../../source/markdown/podman-create.1.md:2453
 msgid ""
-"Rootless Podman works better if the fuse-overlayfs and slirp4netns "
+"Rootless Podman works better if the fuse-overlayfs and pasta "
 "packages are installed. The fuse-overlayfs package provides a userspace "
 "overlay storage driver, otherwise users need to use the vfs storage "
 "driver, which can be disk space expensive and less performant than other "
@@ -12224,7 +12154,7 @@ msgstr ""
 #: ../../source/markdown/podman-create.1.md:2458
 #: ../../source/markdown/podman-run.1.md:2836
 msgid ""
-"To enable VPN on the container, slirp4netns or pasta needs to be "
+"To enable VPN on the container, pasta needs to be "
 "specified; without either, containers need to be run with the "
 "--network=host flag."
 msgstr ""
@@ -12342,8 +12272,7 @@ msgid ""
 " "
 "**[systemd.unit(5)](https://www.freedesktop.org/software/systemd/man/systemd.unit.html)**,"
 " **[setsebool(8)](https://man7.org/linux/man-"
-"pages/man8/setsebool.8.html)**, **[slirp4netns(1)](https://github.com"
-"/rootless-containers/slirp4netns/blob/master/slirp4netns.1.md)**, "
+"pages/man8/setsebool.8.html)**,"
 "**[pasta(1)](https://passt.top/builds/latest/web/passt.1.html)**, "
 "**[fuse-overlayfs(1)](https://github.com/containers/fuse-"
 "overlayfs/blob/main/fuse-overlayfs.1.md)**, **proc(5)**, "
@@ -20795,24 +20724,14 @@ msgid ""
 " that this is only done when no containers are running."
 msgstr ""
 
-#: ../../source/markdown/podman-network.1.md:45
-msgid "Slirp4netns"
-msgstr ""
-
 #: ../../source/markdown/podman-network.1.md:46
 msgid ""
 "When Podman is run as rootless, the internet connectivity is provided "
-"with slirp4netns by default. Slirp4nents uses 10.0.2.0/24 for its default"
+"with Pasta by default. Slirp4nents uses 10.0.2.0/24 for its default"
 " network. This can also be changed in "
 "**[containers.conf(5)](https://github.com/containers/common/blob/main/docs/containers.conf.5.md)**"
 " but under the `[engine]` section. Use the `network_cmd_options` key and "
-"add `[\"cidr=X.X.X.X/24\"]` as a value. Note that slirp4netns needs a "
-"network prefix size between 1 and 25. This option accepts an array, so "
-"more options can be added in a comma-separated string as described on the"
-" **[podman-network-create(1)](podman-network-create.1.md)** man page. To "
-"change the CIDR for just one container, specify it on the cli using the "
-"`--network` option like this: `--network "
-"slirp4netns:cidr=192.168.1.0/24`."
+"add `[\"cidr=X.X.X.X/24\"]` as a value."
 msgstr ""
 
 #: ../../source/markdown/podman-network.1.md:48
@@ -25500,7 +25419,7 @@ msgstr ""
 
 #: ../../source/markdown/podman-run.1.md:2831
 msgid ""
-"Rootless Podman works better if the fuse-overlayfs and slirp4netns "
+"Rootless Podman works better if the fuse-overlayfs and pasta "
 "packages are installed. The **fuse-overlayfs** package provides a "
 "userspace overlay storage driver, otherwise users need to use the **vfs**"
 " storage driver, which can be disk space expensive and less performant "
@@ -26528,13 +26447,6 @@ msgstr ""
 msgid "Do not truncate output"
 msgstr ""
 
-#: ../../source/markdown/podman-stats.1.md:146
-msgid ""
-"Note: When using a slirp4netns network with the rootlesskit port handler,"
-" the traffic sent via the port forwarding is accounted to the `lo` "
-"device.  Traffic accounted to `lo` is not accounted in the stats output."
-msgstr ""
-
 #: ../../source/markdown/podman-stats.1.md:156
 msgid "July 2017, Originally compiled by Ryan Cole <[email protected]>"
 msgstr ""
@@ -31337,16 +31249,6 @@ msgstr ""
 msgid "**--network-cmd-path**=*path*"
 msgstr ""
 
-#: ../../source/markdown/podman.1.md:99
-msgid ""
-"Path to the `slirp4netns(1)` command binary to use for setting up a "
-"slirp4netns network. If \"\" is used, then the binary will first be "
-"searched using the `helper_binaries_dir` option in `containers.conf`, and"
-" second using the `$PATH` environment variable. **Note:** This option is "
-"deprecated and will be removed with Podman 5.0. Use the "
-"`helper_binaries_dir` option in `containers.conf` instead."
-msgstr ""
-
 #: ../../source/markdown/podman.1.md:103
 msgid "**--network-config-dir**=*directory*"
 msgstr ""
@@ -31961,7 +31863,7 @@ msgstr ""
 
 #: ../../source/markdown/podman.1.md:444
 msgid ""
-"Currently slirp4netns or pasta is required to be installed to create a "
+"Currently pasta is required to be installed to create a "
 "network device, otherwise rootless containers need to run in the network "
 "namespace of the host."
 msgstr ""
@@ -32033,8 +31935,6 @@ msgid ""
 "**[runc(8)](https://github.com/opencontainers/runc/blob/main/man/runc.8.md)**,"
 " **[subuid(5)](https://www.unix.com/man-page/linux/5/subuid)**, "
 "**[subgid(5)](https://www.unix.com/man-page/linux/5/subgid)**, "
-"**[slirp4netns(1)](https://github.com/rootless-"
-"containers/slirp4netns/blob/master/slirp4netns.1.md)**, "
 "**[pasta(1)](https://passt.top/builds/latest/web/passt.1.html)**, "
 "**[conmon(8)](https://github.com/containers/conmon/blob/main/docs/conmon.8.md)**"
 msgstr ""