diff options
author | 2008-12-20 22:51:54 -0500 | |
---|---|---|
committer | 2008-12-20 22:51:54 -0500 | |
commit | eeed864730a1bb2247b6010262907a004171eea2 (patch) | |
tree | dba89fa5cd240506c67334bd04d197663f51b528 | |
parent | Update layman-local.txt file to allow tracking of eatnumber1-overlay. (diff) | |
download | eatnumber1-eeed864730a1bb2247b6010262907a004171eea2.tar.gz eatnumber1-eeed864730a1bb2247b6010262907a004171eea2.tar.bz2 eatnumber1-eeed864730a1bb2247b6010262907a004171eea2.zip |
Moved to distcc-overlay.
-rw-r--r-- | sys-devel/distcc/Manifest | 12 | ||||
-rw-r--r-- | sys-devel/distcc/distcc-3.0-r4.ebuild | 179 | ||||
-rw-r--r-- | sys-devel/distcc/distcc-3.1.ebuild | 172 | ||||
-rw-r--r-- | sys-devel/distcc/files/3.0/conf | 40 | ||||
-rw-r--r-- | sys-devel/distcc/files/3.0/distcc-config | 123 | ||||
-rwxr-xr-x | sys-devel/distcc/files/3.0/init | 32 | ||||
-rw-r--r-- | sys-devel/distcc/files/distcc-3.0-gentoo.patch | 33 | ||||
-rw-r--r-- | sys-devel/distcc/files/distcc-3.0-svn617.patch | 13 | ||||
-rw-r--r-- | sys-devel/distcc/files/distcc-3.0-uninitialized.patch | 13 | ||||
-rw-r--r-- | sys-devel/distcc/files/distcc-3.0-xinetd.patch | 15 | ||||
-rw-r--r-- | sys-devel/distcc/files/distcc-hardened.patch | 24 |
11 files changed, 0 insertions, 656 deletions
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest deleted file mode 100644 index a4bf190..0000000 --- a/sys-devel/distcc/Manifest +++ /dev/null @@ -1,12 +0,0 @@ -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 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-hardened.patch 1084 RMD160 0f11c9c8e8b56e91399b054fb57566e290a0baa5 SHA1 746f1905a9bc45ea7b71d71f4b1feba7d96d0f7f SHA256 dcf63f201cb7f4bf13eeb1485a5056c64370b9239d28e4acc77a47046dcda6cf -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-3.0-r4.ebuild 4832 RMD160 8806b10df9b6fd46b1d1e964202ea0b29832d216 SHA1 27bc4778ad2c59a63ebaebfb0871bec7fc53a466 SHA256 2c42054a651f354a9ba993bbc3ecd9c23c1532ca312ceea1357807776644fc7a -EBUILD distcc-3.1.ebuild 4610 RMD160 59a3b7b8d5f36cda2eae973a4df11b464452f830 SHA1 03dabdb10cf5a64ff6c05302896319281e46754c SHA256 34871dbe737dc02ec979e66ec440f788069c7b560d5875de19d98ac7d777e8d8 diff --git a/sys-devel/distcc/distcc-3.0-r4.ebuild b/sys-devel/distcc/distcc-3.0-r4.ebuild deleted file mode 100644 index 7fe3641..0000000 --- a/sys-devel/distcc/distcc-3.0-r4.ebuild +++ /dev/null @@ -1,179 +0,0 @@ -# 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-3.0-r4.ebuild,v 1.2 2008/11/10 23:21:04 matsuu 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 cross-compile" - -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" - 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() { - emake 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}" - if use cross-compile; then - exeinto "${DCCC_PATH}" - cat > "${T}/${CTARGET:-${CHOST}}-wrapper" <<-EOF - #!/bin/bash - exec ${DCCC_PATH}/${CTARGET:-${CHOST}}-g\${0:\$[-2]} "\$@" - EOF - doexe "${T}/${CTARGET:-${CHOST}}-wrapper" - fi - for f in cc c++ gcc g++; do - if use cross-compile; then - dosym "${DCCC_PATH}/${CTARGET:-${CHOST}}-wrapper" "${DCCC_PATH}/${f}" - else - dosym /usr/bin/distcc "${DCCC_PATH}/${f}" - fi - 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.ebuild b/sys-devel/distcc/distcc-3.1.ebuild deleted file mode 100644 index bec4e2c..0000000 --- a/sys-devel/distcc/distcc-3.1.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# 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-3.1.ebuild,v 1.1 2008/12/03 09:19:07 matsuu 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 cross-compile" - -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}/${PN}-3.0-xinetd.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" -} - -src_compile() { - # More legacy stuff? - [ "$(gcc-major-version)" = "2" ] && filter-lfs-flags - - econf \ - $(use_with avahi) \ - $(use_with gtk) \ - $(use_with gnome) \ - $(use_enable ipv6 rfc2553) \ - --disable-Werror \ - --with-docdir="/usr/share/doc/${PF}" || die "econf failed" - emake || die "emake failed" -} - -src_install() { - # In rare cases, parallel make install failed - emake -j1 DESTDIR="${D}" install || die - - dobin "${FILESDIR}/3.0/distcc-config" - - newinitd "${FILESDIR}/3.0/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}" - if use cross-compile; then - exeinto "${DCCC_PATH}" - cat > "${T}/${CTARGET:-${CHOST}}-wrapper" <<-EOF - #!/bin/bash - exec ${DCCC_PATH}/${CTARGET:-${CHOST}}-g\${0:\$[-2]} "\$@" - EOF - doexe "${T}/${CTARGET:-${CHOST}}-wrapper" - fi - for f in cc c++ gcc g++; do - if use cross-compile; then - dosym "${DCCC_PATH}/${CTARGET:-${CHOST}}-wrapper" "${DCCC_PATH}/${f}" - else - dosym /usr/bin/distcc "${DCCC_PATH}/${f}" - fi - 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/3.0/conf b/sys-devel/distcc/files/3.0/conf deleted file mode 100644 index eb784c3..0000000 --- a/sys-devel/distcc/files/3.0/conf +++ /dev/null @@ -1,40 +0,0 @@ -# /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 deleted file mode 100644 index 11676e5..0000000 --- a/sys-devel/distcc/files/3.0/distcc-config +++ /dev/null @@ -1,123 +0,0 @@ -#!/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 deleted file mode 100755 index c4be986..0000000 --- a/sys-devel/distcc/files/3.0/init +++ /dev/null @@ -1,32 +0,0 @@ -#!/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/distcc-3.0-gentoo.patch b/sys-devel/distcc/files/distcc-3.0-gentoo.patch deleted file mode 100644 index e2464df..0000000 --- a/sys-devel/distcc/files/distcc-3.0-gentoo.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 deleted file mode 100644 index 54f55dc..0000000 --- a/sys-devel/distcc/files/distcc-3.0-svn617.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 28b226b..0000000 --- a/sys-devel/distcc/files/distcc-3.0-uninitialized.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 47877ad..0000000 --- a/sys-devel/distcc/files/distcc-3.0-xinetd.patch +++ /dev/null @@ -1,15 +0,0 @@ -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-hardened.patch b/sys-devel/distcc/files/distcc-hardened.patch deleted file mode 100644 index 69b3a65..0000000 --- a/sys-devel/distcc/files/distcc-hardened.patch +++ /dev/null @@ -1,24 +0,0 @@ -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]) |