Accepting request 760525 from home:gary_lin:branches:security

- Amend swtpm-adjust-seccomp-path.patch to add the missing seccomp paths
- Adjust the conditional check of net-tools-deprecated for SLE15 and SLE15-SP1

OBS-URL: https://build.opensuse.org/request/show/760525
OBS-URL: https://build.opensuse.org/package/show/security/swtpm?expand=0&rev=2

swtpm-adjust-seccomp-path.patch

@@ -9,32 +9,25 @@ Signed-off-by: Gary Lin <glin@suse.com>
  src/swtpm/swtpm_chardev.c | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/src/swtpm/swtpm.c b/src/swtpm/swtpm.c
-index 3ecbb7b..7f1010f 100644
---- a/src/swtpm/swtpm.c
-+++ b/src/swtpm/swtpm.c
-@@ -51,7 +51,7 @@
- #include <sys/socket.h>
+Index: swtpm-0.2.0/src/swtpm/Makefile.am
+===================================================================
+--- swtpm-0.2.0.orig/src/swtpm/Makefile.am
++++ swtpm-0.2.0/src/swtpm/Makefile.am
+@@ -94,6 +94,7 @@ swtpm_CFLAGS = \
+ 	$(HARDENING_CFLAGS) \
+ 	$(GLIB_CFLAGS) \
+ 	$(LIBFUSE_CFLAGS) \
++	$(LIBSECCOMP_CFLAGS) \
+ 	-DHAVE_SWTPM_CUSE_MAIN
  
- #ifdef WITH_SECCOMP
--# include <seccomp.h>
-+# include <libseccomp/seccomp.h>
- #endif
+ swtpm_LDADD = \
+@@ -101,7 +102,8 @@ swtpm_LDADD = \
+ 	$(LIBFUSE_LIBS) \
+ 	$(GLIB_LIBS) \
+ 	$(GTHREAD_LIBS) \
+-	$(LIBTPMS_LIBS)
++	$(LIBTPMS_LIBS) \
++	$(LIBSECCOMP_LIBS)
  
- #include <libtpms/tpm_error.h>
-diff --git a/src/swtpm/swtpm_chardev.c b/src/swtpm/swtpm_chardev.c
-index 6278621..c3d0a9f 100644
---- a/src/swtpm/swtpm_chardev.c
-+++ b/src/swtpm/swtpm_chardev.c
-@@ -51,7 +51,7 @@
- #include <sys/ioctl.h>
+ swtpm_cuse_DEPENDENCIES = $(privlib_LTLIBRARIES)
  
- #ifdef WITH_SECCOMP
--# include <seccomp.h>
-+# include <libseccomp/seccomp.h>
- #endif
- 
- #include <libtpms/tpm_error.h>
--- 
-2.22.0
-

swtpm.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jan  3 01:52:45 UTC 2020 - Gary Ching-Pang Lin <glin@suse.com>
+
+- Amend swtpm-adjust-seccomp-path.patch to add the missing seccomp
+  paths
+- Adjust the conditional check of net-tools-deprecated for SLE15
+  and SLE15-SP1
+
 -------------------------------------------------------------------
 Thu Sep  5 08:00:27 UTC 2019 - Gary Ching-Pang Lin <glin@suse.com>
 

swtpm.spec

@@ -41,12 +41,12 @@ BuildRequires:  libtpms-devel
 BuildRequires:  python3-Twisted
 BuildRequires:  socat
 BuildRequires:  tpm-tools
-%if 0%{?suse_version} > 1500 
+%if 0%{?suse_version} >= 1500 
 BuildRequires:  net-tools-deprecated
 %endif
 Requires:       tpm-tools
 Requires:       trousers
-%if 0%{?suse_version} > 1500 
+%if 0%{?suse_version} >= 1500 
 Requires:       net-tools-deprecated
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build