1 |
commit: d1377aaa818973deae073a82bdd57e8aa0601ac5 |
2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 20 14:46:11 2018 +0000 |
4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 20 14:46:47 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1377aaa |
7 |
|
8 |
sys-devel/distcc: install distccd whitelist by shadowman. |
9 |
|
10 |
- remove redundant "|| die". |
11 |
- fix the libdir names. |
12 |
|
13 |
Closes: https://bugs.gentoo.org/650986 |
14 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
15 |
|
16 |
sys-devel/distcc/distcc-3.3.ebuild | 24 +++++++++++++----------- |
17 |
1 file changed, 13 insertions(+), 11 deletions(-) |
18 |
|
19 |
diff --git a/sys-devel/distcc/distcc-3.3.ebuild b/sys-devel/distcc/distcc-3.3.ebuild |
20 |
index 4a7e74e0c42..b088b559a6a 100644 |
21 |
--- a/sys-devel/distcc/distcc-3.3.ebuild |
22 |
+++ b/sys-devel/distcc/distcc-3.3.ebuild |
23 |
@@ -74,7 +74,7 @@ src_prepare() { |
24 |
-e "s:@libdir@:/usr/$(get_libdir):" \ |
25 |
"${FILESDIR}/3.2/distcc-config" > "${T}/distcc-config" || die |
26 |
|
27 |
- hprefixify update-distcc-symlinks.py src/{serve,daemon}.c |
28 |
+ hprefixify -e "s,/lib/,/$(get_libdir)/," update-distcc-symlinks.py src/{serve,daemon}.c |
29 |
} |
30 |
|
31 |
src_configure() { |
32 |
@@ -109,7 +109,7 @@ src_install() { |
33 |
|
34 |
sed -i '/ExecStart/ s|$| --zeroconf|' "${D}$(systemd_get_systemunitdir)"/distccd.service || die |
35 |
fi |
36 |
- doconfd "${T}/distccd" || die |
37 |
+ doconfd "${T}/distccd" |
38 |
|
39 |
cat > "${T}/02distcc" <<-EOF || die |
40 |
# This file is managed by distcc-config; use it to change these settings. |
41 |
@@ -123,26 +123,27 @@ src_install() { |
42 |
DISTCC_ENABLE_DISCREPANCY_EMAIL="${DISTCC_ENABLE_DISCREPANCY_EMAIL}" |
43 |
DCC_EMAILLOG_WHOM_TO_BLAME="${DCC_EMAILLOG_WHOM_TO_BLAME}" |
44 |
EOF |
45 |
- doenvd "${T}/02distcc" || die |
46 |
+ doenvd "${T}/02distcc" |
47 |
|
48 |
- keepdir "${DCCC_PATH}" || die |
49 |
+ keepdir "${DCCC_PATH%bin}" |
50 |
|
51 |
- dobin "${T}/distcc-config" || die |
52 |
+ dobin "${T}/distcc-config" |
53 |
|
54 |
if use gnome || use gtk; then |
55 |
einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui" |
56 |
einfo "This is to have a little sensability in naming schemes between distccmon programs" |
57 |
mv "${ED}/usr/bin/distccmon-gnome" "${ED}/usr/bin/distccmon-gui" || die |
58 |
- dosym distccmon-gui /usr/bin/distccmon-gnome || die |
59 |
+ dosym distccmon-gui /usr/bin/distccmon-gnome |
60 |
fi |
61 |
|
62 |
if use xinetd; then |
63 |
- insinto /etc/xinetd.d || die |
64 |
- newins "doc/example/xinetd" distcc || die |
65 |
+ insinto /etc/xinetd.d |
66 |
+ newins "doc/example/xinetd" distcc |
67 |
fi |
68 |
|
69 |
insinto /usr/share/shadowman/tools |
70 |
newins - distcc <<<"${EPREFIX}${DCCC_PATH}" |
71 |
+ newins - distccd <<<"${EPREFIX}${DCCC_PATH%bin}" |
72 |
|
73 |
rm -r "${ED}/etc/default" || die |
74 |
rm "${ED}/etc/distcc/clients.allow" || die |
75 |
@@ -152,6 +153,7 @@ src_install() { |
76 |
pkg_postinst() { |
77 |
if [[ ${ROOT} == / ]]; then |
78 |
eselect compiler-shadow update distcc |
79 |
+ eselect compiler-shadow update distccd |
80 |
fi |
81 |
|
82 |
use gnome && xdg_desktop_database_update |
83 |
@@ -176,9 +178,9 @@ pkg_postinst() { |
84 |
elog |
85 |
elog "***SECURITY NOTICE***" |
86 |
elog "Since distcc-3.3, whitelist is used for what distccd could execute. The whilelist" |
87 |
- elog "has to be generated manually by invoking \`update-distcc-symlinks\`. To revert" |
88 |
- elog "to the old behavior, you need to pass --make-me-a-botnet to distccd in" |
89 |
- elog "/etc/conf.d/distccd. Cf. https://github.com/distcc/distcc/pull/243." |
90 |
+ elog "has been generated by compiler-shadow distccd. To revert to the old behavior, " |
91 |
+ elog "you need to pass --make-me-a-botnet to distccd in elog /etc/conf.d/distccd." |
92 |
+ elog "Cf. https://github.com/distcc/distcc/pull/243." |
93 |
} |
94 |
|
95 |
pkg_prerm() { |