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@gentoo.org>

diff --git a/sys-process/audit/audit-2.6.4.ebuild b/sys-process/audit/audit-2.6.4.ebuild
index d65d30a4ba4652f23ff3671fdaa0767b7ee82166..c50a44ddd92f4034df32d5f842573a9110fff46a 100644 (file)
--- 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 7959c4aeed17faaba21b5c8015e7548b4124ff4a..ffaa96aec521a451d4dec7a1fe60f4d03cfb89db 100644 (file)
--- 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 2980cdececb17c6022432bf3844d0d4971afac1c..4aa75229e58c2ce15257ad76b8041b4872e05a6b 100644 (file)
--- 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 18175053305cbf90859cd4358a4b11fa09076f89..737db834349cd43f6e2d034f2bd14056a3993770 100644 (file)
--- 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 13be78df8a0d14addf97889fedb846c849febd65..22ff19e94b57fdbc1a43020ba61619a5384c28b8 100644 (file)
--- 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