Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package tpm2.0-abrmd for openSUSE:Factory checked in at 2021-12-08 22:08:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tpm2.0-abrmd (Old) and /work/SRC/openSUSE:Factory/.tpm2.0-abrmd.new.31177 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tpm2.0-abrmd" Wed Dec 8 22:08:47 2021 rev:21 rq:936756 version:2.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/tpm2.0-abrmd/tpm2.0-abrmd.changes 2021-12-02 02:27:44.480091791 +0100 +++ /work/SRC/openSUSE:Factory/.tpm2.0-abrmd.new.31177/tpm2.0-abrmd.changes 2021-12-08 22:09:21.422873876 +0100 @@ -1,0 +2,14 @@ +Wed Dec 8 16:50:13 UTC 2021 - Alberto Planas Dominguez <[email protected]> + +- Version 2.4.0 + + remover syslog deprecation warning (bsc#1185154) + + cover update to 2.3.3 (jsc#SLE-17366) + + contains reload fix (bsc#1166936~ + + fix tcti loading using short / long names (bsc#1159176) + +------------------------------------------------------------------- +Mon Nov 29 12:54:02 UTC 2021 - Alberto Planas Dominguez <[email protected]> + +- Warp selinux into a bcond + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tpm2.0-abrmd.spec ++++++ --- /var/tmp/diff_new_pack.3DogZg/_old 2021-12-08 22:09:21.878874089 +0100 +++ /var/tmp/diff_new_pack.3DogZg/_new 2021-12-08 22:09:21.882874091 +0100 @@ -18,6 +18,16 @@ %global selinuxtype targeted %global modulename tabrmd +# the auto activation is not whitelisted for <= SLE12-SP3 +%if 0%{?sle_version} > 120300 || 0%{?is_opensuse} +%define install_dbus_files 1 +%endif +# selinux only for Tumbleweed for now +%if 0%{?suse_version} >= 1550 && 0%{?is_opensuse} +%bcond_without selinux +%else +%bcond_with selinux +%endif Name: tpm2.0-abrmd Version: 2.4.0 Release: 0 @@ -35,23 +45,19 @@ BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: policycoreutils -BuildRequires: selinux-policy-devel BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(tss2-sys) -# due to %%selinux_requires -BuildRequires: pkgconfig(systemd) -# -BuildRequires: selinux-policy-targeted -Requires(pre): user(tss) Requires: libtss2-tcti-device0 Requires: libtss2-tcti-tabrmd0 Requires: tpm2-0-tss +Requires(pre): user(tss) +%if %{with selinux} +BuildRequires: selinux-policy-devel +BuildRequires: selinux-policy-targeted +BuildRequires: pkgconfig(systemd) Requires: (%{name}-selinux if selinux-policy-base) -# the auto activation is not whitelisted for <= SLE12-SP3 -%if 0%{?sle_version} > 120300 || 0%{?is_opensuse} -%define install_dbus_files 1 %endif %description @@ -70,15 +76,17 @@ This package provides the development files for the Access Broker & Resource Manager for coordinating access to TPM 2.0 chips. +%if %{with selinux} %package selinux Summary: SELinux module for the Access Broker & Resource Manager for TPM 2.0 chips Group: System/Management -BuildArch: noarch Requires: tpm2.0-abrmd = %{version} -%selinux_requires +BuildArch: noarch +%{selinux_requires} %description selinux This package provides the SELinux module for the Access Broker & Resource Manager for TPM 2.0 chips. +%endif %package -n libtss2-tcti-tabrmd0 Summary: Client interface library for tpm2-abrmd @@ -99,11 +107,10 @@ export LDFLAGS="$LDFLAGS -pie" %configure \ --disable-static \ - --with-sepolicy=yes \ + %{?with_selinux: --with-sepolicy=yes} \ --with-systemdsystemunitdir=%{_unitdir} \ --with-dbuspolicydir=%{_datadir}/dbus-1/system.d - %{nil} -make %{?_smp_mflags} PTHREAD_LDFLAGS=-pthread +%make_build PTHREAD_LDFLAGS=-pthread %install %make_install @@ -112,13 +119,15 @@ ln -sv %{_sbindir}/service %{buildroot}%{_sbindir}/rctpm2-abrmd # don't install the systemd preset, our presets are handled by # systemd-presets-* packages -rm %{buildroot}/usr/lib*/systemd/system-preset/tpm2-abrmd.preset +rm %{buildroot}%{_prefix}/lib*/systemd/system-preset/tpm2-abrmd.preset %if ! 0%{?install_dbus_files} rm %{buildroot}/%{_sysconfdir}/dbus-1/system.d/tpm2-abrmd.conf rm %{buildroot}/%{_datadir}/dbus-1/system-services/com.intel.tss2.Tabrmd.service %endif +%if %{with selinux} mkdir %{buildroot}%{_datadir}/selinux/packages/targeted mv %{buildroot}%{_datadir}/selinux/packages/tab* %{buildroot}%{_datadir}/selinux/packages/targeted +%endif %pre %service_add_pre tpm2-abrmd.service @@ -132,19 +141,21 @@ %preun %service_del_preun tpm2-abrmd.service +%if %{with selinux} %pre selinux -%selinux_relabel_pre -s %{selinuxtype} +%{selinux_relabel_pre -s %{selinuxtype}} %post selinux -%selinux_modules_install -s %{selinuxtype} -p 200 %{_datadir}/selinux/packages/targeted/%{modulename}.pp.bz2 +%{selinux_modules_install -s %{selinuxtype} -p 200 %{_datadir}/selinux/packages/targeted/%{modulename}.pp.bz2} %postun selinux if [ $1 -eq 0 ]; then - %selinux_modules_uninstall -s %{selinuxtype} -p 200 %{modulename} + %{selinux_modules_uninstall -s %{selinuxtype} -p 200 %{modulename}} fi %posttrans selinux -%selinux_relabel_post -s %{selinuxtype} +%{selinux_relabel_post -s %{selinuxtype}} +%endif %files %doc *.md @@ -160,16 +171,20 @@ %{_datadir}/dbus-1/system-services/com.intel.tss2.Tabrmd.service %endif +%if %{with selinux} %files selinux %{_datadir}/selinux/packages/targeted/tabrmd.pp.bz2 %ghost %verify(not md5 size mtime) %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{modulename} +%endif %files devel %{_includedir}/tss2 %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %{_mandir}/man3/Tss2* +%if %{with selinux} %{_datadir}/selinux/devel/include/contrib/tabrmd.if +%endif %files -n libtss2-tcti-tabrmd0 %{_libdir}/libtss2-tcti-tabrmd.so.*
