From c82ff9d03dae74d61577219e5346688ec40580574911e10a0008105c370d5de9 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Fri, 30 Jul 2021 10:44:17 +0000 Subject: [PATCH] Accepting request 901760 from home:aplanas:branches:security (*Review carefully*: this is a proposal for a fix, and can be wrong) - Add /etc/keys/ and /usr/etc/keys/ directory (bsc#1187654) OBS-URL: https://build.opensuse.org/request/show/901760 OBS-URL: https://build.opensuse.org/package/show/security/keyutils?expand=0&rev=56 --- keyutils.changes | 5 +++++ keyutils.spec | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/keyutils.changes b/keyutils.changes index 2eb3abf..2f9d542 100644 --- a/keyutils.changes +++ b/keyutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 24 12:54:11 UTC 2021 - Alberto Planas Dominguez + +- Add /etc/keys/ and /usr/etc/keys/ directory (bsc#1187654) + ------------------------------------------------------------------- Wed Jan 6 10:27:14 UTC 2021 - Marcus Meissner diff --git a/keyutils.spec b/keyutils.spec index 0e59541..d9c912e 100644 --- a/keyutils.spec +++ b/keyutils.spec @@ -16,6 +16,12 @@ # +%if ! %{defined _distconfdir} +%define _distconfdir %{_sysconfdir} +%else +%define use_usretc 1 +%endif + %define lname libkeyutils1 Name: keyutils Version: 1.6.3 @@ -80,6 +86,12 @@ ln -s /%{_sbindir}/key.dns_resolver %{buildroot}/sbin ln -s /%{_sbindir}/request-key %{buildroot}/sbin %endif +install -m 0750 -d \ + %{buildroot}%{_sysconfdir}/keys \ + %{buildroot}%{_sysconfdir}/keys/ima \ + %{buildroot}%{_distconfdir}/keys \ + %{buildroot}%{_distconfdir}/keys/ima + %post -n %{lname} -p /sbin/ldconfig %postun -n %{lname} -p /sbin/ldconfig @@ -96,6 +108,12 @@ ln -s /%{_sbindir}/request-key %{buildroot}/sbin %{_mandir}/*/* %config(noreplace) %{_sysconfdir}/request-key.conf %dir %{_sysconfdir}/request-key.d/ +%dir %{_sysconfdir}/keys/ +%dir %{_sysconfdir}/keys/ima/ +%if %{defined use_usretc} +%dir %{_distconfdir}/keys/ +%dir %{_distconfdir}/keys/ima/ +%endif %files -n %{lname} %license LICENCE.LGPL