| 1 |
commit: 7a5e09138cac63d8269fc114664d7a832b0f9cd4 |
| 2 |
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 17 09:56:06 2019 +0000 |
| 4 |
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 17 10:03:34 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a5e0913 |
| 7 |
|
| 8 |
sys-process/audit: fix DoublePrefixInPath |
| 9 |
|
| 10 |
DoublePrefixInPath fperms 644 "$(systemd_get_systemunitdir): |
| 11 |
concatenates two variables containing EPREFIX on line 192 |
| 12 |
|
| 13 |
The perms on the unit file were fixed in 2.7.4, so remove from all later |
| 14 |
ones. For the earlier ones use chmod directly instead. |
| 15 |
|
| 16 |
Package-Manager: Portage-2.3.69, Repoman-2.3.16 |
| 17 |
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org> |
| 18 |
|
| 19 |
sys-process/audit/audit-2.6.4.ebuild | 2 +- |
| 20 |
sys-process/audit/audit-2.7.1.ebuild | 2 +- |
| 21 |
sys-process/audit/audit-2.8.2.ebuild | 2 -- |
| 22 |
sys-process/audit/audit-2.8.3.ebuild | 2 -- |
| 23 |
sys-process/audit/audit-2.8.4.ebuild | 2 -- |
| 24 |
5 files changed, 2 insertions(+), 8 deletions(-) |
| 25 |
|
| 26 |
diff --git a/sys-process/audit/audit-2.6.4.ebuild b/sys-process/audit/audit-2.6.4.ebuild |
| 27 |
index d65d30a4ba4..c50a44ddd92 100644 |
| 28 |
--- a/sys-process/audit/audit-2.6.4.ebuild |
| 29 |
+++ b/sys-process/audit/audit-2.6.4.ebuild |
| 30 |
@@ -189,7 +189,7 @@ multilib_src_install_all() { |
| 31 |
newinitd "${FILESDIR}"/auditd-init.d-2.4.3 auditd |
| 32 |
newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd |
| 33 |
|
| 34 |
- fperms 644 "$(systemd_get_systemunitdir)"/auditd.service # 556436 |
| 35 |
+ chmod 644 "${D}$(systemd_get_systemunitdir)"/auditd.service || die # 556436 |
| 36 |
|
| 37 |
[ -f "${ED}"/sbin/audisp-remote ] && \ |
| 38 |
dodir /usr/sbin && \ |
| 39 |
|
| 40 |
diff --git a/sys-process/audit/audit-2.7.1.ebuild b/sys-process/audit/audit-2.7.1.ebuild |
| 41 |
index 7959c4aeed1..ffaa96aec52 100644 |
| 42 |
--- a/sys-process/audit/audit-2.7.1.ebuild |
| 43 |
+++ b/sys-process/audit/audit-2.7.1.ebuild |
| 44 |
@@ -189,7 +189,7 @@ multilib_src_install_all() { |
| 45 |
newinitd "${FILESDIR}"/auditd-init.d-2.4.3 auditd |
| 46 |
newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd |
| 47 |
|
| 48 |
- fperms 644 "$(systemd_get_systemunitdir)"/auditd.service # 556436 |
| 49 |
+ chmod 644 "${D}$(systemd_get_systemunitdir)"/auditd.service || die # 556436 |
| 50 |
|
| 51 |
[ -f "${ED}"/sbin/audisp-remote ] && \ |
| 52 |
dodir /usr/sbin && \ |
| 53 |
|
| 54 |
diff --git a/sys-process/audit/audit-2.8.2.ebuild b/sys-process/audit/audit-2.8.2.ebuild |
| 55 |
index 2980cdececb..4aa75229e58 100644 |
| 56 |
--- a/sys-process/audit/audit-2.8.2.ebuild |
| 57 |
+++ b/sys-process/audit/audit-2.8.2.ebuild |
| 58 |
@@ -189,8 +189,6 @@ multilib_src_install_all() { |
| 59 |
newinitd "${FILESDIR}"/auditd-init.d-2.4.3 auditd |
| 60 |
newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd |
| 61 |
|
| 62 |
- fperms 644 "$(systemd_get_systemunitdir)"/auditd.service # 556436 |
| 63 |
- |
| 64 |
[ -f "${ED}"/sbin/audisp-remote ] && \ |
| 65 |
dodir /usr/sbin && \ |
| 66 |
mv "${ED}"/{sbin,usr/sbin}/audisp-remote || die |
| 67 |
|
| 68 |
diff --git a/sys-process/audit/audit-2.8.3.ebuild b/sys-process/audit/audit-2.8.3.ebuild |
| 69 |
index 18175053305..737db834349 100644 |
| 70 |
--- a/sys-process/audit/audit-2.8.3.ebuild |
| 71 |
+++ b/sys-process/audit/audit-2.8.3.ebuild |
| 72 |
@@ -189,8 +189,6 @@ multilib_src_install_all() { |
| 73 |
newinitd "${FILESDIR}"/auditd-init.d-2.4.3 auditd |
| 74 |
newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd |
| 75 |
|
| 76 |
- fperms 644 "$(systemd_get_systemunitdir)"/auditd.service # 556436 |
| 77 |
- |
| 78 |
[ -f "${ED}"/sbin/audisp-remote ] && \ |
| 79 |
dodir /usr/sbin && \ |
| 80 |
mv "${ED}"/{sbin,usr/sbin}/audisp-remote || die |
| 81 |
|
| 82 |
diff --git a/sys-process/audit/audit-2.8.4.ebuild b/sys-process/audit/audit-2.8.4.ebuild |
| 83 |
index 13be78df8a0..22ff19e94b5 100644 |
| 84 |
--- a/sys-process/audit/audit-2.8.4.ebuild |
| 85 |
+++ b/sys-process/audit/audit-2.8.4.ebuild |
| 86 |
@@ -189,8 +189,6 @@ multilib_src_install_all() { |
| 87 |
newinitd "${FILESDIR}"/auditd-init.d-2.4.3 auditd |
| 88 |
newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd |
| 89 |
|
| 90 |
- fperms 644 "$(systemd_get_systemunitdir)"/auditd.service # 556436 |
| 91 |
- |
| 92 |
[ -f "${ED}"/sbin/audisp-remote ] && \ |
| 93 |
dodir /usr/sbin && \ |
| 94 |
mv "${ED}"/{sbin,usr/sbin}/audisp-remote || die |
Archives