From 7a5e09138cac63d8269fc114664d7a832b0f9cd4 Mon Sep 17 00:00:00 2001 From: Jason Zaman Date: Sat, 17 Aug 2019 17:56:06 +0800 Subject: sys-process/audit: fix DoublePrefixInPath DoublePrefixInPath fperms 644 "$(systemd_get_systemunitdir): concatenates two variables containing EPREFIX on line 192 The perms on the unit file were fixed in 2.7.4, so remove from all later ones. For the earlier ones use chmod directly instead. Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Jason Zaman --- sys-process/audit/audit-2.6.4.ebuild | 2 +- sys-process/audit/audit-2.7.1.ebuild | 2 +- sys-process/audit/audit-2.8.2.ebuild | 2 -- sys-process/audit/audit-2.8.3.ebuild | 2 -- sys-process/audit/audit-2.8.4.ebuild | 2 -- 5 files changed, 2 insertions(+), 8 deletions(-) diff --git a/sys-process/audit/audit-2.6.4.ebuild b/sys-process/audit/audit-2.6.4.ebuild index d65d30a4ba46..c50a44ddd92f 100644 --- a/sys-process/audit/audit-2.6.4.ebuild +++ b/sys-process/audit/audit-2.6.4.ebuild @@ -189,7 +189,7 @@ multilib_src_install_all() { newinitd "${FILESDIR}"/auditd-init.d-2.4.3 auditd newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd - fperms 644 "$(systemd_get_systemunitdir)"/auditd.service # 556436 + chmod 644 "${D}$(systemd_get_systemunitdir)"/auditd.service || die # 556436 [ -f "${ED}"/sbin/audisp-remote ] && \ dodir /usr/sbin && \ diff --git a/sys-process/audit/audit-2.7.1.ebuild b/sys-process/audit/audit-2.7.1.ebuild index 7959c4aeed17..ffaa96aec521 100644 --- a/sys-process/audit/audit-2.7.1.ebuild +++ b/sys-process/audit/audit-2.7.1.ebuild @@ -189,7 +189,7 @@ multilib_src_install_all() { newinitd "${FILESDIR}"/auditd-init.d-2.4.3 auditd newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd - fperms 644 "$(systemd_get_systemunitdir)"/auditd.service # 556436 + chmod 644 "${D}$(systemd_get_systemunitdir)"/auditd.service || die # 556436 [ -f "${ED}"/sbin/audisp-remote ] && \ dodir /usr/sbin && \ diff --git a/sys-process/audit/audit-2.8.2.ebuild b/sys-process/audit/audit-2.8.2.ebuild index 2980cdececb1..4aa75229e58c 100644 --- a/sys-process/audit/audit-2.8.2.ebuild +++ b/sys-process/audit/audit-2.8.2.ebuild @@ -189,8 +189,6 @@ multilib_src_install_all() { newinitd "${FILESDIR}"/auditd-init.d-2.4.3 auditd newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd - fperms 644 "$(systemd_get_systemunitdir)"/auditd.service # 556436 - [ -f "${ED}"/sbin/audisp-remote ] && \ dodir /usr/sbin && \ mv "${ED}"/{sbin,usr/sbin}/audisp-remote || die diff --git a/sys-process/audit/audit-2.8.3.ebuild b/sys-process/audit/audit-2.8.3.ebuild index 18175053305c..737db834349c 100644 --- a/sys-process/audit/audit-2.8.3.ebuild +++ b/sys-process/audit/audit-2.8.3.ebuild @@ -189,8 +189,6 @@ multilib_src_install_all() { newinitd "${FILESDIR}"/auditd-init.d-2.4.3 auditd newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd - fperms 644 "$(systemd_get_systemunitdir)"/auditd.service # 556436 - [ -f "${ED}"/sbin/audisp-remote ] && \ dodir /usr/sbin && \ mv "${ED}"/{sbin,usr/sbin}/audisp-remote || die diff --git a/sys-process/audit/audit-2.8.4.ebuild b/sys-process/audit/audit-2.8.4.ebuild index 13be78df8a0d..22ff19e94b57 100644 --- a/sys-process/audit/audit-2.8.4.ebuild +++ b/sys-process/audit/audit-2.8.4.ebuild @@ -189,8 +189,6 @@ multilib_src_install_all() { newinitd "${FILESDIR}"/auditd-init.d-2.4.3 auditd newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd - fperms 644 "$(systemd_get_systemunitdir)"/auditd.service # 556436 - [ -f "${ED}"/sbin/audisp-remote ] && \ dodir /usr/sbin && \ mv "${ED}"/{sbin,usr/sbin}/audisp-remote || die -- cgit v1.2.3-65-gdbad