Bug #98005: Ensure correct behavior when there are no ports on the bridge.

(Portage version: 2.0.51.22-r1)

5 files changed, 72 insertions, 1 deletions

diff --git a/net-misc/bridge-utils/ChangeLog b/net-misc/bridge-utils/ChangeLog
index 74457f9c0ae8..54a79c69a32c 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/ChangeLog,v 1.24 2005/07/04 21:13:52 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/ChangeLog,v 1.25 2005/07/12 03:37:08 robbat2 Exp $
+
+*bridge-utils-1.0.6-r1 (12 Jul 2005)
+
+  12 Jul 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/bridge-utils-1.0.6-dont-error-on-no-ports.patch,
+  +bridge-utils-1.0.6-r1.ebuild:
+  Bug #98005: Ensure correct behavior when there are no ports on the bridge.
 
   04 Jul 2005; Robin H. Johnson <robbat2@gentoo.org>
   bridge-utils-1.0.6.ebuild:
diff --git a/net-misc/bridge-utils/Manifest b/net-misc/bridge-utils/Manifest
index 5cf0deea4d6d..4d77fab3ef5a 100644
--- a/net-misc/bridge-utils/Manifest
+++ b/net-misc/bridge-utils/Manifest
@@ -1,10 +1,13 @@
 MD5 0d6d3f3c84b9fd514a08af08ba76ad0f bridge-utils-1.0.4.ebuild 1169
 MD5 b9d5cf5a4a11a82972f20d974423c918 bridge-utils-0.9.6-r2.ebuild 1104
 MD5 2c6ca210a0063810c357673b36d2eac0 bridge-utils-1.0.6.ebuild 1268
+MD5 0041a49c0a64f35c8076ba1cd27a0d48 bridge-utils-1.0.6-r1.ebuild 1379
 MD5 707e324d4b14ac8aabe86405b888f3c1 ChangeLog 3785
 MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
+MD5 69312e372ac3b1c445dd53c8abf3cd57 files/digest-bridge-utils-1.0.6-r1 69
 MD5 be13eee50cb73dfb7574dc9d439e247e files/digest-bridge-utils-1.0.4 70
 MD5 69312e372ac3b1c445dd53c8abf3cd57 files/digest-bridge-utils-1.0.6 69
 MD5 bccc629ec82d45006faa7d2e7cfe900f files/bridge.conf 106
+MD5 dad9b29868d4bf5b8fe41be9fef393be files/bridge-utils-1.0.6-dont-error-on-no-ports.patch 330
 MD5 ab89aefb5bcf4befdfb115be79139469 files/digest-bridge-utils-0.9.6-r2 69
 MD5 2247ac780a2897505fa460ba9b322d86 files/bridge.rc 939
diff --git a/net-misc/bridge-utils/bridge-utils-1.0.6-r1.ebuild b/net-misc/bridge-utils/bridge-utils-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..6fd2df38b9c2
--- /dev/null
+++ b/net-misc/bridge-utils/bridge-utils-1.0.6-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/bridge-utils-1.0.6-r1.ebuild,v 1.1 2005/07/12 03:37:08 robbat2 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/"
+
+SRC_URI="mirror://sourceforge/bridge/${P}.tar.gz"
+
+IUSE=""
+RDEPEND="virtual/libc
+	>=sys-fs/sysfsutils-1.0
+	>=sys-apps/baselayout-1.11.6"
+DEPEND="${RDEPEND} virtual/os-headers"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~ppc ~amd64"
+
+src_unpack() {
+	unpack ${A}
+	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${P}-dont-error-on-no-ports.patch
+}
+
+src_compile() {
+	# use santitized headers and not headers from /usr/src
+	econf \
+		--prefix=/ \
+		--libdir=/usr/lib \
+		--includedir=/usr/include \
+		--with-linux-headers=/usr/include \
+		|| die "econf failed"
+	emake || die "make failed"
+}
+
+src_install () {
+	emake install DESTDIR="${D}"
+	#einstall prefix=${D} libdir=${D}/usr/lib includedir=${D}/usr/include
+	dodoc AUTHORS ChangeLog README THANKS TODO
+	dodoc doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST}
+}
+
+pkg_postinst () {
+	ewarn "This package no longer provides a seperate init script."
+	ewarn "Please utilize the new bridge support in baselayout."
+}
diff --git a/net-misc/bridge-utils/files/bridge-utils-1.0.6-dont-error-on-no-ports.patch b/net-misc/bridge-utils/files/bridge-utils-1.0.6-dont-error-on-no-ports.patch
new file mode 100644
index 000000000000..0cfc47d11796
--- /dev/null
+++ b/net-misc/bridge-utils/files/bridge-utils-1.0.6-dont-error-on-no-ports.patch
@@ -0,0 +1,12 @@
+--- libbridge/libbridge_init.c.orig	2005-07-05 14:15:23.000000000 +0100
++++ libbridge/libbridge_init.c		2005-07-05 14:28:30.000000000 +0100
+@@ -230,7 +230,8 @@
+ 
+ 	links = sysfs_get_dir_links(dir);
+ 	if (!links) {
+-		err = -ENOSYS;
++		/* We may not have any ports assigned, so we don't error */
++		err = errno;
+ 		goto out;
+ 	}
+ 
diff --git a/net-misc/bridge-utils/files/digest-bridge-utils-1.0.6-r1 b/net-misc/bridge-utils/files/digest-bridge-utils-1.0.6-r1
new file mode 100644
index 000000000000..0c80ead242a4
--- /dev/null
+++ b/net-misc/bridge-utils/files/digest-bridge-utils-1.0.6-r1
@@ -0,0 +1 @@
+MD5 9b7dc52656f5cbec846a7ba3299f73bd bridge-utils-1.0.6.tar.gz 81937