diff options
author | Andrew Savchenko <bircoph@gmail.com> | 2010-10-24 07:08:21 +0400 |
---|---|---|
committer | Andrew Savchenko <bircoph@gmail.com> | 2010-10-24 07:08:21 +0400 |
commit | 3216b770268eff1b162ef5ac5ca442319c365398 (patch) | |
tree | a2679eef3928f7c58671b824655d127c29fae4cc /sys-devel | |
parent | Add userchroot utility (diff) | |
download | bircoph-3216b770268eff1b162ef5ac5ca442319c365398.tar.gz bircoph-3216b770268eff1b162ef5ac5ca442319c365398.tar.bz2 bircoph-3216b770268eff1b162ef5ac5ca442319c365398.zip |
Crosscompile-patched distcc
Add distcc specially patched to 100% correct crosscompilation even
on 64->32 bit compiler.
Diffstat (limited to 'sys-devel')
31 files changed, 3158 insertions, 0 deletions
diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog new file mode 100644 index 0000000..4c849ac --- /dev/null +++ b/sys-devel/distcc/ChangeLog @@ -0,0 +1,1027 @@ +# ChangeLog for sys-devel/distcc +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.205 2009/05/20 17:45:39 armin76 Exp $ + + 20 May 2009; Raúl Porcel <armin76@gentoo.org> distcc-3.1-r4.ebuild: + arm/ia64/s390/sh stable wrt #269322 + + 15 May 2009; Tobias Klausmann <klausman@gentoo.org> distcc-3.1-r4.ebuild: + Stable on alpha, bug #269322 + + 14 May 2009; Markus Meier <maekke@gentoo.org> distcc-3.1-r4.ebuild: + amd64/x86 stable, bug #269322 + + 14 May 2009; Joseph Jezak <josejx@gentoo.org> distcc-3.1-r4.ebuild: + Marked ppc/ppc64 stable for bug #269322. + + 13 May 2009; Jeroen Roovers <jer@gentoo.org> distcc-3.1-r4.ebuild: + Stable for HPPA (bug #269322). + + 11 May 2009; Ferris McCormick <fmccor@gentoo.org> distcc-3.1-r4.ebuild: + Sparc stable, bug #269322. + + 11 May 2009; MATSUU Takuto <matsuu@gentoo.org> -distcc-3.1-r3.ebuild: + Removed old version. + +*distcc-3.1-r4 (07 Apr 2009) + + 07 Apr 2009; MATSUU Takuto <matsuu@gentoo.org> -distcc-3.1-r1.ebuild, + -distcc-3.1-r2.ebuild, +distcc-3.1-r4.ebuild: + Fixed dependency related zeroconf, bug #263939. Removed old versions. + +*distcc-3.1-r3 (19 Mar 2009) + + 19 Mar 2009; MATSUU Takuto <matsuu@gentoo.org> +files/3.1/init, + +files/distcc-3.1-python.patch, +distcc-3.1-r3.ebuild: + Load PATH and GCC_SPECS from gcc-config, bug #262773. Fixed python issue, + bug #258364. + + 13 Mar 2009; Raúl Porcel <armin76@gentoo.org> distcc-3.0-r4.ebuild: + s390 stable wrt #249695 + +*distcc-3.1-r2 (10 Feb 2009) + + 10 Feb 2009; MATSUU Takuto <matsuu@gentoo.org> + +files/distcc-3.0-fix-fortify.patch, -distcc-2.18.3-r13.ebuild, + distcc-3.0-r4.ebuild, -distcc-3.1.ebuild, +distcc-3.1-r2.ebuild: + Fixed -D_FORTIFY_SOURCE=2 issue, bug 253786. + +*distcc-3.1-r1 (01 Feb 2009) + + 01 Feb 2009; MATSUU Takuto <matsuu@gentoo.org> + +files/distcc-3.1-freedesktop.patch, +distcc-3.1-r1.ebuild: + Fixed RFC2553 issue, bug #254176. Fixed icon and menu location, bug + #255188. + + 19 Dec 2008; MATSUU Takuto <matsuu@gentoo.org> distcc-3.0-r4.ebuild: + Added -j1 to emake install, bug #249695. + + 14 Dec 2008; Raúl Porcel <armin76@gentoo.org> distcc-3.0-r4.ebuild: + arm/ia64/sh/x86 stable wrt #249695 + + 14 Dec 2008; Thomas Anderson <gentoofan23@gentoo.org> + distcc-3.0-r4.ebuild: + stable amd64, bug 249695 + + 12 Dec 2008; Ferris McCormick <fmccor@gentoo.org> distcc-3.0-r4.ebuild: + Sparc stable, Bug #249695. + + 11 Dec 2008; Tobias Klausmann <klausman@gentoo.org> distcc-3.0-r4.ebuild: + Stable on alpha, bug #249695 + + 09 Dec 2008; Jeroen Roovers <jer@gentoo.org> distcc-3.0-r4.ebuild: + Stable for HPPA (bug #249695). + + 06 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org> + distcc-3.0-r4.ebuild: + ppc stable, bug #249695 + + 03 Dec 2008; Brent Baude <ranger@gentoo.org> distcc-3.0-r4.ebuild: + stable ppc64, bug 249695 + +*distcc-3.1 (03 Dec 2008) + + 03 Dec 2008; MATSUU Takuto <matsuu@gentoo.org> +distcc-3.1.ebuild: + Version bumped. + + 20 Nov 2008; Mike Frysinger <vapier@gentoo.org> + -files/2.18/distcc-config.patch: + Drop unused patch. + + 16 Nov 2008; MATSUU Takuto <matsuu@gentoo.org> files/3.0/init, + -distcc-3.0-r3.ebuild: + Create /var/run/distccd in init script, bug #247069. Removed old revision. + + 10 Nov 2008; MATSUU Takuto <matsuu@gentoo.org> distcc-3.0-r4.ebuild: + Removed -Werror, bug #244847. + +*distcc-3.0-r4 (05 Nov 2008) + + 05 Nov 2008; MATSUU Takuto <matsuu@gentoo.org> files/3.0/init, + +files/distcc-3.0-uninitialized.patch, +distcc-3.0-r4.ebuild: + Added GCC_SPECS to init.d, bug #164818. Fixed uninitialized issue, bug + #244847. Removed DISTCC_POTENTIAL_HOSTS variable. Added IPv6 elog. + + 05 Nov 2008; MATSUU Takuto <matsuu@gentoo.org> files/3.0/init, + distcc-3.0-r3.ebuild: + Added GCC_SPECS to init.d, bug #164818. Removed DISTCC_POTENTIAL_HOSTS + variable. Added IPv6 elog. + + 02 Nov 2008; Gordon Malm <gengor@gentoo.org> +files/distcc-hardened.patch, + distcc-2.18.3-r10.ebuild, distcc-2.18.3-r13.ebuild, distcc-3.0-r3.ebuild: + Add "hardened" USE flag, fixing bugs #120001, #167844 and probably more. + + 27 Oct 2008; MATSUU Takuto <matsuu@gentoo.org> + +files/distcc-3.0-xinetd.patch, files/3.0/distcc-config, + -files/3.0/xinetd, -distcc-2.18.3-r11.ebuild, -distcc-2.18.3-r12.ebuild, + -distcc-3.0-r2.ebuild, distcc-3.0-r3.ebuild: + Fixed xinetd issue and typo. Clean up distcc-config. Removed old + revisions. + +*distcc-3.0-r3 (26 Oct 2008) + + 26 Oct 2008; MATSUU Takuto <matsuu@gentoo.org> +distcc-3.0-r3.ebuild: + Fixed pump-mode issue. + +*distcc-3.0-r2 (25 Oct 2008) + + 25 Oct 2008; MATSUU Takuto <matsuu@gentoo.org> files/3.0/distcc-config, + +files/3.0/xinetd, files/3.0/init, -distcc-3.0-r1.ebuild, + +distcc-3.0-r2.ebuild: + Added xinetd USE flag. Removed '--install' function from gcc-config and + Added doenvd to src_install. + Added --daemon to /etc/init.d/distcc, bug #216950. + Clean up ebuild. + +*distcc-3.0-r1 (19 Oct 2008) + + 19 Oct 2008; MATSUU Takuto <matsuu@gentoo.org> + +files/distcc-3.0-svn617.patch, metadata.xml, -distcc-3.0.ebuild, + +distcc-3.0-r1.ebuild: + Add myself as a maintainer, bug #234312. Backport patch from svn 617. + +*distcc-3.0 (18 Oct 2008) + + 18 Oct 2008; MATSUU Takuto <matsuu@gentoo.org> +files/3.0/conf, + +files/3.0/init, +files/distcc-3.0-gentoo.patch, +files/3.0/distcc-config, + +distcc-3.0.ebuild: + Version bumped and clean up, bug #234312. + + 17 Aug 2008; Michael Sterrett <mr_bones_@gentoo.org> + distcc-2.18.3-r10.ebuild, distcc-2.18.3-r11.ebuild, + distcc-2.18.3-r12.ebuild, distcc-2.18.3-r13.ebuild: + remove reference to app-admin/eselect-compiler which is long gone + +*distcc-2.18.3-r13 (26 May 2008) + + 26 May 2008; Ryan Hill <dirtyepic@gentoo.org> + +files/distcc-march-native.patch, +distcc-2.18.3-r13.ebuild: + Add patch to always run jobs containing -march=native locally. Bug + #223159. + + 25 Apr 2008; Diego Pettenò <flameeyes@gentoo.org> + distcc-2.18.3-r12.ebuild: + Always run eautoreconf so that --docdir will be always recognised. Depend + on autoconf 2.60 at least so that it supports --docdir for sure. + + 22 Apr 2008; Diego Pettenò <flameeyes@gentoo.org> + files/distcc-avahi-configure.patch, distcc-2.18.3-r12.ebuild: + Fix building with autoconf 2.62 (error in AC_HELP_STRING parameters), + closes bug #218237. Also install documentation in the canonical directory, + closes bug #179586. + + 17 Feb 2008; Alexis Ballier <aballier@gentoo.org> + distcc-2.18.3-r12.ebuild: + set proper deps for unifdef and rekeyword ~x86-fbsd, part of bug #204237 + + 17 Jan 2008; Petteri Räty <betelgeuse@gentoo.org> metadata.xml: + Add myself as the maintainer after getting ok from dberkholz. + +*distcc-2.18.3-r12 (04 Jan 2008) + + 04 Jan 2008; Petteri Räty <betelgeuse@gentoo.org> + +files/distcc-create-dir.patch, +files/distcc-freedesktop.patch, + +distcc-2.18.3-r12.ebuild: + Fix .desktop file installation to follow latest freedesktop specs. Fix the + ebuild to install the gui monitor with gnome -gtk use flags. Create + DISTCC_DIR if it doesn't exist to avoid regular error messages. Fixes bug + #171507. + +*distcc-2.18.3-r11 (04 Jan 2008) + + 04 Jan 2008; Petteri Räty <betelgeuse@gentoo.org> +files/2.18-r1/conf, + +files/2.18-r1/init, +files/distcc-avahi-configure.patch, + +distcc-2.18.3-r11.ebuild: + Add avahi support to distcc and use system copy of popt. Fixes bug #203874 + and bug #179631. + + 25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml: + Removing lisa from metadata.xml as per #23541. + + 28 Apr 2007; Sven Wegener <swegener@gentoo.org> distcc-2.18.3-r10.ebuild: + Fix *initd, *confd and *envd calls (#173884, #174266) + + 26 Apr 2007; Donnie Berkholz <dberkholz@gentoo.org>; metadata.xml: + Update for cluster herd split to hp-cluster and ha-cluster. + + 26 Mar 2007; Alec Warner <antarus@gentoo.org> distcc-2.18.3-r10.ebuild: + Remove dependency on portage: ref bug 162516 + + 04 Mar 2007; Lisa Seelye <lisa@gentoo.org> -distcc-2.16-r2.ebuild, + -distcc-2.16-r3.ebuild, -distcc-2.18.3-r6.ebuild, + -distcc-2.18.3-r7.ebuild, -distcc-2.18.3-r8.ebuild: + Now trying to remove old files! + + 04 Mar 2007; Lisa Seelye <lisa@gentoo.org> -files/2.17/conf, + -files/2.17/init: + Prune old versions and old PATCHLEVEL dirs in files that shouldnt be there. + + 05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> distcc-2.16-r2.ebuild, + distcc-2.16-r3.ebuild, distcc-2.18.3-r6.ebuild, distcc-2.18.3-r7.ebuild, + distcc-2.18.3-r8.ebuild, distcc-2.18.3-r10.ebuild: + Remove gnuconfig_update usage, leave it to econf. + + 17 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> + distcc-2.18.3-r10.ebuild: + Add ~sparc-fbsd keyword. + + 14 Aug 2006; Christian Heim <phreak@gentoo.org> distcc-2.16-r2.ebuild, + distcc-2.16-r3.ebuild, distcc-2.18.3-r6.ebuild, distcc-2.18.3-r7.ebuild, + distcc-2.18.3-r8.ebuild, distcc-2.18.3-r10.ebuild: + Switch default ordering of gcc-config and eselect-compiler to work around + portage bug. + + 06 Jun 2006; Jeremy Huddleston <eradicator@gentoo.org> + distcc-2.16-r2.ebuild, distcc-2.16-r3.ebuild, distcc-2.18.3-r6.ebuild, + distcc-2.18.3-r7.ebuild, distcc-2.18.3-r8.ebuild, + distcc-2.18.3-r10.ebuild: + Updated DEPEND to accept eselect-compiler. + + 02 May 2006; Diego Pettenò <flameeyes@gentoo.org> + distcc-2.18.3-r10.ebuild: + Fix up dependencies and checks for non-GNU userlands (where shadow is not + used) and mark ~x86-fbsd. + + 27 Apr 2006; Alec Warner <antarus@gentoo.org> files/digest-distcc-2.16-r2, + files/digest-distcc-2.16-r3, files/digest-distcc-2.18.3-r6, + files/digest-distcc-2.18.3-r7, files/digest-distcc-2.18.3-r8, Manifest: + Fixing SHA256 digest, pass four + +*distcc-2.18.3-r10 (17 Apr 2006) + + 17 Apr 2006; Lisa Seelye <lisa@gentoo.org> +distcc-2.18.3-r10.ebuild: + Base the new thing on -r7 and not pmasked -r8 with IUSE crosscompile. thanks + agaffney. + +*distcc-2.18.3-r9 (15 Apr 2006) + + 15 Apr 2006; Lisa Seelye <lisa@gentoo.org> +files/distcc-as-needed.patch, + +distcc-2.18.3-r9.ebuild: + --as-needed for bug 128605 + + 19 Feb 2006; Joshua Kinard <kumba@gentoo.org> distcc-2.18.3-r7.ebuild: + Marked stable on mips. + + 05 Sep 2005; Lisa Seelye <lisa@gentoo.org> distcc-2.16-r3.ebuild, + distcc-2.18.3-r8.ebuild: + Change PN to PF for bug #99386. + + 30 Jul 2005; MATSUU Takuto <matsuu@gentoo.org> distcc-2.18.3-r7.ebuild: + Stable on sh. + + 20 Jul 2005; Markus Rothe <corsair@gentoo.org> distcc-2.18.3-r7.ebuild: + Stable on ppc64 + + 17 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org> + distcc-2.18.3-r7.ebuild: + ppc stable + + 02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> + distcc-2.18.3-r7.ebuild: + Stable on alpha. + + 28 Jun 2005; Aron Griffis <agriffis@gentoo.org> distcc-2.16-r3.ebuild, + distcc-2.18.3-r7.ebuild, distcc-2.18.3-r8.ebuild: + Minor ebuild cleanups. Fix use invocation. keepdir does mkdir, so there's no + need to use dodir first + + 19 Jun 2005; Jason Wever <weeve@gentoo.org> distcc-2.18.3-r7.ebuild: + Stable on SPARC. + + 18 Jun 2005; Daniel Goller <morfic@gentoo.org> + files/2.18/distcc-config.patch: + added one more script to array + +*distcc-2.18.3-r8 (18 Jun 2005) + + 18 Jun 2005; Daniel Goller <morfic@gentoo.org> + +files/2.18/distcc-config.patch, +distcc-2.18.3-r8.ebuild: + Added crosscompile USE flag to allow proper cross compilation in multi arch + environments, thanks to Andrew de Quincey on bug #87859 + + 18 Jun 2005; Markus Rothe <corsair@gentoo.org> distcc-2.18.3-r7.ebuild: + added ~ppc64 + +*distcc-2.18.3-r7 (15 Jun 2005) +*distcc-2.16-r3 (15 Jun 2005) + + 15 Jun 2005; Lisa Seelye <lisa@gentoo.org> +distcc-2.16-r3.ebuild, + +distcc-2.18.3-r7.ebuild: + Did a little jiggeypokery with the Gnome/GTK+ monitor: mv distccmon-gnome -> + distccmon-gui and a symlink for backwards compatability. It seems a bit + silly to have the gtk+ monitor called distccmon-gnome (when it isn't). + +*distcc-2.18.3-r6 (18 May 2005) + + 18 May 2005; Lisa Seelye <lisa@gentoo.org> distcc-2.16-r2.ebuild, + -distcc-2.18.3-r2.ebuild, -distcc-2.18.3-r4.ebuild, + -distcc-2.18.3-r5.ebuild, +distcc-2.18.3-r6.ebuild: + Edit ebuilds to comply with bug #92745, inherit gcc -> toolchain-funcs. Also + do a little cleanup. + + 09 May 2005; Aron Griffis <agriffis@gentoo.org> distcc-2.18.3-r2.ebuild: + stable on ia64 + + 19 Mar 2005; Lisa Seelye <lisa@gentoo.org> : + Finally put a test around newuser to test for bootstrap condition (where + shadow is not present) and cleaned out some legacy stuff. + +*distcc-2.18.3-r4 (05 Feb 2005) + + 05 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> + files/distcc-gentoo-multilib-r1.patch, -distcc-2.18.3-r3.ebuild, + +distcc-2.18.3-r4.ebuild: + Fix segfault when freeing argv in the multilib patch. Closes bug #80518. + +*distcc-2.18.3-r3 (30 Jan 2005) + + 30 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> + +files/distcc-gentoo-multilib-r1.patch, +distcc-2.18.3-r3.ebuild: + Let command line arguments override those set by ${ABI}. See bug #78652. + +*distcc-2.18.3-r2 (18 Jan 2005) + + 18 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> + -distcc-2.18.3-r1.ebuild, +distcc-2.18.3-r2.ebuild: + Revbumping to force people to get the updated patch. + + 15 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> + distcc-2.18.3-r1.ebuild: + Stable amd64 for 2005.0. + + 14 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> + files/distcc-gentoo-multilib.patch: + Updating patch to properly initialze newflagsCount. Thanks to Sven Wegener + <swegener@gentoo.org>. + + 12 Jan 2005; Lisa Seelye <lisa@gentoo.org> -distcc-2.17-r1.ebuild, + -distcc-2.18.3.ebuild: + Removed 2.18.3-r1 from p.mask and 2.17-r1 from the repository: no point in + it, especially since users with ~arch will get 2.18.3 anyways. + + 31 Dec 2004; Lisa Seelye <lisa@gentoo.org> : + Added distcc-2.18.3-r1.ebuild with the ABI patch in bug #75420. this release + is package.masked. + + 28 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> + +files/distcc-gentoo-multilib.patch, distcc-2.18.3.ebuild: + Added patch to honor CFLAGS_${ABI}. It's commented out in the ebuild pending + lisa's approval since she's the maintainer. See bug #75420. + + 14 Dec 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.18.3.ebuild: + fix dependency on pkgconfig for only gtk/gnome. bug #68168 + +*distcc-2.18.3 (14 Dec 2004) + + 14 Dec 2004; Lisa Seelye <lisa@gentoo.org> -distcc-2.18.2.ebuild, + +distcc-2.18.3.ebuild, -distcc-2.18.ebuild: + version bump, too + + 14 Dec 2004; Lisa Seelye <lisa@gentoo.org> -distcc-2.18.2.ebuild, + -distcc-2.18.ebuild: + 2.18 and 2.18.2 are outdated by 2.18.3 + + 24 Nov 2004; Hardave Riar <hardave@gentoo.org> distcc-2.16-r2.ebuild, + distcc-2.18.2.ebuild: + Re-enable gnome/gtk support on mips. + +*distcc-2.18.2 (15 Nov 2004) + + 15 Nov 2004; Lisa Seelye <lisa@gentoo.org> +distcc-2.18.2.ebuild: + version bump + +*distcc-2.18 (12 Oct 2004) + + 12 Oct 2004; Lisa Seelye <lisa@gentoo.org> +files/2.18/conf, + +files/2.18/init, +distcc-2.18.ebuild: + New version. Hoorraay; --allow flag is now mandatory. + + 05 Oct 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.16-r2.ebuild: + bump 2.16-r2 on mips + + 05 Oct 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.16-r2.ebuild: + bump to arch on a few arches for 2.16-r2 + + 05 Oct 2004; Lisa Seelye <lisa@gentoo.org> -distcc-2.14-r1.ebuild: + Removing 2.14 due to security concerns bug #66424 + +*distcc-2.16-r2 (17 Sep 2004) + + 17 Sep 2004; Lisa Seelye <lisa@gentoo.org> +distcc-2.16-r2.ebuild: + bump to -r2 for bug #64317... and pending glsa + + 16 Sep 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.16-r1.ebuild: + forgot to bump patchlevel var + +*distcc-2.16-r1 (16 Sep 2004) +*distcc-2.14-r1 (16 Sep 2004) + + 16 Sep 2004; Lisa Seelye <lisa@gentoo.org> -files/2.11.1p/conf, + -files/2.11.1p/init, +distcc-2.14-r1.ebuild, +distcc-2.16-r1.ebuild, + distcc-2.17-r1.ebuild: + And force the users to update with a -r1 on 2.14 and 2.16... + + 16 Sep 2004; Lisa Seelye <lisa@gentoo.org> -files/2.11.1p/conf, + -files/2.11.1p/init, distcc-2.14.ebuild, distcc-2.16.ebuild: + Put old versions on the new "patchlevel" - updating conf and init files. + + 16 Sep 2004; Lisa Seelye <lisa@gentoo.org> -distcc-2.12.1-r1.ebuild, + -distcc-2.13-r1.ebuild, distcc-2.17-r1.ebuild, -distcc-2.17.ebuild: + Doing a bit of tidying and then some fun stuff after + + 13 Sep 2004; Jason Wever <weeve@gentoo.org> distcc-2.16.ebuild: + Stable on sparc. + + 09 Sep 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.16.ebuild: + bump 2.16 to x86 + + 06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> distcc-2.12.1-r1.ebuild, + distcc-2.13-r1.ebuild, distcc-2.14.ebuild, distcc-2.16.ebuild, + distcc-2.17-r1.ebuild, distcc-2.17.ebuild: + Switch to use epause and ebeep, bug #62950 + + 27 Aug 2004; <pyrania@gentoo.org> +files/distcc-config, + -files/2.11.1p/distcc-config, -files/2.17/distcc-config, + distcc-2.12.1-r1.ebuild, distcc-2.13-r1.ebuild, distcc-2.14.ebuild, + distcc-2.16.ebuild, distcc-2.17-r1.ebuild, distcc-2.17.ebuild: + Fixing bug #57421, thanks to Stefan Sperling. Cleaning up older distcc-config + version. + + 22 Aug 2004; Tom Gall <tgall@gentoo.org> distcc-2.16.ebuild: + added ~ppc64, bug #59224 + +*distcc-2.17-r1 (22 Aug 2004) + + 22 Aug 2004; Lisa Seelye <lisa@gentoo.org> + +files/2.17/2.17-ipv6-fix.diff.gz, +files/2.17/conf, + +files/2.17/distcc-config, +files/2.17/init, +distcc-2.17-r1.ebuild: + Adding a patch for 2.17 to enable ipv6, updating the init and conf scripts. + also set the distcc-config script to try and use userid 240. + + 20 Aug 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.17.ebuild: + <@SpanKY> make the first line 'ipv6 does not work with distcc-2.17' ? + +*distcc-2.17 (20 Aug 2004) + + 20 Aug 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.14.ebuild, + distcc-2.16.ebuild, +distcc-2.17.ebuild: + version bump and fix RDEPEND.badindev errors + + 26 Jul 2004; Mike Frysinger <vapier@gentoo.org> distcc-2.16.ebuild: + gnuconfig loving for us non-mainstream users. + +*distcc-2.16 (08 Jul 2004) + + 08 Jul 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.14.ebuild, + -distcc-2.15.ebuild, +distcc-2.16.ebuild: + First: Bumped the testing version to 2.16 (released today) and removed the + 2.15 since it's silly to let people test that when there's no real need + Second: Changed KEYWORDS on 2.14 to -* s390 since s390 had moved to stable and + nothing else had moved (everything is stable on 2.13-r1), so let's have people + on ~arch test 2.16 Third: s390 maintainers, or whoever bumped 2.14 please heed + http://groups.google.com/groups?hl=no&lr=&ie=UTF-8&c2coff=1&safe=off&selm=2fpl + q-1cD-43%40gated-at.bofh.it + +*distcc-2.15 (06 Jul 2004) + + 06 Jul 2004; Lisa Seelye <lisa@gentoo.org> +distcc-2.15.ebuild: + version bump + + 15 May 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.13-r1.ebuild, + distcc-2.14.ebuild: + Add >=gnome-base/gconf-2 as a depend for gnome to resolve bug #50594 + + 15 May 2004; Lisa Seelye <lisa@gentoo.org> : + cleanup of old files + + 12 May 2004; Michael McCabe <randy@gentoo.org> distcc-2.14.ebuild: + Added s390 keywords + +*distcc-2.14 (02 May 2004) + + 02 May 2004; Lisa Seelye <lisa@gentoo.org> +distcc-2.14.ebuild: + bump to 2.14 + + 11 Apr 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.12.1.ebuild, + distcc-2.13-r1.ebuild, distcc-2.13.ebuild: + bump to stable. yell at me if your arch breaks + + 11 Apr 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.12.1.ebuild, + distcc-2.13.ebuild: + General cleanup of old ebuilds & digests. + + 21 Mar 2004; Lisa Seelye <lisa@gentoo.org> files/2.11.1p/init: + Change the init script to do TMPDIR=TMPDIR basically so that the user can + inherit a new TMPDIR location. Closes bug #44915 + +*distcc-2.13-r1 (06 Mar 2004) +*distcc-2.12.1-r1 (06 Mar 2004) + + 06 Mar 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.12.1-r1.ebuild, + distcc-2.13-r1.ebuild: + chown /var/run/distccd for distcc:daemon after install since in some cases its + being reset to root:root + +*distcc-2.13 (02 Mar 2004) + + 02 Mar 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.13.ebuild, + files/2.11.1p/conf, files/2.11.1p/init: + Version bump and to remove DISTCC_DIR remnants from the daemon config files + (see bug #42947). the config files are non critical, since an unuse envvar + never hurt anyone i will not bump 2.12.1. + + 22 Feb 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.11.1.ebuild, + distcc-2.11.2-r1.ebuild, distcc-2.11.2.ebuild, distcc-2.8-r2.ebuild, + distcc-2.9.ebuild: + Removing old stuff since everyone is now stable on 2.12.1. (cool huh) + + 22 Feb 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.12.1.ebuild: + Move 2.12.1 to stable on ppc. Directory cleanup in this dir to follow + shortly.... + + 22 Feb 2004; Aron Griffis <agriffis@gentoo.org> distcc-2.12.1.ebuild: + stable on alpha + + 21 Feb 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.11.1.ebuild, + distcc-2.11.2-r1.ebuild, distcc-2.11.2.ebuild, distcc-2.12.1.ebuild, + distcc-2.5-r1.ebuild, distcc-2.8-r2.ebuild, distcc-2.9.ebuild: + remove arm keyword from old ebuilds. i will clean (rdepend.bad and prune) + these up shortly... + + 21 Feb 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.12.1.ebuild: + Bump 2.12.1 to stable across several arches - still need to hear from alpha + and ppc. Also add amd64 and ia64 to keyword + + 11 Jan 2004; Markus Nigbur <pyrania@gentoo.org> distcc-2.11.2-r1.ebuild, + distcc-2.11.2.ebuild, distcc-2.12.1.ebuild: + Changed the distcc-config related ewarn message. + + 11 Jan 2004; Markus Nigbur <pyrania@gentoo.org> files/2.11.1p/distcc-config: + Removing verbose msg from writeenv. + + 10 Jan 2004; Markus Nigbur <pyrania@gentoo.org> files/2.11.1p/distcc-config: + Restarting the daemon is no good. + +*distcc-2.12.1 (09 Jan 2004) + + 09 Jan 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.12.1.ebuild: + This is a version bump with some pretty big fixes (setuid/gid ordering, gentoo + bug #37592) and more. + + 05 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> files/2.10/distcc-config, + files/2.11/distcc-config, files/2.8/distcc-config, files/2.9/distcc-config: + fix tail -1 stuff in distcc-config files + +*distcc-2.12 (24 Dec 2003) + + 24 Dec 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.12.ebuild, + files/setuid-2.12-order-fix.gz: + Version bump, which includes IPv6 support (shoulda been in last one, but oh + well), and a setuid patch that was posted to the distcc ml by Wayne Davison + <wayned@samba.org> (this patch fixes the order in which setuid happens in + the daemon startup) + + 11 Dec 2003; Markus Nigbur <pyrania@gentoo.org> files/2.11.1p/distcc-config: + Fixed distcc-config. See bug #27432 for details. + + 06 Dec 2003; Lisa Seelye <lisa@gentoo.org> files/2.11/distcc-config, + files/2.11.1p/distcc-config: + fix distcc-config to default to uid 240, to close bug 35096 + + 06 Dec 2003; Lisa Seelye <lisa@gentoo.org> files/2.11.1p/distcc-config: + fix distcc-config to default to uid 240, to close bug 35096 (will fix the + lower versions in a second) + +*distcc-2.11.2-r1 (21 Nov 2003) + + 21 Nov 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.11.2-r1.ebuild, + files/2.11.1p/distcc-config: + New distcc-config from bug 27432; fixes comment 18 + + 03 Nov 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.11.1.ebuild: + Bump to arch on mips for 2.11.1 + + 01 Nov 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.11-r1.ebuild, + distcc-2.11-r2.ebuild: + Cleaning up a little. These two ebuilds (2.11-r1,r2) are obsolete + + 24 Oct 2003; Chris PeBenito <pebenito@gentoo.org> distcc-2.10-r3.ebuild, + distcc-2.11-r1.ebuild, distcc-2.11-r2.ebuild, distcc-2.11.1-r1.ebuild, + distcc-2.11.1.ebuild, distcc-2.11.2.ebuild, distcc-2.5-r1.ebuild, + distcc-2.8-r2.ebuild, distcc-2.9.ebuild: + Add in selinux to IUSE, since I forgot to do it when I added the selinux RDEP. + +*distcc-2.11.2 (23 Oct 2003) + + 23 Oct 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.11.1.ebuild, + distcc-2.11.2.ebuild: + Version bump, using the new distcc-config + + 23 Oct 2003; Jason Wever <weeve@gentoo.org> distcc-2.10-r3.ebuild: + Marked stable on sparc. + +*distcc-2.11.1-r1 (18 Oct 2003) + + 18 Oct 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.11.1-r1.ebuild, + files/2.11.1p/conf, files/2.11.1p/distcc-config, files/2.11.1p/init: + Distcc-2.11.1-r1 is to test distcc-config rewritten in python as per bug + 27432. Thanks to Pyrania for the rewrite. + +*distcc-2.11.1 (08 Oct 2003) + + 08 Oct 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.11.1.ebuild: + version bump. gtk non using gnome users should be happy! + +*distcc-2.11-r2 (24 Sep 2003) + + 24 Sep 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.11-r2.ebuild: + gtk again + +*distcc-2.11-r1 (24 Sep 2003) + + 24 Sep 2003; Lisa Seelye <lisa@gentoo.org distcc-2.11-r1.ebuild: + -m Fix bug 29511. Seems as if the depends were silently changed. + +*distcc-2.11 (23 Sep 2003) + + 23 Oct 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.11.1.ebuild: + Move 2.11.1 to stable on a few arches, going to move the rest ASAP. + + 23 Sep 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.11.ebuild, + files/2.11/conf, files/2.11/distcc-config, files/2.11/init: + Version bump, and it now requires Portage-2.0.49-r6 or greater. + +*distcc-2.10-r3 (15 Sep 2003) + + 15 Sep 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.10-r3.ebuild, + files/2.10/conf, files/2.10/distcc-config, files/2.10/init: + Moved DISTCC_DIR to /etc/make.conf and resolved bug 26697. + +*distcc-2.10-r2 (15 Aug 2003) + + 15 Aug 2003; Seemant Kulleen <seemant@gentoo.org> distcc-2.10-r2.ebuild: + fixed the distcc_log env installation on installation. Lisa gave me the fix to + commit while she has technical issues. So please don't think I'm maintaining + it, coz I'm not :) + +*distcc-2.10-r1 (13 Aug 2003) + + 13 Aug 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.10-r1.ebuild: + Fix the ebuild. should be doing distcc-config --install, too + + 12 Aug 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.9.ebuild: + Mark distcc 2.9 stable on x86. + +*distcc-2.10 (12 Aug 2003) + + 12 Aug 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.10.ebuild, files/2.10/conf, + files/2.10/distcc-config, files/2.10/init: + add distcc 2.10 and related files + + 10 Aug 2003; Chris PeBenito <pebenito@gentoo.org> distcc-2.5-r1.ebuild, + distcc-2.8-r2.ebuild, distcc-2.9.ebuild: + Add selinux policy to RDEP + + 08 Aug 2003; Lisa M. Seelye <lisa@gentoo.org> files/2.8/conf, + files/2.8/init, files/2.9/conf, files/2.9/init: + Incorporated bug 26204 into the conf and init scripts (DISTCC_TMPDIR), and + added a CVS Header + + 08 Aug 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.5-r1.ebuild, + distcc-2.8-r2.ebuild, distcc-2.9.ebuild: + updated guide document URI + +*distcc-2.8-r1 (08 Aug 2003) + + 08 Aug 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.5.ebuild, distcc-2.7.1.ebuild, + distcc-2.7.ebuild, distcc-2.8-r1.ebuild, distcc-2.8.ebuild, + files/2.7.1/001_fix_tmpdir.patch.gz, files/2.7.1/conf, + files/2.7.1/distcc-config, files/2.7.1/init: + Cleaning the repository. non x86 will go from 2.5-r1 to 2.8-r2 or 2.9. There + is no need to keep the old ones around. + + 04 Aug 2003; Aron Griffis <agriffis@gentoo.org> distcc-2.8-r2.ebuild: + Mark stable on alpha. Fix formatting and some errors in ChangeLog + + 02 Aug 2003: Lisa Marie Seelye <lisa@gentoo.org> ChangeLog : + Added a metadata.xml file. Initially under the `cluster' herd. Also + normalized this file (distcc-2.8) to have most recent dates at the top of + the file + +*distcc-2.9 (21 Jul 2003) + + 24 Aug 2003; Guy Martin <gmsoft@gentoo.org> distcc-2.9.ebuild : + Added hppa to KEYWORDS. + + 21 Jul 2003: Lisa Marie Seelye <lisa@gentoo.org> : + New version released and committed (Still with the patch to fix tmpdir) + Updated distcc-config to reflect bug #24972 I'll make this change in + all versions in the repository. + +*distcc-2.8 (09 Jul 2003) + + 06 Aug 2003; Lisa Marie Seelye <lisa@gentoo.org> distcc-2.8-r2.ebuild: + Marked 2.8-r2 stable on sparc thanks todd + + 05 Aug 2003; Guy Martin <gmsoft@gentoo.org> distcc-2.8-r2.ebuild : + Marked stable on hppa. + + 27 Jul 2003; Lisa Marie Seelye <lisa@gentoo.org> : + Bumped distcc-2.8-r2 to x86 + + 13 Jul 2003; Lisa Marie Seelye <lisa@gentoo.org> : + (files/2.8/conf) Added a --port to DISTCC_OPTS (/etc/conf.d/distccd) to + change the running port. + (distcc-2.8-r2.ebuild) Added a note to the backup distcc website + + 12 Jul 2003; Lisa Marie Seelye <lisa@gentoo.org> : + Oops. :) `gtk' is preferred over `gtk2'. Thanks Spider for the + heads up! + + 10 Jul 2003; Lisa Marie Seelye <lisa@gentoo.org> : + New version released and committed (Still with the patch to fix tmpdir) + +*distcc-2.7.1 (01 Jul 2003) + + 21 Jul 2003; Lisa Marie Seelye <lisa@gentoo.org> : + Updated distcc-config to reflect bug #24972 + + 17 Jul 2003; Lisa Marie Seelye <lisa@gentoo.org> : + Changed gnome stuff to gtk. How on earth did this get missed?? + + 14 Jul 2003; Lisa Marie Seelye <lisa@gentoo.org> : + Updated the "How-to" website URI in the .ebuild + + 10 Jul 2003; Lisa Marie Seelye <lisa@gentoo.org> : + Moved to x86 (from ~x86) + + 04 Jul 2003; Joshua Kinard <kumba@gentoo.org> : + Fixed b0rked digests + + 01 Jul 2003; Karl Trygve Kalleberg <karltk@gentoo.org> : + distcc-2.7.ebuild, files/2.7.1/distcc-config, files/2.7.1/conf, + files/2.7.1/init, files/2.7.1/001_fix_tmpdir.patch.gz: + New upstream version. Ebuild submitted by Lisa Marie <lisa@thedoh.com>. + This version is self-contained, so previous versions may be nuked at + whim. + +*distcc-2.7 (16 Jun 2003) + + 17 Jun 2003; Mike Frysinger <vapier@gentoo.org> distcc-2.7.ebuild: + Filter out large file flags on gcc-2.x machines. + + 16 Jun 2003; Zach Welch <zwelch@gentoo.org> distcc-2.7.ebuild: + bump version; add support provided by Lisa Marie in bug 22914 + + 04 Jun 2003; Zach Welch <zwelch@gentoo.org> distcc-2.5-r1.ebuild: + mark 2.5-r1 stable on all arches; update web page address to use new wiki + restore truncated change log, oopsie. + +*distcc-2.5-r1 (30 May 2003) + + 30 May 2003; Zach Welch <zwelch@gentoo.org> distcc-2.5-r1.ebuild, + files/2.3/distcc-config: + update to fix problems with DISTCC_HOSTS when upgrading from earlier versions + +*distcc-2.5 (27 May 2003) + + 27 May 2003; Zach Welch <zwelch@gentoo.org distcc-2.5.ebuild, + files/1.2/init: + new version; fixes to init script as proposed by agriffis@gentoo.org + +*distcc-2.4.2 (23 May 2003) + + 23 May 2003; Hanno Boeck <hanno@gentoo.org> distcc-2.4.2.ebuild: + New version. + +*distcc-2.4 (21 May 2003) + + 21 May 2003; Zach Welch <zwelch@gentoo.org distcc-2.3.ebuild, + files/2.3/distcc-config, distcc-2.4.ebuild: + Update to latest versions; updates to distcc-config to use new + DISTCC_HOSTS configuration. May require some cleaning of previous + settings, notably DISTCC_HOSTS in /etc/env.d/02distcc + +*distcc-2.0.1 (31 Mar 2003) + + 28 Apr 2003; Zach Welch <zwelch@gentoo.org> distcc-0.12.ebuild, + distcc-0.12.ebuild, distcc-0.15.ebuild, distcc-0.15.ebuild, + distcc-1.0.ebuild, distcc-1.0.ebuild, distcc-1.1-r11.ebuild, + distcc-1.1-r11.ebuild, distcc-1.1-r8.ebuild, distcc-1.1-r8.ebuild, + distcc-1.1.ebuild, distcc-1.1.ebuild, distcc-1.2.1.ebuild, + distcc-1.2.1.ebuild, distcc-1.2.3.ebuild, distcc-1.2.3.ebuild, + distcc-1.2.ebuild, distcc-1.2.ebuild, files/distccd, files/distccd.1, + files/distccd.2, files/distccd.4, files/wrapper-1.1.patch, + files/1.2/distcc-config, files/1.2/wrapper.patch, files/1.2.1/distcc-config, + files/1.2.1/wrapper.patch, files/1.2.3/distcc-config: + Bump distcc-2.0.1 revision and add new --set-j option for setting MAKEOPTS. + Remove old versions that are no longer needed or desired. + + 17 Apr 2003; Zach Welch <zwelch@gentoo.org> files/1.2.3/distcc-config: + fix distcc-config to add DCCC_QUIET + + 31 Mar 2003; Zach Welch <zwelch@gentoo.org> distcc-2.0.1.ebuild, + files/1.2.3/distcc-config: + bump version to close bug 18566; masquerade patch now mainlined + info file removed upstream; add --help to distcc-config + +*distcc-1.2.3-r3 (17 Mar 2003) + + 17 Apr 2003; Zach Welch <zwelch@gentoo.org> distcc-1.2.3-r3.ebuild: + bump to stable for all arches + + 19 Mar 2003; Aron Griffis <agriffis@gentoo.org> distcc-1.2.3-r3.ebuild: + Mark stable on alpha + + 17 Mar 2003; Zach Welch <zwelch@gentoo.org> distcc-1.2.3-r1.ebuild, + files/1.2.3/distcc-config: + set ROOTPATH, refactor env-update code, rename env file + +*distcc-1.2.3-r2 (17 Mar 2003) + + 17 Mar 2003; Zach Welch <zwelch@gentoo.org> files/1.2.3/distcc-config: + usability additions, see online docs for info + + 17 Mar 2003; Zach Welch <zwelch@gentoo.org> distcc-1.2.3-r1.ebuild, + distcc-1.2.3-r1.ebuild, distcc-1.2.3-r2.ebuild, files/1.2.3/distcc-config: + fix einfo issue in new config function + +*distcc-1.2.3-r1 (17 Mar 2003) + + 17 Mar 2003; Zach Welch <zwelch@gentoo.org> distcc-1.2.3-r1.ebuild, + files/1.2.3/distcc-config, files/1.2.3/info.patch: + Add distcc environment file and options to distcc-config to manage it + Fix ebuild to address defects reported in but 17716 + +*distcc-1.2.3 (03 Mar 2003) + + 11 Mar 2003; Zach Welch <zwelch@gentoo.org> distcc-1.2.3.ebuild, + files/1.2.1/distcc-config: + add shadow as DEPEND (for now), fix distcc-config if shadow tools not + installed (for later) + + 07 Mar 2003; Zach Welch <zwelch@gentoo.org> distcc-1.2.3.ebuild: + mark distcc-1.2.3 as stable on x86 and ppc + + 03 Mar 2003; Zach Welch <zwelch@gentoo.org> distcc-1.2.3.ebuild, + files/1.2.3/wrapper.patch: + Bump to latest bug release version + +*distcc-1.2.1 (26 Feb 2003) + + 26 Feb 2003; Zach Welch <zwelch@gentoo.org> distcc-1.2.1.ebuild, + files/1.2.1/distcc-config, files/1.2.1/wrapper.patch: + New version, with fixes for installs under strange ROOTs + Moved user creation, directory fixups into distcc-config script + Fix typo in conf script; fixes bug 16432 + +*distcc-1.2 (21 Feb 2003) + + 21 Feb 2003; Zach Welch <zwelch@gentoo.org> distcc-1.2.ebuild : + Add new version, cleanup patch from 1.1-r11 + Add initial distcc-config script + +*distcc-1.1-r11 (17 Feb 2003) + + 21 Feb 2003; Zach Welch <zwelch@gentoo.org> distcc-1.1-r11.ebuild : + Remove extra cp of $S + + 19 Feb 2003; Zach Welch <zwelch@gentoo.org> distcc-1.1-r11.ebuild : + Added arm to keywords. + + 19 Feb 2003; Guy Martin <gmsoft@gentoo.org> distcc-1.1-r11.ebuild : + Added ~hppa to keywords. + + 18 Feb 2003; Zach Welch <zwelch@gentoo.org> : + Updated to fix minor bugs in -r11 + +*distcc-1.1-r10 (17 Feb 2003) + + 17 Feb 2003; Zach Welch <zwelch@gentoo.org> : + Add /var/run/distccd for pid and distcc user... (bugs 15048 and 15769) + Updated to fix minor bugs in original -r10 + +*distcc-1.1-r9 (17 Feb 2003) + + 17 Feb 2003; Zach Welch <zwelch@gentoo.org> : + Fix location of pid file... (bug 15769) + Fix einfo Portage version reference + (THIS VERSION IS BROKEN - ztw) + +*distcc-1.1-r8 (10 Feb 2003) + + 17 Feb 2003; Zach Welch <zwelch@gentoo.org> : + Fix einfo Portage version reference + + 15 Feb 2003; Zach Welch <zwelch@gentoo.org> : + Extended einfo and added link to configuration page + + 10 Feb 2003; Zach Welch <zwelch@gentoo.org> : + Includes wrapper-1.1.patch from bug 13897; now installs symlinks + in /usr/lib/distcc/bin to gcc, g++, and others. Users should no + longer set CC or CXX to distcc; instead, for non-portage builds, + set PATH="/usr/lib/distcc/bin:$PATH". See the follow for more info: + http://gentoo.superlucidity.net/www/distcc.html + +*distcc-1.1 (26 Jan 2003) + + 26 Jan 2003; Brad Cowan <bcowan@gentoo.org> distcc-1.1.ebuild, + files/digest-distcc-1.1: + + Bumped version. + +*distcc-1.0 (15 Jan 2003) + + 15 Jan 2003; Brad Cowan <bcowan@gentoo.org> distcc-1.0.ebuild, + files/digest-distcc-1.0: + + Bumped version. Added new init script thanks to Eric Andreson (Ndiin). + + 16 Dec 2002; Aron Griffis <agriffis@gentoo.org> distcc-0.15.ebuild: + Added ~alpha to KEYWORDS + +*distcc-0.15 (12 Dec 2002) + + 12 Dec 2002; Brad Cowan <bcowan@gentoo.org> distcc-0.15.ebuild, + files/digest-distcc-0.15: + + Bumped version. + +*distcc-0.14-r1 (11 Dec 2002) + + 11 Dec 2002; Brad Cowan <bcowan@gentoo.org> distcc-0.14-r1.ebuild, + files/digest-distcc-0.14-r1: + + Removed bad info file. + +*distcc-0.14 (16 Nov 2002) + + 16 Nov 2002; Brad Cowan <bcowan@gentoo.org> distcc-0.14.ebuild, + files/digest-distcc-0.14 : + + Version bump. + +*distcc-0.13 (12 Nov 2002) + + 12 Nov 2002; Brad Cowan <bcowan@gentoo.org> distcc-0.13.ebuild, + files/digest-distcc-0.13 : + + Version bump, with many major bugfixes. + +*distcc-0.12 (07 Oct 2002) + + 12 Nov 2002; Mark Guertin <gerk@gentoo.org> distcc-0.12.ebuild : + Added ppc to keywords again. + + 13 Oct 2002; Brad Cowan <bcowan@gentoo.org> distcc-0.12.ebuild, + files/distccd : + + Added distccd init script. + + 22 Sep 2002; Brad Cowan <bcowan@gentoo.org> distcc-0.12.ebuild : + + Version bump. + +*distcc-0.11 (25 Sep 2002) + + 22 Sep 2002; Brad Cowan <bcowan@gentoo.org> distcc-0.11.ebuild : + + Version bump. + +*distcc-0.10.1 (17 Sep 2002) + + 17 Sep 2002; Brad Cowan <bcowan@gentoo.org> distcc-0.10.1.ebuild : + + Version bump, updated docs. + +*distcc-0.8 (20 Aug 2002) + + 20 Aug 2002; Maik Schreiber <blizzy@gentoo.org> : New release. + +*distcc-0.7 (06 Aug 2002) + + 06 Aug 2002; Maik Schreiber <blizzy@gentoo.org> : New release. + +*distcc-0.6 (12 Jul 2002) + + 25 Jul 2002; Mark Guertin <gerk@gentoo.org> : Added ppc to + keywords + + 12 Jul 2002; Maik Schreiber <blizzy@gentoo.org> : New release. + +*distcc-0.5 (05 Jul 2002) + + 05 Jul 2002; Daniel Robbins <drobbins@gentoo.org> : new release + that includes missing KEYWORDS, SLOT, LICENSE and new man pages, + closes bug #4506. + +*distcc-0.4 (21 Jun 2002) + + 07 Jun 2002; Ryan Phillips <rphillips@gentoo.org> : Added popt + dep. Fixes # 4466. Thanks to Michael Grigoriev + + 21 Jun 2002; Ryan Phillips <rphillips@gentoo.org> : New release + +*distcc-0.3 (21 Jun 2002) + + 21 Jun 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest new file mode 100644 index 0000000..14191ab --- /dev/null +++ b/sys-devel/distcc/Manifest @@ -0,0 +1,33 @@ +AUX 2.18-r1/conf 1345 RMD160 6921e75f3d71ecebf66ebf4356482655ff1d0a19 SHA1 89aa69c5cc8a645fe3ff11282cd230c3a3dd898a SHA256 c48a04bd789d38682c8e1003f891a4428e5bb457696578afe56a913ec003fdef +AUX 2.18-r1/init 927 RMD160 11638f1be4f1a55414517e9982b3a2ee508b9b9d SHA1 6456b0af8e63112258fd401afc1abe7b578004cb SHA256 3b7343b659ce864da8b730d2bf2c221de6446d6afc935f7686d85fc8d0983167 +AUX 2.18/conf 1267 RMD160 a12045786088255c9bc8f4ad826928c00efac567 SHA1 828f62bee16cfb4b2667cdbda5a18e9516bcf969 SHA256 51365685f2f02c6f2846e4b35ed1ae3628999ed5035af3ad0c7b2d68acfe7c3d +AUX 2.18/init 733 RMD160 935e52d2ddfc6363f26a916666bbbc28b6fdb79b SHA1 737e969b122c70df6d54c7a98bfdc872af278ff6 SHA256 1477ab79b8be398b6acb7d44e0f0a66bb75d1918365b350b824e16b8b02af22b +AUX 3.0/conf 1286 RMD160 52f0fb469fc83b2f28f032c81515773d09add0d5 SHA1 4860a6e2eea10d918058b0cdcb76ac196a2d7992 SHA256 28fa9a9ce30c9f979eac3d5be3fc64f199ecffa9d7e38e02f11957019152dc46 +AUX 3.0/distcc-config 3402 RMD160 ef72502f3b69d86884fcc038d84105be46b952f2 SHA1 bbef02b51241439f64a679c72b69428035a8c2a8 SHA256 b37627554a6b55671770dd005c85a68a3db83a0b9a5669517c11064b76086e71 +AUX 3.0/init 846 RMD160 313ba4a8b611254bd333364f54bd7dc73d988283 SHA1 4e4a271486ea78d4d126df5d3ee2a6d38af13b0e SHA256 ca81ef66534013ec10a10e3e58610170938b54fb75ced23e3507ebd166be99cc +AUX 3.1/init 776 RMD160 a25d940287d0b87d2f9929d5a9f74ba7253124c6 SHA1 405eea7cb18b2c6015e0dada8878bcec2b8d09f7 SHA256 a902eccf102174e1ebb552cf8d078d42105787cfd8d9b11a120143a5131af98b +AUX distcc-3.0-fix-fortify.patch 313 RMD160 e5edc96a4bc4fe06a58878011cbb466184946b3e SHA1 386ee72a9d0b620dfc3aa75324060f764ed44e6d SHA256 7b57ae28dcef0c1ecd273a8a10dd1a16fa6a7af618d5438e1fe4398863fa8901 +AUX distcc-3.0-gentoo.patch 1225 RMD160 5c305052c9ee62c7d60377b26e53f69a67438b39 SHA1 7114da1f2ddda38498d19a685782da48a8b37f30 SHA256 ba1895fa906ba18490b722f9eda07a96459949d879412c2aba0218f8854ca7cc +AUX distcc-3.0-svn617.patch 533 RMD160 64c8712a9290b1fef776ca5517074748a0ec9255 SHA1 7b9b661b21aea2e1a338b3ed890c6bd7dc8064e3 SHA256 902d6715f443fceb7c799bcf4f82d637569db2da900be5e36bb40b57a3e9fa84 +AUX distcc-3.0-uninitialized.patch 448 RMD160 706d9923d257f7616775d55b287e02fb133dbdd9 SHA1 7275a1d4c314abc0ddac572cb85b49efaedee97b SHA256 2d4b0aefbe1e0245881d35c572605ee8f3c52e43316482041fadadc31e5fa9a6 +AUX distcc-3.0-xinetd.patch 558 RMD160 c69f8a379ec543972fac6ec3066989c5393223f3 SHA1 58d4393c6cdd3546f35efc57021de496c66c239d SHA256 9ef11743e91167548ac6324aa21608a62fd09149a8dbdbab32602f70804e0560 +AUX distcc-3.1-crosscompile.patch 4967 RMD160 47a76a5185224cb0a8289921ab9e575118a7799d SHA1 40ac3881eee04512645f40c286a3483c2cb6a5d7 SHA256 2522c3b0dc397424344cd80eaa66f6c6269fcdcca642e97d0835d60fc1b45686 +AUX distcc-3.1-freedesktop.patch 2959 RMD160 e2d503b80174709d0c416fd4feea8414e4a7900c SHA1 007161b1bec7a8d5b70e46077b307de21e2a7e1c SHA256 bf8694f4d1eb5e757615929bc58587f538ce733891097eb42204423cab644798 +AUX distcc-3.1-python.patch 10754 RMD160 6f4f5b2e8ec24ea969002cb00fc3d4a624edc65a SHA1 34f73e4f0494066be528339e5ac0956fb95414da SHA256 8ba3c0745a30b5901cfb37f4231d754e5779cbc5a6fa173fb196661d2a035cc2 +AUX distcc-as-needed.patch 558 RMD160 faebf24490e3dd2a5247cfb6914dc88fb7b98e35 SHA1 5e5547032b6492f9f8b0511fd621a005dbd455a2 SHA256 9e87d3b0487ffc52ccf6362866e967dff9c2a85681175096ece11413f8c91e54 +AUX distcc-avahi-configure.patch 1263 RMD160 de3ba2d651b5a76d5ee71cde79a2555f77a70b1b SHA1 eddae708be95f4bbd7cbfed53439e2dc38a979e8 SHA256 9d967456da6631845b4262ae7508948d629764149fd568c367e76e89168bb132 +AUX distcc-config 4874 RMD160 07bd612fc11c785691bd56e4e7bb7994a2e4dbb8 SHA1 85b5f38d6024e4f454bfa07d96c13b4749ce3e2a SHA256 c6a7bb74eb235fd7896ca101c033a2e9faf80afeb7232bff3afe22f8a6268a5c +AUX distcc-create-dir.patch 1404 RMD160 c9c878715ac02952d791da8776952e69d5de7e57 SHA1 387572bc6c05896386aef50db0d490168c1058f1 SHA256 b327b879f200d7a78cfe665cdba864e4d92a9fdecdd81149d75d72c8ba756bde +AUX distcc-freedesktop.patch 2519 RMD160 98020f40eebe7ca9cd629e602a9ff216df0b97f9 SHA1 1cdcacc021a51ad3469ab16b90f43379538629f9 SHA256 632f7865da9f35773fb95df53ae77089e1bbf7aa936b86d0f4b938603a8c37c3 +AUX distcc-gentoo-multilib-r1.patch 4245 RMD160 175cb4c2ce0e8ecb2262165b3fd9a0d89ddc7beb SHA1 f617965969e7b4afd1b6467a56fe0f7f748c7717 SHA256 78839f7392769ab41509e84f07c36d07315d0220f7aacbb174ed1aba80b9c28d +AUX distcc-gentoo-multilib.patch 3784 RMD160 f48a3f2f8c82379c30c9da0e49aa66ba34681882 SHA1 5a3ba956caaab2d5c6ef44ee3ded10a33ac870dc SHA256 d3af7a7592d0a11a35d294022b36feca2fb625e4799513bf56a79e0656278403 +AUX distcc-hardened.patch 1084 RMD160 0f11c9c8e8b56e91399b054fb57566e290a0baa5 SHA1 746f1905a9bc45ea7b71d71f4b1feba7d96d0f7f SHA256 dcf63f201cb7f4bf13eeb1485a5056c64370b9239d28e4acc77a47046dcda6cf +AUX distcc-march-native.patch 934 RMD160 29908d5b5c4622285a78f221b2633e3ee495a648 SHA1 e1ac6912d55c9b3dda9b6f1a03c973ad1a85f359 SHA256 bc95daad65a3c3a7429b94b432b5d2aa470cb50d6e67c65303865df1e28831e7 +DIST distcc-2.18.3.tar.bz2 341601 RMD160 c7ac6f3e161dccf39b841b57a3328b4208d28c2d SHA1 88e4c15826bdbc5a3de0f7c1bcb429e558c6976d SHA256 6500f1bc2a30b1f044ebed79c6ce15457d1712263e65f0db7d6046af262ba434 +DIST distcc-3.0.tar.bz2 582700 RMD160 1e187fe09129dcc6e561bfb0cd0db9a43619acca SHA1 90cea1d7500e95d3c698e6ab9b9536a946f62824 SHA256 bb6f5674b619ef1438da67739d982e8a6b11e01f748708e0fcbe371c02f020fe +DIST distcc-3.1.tar.bz2 588820 RMD160 82229c230e6917b0df7db275460579b02dbf6b60 SHA1 30663e8ff94f13c0553fbfb928adba91814e1b3a SHA256 f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89 +EBUILD distcc-2.18.3-r10.ebuild 5142 RMD160 64d8b7d135334e023aa4450be62da861ea591298 SHA1 8de697fc7beddfab8192be91ca27faeb4074dd25 SHA256 2dfc6ea7957cb4baf1632bac8d417be835cb6b893f83fbefece100b782ae55fe +EBUILD distcc-3.0-r4.ebuild 4590 RMD160 624db18d0f56a00181e2d2897020f8e6e082fe82 SHA1 6d87b0491d21d599da3e9c56e329009b6a82a2e2 SHA256 417ffc3783df12916ff68402072c2684d46579b082dce14b567c91f3df0356e1 +EBUILD distcc-3.1-r4.ebuild 4516 RMD160 2bb97b3dd05e04fe04b0df7c69351bb7e54beb79 SHA1 f89835e957e4d375f208bcf974ab5563cbeb061a SHA256 e9226e201d1672657972ea79041c1f4751a4e6304a8bb9c2ac063fef55ab1d99 +MISC ChangeLog 37301 RMD160 af53ebae537554fb6accb7e5c54dd5471202eb73 SHA1 42fe279f259f1cfa588155eb29efd47ee062babe SHA256 4775c3770ff1dca81c41f7f77a2c4f3d7e746ee5fa6fb738eb2dc687513a158e +MISC metadata.xml 375 RMD160 71766089deafcc906533d0dc537a46646f36b50a SHA1 c188ca1cdd4d1bc82f372608e8ad7fc473cb47e5 SHA256 adb92971f6939e55ce103e1c42d3ce3dfe82823d038db0e9cf9b08d9be888e1a diff --git a/sys-devel/distcc/distcc-2.18.3-r10.ebuild b/sys-devel/distcc/distcc-2.18.3-r10.ebuild new file mode 100644 index 0000000..48f13f2 --- /dev/null +++ b/sys-devel/distcc/distcc-2.18.3-r10.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.18.3-r10.ebuild,v 1.11 2008/11/02 22:24:23 gengor Exp $ + +# If you change this in any way please email lisa@gentoo.org and make an +# entry in the ChangeLog (this means you spanky :P). (2004-04-11) Lisa Seelye + +inherit eutils flag-o-matic toolchain-funcs + +PATCHLEVEL="2.18" + +DESCRIPTION="a program to distribute compilation of C code across several machines on a network" +HOMEPAGE="http://distcc.samba.org/" +SRC_URI="http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" +IUSE="gnome gtk hardened selinux ipv6" + +DEPEND=">=sys-devel/gcc-config-1.3.1 + userland_GNU? ( sys-apps/shadow ) + gnome? ( dev-util/pkgconfig ) + gtk? ( dev-util/pkgconfig )" +RDEPEND=" + gnome? ( + >=x11-libs/gtk+-2.0.0 + >=gnome-base/libgnome-2.0.0 + >=gnome-base/libgnomeui-2.0.0.0 + >=gnome-base/libglade-2.0.0 + x11-libs/pango + >=gnome-base/gconf-2.0.0 + ) + gtk? ( + >=x11-libs/gtk+-2.0.0 + x11-libs/pango + ) + selinux? ( sec-policy/selinux-distcc )" + +src_unpack() { + unpack ${A} + cd "${S}" + + # -Wl,--as-needed to close bug #128605 + epatch "${FILESDIR}/distcc-as-needed.patch" + + # See bug #75420 for more multilib stuff + epatch "${FILESDIR}/distcc-gentoo-multilib-r1.patch" + einfo "Please report to bug #75420 success or failure of this patch." + + # Bugs #120001, #167844 and probably more. See patch for description. + use hardened && epatch "${FILESDIR}/distcc-hardened.patch" +} + +src_compile() { + local myconf="--with-included-popt " + #Here we use the built in parse-options package. saves a dependancy + + #not taking any chances here, guessing which takes precedence in the + #configure script, so we'll just make the distinction here: + #gnome takes precedence over gtk if both are specified (gnome pulls + #in gtk anyways...) + use gtk && ! use gnome && myconf="${myconf} --with-gtk" + use gtk && use gnome && myconf="${myconf} --with-gnome" + + #More legacy stuff? + [ `gcc-major-version` -eq 2 ] && filter-lfs-flags + + if use ipv6; then + ewarn "To use IPV6 you must have IPV6 compiled into your kernel" + ewarn "either via a module or compiled code" + ewarn "You can recompile without ipv6 with: USE='-ipv6' emerge distcc" + myconf=" ${myconf} --enable-rfc2553 " + epause 5 + fi + econf ${myconf} || die "econf ${myconf} failed" + emake || die "emake failed" +} + +src_install() { + make DESTDIR="${D%/}" install + + insinto /usr/share/doc/${PN} + doins "${S}/survey.txt" + + exeinto /usr/bin + doexe "${FILESDIR}/distcc-config" + + newconfd "${FILESDIR}/${PATCHLEVEL}/conf" distccd + + newinitd "${FILESDIR}/${PATCHLEVEL}/init" distccd + + # create and keep the symlink dir + dodir /usr/lib/distcc/bin + keepdir /usr/lib/distcc/bin + + # create the distccd pid directory + dodir /var/run/distccd + keepdir /var/run/distccd + + if use gnome || use gtk; then + einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui" + einfo "This is to have a little sensability in naming schemes between distccmon programs" + mv "${D}/usr/bin/distccmon-gnome" "${D}/usr/bin/distccmon-gui" + dosym /usr/bin/distccmon-gui /usr/bin/distccmon-gnome + fi + +} + +pkg_preinst() { + # non-/ installs don't require us to do anything here + [ "${ROOT}" != "/" ] && return 0 + + # stop daemon since script is being updated + [ -n "$(pidof distccd)" -a -x /etc/init.d/distccd ] && \ + /etc/init.d/distccd stop +} + +pkg_postinst() { + #are we doing bootstrap with has no useradd? + if [[ ${CHOST} != *-*-gnu && ${CHOST} != *-linux* ]] || [ -x /usr/sbin/useradd ]; then + enewuser distcc 240 + else + ewarn "You do not have useradd (bootstrap) from shadow so I didn't" + ewarn "install the distcc user. Note that attempting to start the daemon" + ewarn "will fail. Please install shadow and re-emerge distcc." + ebeep 2 + fi + + # By now everyone should be using the right envfile + + if [ "${ROOT}" = "/" ]; then + einfo "Installing links to native compilers..." + /usr/bin/distcc-config --install + else + # distcc-config can *almost* handle ROOT installs itself + # but for now, but user must finsh things off + ewarn "*** Installation is not complete ***" + ewarn "You must run the following as root:" + ewarn " /usr/bin/distcc-config --install" + ewarn "after booting or chrooting into ${ROOT}" + fi + einfo "Setting permissions on ${ROOT}var/run/distccd" + chown -R distcc:daemon "${ROOT}var/run/distccd" + echo "" + + einfo "Tips on using distcc with Gentoo can be found at" + einfo "http://www.gentoo.org/doc/en/distcc.xml" + echo "" + einfo "To use the distccmon programs with Gentoo you should use this command:" + einfo " DISTCC_DIR=/var/tmp/portage/.distcc distccmon-text N" + use gnome || use gtk && einfo "Or: DISTCC_DIR=/var/tmp/portage/.distcc distccmon-gnome" + + ewarn "***SECURITY NOTICE***" + ewarn "If you are upgrading distcc please make sure to run etc-update to" + ewarn "update your /etc/conf.d/distccd and /etc/init.d/distccd files with" + ewarn "added security precautions (the --listen and --allow directives)" + ebeep 5 +} diff --git a/sys-devel/distcc/distcc-3.0-r4.ebuild b/sys-devel/distcc/distcc-3.0-r4.ebuild new file mode 100644 index 0000000..6406110 --- /dev/null +++ b/sys-devel/distcc/distcc-3.0-r4.ebuild @@ -0,0 +1,170 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.0-r4.ebuild,v 1.12 2009/03/13 17:10:24 armin76 Exp $ + +inherit eutils fdo-mime flag-o-matic multilib toolchain-funcs + +DESCRIPTION="a program to distribute compilation of C code across several machines on a network" +HOMEPAGE="http://distcc.org/" +SRC_URI="http://distcc.googlecode.com/files/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" +IUSE="avahi gnome gtk hardened ipv6 selinux xinetd" + +RESTRICT="test" + +RDEPEND=">=dev-lang/python-2.4 + dev-libs/popt + avahi? ( >=net-dns/avahi-0.6 ) + gnome? ( + >=gnome-base/libgnome-2 + >=gnome-base/libgnomeui-2 + >=x11-libs/gtk+-2 + x11-libs/pango + ) + gtk? ( + >=x11-libs/gtk+-2 + )" +DEPEND="${RDEPEND} + dev-util/pkgconfig" +RDEPEND="${RDEPEND} + !net-misc/pump + >=sys-devel/gcc-config-1.3.1 + selinux? ( sec-policy/selinux-distcc ) + xinetd? ( sys-apps/xinetd )" + +DISTCC_LOG="" +DCCC_PATH="/usr/$(get_libdir)/distcc/bin" +DISTCC_VERBOSE="0" + +pkg_setup() { + enewuser distcc 240 -1 -1 daemon +} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}-gentoo.patch" + epatch "${FILESDIR}/${P}-svn617.patch" + epatch "${FILESDIR}/${P}-xinetd.patch" + epatch "${FILESDIR}/${P}-uninitialized.patch" + # bug #253786 + epatch "${FILESDIR}/${PN}-3.0-fix-fortify.patch" + 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" + + # Bug #244847 + sed -i -e "s:-Werror::" configure* include_server/setup.py || die +} + +src_compile() { + # More legacy stuff? + [ "$(gcc-major-version)" = "2" ] && filter-lfs-flags + + # -O? is required + [ "${CFLAGS/-O}" = "${CFLAGS}" ] && CFLAGS="${CFLAGS} -O2" + + econf \ + $(use_with avahi) \ + $(use_with gtk) \ + $(use_with gnome) \ + $(use_enable ipv6 rfc2553) \ + --with-docdir="/usr/share/doc/${PF}" || die "econf failed" + emake || die "emake failed" +} + +src_install() { + # In rare cases, parallel make install failed, bug #249695 + emake -j1 DESTDIR="${D}" install || die + + dobin "${FILESDIR}/${PV}/distcc-config" + + newinitd "${FILESDIR}/${PV}/init" distccd + + cp "${FILESDIR}/${PV}/conf" "${T}/distccd" + if use avahi; then + cat >> "${T}/distccd" <<-EOF + + # Enable zeroconf support in distccd + DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf" + EOF + fi + doconfd "${T}/distccd" + + cat > "${T}/02distcc" <<-EOF + # This file is managed by distcc-config; use it to change these settings. + DISTCC_LOG="${DISTCC_LOG}" + DCCC_PATH="${DCCC_PATH}" + DISTCC_VERBOSE="${DISTCC_VERBOSE}" + EOF + doenvd "${T}/02distcc" + + # create the masquerade directory + dodir "${DCCC_PATH}" + for f in cc c++ gcc g++; do + dosym /usr/bin/distcc "${DCCC_PATH}/${f}" + if [ "${f}" != "cc" ]; then + dosym /usr/bin/distcc "${DCCC_PATH}/${CTARGET:-${CHOST}}-${f}" + fi + done + + # create the distccd pid directory + keepdir /var/run/distccd + fowners distcc:daemon /var/run/distccd + + if use gnome || use gtk; then + einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui" + einfo "This is to have a little sensability in naming schemes between distccmon programs" + mv "${D}/usr/bin/distccmon-gnome" "${D}/usr/bin/distccmon-gui" || die + dosym distccmon-gui /usr/bin/distccmon-gnome + fi + + if use xinetd; then + insinto /etc/xinetd.d + newins "doc/example/xinetd" distcc + fi + + rm -rf "${D}/etc/default" + rm -f "${D}/etc/distcc/clients.allow" + rm -f "${D}/etc/distcc/commands.allow.sh" + prepalldocs +} + +pkg_postinst() { + use gnome && fdo-mime_desktop_database_update + + if use ipv6; then + elog + elog "IPv6 has not supported yet by ${P}." + fi + elog + elog "Tips on using distcc with Gentoo can be found at" + elog "http://www.gentoo.org/doc/en/distcc.xml" + elog + elog "How to use pump mode with Gentoo:" + elog "# distcc-config --set-hosts \"foo,cpp,lzo bar,cpp,lzo baz,cpp,lzo\"" + elog "# pump emerge -u world" + elog + elog "To use the distccmon programs with Gentoo you should use this command:" + elog "# DISTCC_DIR=\"${DISTCC_DIR}\" distccmon-text 5" + + if use gnome || use gtk; then + elog "Or:" + elog "# DISTCC_DIR=\"${DISTCC_DIR}\" distccmon-gnome" + fi + + elog + elog "***SECURITY NOTICE***" + elog "If you are upgrading distcc please make sure to run etc-update to" + elog "update your /etc/conf.d/distccd and /etc/init.d/distccd files with" + elog "added security precautions (the --listen and --allow directives)" + elog +} + +pkg_postrm() { + use gnome && fdo-mime_desktop_database_update +} diff --git a/sys-devel/distcc/distcc-3.1-r4.ebuild b/sys-devel/distcc/distcc-3.1-r4.ebuild new file mode 100644 index 0000000..f862478 --- /dev/null +++ b/sys-devel/distcc/distcc-3.1-r4.ebuild @@ -0,0 +1,169 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.1-r4.ebuild,v 1.7 2009/05/20 17:45:39 armin76 Exp $ + +EAPI="2" +inherit eutils fdo-mime flag-o-matic multilib toolchain-funcs + +DESCRIPTION="a program to distribute compilation of C code across several machines on a network" +HOMEPAGE="http://distcc.org/" +SRC_URI="http://distcc.googlecode.com/files/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" +IUSE="avahi gnome gtk hardened ipv6 selinux xinetd" + +RESTRICT="test" + +RDEPEND=">=dev-lang/python-2.4 + dev-libs/popt + avahi? ( >=net-dns/avahi-0.6[dbus] ) + gnome? ( + >=gnome-base/libgnome-2 + >=gnome-base/libgnomeui-2 + >=x11-libs/gtk+-2 + x11-libs/pango + ) + gtk? ( + >=x11-libs/gtk+-2 + )" +DEPEND="${RDEPEND} + dev-util/pkgconfig" +RDEPEND="${RDEPEND} + !net-misc/pump + >=sys-devel/gcc-config-1.4.1 + selinux? ( sec-policy/selinux-distcc ) + xinetd? ( sys-apps/xinetd )" + +DISTCC_LOG="" +DCCC_PATH="/usr/$(get_libdir)/distcc/bin" +DISTCC_VERBOSE="0" + +pkg_setup() { + enewuser distcc 240 -1 -1 daemon +} + +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" + + 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" + + epatch "${FILESDIR}/${P}-crosscompile.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) \ + $(use_with gnome) \ + ${myconf} || die "econf failed" +} + +src_install() { + # In rare cases, parallel make install failed + emake -j1 DESTDIR="${D}" install || die + + dobin "${FILESDIR}/3.0/distcc-config" + + newinitd "${FILESDIR}/${PV}/init" distccd + + cp "${FILESDIR}/3.0/conf" "${T}/distccd" + if use avahi; then + cat >> "${T}/distccd" <<-EOF + + # Enable zeroconf support in distccd + DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf" + EOF + fi + doconfd "${T}/distccd" + + cat > "${T}/02distcc" <<-EOF + # This file is managed by distcc-config; use it to change these settings. + DISTCC_LOG="${DISTCC_LOG}" + DCCC_PATH="${DCCC_PATH}" + DISTCC_VERBOSE="${DISTCC_VERBOSE}" + EOF + doenvd "${T}/02distcc" + + # create the masquerade directory + dodir "${DCCC_PATH}" + for f in cc c++ gcc g++; do + dosym /usr/bin/distcc "${DCCC_PATH}/${f}" + if [ "${f}" != "cc" ]; then + dosym /usr/bin/distcc "${DCCC_PATH}/${CTARGET:-${CHOST}}-${f}" + fi + done + + # create the distccd pid directory + keepdir /var/run/distccd + fowners distcc:daemon /var/run/distccd + + if use gnome || use gtk; then + einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui" + einfo "This is to have a little sensability in naming schemes between distccmon programs" + mv "${D}/usr/bin/distccmon-gnome" "${D}/usr/bin/distccmon-gui" || die + dosym distccmon-gui /usr/bin/distccmon-gnome + fi + + if use xinetd; then + insinto /etc/xinetd.d + newins "doc/example/xinetd" distcc + fi + + rm -rf "${D}/etc/default" + rm -f "${D}/etc/distcc/clients.allow" + rm -f "${D}/etc/distcc/commands.allow.sh" + prepalldocs +} + +pkg_postinst() { + use gnome && fdo-mime_desktop_database_update + + if use ipv6; then + elog + elog "IPv6 has not supported yet by ${P}." + fi + elog + elog "Tips on using distcc with Gentoo can be found at" + elog "http://www.gentoo.org/doc/en/distcc.xml" + elog + elog "How to use pump mode with Gentoo:" + elog "# distcc-config --set-hosts \"foo,cpp,lzo bar,cpp,lzo baz,cpp,lzo\"" + elog "# pump emerge -u world" + elog + elog "To use the distccmon programs with Gentoo you should use this command:" + elog "# DISTCC_DIR=\"${DISTCC_DIR}\" distccmon-text 5" + + if use gnome || use gtk; then + elog "Or:" + elog "# DISTCC_DIR=\"${DISTCC_DIR}\" distccmon-gnome" + fi + + elog + elog "***SECURITY NOTICE***" + elog "If you are upgrading distcc please make sure to run etc-update to" + elog "update your /etc/conf.d/distccd and /etc/init.d/distccd files with" + elog "added security precautions (the --listen and --allow directives)" + elog +} + +pkg_postrm() { + use gnome && fdo-mime_desktop_database_update +} diff --git a/sys-devel/distcc/files/2.18-r1/conf b/sys-devel/distcc/files/2.18-r1/conf new file mode 100644 index 0000000..783236a --- /dev/null +++ b/sys-devel/distcc/files/2.18-r1/conf @@ -0,0 +1,45 @@ +# /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 recomended 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_NICE="15" + +#ifdef AVAHI +# Enable zeroconf support in distccd +DISTCCD_AVAHI="yes" +#endif diff --git a/sys-devel/distcc/files/2.18-r1/init b/sys-devel/distcc/files/2.18-r1/init new file mode 100644 index 0000000..ae899aa --- /dev/null +++ b/sys-devel/distcc/files/2.18-r1/init @@ -0,0 +1,39 @@ +#!/sbin/runscript +# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.18-r1/init,v 1.1 2008/01/04 03:53:15 betelgeuse Exp $ + +depend() { + local avahi +#ifdef AVAHI + [ ${DISTCCD_AVAHI} = yes ] && avahi="avahi-daemon" +#endif + need net ${avahi} + use ypbind +} + +start() { + [ -e "${DISTCCD_PIDFILE}" ] && rm -f ${DISTCCD_PIDFILE} &>/dev/null + + local args +#ifdef AVAHI + [ ${DISTCCD_AVAHI} = yes ] && args="--zeroconf" +#endif + + ebegin "Starting distccd" + chown distcc `dirname ${DISTCCD_PIDFILE}` &>/dev/null + TMPDIR="${TMPDIR}" \ + PATH="$(gcc-config --get-bin-path):${PATH}" \ + /sbin/start-stop-daemon --start --quiet --startas ${DISTCCD_EXEC} \ + --pidfile ${DISTCCD_PIDFILE} -- \ + --pid-file ${DISTCCD_PIDFILE} -N ${DISTCCD_NICE} --user distcc \ + ${args} ${DISTCCD_OPTS} + + eend $? +} + +stop() { + ebegin "Stopping distccd" + start-stop-daemon --stop --quiet --pidfile "${DISTCCD_PIDFILE}" + rm -f "${DISTCCD_PIDFILE}" + eend $? +} + diff --git a/sys-devel/distcc/files/2.18/conf b/sys-devel/distcc/files/2.18/conf new file mode 100644 index 0000000..3f6c3f0 --- /dev/null +++ b/sys-devel/distcc/files/2.18/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 recomended 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_NICE="15" diff --git a/sys-devel/distcc/files/2.18/init b/sys-devel/distcc/files/2.18/init new file mode 100755 index 0000000..1abe4a9 --- /dev/null +++ b/sys-devel/distcc/files/2.18/init @@ -0,0 +1,30 @@ +#!/sbin/runscript +# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.18/init,v 1.1 2004/10/12 17:21:43 lisa Exp $ + +depend() { + need net + use ypbind +} + +start() { + [ -e "${DISTCCD_PIDFILE}" ] && rm -f ${DISTCCD_PIDFILE} &>/dev/null + + ebegin "Starting distccd" + chown distcc `dirname ${DISTCCD_PIDFILE}` &>/dev/null + TMPDIR="${TMPDIR}" \ + PATH="$(gcc-config --get-bin-path):${PATH}" \ + /sbin/start-stop-daemon --start --quiet --startas ${DISTCCD_EXEC} \ + --pidfile ${DISTCCD_PIDFILE} -- \ + --pid-file ${DISTCCD_PIDFILE} -N ${DISTCCD_NICE} --user distcc \ + ${DISTCCD_OPTS} + + eend $? +} + +stop() { + ebegin "Stopping distccd" + start-stop-daemon --stop --quiet --pidfile "${DISTCCD_PIDFILE}" + rm -f "${DISTCCD_PIDFILE}" + eend $? +} + diff --git a/sys-devel/distcc/files/3.0/conf b/sys-devel/distcc/files/3.0/conf new file mode 100644 index 0000000..eb784c3 --- /dev/null +++ b/sys-devel/distcc/files/3.0/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 recomended 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/3.0/distcc-config b/sys-devel/distcc/files/3.0/distcc-config new file mode 100644 index 0000000..11676e5 --- /dev/null +++ b/sys-devel/distcc/files/3.0/distcc-config @@ -0,0 +1,123 @@ +#!/usr/bin/env python +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/3.0/distcc-config,v 1.3 2008/10/27 21:29:44 matsuu Exp $ + +import os, re, signal, sys +from string import rstrip +from subprocess import Popen + +options=[ + '--get-hosts', + '--set-hosts', + '--get-verbose', + '--set-verbose', + '--get-log', + '--set-log', + '--help', + '--get-env', + '--set-env' +] + +tmpcmdline=sys.argv[1:] +cmdline=[] +envfile = '/etc/env.d/02distcc' + +def exithandler(foo,bar): + os.kill(0,signal.SIGKILL) + sys.exit(1) + +signal.signal(signal.SIGINT,exithandler) + +def isroot(ret=0): + if os.getuid() != 0: + if ret == 0: + print '!!!',sys.argv[:1][0],tmpcmdline[0],'must be run as root' + sys.exit(1) + else: + retval = 0 + else: + retval = 1 + return retval + +def writeenv(var,value): + isroot() + distcc_env = [] + distcc_env = open(envfile, 'r').readlines() + distcc_env_new = open(envfile, 'w') + for i in range(len(distcc_env)): + if re.compile(var+'="(.*)"').match(distcc_env[i]): + distcc_env[i] = var+'="'+value+'"\n' + distcc_env_new.write(distcc_env[i]) + #print 'Set',var,'to:',value + Popen('/usr/sbin/env-update', shell=True) + print 'If you want to use these new settings in an existing shell,' + print 'you need to "source /etc/profile" to get the changes.' + +def readenv(var): + distcc_env = open(envfile, 'r').read() + match = re.compile(var+'="(.*)"').search(distcc_env) + if match: + print var+'='+match.group(1) + else: + print var,'not set.' + +def createdistccdir(dir): + if not os.path.exists(dir): + os.mkdir(dir) + os.chmod(dir, 0755) + +for x in tmpcmdline: + if not x: + continue + if x[0:2]=="--": + if not x in options: + print "!!! Error:",x,"is an invalid option." + sys.exit(1) + else: + cmdline = x + +if '--get-hosts' in tmpcmdline: + HOSTS_ENV = os.environ.get('DISTCC_HOSTS') + HOSTS_HOME = os.environ.get('HOME')+'/hosts' + if HOSTS_ENV: + print HOSTS_ENV + elif os.path.isfile(HOSTS_HOME) and os.path.getsize(HOSTS_HOME) != 0: + print rstrip(open(HOSTS_HOME, 'r').read()) + elif os.path.exists('/etc/distcc/hosts'): + print rstrip(open('/etc/distcc/hosts', 'r').read()) + else: + print 'No configuration file found. Setup your hosts with --set-hosts.' +elif '--set-hosts' in tmpcmdline: + if isroot(1): + PATH = '/etc/distcc' + else: + PATH = os.environ.get('HOME') + createdistccdir(PATH) + open(PATH+'/hosts', 'w').write(cmdline + '\n') +elif '--get-verbose' in tmpcmdline: + readenv('DISTCC_VERBOSE') +elif '--set-verbose' in tmpcmdline: + writeenv('DISTCC_VERBOSE',tmpcmdline[1]) +elif '--get-log' in tmpcmdline: + readenv('DISTCC_LOG') +elif '--set-log' in tmpcmdline: + writeenv('DISTCC_LOG',tmpcmdline[1]) +elif '--get-env' in tmpcmdline: + if len(tmpcmdline) == 1: + print rstrip(open(envfile, 'r').read()) + elif len(tmpcmdline) == 2: + readenv(tmpcmdline[1]) + else: + print '!!! Error: Specify only one variable.' +elif '--set-env' in tmpcmdline: + if len(tmpcmdline) > 2 and len(tmpcmdline) <= 3: + isroot() + writeenv(tmpcmdline[1],tmpcmdline[2]) + else: + print '!!! Error: Awaiting two parameters.' +else: + print 'Usage: %s --set-hosts DISTCC_HOSTS | --get-hosts' % sys.argv[0] + print ' %s --set-verbose { 0 | 1 } | --get-verbose' % sys.argv[0] + print ' %s --set-log FILE | --get-log' % sys.argv[0] + print ' %s --set-env VARIABLE VALUE | --get-env [VARIABLE]' % sys.argv[0] diff --git a/sys-devel/distcc/files/3.0/init b/sys-devel/distcc/files/3.0/init new file mode 100755 index 0000000..c4be986 --- /dev/null +++ b/sys-devel/distcc/files/3.0/init @@ -0,0 +1,32 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/3.0/init,v 1.4 2008/11/16 16:36:37 matsuu Exp $ + +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 GCC_SPECS from profile.env bug #164818 + GCC_SPECS="$(. /etc/profile.env; echo "${GCC_SPECS}")" \ + PATH="$(gcc-config --get-bin-path):${PATH}" \ + start-stop-daemon --start --quiet --exec "${DISTCCD_EXEC}" -- \ + --daemon --pid-file "${DISTCCD_PIDFILE}" --user distcc \ + ${DISTCCD_OPTS} + eend $? +} + +stop() { + ebegin "Stopping distccd" + start-stop-daemon --stop --quiet --pidfile "${DISTCCD_PIDFILE}" + eend $? +} diff --git a/sys-devel/distcc/files/3.1/init b/sys-devel/distcc/files/3.1/init new file mode 100755 index 0000000..7c4277c --- /dev/null +++ b/sys-devel/distcc/files/3.1/init @@ -0,0 +1,32 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/3.1/init,v 1.1 2009/03/19 17:56:09 matsuu Exp $ + +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}" -- \ + --daemon --pid-file "${DISTCCD_PIDFILE}" --user distcc \ + ${DISTCCD_OPTS} + eend $? +} + +stop() { + ebegin "Stopping distccd" + start-stop-daemon --stop --quiet --pidfile "${DISTCCD_PIDFILE}" + eend $? +} diff --git a/sys-devel/distcc/files/distcc-3.0-fix-fortify.patch b/sys-devel/distcc/files/distcc-3.0-fix-fortify.patch new file mode 100644 index 0000000..8edc330 --- /dev/null +++ b/sys-devel/distcc/files/distcc-3.0-fix-fortify.patch @@ -0,0 +1,11 @@ +diff -ru a/src/snprintf.h b/src/snprintf.h +--- a/src/snprintf.h 2008-08-06 15:52:06.000000000 -0500 ++++ b/src/snprintf.h 2009-01-04 15:19:22.000000000 -0600 +@@ -7,6 +7,7 @@ + */ + + #include <stdarg.h> ++#include "config.h" + + #ifdef __GNUC__ + /** Use gcc attribute to check printf fns. a1 is the 1-based index of diff --git a/sys-devel/distcc/files/distcc-3.0-gentoo.patch b/sys-devel/distcc/files/distcc-3.0-gentoo.patch new file mode 100644 index 0000000..e2464df --- /dev/null +++ b/sys-devel/distcc/files/distcc-3.0-gentoo.patch @@ -0,0 +1,33 @@ +diff -Naur distcc-3.0.orig/include_server/c_extensions/distcc_pump_c_extensions_module.c distcc-3.0/include_server/c_extensions/distcc_pump_c_extensions_module.c +--- distcc-3.0.orig/include_server/c_extensions/distcc_pump_c_extensions_module.c 2008-08-07 05:52:20.000000000 +0900 ++++ distcc-3.0/include_server/c_extensions/distcc_pump_c_extensions_module.c 2008-10-14 22:34:38.000000000 +0900 +@@ -23,17 +23,18 @@ + + #include "Python.h" + +-static char *version = ".01"; ++static const char *version = ".01"; + + /* To suppress compiler warnings */ + #define UNUSED(v) ((void)&v) + +-char *rs_program_name = "distcc_include_server"; ++const char *rs_program_name = "distcc_include_server"; + + #include "distcc.h" + #include "rpc.h" + + static PyObject *distcc_pump_c_extensionsError; ++void initdistcc_pump_c_extensions(void); + + + /*********************************************************************** +@@ -385,7 +386,7 @@ + PyObject *module; + PyObject *py_str; + distcc_pump_c_extensionsError = PyErr_NewException( +- "distcc_pump_c_extensions.Error", NULL, NULL); ++ (char *)"distcc_pump_c_extensions.Error", NULL, NULL); + + module = Py_InitModule4("distcc_pump_c_extensions", + methods, diff --git a/sys-devel/distcc/files/distcc-3.0-svn617.patch b/sys-devel/distcc/files/distcc-3.0-svn617.patch new file mode 100644 index 0000000..54f55dc --- /dev/null +++ b/sys-devel/distcc/files/distcc-3.0-svn617.patch @@ -0,0 +1,13 @@ +Index: src/arg.c +=================================================================== +--- src/arg.c (revision 616) ++++ src/arg.c (revision 617) +@@ -453,7 +453,7 @@ + dest_argv[i] = strdup(opt); + if (!dest_argv[i]) return EXIT_OUT_OF_MEMORY; + i++; +- if (strcmp(opt, "-MD") == 0 || strcmp(opt, "-MMD")) { ++ if (strcmp(opt, "-MD") == 0 || strcmp(opt, "-MMD") == 0) { + char *filename; + if (!comma) { + rs_log_warning("'-Wp,-MD' or '-Wp,-MMD' option is missing " diff --git a/sys-devel/distcc/files/distcc-3.0-uninitialized.patch b/sys-devel/distcc/files/distcc-3.0-uninitialized.patch new file mode 100644 index 0000000..28b226b --- /dev/null +++ b/sys-devel/distcc/files/distcc-3.0-uninitialized.patch @@ -0,0 +1,13 @@ +Index: src/where.c +=================================================================== +--- src/where.c (revision 622) ++++ src/where.c (working copy) +@@ -190,7 +190,7 @@ + int dcc_lock_local_cpp(int *cpu_lock_fd) + { + int ret; +- struct dcc_hostdef *chosen; ++ struct dcc_hostdef *chosen = NULL; + ret = dcc_lock_one(dcc_hostdef_local_cpp, &chosen, cpu_lock_fd); + dcc_note_state(DCC_PHASE_CPP, NULL, chosen->hostname); + return ret; diff --git a/sys-devel/distcc/files/distcc-3.0-xinetd.patch b/sys-devel/distcc/files/distcc-3.0-xinetd.patch new file mode 100644 index 0000000..47877ad --- /dev/null +++ b/sys-devel/distcc/files/distcc-3.0-xinetd.patch @@ -0,0 +1,15 @@ +diff -Naur distcc-3.0.orig/doc/example/xinetd distcc-3.0/doc/example/xinetd +--- distcc-3.0.orig/doc/example/xinetd 2008-08-07 05:52:13.000000000 +0900 ++++ distcc-3.0/doc/example/xinetd 2008-10-27 15:32:14.000000000 +0900 +@@ -19,10 +19,6 @@ + socket_type = stream + wait = no + user = distcc +- server = /usr/local/bin/distccd ++ server = /usr/bin/distccd + server_args = --inetd +- +- # This makes xinetd cope if there is no service listed in +- # /etc/services +- type = UNLISTED + } diff --git a/sys-devel/distcc/files/distcc-3.1-crosscompile.patch b/sys-devel/distcc/files/distcc-3.1-crosscompile.patch new file mode 100644 index 0000000..6ed81d2 --- /dev/null +++ b/sys-devel/distcc/files/distcc-3.1-crosscompile.patch @@ -0,0 +1,125 @@ +diff -Naur distcc-3.1.orig/src/compile.c distcc-3.1/src/compile.c +--- distcc-3.1.orig/src/compile.c 2008-12-03 00:50:25.000000000 +0300 ++++ distcc-3.1/src/compile.c 2009-08-22 09:06:46.507514641 +0400 +@@ -359,7 +359,7 @@ + + /* We don't do any redirection of file descriptors when running locally, + * so if for example cpp is being used in a pipeline we should be fine. */ +- if ((ret = dcc_spawn_child(argv, &pid, NULL, NULL, NULL)) != 0) ++ if ((ret = dcc_spawn_child(argv, &pid, NULL, NULL, NULL, 1)) != 0) + return ret; + + if ((ret = dcc_collect_child("cc", pid, &status, timeout_null_fd))) +diff -Naur distcc-3.1.orig/src/cpp.c distcc-3.1/src/cpp.c +--- distcc-3.1.orig/src/cpp.c 2008-12-03 00:50:24.000000000 +0300 ++++ distcc-3.1/src/cpp.c 2009-08-22 09:06:11.284184134 +0400 +@@ -97,5 +97,5 @@ + /* FIXME: cpp_argv is leaked */ + + return dcc_spawn_child(cpp_argv, cpp_pid, +- "/dev/null", *cpp_fname, NULL); ++ "/dev/null", *cpp_fname, NULL, 1); + } +diff -Naur distcc-3.1.orig/src/exec.c distcc-3.1/src/exec.c +--- distcc-3.1.orig/src/exec.c 2008-12-03 00:50:24.000000000 +0300 ++++ distcc-3.1/src/exec.c 2009-08-22 09:02:37.964204487 +0400 +@@ -80,10 +80,11 @@ + static void dcc_inside_child(char **argv, + const char *stdin_file, + const char *stdout_file, +- const char *stderr_file) NORETURN; ++ const char *stderr_file, ++ const char local) NORETURN; + + +-static void dcc_execvp(char **argv) NORETURN; ++static void dcc_execvp(char **argv, const char local) NORETURN; + + void dcc_note_execution(struct dcc_hostdef *host, char **argv) + { +@@ -242,12 +243,20 @@ + * + * Does not return, either execs the compiler in place, or exits with + * a message. ++ * ++ * local -- determines compile host type, on remote targets ++ * special crosscompile-friendly check must be done, but on local ++ * targets it will broke things ++ * + **/ +-static void dcc_execvp(char **argv) ++static void dcc_execvp(char **argv, const char local) + { + char *slash; + +- execvp(argv[0], argv); ++ /* do not exectute full path mindlessly, this breaks ++ * cross-compilation for names like gcc, g++, etc */ ++ if (local || argv[0][0] != '/') ++ execvp(argv[0], argv); + + /* If we're still running, the program was not found on the path. One + * thing that might have happened here is that the client sent an absolute +@@ -290,7 +299,8 @@ + static void dcc_inside_child(char **argv, + const char *stdin_file, + const char *stdout_file, +- const char *stderr_file) ++ const char *stderr_file, ++ const char local) + { + int ret; + +@@ -334,7 +344,7 @@ + if ((ret = dcc_redirect_fds(stdin_file, stdout_file, stderr_file))) + goto fail; + +- dcc_execvp(argv); ++ dcc_execvp(argv, local); + + ret = EXIT_DISTCC_FAILED; + +@@ -378,7 +388,8 @@ + int dcc_spawn_child(char **argv, pid_t *pidptr, + const char *stdin_file, + const char *stdout_file, +- const char *stderr_file) ++ const char *stderr_file, ++ const char local) + { + pid_t pid; + +@@ -400,7 +411,7 @@ + if (dcc_new_pgrp() != 0) + rs_trace("Unable to start a new group\n"); + } +- dcc_inside_child(argv, stdin_file, stdout_file, stderr_file); ++ dcc_inside_child(argv, stdin_file, stdout_file, stderr_file, local); + /* !! NEVER RETURN FROM HERE !! */ + } else { + *pidptr = pid; +diff -Naur distcc-3.1.orig/src/exec.h distcc-3.1/src/exec.h +--- distcc-3.1.orig/src/exec.h 2008-12-03 00:50:24.000000000 +0300 ++++ distcc-3.1/src/exec.h 2009-08-22 09:03:17.880867366 +0400 +@@ -30,7 +30,8 @@ + const char *stderr_file); + + int dcc_spawn_child(char **argv, pid_t *pidptr, +- const char *, const char *, const char *); ++ const char *, const char *, const char *, ++ const char local); + + /* if in_fd is timeout_null_fd, means this parameter is not used */ + int dcc_collect_child(const char *what, pid_t pid, +diff -Naur distcc-3.1.orig/src/serve.c distcc-3.1/src/serve.c +--- distcc-3.1.orig/src/serve.c 2008-12-03 00:50:25.000000000 +0300 ++++ distcc-3.1/src/serve.c 2009-08-22 09:05:37.767520798 +0400 +@@ -646,7 +646,7 @@ + goto out_cleanup; + + if ((compile_ret = dcc_spawn_child(argv, &cc_pid, +- "/dev/null", out_fname, err_fname)) ++ "/dev/null", out_fname, err_fname, 0)) + || (compile_ret = dcc_collect_child("cc", cc_pid, &status, in_fd))) { + /* We didn't get around to finding a wait status from the actual + * compiler */ diff --git a/sys-devel/distcc/files/distcc-3.1-freedesktop.patch b/sys-devel/distcc/files/distcc-3.1-freedesktop.patch new file mode 100644 index 0000000..b23db21 --- /dev/null +++ b/sys-devel/distcc/files/distcc-3.1-freedesktop.patch @@ -0,0 +1,76 @@ +diff -Naur distcc-3.1.orig/Makefile.in distcc-3.1/Makefile.in +--- distcc-3.1.orig/Makefile.in 2008-12-03 06:50:31.000000000 +0900 ++++ distcc-3.1/Makefile.in 2009-02-02 00:40:20.000000000 +0900 +@@ -49,13 +49,14 @@ + includedir = @includedir@ + oldincludedir = /usr/include + docdir = @docdir@ +-pkgdatadir = $(datadir)/@PACKAGE_NAME@ ++icondir = $(datadir)/pixmaps ++desktopdir = $(datadir)/applications + + include_server_builddir = $(builddir)/_include_server + + # These must be done from here, not from autoconf, because they can + # contain variable expansions written in Make syntax. Ew. +-DIR_DEFS = -DSYSCONFDIR="\"${sysconfdir}\"" -DPKGDATADIR="\"${pkgdatadir}\"" ++DIR_DEFS = -DSYSCONFDIR="\"${sysconfdir}\"" -DICONDIR="\"${icondir}\"" + + # arguments to pkgconfig + GNOME_PACKAGES = @GNOME_PACKAGES@ +@@ -1003,7 +1004,8 @@ + @echo " documents $(DESTDIR)$(docdir)" + @echo " programs $(DESTDIR)$(bindir)" + @echo " system configuration $(DESTDIR)$(sysconfdir)" +- @echo " shared data files $(DESTDIR)$(pkgdatadir)" ++ @echo " icons $(DESTDIR)$(icondir)" ++ @echo " .desktop file $(DESTDIR)$(desktopdir)" + + + # install-sh can't handle multiple arguments, but we don't need any +@@ -1086,10 +1088,10 @@ + done + + install-gnome-data: $(gnome_data) +- $(mkinstalldirs) "$(DESTDIR)$(pkgdatadir)" +- for p in $(gnome_data); do \ +- $(INSTALL_DATA) "$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(icondir) ++ $(mkinstalldirs) $(DESTDIR)$(desktopdir) ++ $(INSTALL_DATA) gnome/distccmon-gnome-icon.png $(DESTDIR)$(icondir) ++ $(INSTALL_DATA) gnome/distccmon-gnome.desktop $(DESTDIR)$(desktopdir) + + install-conf: $(conf_files) $(default_files) + $(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc" +diff -Naur distcc-3.1.orig/gnome/distccmon-gnome.desktop distcc-3.1/gnome/distccmon-gnome.desktop +--- distcc-3.1.orig/gnome/distccmon-gnome.desktop 2008-12-03 06:50:27.000000000 +0900 ++++ distcc-3.1/gnome/distccmon-gnome.desktop 2009-02-02 00:40:55.000000000 +0900 +@@ -1,13 +1,11 @@ + [Desktop Entry] +-Version=0.9.4 +-Encoding=UTF-8 + Exec=distccmon-gnome + Name=distcc monitor + GenericName=Distributed Compile Monitor + Comment=Graphical view of distributed compile tasks +-Icon=distccmon-gnome-icon.png ++Icon=distccmon-gnome-icon + TryExec=distccmon-gnome + Terminal=false + Type=Application +-Categories=GNOME;Application;Development; ++Categories=GNOME;Development; + StartupNotify=true +diff -Naur distcc-3.1.orig/src/mon-gnome.c distcc-3.1/src/mon-gnome.c +--- distcc-3.1.orig/src/mon-gnome.c 2008-12-03 06:50:25.000000000 +0900 ++++ distcc-3.1/src/mon-gnome.c 2009-02-02 00:41:18.000000000 +0900 +@@ -599,7 +599,7 @@ + + #if GTK_CHECK_VERSION(2,2,0) + gtk_window_set_icon_from_file (GTK_WINDOW (mainwin), +- PKGDATADIR "/distccmon-gnome-icon.png", ++ ICONDIR "/distccmon-gnome-icon.png", + NULL); + #endif + diff --git a/sys-devel/distcc/files/distcc-3.1-python.patch b/sys-devel/distcc/files/distcc-3.1-python.patch new file mode 100644 index 0000000..733357a --- /dev/null +++ b/sys-devel/distcc/files/distcc-3.1-python.patch @@ -0,0 +1,258 @@ +diff -Naur distcc-3.1.orig/bench/statistics.py distcc-3.1/bench/statistics.py +--- distcc-3.1.orig/bench/statistics.py 2008-12-03 06:50:21.000000000 +0900 ++++ distcc-3.1/bench/statistics.py 2009-03-17 01:29:26.000000000 +0900 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python2.2 ++#! /usr/bin/env python + + # benchmark -- automated system for testing distcc correctness + # and performance on various source trees. +diff -Naur distcc-3.1.orig/configure distcc-3.1/configure +--- distcc-3.1.orig/configure 2008-12-03 06:50:34.000000000 +0900 ++++ distcc-3.1/configure 2009-03-17 01:31:09.000000000 +0900 +@@ -3629,7 +3629,7 @@ + # + # NB: Cannot use AC_CONFIG_LIBOBJ_DIR here, because it's not present + # in autoconf 2.53. +-for ac_prog in python2.5 python-2.5 python2.4 python-2.4 python ++for ac_prog in python + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +diff -Naur distcc-3.1.orig/configure.ac distcc-3.1/configure.ac +--- distcc-3.1.orig/configure.ac 2008-12-03 06:50:31.000000000 +0900 ++++ distcc-3.1/configure.ac 2009-03-17 01:29:04.000000000 +0900 +@@ -243,7 +243,7 @@ + # + # NB: Cannot use AC_CONFIG_LIBOBJ_DIR here, because it's not present + # in autoconf 2.53. +-AC_PATH_PROGS(PYTHON, [python2.5 python-2.5 python2.4 python-2.4 python]) ++AC_PATH_PROGS(PYTHON, [python]) + AC_ARG_VAR(PYTHON, [Python interpreter]) + # Python 1 doesn't even support -V + if ! "$PYTHON" -V 2>&1 | grep "^Python" >/dev/null; then +diff -Naur distcc-3.1.orig/include_server/basics.py distcc-3.1/include_server/basics.py +--- distcc-3.1.orig/include_server/basics.py 2008-12-03 06:50:31.000000000 +0900 ++++ distcc-3.1/include_server/basics.py 2009-03-17 01:30:46.000000000 +0900 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.4 ++#!/usr/bin/python + # + # Copyright 2007 Google Inc. + # +diff -Naur distcc-3.1.orig/include_server/basics_test.py distcc-3.1/include_server/basics_test.py +--- distcc-3.1.orig/include_server/basics_test.py 2008-12-03 06:50:31.000000000 +0900 ++++ distcc-3.1/include_server/basics_test.py 2009-03-17 01:30:46.000000000 +0900 +@@ -1,4 +1,4 @@ +-#! /usr/bin/python2.4 ++#! /usr/bin/python + + # Copyright 2007 Google Inc. + # +diff -Naur distcc-3.1.orig/include_server/c_extensions_test.py distcc-3.1/include_server/c_extensions_test.py +--- distcc-3.1.orig/include_server/c_extensions_test.py 2008-12-03 06:50:31.000000000 +0900 ++++ distcc-3.1/include_server/c_extensions_test.py 2009-03-17 01:30:46.000000000 +0900 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.4 ++#!/usr/bin/python + + # Copyright 2007 Google Inc. + # +diff -Naur distcc-3.1.orig/include_server/cache_basics.py distcc-3.1/include_server/cache_basics.py +--- distcc-3.1.orig/include_server/cache_basics.py 2008-12-03 06:50:31.000000000 +0900 ++++ distcc-3.1/include_server/cache_basics.py 2009-03-17 01:30:46.000000000 +0900 +@@ -1,4 +1,4 @@ +-#! /usr/bin/python2.4 ++#! /usr/bin/python + + # Copyright 2007 Google Inc. + # +diff -Naur distcc-3.1.orig/include_server/compiler_defaults.py distcc-3.1/include_server/compiler_defaults.py +--- distcc-3.1.orig/include_server/compiler_defaults.py 2008-12-03 06:50:31.000000000 +0900 ++++ distcc-3.1/include_server/compiler_defaults.py 2009-03-17 01:30:46.000000000 +0900 +@@ -1,4 +1,4 @@ +-#! /usr/bin/python2.4 ++#! /usr/bin/python + + # Copyright 2007 Google Inc. + # +diff -Naur distcc-3.1.orig/include_server/compress_files.py distcc-3.1/include_server/compress_files.py +--- distcc-3.1.orig/include_server/compress_files.py 2008-12-03 06:50:31.000000000 +0900 ++++ distcc-3.1/include_server/compress_files.py 2009-03-17 01:30:46.000000000 +0900 +@@ -1,4 +1,4 @@ +-#! /usr/bin/python2.4 ++#! /usr/bin/python + + # Copyright 2007 Google Inc. + # +diff -Naur distcc-3.1.orig/include_server/include_analyzer.py distcc-3.1/include_server/include_analyzer.py +--- distcc-3.1.orig/include_server/include_analyzer.py 2008-12-03 06:50:31.000000000 +0900 ++++ distcc-3.1/include_server/include_analyzer.py 2009-03-17 01:30:46.000000000 +0900 +@@ -1,4 +1,4 @@ +-#! /usr/bin/python2.4 ++#! /usr/bin/python + + # Copyright 2007 Google Inc. + # +diff -Naur distcc-3.1.orig/include_server/include_analyzer_memoizing_node.py distcc-3.1/include_server/include_analyzer_memoizing_node.py +--- distcc-3.1.orig/include_server/include_analyzer_memoizing_node.py 2008-12-03 06:50:31.000000000 +0900 ++++ distcc-3.1/include_server/include_analyzer_memoizing_node.py 2009-03-17 01:30:46.000000000 +0900 +@@ -1,4 +1,4 @@ +-#! /usr/bin/python2.4 ++#! /usr/bin/python + + # Copyright 2007 Google Inc. + # +diff -Naur distcc-3.1.orig/include_server/include_analyzer_memoizing_node_test.py distcc-3.1/include_server/include_analyzer_memoizing_node_test.py +--- distcc-3.1.orig/include_server/include_analyzer_memoizing_node_test.py 2008-12-03 06:50:31.000000000 +0900 ++++ distcc-3.1/include_server/include_analyzer_memoizing_node_test.py 2009-03-17 01:30:46.000000000 +0900 +@@ -1,4 +1,4 @@ +-#! /usr/bin/python2.4 ++#! /usr/bin/python + + # Copyright 2007 Google Inc. + # +diff -Naur distcc-3.1.orig/include_server/include_analyzer_test.py distcc-3.1/include_server/include_analyzer_test.py +--- distcc-3.1.orig/include_server/include_analyzer_test.py 2008-12-03 06:50:31.000000000 +0900 ++++ distcc-3.1/include_server/include_analyzer_test.py 2009-03-17 01:30:46.000000000 +0900 +@@ -1,4 +1,4 @@ +-#! /usr/bin/python2.4 ++#! /usr/bin/python + + # Copyright 2007 Google Inc. + # +diff -Naur distcc-3.1.orig/include_server/include_server.py distcc-3.1/include_server/include_server.py +--- distcc-3.1.orig/include_server/include_server.py 2008-12-03 06:50:31.000000000 +0900 ++++ distcc-3.1/include_server/include_server.py 2009-03-17 01:30:46.000000000 +0900 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.4 ++#!/usr/bin/python + + # Copyright 2007 Google Inc. + # +diff -Naur distcc-3.1.orig/include_server/include_server_test.py distcc-3.1/include_server/include_server_test.py +--- distcc-3.1.orig/include_server/include_server_test.py 2008-12-03 06:50:31.000000000 +0900 ++++ distcc-3.1/include_server/include_server_test.py 2009-03-17 01:30:46.000000000 +0900 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.4 ++#!/usr/bin/python + + # Copyright 2007 Google Inc. + # +diff -Naur distcc-3.1.orig/include_server/macro_eval.py distcc-3.1/include_server/macro_eval.py +--- distcc-3.1.orig/include_server/macro_eval.py 2008-12-03 06:50:31.000000000 +0900 ++++ distcc-3.1/include_server/macro_eval.py 2009-03-17 01:30:46.000000000 +0900 +@@ -1,4 +1,4 @@ +-#! /usr/bin/python2.4 ++#! /usr/bin/python + + # Copyright 2007 Google Inc. + # +diff -Naur distcc-3.1.orig/include_server/macro_eval_test.py distcc-3.1/include_server/macro_eval_test.py +--- distcc-3.1.orig/include_server/macro_eval_test.py 2008-12-03 06:50:31.000000000 +0900 ++++ distcc-3.1/include_server/macro_eval_test.py 2009-03-17 01:30:46.000000000 +0900 +@@ -1,4 +1,4 @@ +-#! /usr/bin/python2.4 ++#! /usr/bin/python + + # Copyright 2007 Google Inc. + # +diff -Naur distcc-3.1.orig/include_server/mirror_path.py distcc-3.1/include_server/mirror_path.py +--- distcc-3.1.orig/include_server/mirror_path.py 2008-12-03 06:50:31.000000000 +0900 ++++ distcc-3.1/include_server/mirror_path.py 2009-03-17 01:30:46.000000000 +0900 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.4 ++#!/usr/bin/python + + # Copyright 2007 Google Inc. + # +diff -Naur distcc-3.1.orig/include_server/mirror_path_test.py distcc-3.1/include_server/mirror_path_test.py +--- distcc-3.1.orig/include_server/mirror_path_test.py 2008-12-03 06:50:31.000000000 +0900 ++++ distcc-3.1/include_server/mirror_path_test.py 2009-03-17 01:30:46.000000000 +0900 +@@ -1,4 +1,4 @@ +-#! /usr/bin/python2.4 ++#! /usr/bin/python + + # Copyright 2007 Google Inc. + # +diff -Naur distcc-3.1.orig/include_server/parse_command.py distcc-3.1/include_server/parse_command.py +--- distcc-3.1.orig/include_server/parse_command.py 2008-12-03 06:50:31.000000000 +0900 ++++ distcc-3.1/include_server/parse_command.py 2009-03-17 01:30:46.000000000 +0900 +@@ -1,4 +1,4 @@ +-#! /usr/bin/python2.4 ++#! /usr/bin/python + + # Copyright 2007 Google Inc. + # +diff -Naur distcc-3.1.orig/include_server/parse_command_test.py distcc-3.1/include_server/parse_command_test.py +--- distcc-3.1.orig/include_server/parse_command_test.py 2008-12-03 06:50:31.000000000 +0900 ++++ distcc-3.1/include_server/parse_command_test.py 2009-03-17 01:30:46.000000000 +0900 +@@ -1,4 +1,4 @@ +-#! /usr/bin/python2.4 ++#! /usr/bin/python + + # Copyright 2007 Google Inc. + # +diff -Naur distcc-3.1.orig/include_server/parse_file.py distcc-3.1/include_server/parse_file.py +--- distcc-3.1.orig/include_server/parse_file.py 2008-12-03 06:50:31.000000000 +0900 ++++ distcc-3.1/include_server/parse_file.py 2009-03-17 01:30:46.000000000 +0900 +@@ -1,4 +1,4 @@ +-#! /usr/bin/python2.4 ++#! /usr/bin/python + + # Copyright 2007 Google Inc. + # +diff -Naur distcc-3.1.orig/include_server/parse_file_test.py distcc-3.1/include_server/parse_file_test.py +--- distcc-3.1.orig/include_server/parse_file_test.py 2008-12-03 06:50:31.000000000 +0900 ++++ distcc-3.1/include_server/parse_file_test.py 2009-03-17 01:30:46.000000000 +0900 +@@ -1,4 +1,4 @@ +-#! /usr/bin/python2.4 ++#! /usr/bin/python + + # Copyright 2007 Google Inc. + # +diff -Naur distcc-3.1.orig/include_server/run.py distcc-3.1/include_server/run.py +--- distcc-3.1.orig/include_server/run.py 2008-12-03 06:50:31.000000000 +0900 ++++ distcc-3.1/include_server/run.py 2009-03-17 01:30:46.000000000 +0900 +@@ -1,4 +1,4 @@ +-#! /usr/bin/python2.4 ++#! /usr/bin/python + + # Copyright 2007 Google Inc. + # +diff -Naur distcc-3.1.orig/include_server/setup.py distcc-3.1/include_server/setup.py +--- distcc-3.1.orig/include_server/setup.py 2008-12-03 06:50:31.000000000 +0900 ++++ distcc-3.1/include_server/setup.py 2009-03-17 01:30:46.000000000 +0900 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.4 ++#!/usr/bin/python + + # Copyright 2007 Google Inc. + # +diff -Naur distcc-3.1.orig/include_server/statistics.py distcc-3.1/include_server/statistics.py +--- distcc-3.1.orig/include_server/statistics.py 2008-12-03 06:50:31.000000000 +0900 ++++ distcc-3.1/include_server/statistics.py 2009-03-17 01:30:46.000000000 +0900 +@@ -1,4 +1,4 @@ +-#! /usr/bin/python2.4 ++#! /usr/bin/python + # + # Copyright 2007 Google Inc. + # +diff -Naur distcc-3.1.orig/test/onetest.py distcc-3.1/test/onetest.py +--- distcc-3.1.orig/test/onetest.py 2008-12-03 06:50:22.000000000 +0900 ++++ distcc-3.1/test/onetest.py 2009-03-17 01:29:44.000000000 +0900 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.4 ++#!/usr/bin/python + # + # Copyright 2007 Google Inc. + # +diff -Naur distcc-3.1.orig/test/testdistcc.py distcc-3.1/test/testdistcc.py +--- distcc-3.1.orig/test/testdistcc.py 2008-12-03 06:50:22.000000000 +0900 ++++ distcc-3.1/test/testdistcc.py 2009-03-17 01:29:36.000000000 +0900 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python2.2 ++#! /usr/bin/env python + + # Copyright (C) 2002, 2003, 2004 by Martin Pool <mbp@samba.org> + # Copyright 2007 Google Inc. diff --git a/sys-devel/distcc/files/distcc-as-needed.patch b/sys-devel/distcc/files/distcc-as-needed.patch new file mode 100644 index 0000000..6678e4d --- /dev/null +++ b/sys-devel/distcc/files/distcc-as-needed.patch @@ -0,0 +1,17 @@ +Index: distcc-2.18.3/Makefile.in +=================================================================== +--- distcc-2.18.3.orig/Makefile.in ++++ distcc-2.18.3/Makefile.in +@@ -377,9 +377,9 @@ src/renderer.o: src/renderer.c + $(srcdir)/src/renderer.c + + distccmon-gnome@EXEEXT@: $(mon_obj) $(gnome_obj) +- $(CC) -o $@ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(LIBS) \ +- $(GNOME_CFLAGS) $(GNOME_LIBS) \ +- $(mon_obj) $(gnome_obj) ++ $(CC) -o $@ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \ ++ $(mon_obj) $(gnome_obj) \ ++ $(LIBS) $(GNOME_CFLAGS) $(GNOME_LIBS) + + + ## Dist targets diff --git a/sys-devel/distcc/files/distcc-avahi-configure.patch b/sys-devel/distcc/files/distcc-avahi-configure.patch new file mode 100644 index 0000000..cc1097d --- /dev/null +++ b/sys-devel/distcc/files/distcc-avahi-configure.patch @@ -0,0 +1,29 @@ +diff -ur distcc-2.18.3.old/configure.ac distcc-2.18.3/configure.ac +--- distcc-2.18.3.old/configure.ac 2008-01-01 21:08:02.000000000 +0200 ++++ distcc-2.18.3/configure.ac 2008-01-01 21:09:56.000000000 +0200 +@@ -387,14 +387,18 @@ + [#include <sys/socket.h>]) + + dnl check for avahi ++AC_ARG_ENABLE(avahi, AC_HELP_STRING([--enable-avahi], [enable avahi support]), [], [enable_avahi=auto]) ++ZEROCONF_DISTCC_OBJS="" ++ZEROCONF_DISTCCD_OBJS="" + PKG_CHECK_MODULES(AVAHI, [avahi-client >= 0.6.5], +-[AC_DEFINE(HAVE_AVAHI, 1, [defined if Avahi is available]) +-CFLAGS="$CFLAGS $AVAHI_CFLAGS" +-LIBS="$LIBS $AVAHI_LIBS" +-ZEROCONF_DISTCC_OBJS="src/zeroconf.o src/gcc-id.o" +-ZEROCONF_DISTCCD_OBJS="src/zeroconf-reg.o src/gcc-id.o"], +-[ZEROCONF_DISTCC_OBJS="" +-ZEROCONF_DISTCCD_OBJS=""]) ++[if test x"${enable_avahi}" = x"yes" || test x"${enable_avahi}" = x"auto"; then ++ AC_DEFINE(HAVE_AVAHI, 1, [defined if Avahi is available]) ++ CFLAGS="$CFLAGS $AVAHI_CFLAGS" ++ LIBS="$LIBS $AVAHI_LIBS" ++ ZEROCONF_DISTCC_OBJS="src/zeroconf.o src/gcc-id.o" ++ ZEROCONF_DISTCCD_OBJS="src/zeroconf-reg.o src/gcc-id.o" ++fi], ++[test x"${enable_avahi}" = x"yes" && AC_MSG_ERROR(avahi support needs avahi-client >= 0.6.5 installed)]) + AC_SUBST(ZEROCONF_DISTCC_OBJS) + AC_SUBST(ZEROCONF_DISTCCD_OBJS) + diff --git a/sys-devel/distcc/files/distcc-config b/sys-devel/distcc/files/distcc-config new file mode 100755 index 0000000..b0a8975 --- /dev/null +++ b/sys-devel/distcc/files/distcc-config @@ -0,0 +1,165 @@ +#!/usr/bin/env python +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/distcc-config,v 1.1 2004/08/27 11:05:10 pyrania Exp $ + +import os, re, signal, sys, commands, pwd +from string import rstrip + +options=[ + '--get-hosts', + '--set-hosts', + '--get-verbose', + '--set-verbose', + '--get-log', + '--set-log', + '--install', + '--help', + '--get-env', + '--set-env' +] + +tmpcmdline=sys.argv[1:] +cmdline=[] +envfile = '/etc/env.d/02distcc' + +def exithandler(foo,bar): + os.kill(0,signal.SIGKILL) + sys.exit(1) + +signal.signal(signal.SIGINT,exithandler) + +def isroot(ret=0): + if os.getuid() != 0: + if ret == 0: + print '!!!',sys.argv[:1][0],tmpcmdline[0],'must be run as root' + sys.exit(1) + else: + retval = 0 + else: + retval = 1 + return retval + +def writeenv(var,value): + isroot() + distcc_env = [] + distcc_env = open(envfile, 'r').readlines() + distcc_env_new = open(envfile, 'w') + for i in range(len(distcc_env)): + if re.compile(var+'="(.*)"').match(distcc_env[i]): + distcc_env[i] = var+'="'+value+'"\n' + distcc_env_new.write(distcc_env[i]) + #print 'Set',var,'to:',value + os.popen('/usr/sbin/env-update') + print 'If you want to use these new settings in an existing shell,' + print 'you need to "source /etc/profile" to get the changes.' + +def readenv(var): + distcc_env = open(envfile, 'r').read() + match = re.compile(var+'="(.*)"').search(distcc_env) + if match: + print var+'='+match.group(1) + else: + print var,'not set.' + +def permissions(path,user,group): + for file in os.listdir(path): + #print 'Configuring',path+file+'...' + os.chown(path+file,user,group) + +def installlinks(chost=''): + for file in ['gcc', 'cc', 'c++', 'g++']: + path = '/usr/lib/distcc/bin/' + if not chost == '': + file = chost+'-'+file + if os.path.exists('/usr/bin/'+file): + #print 'Creating',path+file,'symlink...' + if not os.path.exists(path+file): + os.symlink('/usr/bin/distcc',path+file) + #else: + # print 'Already exists. Skipping...' + +def createdistccdir(dir): + if not os.path.exists(dir): + os.mkdir(dir) + os.chmod(dir, 1777) + +for x in tmpcmdline: + if not x: + continue + if x[0:2]=="--": + if not x in options: + print "!!! Error:",x,"is an invalid option." + sys.exit(1) + else: + cmdline = x + +if '--get-hosts' in tmpcmdline: + HOSTS_ENV = os.environ.get('DISTCC_HOSTS') + HOSTS_HOME = os.environ.get('HOME')+'/hosts' + if HOSTS_ENV: + print HOSTS_ENV + elif os.path.isfile(HOSTS_HOME) and os.path.getsize(HOSTS_HOME) != 0: + print HOSTS_HOME + elif os.path.exists('/etc/distcc/hosts'): + print rstrip(open('/etc/distcc/hosts', 'r').read()) + else: + print 'No configuration file found. Setup your hosts with --set-hosts.' +elif '--set-hosts' in tmpcmdline: + if isroot(1): + PATH = '/etc/distcc' + else: + PATH = os.environ.get('HOME') + createdistccdir(PATH) + open(PATH+'/hosts', 'w').write(cmdline + '\n') +elif '--get-verbose' in tmpcmdline: + readenv('DISTCC_VERBOSE') +elif '--set-verbose' in tmpcmdline: + writeenv('DISTCC_VERBOSE',tmpcmdline[1]) +elif '--get-log' in tmpcmdline: + readenv('DISTCC_LOG') +elif '--set-log' in tmpcmdline: + writeenv('DISTCC_LOG',tmpcmdline[1]) +elif '--install' in tmpcmdline: + isroot() + print 'Creating',envfile+'...' + distcc_env = open(envfile, 'w') + distcc_env.write('# This file is managed by distcc-config; use it to change these settings.\n') + distcc_env.write('DISTCC_LOG=""\n') + distcc_env.write('DCCC_PATH="/usr/lib/distcc/bin"\n') + distcc_env.write('DISTCC_VERBOSE="0"\n') + + if os.WEXITSTATUS(commands.getstatusoutput('/usr/sbin/useradd -u 240 -g daemon -s /bin/false -d /dev/null -c "distccd" distcc')[0]) == 9: + os.WEXITSTATUS(commands.getstatusoutput('/usr/sbin/usermod -g daemon -s /bin/false -d /dev/null -c "distccd" distcc')[0]) + + foobar = pwd.getpwnam('distcc') + user = foobar[2] + group = foobar[3] + + makeconf = open('/etc/make.conf', 'r').read() + chost = re.compile('CHOST="(.*)"').search(makeconf).group(1) + print 'Creating symlinks...' + installlinks() + installlinks(chost) + + print 'Checking permissions...' + permissions('/usr/lib/distcc/bin/',user,group) + permissions('/var/run/distccd/',user,group) +elif '--get-env' in tmpcmdline: + if len(tmpcmdline) == 1: + print rstrip(open(envfile, 'r').read()) + elif len(tmpcmdline) == 2: + readenv(tmpcmdline[1]) + else: + print '!!! Error: Specify only one variable.' +elif '--set-env' in tmpcmdline: + if len(tmpcmdline) > 2 and len(tmpcmdline) <= 3: + isroot() + writeenv(tmpcmdline[1],tmpcmdline[2]) + else: + print '!!! Error: Awaiting two parameters.' +else: + print 'Usage: /usr/bin/distcc-config --set-hosts DISTCC_HOSTS | --get-hosts' + print ' /usr/bin/distcc-config --set-verbose { 0 | 1 } | --get-verbose' + print ' /usr/bin/distcc-config --set-log FILE | --get-log' + print ' /usr/bin/distcc-config --set-env VARIABLE VALUE | --get-env [VARIABLE]' diff --git a/sys-devel/distcc/files/distcc-create-dir.patch b/sys-devel/distcc/files/distcc-create-dir.patch new file mode 100644 index 0000000..8c818e1 --- /dev/null +++ b/sys-devel/distcc/files/distcc-create-dir.patch @@ -0,0 +1,56 @@ +* local directory is at mbp@sourcefrog.net--2004/distcc--devel--2--patch-183 +* comparing to mbp@sourcefrog.net--2004/distcc--devel--2--patch-183 +M ./src/tempfile.c + +* modified files + +--- orig/src/tempfile.c ++++ mod/src/tempfile.c +@@ -145,7 +145,7 @@ + int dcc_get_top_dir(char **path_ret) + { + char *env; +- static char *cached; ++ static char *cached = NULL; + int ret; + + if (cached) { +@@ -154,22 +154,23 @@ + } + + if ((env = getenv("DISTCC_DIR"))) { +- if ((cached = strdup(env)) == NULL) { ++ ++ if ((cached = strdup(env)) == NULL) + return EXIT_OUT_OF_MEMORY; +- } else { ++ else + *path_ret = cached; +- return 0; +- } +- } + +- if ((env = getenv("HOME")) == NULL) { +- rs_log_warning("HOME is not set; can't find distcc directory"); +- return EXIT_BAD_ARGUMENTS; +- } ++ } else { + +- if (asprintf(path_ret, "%s/.distcc", env) == -1) { +- rs_log_error("asprintf failed"); +- return EXIT_OUT_OF_MEMORY; ++ if ((env = getenv("HOME")) == NULL) { ++ rs_log_warning("HOME is not set; can't find distcc directory"); ++ return EXIT_BAD_ARGUMENTS; ++ } ++ ++ if (asprintf(path_ret, "%s/.distcc", env) == -1) { ++ rs_log_error("asprintf failed"); ++ return EXIT_OUT_OF_MEMORY; ++ } + } + + ret = dcc_mkdir(*path_ret); + + + diff --git a/sys-devel/distcc/files/distcc-freedesktop.patch b/sys-devel/distcc/files/distcc-freedesktop.patch new file mode 100644 index 0000000..2698109 --- /dev/null +++ b/sys-devel/distcc/files/distcc-freedesktop.patch @@ -0,0 +1,84 @@ +* local directory is at mbp@sourcefrog.net--2004/distcc--devel--2--patch-183 +* comparing to mbp@sourcefrog.net--2004/distcc--devel--2--patch-183 +M src/mon-gnome.c +M Makefile.in +M gnome/distccmon-gnome.desktop + +* modified files + +--- orig/Makefile.in ++++ mod/Makefile.in +@@ -45,11 +45,12 @@ + includedir = @includedir@ + oldincludedir = /usr/include + docdir = @docdir@ +-pkgdatadir = $(datadir)/@PACKAGE_NAME@ ++icondir = $(datadir)/pixmaps ++desktopdir = $(datadir)/applications + + # These must be done from here, not from autoconf, because they can + # contain variable expansions written in Make syntax. Ew. +-DIR_DEFS = -DSYSCONFDIR="\"${sysconfdir}\"" -DPKGDATADIR="\"${pkgdatadir}\"" ++DIR_DEFS = -DSYSCONFDIR="\"${sysconfdir}\"" -DICONDIR="\"${icondir}\"" + + # arguments to pkgconfig + GNOME_PACKAGES = @GNOME_PACKAGES@ +@@ -508,7 +509,8 @@ + @echo " documents $(DESTDIR)$(docdir)" + @echo " programs $(DESTDIR)$(bindir)" + @echo " system configuration $(DESTDIR)$(sysconfdir)" +- @echo " shared data files $(DESTDIR)$(pkgdatadir)" ++ @echo " icons $(DESTDIR)$(icondir)" ++ @echo " .desktop file $(DESTDIR)$(desktopdir)" + + + # install-sh can't handle multiple arguments, but we don't need any +@@ -541,8 +543,8 @@ + done + + install-gnome-data: $(gnome_data) +- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) +- for p in $^; do \ +- $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir) || exit 1; \ +- done ++ $(mkinstalldirs) $(DESTDIR)$(icondir) ++ $(mkinstalldirs) $(DESTDIR)$(desktopdir) ++ $(INSTALL_DATA) gnome/distccmon-gnome-icon.png $(DESTDIR)$(icondir) ++ $(INSTALL_DATA) gnome/distccmon-gnome.desktop $(DESTDIR)$(desktopdir) + + + +--- orig/gnome/distccmon-gnome.desktop ++++ mod/gnome/distccmon-gnome.desktop +@@ -1,13 +1,11 @@ + [Desktop Entry] +-Version=0.9.4 +-Encoding=UTF-8 + Exec=distccmon-gnome + Name=distcc monitor + GenericName=Distributed Compile Monitor + Comment=Graphical view of distributed compile tasks +-Icon=distccmon-gnome-icon.png ++Icon=distccmon-gnome-icon + TryExec=distccmon-gnome + Terminal=false + Type=Application +-Categories=GNOME;Application;Development; ++Categories=GNOME;Development; + StartupNotify=true + + +--- orig/src/mon-gnome.c ++++ mod/src/mon-gnome.c +@@ -599,7 +599,7 @@ + + #if GTK_CHECK_VERSION(2,2,0) + gtk_window_set_icon_from_file (GTK_WINDOW (mainwin), +- PKGDATADIR "/distccmon-gnome-icon.png", ++ ICONDIR "/distccmon-gnome-icon.png", + NULL); + #endif + + + + diff --git a/sys-devel/distcc/files/distcc-gentoo-multilib-r1.patch b/sys-devel/distcc/files/distcc-gentoo-multilib-r1.patch new file mode 100644 index 0000000..8a7b37e --- /dev/null +++ b/sys-devel/distcc/files/distcc-gentoo-multilib-r1.patch @@ -0,0 +1,146 @@ +diff -Naurp distcc-2.18.3.orig/src/distcc.c distcc-2.18.3/src/distcc.c +--- distcc-2.18.3.orig/src/distcc.c 2004-10-01 17:47:07.000000000 -0700 ++++ distcc-2.18.3/src/distcc.c 2005-01-30 22:15:43.883870942 -0800 +@@ -135,7 +135,106 @@ static void dcc_client_catch_signals(voi + signal(SIGHUP, &dcc_client_signalled); + } + ++#define MAXNEWFLAGS 32 ++#define MAXFLAGLEN 127 + ++static char **getNewArgv(char **argv, const char *newflagsStr) { ++ char **newargv; ++ char newflags[MAXNEWFLAGS][MAXFLAGLEN + 1]; ++ unsigned newflagsCount = 0; ++ unsigned argc; ++ unsigned i; ++ char **p; ++ ++ unsigned s, f; /* start/finish of each flag. f points to ++ * the char AFTER the end (ie the space/\0 ++ */ ++ ++ /* Tokenize the flag list */ ++ for(s=0; s < strlen(newflagsStr); s=f+1) { ++ /* Put s at the start of the next flag */ ++ while(newflagsStr[s] == ' ' || ++ newflagsStr[s] == '\t') ++ s++; ++ if(s == strlen(newflagsStr)) ++ break; ++ ++ f = s + 1; ++ while(newflagsStr[f] != ' ' && ++ newflagsStr[f] != '\t' && ++ newflagsStr[f] != '\0') ++ f++; ++ ++ /* Detect overrun */ ++ if(MAXFLAGLEN < f - s || MAXNEWFLAGS == newflagsCount) ++ return NULL; ++ ++ strncpy(newflags[newflagsCount], newflagsStr + s, f - s); ++ newflags[newflagsCount][f - s]='\0'; ++ newflagsCount++; ++ } ++ ++ /* Calculate original argc and see if it contains -m{abi,32,64} */ ++ for(argc=0, p=argv; *p; p++, argc++) { ++ if(newflagsCount && (strncmp(*p, "-m32", 4) == 0 || ++ strncmp(*p, "-m64", 4) == 0 || ++ strncmp(*p, "-mabi", 5) == 0)) { ++ /* Our command line sets the ABI, warn the user about this and ignore ++ newArgs by setting newflagsCount to 0. ++ */ ++ newflagsCount = 0; ++ fprintf(stderr, "%s: %s detected on the command line overrides implicit %s added by the wrapper.\n", argv[0], *p, newflagsStr); ++ } ++ } ++ ++ /* Allocate our array */ ++ newargv = (char **)malloc(sizeof(char *) * (argc + newflagsCount + 1)); ++ ++ /* Make room for the original, new ones, and the NULL terminator */ ++ if(!newargv) ++ return NULL; ++ ++ /* Build argv */ ++ newargv[0] = argv[0]; ++ ++ /* The newFlags come first since we want the environment to override them. */ ++ for(i=1; i - 1 < newflagsCount; i++) { ++ newargv[i] = newflags[i - 1]; ++ } ++ ++ /* We just use the existing argv[i] as the start. */ ++ for(; i - newflagsCount < argc; i++) { ++ newargv[i] = argv[i - newflagsCount]; ++ } ++ ++ /* And now cap it off... */ ++ newargv[i] = NULL; ++ ++ return newargv; ++} ++ ++static char **getNewArgvFromEnv(char **argv) { ++ char **newargv = argv; ++ ++ if(getenv("ABI")) { ++ char *envar = (char *)malloc(sizeof(char) * (strlen("CFLAGS_") + strlen(getenv("ABI")) + 1 )); ++ ++ if(!envar) ++ return NULL; ++ ++ /* We use CFLAGS_${ABI} for gcc, g++, g77, etc as they are ++ * the same no matter which compiler we are using. ++ */ ++ sprintf(envar, "CFLAGS_%s", getenv("ABI")); ++ ++ if(getenv(envar)) ++ newargv = getNewArgv(argv, getenv(envar)); ++ ++ free(envar); ++ } ++ ++ return newargv; ++} + + /** + * distcc client entry point. +@@ -150,6 +249,7 @@ int main(int argc, char **argv) + int status, sg_level, tweaked_path = 0; + char **compiler_args; + char *compiler_name; ++ char **newargv; + int ret; + + dcc_client_catch_signals(); +@@ -183,7 +283,12 @@ int main(int argc, char **argv) + goto out; + } + +- dcc_find_compiler(argv, &compiler_args); ++ if(!(newargv = getNewArgvFromEnv(argv))) { ++ ret = EXIT_OUT_OF_MEMORY; ++ goto out; ++ } ++ dcc_find_compiler(newargv, &compiler_args); ++ if (newargv != argv) free(newargv); + /* compiler_args is now respectively either "cc -c hello.c" or + * "gcc -c hello.c" */ + +@@ -200,7 +305,12 @@ int main(int argc, char **argv) + &tweaked_path)) != 0) + goto out; + +- dcc_copy_argv(argv, &compiler_args, 0); ++ if(!(newargv = getNewArgvFromEnv(argv))) { ++ ret = EXIT_OUT_OF_MEMORY; ++ goto out; ++ } ++ dcc_copy_argv(newargv, &compiler_args, 0); ++ if (newargv != argv) free(newargv); + compiler_args[0] = compiler_name; + } + diff --git a/sys-devel/distcc/files/distcc-gentoo-multilib.patch b/sys-devel/distcc/files/distcc-gentoo-multilib.patch new file mode 100644 index 0000000..02e0486 --- /dev/null +++ b/sys-devel/distcc/files/distcc-gentoo-multilib.patch @@ -0,0 +1,126 @@ +diff -Naur distcc-2.18.3-vanilla/src/distcc.c distcc-2.18.3/src/distcc.c +--- distcc-2.18.3-vanilla/src/distcc.c 2004-10-01 17:47:07.000000000 -0700 ++++ distcc-2.18.3/src/distcc.c 2004-12-28 01:04:51.017574246 -0800 +@@ -135,7 +135,86 @@ + signal(SIGHUP, &dcc_client_signalled); + } + ++#define MAXNEWFLAGS 32 ++#define MAXFLAGLEN 127 + ++static char **getNewArgv(char **argv) { ++ char **newargv; ++ char newflags[MAXNEWFLAGS][MAXFLAGLEN + 1]; ++ unsigned newflagsCount = 0; ++ unsigned argc; ++ unsigned i; ++ char **p; ++ ++ if(getenv("ABI")) { ++ char *envar = (char *)malloc(sizeof(char) * ++ (strlen("CFLAGS_") + strlen(getenv("ABI")) + 1 )); ++ if(!envar) ++ return NULL; ++ ++ /* We use CFLAGS_${ABI} for gcc, g++, g77, etc as they are ++ * the same no matter which compiler we are using. ++ */ ++ sprintf(envar, "CFLAGS_%s", getenv("ABI")); ++ ++ if(getenv(envar)) { ++ const char *newflagsStr = getenv(envar); ++ unsigned s, f; /* start/finish of each flag. f points to ++ * the char AFTER the end (ie the space/\0 ++ */ ++ ++ /* Tokenize the flag list */ ++ for(s=0; s < strlen(newflagsStr); s=f+1) { ++ /* Put s at the start of the next flag */ ++ while(newflagsStr[s] == ' ' || ++ newflagsStr[s] == '\t') ++ s++; ++ if(s == strlen(newflagsStr)) ++ break; ++ ++ f = s + 1; ++ while(newflagsStr[f] != ' ' && ++ newflagsStr[f] != '\t' && ++ newflagsStr[f] != '\0') ++ f++; ++ ++ /* Detect overrun */ ++ if(MAXFLAGLEN < f - s || MAXNEWFLAGS == newflagsCount) ++ return NULL; ++ ++ strncpy(newflags[newflagsCount], newflagsStr + s, f - s); ++ newflagsCount++; ++ } ++ } ++ ++ free(envar); ++ } ++ ++ /* Calculate argc */ ++ for(argc=0, p=argv; *p; p++, argc++); ++ ++ /* Allocate our array */ ++ newargv = (char **)malloc(sizeof(char *) * (argc + newflagsCount + 1)); ++ ++ /* Make room for the original, new ones, and the NULL terminator */ ++ if(!newargv) ++ return NULL; ++ ++ /* We just use the existing argv[i] as the start. */ ++ for(i=0; i < argc; i++) { ++ newargv[i] = argv[i]; ++ } ++ ++ /* Now we want to append our newflags list. */ ++ for(; i < argc + newflagsCount; i++) { ++ newargv[i] = newflags[i - argc]; ++ } ++ ++ /* And now cap it off... */ ++ newargv[i] = NULL; ++ ++ return newargv; ++} + + /** + * distcc client entry point. +@@ -150,6 +229,7 @@ + int status, sg_level, tweaked_path = 0; + char **compiler_args; + char *compiler_name; ++ char **newargv; + int ret; + + dcc_client_catch_signals(); +@@ -183,7 +263,12 @@ + goto out; + } + +- dcc_find_compiler(argv, &compiler_args); ++ if(!(newargv = getNewArgv(argv))) { ++ ret = EXIT_OUT_OF_MEMORY; ++ goto out; ++ } ++ dcc_find_compiler(newargv, &compiler_args); ++ free(newargv); + /* compiler_args is now respectively either "cc -c hello.c" or + * "gcc -c hello.c" */ + +@@ -200,7 +285,12 @@ + &tweaked_path)) != 0) + goto out; + +- dcc_copy_argv(argv, &compiler_args, 0); ++ if(!(newargv = getNewArgv(argv))) { ++ ret = EXIT_OUT_OF_MEMORY; ++ goto out; ++ } ++ dcc_copy_argv(newargv, &compiler_args, 0); ++ free(newargv); + compiler_args[0] = compiler_name; + } + diff --git a/sys-devel/distcc/files/distcc-hardened.patch b/sys-devel/distcc/files/distcc-hardened.patch new file mode 100644 index 0000000..69b3a65 --- /dev/null +++ b/sys-devel/distcc/files/distcc-hardened.patch @@ -0,0 +1,24 @@ +From: Gordon Malm <gengor@gentoo.org> + +Make distcc client pass -D__KERNEL__ macro. Hardened GCC uses this +macro to determine if code intended to be run in-kernel is being compiled. +If the code is kernel code, certain compile flags are not applied. + +When using distcc to build kernel code (modules, etc.) without this patch, +the distccd host doesn't get passed -D__KERNEL__. Consequently, gcc on +the distccd host applies all kinds of flags that it shouldn't. + +--- distcc-2.18.3/src/strip.c ++++ distcc-2.18.3-hardened/src/strip.c +@@ -73,7 +73,10 @@ int dcc_strip_local_args(char **from, ch + /* skip through argv, copying all arguments but skipping ones that + * ought to be omitted */ + for (from_i = to_i = 0; from[from_i]; from_i++) { +- if (str_equal("-D", from[from_i]) ++ if (str_equal("-D__KERNEL__", from[from_i])) { ++ to[to_i++] = from[from_i]; ++ } ++ else if (str_equal("-D", from[from_i]) + || str_equal("-I", from[from_i]) + || str_equal("-U", from[from_i]) + || str_equal("-L", from[from_i]) diff --git a/sys-devel/distcc/files/distcc-march-native.patch b/sys-devel/distcc/files/distcc-march-native.patch new file mode 100644 index 0000000..a5c9bb2 --- /dev/null +++ b/sys-devel/distcc/files/distcc-march-native.patch @@ -0,0 +1,16 @@ +diff -ur distcc-2.18.3/src/arg.c distcc-modified/src/arg.c +--- distcc-2.18.3/src/arg.c 2004-11-30 13:13:53.000000000 +0100 ++++ distcc-modified/src/arg.c 2008-02-05 17:56:58.000000000 +0100 +@@ -171,6 +171,12 @@ + to distribute it even if we could. */ + rs_trace("%s implies -E (maybe) and must be local", a); + return EXIT_DISTCC_FAILED; ++ } else if (!strcmp(a, "-march=native")) { ++ rs_trace("-march=native generates code for local machine; must be local"); ++ return EXIT_DISTCC_FAILED; ++ } else if (!strcmp(a, "-mtune=native")) { ++ rs_trace("-mtune=native optimizes for local machine; must be local"); ++ return EXIT_DISTCC_FAILED; + } else if (str_startswith("-Wa,", a)) { + /* Look for assembler options that would produce output + * files and must be local. diff --git a/sys-devel/distcc/metadata.xml b/sys-devel/distcc/metadata.xml new file mode 100644 index 0000000..7b9fb75 --- /dev/null +++ b/sys-devel/distcc/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>hp-cluster</herd> + <maintainer> + <email>matsuu@gentoo.org</email> + </maintainer> + <longdescription lang="en"> + Distcc is a program to distribute compilation of C code across several + machines on a network. + </longdescription> +</pkgmetadata> |