From 18b17a0bdb7d2ab28d2a6ac7cdc41c47dc68e4547321fa519dbc4662f126bc2e Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Thu, 27 Jul 2017 16:11:06 +0000
Subject: [PATCH] Accepting request 512333 from
 home:jordimassaguerpla:branch:Vc:fix_seccomp_and_dm

- enable deferred removal for sle12sp2 and newer (and openSUSE
  equivalent. fix bsc#1021227

- enable libseccomp on sle12sp2 and newer, 42.2 and newer
  fix bsc#1028638 - docker: conditional filtering not supported on
  libseccomp for sle12

OBS-URL: https://build.opensuse.org/request/show/512333
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=195
---
 docker.changes | 13 +++++++++++++
 docker.spec    | 21 +++++++++++++--------
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/docker.changes b/docker.changes
index d27bda2..4321e44 100644
--- a/docker.changes
+++ b/docker.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Jul 19 18:12:26 UTC 2017 - jmassaguerpla@suse.com
+
+- enable deferred removal for sle12sp2 and newer (and openSUSE
+  equivalent. fix bsc#1021227
+
+-------------------------------------------------------------------
+Wed Jul 19 17:17:04 UTC 2017 - jmassaguerpla@suse.com
+
+- enable libseccomp on sle12sp2 and newer, 42.2 and newer
+  fix bsc#1028638 - docker: conditional filtering not supported on
+  libseccomp for sle12
+
 -------------------------------------------------------------------
 Tue Jul 11 10:50:12 UTC 2017 - jmassaguerpla@suse.com
 
diff --git a/docker.spec b/docker.spec
index 9e05e09..1cea9e5 100644
--- a/docker.spec
+++ b/docker.spec
@@ -65,9 +65,16 @@ BuildRequires:  device-mapper-devel >= 1.2.68
 BuildRequires:  glibc-devel-static
 BuildRequires:  libapparmor-devel
 BuildRequires:  libbtrfs-devel >= 3.8
-# If not leap 42.1 (120100), not sle12sp1 (120100) and not sle12 (1315)
-# enable libseccomp
-%if 0%{?sle_version} != 120100 && 0%{?suse_version} != 1315
+# enable libseccomp for sle >= sle12sp2
+%if 0%{?sle_version} >= 120200
+%define with_libseccomp 1
+%endif
+# enable libseccomp for leap >= 42.2
+%if 0%{?leap_version} >= 420200
+%define with_libseccomp 1
+%endif
+# enable libseccomp for Factory
+%if 0%{?suse_version} > 1320
 %define with_libseccomp 1
 %endif
 %if 0%{?with_libseccomp}
@@ -180,11 +187,9 @@ BUILDTAGS="exclude_graphdriver_aufs apparmor selinux pkcs11"
 %if 0%{?with_libseccomp}
 BUILDTAGS="seccomp $BUILDTAGS"
 %endif
-# Note that these commands do not allow %%elseif.
-# For versions equal to or below SLE12 && openSUSE_13.2 libdevmapper.h is not
-# recent enough to define dm_task_deferred_remove(). (This is not true of
-# SLE12_SP1 but we cannot distinguish it with this macro.)
-%if 0%{?suse_version} <= 1320
+# For SLE12 libdevmapper.h is not recent enough to define
+# dm_task_deferred_remove().
+%if 0%{?sle_version} == 120000
 	BUILDTAGS="libdm_no_deferred_remove $BUILDTAGS"
 %endif