diff --git a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/ChangeLog b/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/ChangeLog deleted file mode 100644 index f329d5f359..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/ChangeLog +++ /dev/null @@ -1,65 +0,0 @@ -# ChangeLog for net-misc/bridge-utils -# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 -# (auto-generated from git log) - -*bridge-utils-1.5 (09 Aug 2015) - - 09 Aug 2015; Robin H. Johnson +bridge-utils-1.5.ebuild, - +files/bridge-utils-1.5-linux-3.8.patch, +metadata.xml: - proj/gentoo: Initial commit - - This commit represents a new era for Gentoo: - Storing the gentoo-x86 tree in Git, as converted from CVS. - - This commit is the start of the NEW history. - Any historical data is intended to be grafted onto this point. - - Creation process: - 1. Take final CVS checkout snapshot - 2. Remove ALL ChangeLog* files - 3. Transform all Manifests to thin - 4. Remove empty Manifests - 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ - 5.1. Do not touch files with -kb/-ko keyword flags. - - Signed-off-by: Robin H. Johnson - X-Thanks: Alec Warner - did the GSoC 2006 migration - tests - X-Thanks: Robin H. Johnson - infra guy, herding this - project - X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo - developer, wrote Git features for the migration - X-Thanks: Brian Harring - wrote much python to improve - cvs2svn - X-Thanks: Rich Freeman - validation scripts - X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 - work in migration - X-Thanks: Michał Górny - scripts, QA, nagging - X-Thanks: All of other Gentoo developers - many ideas and lots of paint on - the bikeshed - - 24 Aug 2015; Justin Lecher metadata.xml: - Use https by default - - Convert all URLs for sites supporting encrypted connections from http to - https - - Signed-off-by: Justin Lecher - - 24 Aug 2015; Mike Gilbert metadata.xml: - Revert DOCTYPE SYSTEM https changes in metadata.xml - - repoman does not yet accept the https version. - This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450. - - Bug: https://bugs.gentoo.org/552720 - - 24 Jan 2016; Michał Górny metadata.xml: - Replace all herds with appropriate projects (GLEP 67) - - Replace all uses of herd with appropriate project maintainers, or no - maintainers in case of herds requested to be disbanded. - - 24 Jan 2016; Michał Górny metadata.xml: - Set appropriate maintainer types in metadata.xml (GLEP 67) - diff --git a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/ChangeLog-2015 b/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/ChangeLog-2015 deleted file mode 100644 index 7483d3451d..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/ChangeLog-2015 +++ /dev/null @@ -1,288 +0,0 @@ -# ChangeLog for net-misc/bridge-utils -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/ChangeLog,v 1.71 2015/05/16 06:30:55 robbat2 Exp $ - - 16 May 2015; Robin H. Johnson bridge-utils-1.5.ebuild: - Bug #538022: selinux policy rdepend. - - 03 Mar 2015; Yixun Lan bridge-utils-1.5.ebuild: - add arm64 support, tested on A53 board - - 14 Sep 2013; Samuli Suominen -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 bridge-utils-1.5.ebuild: - Stable for ia64, wrt bug #483892 - - 08 Sep 2013; Markus Meier bridge-utils-1.5.ebuild: - arm stable, bug #483892 - - 06 Sep 2013; Jeroen Roovers bridge-utils-1.5.ebuild: - Stable for HPPA (bug #483892). - - 06 Sep 2013; Agostino Sarubbo bridge-utils-1.5.ebuild: - Stable for sparc, wrt bug #483892 - - 06 Sep 2013; Agostino Sarubbo bridge-utils-1.5.ebuild: - Stable for ppc64, wrt bug #483892 - - 06 Sep 2013; Agostino Sarubbo bridge-utils-1.5.ebuild: - Stable for ppc, wrt bug #483892 - - 06 Sep 2013; Agostino Sarubbo bridge-utils-1.5.ebuild: - Stable for x86, wrt bug #483892 - - 06 Sep 2013; Agostino Sarubbo bridge-utils-1.5.ebuild: - Stable for amd64, wrt bug #483892 - - 06 Sep 2013; Robin H. Johnson bridge-utils-1.4.ebuild, - bridge-utils-1.5.ebuild: - Safety workaround for bug #483692 while 1.5 is stabilized. - - 06 Mar 2013; Samuli Suominen bridge-utils-1.5.ebuild, - +files/bridge-utils-1.5-linux-3.8.patch: - Unfortunately linux/if_bridge.h is not self-contained and struct for ip6 is - in netinet/ip6.h (since Linux 3.8+) wrt #460262 by Guillaume Castagnino - - 19 May 2012; Anthony G. Basile bridge-utils-1.5.ebuild: - keyword mips, bug #405835 - -*bridge-utils-1.5 (15 Jun 2011) - - 15 Jun 2011; Jeroen Roovers +bridge-utils-1.5.ebuild: - Version bump. Remove old init script warning. - - 19 Sep 2010; Michael Weber bridge-utils-1.4.ebuild: - Added ~arm keyword - - 12 Feb 2010; Robin H. Johnson - bridge-utils-1.4.ebuild: - Add warning message for lack of CONFIG_BRIDGE, and add ~ppc64 keyword per - request by JoseJX. - - 09 May 2009; Raúl Porcel bridge-utils-1.4.ebuild: - sparc stable wrt #268323 - - 04 Oct 2008; Raúl Porcel bridge-utils-1.4.ebuild: - ia64/x86 stable wrt #239119 - - 02 Oct 2008; Brent Baude bridge-utils-1.4.ebuild: - stable ppc, bug 239119 - - 30 Sep 2008; Jeroen Roovers bridge-utils-1.4.ebuild: - Stable for HPPA (bug #239119). - - 30 Sep 2008; Jeremy Olexa bridge-utils-1.4.ebuild: - amd64 stable, bug #239119 - - 30 Sep 2008; Robin H. Johnson - bridge-utils-1.2.ebuild, bridge-utils-1.4.ebuild: - Bug #238782, spelling fix. - - 28 Sep 2008; Raúl Porcel bridge-utils-1.4.ebuild: - Add ~sparc wrt #238183 - - 05 Jun 2008; Robin H. Johnson - bridge-utils-1.2.ebuild: - Fix syntax. - -*bridge-utils-1.4 (05 Jun 2008) - - 05 Jun 2008; Robin H. Johnson - +bridge-utils-1.4.ebuild: - Version bump per bug #204744. Cross compile should work now. - - 28 Apr 2008; Doug Goldstein - -bridge-utils-1.0.6-r3.ebuild, bridge-utils-1.2.ebuild: - remove USE=sysfs from bridge-utils-1.2 since it's unused (bug #219600) and - remove old version - - 14 Jan 2008; Robin H. Johnson metadata.xml: - Update metadata. - - 11 May 2007; Jeroen Roovers bridge-utils-1.2.ebuild: - Stable for HPPA (bug #173864). - - 22 Apr 2007; Tobias Scherbaum - bridge-utils-1.2.ebuild: - ppc stable, bug #173864 - - 21 Apr 2007; Robin H. Johnson - -bridge-utils-0.9.6-r2.ebuild, -bridge-utils-1.0.4.ebuild, - -bridge-utils-1.0.6.ebuild, -bridge-utils-1.0.6-r2.ebuild: - Remove old ebuilds per bug #174266. - - 09 Apr 2007; Raúl Porcel bridge-utils-1.2.ebuild: - ia64 stable wrt bug 173864 - - 09 Apr 2007; Peter Weller bridge-utils-1.2.ebuild: - Stable on amd64 wrt bug 173864 - - 09 Apr 2007; Raúl Porcel bridge-utils-1.2.ebuild: - x86 stable wrt bug 173864 - - 07 Nov 2006; Joel Martin bridge-utils-1.0.6-r3.ebuild, - bridge-utils-1.2.ebuild: - Use get_libdir instead of just 'lib' - - 04 Nov 2006; Tobias Scherbaum - bridge-utils-1.0.6-r3.ebuild, bridge-utils-1.2.ebuild: - Added ~hppa - -*bridge-utils-1.2 (25 Sep 2006) - - 25 Sep 2006; Robin H. Johnson - +bridge-utils-1.2.ebuild: - Version bump, bug #148084 - upstream no longer uses sysfsutils. - - 04 Jul 2006; Robin H. Johnson - bridge-utils-1.0.6-r3.ebuild: - Bug #138199 - fix for using autoconf-2.60. - - 25 Apr 2006; Luca Barbato - bridge-utils-1.0.6-r3.ebuild: - Marked ppc - - 29 Mar 2006; Aron Griffis - bridge-utils-1.0.6-r3.ebuild: - Mark 1.0.6-r3 stable on ia64 - - 16 Feb 2006; Aron Griffis - bridge-utils-1.0.6-r3.ebuild: - Mark 1.0.6-r3 ~ia64 - - 19 Jan 2006; Marcus D. Hanwell - bridge-utils-1.0.6-r3.ebuild: - Stable on amd64. - - 15 Aug 2005; Robin H. Johnson - bridge-utils-1.0.6-r3.ebuild: - 1.0.6-r3 to stable x86, so that it works for 2.4 users, and also throw in a - bit more error checking (bug #102588). - -*bridge-utils-1.0.6-r3 (05 Aug 2005) - - 05 Aug 2005; Robin H. Johnson - +files/bridge-utils-1.0.6-allow-without-sysfs.patch, - +bridge-utils-1.0.6-r3.ebuild: - Bug #69292: Make it possible to compile without sysfs, so the new versions - work well for 2.4 users. - - 12 Jul 2005; Simon Stelling - bridge-utils-1.0.6-r2.ebuild: - stable on amd64 - -*bridge-utils-1.0.6-r2 (12 Jul 2005) - - 12 Jul 2005; Roy Marples - -bridge-utils-1.0.6-r1.ebuild, +bridge-utils-1.0.6-r2.ebuild: - epatch requires eutils - rev bumped as r1 still compiled - but without the patch! - -*bridge-utils-1.0.6-r1 (12 Jul 2005) - - 12 Jul 2005; Robin H. Johnson - +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 - bridge-utils-1.0.6.ebuild: - Stable 1.0.6 on x86. - - 03 Jul 2005; Robin H. Johnson - -bridge-utils-0.9.6.ebuild, -bridge-utils-0.9.6-r1.ebuild: - Remove some old ebuilds. - -*bridge-utils-0.9.6-r2 (03 Jul 2005) - - 03 Jul 2005; Robin H. Johnson - +bridge-utils-0.9.6-r2.ebuild: - Add bridge-utils-0.9.6-r2 that uses the bridge support in the new - baselayout, instead of the old init scripts. - - 02 Jul 2005; Robin H. Johnson - bridge-utils-1.0.6.ebuild: - Add ~amd64 to newest ebuild since it seems to exist on an old one only. - - 06 May 2005; Sven Wegener bridge-utils-1.0.6.ebuild: - Removed * postfix from <, <=, >= and > dependencies. - -*bridge-utils-1.0.6 (29 Apr 2005) - - 29 Apr 2005; Robin H. Johnson - +bridge-utils-1.0.6.ebuild: - Version bump - now uses baselayout's bridge stuff. - - 28 Apr 2005; Robin H. Johnson - bridge-utils-1.0.4.ebuild: - Fix bug #69292, missing dep. - - 01 Jul 2004; Jon Hood bridge-utils-0.9.6-r1.ebuild, - bridge-utils-0.9.6.ebuild, bridge-utils-1.0.4.ebuild: - change virtual/glibc to virtual/libc, add IUSE - - 18 Jun 2004; David Holm bridge-utils-1.0.4.ebuild: - Added to ~ppc. - - 17 Jun 2004; Jared Hudson bridge-utils-0.9.6-r1.ebuild, - bridge-utils-0.9.6.ebuild, bridge-utils-1.0.4.ebuild: - Fixed SRC_URI to point to sourceforge's new bridge util location, set 0.9.6 - to x86 and bumped bridge-utils to 1.0.4 (~x86) - - 26 Apr 2004; Aron Griffis - bridge-utils-0.9.6-r1.ebuild, bridge-utils-0.9.6.ebuild: - Add die following econf for bug 48950 - - 02 Apr 2004; Daniel Ahlberg bridge-utils-0.9.6-r1.ebuild: - Adding amd64 keyword, closing #46552. - -*bridge-utils-0.9.6-r1 (18 Mar 2004) - - 18 Mar 2004; Jared Hudson 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 - and Denis Knauf - - 25 Feb 2004; Patrick Kursawe - bridge-utils-0.9.3-r1.ebuild, bridge-utils-0.9.6.ebuild: - Cleanup - - 25 Feb 2004; Patrick Kursawe - bridge-utils-0.9.6.ebuild: - Added additional check for build success because of bug #42548 - - 24 Apr 2003; Patrick Kursawe bridge-utils-0.9.6.ebuild : - Considered stable for x86 - -*bridge-utils-0.9.6 (02 Apr 2003) - - 02 Apr 2003; Patrick Kursawe bridge-utils-0.9.6.ebuild, - files/digest-bridge-utils-0.9.6 : - New version, moved binaries to /sbin since they can be necessary for - bringing the network up. - - 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords - -*bridge-utils-0.9.3-r1 (3 May 2002) - - 6 Jul 2002; phoen][x : - - Added KEYWORDS. - - 3 May 2002; Donny Davies : - - Added LICENSE, SLOT. - -*bridge-utils-0.9.3 (1 Feb 2002) - - 1 Feb 2002; G.Bevin ChangeLog : - - Added initial ChangeLog which should be updated whenever the package is - updated in any way. This changelog is targetted to users. This means that the - comments should well explained and written in clean English. The details about - writing correct changelogs are explained in the skel.ChangeLog file which you - can find in the root directory of the portage repository. diff --git a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/Manifest b/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/Manifest index 780358a34f..08ad577c85 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/Manifest @@ -1,6 +1,2 @@ -AUX bridge-utils-1.5-linux-3.8.patch 435 SHA256 ce60b2328784307ad7a408fad96c0e0165b7740d1e4aaadb3cf2d6e6feaef235 SHA512 dea1668cc0b76b1f88e7040262e3056db278000df2680e8d3a1596b6821e7f8213a0e67ae26ffc23950b848c2ccc5dabf61baf6c40159eecfb7c22118dec2635 WHIRLPOOL 056fdf262ac2765a6996d54da8014d1f52d72d646ac215476dfb14bdb983fd0c8283ff61a056d3d909ef9a9cd1f0cb7cc08db112e4f477204d8a94371edf84ea -DIST bridge-utils-1.5.tar.gz 33243 SHA256 42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688 SHA512 4e525fbd3defb509664ef3b728d9e5edfb92beaebdb5d7733d8203fb38cb3f4bb54d02dc1e28813889a2ee19c78b9b47da6d99c8032481a7fd7f104658dea7c3 WHIRLPOOL f11eb95ae9b562cb301bb1f657d87878f0a0729a2129b90fa5957747f078f3afe2ebdadd1eb7ea4a59e544acc8194cf1744126db9ba3f3704210bc18ee3480fa -EBUILD bridge-utils-1.5.ebuild 1288 SHA256 183f2a6bf021260cccbc0f8ed9cb9cdf658080aa9d9ef7b4f1f970b00ff34875 SHA512 34b71352bd3fd304298f655d96ae78f18957329e58f715f47ba681cee236946e4ce0b9811929a9a30c00f840ca784ec5faf011e6222cec2ed9d04313d70ea31e WHIRLPOOL 5ea4badf8c45cbea39fa12b9ee0031fbd1cb138b58019887ccf10845eeb8ae3b7a9e3ee39997ff645934e04553ffb8d8a24cdafd26d497b43725e233fe409901 -MISC ChangeLog 2479 SHA256 669239dd5eccd538a94a7de8b80e5c55985e32531404fef7a2d4e571d1cd2945 SHA512 e2045ae448a113c560492661c247505ebba96f43c8481e41d01a5f1103e0cbe274de78f4534e2651b2906ea69e1d9aec389741afa8860676a7913cd7ffffd76d WHIRLPOOL b26c965f6a74cd837606cd36a86362fcd42e95e23102bf1c28223def0b02c88ffd8b47ec4e4f74537815de98e558ca74afcfc79aaa3c770de7377d39fc0fd12e -MISC ChangeLog-2015 10269 SHA256 09a7e39e286023aa1bb9adaae16cb4f0eb5bcebfdf269ec259539f4f7d21aad6 SHA512 3993e85d6ad2f3afb9ad741ee56bb90ed468be20e91d50cc96b3fbd3b710984ff4f7f0ebb390dafe93689f7058c05e4c004c6ce0bd3d4a16935d32a998eb4a3b WHIRLPOOL e4b8f8e80174c7b38ae1b116b9b88304206bc0a4ef96bd1305db0c8877d650603d09e23aceb802b71384731e6b0936b9ce05ae26f40ea9bd2af031fef1053a24 -MISC metadata.xml 426 SHA256 b34c0320b4f643677f7b03ecb26c8f0336ab1f9a68c7156f4d0a0ae85eafec60 SHA512 b6d8f31496815fff6ee465b4eff20dba27a478e803c299e1d329ad33dd80493380b746fd0aba19d15a3780e4a4b37365829781cda5aaccfca2f044506b15c38e WHIRLPOOL 177367f59aae104c6aa481ca706e54aaf8f204843c647856595e30dc736d6f593d1dc36c93049eccc047f50faf364a6cbb35247a652b8531fba1129da317ab72 +DIST bridge-utils-1.6.tar.xz 29904 BLAKE2B 4a816d2855a8f127dca3a19df326863848d36032c881a9093cd98b88f701d70486a9488e9761869629f29c6f5bc14305388eac3c22393a3e60dfdb3c9c4dda10 SHA512 b2ed39bc67349b7b91f2068cb505c0e3c89a8797d61e3d97ff957796cfe5fcef2c26dd788bd4215f628d69a4c8592377f4e632c3e181e87af3eaa238d8741e02 +DIST bridge-utils-1.7.1.tar.xz 29632 BLAKE2B 36b8b9c62e88f6f1510acbf23ab8dc5ec41d3bf97eecd274c91771e116650e30b366ded37e65bde061c1e9bc7b19b7eae1e17d4573fcea9fd31892bf6d937515 SHA512 6a3824853bdaa1733c552973e6a5082280facdddc52c3feeb2c8c9375ba9469a5930b559092c9de1a73b464f388f019e147b45ac1e2d10ce8968057779fcd12c diff --git a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/bridge-utils-1.5.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/bridge-utils-1.6.ebuild similarity index 58% rename from sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/bridge-utils-1.5.ebuild rename to sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/bridge-utils-1.6.ebuild index dda7236589..273624c416 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/bridge-utils-1.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/bridge-utils-1.6.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI="5" +EAPI=6 -inherit autotools eutils linux-info toolchain-funcs +inherit autotools linux-info toolchain-funcs DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge" HOMEPAGE="http://bridge.sourceforge.net/" -SRC_URI="mirror://sourceforge/bridge/${P}.tar.gz" +#SRC_URI="mirror://sourceforge/bridge/${P}.tar.gz" +SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" IUSE="selinux" DEPEND="virtual/os-headers" @@ -29,22 +29,27 @@ get_headers() { } src_prepare() { - epatch "${FILESDIR}"/${P}-linux-3.8.patch + local PATCHES=( + "${FILESDIR}"/libbridge-substitute-AR-variable-from-configure.patch + ) + default eautoreconf } src_configure() { # use santitized headers and not headers from /usr/src - econf \ - --prefix=/ \ - --libdir=/usr/$(get_libdir) \ - --includedir=/usr/include \ + local myeconfargs=( + --prefix=/ + --libdir=/usr/$(get_libdir) + --includedir=/usr/include --with-linux-headers="$(get_headers)" + ) + econf "${myeconfargs[@]}" } -src_install () { +src_install() { emake install DESTDIR="${D}" dodoc AUTHORS ChangeLog README THANKS TODO \ doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST} - [ -f "${D}"/sbin/brctl ] || die "upstream makefile failed to install binary" + [ -f "${ED%/}"/sbin/brctl ] || die "upstream makefile failed to install binary" } diff --git a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild new file mode 100644 index 0000000000..85a58f61fc --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools linux-info toolchain-funcs + +DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge" +HOMEPAGE="http://bridge.sourceforge.net/" +SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="selinux" + +DEPEND="virtual/os-headers" +RDEPEND="selinux? ( sec-policy/selinux-brctl )" + +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_prepare() { + local PATCHES=( + "${FILESDIR}"/libbridge-substitute-AR-variable-from-configure.patch + "${FILESDIR}"/${P}-musl.patch #828902 + ) + default + eautoreconf +} + +src_configure() { + # use santitized headers and not headers from /usr/src + local myeconfargs=( + --prefix=/ + --libdir=/usr/$(get_libdir) + --includedir=/usr/include + --with-linux-headers="$(get_headers)" + ) + econf "${myeconfargs[@]}" +} + +src_install() { + emake install DESTDIR="${D}" + dodoc AUTHORS ChangeLog README THANKS \ + doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST} + + [ -f "${ED}"/sbin/brctl ] || die "upstream makefile failed to install binary" +} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/bridge-utils-1.7.1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/bridge-utils-1.7.1.ebuild new file mode 100644 index 0000000000..b3ea6ff1a7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/bridge-utils-1.7.1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools linux-info toolchain-funcs + +DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge" +HOMEPAGE="http://bridge.sourceforge.net/" +SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" +IUSE="selinux" + +DEPEND="virtual/os-headers" +RDEPEND="selinux? ( sec-policy/selinux-brctl )" + +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_prepare() { + local PATCHES=( + "${FILESDIR}"/libbridge-substitute-AR-variable-from-configure.patch + ) + default + eautoreconf +} + +src_configure() { + # use santitized headers and not headers from /usr/src + local myeconfargs=( + --prefix=/ + --libdir=/usr/$(get_libdir) + --includedir=/usr/include + --with-linux-headers="$(get_headers)" + ) + econf "${myeconfargs[@]}" +} + +src_install() { + emake install DESTDIR="${D}" + dodoc AUTHORS ChangeLog README THANKS \ + doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST} + + [ -f "${ED}"/sbin/brctl ] || die "upstream makefile failed to install binary" +} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/files/bridge-utils-1.5-linux-3.8.patch b/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/files/bridge-utils-1.5-linux-3.8.patch deleted file mode 100644 index 49ebb4e9da..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/files/bridge-utils-1.5-linux-3.8.patch +++ /dev/null @@ -1,18 +0,0 @@ -unfortunately if_bridge.h from Linux 3.8+ is not self-contained and the struct -for ip6 is missing - -http://bugs.gentoo.org/460262 - -this is not unheard of with Linux headers, for example, needs - to get INT_MAX - ---- libbridge/libbridge.h -+++ libbridge/libbridge.h -@@ -20,6 +20,7 @@ - #define _LIBBRIDGE_H - - #include -+#include - #include - #include - diff --git a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/files/bridge-utils-1.7.1-musl.patch b/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/files/bridge-utils-1.7.1-musl.patch new file mode 100644 index 0000000000..618811e80b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/files/bridge-utils-1.7.1-musl.patch @@ -0,0 +1,10 @@ +--- a/libbridge/libbridge.h ++++ b/libbridge/libbridge.h +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/files/libbridge-substitute-AR-variable-from-configure.patch b/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/files/libbridge-substitute-AR-variable-from-configure.patch new file mode 100644 index 0000000000..0676d0cc9c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/files/libbridge-substitute-AR-variable-from-configure.patch @@ -0,0 +1,40 @@ +From 4dc12feb7b5a0f8f4d27c737513853896e77feea Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Tue, 21 Apr 2020 13:17:33 -0400 +Subject: [PATCH] libbridge: substitute AR variable from configure + +Bug: https://bugs.gentoo.org/717700 +Signed-off-by: Mike Gilbert +--- + configure.ac | 1 + + libbridge/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 8b2e2ea..e66f334 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -12,6 +12,7 @@ dnl Checks for programs. + AC_PROG_CC + AC_PROG_INSTALL + AC_PROG_RANLIB ++AC_CHECK_TOOL([AR], [ar]) + + dnl Checks for header files. + AC_HEADER_STDC +diff --git a/libbridge/Makefile.in b/libbridge/Makefile.in +index 7932bfe..bd55e9b 100644 +--- a/libbridge/Makefile.in ++++ b/libbridge/Makefile.in +@@ -1,7 +1,7 @@ + + KERNEL_HEADERS=-I@KERNEL_HEADERS@ + +-AR=ar ++AR=@AR@ + RANLIB=@RANLIB@ + + CC=@CC@ +-- +2.26.1 + diff --git a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/metadata.xml b/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/metadata.xml index 995aec8204..2dd80ab197 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/net-misc/bridge-utils/metadata.xml @@ -1,5 +1,5 @@ - + robbat2@gentoo.org @@ -9,6 +9,7 @@ Gentoo Base System + cpe:/a:kernel:bridge-utils bridge