diff options
| -rw-r--r-- | net-misc/bridge-utils/ChangeLog | 8 | ||||
| -rw-r--r-- | net-misc/bridge-utils/bridge-utils-1.2.ebuild | 50 | ||||
| -rw-r--r-- | net-misc/bridge-utils/bridge-utils-1.4.ebuild | 56 | ||||
| -rw-r--r-- | net-misc/bridge-utils/files/bridge-utils-1.0.6-allow-without-sysfs.patch | 27 | ||||
| -rw-r--r-- | net-misc/bridge-utils/files/bridge-utils-1.0.6-dont-error-on-no-ports.patch | 12 | ||||
| -rw-r--r-- | net-misc/bridge-utils/files/bridge.conf | 6 | ||||
| -rw-r--r-- | net-misc/bridge-utils/files/bridge.rc | 47 |
7 files changed, 7 insertions, 199 deletions
diff --git a/net-misc/bridge-utils/ChangeLog b/net-misc/bridge-utils/ChangeLog index afa3cb27b92a..0c593210a16b 100644 --- a/net-misc/bridge-utils/ChangeLog +++ b/net-misc/bridge-utils/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/bridge-utils # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/ChangeLog,v 1.68 2013/09/14 07:42:52 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/ChangeLog,v 1.69 2013/09/14 19:28:31 ssuominen Exp $ + + 14 Sep 2013; Samuli Suominen <ssuominen@gentoo.org> -bridge-utils-1.2.ebuild, + -bridge-utils-1.4.ebuild, -files/bridge-utils-1.0.6-allow-without-sysfs.patch, + -files/bridge-utils-1.0.6-dont-error-on-no-ports.patch, -files/bridge.conf, + -files/bridge.rc: + old 14 Sep 2013; Agostino Sarubbo <ago@gentoo.org> bridge-utils-1.5.ebuild: Stable for ia64, wrt bug #483892 diff --git a/net-misc/bridge-utils/bridge-utils-1.2.ebuild b/net-misc/bridge-utils/bridge-utils-1.2.ebuild deleted file mode 100644 index ef352cd8b175..000000000000 --- a/net-misc/bridge-utils/bridge-utils-1.2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2008 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.2.ebuild,v 1.12 2008/09/30 06:48:15 robbat2 Exp $ - -# I think you want CONFIG_BRIDGE in your kernel to use this ;) - -inherit eutils autotools - -DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge" -HOMEPAGE="http://bridge.sourceforge.net/" -SRC_URI="mirror://sourceforge/bridge/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 hppa ia64 ppc x86" -IUSE="" - -DEPEND="virtual/os-headers - >=sys-devel/autoconf-2.59" -RDEPEND="" - -src_unpack() { - unpack ${A} - cd "${S}" - WANT_AUTOMAKE=1.9 eautomake || die "Failed to run autoconf" - WANT_AUTOCONF=2.5 eautoconf || die "Failed to run autoconf" -} - -src_compile() { - # use santitized headers and not headers from /usr/src - econf \ - --prefix=/ \ - --libdir=/usr/$(get_libdir) \ - --includedir=/usr/include \ - --with-linux-headers=/usr/include \ - || die "econf failed" - emake || die "make failed" -} - -src_install () { - emake install DESTDIR="${D}" || die "make install failed" - #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 separate init script." - ewarn "Please utilize the new bridge support in baselayout." -} diff --git a/net-misc/bridge-utils/bridge-utils-1.4.ebuild b/net-misc/bridge-utils/bridge-utils-1.4.ebuild deleted file mode 100644 index 8965a3795fda..000000000000 --- a/net-misc/bridge-utils/bridge-utils-1.4.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2013 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.4.ebuild,v 1.11 2013/09/06 06:00:31 robbat2 Exp $ - -inherit toolchain-funcs eutils autotools linux-info - -DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge" -HOMEPAGE="http://bridge.sourceforge.net/" -SRC_URI="mirror://sourceforge/bridge/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm hppa ia64 ppc sparc x86 ~ppc64" -IUSE="" - -DEPEND="virtual/os-headers" -RDEPEND="" - -CONFIG_CHECK="~BRIDGE" -WARNING_BRIDGE="CONFIG_BRIDGE is required to get bridge devices in the kernel" - -get_headers() { - CTARGET=${CTARGET:-${CHOST}} - dir=/usr/include - tc-is-cross-compiler && dir=/usr/${CTARGET}/usr/include - echo "${dir}" -} - -src_unpack() { - unpack ${A} - cd "${S}" - eautoreconf -} - -src_compile() { - # use santitized headers and not headers from /usr/src - econf \ - --prefix=/ \ - --libdir=/usr/$(get_libdir) \ - --includedir=/usr/include \ - --with-linux-headers="$(get_headers)" \ - || die "econf failed" - emake || die "make failed" -} - -src_install () { - emake install DESTDIR="${D}" || die "make install failed" - dodoc AUTHORS ChangeLog README THANKS TODO - dodoc doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST} - [ -f "${D}"/sbin/brctl ] || die "upstream makefile failed to install binary" -} - -pkg_postinst () { - ewarn "This package no longer provides a separate init script." - ewarn "Please utilize the new bridge support in baselayout." -} diff --git a/net-misc/bridge-utils/files/bridge-utils-1.0.6-allow-without-sysfs.patch b/net-misc/bridge-utils/files/bridge-utils-1.0.6-allow-without-sysfs.patch deleted file mode 100644 index a54901a3752a..000000000000 --- a/net-misc/bridge-utils/files/bridge-utils-1.0.6-allow-without-sysfs.patch +++ /dev/null @@ -1,27 +0,0 @@ -This patch provides a means of forcing bridge-utils to compile without sysfs. -Patch by Robin H. Johnson <robbat2@gentoo.org> ---- bridge-utils-1.0.6.orig/configure.in 2005-03-16 12:15:46.000000000 -0800 -+++ bridge-utils-1.0.6/configure.in 2005-08-05 12:19:48.000000000 -0700 -@@ -26,12 +26,17 @@ - AC_CHECK_FUNCS(if_nametoindex if_indextoname) - - dnl Check for libsysfs -+ -+AC_ARG_WITH( sysfs, [ --without-sysfs Disallow use of libsysfs],[],[]) -+ -+if test "${with_sysfs}" != "no" ; then - AC_CHECK_HEADER(sysfs/libsysfs.h, -- [AC_CHECK_LIB(sysfs, sysfs_open_directory, -- [AC_DEFINE(HAVE_LIBSYSFS) -- LIBS="$LIBS -lsysfs"], -- [AC_MSG_WARN([Missing sysfs library!])])], -- [AC_MSG_WARN([Missing /usr/include/sysfs/libsysfs.h])]) -+ [AC_CHECK_LIB(sysfs, sysfs_open_directory, -+ [AC_DEFINE(HAVE_LIBSYSFS) -+ LIBS="$LIBS -lsysfs"], -+ [AC_MSG_WARN([Missing sysfs library!])])], -+ [AC_MSG_WARN([Missing /usr/include/sysfs/libsysfs.h])]) -+fi - - - AC_SUBST(KERNEL_HEADERS) 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 deleted file mode 100644 index 0cfc47d11796..000000000000 --- a/net-misc/bridge-utils/files/bridge-utils-1.0.6-dont-error-on-no-ports.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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/bridge.conf b/net-misc/bridge-utils/files/bridge.conf deleted file mode 100644 index 94bcb4cda1f6..000000000000 --- a/net-misc/bridge-utils/files/bridge.conf +++ /dev/null @@ -1,6 +0,0 @@ -#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 deleted file mode 100644 index 388e47356321..000000000000 --- a/net-misc/bridge-utils/files/bridge.rc +++ /dev/null @@ -1,47 +0,0 @@ -#!/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" -} |