bridge-utils: upgraded package to upstream
Latest version allows to set @AR@ utility to use.
BUG=None
TEST=CQ Passes
Change-Id: Ibc26fe94bf2b345cb621097fb5d4899f6e29af9c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/3194868
Commit-Queue: Sergey Frolov <sfrolov@google.com>
Commit-Queue: Manoj Gupta <manojgupta@chromium.org>
Reviewed-by: Evan Benn <evanbenn@chromium.org>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Tested-by: Manoj Gupta <manojgupta@chromium.org>
diff --git a/net-misc/bridge-utils/bridge-utils-1.6.ebuild b/net-misc/bridge-utils/bridge-utils-1.6.ebuild
index ae6f7dc..e2b1990 100644
--- a/net-misc/bridge-utils/bridge-utils-1.6.ebuild
+++ b/net-misc/bridge-utils/bridge-utils-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,15 +8,15 @@
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://kernel/linux/utils/net/${PN}/${P}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="*"
-IUSE=""
+IUSE="selinux"
DEPEND="virtual/os-headers"
-RDEPEND=""
+RDEPEND="selinux? ( sec-policy/selinux-brctl )"
CONFIG_CHECK="~BRIDGE"
WARNING_BRIDGE="CONFIG_BRIDGE is required to get bridge devices in the kernel"
@@ -29,6 +29,9 @@
}
src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}"/libbridge-substitute-AR-variable-from-configure.patch
+ )
default
eautoreconf
}
@@ -44,7 +47,7 @@
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}
diff --git a/net-misc/bridge-utils/files/libbridge-substitute-AR-variable-from-configure.patch b/net-misc/bridge-utils/files/libbridge-substitute-AR-variable-from-configure.patch
new file mode 100644
index 0000000..0676d0c
--- /dev/null
+++ b/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 <floppym@gentoo.org>
+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 <floppym@gentoo.org>
+---
+ 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/net-misc/bridge-utils/metadata.xml b/net-misc/bridge-utils/metadata.xml
index 01369d2..2dd80ab 100644
--- a/net-misc/bridge-utils/metadata.xml
+++ b/net-misc/bridge-utils/metadata.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
- <email>robbat2@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
-</maintainer>
-<upstream>
- <remote-id type="cpe">cpe:/a:kernel:bridge-utils</remote-id>
- <remote-id type="sourceforge">bridge</remote-id>
-</upstream>
+ <maintainer type="person">
+ <email>robbat2@gentoo.org</email>
+ </maintainer>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="cpe">cpe:/a:kernel:bridge-utils</remote-id>
+ <remote-id type="sourceforge">bridge</remote-id>
+ </upstream>
</pkgmetadata>
