From 83a8c219663d6335784fe7a8dd88f7afc28ec0fea8762f59eb5f543daa9f1be8 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Fri, 6 Apr 2018 18:38:34 +0000
Subject: [PATCH 1/3] Accepting request 594071 from
 home:cyphar:containers:catatonit

- Fix build to correctly build a static binary (which will allow it to work in
  all containers). This was caused by forgetting to include
  'glibc-devel-static'. I've added a check to ensure it doesn't happen by
  accident again.

OBS-URL: https://build.opensuse.org/request/show/594071
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/catatonit?expand=0&rev=6
---
 catatonit-rpmlintrc | 3 +++
 catatonit.changes   | 8 ++++++++
 catatonit.spec      | 6 ++++++
 3 files changed, 17 insertions(+)
 create mode 100644 catatonit-rpmlintrc

diff --git a/catatonit-rpmlintrc b/catatonit-rpmlintrc
new file mode 100644
index 0000000..dbf3036
--- /dev/null
+++ b/catatonit-rpmlintrc
@@ -0,0 +1,3 @@
+# We need catatonit to be statically linked.
+addFilter ("^catatonit.*: W: statically-linked-binary /usr/bin/catatonit")
+addFilter ("^catatonit.*: W: position-independent-executable-suggested /usr/bin/catatonit")
diff --git a/catatonit.changes b/catatonit.changes
index c5eac87..0ec4fc9 100644
--- a/catatonit.changes
+++ b/catatonit.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Apr  6 18:31:08 UTC 2018 - asarai@suse.com
+
+- Fix build to correctly build a static binary (which will allow it to work in
+  all containers). This was caused by forgetting to include
+  'glibc-devel-static'. I've added a check to ensure it doesn't happen by
+  accident again.
+
 -------------------------------------------------------------------
 Tue Apr  3 23:27:27 UTC 2018 - jengelh@inai.de
 
diff --git a/catatonit.spec b/catatonit.spec
index ac1c9f3..03ad4e2 100644
--- a/catatonit.spec
+++ b/catatonit.spec
@@ -28,7 +28,9 @@ Source1:        %{name}-%{version}.tar.xz.asc
 Source2:        %{name}.keyring
 BuildRequires:  autoconf
 BuildRequires:  automake
+BuildRequires:  file
 BuildRequires:  gcc
+BuildRequires:  glibc-devel-static
 BuildRequires:  libtool
 
 %description
@@ -49,6 +51,10 @@ autoreconf -fi
 %configure
 make %{?_smp_mflags}
 
+# Make sure we *always* build a static binary. Otherwise we'll break containers
+# that don't have the necessary shared libs.
+file ./%{name} | grep 'statically linked'
+
 %install
 %make_install
 ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/docker-init

From 1a7ed295d1a9d0a4824c8b9b01e44588876312d0227347800402a10011442619 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Fri, 6 Apr 2018 18:46:08 +0000
Subject: [PATCH 2/3] Accepting request 594075 from
 home:cyphar:containers:catatonit

- Fix build to correctly build a static binary (which will allow it to work in
  all containers). This was caused by forgetting to include
  'glibc-devel-static'. I've added a check to ensure it doesn't happen by
  accident again.
- Add catatonit-rpmlintrc to include filters for "static binary" warnings,
  since this is intentional.

OBS-URL: https://build.opensuse.org/request/show/594075
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/catatonit?expand=0&rev=7
---
 catatonit.changes | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/catatonit.changes b/catatonit.changes
index 0ec4fc9..3e330b9 100644
--- a/catatonit.changes
+++ b/catatonit.changes
@@ -5,6 +5,8 @@ Fri Apr  6 18:31:08 UTC 2018 - asarai@suse.com
   all containers). This was caused by forgetting to include
   'glibc-devel-static'. I've added a check to ensure it doesn't happen by
   accident again.
+- Add catatonit-rpmlintrc to include filters for "static binary" warnings,
+  since this is intentional.
 
 -------------------------------------------------------------------
 Tue Apr  3 23:27:27 UTC 2018 - jengelh@inai.de

From feb48c475fb2ca8b5dd24d21e3a8573b19bef408426bfe933e9cb34f35ec567f Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Fri, 6 Apr 2018 18:51:18 +0000
Subject: [PATCH 3/3] Accepting request 594080 from
 home:cyphar:containers:catatonit

Add rpmlintrc to specfile.

OBS-URL: https://build.opensuse.org/request/show/594080
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/catatonit?expand=0&rev=8
---
 catatonit.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/catatonit.spec b/catatonit.spec
index 03ad4e2..cb1327c 100644
--- a/catatonit.spec
+++ b/catatonit.spec
@@ -26,6 +26,7 @@ Url:            https://github.com/openSUSE/catatonit
 Source0:        %{name}-%{version}.tar.xz
 Source1:        %{name}-%{version}.tar.xz.asc
 Source2:        %{name}.keyring
+Source3:        %{name}-rpmlintrc
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  file