Added init script to create network bridges using brctl (bug #21418)

8 files changed, 114 insertions, 3 deletions

diff --git a/net-misc/bridge-utils/ChangeLog b/net-misc/bridge-utils/ChangeLog
index 9e3d176bf23b..9e1e35dbba8c 100644
--- a/net-misc/bridge-utils/ChangeLog
+++ b/net-misc/bridge-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/bridge-utils
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/ChangeLog,v 1.10 2004/02/25 07:42:02 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/ChangeLog,v 1.11 2004/03/18 11:31:04 jhhudso Exp $
+
+*bridge-utils-0.9.6-r1 (18 Mar 2004)
+
+  18 Mar 2004; Jared Hudson <jhhudso@gentoo.org> bridge-utils-0.9.6-r1.ebuild,
+  bridge-utils-0.9.6.ebuild, metadata.xml, files/bridge.conf, files/bridge.rc:
+  Added an init script to the bridge port thanks to Gustavo Felisberto
+  <humpback@gentoo.org> and Denis Knauf <deac@linux-ist-pleite.de>
 
   25 Feb 2004; Patrick Kursawe <phosphan@gentoo.org>
   bridge-utils-0.9.3-r1.ebuild, bridge-utils-0.9.6.ebuild:
diff --git a/net-misc/bridge-utils/Manifest b/net-misc/bridge-utils/Manifest
index da5ddd927b23..43eac497b027 100644
--- a/net-misc/bridge-utils/Manifest
+++ b/net-misc/bridge-utils/Manifest
@@ -1,3 +1,7 @@
-MD5 403ea9affbf31bf39eb687ece8a208fa bridge-utils-0.9.6.ebuild 1075
+MD5 0ba767744d45f0fabef8cd1253d29975 bridge-utils-0.9.6-r1.ebuild 1042
 MD5 cd6d0006c4580d8f1c120f1ad13fdfbe ChangeLog 1591
+MD5 e8d91f92588b6d7e0ed75e873bb1c652 bridge-utils-0.9.6.ebuild 963
+MD5 686661d3e601e7ea69899b711e8250c5 files/bridge.conf 89
 MD5 ab89aefb5bcf4befdfb115be79139469 files/digest-bridge-utils-0.9.6 69
+MD5 ab89aefb5bcf4befdfb115be79139469 files/digest-bridge-utils-0.9.6-r1 69
+MD5 0a620347fd88ca7a5ebcea31011b8332 files/bridge.rc 604
diff --git a/net-misc/bridge-utils/bridge-utils-0.9.6-r1.ebuild b/net-misc/bridge-utils/bridge-utils-0.9.6-r1.ebuild
new file mode 100644
index 000000000000..615d39a817c4
--- /dev/null
+++ b/net-misc/bridge-utils/bridge-utils-0.9.6-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/bridge-utils-0.9.6-r1.ebuild,v 1.1 2004/03/18 11:31:04 jhhudso Exp $
+
+# I think you want CONFIG_BRIDGE in your kernel to use this ;)
+
+DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge"
+HOMEPAGE="http://bridge.sourceforge.net/"
+
+S=${WORKDIR}/${PN}
+SRC_URI="http://bridge.sourceforge.net/bridge-utils/${P}.tar.gz"
+
+DEPEND="virtual/glibc"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+src_compile() {
+	econf --prefix=/ --libdir=/usr/lib --includedir=/usr/include
+	emake || die "make failed"
+}
+
+src_install () {
+	einstall prefix=${D} libdir=${D}/usr/lib includedir=${D}/usr/include
+	dodoc AUTHORS ChangeLog README THANKS
+	dodoc doc/{FAQ,FIREWALL,HOWTO,PROJECTS,SMPNOTES,WISHLIST}
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/bridge.rc bridge
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/bridge.conf bridge
+}
+
+pkg_postinst () {
+	ewarn "Gentoo now comes with a bridge init script. You can add it to"
+	ewarn "the boot runlevel. You can configure it in /etc/conf.d/bridge"
+}
diff --git a/net-misc/bridge-utils/bridge-utils-0.9.6.ebuild b/net-misc/bridge-utils/bridge-utils-0.9.6.ebuild
index bb2b0aa25cfd..3e15fda80051 100644
--- a/net-misc/bridge-utils/bridge-utils-0.9.6.ebuild
+++ b/net-misc/bridge-utils/bridge-utils-0.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/bridge-utils-0.9.6.ebuild,v 1.4 2004/02/25 07:42:02 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/bridge-utils-0.9.6.ebuild,v 1.5 2004/03/18 11:31:04 jhhudso Exp $
 
 # I think you want CONFIG_BRIDGE in your kernel to use this ;)
 
diff --git a/net-misc/bridge-utils/files/bridge.conf b/net-misc/bridge-utils/files/bridge.conf
new file mode 100644
index 000000000000..94bcb4cda1f6
--- /dev/null
+++ b/net-misc/bridge-utils/files/bridge.conf
@@ -0,0 +1,6 @@
+#Examples
+#
+#bridge="br100 br1000"
+#
+#bridge_br100_devices="eth3 eth4"
+#bridge_br1000_devices="eth5 eth6"
diff --git a/net-misc/bridge-utils/files/bridge.rc b/net-misc/bridge-utils/files/bridge.rc
new file mode 100644
index 000000000000..388e47356321
--- /dev/null
+++ b/net-misc/bridge-utils/files/bridge.rc
@@ -0,0 +1,47 @@
+#!/sbin/runscript
+
+depend() {
+	use modules
+}
+
+start() {
+	for b in ${bridge}
+	do
+		ebegin "Create Bridge ${b}"
+		/sbin/brctl addbr ${b} || {
+			retval=$?
+			eend ${retval} "Failed to create bridge ${b}"
+			continue
+		}
+		for i in $(eval echo \$\{bridge_${b}_devices\})
+		do
+			/sbin/brctl addif ${b} ${i} || {
+				retval=$?
+				eend ${retval} "Failed to add interface ${i}"
+				continue
+			}
+			ifconfig ${i} 0.0.0.0 promisc || \
+				eend $? "Failed to set up interface ${i}"
+		done
+	done
+}
+
+stop() {
+	for b in ${bridge}
+	do
+		ebegin "Destroy Bridge ${b}"
+		for i in $(eval echo \$\{bridge_${b}_devices\})
+		do
+			ifconfig ${i} down || \
+				eend $? "Failed to set down interface ${i}"
+			/sbin/brctl delif ${b} ${i} || {
+				retval=$?
+				eend ${retval} "Failed to del interface ${i}"
+				return ${retval}
+			}
+		done
+		/sbin/brctl delbr ${b} || \
+			eend ${retval} "Failed to destroy bridge ${b}"
+	done
+	eend $? "Failed to stop bridge"
+}
diff --git a/net-misc/bridge-utils/files/digest-bridge-utils-0.9.6-r1 b/net-misc/bridge-utils/files/digest-bridge-utils-0.9.6-r1
new file mode 100644
index 000000000000..c63affd4077e
--- /dev/null
+++ b/net-misc/bridge-utils/files/digest-bridge-utils-0.9.6-r1
@@ -0,0 +1 @@
+MD5 c45ede7ebd2fa762b4093f62ff582fd0 bridge-utils-0.9.6.tar.gz 60447
diff --git a/net-misc/bridge-utils/metadata.xml b/net-misc/bridge-utils/metadata.xml
new file mode 100644
index 000000000000..c5d67a611520
--- /dev/null
+++ b/net-misc/bridge-utils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>jhhudso@gentoo.org</email>
+</maintainer>
+</pkgmetadata>