Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/cutter/files/, net-analyzer/cutter/
Date: Thu, 30 Dec 2021 09:48:04
Message-Id: 1640857662.0cd78596917a0e12644793e8b5ba5f3da3d1e496.sam@gentoo
1 commit: 0cd78596917a0e12644793e8b5ba5f3da3d1e496
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 30 09:47:42 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 30 09:47:42 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cd78596
7
8 net-analyzer/cutter: fix build on musl
9
10 Closes: https://bugs.gentoo.org/715994
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 net-analyzer/cutter/cutter-1.04.ebuild | 1 +
14 net-analyzer/cutter/files/cutter-1.04-musl-if-ether.patch | 12 ++++++++++++
15 2 files changed, 13 insertions(+)
16
17 diff --git a/net-analyzer/cutter/cutter-1.04.ebuild b/net-analyzer/cutter/cutter-1.04.ebuild
18 index 46cc52cc6f2c..ebe71d34d0bc 100644
19 --- a/net-analyzer/cutter/cutter-1.04.ebuild
20 +++ b/net-analyzer/cutter/cutter-1.04.ebuild
21 @@ -15,6 +15,7 @@ KEYWORDS="amd64 ~ppc x86"
22
23 PATCHES=(
24 "${FILESDIR}"/${PN}-1.03-debian.patch
25 + "${FILESDIR}"/${PN}-1.04-musl-if-ether.patch
26 )
27
28 src_prepare() {
29
30 diff --git a/net-analyzer/cutter/files/cutter-1.04-musl-if-ether.patch b/net-analyzer/cutter/files/cutter-1.04-musl-if-ether.patch
31 new file mode 100644
32 index 000000000000..fed8bc26ee02
33 --- /dev/null
34 +++ b/net-analyzer/cutter/files/cutter-1.04-musl-if-ether.patch
35 @@ -0,0 +1,12 @@
36 +https://git.alpinelinux.org/aports/tree/main/cutter/musl-fix.patch
37 +https://bugs.gentoo.org/715994
38 +--- a/cutter.c
39 ++++ b/cutter.c
40 +@@ -47,7 +47,6 @@
41 + #include <linux/socket.h>
42 + #include <linux/ip.h>
43 + #include <linux/tcp.h>
44 +-#include <linux/if_ether.h>
45 + #include <fcntl.h>
46 + #include <netpacket/packet.h>
47 + #include <net/ethernet.h> /* the L2 protocols */