Resolves: #1619411 - python3-podman should require python3-psutil

podman-docker should conflict with moby-engine
require nftables
recommend slirp4netns and fuse-overlayfs (latter only for kernel >= 4.18)

.fmf/version

@@ -1 +0,0 @@
-1

.packit.yaml

@@ -1,166 +0,0 @@
----
-# See the documentation for more information:
-# https://packit.dev/docs/configuration/
-
-downstream_package_name: podman
-upstream_tag_template: v{version}
-
-# These files get synced from upstream to downstream (Fedora / CentOS Stream) on every
-# propose-downstream job. This is done so tests maintained upstream can be run
-# downstream in Zuul CI and Bodhi.
-# Ref: https://packit.dev/docs/configuration#files_to_sync
-files_to_sync:
-  - src: rpm/gating.yaml
-    dest: gating.yaml
-    delete: true
-  - src: plans/
-    dest: plans/
-    delete: true
-    mkpath: true
-  - src: test/tmt/
-    dest: test/tmt/
-    delete: true
-    mkpath: true
-  - src: .fmf/
-    dest: .fmf/
-    delete: true
-  - .packit.yaml
-
-packages:
-  podman-fedora:
-    pkg_tool: fedpkg
-    specfile_path: rpm/podman.spec
-  podman-centos:
-    pkg_tool: centpkg
-    specfile_path: rpm/podman.spec
-  podman-eln:
-    specfile_path: rpm/podman.spec
-
-# Disable automatic merging for Copr builds (and subsequent Testing Farm)
-merge_pr_in_ci: false
-
-srpm_build_deps:
-  - git-archive-all
-  - make
-
-actions:
-  fix-spec-file: "bash .packit-copr-rpm.sh"
-  pre-sync: "bash .packit-rpm-git-commit.sh"
-
-jobs:
-  - job: copr_build
-    trigger: pull_request
-    packages: [podman-fedora]
-    notifications: &packit_generic_failure_notification
-      failure_comment:
-        message: "[NON-BLOCKING] Packit jobs failed. @containers/packit-build please check. Everyone else, feel free to ignore."
-    enable_net: true
-    targets:
-      - fedora-all-x86_64
-      - fedora-all-aarch64
-    # Re-enable these scans if OpenScanHub starts scanning go packages
-    # https://packit.dev/posts/openscanhub-prototype
-    osh_diff_scan_after_copr_build: false
-
-  # Ignore until golang is updated in distro buildroot to go 1.23.3+
-  - job: copr_build
-    trigger: ignore
-    packages: [podman-eln]
-    notifications: *packit_generic_failure_notification
-    enable_net: true
-    targets:
-      fedora-eln-x86_64:
-        additional_repos:
-          - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/x86_64/"
-      fedora-eln-aarch64:
-        additional_repos:
-          - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/aarch64/"
-
-  # Ignore until golang is updated in distro buildroot to go 1.23.3+
-  - job: copr_build
-    trigger: ignore
-    packages: [podman-centos]
-    notifications: *packit_generic_failure_notification
-    enable_net: true
-    targets:
-      - centos-stream-9-x86_64
-      - centos-stream-9-aarch64
-      - centos-stream-10-x86_64
-      - centos-stream-10-aarch64
-
-  # Run on commit to main branch
-  - job: copr_build
-    trigger: commit
-    packages: [podman-fedora]
-    branch: main
-    owner: rhcontainerbot
-    project: podman-next
-    enable_net: true
-
-  # Tests on Fedora
-  - job: tests
-    trigger: pull_request
-    packages: [podman-fedora]
-    notifications: *packit_generic_failure_notification
-    targets:
-      - fedora-all
-    tmt_plan: "/plans/system/*"
-
-  - job: tests
-    identifier: cockpit-revdeps
-    trigger: pull_request
-    packages: [podman-fedora]
-    notifications:
-      failure_comment:
-        message: "Cockpit tests failed for commit {commit_sha}. @martinpitt, @jelly, @mvollmer please check."
-    targets:
-      - fedora-latest-stable
-      - fedora-development
-    tf_extra_params:
-      environments:
-        - artifacts:
-          - type: repository-file
-            id: https://copr.fedorainfracloud.org/coprs/g/cockpit/main-builds/repo/fedora-$releasever/group_cockpit-main-builds-fedora-$releasever.repo
-          tmt:
-            context:
-              revdeps: "yes"
-
-  - job: tests
-    identifier: tmt-revdeps
-    trigger: pull_request
-    packages: [podman-fedora]
-    notifications:
-      failure_comment:
-        message: "tmt tests failed for commit {commit_sha}. @lsm5, @psss, @thrix please check."
-    targets:
-      - fedora-latest
-    fmf_url: https://github.com/teemtee/tmt
-    fmf_path: /plans/friends
-    fmf_ref: main
-    tmt_plan: "/podman"
-
-  - job: propose_downstream
-    trigger: release
-    update_release: false
-    packages: [podman-fedora]
-    dist_git_branches: &fedora_targets
-      - fedora-all
-
-  - job: koji_build
-    trigger: commit
-    packages: [podman-fedora]
-    sidetag_group: podman-releases
-    dist_git_branches: *fedora_targets
-
-  - job: bodhi_update
-    trigger: koji_build
-    packages: [podman-fedora]
-    sidetag_group: podman-releases
-    # Dependencies are not rpm dependencies, but packages that should go in the
-    # same bodhi update
-    # Ref: https://packit.dev/docs/fedora-releases-guide/releasing-multiple-packages
-    dependencies:
-      - buildah
-      - containers-common
-      - skopeo
-    dist_git_branches: *fedora_targets

README.packit

@@ -1,3 +0,0 @@
-This repository is maintained by packit.
-https://packit.dev/
-The file was generated using packit 1.12.0.post1.dev22+gfe66fd850.

f27.patch

@@ -0,0 +1,41 @@
+diff --git a/Makefile b/Makefile
+index bbd00e4..477890a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -236,8 +236,6 @@ install.docker: docker-docs
+ 	install ${SELINUXOPT} -m 644 docs/docker*.1 -t $(MANDIR)/man1
+ 
+ install.systemd:
+-	install ${SELINUXOPT} -m 644 -D contrib/varlink/io.podman.socket ${SYSTEMDDIR}/io.podman.socket
+-	install ${SELINUXOPT} -m 644 -D contrib/varlink/io.podman.service ${SYSTEMDDIR}/io.podman.service
+ 	install ${SELINUXOPT} -m 644 -D contrib/varlink/podman.conf ${TMPFILESDIR}/podman.conf
+ 
+ install.python:
+diff --git a/libpod.conf b/libpod.conf
+index cef5a12..3a363e2 100644
+--- a/libpod.conf
++++ b/libpod.conf
+@@ -30,7 +30,7 @@ conmon_env_vars = [
+ ]
+ 
+ # CGroup Manager - valid values are "systemd" and "cgroupfs"
+-cgroup_manager = "systemd"
++cgroup_manager = "cgroupfs"
+ 
+ # Directory for persistent libpod files (database, etc)
+ # By default, this will be configured relative to where containers/storage
+diff --git a/cmd/podman/libpodruntime/runtime.go b/cmd/podman/libpodruntime/runtime.go
+index 9d1347cc..f1f2b963 100644
+--- a/cmd/podman/libpodruntime/runtime.go
++++ b/cmd/podman/libpodruntime/runtime.go
+@@ -105,6 +105,10 @@ func GetRuntimeWithStorageOpts(c *cli.Context, storageOpts *storage.StoreOptions
+ 
+ 	if c.GlobalIsSet("cgroup-manager") {
+ 		options = append(options, libpod.WithCgroupManager(c.GlobalString("cgroup-manager")))
++	} else {
++		if rootless.IsRootless() {
++			options = append(options, libpod.WithCgroupManager("cgroupfs"))
++		}
+ 	}
+ 
+ 	// TODO flag to set libpod static dir?

gating.yaml

@@ -1,17 +0,0 @@
---- !Policy
-product_versions:
-  - fedora-*
-decision_contexts:
-  - bodhi_update_push_stable
-  - bodhi_update_push_testing
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
-
-# recipients: jnovy, lsm5, santiago
---- !Policy
-product_versions:
-  - rhel-*
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

plans/cockpit-podman.fmf

@@ -1,37 +0,0 @@
-# reverse dependency test for https://github.com/cockpit-project/cockpit-podman/
-# packit should automatically notify the cockpit maintainers on failures.
-# For questions, please contact @martinpitt, @jelly, @mvollmer
-enabled: false
-
-adjust+:
-  when: revdeps == yes
-  enabled: true
-
-discover:
-    how: fmf
-    url: https://github.com/cockpit-project/cockpit-podman
-    ref: "main"
-
-execute:
-    how: tmt
-
-# not relevant for testing podman
-environment:
-    TEST_AUDIT_NO_SELINUX: 1
-    TEST_ALLOW_JOURNAL_MESSAGES: ".*"
-
-# This has to duplicate cockpit-podman's plan structure; see https://github.com/teemtee/tmt/issues/1770
-/podman-system:
-    summary: Run cockpit-podman system tests
-    discover+:
-        test: /test/browser/system
-
-/podman-user:
-    summary: Run cockpit-podman user tests
-    discover+:
-        test: /test/browser/user
-
-/podman-misc:
-    summary: Run other cockpit-podman tests
-    discover+:
-        test: /test/browser/other

plans/system.fmf

@@ -1,50 +0,0 @@
-discover:
-    how: fmf
-
-execute:
-    how: tmt
-
-prepare:
-    - how: shell
-      script: modprobe null_blk nr_devices=1
-      order: 5
-    - when: distro == centos-stream or distro == rhel
-      how: shell
-      script: |
-        dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-$(rpm --eval '%{?rhel}').noarch.rpm
-        dnf -y config-manager --set-enabled epel
-      order: 10
-
-adjust+:
-    - enabled: false
-      when: revdeps == yes
-
-provision:
-    how: artemis
-    hardware:
-        memory: ">= 16 GB"
-        cpu:
-            cores: ">= 4"
-            threads: ">=8"
-        disk:
-            - size: ">= 512 GB"
-
-/local-root:
-    summary: Local rootful tests
-    discover+:
-        filter: 'tag:local & tag:root'
-
-/local-rootless:
-    summary: Local rootless tests
-    discover+:
-        filter: 'tag:local & tag:rootless'
-
-/remote-root:
-    summary: Remote rootful tests
-    discover+:
-        filter: 'tag:remote & tag:root'
-
-/remote-rootless:
-    summary: Remote rootless tests
-    discover+:
-        filter: 'tag:remote & tag:rootless'

plans/tmt.fmf

@@ -1,21 +0,0 @@
-summary: Run tmt container provision test (downstream only)
-
-enabled: false
-adjust+:
-    - enabled: true
-      when: initiator != packit and distro != rhel
-
-discover:
-    how: fmf
-    filter: 'tag:tmt & tag:downstream'
-
-execute:
-    how: tmt
-
-prepare:
-    - when: distro == centos-stream or distro == rhel
-      how: shell
-      script: |
-        dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-$(rpm --eval '%{?rhel}').noarch.rpm
-        dnf -y config-manager --set-enabled epel
-      order: 10

plans/toolbox.fmf

@@ -1,29 +0,0 @@
-summary: Run toolbox tests (downstream only)
-
-enabled: false
-adjust+:
-    - enabled: true
-      when: initiator != packit and distro == fedora
-
-provision:
-    how: artemis
-    hardware:
-        memory: ">= 16 GB"
-        cpu:
-            cores: ">= 4"
-            threads: ">=8"
-        disk:
-            - size: ">= 512 GB"
-
-prepare:
-    - name: packages
-      how: install
-      package: [toolbox-tests]
-
-discover:
-    how: fmf
-    url: https://src.fedoraproject.org/rpms/toolbox
-    ref: "rawhide"
-
-execute:
-    how: tmt

sources

@@ -1 +1 @@
-SHA512 (v5.7.1.tar.gz) = 81fd4c27ff1d16dcb85229d4e4fd2cb06943ddfe966b5324fa8a8a957b2d2ec2aed7c5da05d6c009148f53b76545b27b0cba506622c8861f70bf7cad6c214a08
+SHA512 (libpod-3d55721.tar.gz) = 78366d0f6cb63d83bfbd49dc59b9206494eef9aa72d8a8d7e937f875bc05fb245d3ff8ae3ca6b7f6397d8ee094b5e48a37c750dfb9278033d204fda769aa7420

test/tmt/system.fmf

@@ -1,51 +0,0 @@
-require:
-    - podman-tests
-    - psmisc
-
-environment:
-    # PODMAN_TESTING envvar is set in system.sh
-    PODMAN: /usr/bin/podman
-    QUADLET: /usr/libexec/podman/quadlet
-    ROOTLESS_USER: "fedora"
-adjust+:
-    - when: distro == centos-stream
-      environment+:
-        ROOTLESS_USER: "ec2-user"
-    - when: distro == rhel
-      environment+:
-        ROOTLESS_USER: "cloud-user"
-    - when: initiator != "packit"
-      environment+:
-        RELEASE_TESTING: true
-
-/local-root:
-    tag: [ local, root ]
-    summary: local rootful test
-    test: bash ./system.sh
-    duration: 30m
-
-/local-rootless:
-    tag: [ local, rootless ]
-    summary: rootless test
-    test: bash ./system.sh rootless
-    duration: 30m
-
-/remote-root:
-    tag: [ remote, root ]
-    summary: remote rootful test
-    test: bash ./system.sh
-    duration: 30m
-    environment+:
-        PODMAN: /usr/bin/podman-remote
-    require+:
-        - podman-remote
-
-/remote-rootless:
-    tag: [ remote, rootless ]
-    summary: remote rootless test
-    test: bash ./system.sh rootless
-    duration: 30m
-    environment+:
-        PODMAN: /usr/bin/podman-remote
-    require+:
-        - podman-remote

test/tmt/system.sh

@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-
-set -exo pipefail
-
-uname -r
-
-loginctl enable-linger "$ROOTLESS_USER"
-
-rpm -q \
-    aardvark-dns \
-    buildah \
-    conmon \
-    container-selinux \
-    containers-common \
-    criu \
-    crun \
-    netavark \
-    passt \
-    podman \
-    podman-tests \
-    skopeo \
-    slirp4netns \
-    systemd
-
-export system_service_cmd="/usr/bin/podman system service --timeout=0 &"
-export test_cmd="whoami && cd /usr/share/podman/test/system && PODMAN_TESTING=/usr/bin/podman-testing bats ."
-
-if [[ -z $1 ]]; then
-    if [[ $PODMAN == "/usr/bin/podman-remote" ]]; then
-        eval "$system_service_cmd"
-    fi
-    eval "$test_cmd"
-elif [[ $1 == "rootless" ]]; then
-    if [[ $PODMAN == "/usr/bin/podman-remote" ]]; then
-        su - "$ROOTLESS_USER" -c "eval $system_service_cmd"
-    fi
-    su - "$ROOTLESS_USER" -c "eval $test_cmd"
-fi
-
-# Kill all podman processes for remote tests
-if [[ $PODMAN == "/usr/bin/podman-remote" ]]; then
-    killall -q podman
-fi
-exit 0

test/tmt/tmt.fmf

@@ -1,13 +0,0 @@
-enabled: false
-adjust:
-    enabled: true
-    when: initiator != packit && distro != rhel
-summary: Make sure that TMT container provision works
-tag: [downstream]
-require:
-  - tmt+provision-container
-test:
-    tmt run --verbose --remove
-        provision --how container --image fedora
-        login --command 'cat /etc/os-release'
-        finish