Lots of fun hackery, forcing updates to have users etc-update to hopefully fix http://distcc.samba.org/security.html by using --listen and/or --allow flags on distccd.

9 files changed, 40 insertions, 62 deletions

diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index 0c27195ff668..f0cc42cf35a5 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-devel/distcc
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.118 2004/09/16 21:38:56 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.119 2004/09/16 21:57:03 lisa Exp $
+
+*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:
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 4f77e02f511a..adffc1204155 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,14 +1,12 @@
-MD5 f39c687d0e21296ce13a099e3160bf73 ChangeLog 21615
-MD5 0f89aa221e99bc4ceb38843434519550 distcc-2.14.ebuild 4805
-MD5 2d087f5344cf42f435c77129776aebbd distcc-2.16.ebuild 4878
+MD5 621f16fa58ab579c37412bc0b913e9ef ChangeLog 22077
+MD5 7575e847dcd5199a75c26f9ec301bed1 distcc-2.14-r1.ebuild 5058
+MD5 34703cac4bf91985c9e4570e1f42faa1 distcc-2.16-r1.ebuild 5136
 MD5 70619e7eb5fa4fd0aa4f3588579cd50d metadata.xml 443
-MD5 e28d8d0393c573dc8caab6070ff0d712 distcc-2.17-r1.ebuild 4971
-MD5 47a8df000e00ce5f8bff08c9342bdae4 files/digest-distcc-2.14 64
-MD5 c462167d99c154e9f8b9f94022ed2a71 files/digest-distcc-2.16 64
+MD5 c2348700d8d0d7b2fcc10f05911fea22 distcc-2.17-r1.ebuild 5166
+MD5 47a8df000e00ce5f8bff08c9342bdae4 files/digest-distcc-2.14-r1 64
+MD5 c462167d99c154e9f8b9f94022ed2a71 files/digest-distcc-2.16-r1 64
 MD5 af5f3983a736bd552e83d92ac9955a03 files/digest-distcc-2.17-r1 64
 MD5 fec77b3be8d8bd8f2d6e5a708cb35717 files/distcc-config 4874
 MD5 2f83451f527f3c2c7739d4535f1fb1b3 files/2.17/conf 1317
 MD5 1161999a5d25185f95a8c284bd7307d1 files/2.17/init 733
 MD5 a053c2281c30835b1025f307b09b78ae files/2.17/2.17-ipv6-fix.diff.gz 237
-MD5 0c66fbdfd3c7ad0ae07bc17bbce9b5e1 files/2.11.1p/conf 551
-MD5 0f86be5afa04088831e049957f87582a files/2.11.1p/init 642
diff --git a/sys-devel/distcc/distcc-2.14.ebuild b/sys-devel/distcc/distcc-2.14-r1.ebuild
index a43a408f4f96..430f6577a316 100644
--- a/sys-devel/distcc/distcc-2.14.ebuild
+++ b/sys-devel/distcc/distcc-2.14-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.14.ebuild,v 1.9 2004/09/06 19:50:54 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.14-r1.ebuild,v 1.1 2004/09/16 21:57:03 lisa 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 gcc flag-o-matic
 
-PATCHLEVEL="2.11.1p"
+PATCHLEVEL="2.17"
 
 DESCRIPTION="a program to distribute compilation of C code across several machines on a network"
 HOMEPAGE="http://distcc.samba.org/"
@@ -145,5 +145,10 @@ pkg_postinst() {
 	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"
-	epause 5
+
+	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-2.16.ebuild b/sys-devel/distcc/distcc-2.16-r1.ebuild
index 7dd4de28b143..8eb4c7957a2a 100644
--- a/sys-devel/distcc/distcc-2.16.ebuild
+++ b/sys-devel/distcc/distcc-2.16-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.16.ebuild,v 1.8 2004/09/13 12:21:43 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.16-r1.ebuild,v 1.1 2004/09/16 21:57:03 lisa 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
@@ -154,5 +154,10 @@ pkg_postinst() {
 	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"
-	epause 5
+
+	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-2.17-r1.ebuild b/sys-devel/distcc/distcc-2.17-r1.ebuild
index 991e782c2973..2fa5297528a1 100644
--- a/sys-devel/distcc/distcc-2.17-r1.ebuild
+++ b/sys-devel/distcc/distcc-2.17-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.17-r1.ebuild,v 1.4 2004/09/16 21:38:56 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.17-r1.ebuild,v 1.5 2004/09/16 21:57:03 lisa 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
@@ -154,6 +154,10 @@ pkg_postinst() {
 	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 "Don't forget to run etc-update and restart distccd!"
-	epause 5
+
+	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/files/2.11.1p/conf b/sys-devel/distcc/files/2.11.1p/conf
deleted file mode 100644
index 9769d19a94a3..000000000000
--- a/sys-devel/distcc/files/2.11.1p/conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2003 Gentoo Technologies, Inc
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.11.1p/conf,v 1.3 2004/07/18 04:44:08 dragonheart Exp $
-# distccd configuration file
-
-# 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="--port 3632"
-
-# set this for niceness
-# Default is 15
-DISTCCD_NICE="15"
diff --git a/sys-devel/distcc/files/2.11.1p/init b/sys-devel/distcc/files/2.11.1p/init
deleted file mode 100644
index f76fe3ede035..000000000000
--- a/sys-devel/distcc/files/2.11.1p/init
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.11.1p/init,v 1.4 2004/06/23 20:53:59 eradicator Exp $
-
-depend() {
-	need net
-	use ypbind
-}
-
-start() {
-	rm -f ${DISTCCD_PIDFILE}
-	ebegin "Starting distccd"
-	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/digest-distcc-2.14 b/sys-devel/distcc/files/digest-distcc-2.14-r1
index af4a45dcc9a8..af4a45dcc9a8 100644
--- a/sys-devel/distcc/files/digest-distcc-2.14
+++ b/sys-devel/distcc/files/digest-distcc-2.14-r1
diff --git a/sys-devel/distcc/files/digest-distcc-2.16 b/sys-devel/distcc/files/digest-distcc-2.16-r1
index b46ab9e2afc2..b46ab9e2afc2 100644
--- a/sys-devel/distcc/files/digest-distcc-2.16
+++ b/sys-devel/distcc/files/digest-distcc-2.16-r1