Accepting request 857979 from home:gary_lin:branches:security

- Create /var/lib/swtpm-localca to store the keys created by
  swtpm-localca (bsc#1179811)
- Replace net-tools-deprecated with iproute2 since the scripts in
  swtpm now can use 'ss' instead of 'netstat'

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

swtpm.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Dec 22 04:06:10 UTC 2020 - Gary Ching-Pang Lin <glin@suse.com>
+
+- Create /var/lib/swtpm-localca to store the keys created by
+  swtpm-localca (bsc#1179811)
+- Replace net-tools-deprecated with iproute2 since the scripts in
+  swtpm now can use 'ss' instead of 'netstat'
+
 -------------------------------------------------------------------
 Sun Nov 22 03:16:13 UTC 2020 - Kai Liu <kai.liu@suse.com>
 

swtpm.spec

@@ -33,6 +33,7 @@ BuildRequires:  expect
 BuildRequires:  fuse-devel
 BuildRequires:  glib2-devel
 BuildRequires:  gnutls
+BuildRequires:  iproute2
 BuildRequires:  libgnutls-devel
 BuildRequires:  libopenssl-devel
 BuildRequires:  libseccomp-devel
@@ -41,14 +42,9 @@ BuildRequires:  libtool
 BuildRequires:  libtpms-devel
 BuildRequires:  python3-cryptography
 BuildRequires:  socat
-%if 0%{?suse_version} >= 1500 
-BuildRequires:  net-tools-deprecated
-%endif
-Requires:       trousers
-%if 0%{?suse_version} >= 1500 
-Requires:       net-tools-deprecated
-%endif
+Requires:       iproute2
 Requires:       python3-cryptography
+Requires:       trousers
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -91,7 +87,17 @@ make %{?_smp_mflags}
 %install
 %make_install
 
-%post -p /sbin/ldconfig
+mkdir -p %{buildroot}%{_localstatedir}/lib/swtpm-localca
+
+%post
+/sbin/ldconfig
+
+# the same user/group is employed by trousers
+/usr/bin/getent group tss >/dev/null || /usr/sbin/groupadd -g 98 tss
+/usr/bin/getent passwd tss >/dev/null || \
+        /usr/sbin/useradd -u 98 -o -g tss -s /bin/false -c "TSS daemon" \
+        -d /var/lib/tpm tss
+
 %postun -p /sbin/ldconfig
 
 %files
@@ -113,6 +119,7 @@ make %{?_smp_mflags}
 %{python_sitelib}/py_swtpm_setup/*.py
 %{python_sitelib}/swtpm_localca*
 %{python_sitelib}/swtpm_setup*
+%dir %attr(0750,tss,root) %{_localstatedir}/lib/swtpm-localca
 
 %files devel
 %{_libdir}/swtpm/*.so