* [gentoo-commits] repo/gentoo:master commit in: net-misc/bridge-utils/files/, net-misc/bridge-utils/
@ 2020-04-21 17:36 Mike Gilbert
0 siblings, 0 replies; 3+ messages in thread
From: Mike Gilbert @ 2020-04-21 17:36 UTC (permalink / raw
To: gentoo-commits
commit: 98324336099cd804e6754bb2a8c3fd8c11e80840
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 21 17:35:51 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Apr 21 17:35:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98324336
net-misc/bridge-utils: substitute AR from configure
Bug: https://bugs.gentoo.org/717700
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
net-misc/bridge-utils/bridge-utils-1.6.ebuild | 7 ++--
...dge-substitute-AR-variable-from-configure.patch | 40 ++++++++++++++++++++++
2 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/net-misc/bridge-utils/bridge-utils-1.6.ebuild b/net-misc/bridge-utils/bridge-utils-1.6.ebuild
index a371017e158..11f95413077 100644
--- a/net-misc/bridge-utils/bridge-utils-1.6.ebuild
+++ b/net-misc/bridge-utils/bridge-utils-1.6.ebuild
@@ -29,6 +29,9 @@ get_headers() {
}
src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}"/libbridge-substitute-AR-variable-from-configure.patch
+ )
default
eautoreconf
}
@@ -44,10 +47,6 @@ src_configure() {
econf "${myeconfargs[@]}"
}
-src_compile() {
- emake AR=$(tc-getAR)
-}
-
src_install() {
emake install DESTDIR="${D}"
dodoc AUTHORS ChangeLog README THANKS TODO \
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 00000000000..0676d0cc9c7
--- /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
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/bridge-utils/files/, net-misc/bridge-utils/
@ 2020-07-03 6:13 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2020-07-03 6:13 UTC (permalink / raw
To: gentoo-commits
commit: c4adfbc686b7d3f5dd14474b3bdbe461f3094595
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 3 06:11:02 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jul 3 06:13:18 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4adfbc6
net-misc/bridge-utils: Removed old
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-misc/bridge-utils/Manifest | 1 -
net-misc/bridge-utils/bridge-utils-1.5.ebuild | 53 ----------------------
.../files/bridge-utils-1.5-linux-3.8.patch | 18 --------
3 files changed, 72 deletions(-)
diff --git a/net-misc/bridge-utils/Manifest b/net-misc/bridge-utils/Manifest
index d14385f78e8..18f5569d859 100644
--- a/net-misc/bridge-utils/Manifest
+++ b/net-misc/bridge-utils/Manifest
@@ -1,2 +1 @@
-DIST bridge-utils-1.5.tar.gz 33243 BLAKE2B 211ecb831f802c119f32c30621daa781056bd9ff2fb5880d328704bd76b5b5b964d0671f77489fb9c71f25a3e073e5e4070cfa759deeba014aa1136ff60b1fdd SHA512 4e525fbd3defb509664ef3b728d9e5edfb92beaebdb5d7733d8203fb38cb3f4bb54d02dc1e28813889a2ee19c78b9b47da6d99c8032481a7fd7f104658dea7c3
DIST bridge-utils-1.6.tar.xz 29904 BLAKE2B 4a816d2855a8f127dca3a19df326863848d36032c881a9093cd98b88f701d70486a9488e9761869629f29c6f5bc14305388eac3c22393a3e60dfdb3c9c4dda10 SHA512 b2ed39bc67349b7b91f2068cb505c0e3c89a8797d61e3d97ff957796cfe5fcef2c26dd788bd4215f628d69a4c8592377f4e632c3e181e87af3eaa238d8741e02
diff --git a/net-misc/bridge-utils/bridge-utils-1.5.ebuild b/net-misc/bridge-utils/bridge-utils-1.5.ebuild
deleted file mode 100644
index d48b3a0242b..00000000000
--- a/net-misc/bridge-utils/bridge-utils-1.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools eutils 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"
-
-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() {
- epatch "${FILESDIR}"/${P}-linux-3.8.patch
- eautoreconf
-}
-
-src_configure() {
- # use santitized headers and not headers from /usr/src
- econf \
- --prefix=/ \
- --libdir=/usr/$(get_libdir) \
- --includedir=/usr/include \
- --with-linux-headers="$(get_headers)"
-}
-
-src_compile() {
- emake AR=$(tc-getAR)
-}
-
-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"
-}
diff --git a/net-misc/bridge-utils/files/bridge-utils-1.5-linux-3.8.patch b/net-misc/bridge-utils/files/bridge-utils-1.5-linux-3.8.patch
deleted file mode 100644
index 49ebb4e9da2..00000000000
--- a/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, <linux/cdrom.h> needs
-<limits.h> to get INT_MAX
-
---- libbridge/libbridge.h
-+++ libbridge/libbridge.h
-@@ -20,6 +20,7 @@
- #define _LIBBRIDGE_H
-
- #include <sys/socket.h>
-+#include <netinet/ip6.h>
- #include <linux/if.h>
- #include <linux/if_bridge.h>
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/bridge-utils/files/, net-misc/bridge-utils/
@ 2022-02-04 15:19 Fabian Groffen
0 siblings, 0 replies; 3+ messages in thread
From: Fabian Groffen @ 2022-02-04 15:19 UTC (permalink / raw
To: gentoo-commits
commit: 36d4c4e69edfc56c9c515bb29af7abd39cb02c7c
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 4 15:19:42 2022 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Feb 4 15:19:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36d4c4e6
net-misc/bridge-utils-1.7.1-r1: fix compilation on musl
Closes: https://bugs.gentoo.org/828902
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild | 56 ++++++++++++++++++++++
.../files/bridge-utils-1.7.1-musl.patch | 10 ++++
2 files changed, 66 insertions(+)
diff --git a/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild b/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild
new file mode 100644
index 000000000000..85a58f61fc89
--- /dev/null
+++ b/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/net-misc/bridge-utils/files/bridge-utils-1.7.1-musl.patch b/net-misc/bridge-utils/files/bridge-utils-1.7.1-musl.patch
new file mode 100644
index 000000000000..618811e80b7a
--- /dev/null
+++ b/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 <sys/socket.h>
+ #include <sys/time.h>
+ #include <netinet/in.h>
++#include <limits.h>
+
+ #include <linux/if.h>
+ #include <linux/if_bridge.h>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-04 15:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-04 15:19 [gentoo-commits] repo/gentoo:master commit in: net-misc/bridge-utils/files/, net-misc/bridge-utils/ Fabian Groffen
-- strict thread matches above, loose matches on Subject: below --
2020-07-03 6:13 Lars Wendler
2020-04-21 17:36 Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox