1 |
commit: 37f05be34993ee4da8a8f8e13d1ce1b5574f8632 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 29 20:49:59 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 29 20:51:14 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37f05be3 |
7 |
|
8 |
sys-devel/distcc: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
sys-devel/distcc/Manifest | 1 - |
13 |
sys-devel/distcc/distcc-3.3.2-r5.ebuild | 200 --------------------- |
14 |
.../distcc/files/distcc-3.3.2-noexist-crash.patch | 22 --- |
15 |
3 files changed, 223 deletions(-) |
16 |
|
17 |
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest |
18 |
index 5e6d668cdda..1efba30ad96 100644 |
19 |
--- a/sys-devel/distcc/Manifest |
20 |
+++ b/sys-devel/distcc/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST distcc-3.3.2.tar.gz 1008938 BLAKE2B e784002dffefd395b068d237a86203563fefc81e17a08c4d2e372eaaf62c5ac799011fc8633c8bfb717f0ebc8c8cb8b999c941e0f5f87c4077d031a9e5c4b138 SHA512 fdf11ed94ba50977b45e302179c5c4ba067cc3db37579cb8ed6d5b9487f8e3c89114f65af69333c38d374cf7634d7aef8d5a2d5c7fd8e9b1f4930c0897d6da10 |
23 |
DIST distcc-3.3.3.tar.gz 1195666 BLAKE2B b393fdb20eb555dec794bf55c1287dd804a576e0a5db9f2fa84c3924a40185a193231aea807353918430297c9c83c7592aaaafd521cf73c92a72bf30b8a69caa SHA512 d5e7fc67f49ee640cef753038b5c0ebcbbac61c6ac29f20ee4736b045a89979ced765717c46383a4fadc50a4fe34e94e58e307509144414a9ca19eb4cc68a135 |
24 |
|
25 |
diff --git a/sys-devel/distcc/distcc-3.3.2-r5.ebuild b/sys-devel/distcc/distcc-3.3.2-r5.ebuild |
26 |
deleted file mode 100644 |
27 |
index ebf2f5ab847..00000000000 |
28 |
--- a/sys-devel/distcc/distcc-3.3.2-r5.ebuild |
29 |
+++ /dev/null |
30 |
@@ -1,200 +0,0 @@ |
31 |
-# Copyright 1999-2019 Gentoo Authors |
32 |
-# Distributed under the terms of the GNU General Public License v2 |
33 |
- |
34 |
-EAPI=6 |
35 |
- |
36 |
-PYTHON_COMPAT=( python3_{5,6} ) |
37 |
- |
38 |
-inherit autotools flag-o-matic python-single-r1 systemd \ |
39 |
- toolchain-funcs user xdg-utils prefix |
40 |
- |
41 |
-DESCRIPTION="Distribute compilation of C code across several machines on a network" |
42 |
-HOMEPAGE="http://distcc.org/" |
43 |
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" |
44 |
- |
45 |
-LICENSE="GPL-2+" |
46 |
-SLOT="0" |
47 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86" |
48 |
-IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf" |
49 |
- |
50 |
-RESTRICT="test" |
51 |
- |
52 |
-CDEPEND="${PYTHON_DEPS} |
53 |
- dev-libs/popt |
54 |
- gnome? ( |
55 |
- >=gnome-base/libgnome-2 |
56 |
- >=gnome-base/libgnomeui-2 |
57 |
- x11-libs/gtk+:2 |
58 |
- x11-libs/pango |
59 |
- ) |
60 |
- gssapi? ( net-libs/libgssglue ) |
61 |
- gtk? ( x11-libs/gtk+:2 ) |
62 |
- zeroconf? ( >=net-dns/avahi-0.6[dbus] ) |
63 |
-" |
64 |
-DEPEND="${CDEPEND} |
65 |
- sys-devel/autoconf-archive |
66 |
- sys-libs/binutils-libs |
67 |
- virtual/pkgconfig" |
68 |
-RDEPEND="${CDEPEND} |
69 |
- !net-misc/pump |
70 |
- dev-util/shadowman |
71 |
- >=sys-devel/gcc-config-1.4.1 |
72 |
- selinux? ( sec-policy/selinux-distcc ) |
73 |
- xinetd? ( sys-apps/xinetd )" |
74 |
- |
75 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
76 |
- |
77 |
-S="${WORKDIR}/distcc" |
78 |
- |
79 |
-pkg_setup() { |
80 |
- enewuser distcc 240 -1 -1 daemon |
81 |
- python-single-r1_pkg_setup |
82 |
-} |
83 |
- |
84 |
-src_prepare() { |
85 |
- eapply "${FILESDIR}/${PN}-3.0-xinetd.patch" |
86 |
- # bug #255188 |
87 |
- eapply "${FILESDIR}/${PN}-3.3.2-freedesktop.patch" |
88 |
- # SOCKSv5 support needed for Portage, bug #537616 |
89 |
- eapply "${FILESDIR}/${PN}-3.2_rc1-socks5.patch" |
90 |
- # crash on missing directory |
91 |
- eapply "${FILESDIR}"/distcc-3.3.2-noexist-crash.patch |
92 |
- eapply_user |
93 |
- |
94 |
- # Bugs #120001, #167844 and probably more. See patch for description. |
95 |
- use hardened && eapply "${FILESDIR}/distcc-hardened.patch" |
96 |
- |
97 |
- sed -i \ |
98 |
- -e "/PATH/s:\$distcc_location:${EPREFIX}/usr/lib/distcc/bin:" \ |
99 |
- -e "s:@PYTHON@:${EPYTHON}:" \ |
100 |
- pump.in || die "sed failed" |
101 |
- |
102 |
- sed \ |
103 |
- -e "s:@EPREFIX@:${EPREFIX:-/}:" \ |
104 |
- -e "s:@libdir@:/usr/lib:" \ |
105 |
- "${FILESDIR}/distcc-config" > "${T}/distcc-config" || die |
106 |
- |
107 |
- hprefixify update-distcc-symlinks.py src/{serve,daemon}.c |
108 |
- python_fix_shebang update-distcc-symlinks.py "${T}/distcc-config" |
109 |
- eautoreconf |
110 |
-} |
111 |
- |
112 |
-src_configure() { |
113 |
- local myconf=( |
114 |
- --disable-Werror |
115 |
- --libdir=/usr/lib |
116 |
- $(use_enable ipv6 rfc2553) |
117 |
- $(use_with gtk) |
118 |
- $(use_with gnome) |
119 |
- $(use_with gssapi auth) |
120 |
- $(use_with zeroconf avahi) |
121 |
- ) |
122 |
- |
123 |
- econf "${myconf[@]}" |
124 |
-} |
125 |
- |
126 |
-src_install() { |
127 |
- # override GZIP_BIN to stop it from compressing manpages |
128 |
- emake DESTDIR="${D}" GZIP_BIN=false install |
129 |
- python_optimize |
130 |
- |
131 |
- newinitd "${FILESDIR}/distccd.initd" distccd |
132 |
- systemd_newunit "${FILESDIR}/distccd.service-1" distccd.service |
133 |
- systemd_install_serviced "${FILESDIR}/distccd.service.conf" |
134 |
- |
135 |
- cp "${FILESDIR}/distccd.confd" "${T}/distccd" || die |
136 |
- if use zeroconf; then |
137 |
- cat >> "${T}/distccd" <<-EOF || die |
138 |
- |
139 |
- # Enable zeroconf support in distccd |
140 |
- DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf" |
141 |
- EOF |
142 |
- |
143 |
- sed -i '/ExecStart/ s|$| --zeroconf|' "${D}$(systemd_get_systemunitdir)"/distccd.service || die |
144 |
- fi |
145 |
- doconfd "${T}/distccd" |
146 |
- |
147 |
- newenvd - 02distcc <<-EOF || die |
148 |
- # This file is managed by distcc-config; use it to change these settings. |
149 |
- # DISTCC_LOG and DISTCC_DIR should not be set. |
150 |
- DISTCC_VERBOSE="${DISTCC_VERBOSE:-0}" |
151 |
- DISTCC_FALLBACK="${DISTCC_FALLBACK:-1}" |
152 |
- DISTCC_SAVE_TEMPS="${DISTCC_SAVE_TEMPS:-0}" |
153 |
- DISTCC_TCP_CORK="${DISTCC_TCP_CORK}" |
154 |
- DISTCC_SSH="${DISTCC_SSH}" |
155 |
- UNCACHED_ERR_FD="${UNCACHED_ERR_FD}" |
156 |
- DISTCC_ENABLE_DISCREPANCY_EMAIL="${DISTCC_ENABLE_DISCREPANCY_EMAIL}" |
157 |
- DCC_EMAILLOG_WHOM_TO_BLAME="${DCC_EMAILLOG_WHOM_TO_BLAME}" |
158 |
- EOF |
159 |
- |
160 |
- keepdir /usr/lib/distcc |
161 |
- |
162 |
- dobin "${T}/distcc-config" |
163 |
- |
164 |
- if use gnome || use gtk; then |
165 |
- einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui" |
166 |
- einfo "This is to have a little sensability in naming schemes between distccmon programs" |
167 |
- mv "${ED}/usr/bin/distccmon-gnome" "${ED}/usr/bin/distccmon-gui" || die |
168 |
- dosym distccmon-gui /usr/bin/distccmon-gnome |
169 |
- fi |
170 |
- |
171 |
- if use xinetd; then |
172 |
- insinto /etc/xinetd.d |
173 |
- newins "doc/example/xinetd" distcc |
174 |
- fi |
175 |
- |
176 |
- insinto /usr/share/shadowman/tools |
177 |
- newins - distcc <<<"${EPREFIX}/usr/lib/distcc/bin" |
178 |
- newins - distccd <<<"${EPREFIX}/usr/lib/distcc" |
179 |
- |
180 |
- rm -r "${ED}/etc/default" || die |
181 |
- rm "${ED}/etc/distcc/clients.allow" || die |
182 |
- rm "${ED}/etc/distcc/commands.allow.sh" || die |
183 |
-} |
184 |
- |
185 |
-pkg_postinst() { |
186 |
- # remove the old paths when switching from libXX to lib |
187 |
- if [[ $(get_libdir) != lib && ${SYMLINK_LIB} != yes && \ |
188 |
- -d ${EROOT%/}/usr/$(get_libdir)/distcc ]]; then |
189 |
- rm -r -f "${EROOT%/}/usr/$(get_libdir)/distcc" || die |
190 |
- fi |
191 |
- |
192 |
- if [[ ${ROOT} == / ]]; then |
193 |
- eselect compiler-shadow update distcc |
194 |
- eselect compiler-shadow update distccd |
195 |
- fi |
196 |
- |
197 |
- use gnome && xdg_desktop_database_update |
198 |
- |
199 |
- elog |
200 |
- elog "Tips on using distcc with Gentoo can be found at" |
201 |
- elog "https://wiki.gentoo.org/wiki/Distcc" |
202 |
- elog |
203 |
- elog "distcc-pump is known to cause breakage with multiple packages." |
204 |
- elog "Do NOT enable it globally." |
205 |
- elog |
206 |
- elog "To use the distccmon programs with Gentoo you should use this command:" |
207 |
- elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-text 5" |
208 |
- |
209 |
- if use gnome || use gtk; then |
210 |
- elog "Or:" |
211 |
- elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-gnome" |
212 |
- fi |
213 |
- |
214 |
- elog |
215 |
- elog "***SECURITY NOTICE***" |
216 |
- elog "Since distcc-3.3, whitelist is used for what distccd could execute. The whilelist" |
217 |
- elog "has been generated by compiler-shadow distccd. To revert to the old behavior, " |
218 |
- elog "you need to pass --make-me-a-botnet to distccd in /etc/conf.d/distccd." |
219 |
- elog "Cf. https://github.com/distcc/distcc/pull/243." |
220 |
-} |
221 |
- |
222 |
-pkg_prerm() { |
223 |
- if [[ -z ${REPLACED_BY_VERSION} && ${ROOT} == / ]]; then |
224 |
- eselect compiler-shadow remove distcc |
225 |
- fi |
226 |
-} |
227 |
- |
228 |
-pkg_postrm() { |
229 |
- use gnome && xdg_desktop_database_update |
230 |
-} |
231 |
|
232 |
diff --git a/sys-devel/distcc/files/distcc-3.3.2-noexist-crash.patch b/sys-devel/distcc/files/distcc-3.3.2-noexist-crash.patch |
233 |
deleted file mode 100644 |
234 |
index 7f378082d99..00000000000 |
235 |
--- a/sys-devel/distcc/files/distcc-3.3.2-noexist-crash.patch |
236 |
+++ /dev/null |
237 |
@@ -1,22 +0,0 @@ |
238 |
-From 24f73c5cd8f839bd520eb52e91d0d26e07689373 Mon Sep 17 00:00:00 2001 |
239 |
-From: Shawn Landden <shawn@×××.icu> |
240 |
-Date: Wed, 29 Aug 2018 04:52:38 -0700 |
241 |
-Subject: [PATCH] fix #304 |
242 |
- |
243 |
---- |
244 |
- src/daemon.c | 2 +- |
245 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
246 |
- |
247 |
-diff --git a/src/daemon.c b/src/daemon.c |
248 |
-index 5765982..c8fee7c 100644 |
249 |
---- a/src/daemon.c |
250 |
-+++ b/src/daemon.c |
251 |
-@@ -166,7 +166,7 @@ static void dcc_warn_masquerade_whitelist(void) { |
252 |
- rs_log_crit(LIBDIR "/distcc not found. %s", warn); |
253 |
- dcc_exit(EXIT_COMPILER_MISSING); |
254 |
- } |
255 |
-- if (!readdir(e) && !readdir(d)) { |
256 |
-+ if ((!e || !readdir(e)) && (!d || !readdir(d))) { |
257 |
- rs_log_crit(LIBDIR "/distcc empty. %s", warn); |
258 |
- dcc_exit(EXIT_COMPILER_MISSING); |
259 |
- } |