[gentoo-commits] repo/gentoo:master commit in: sys-process/audit/

["Jason Zaman" <perfinion@gentoo.org>]

commit:     7a5e09138cac63d8269fc114664d7a832b0f9cd4
Author:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 17 09:56:06 2019 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sat Aug 17 10:03:34 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a5e0913

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 <perfinion <AT> gentoo.org>

 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 d65d30a4ba4..c50a44ddd92 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 7959c4aeed1..ffaa96aec52 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 2980cdececb..4aa75229e58 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 18175053305..737db834349 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 13be78df8a0..22ff19e94b5 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