contrib, test: Rebase Podman patch, enable three-way merge on git am in demo2022_08_04.b516d15

Given that a three-way git merge was enough to cope with context
changes in man pages, it's probably a good idea to enable that for
'git am' in the demo too.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>

1 files changed, 16 insertions, 16 deletions

diff --git a/contrib/podman/0001-libpod-Add-pasta-networking-mode.patch b/contrib/podman/0001-libpod-Add-pasta-networking-mode.patch
index cb1bab9..ac82a44 100644
--- a/contrib/podman/0001-libpod-Add-pasta-networking-mode.patch
+++ b/contrib/podman/0001-libpod-Add-pasta-networking-mode.patch
@@ -1,4 +1,4 @@
-From 3aa86f0fd0d420c11d328c673e8162300172925a Mon Sep 17 00:00:00 2001
+From 27b0bf3a0ad6c57c7713aef1ded8cad6d4cd4d4a Mon Sep 17 00:00:00 2001
 From: Stefano Brivio <sbrivio@redhat.com>
 Date: Mon, 2 May 2022 16:12:07 +0200
 Subject: [PATCH] libpod: Add pasta networking mode
@@ -56,7 +56,7 @@ SPDX-License-Identifier: Apache-2.0
  create mode 100644 libpod/networking_pasta.go
 
 diff --git a/docs/source/markdown/podman-create.1.md b/docs/source/markdown/podman-create.1.md
-index 67bb573e2..3b96de4d7 100644
+index b3e707e45..03a754e4c 100644
 --- a/docs/source/markdown/podman-create.1.md
 +++ b/docs/source/markdown/podman-create.1.md
 @@ -717,10 +717,15 @@ Valid _mode_ values are:
@@ -115,8 +115,8 @@ index 67bb573e2..3b96de4d7 100644
 +
  #### **--network-alias**=*alias*
  
- Add a network-scoped alias for the container, setting the alias for all networks that the container joins. To set a name only for a specific network, use the alias option as described under the **--network** option.
-@@ -1592,8 +1631,9 @@ In order for users to run rootless, there must be an entry for their username in
+ Add a network-scoped alias for the container, setting the alias for all networks that the container joins. To set a
+@@ -1595,8 +1634,9 @@ In order for users to run rootless, there must be an entry for their username in
  
  Rootless Podman works better if the fuse-overlayfs and slirp4netns packages are installed.
  The fuse-overlayfs package provides a userspace overlay storage driver, otherwise users need to use
@@ -128,7 +128,7 @@ index 67bb573e2..3b96de4d7 100644
  
  ## ENVIRONMENT
  
-@@ -1642,7 +1682,9 @@ page.
+@@ -1645,7 +1685,9 @@ page.
  NOTE: Use the environment variable `TMPDIR` to change the temporary storage location of downloaded container images. Podman defaults to use `/var/tmp`.
  
  ## SEE ALSO
@@ -140,10 +140,10 @@ index 67bb573e2..3b96de4d7 100644
  ## HISTORY
  October 2017, converted from Docker documentation to Podman by Dan Walsh for Podman `<dwalsh@redhat.com>`
 diff --git a/docs/source/markdown/podman-pod-create.1.md b/docs/source/markdown/podman-pod-create.1.md
-index de9a34bfa..e711d6823 100644
+index 7b63ac51d..03174d1a6 100644
 --- a/docs/source/markdown/podman-pod-create.1.md
 +++ b/docs/source/markdown/podman-pod-create.1.md
-@@ -193,10 +193,15 @@ Valid _mode_ values are:
+@@ -263,10 +263,15 @@ Valid _mode_ values are:
    - **interface_name**: Specify a name for the created network interface inside the container.
  
    For example to set a static ipv4 address and a static mac address, use `--network bridge:ip=10.88.0.10,mac=44:33:22:11:00:99`.
@@ -159,7 +159,7 @@ index de9a34bfa..e711d6823 100644
  - **ns:**_path_: Path to a network namespace to join.
  - **private**: Create a new namespace for the container. This will use the **bridge** mode for rootful containers and **slirp4netns** for rootless ones.
  - **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:
-@@ -212,6 +217,43 @@ Valid _mode_ values are:
+@@ -282,6 +287,43 @@ Valid _mode_ values are:
    Note: Rootlesskit changes the source IP address of incoming packets to an IP address in the container network namespace, usually `10.0.2.100`. If your application requires the real source IP address, e.g. web server logs, use the slirp4netns port handler. The rootlesskit port handler is also used for rootless containers when connected to user-defined networks.
    - **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.
  
@@ -202,8 +202,8 @@ index de9a34bfa..e711d6823 100644
 +
  #### **--network-alias**=*alias*
  
- Add a network-scoped alias for the pod, setting the alias for all networks that the pod joins. To set a name only for a specific network, use the alias option as described under the **--network** option.
-@@ -599,6 +641,8 @@ $ podman pod create --network slirp4netns:outbound_addr=127.0.0.1,allow_host_loo
+ Add a network-scoped alias for the pod, setting the alias for all networks that the container joins. To set a
+@@ -672,6 +714,8 @@ $ podman pod create --network slirp4netns:outbound_addr=127.0.0.1,allow_host_loo
  
  $ podman pod create --network slirp4netns:cidr=192.168.0.0/24
  
@@ -213,7 +213,7 @@ index de9a34bfa..e711d6823 100644
  ```
  
 diff --git a/docs/source/markdown/podman-run.1.md b/docs/source/markdown/podman-run.1.md
-index 4566a73d0..8f8b5b4c1 100644
+index 8c889f0a5..0ad667fc2 100644
 --- a/docs/source/markdown/podman-run.1.md
 +++ b/docs/source/markdown/podman-run.1.md
 @@ -734,10 +734,15 @@ Valid _mode_ values are:
@@ -275,8 +275,8 @@ index 4566a73d0..8f8b5b4c1 100644
 +
  #### **--network-alias**=*alias*
  
- Add a network-scoped alias for the container, setting the alias for all networks that the container joins. To set a name only for a specific network, use the alias option as described under the **--network** option.
-@@ -1964,8 +2006,9 @@ In order for users to run rootless, there must be an entry for their username in
+ Add a network-scoped alias for the container, setting the alias for all networks that the container joins. To set a
+@@ -1967,8 +2009,9 @@ In order for users to run rootless, there must be an entry for their username in
  
  Rootless Podman works better if the fuse-overlayfs and slirp4netns packages are installed.
  The **fuse-overlayfs** package provides a userspace overlay storage driver, otherwise users need to use
@@ -288,7 +288,7 @@ index 4566a73d0..8f8b5b4c1 100644
  
  ## ENVIRONMENT
  
-@@ -2012,7 +2055,7 @@ page.
+@@ -2015,7 +2058,7 @@ page.
  NOTE: Use the environment variable `TMPDIR` to change the temporary storage location of downloaded container images. Podman defaults to use `/var/tmp`.
  
  ## SEE ALSO
@@ -511,10 +511,10 @@ index f0d4e9153..2c4b40509 100644
  		portMappings, expose, err := createPortMappings(s, imageData)
  		if err != nil {
 diff --git a/pkg/specgen/generate/pod_create.go b/pkg/specgen/generate/pod_create.go
-index 212d613fe..b50fe3586 100644
+index 4e6362c9b..fa8a01c84 100644
 --- a/pkg/specgen/generate/pod_create.go
 +++ b/pkg/specgen/generate/pod_create.go
-@@ -163,6 +163,12 @@ func MapSpec(p *specgen.PodSpecGenerator) (*specgen.SpecGenerator, error) {
+@@ -200,6 +200,12 @@ func MapSpec(p *specgen.PodSpecGenerator) (*specgen.SpecGenerator, error) {
  			p.InfraContainerSpec.NetworkOptions = p.NetworkOptions
  			p.InfraContainerSpec.NetNS.NSMode = specgen.Slirp
  		}