From 68a3dd860b7f391401d5a433aabf060bb2947e08 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Fri, 28 Sep 2018 11:09:00 -0400
Subject: [PATCH] podman-1:0.9.4-3.dev.gite7e81e6

- built libpod commit e7e81e6
- built conmon from cri-o commit 2cbe48b

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 .gitignore  |  2 ++
 podman.spec | 37 ++++++++++++++++++++++++++++++++++---
 sources     |  3 ++-
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5f19a3e..b6e9b73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -102,3 +102,5 @@
 /libpod-28a2bf8.tar.gz
 /libpod-c3a0874.tar.gz
 /libpod-af791f3.tar.gz
+/cri-o-2cbe48b.tar.gz
+/libpod-e7e81e6.tar.gz
diff --git a/podman.spec b/podman.spec
index e0eefec..7b8400a 100644
--- a/podman.spec
+++ b/podman.spec
@@ -26,9 +26,14 @@
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path %{provider_prefix}
 %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit0 af791f340cfc3f8134e1fe0e3b0a6d3597706277
+%global commit0 e7e81e6448dc4ad1d53ef51e8175d717d18a8197
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
+%global import_path_conmon github.com/kubernetes-sigs/cri-o
+%global git_conmon https://%{import_path_conmon}
+%global commit_conmon 2cbe48b8907849fc3982615fbadb0f584200c5b5
+%global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7})
+
 Name: podman
 # Version string is wrong but only written as such to avoid epoch bumps
 # Will be fixed once upstream moves to 0.8.11-dev
@@ -36,11 +41,12 @@ Name: podman
 Epoch: 1
 %endif
 Version: 0.9.4
-Release: 2.dev.git%{shortcommit0}%{?dist}
+Release: 3.dev.git%{shortcommit0}%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0
 URL: https://podman.io/
 Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz
+Source1: %{git_conmon}/archive/%{commit_conmon}/cri-o-%{shortcommit_conmon}.tar.gz
 # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
 #ExclusiveArch:  %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 aarch64 %%{arm}}
 ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64
@@ -60,7 +66,7 @@ BuildRequires: libselinux-devel
 BuildRequires: ostree-devel
 BuildRequires: pkgconfig
 BuildRequires: make
-Requires: runc >= 2:1.0.0-55
+Requires: runc
 Requires: containers-common
 Requires: containernetworking-plugins >= 0.7.3-2
 Requires: iptables
@@ -394,6 +400,9 @@ sed -i 's/0.0.0/%{version}/' contrib/python/%{name}/setup.py
 sed -i 's/0.0.0/%{version}/' contrib/python/py%{name}/setup.py
 mv pkg/hooks/README.md pkg/hooks/README-hooks.md
 
+# untar cri-o
+tar zxf %{SOURCE1}
+
 %build
 mkdir _build
 pushd _build
@@ -406,6 +415,19 @@ export BUILDTAGS="varlink selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/
 %gogenerate ./cmd/%{name}/varlink/...
 %gobuild -o bin/%{name} %{import_path}/cmd/%{name}
 
+# build conmon
+pushd cri-o-%{commit_conmon}
+mkdir _output
+pushd _output
+mkdir -p src/%{provider}.%{provider_tld}/{kubernetes-sigs,opencontainers}
+ln -s $(dirs +1 -l) src/%{import_path_conmon}
+popd
+ln -s vendor src
+export GOPATH=$(pwd)/_output:$(pwd):%{gopath}
+export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) containers_image_ostree_stub"
+BUILDTAGS=$BUILDTAGS make -C conmon
+popd
+
 %if %{with varlink}
 #install python-podman
 pushd contrib/python/podman
@@ -436,6 +458,10 @@ install -dp %{buildroot}%{_unitdir}
 install -dp %{buildroot}%{_datadir}/containers
 install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers
 
+# install conmon
+install -dp %{buildroot}%{_libexecdir}/%{name}
+install -p -m 755 cri-o-%{commit_conmon}/bin/conmon %{buildroot}%{_libexecdir}/%{name}
+
 # source codes for building projects
 %if 0%{?with_devel}
 install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
@@ -510,6 +536,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_mandir}/man1/podman*.1*
 %{_mandir}/man5/*.5*
 %{_datadir}/bash-completion/completions/*
+%{_libexecdir}/%{name}/conmon
 %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist
 %{_datadir}/containers/%{repo}.conf
 %{_unitdir}/io.%{name}.service
@@ -551,6 +578,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %endif
 
 %changelog
+* Fri Sep 28 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1:0.9.4-3.dev.gite7e81e6
+- built libpod commit e7e81e6
+- built conmon from cri-o commit 2cbe48b
+
 * Tue Sep 25 2018 Dan Walsh <dwalsh@redhat.com> - 1:0.9.4-2.dev.gitaf791f3
 - Fix required version of runc
 
diff --git a/sources b/sources
index 0f5882f..35106e4 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (libpod-af791f3.tar.gz) = 888e7869ca3620c909ddc0065ff8e66861bc52fba04ed77bc60973a4e1277520cc6a57fd05f48ccd9b240638f1a52dfcedf96495bc753f9004270ba9ab9e4d3a
+SHA512 (cri-o-2cbe48b.tar.gz) = e22110140109ecc86c6fb636808070f4728a3b550a4cd748b756410b836650b20060c805c66c56f9c517c3e8cca609c1d4e4a0bd3aa989ae5f940266022351f9
+SHA512 (libpod-e7e81e6.tar.gz) = 18c38d1952d1cd519071c4ae0130139404a5198c055f66b6c8228fa5e9a27a39631b09771a4310bc4686877be5f0e8623bcc04903e357771185e5ab52a431c3e