Merge branch 'main' into 2.0

Author: jslobodzian

SPECS/buildah/buildah.signatures.json renamed to SPECS-EXTENDED/buildah/buildah.signatures.json

@@ -1,51 +1,74 @@
+Vendor:         Microsoft Corporation
+Distribution:   Mariner
+%global with_bundled 1
+
+
 %global with_debug 1
+
+
+
+
 %if 0%{?with_debug}
 %global _find_debuginfo_dwz_opts %{nil}
 %global _dwz_low_mem_die_limit 0
 %else
 %global debug_package   %{nil}
 %endif
+
 %global provider github
 %global provider_tld com
 %global project containers
 %global repo buildah
 # https://github.com/containers/buildah
 %global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
 %global git0 https://%{import_path}
+
 # Used for comparing with latest upstream tag
 # to decide whether to autobuild (non-rawhide only)
 %define built_tag v1.18.0
 %define built_tag_strip %(b=%{built_tag}; echo ${b:1})
-Summary:        A command line tool used for creating OCI Images
-Name:           %{repo}
-Version:        1.18.0
-Release:        8%{?dist}
-License:        Apache-2.0
-Vendor:         Microsoft Corporation
-Distribution:   Mariner
-URL:            https://%{name}.io
-Source:         https://%{import_path}/archive/%{built_tag}.tar.gz#/%{name}-%{version}.tar.gz
-
-Patch0:         CVE-2022-27651.patch
-
-BuildRequires:  btrfs-progs-devel
-BuildRequires:  device-mapper-devel
-BuildRequires:  git
-BuildRequires:  glib2-devel
-BuildRequires:  glibc-static >= 2.35-3%{?dist}
-BuildRequires:  go-md2man
-BuildRequires:  go-rpm-macros
-BuildRequires:  golang
-BuildRequires:  gpgme-devel
-BuildRequires:  libassuan-devel
-BuildRequires:  libseccomp-static
-BuildRequires:  make
-BuildRequires:  ostree-devel
-Requires:       libcontainers-common
-Requires:       libseccomp >= 2.4.1-0
-Recommends:     container-selinux
-Recommends:     fuse-overlayfs
-Recommends:     slirp4netns >= 0.3-0
+%define download_url https://%{import_path}/archive/%{built_tag}.tar.gz
+
+Name: %{repo}
+Version: 1.18.0
+Release: 6%{?dist}
+Summary: A command line tool used for creating OCI Images
+License: ASL 2.0
+URL: https://%{name}.io
+Source: %{download_url}#/%{name}-%{version}.tar.gz
+BuildRequires: device-mapper-devel
+BuildRequires: golang
+BuildRequires: git
+BuildRequires: glib2-devel
+BuildRequires: glibc-static >= 2.35-3%{?dist}
+BuildRequires: go-md2man
+BuildRequires: go-rpm-macros
+BuildRequires: gpgme-devel
+BuildRequires: libassuan-devel
+BuildRequires: make
+Requires: containers-common
+# No ostree for centos 7
+
+BuildRequires: ostree-devel
+
+# No btrfs for centos 8
+
+BuildRequires: btrfs-progs-devel
+
+
+Requires: crun >= 0.10-1
+BuildRequires: libseccomp-static
+Recommends: container-selinux
+Requires: libseccomp >= 2.4.1-0
+Recommends: slirp4netns >= 0.3-0
+Recommends: fuse-overlayfs
+
+
+
+
+
+
+
 
 %description
 The %{name} package provides a command line tool which can be used to
@@ -56,8 +79,25 @@ or
 * save container's root file system layer to create a new image
 * delete a working container or an image
 
+%package tests
+Summary: Tests for %{name}
+
+Requires: %{name} = %{version}-%{release}
+Requires: bats
+Requires: bzip2
+Requires: podman
+Requires: golang
+Requires: jq
+Requires: httpd-tools
+Requires: openssl
+
+%description tests
+%{summary}
+
+This package contains system tests for %{name}
+
 %prep
-%autosetup -p1 -Sgit -n %{name}-%{built_tag_strip}
+%autosetup -Sgit -n %{name}-%{built_tag_strip}
 sed -i 's/GOMD2MAN =/GOMD2MAN ?=/' docs/Makefile
 sed -i '/docs install/d' Makefile
 
@@ -72,14 +112,25 @@ mv vendor src
 
 export GOPATH=$(pwd)/_build:$(pwd)
 export BUILDTAGS='seccomp selinux'
+%if 0%{?centos} >= 8
+export BUILDTAGS+=' exclude_graphdriver_btrfs'
+%endif
 %gobuild -o bin/%{name} %{import_path}/cmd/%{name}
-GOMD2MAN=go-md2man make -C docs
+%gobuild -o imgtype %{import_path}/tests/imgtype
+GOMD2MAN=go-md2man %{__make} -C docs
 
 %install
 export GOPATH=$(pwd)/_build:$(pwd):%{gopath}
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
 
+install -d -p %{buildroot}/%{_datadir}/%{name}/test/system
+cp -pav tests/. %{buildroot}/%{_datadir}/%{name}/test/system
+cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
+
+#define license tag if not already defined
+%{!?_licensedir:%global license %doc}
+
 %files
 %license LICENSE
 %doc README.md
@@ -89,14 +140,12 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
 %dir %{_datadir}/bash-completion/completions
 %{_datadir}/bash-completion/completions/%{name}
 
-%changelog
-* Fri Nov 18 2022 Sam Meluch <[email protected]> - 1.18.0-8
-- Add Patch for CVE-2022-27651
-
-* Tue Nov 01 2022 Ameya Usgaonkar <[email protected]> - 1.18.0-7
-- Move to core packages
-- Remove tests package
+%files tests
+%license LICENSE
+%{_bindir}/%{name}-imgtype
+%{_datadir}/%{name}/test
 
+%changelog
 * Tue Nov 01 2022 Olivia Crain <[email protected]> - 1.18.0-6
 - Bump release to rebuild with go 1.18.8
 

SPECS/buildah/buildah.spec renamed to SPECS-EXTENDED/buildah/buildah.spec

@@ -1,21 +1,23 @@
-Summary:        A signal-forwarding process manager for containers
-Name:           catatonit
-Version:        0.1.7
-Release:        7%{?dist}
-License:        GPLv3+
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
-URL:            https://github.com/openSUSE/catatonit
-Source0:        %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  file
-BuildRequires:  gcc
-BuildRequires:  git
-BuildRequires:  glibc-static >= 2.35-3%{?dist}
-BuildRequires:  libtool
-BuildRequires:  make
-Provides:       podman-%{name} = %{version}-%{release}
+
+Name: catatonit
+Version: 0.1.7
+Release: 6%{?dist}
+Summary: A signal-forwarding process manager for containers
+License: GPLv3+
+URL: https://github.com/openSUSE/catatonit
+Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: file
+BuildRequires: gcc
+BuildRequires: git
+BuildRequires: glibc-static >= 2.35-3%{?dist}
+BuildRequires: libtool
+BuildRequires: make
+
+Provides: podman-%{name} = %{version}-%{release}
 
 %description
 Catatonit is a /sbin/init program for use within containers. It
@@ -34,7 +36,7 @@ sed -i '$d' configure.ac
 %build
 autoreconf -fi
 %configure
-%make_build
+%{__make} %{?_smp_mflags}
 
 # Make sure we *always* build a static binary. Otherwise we'll break containers
 # that don't have the necessary shared libs.
@@ -59,9 +61,6 @@ ln -s %{_libexecdir}/%{name}/%{name} %{buildroot}%{_libexecdir}/podman/%{name}
 %{_libexecdir}/podman/%{name}
 
 %changelog
-* Tue Nov 01 2022 Ameya Usgaonkar <[email protected]> - 0.1.7-7
-- Move to core packages
-
 * Tue Sep 13 2022 Andy Caldwell <[email protected]> - 0.1.7-6
 - Rebuilt for glibc-static 2.35-3
 

SPECS/catatonit/catatonit.signatures.json renamed to SPECS-EXTENDED/catatonit/catatonit.signatures.json

@@ -1,70 +1,76 @@
 %global with_debug 1
+
 %if 0%{?with_debug}
 %global _find_debuginfo_dwz_opts %{nil}
 %global _dwz_low_mem_die_limit 0
 %else
 %global debug_package   %{nil}
 %endif
+
 %global provider github
 %global provider_tld com
 %global project containernetworking
 %global repo plugins
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path %{provider_prefix}
 %global git0 https://%{import_path}
+
 # Used for comparing with latest upstream tag
 # to decide whether to autobuild (non-rawhide only)
 %define built_tag v1.1.1
 %define built_tag_strip %(b=%{built_tag}; echo ${b:1})
 %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
 %define download_url %{git0}/archive/%{built_tag}.tar.gz
-Summary:        Libraries for writing CNI plugin
-Name:           %{project}-%{repo}
-Version:        1.1.1
-Release:        4%{?dist}
-License:        Apache-2.0 AND BSD AND MIT
-Vendor:         Microsoft Corporation
-Distribution:   Mariner
-URL:            %{git0}
-Source0:        %{download_url}#/%{name}-%{version}.tar.gz
-BuildRequires:  git
-BuildRequires:  go-md2man
-BuildRequires:  go-rpm-macros
+
+Name:          %{project}-%{repo}
+Version:       1.1.1
+Release:       3%{?dist}
+Summary:       Libraries for writing CNI plugin
+License:       ASL 2.0 and BSD and MIT
+Vendor:        Microsoft Corporation
+Distribution:  Mariner
+URL:           %{git0}
+Source0: %{download_url}#/%{name}-%{version}.tar.gz
 # If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires:  golang
-BuildRequires:  systemd-devel
-Requires:       systemd
-Obsoletes:      %{project}-cni < 0.7.1-2
-Provides:       %{project}-cni = %{version}-%{release}
-Provides:       kubernetes-cni
-Provides:       container-network-stack = 1
+BuildRequires: golang
+BuildRequires: git
+BuildRequires: go-md2man
+BuildRequires: go-rpm-macros
+BuildRequires: systemd-devel
+Requires:      systemd
+
+
+Obsoletes:     %{project}-cni < 0.7.1-2
+Provides:      %{project}-cni = %{version}-%{release}
+Provides:      kubernetes-cni
+Provides:      container-network-stack = 1
 # vendored libraries
 # awk '{print "Provides: bundled(golang("$1")) = "$2}' go.mod | sort | uniq | sed -e 's/-/_/g' -e '/bundled(golang())/d' -e '/bundled(golang(go\|module\|replace\|require))/d'
-Provides:       bundled(golang(github.com/Microsoft/go_winio)) = v0.4.17
-Provides:       bundled(golang(github.com/Microsoft/hcsshim)) = v0.8.20
-Provides:       bundled(golang(github.com/alexflint/go_filemutex)) = v1.1.0
-Provides:       bundled(golang(github.com/buger/jsonparser)) = v1.1.1
-Provides:       bundled(golang(github.com/containerd/cgroups)) = v1.0.1
-Provides:       bundled(golang(github.com/containernetworking/cni)) = v1.0.1
-Provides:       bundled(golang(github.com/coreos/go_iptables)) = v0.6.0
-Provides:       bundled(golang(github.com/coreos/go_systemd/v22)) = v22.3.2
-Provides:       bundled(golang(github.com/d2g/dhcp4)) = v0.0.0_20170904100407_a1d1b6c41b1c
-Provides:       bundled(golang(github.com/d2g/dhcp4client)) = v1.0.0
-Provides:       bundled(golang(github.com/d2g/dhcp4server)) = v0.0.0_20181031114812_7d4a0a7f59a5
-Provides:       bundled(golang(github.com/fsnotify/fsnotify)) = v1.4.9
-Provides:       bundled(golang(github.com/godbus/dbus/v5)) = v5.0.4
-Provides:       bundled(golang(github.com/gogo/protobuf)) = v1.3.2
-Provides:       bundled(golang(github.com/golang/groupcache)) = v0.0.0_20200121045136_8c9f03a8e57e
-Provides:       bundled(golang(github.com/mattn/go_shellwords)) = v1.0.12
-Provides:       bundled(golang(github.com/networkplumbing/go_nft)) = v0.2.0
-Provides:       bundled(golang(github.com/nxadm/tail)) = v1.4.8
-Provides:       bundled(golang(github.com/onsi/ginkgo)) = v1.16.4
-Provides:       bundled(golang(github.com/onsi/gomega)) = v1.15.0
-Provides:       bundled(golang(github.com/pkg/errors)) = v0.9.1
-Provides:       bundled(golang(github.com/safchain/ethtool)) = v0.0.0_20210803160452_9aa261dae9b1
-Provides:       bundled(golang(github.com/sirupsen/logrus)) = v1.8.1
-Provides:       bundled(golang(github.com/vishvananda/netlink)) = v1.1.1_0.20210330154013_f5de75959ad5
-Provides:       bundled(golang(github.com/vishvananda/netns)) = v0.0.0_20210104183010_2eb08e3e575f
+Provides:      bundled(golang(github.com/Microsoft/go_winio)) = v0.4.17
+Provides:      bundled(golang(github.com/Microsoft/hcsshim)) = v0.8.20
+Provides:      bundled(golang(github.com/alexflint/go_filemutex)) = v1.1.0
+Provides:      bundled(golang(github.com/buger/jsonparser)) = v1.1.1
+Provides:      bundled(golang(github.com/containerd/cgroups)) = v1.0.1
+Provides:      bundled(golang(github.com/containernetworking/cni)) = v1.0.1
+Provides:      bundled(golang(github.com/coreos/go_iptables)) = v0.6.0
+Provides:      bundled(golang(github.com/coreos/go_systemd/v22)) = v22.3.2
+Provides:      bundled(golang(github.com/d2g/dhcp4)) = v0.0.0_20170904100407_a1d1b6c41b1c
+Provides:      bundled(golang(github.com/d2g/dhcp4client)) = v1.0.0
+Provides:      bundled(golang(github.com/d2g/dhcp4server)) = v0.0.0_20181031114812_7d4a0a7f59a5
+Provides:      bundled(golang(github.com/fsnotify/fsnotify)) = v1.4.9
+Provides:      bundled(golang(github.com/godbus/dbus/v5)) = v5.0.4
+Provides:      bundled(golang(github.com/gogo/protobuf)) = v1.3.2
+Provides:      bundled(golang(github.com/golang/groupcache)) = v0.0.0_20200121045136_8c9f03a8e57e
+Provides:      bundled(golang(github.com/mattn/go_shellwords)) = v1.0.12
+Provides:      bundled(golang(github.com/networkplumbing/go_nft)) = v0.2.0
+Provides:      bundled(golang(github.com/nxadm/tail)) = v1.4.8
+Provides:      bundled(golang(github.com/onsi/ginkgo)) = v1.16.4
+Provides:      bundled(golang(github.com/onsi/gomega)) = v1.15.0
+Provides:      bundled(golang(github.com/pkg/errors)) = v0.9.1
+Provides:      bundled(golang(github.com/safchain/ethtool)) = v0.0.0_20210803160452_9aa261dae9b1
+Provides:      bundled(golang(github.com/sirupsen/logrus)) = v1.8.1
+Provides:      bundled(golang(github.com/vishvananda/netlink)) = v1.1.1_0.20210330154013_f5de75959ad5
+Provides:      bundled(golang(github.com/vishvananda/netns)) = v0.0.0_20210104183010_2eb08e3e575f
 
 %description
 The CNI (Container Network Interface) project consists of a specification
@@ -73,6 +79,7 @@ containers, along with a number of supported plugins. CNI concerns itself
 only with network connectivity of containers and removing allocated resources
 when the container is deleted.
 
+
 %prep
 %autosetup -Sgit -n %{repo}-%{built_tag_strip}
 rm -rf plugins/main/windows
@@ -110,6 +117,9 @@ install -dp %{buildroot}%{_unitdir}
 install -p plugins/ipam/dhcp/systemd/cni-dhcp.service %{buildroot}%{_unitdir}
 install -p plugins/ipam/dhcp/systemd/cni-dhcp.socket %{buildroot}%{_unitdir}
 
+#define license tag if not already defined
+%{!?_licensedir:%global license %doc}
+
 %files
 %license LICENSE
 %doc *.md
@@ -119,9 +129,6 @@ install -p plugins/ipam/dhcp/systemd/cni-dhcp.socket %{buildroot}%{_unitdir}
 %{_unitdir}/cni-dhcp.socket
 
 %changelog
-* Tue Nov 01 2022 Ameya Usgaonkar <[email protected]> - 1.1.1-4
-- Move to core packages
-
 * Tue Nov 01 2022 Olivia Crain <[email protected]> - 1.1.1-3
 - Bump release to rebuild with go 1.18.8