From 6f4e3beedc2a78753f1265c848e5cb6d21ebdcb4 Mon Sep 17 00:00:00 2001
From: Valentin Rothberg <rothberg@redhat.com>
Date: Tue, 24 Sep 2019 12:17:54 +0200
Subject: [PATCH 1/2] bump catatonit to v0.1.4

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
---
 hack/install_catatonit.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hack/install_catatonit.sh b/hack/install_catatonit.sh
index e5532a200a..1ba399d197 100755
--- a/hack/install_catatonit.sh
+++ b/hack/install_catatonit.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 BASE_PATH="/usr/libexec/podman"
 CATATONIT_PATH="${BASE_PATH}/catatonit"
-CATATONIT_VERSION="v0.1.3"
+CATATONIT_VERSION="v0.1.4"
 
 if [ -f $CATATONIT_PATH ]; then
 	echo "skipping ... catatonit is already installed"

From 80f6af7766a1b47715a0cd8d1fab567750dcdc31 Mon Sep 17 00:00:00 2001
From: Valentin Rothberg <rothberg@redhat.com>
Date: Tue, 24 Sep 2019 12:36:50 +0200
Subject: [PATCH 2/2] catatonit: clone and build

Instead of unconditionally pulling the x86 binary, clone the repository
and build the binary to make it independent of the architecture.

Fixes: #2699
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
---
 Dockerfile                            |  1 +
 Dockerfile.centos                     |  4 ++++
 Dockerfile.fedora                     |  4 ++++
 contrib/cirrus/packer/fedora_setup.sh |  2 ++
 contrib/cirrus/packer/ubuntu_setup.sh |  1 +
 hack/install_catatonit.sh             | 17 +++++++++++++----
 6 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1f51cd8749..3c65bf5a86 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,7 @@ RUN apt-get update && apt-get install -y \
     build-essential \
     curl \
     e2fslibs-dev \
+    file \
     gawk \
     gettext \
     go-md2man \
diff --git a/Dockerfile.centos b/Dockerfile.centos
index 513c4bdfd0..9af7ef7f19 100644
--- a/Dockerfile.centos
+++ b/Dockerfile.centos
@@ -2,9 +2,12 @@ FROM registry.centos.org/centos/centos:7
 
 RUN yum -y install btrfs-progs-devel \
               atomic-registries \
+              autoconf \
+              automake \
               bzip2 \
               device-mapper-devel \
               findutils \
+              file \
               git \
               glibc-static \
               glib2-devel \
@@ -15,6 +18,7 @@ RUN yum -y install btrfs-progs-devel \
               libassuan-devel \
               libseccomp-devel \
               libselinux-devel \
+              libtool \
               containers-common \
               runc \
               make \
diff --git a/Dockerfile.fedora b/Dockerfile.fedora
index 9b1568b0bf..8769b5c189 100644
--- a/Dockerfile.fedora
+++ b/Dockerfile.fedora
@@ -2,8 +2,11 @@ FROM registry.fedoraproject.org/fedora:30
 
 RUN dnf -y install btrfs-progs-devel \
               atomic-registries \
+              autoconf \
+              automake \
               bzip2 \
               device-mapper-devel \
+              file \
               findutils \
               git \
               glib2-devel \
@@ -15,6 +18,7 @@ RUN dnf -y install btrfs-progs-devel \
               libassuan-devel \
               libseccomp-devel \
               libselinux-devel \
+              libtool \
               containers-common \
               runc \
               make \
diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh
index 6709eecaf3..d948a0afa2 100644
--- a/contrib/cirrus/packer/fedora_setup.sh
+++ b/contrib/cirrus/packer/fedora_setup.sh
@@ -36,6 +36,7 @@ ooe.sh sudo dnf install -y \
     criu \
     device-mapper-devel \
     emacs-nox \
+    file \
     findutils \
     fuse3 \
     fuse3-devel \
@@ -59,6 +60,7 @@ ooe.sh sudo dnf install -y \
     libseccomp \
     libseccomp-devel \
     libselinux-devel \
+    libtool \
     libvarlink-util \
     lsof \
     make \
diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh
index da7d457a50..d20e7e005e 100644
--- a/contrib/cirrus/packer/ubuntu_setup.sh
+++ b/contrib/cirrus/packer/ubuntu_setup.sh
@@ -52,6 +52,7 @@ $BIGTO $SUDOAPTGET install \
     curl \
     e2fslibs-dev \
     emacs-nox \
+    file \
     gawk \
     gcc \
     gettext \
diff --git a/hack/install_catatonit.sh b/hack/install_catatonit.sh
index 1ba399d197..7fd7592a90 100755
--- a/hack/install_catatonit.sh
+++ b/hack/install_catatonit.sh
@@ -6,10 +6,19 @@ CATATONIT_VERSION="v0.1.4"
 if [ -f $CATATONIT_PATH ]; then
 	echo "skipping ... catatonit is already installed"
 else
-	echo "downloading catatonit to $CATATONIT_PATH"
-	curl -o catatonit -L https://github.com/openSUSE/catatonit/releases/download/$CATATONIT_VERSION/catatonit.x86_64
-	chmod +x catatonit
+	echo "installing catatonit to $CATATONIT_PATH"
+	buildDir=$(mktemp -d)
+	git clone https://github.com/openSUSE/catatonit.git $buildDir
+
+	pushd $buildDir
+	echo `pwd`
+	git reset --hard ${CATATONIT_VERSION}
+	autoreconf -fi
+	./configure
+	make
 	install ${SELINUXOPT} -d -m 755 $BASE_PATH
 	install ${SELINUXOPT} -m 755 catatonit $CATATONIT_PATH
-	rm catatonit
+	popd
+
+	rm -rf $buildDir
 fi