[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/files/, sys-devel/distcc/
commit: a43ee9d85165ae7913807d321bf3e73c32fd3247
Author: Sam James gentoo org>
AuthorDate: Wed Sep 27 04:26:27 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Sep 27 04:26:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a43ee9d8
sys-devel/distcc: backport CHOST rewriting fix (deux)
Closes: https://bugs.gentoo.org/773652
Signed-off-by: Sam James gentoo.org>
sys-devel/distcc/distcc-3.4-r3.ebuild | 186 +
.../distcc/files/distcc-3.4-rewrite-chost.patch| 79 +
2 files changed, 265 insertions(+)
diff --git a/sys-devel/distcc/distcc-3.4-r3.ebuild
b/sys-devel/distcc/distcc-3.4-r3.ebuild
new file mode 100644
index ..df8124e492d9
--- /dev/null
+++ b/sys-devel/distcc/distcc-3.4-r3.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit autotools flag-o-matic prefix python-single-r1 systemd
+
+DESCRIPTION="Distribute compilation of C code across several machines on a
network"
+HOMEPAGE="https://github.com/distcc/distcc;
+SRC_URI="https://github.com/distcc/distcc/releases/download/v${PV}/${P}.tar.gz;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86"
+IUSE="gssapi gtk hardened ipv6 selinux xinetd zeroconf"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/popt
+ gssapi? ( net-libs/libgssglue )
+ gtk? ( x11-libs/gtk+:3 )
+ zeroconf? ( >=net-dns/avahi-0.6[dbus] )
+"
+DEPEND="${RDEPEND}
+ sys-libs/binutils-libs"
+BDEPEND="
+ sys-devel/autoconf-archive
+ virtual/pkgconfig"
+RDEPEND+="
+ acct-user/distcc
+ dev-util/shadowman
+ >=sys-devel/gcc-config-1.4.1
+ selinux? ( sec-policy/selinux-distcc )
+ xinetd? ( sys-apps/xinetd )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.0-xinetd.patch"
+ # SOCKSv5 support needed for Portage, bug #537616
+ "${FILESDIR}/${PN}-3.2_rc1-socks5.patch"
+ "${FILESDIR}/${PN}-3.4-pump-tests.patch"
+ "${FILESDIR}/${P}-fix-dcc_gcc_rewrite_fqn-corruption.patch"
+ "${FILESDIR}/${P}-rewrite-chost.patch"
+)
+
+src_prepare() {
+ default
+
+ # Bugs #120001, #167844 and probably more. See patch for description.
+ use hardened && eapply "${FILESDIR}/distcc-hardened.patch"
+
+ sed -i \
+ -e "/PATH/s:\$distcc_location:${EPREFIX}/usr/lib/distcc/bin:" \
+ -e "s:@PYTHON@:${EPYTHON}:" \
+ pump.in || die "sed failed"
+
+ sed \
+ -e "s:@EPREFIX@:${EPREFIX:-/}:" \
+ -e "s:@libdir@:/usr/lib:" \
+ "${FILESDIR}/distcc-config" > "${T}/distcc-config" || die
+
+ # TODO: gdb tests fail due to gdb failing to find .c file
+ sed -i -e '/Gdb.*Case,/d' test/testdistcc.py || die
+
+ hprefixify update-distcc-symlinks.py src/{serve,daemon}.c
+ python_fix_shebang update-distcc-symlinks.py "${T}/distcc-config"
+ eautoreconf
+}
+
+src_configure() {
+ # https://github.com/distcc/distcc/issues/454
+ append-cppflags -DPY_SSIZE_T_CLEAN
+
+ local myconf=(
+ --disable-Werror
+ --libdir="${EPREFIX}"/usr/lib
+ $(use_enable ipv6 rfc2553)
+ $(use_with gtk)
+ --without-gnome
+ $(use_with gssapi auth)
+ $(use_with zeroconf avahi)
+ )
+
+ econf "${myconf[@]}"
+}
+
+src_test() {
+ # sandbox breaks some tests, and hangs some too
+ # retest once #590084 is fixed
+ local -x SANDBOX_ON=0
+ emake -j1 check
+}
+
+src_install() {
+ # override GZIP_BIN to stop it from compressing manpages
+ emake -j1 DESTDIR="${D}" GZIP_BIN=false install
+ python_optimize
+
+ newinitd "${FILESDIR}/distccd.initd" distccd
+ systemd_newunit "${FILESDIR}/distccd.service-1" distccd.service
+ systemd_install_serviced "${FILESDIR}/distccd.service.conf"
+
+ cp "${FILESDIR}/distccd.confd" "${T}/distccd" || die
+ if use zeroconf; then
+ cat >> "${T}/distccd" <<-EOF || die
+
+ # Enable zeroconf support in distccd
+ DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf"
+ EOF
+
+ sed -i '/ExecStart/ s|$| --zeroconf|'
"${D}$(systemd_get_systemunitdir)"/distccd.service || die
+ fi
+ doconfd "${T}/distccd"
+
+ newenvd - 02distcc <<-EOF || die
+ # This file is managed by distcc-config; use it to change these
settings.
+ # DISTCC_LOG and DISTCC_DIR should not be set.
+ DISTCC_VERBOSE="${DISTCC_VERBOSE:-0}"
+ DISTCC_FALLBACK="${DISTCC_FALLBACK:-1}"
+ DISTCC_SAVE_TEMPS="${DISTCC_SAVE_TEMPS:-0}"
+ DISTCC_TCP_CORK="${DISTCC_TCP_CORK}"
+ DISTCC_SSH="${DISTCC_SSH}"
+
[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/files/, sys-devel/distcc/
commit: 1b76343af3ea4da0cf9dba731990a57c38a8cb85
Author: Joonas Niilola gentoo org>
AuthorDate: Sun May 31 11:04:37 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sun May 31 12:46:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b76343a
sys-devel/distcc: gcc-10 fix from upstream
Closes: https://bugs.gentoo.org/707502
Signed-off-by: Joonas Niilola gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/16029
sys-devel/distcc/distcc-3.3.3-r1.ebuild| 2 ++
.../distcc/files/distcc-3.3.3-gcc-10-fix.patch | 28 ++
2 files changed, 30 insertions(+)
diff --git a/sys-devel/distcc/distcc-3.3.3-r1.ebuild
b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
index e3911a71f50..700f331aa62 100644
--- a/sys-devel/distcc/distcc-3.3.3-r1.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
@@ -48,6 +48,8 @@ src_prepare() {
eapply "${FILESDIR}/${PN}-3.2_rc1-socks5.patch"
# backport py3.8 fixes
eapply "${FILESDIR}/${P}-py38.patch"
+ # gcc-10 fix, #707502
+ eapply "${FILESDIR}/${P}-gcc-10-fix.patch"
eapply_user
# Bugs #120001, #167844 and probably more. See patch for description.
diff --git a/sys-devel/distcc/files/distcc-3.3.3-gcc-10-fix.patch
b/sys-devel/distcc/files/distcc-3.3.3-gcc-10-fix.patch
new file mode 100644
index 000..2c0bce6c82b
--- /dev/null
+++ b/sys-devel/distcc/files/distcc-3.3.3-gcc-10-fix.patch
@@ -0,0 +1,28 @@
+From 377969cc762569f4a5ec409a1e7ad6a7be3e51b3 Mon Sep 17 00:00:00 2001
+From: Romain Geissler
+Date: Mon, 27 Jan 2020 09:28:43 +
+Subject: [PATCH] Fix build with gcc 10 which defaults to -fno-common (cf
+ https://gcc.gnu.org/gcc-10/porting_to.html)
+
+This fixes the following link error I see when I use the latest gcc 10
+git branch:
+/opt/1A/toolchain/x86_64-v20.0.7/lib/gcc/x86_64-1a-linux-gnu/10.0.1/../../../../x86_64-1a-linux-gnu/bin/ld:
src/serve.o:(.bss+0x0): multiple definition of `stats_text';
src/prefork.o:(.bss+0x0): first defined here
+/opt/1A/toolchain/x86_64-v20.0.7/lib/gcc/x86_64-1a-linux-gnu/10.0.1/../../../../x86_64-1a-linux-gnu/bin/ld:
src/stats.o:(.data+0x20): multiple definition of `stats_text';
src/prefork.o:(.bss+0x0): first defined here
+collect2: error: ld returned 1 exit status
+---
+ src/stats.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/stats.h b/src/stats.h
+index 9bde285..74d4690 100644
+--- a/src/stats.h
b/src/stats.h
+@@ -33,7 +33,7 @@ enum stats_e { STATS_TCP_ACCEPT, STATS_REJ_BAD_REQ,
STATS_REJ_OVERLOAD,
+ STATS_COMPILE_OK, STATS_COMPILE_ERROR, STATS_COMPILE_TIMEOUT,
+ STATS_CLI_DISCONN, STATS_OTHER, STATS_ENUM_MAX };
+
+-const char *stats_text[20];
++extern const char *stats_text[20];
+
+ int dcc_stats_init(void);
+ void dcc_stats_init_kid(void);
[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/files/, sys-devel/distcc/
commit: d8b0e7c0e5c4d7c2a26f70492c959d2b910eb3b7
Author: Michał Górny gentoo org>
AuthorDate: Sun May 31 09:33:12 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Sun May 31 09:44:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8b0e7c0
sys-devel/distcc: Port to py38&39
Signed-off-by: Michał Górny gentoo.org>
sys-devel/distcc/distcc-3.3.3-r1.ebuild| 4 +-
sys-devel/distcc/files/distcc-3.3.3-py38.patch | 53 ++
2 files changed, 56 insertions(+), 1 deletion(-)
diff --git a/sys-devel/distcc/distcc-3.3.3-r1.ebuild
b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
index d7992e1b301..3ab5ecab6d3 100644
--- a/sys-devel/distcc/distcc-3.3.3-r1.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
inherit autotools flag-o-matic python-single-r1 systemd \
toolchain-funcs user xdg-utils prefix
@@ -53,6 +53,8 @@ src_prepare() {
eapply "${FILESDIR}/${PN}-3.3.2-freedesktop.patch"
# SOCKSv5 support needed for Portage, bug #537616
eapply "${FILESDIR}/${PN}-3.2_rc1-socks5.patch"
+ # backport py3.8 fixes
+ eapply "${FILESDIR}/${P}-py38.patch"
eapply_user
# Bugs #120001, #167844 and probably more. See patch for description.
diff --git a/sys-devel/distcc/files/distcc-3.3.3-py38.patch
b/sys-devel/distcc/files/distcc-3.3.3-py38.patch
new file mode 100644
index 000..1ba5fee7d87
--- /dev/null
+++ b/sys-devel/distcc/files/distcc-3.3.3-py38.patch
@@ -0,0 +1,53 @@
+From c52a023b8a17e4346c66a8fddee69b40b327eae7 Mon Sep 17 00:00:00 2001
+From: MartB
+Date: Thu, 28 Nov 2019 21:00:59 +0100
+Subject: [PATCH] Replace time.clock() with time.perf_counter()
+
+.clock() got removed in python 3.8 and was marked as deprecated since 3.3
+(https://github.com/python/cpython/pull/13270)
+---
+ include_server/parse_file.py | 4 ++--
+ include_server/statistics.py | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/include_server/parse_file.py b/include_server/parse_file.py
+index d1dcc74..f5d78b7 100755
+--- a/include_server/parse_file.py
b/include_server/parse_file.py
+@@ -272,7 +272,7 @@ def Parse(self, filepath, symbol_table):
+
+ assert isinstance(filepath, str)
+ self.filepath = filepath
+-parse_file_start_time = time.clock()
++parse_file_start_time = time.perf_counter()
+ statistics.parse_file_counter += 1
+
+ includepath_map_index = self.includepath_map.Index
+@@ -338,6 +338,6 @@ def Parse(self, filepath, symbol_table):
+ expr_includes, next_includes)
+
+
+-statistics.parse_file_total_time += time.clock() - parse_file_start_time
++statistics.parse_file_total_time += time.perf_counter() -
parse_file_start_time
+
+ return (quote_includes, angle_includes, expr_includes, next_includes)
+diff --git a/include_server/statistics.py b/include_server/statistics.py
+index 9677af3..7bc9cb8 100755
+--- a/include_server/statistics.py
b/include_server/statistics.py
+@@ -62,13 +62,13 @@ def StartTiming():
+ global start_time, translation_unit_counter
+ """Mark the start of a request to find an include closure."""
+ translation_unit_counter += 1
+- start_time = time.clock()
++ start_time = time.perf_counter()
+
+
+ def EndTiming():
+ """Mark the end of an include closure calculation."""
+ global translation_unit_time, min_time, max_time, total_time
+- translation_unit_time = time.clock() - start_time
++ translation_unit_time = time.perf_counter() - start_time
+ min_time = min(translation_unit_time, min_time)
+ max_time = max(translation_unit_time, max_time)
+ total_time += translation_unit_time
[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/files/, sys-devel/distcc/
commit: 866ab4db4fbdb6a2768152e82137edc6e4a9c9bc
Author: Lars Wendler gentoo org>
AuthorDate: Mon Feb 10 16:05:26 2020 +
Commit: Lars Wendler gentoo org>
CommitDate: Mon Feb 10 16:06:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=866ab4db
sys-devel/distcc: Revbump adding TMPDIR handling to init script
With kind permission from mgorny
Committed straight to stable as we don't change upstream default
without action from the user
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Lars Wendler gentoo.org>
sys-devel/distcc/{distcc-3.3.3.ebuild => distcc-3.3.3-r1.ebuild} | 0
sys-devel/distcc/files/distccd.confd | 5 +
sys-devel/distcc/files/distccd.initd | 4 +++-
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/sys-devel/distcc/distcc-3.3.3.ebuild
b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
similarity index 100%
rename from sys-devel/distcc/distcc-3.3.3.ebuild
rename to sys-devel/distcc/distcc-3.3.3-r1.ebuild
diff --git a/sys-devel/distcc/files/distccd.confd
b/sys-devel/distcc/files/distccd.confd
index bc08d40777d..736527a4a89 100644
--- a/sys-devel/distcc/files/distccd.confd
+++ b/sys-devel/distcc/files/distccd.confd
@@ -35,3 +35,8 @@ DISTCCD_OPTS="${DISTCCD_OPTS} --allow 192.168.0.0/24"
# set this for niceness
# Default is 15
DISTCCD_OPTS="${DISTCCD_OPTS} -N 15"
+
+# By default distccd stores temporary files in /tmp
+# Make sure to give distcc user write permission to
+# the given TMPDIR
+#TMPDIR="/tmp"
diff --git a/sys-devel/distcc/files/distccd.initd
b/sys-devel/distcc/files/distccd.initd
index 7673ff2cf42..963f7b74c12 100644
--- a/sys-devel/distcc/files/distccd.initd
+++ b/sys-devel/distcc/files/distccd.initd
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
depend() {
@@ -11,3 +11,5 @@ command="${DISTCCD_EXEC:-usr/bin/distccd}"
command_args="--user distcc --daemon --no-detach ${DISTCCD_OPTS}"
command_background="true"
pidfile="/run/${RC_SVCNAME}.pid"
+
+export TMPDIR="${TMPDIR:-/tmp}"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/files/, sys-devel/distcc/files/3.1/, ...
commit: dee8c1cf023188cb2bfe67ed2189016c02941bc3
Author: Michał Górny gentoo org>
AuthorDate: Sat Dec 8 11:22:52 2018 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Dec 8 11:25:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dee8c1cf
sys-devel/distcc: Drop old
Signed-off-by: Michał Górny gentoo.org>
sys-devel/distcc/Manifest | 1 -
sys-devel/distcc/distcc-3.1-r10.ebuild | 169 --
sys-devel/distcc/files/3.0/conf| 40
sys-devel/distcc/files/3.0/distcc-config | 122 --
sys-devel/distcc/files/3.1/conf| 35 ---
sys-devel/distcc/files/3.1/init| 31 ---
sys-devel/distcc/files/distcc-3.1-argc-fix.patch | 17 --
.../distcc/files/distcc-3.1-freedesktop.patch | 76 --
sys-devel/distcc/files/distcc-3.1-python.patch | 258 -
sys-devel/distcc/files/distcc-config | 164 -
10 files changed, 913 deletions(-)
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index fecfec3da50..1d4758855f8 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,3 +1,2 @@
-DIST distcc-3.1.tar.bz2 588820 BLAKE2B
fbd00a9cf8af0b2a0c901a60086901e505d9859827a8249ed7937cb8298fc946f6f72470e40dba17e143dbf1525cb0aef4deec3d083268d608f24f1447301df0
SHA512
0ca7167309badf5d36d2783bab398295b52c43fde0355cf1902032c70b27fc40c21729c98af0ee4c0aeea0c48755e4626308e9385d938b7822de27cdb048e7bd
DIST distcc-3.2rc1.tar.bz2 609904 BLAKE2B
e6b928f3b9231524d37bdf86b39cd6a3601b6cdb1e03d913ae562286794240b4dd364d5d01da2176f9bb440809b166b4b877443459751adf8bd3ecf92ceb8476
SHA512
98b2e8423d724bbb6a615d946d170441a8e293310785f867d7a277b318c043a37b0af39ae8ed1f7a0667803de9db1d1925199bad85130cf9bd9cb347635125ee
DIST distcc-3.3.tar.gz 1171281 BLAKE2B
f637cacbfdaaca6efb56e912de55fcfa49e3fffcb8f34649e339f16376250e18a20d30281a46f207992c0b300c726427a3ad5a77bd8976d2993f8f49b9b6b970
SHA512
459c175c8ac905bc70299e77ac11b6d24782bd69c9152126249c9af8fbb4c269e6f7317b02abf50cf6cc0405dd0f887e803320e19dc528a19c4c488640c615dc
diff --git a/sys-devel/distcc/distcc-3.1-r10.ebuild
b/sys-devel/distcc/distcc-3.1-r10.ebuild
deleted file mode 100644
index 49ff6bd8242..000
--- a/sys-devel/distcc/distcc-3.1-r10.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils fdo-mime flag-o-matic multilib python-single-r1 systemd
toolchain-funcs user
-
-DESCRIPTION="Distribute compilation of C code across several machines on a
network"
-HOMEPAGE="http://distcc.org/;
-SRC_URI="https://distcc.googlecode.com/files/${P}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc
x86 ~x86-fbsd"
-IUSE="avahi gtk hardened ipv6 selinux xinetd"
-
-RESTRICT="test"
-
-CDEPEND="${PYTHON_DEPS}
- dev-libs/popt
- avahi? ( >=net-dns/avahi-0.6[dbus] )
- gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${CDEPEND}
- virtual/pkgconfig"
-RDEPEND="${CDEPEND}
- !net-misc/pump
- >=sys-devel/gcc-config-1.4.1
- selinux? ( sec-policy/selinux-distcc )
- xinetd? ( sys-apps/xinetd )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DISTCC_LOG=""
-DCCC_PATH="/usr/$(get_libdir)/distcc/bin"
-DISTCC_VERBOSE="0"
-
-pkg_setup() {
- enewuser distcc 240 -1 -1 daemon
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-3.0-xinetd.patch"
- # bug #253786
- epatch "${FILESDIR}/${PN}-3.0-fix-fortify.patch"
- # bug #255188
- epatch "${FILESDIR}/${P}-freedesktop.patch"
- # bug #258364
- epatch "${FILESDIR}/${P}-python.patch"
- # bug #351979
- epatch "${FILESDIR}/${P}-argc-fix.patch"
- epatch_user
-
- sed -i -e "/PATH/s:\$distcc_location:${DCCC_PATH}:" pump.in || die
-
- # Bugs #120001, #167844 and probably more. See patch for description.
- use hardened && epatch "${FILESDIR}/distcc-hardened.patch"
-}
-
-src_configure() {
- local myconf="--disable-Werror --with-docdir=/usr/share/doc/${PF}"
- # More legacy stuff?
- [ "$(gcc-major-version)" = "2" ] && filter-lfs-flags
-
- # --disable-rfc2553 b0rked, bug #254176
- use ipv6 && myconf="${myconf} --enable-rfc2553"
-
- econf \
- $(use_with avahi) \
- $(use_with gtk) \
- ${myconf}
-}
-
-src_install() {
- # In rare cases, parallel make install failed
- MAKEOPTS+=" -j1"
- default
-
- dobin "${FILESDIR}/3.0/distcc-config"
-
- newinitd "${FILESDIR}/${PV}/init" distccd
- systemd_dounit "${FILESDIR}/distccd.service"
- systemd_install_serviced "${FILESDIR}/distccd.service.conf"
-
- cp "${FILESDIR}/3.1/conf" "${T}/distccd" || die
-
[gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/files/, sys-devel/distcc/, sys-devel/distcc/files/3.2/
commit: b64eb2f7af96867a39670527daa637bc05e2
Author: Sergey Popov gentoo org>
AuthorDate: Thu Oct 22 15:14:39 2015 +
Commit: Sergey Popov gentoo org>
CommitDate: Thu Oct 22 15:17:29 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b64eb2f7
sys-devel/distcc: revision bump
Distcc-config appears to be installed twice, which is wrong.
Also, create separate subdirectory for config files and initscripts,
related to 3.2 branch of package. Drop old revision.
Gentoo-Bug: 523658
Package-Manager: portage-2.2.20
...-3.2_rc1-r3.ebuild => distcc-3.2_rc1-r4.ebuild} | 8 ++---
sys-devel/distcc/files/3.2/conf| 40 ++
.../{distcc-config-3.2_rc1 => 3.2/distcc-config} | 0
sys-devel/distcc/files/3.2/init| 32 +
4 files changed, 75 insertions(+), 5 deletions(-)
diff --git a/sys-devel/distcc/distcc-3.2_rc1-r3.ebuild
b/sys-devel/distcc/distcc-3.2_rc1-r4.ebuild
similarity index 96%
rename from sys-devel/distcc/distcc-3.2_rc1-r3.ebuild
rename to sys-devel/distcc/distcc-3.2_rc1-r4.ebuild
index 29e2e0f..5dbdc16 100644
--- a/sys-devel/distcc/distcc-3.2_rc1-r3.ebuild
+++ b/sys-devel/distcc/distcc-3.2_rc1-r4.ebuild
@@ -76,7 +76,7 @@ src_prepare() {
sed \
-e "s:@EPREFIX@:${EPREFIX:-/}:" \
-e "s:@libdir@:/usr/$(get_libdir):" \
- "${FILESDIR}/distcc-config-3.2_rc1" > "${T}/distcc-config" ||
die
+ "${FILESDIR}/3.2/distcc-config" > "${T}/distcc-config" || die
eaclocal -Im4 --output=aclocal.m4
eautoconf
@@ -102,13 +102,11 @@ src_install() {
default
python_optimize
- dobin "${FILESDIR}/3.0/distcc-config"
-
- newinitd "${FILESDIR}/3.1/init" distccd
+ newinitd "${FILESDIR}/3.2/init" distccd
systemd_dounit "${FILESDIR}/distccd.service"
systemd_install_serviced "${FILESDIR}/distccd.service.conf"
- cp "${FILESDIR}/3.0/conf" "${T}/distccd" || die
+ cp "${FILESDIR}/3.2/conf" "${T}/distccd" || die
if use avahi; then
cat >> "${T}/distccd" <<-EOF
diff --git a/sys-devel/distcc/files/3.2/conf b/sys-devel/distcc/files/3.2/conf
new file mode 100644
index 000..c499271
--- /dev/null
+++ b/sys-devel/distcc/files/3.2/conf
@@ -0,0 +1,40 @@
+# /etc/conf.d/distccd: config file for /etc/init.d/distccd
+
+DISTCCD_OPTS=""
+
+# this is the distccd executable
+DISTCCD_EXEC="/usr/bin/distccd"
+
+# this is where distccd will store its pid file
+DISTCCD_PIDFILE="/var/run/distccd/distccd.pid"
+
+# set this option to run distccd with extra parameters
+# Default port is 3632. For most people the default is okay.
+DISTCCD_OPTS="${DISTCCD_OPTS} --port 3632"
+
+# Logging
+# You can change some logging options here:
+# --log-file FILE
+# --log-level LEVEL [critical,error,warning, notice, info, debug]
+#
+# Leaving --log-file blank will log to syslog
+# example: --log-file /dev/null --log-level warning
+# example: --log-level critical
+
+DISTCCD_OPTS="${DISTCCD_OPTS} --log-level critical"
+
+# SECURITY NOTICE:
+# It is HIGHLY recommended that you use the --listen option
+# for increased security. You can specify an IP to permit connections
+# from or a CIDR mask
+# --listen accepts only a single IP
+# --allow is now mandatory as of distcc-2.18.
+# example: --allow 192.168.0.0/24
+# example: --allow 192.168.0.5 --allow 192.168.0.150
+# example: --listen 192.168.0.2
+DISTCCD_OPTS="${DISTCCD_OPTS} --allow 192.168.0.0/24"
+#DISTCCD_OPTS="${DISTCCD_OPTS} --listen 192.168.0.2"
+
+# set this for niceness
+# Default is 15
+DISTCCD_OPTS="${DISTCCD_OPTS} -N 15"
diff --git a/sys-devel/distcc/files/distcc-config-3.2_rc1
b/sys-devel/distcc/files/3.2/distcc-config
similarity index 100%
rename from sys-devel/distcc/files/distcc-config-3.2_rc1
rename to sys-devel/distcc/files/3.2/distcc-config
diff --git a/sys-devel/distcc/files/3.2/init b/sys-devel/distcc/files/3.2/init
new file mode 100644
index 000..f7009f6
--- /dev/null
+++ b/sys-devel/distcc/files/3.2/init
@@ -0,0 +1,32 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+ need net
+ use avahi-daemon ypbind
+}
+
+start() {
+ ebegin "Starting distccd"
+
+ if [ ! -e /var/run/distccd ] ; then
+ mkdir -p /var/run/distccd
+ chown distcc:daemon /var/run/distccd
+ fi
+
+ # Load PATH and GCC_SPECS from gcc-config, bug #262773
+ eval "$(gcc-config -E)"
+
+ start-stop-daemon --start --quiet --exec "${DISTCCD_EXEC}" --user
distcc -- \
+ --daemon --pid-file "${DISTCCD_PIDFILE}" \
+ ${DISTCCD_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping distccd"
+ start-stop-daemon --stop --quiet --pidfile "${DISTCCD_PIDFILE}"
+ eend $?
+}
