gentoo resync : 20.03.2022

3 files changed, 117 insertions, 2 deletions

diff --git a/net-analyzer/driftnet/Manifest b/net-analyzer/driftnet/Manifest
index a72b921ae164..4c9bfee0f552 100644
--- a/net-analyzer/driftnet/Manifest
+++ b/net-analyzer/driftnet/Manifest
@@ -1,5 +1,6 @@
 AUX driftnet-1.3.0-CFLAGS.patch 451 BLAKE2B 80e4a2dd8afe6b82e95926e28c4c616b04c098c6d7ad637fd4301a9d34b77985c4ad2eead7fbfa9e565ea9983e0afe51312b756f9917260aeac5b366c7bb1af2 SHA512 2b0e50e2db056247ed83b2a8bef3116a8f9880f8539a33b4a696f312c5872098ac50c20f5a3de8ba07dffb935d450ea55ed3d1f291752de45983b85a62f55c04
 AUX driftnet-1.3.0-gtk.patch 298 BLAKE2B 1ccfbe96a69e21f18fa55535996704bd441247f9b109ddc2afd8c826102a0c3a246115c5178276f770b668ca1d8e191fe46858715987fe72f84b20a24f9be1ab SHA512 a43a926d5c289c75b7e942be6d1226a939e0e22e6da8640ebfa2ffd3d08c34fe3dfa525c425831d200bd5e536c73fec02c2c48fd0a6bfaf64f9cb92c9e62b95b
+AUX driftnet-1.3.0-musl-stdint.patch 2867 BLAKE2B a1cc7be83902d960f980311d8ec7cdbd9c35493b519fa6c0b68f46a2f5ed51c8366e77202348895b1daafc532d02f930a1d66b1653ebf6f05de97ab7c2809bbf SHA512 701c466a303e24e53c15881bfaf5a3a50f576e1afdfd344f8da414653b39c66d7ec37acdde0ae72d2d1c4afe4c3a6e8582c6ae870e1947ea7b85945dd99a6010
 DIST driftnet-1.3.0.tar.gz 4971618 BLAKE2B 1cf0a46caac2267c093bf21a0d8e150518dbfe0e76acbe21ef87cd760ccbe964313116ee24d25ad7759b3eeba19ef7925200caee4fd06bb28f9836217d889256 SHA512 45f1016a850cf9e5e294756e47e40eccb13f57a316ae7fa885eac2d5e53f68b9d9ef86868415eca76b108f7aa1f4080c550a91f789265edb0f6e3a55e05f5f0c
-EBUILD driftnet-1.3.0.ebuild 1332 BLAKE2B 1b71ed5c7af207ac8f3db6f90c1f344c4eb1fa9c68fb154c122b5137e73303c4174ae87bdab2c2c6bc4944e82425e49b8db60ab59c99e8892c3b15a286491001 SHA512 132da1a4eba7f52abe898dddf06d7cdde1989f96da9b011de38380f352b0433df12d068102e70c0597dbbb2684c0b88662e32bae1719d0d5cf95a191fa314ce6
+EBUILD driftnet-1.3.0.ebuild 1377 BLAKE2B 7d0caf86be281988aacfd5a9febfdcd3f32741f9225757d27f414fcfd7bbe9d6b4a00c5d8e0da4a7b682eb510e3c5055813cc36887a2d23161f0aef30418abac SHA512 06cab2ae0dd763d544b82b3495da0865311bc56adfaed162ebbd7af72cc0c42e474cc054c6ece74e66c07ecd403ac1ddd205f47dcc30e4e117d0a3b240f0a707
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/driftnet/driftnet-1.3.0.ebuild b/net-analyzer/driftnet/driftnet-1.3.0.ebuild
index 9134806f0c99..3d2fa78cc783 100644
--- a/net-analyzer/driftnet/driftnet-1.3.0.ebuild
+++ b/net-analyzer/driftnet/driftnet-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,6 +38,7 @@ DOCS="
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.0-CFLAGS.patch
 	"${FILESDIR}"/${PN}-1.3.0-gtk.patch
+	"${FILESDIR}"/${PN}-1.3.0-musl-stdint.patch
 )
 
 src_prepare() {
diff --git a/net-analyzer/driftnet/files/driftnet-1.3.0-musl-stdint.patch b/net-analyzer/driftnet/files/driftnet-1.3.0-musl-stdint.patch
new file mode 100644
index 000000000000..7261bbc80e16
--- /dev/null
+++ b/net-analyzer/driftnet/files/driftnet-1.3.0-musl-stdint.patch
@@ -0,0 +1,113 @@
+https://bugs.gentoo.org/832419
+--- a/src/media/image.c
++++ b/src/media/image.c
+@@ -11,6 +11,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h> /* On many systems (Darwin...), stdio.h is a prerequisite. */
++#include <stdint.h>
+ #include <string.h>
+ 
+ #include <netinet/in.h> /* ntohl */
+@@ -288,7 +289,7 @@ unsigned char *find_jpeg_image(const unsigned char *data, const size_t len, unsi
+ unsigned char *find_png_eoi(unsigned char *buffer, const size_t len) {
+     unsigned char *end_data, *data, chunk_code[PNG_CODE_LEN + 1];
+     struct png_chunk chunk;
+-    u_int32_t datalen;
++    uint32_t datalen;
+ 
+     /* Move past the PNG header */
+     data = (buffer + PNG_SIG_LEN);
+--- a/src/network/layer2.c
++++ b/src/network/layer2.c
+@@ -12,6 +12,7 @@
+ 
+ #include "compat/compat.h"
+ 
++#include <stdint.h>
+ #include <string.h>
+ 
+ #ifdef __FreeBSD__
+@@ -39,7 +40,7 @@
+ struct ethhdr {
+ 	unsigned char   h_dest[ETH_ALEN];
+ 	unsigned char   h_source[ETH_ALEN];
+-	u_int16_t       h_proto;
++	uint16_t       h_proto;
+ } __attribute__((packed));
+ #endif
+ 
+@@ -55,20 +56,20 @@ struct ethhdr {
+ #endif
+ 
+ struct ieee80211_radiotap_header {
+-	u_int8_t        it_version;     /* set to 0 */
+-	u_int8_t        it_pad;
+-	u_int16_t       it_len;         /* entire length */
+-	u_int32_t       it_present;     /* fields present */
++	uint8_t        it_version;     /* set to 0 */
++	uint8_t        it_pad;
++	uint16_t       it_len;         /* entire length */
++	uint32_t       it_present;     /* fields present */
+ };
+ 
+ struct ieee80211_frame {
+-    u_int16_t fc;
+-    u_int16_t wi_duration;
+-    u_int8_t wi_add1[6];
+-    u_int8_t wi_add2[6];
+-    u_int8_t wi_add3[6];
+-    u_int16_t wi_sequenceControl;
+-    // u_int8_t wi_add4[6];
++    uint16_t fc;
++    uint16_t wi_duration;
++    uint8_t wi_add1[6];
++    uint8_t wi_add2[6];
++    uint8_t wi_add3[6];
++    uint16_t wi_sequenceControl;
++    // uint8_t wi_add4[6];
+     //unsigned int qosControl:2;
+     //unsigned int frameBody[23124];
+ };
+@@ -89,13 +90,13 @@ struct frame_control {
+ 
+ /* SNAP LLC header format */
+ struct snap_header {
+-  u_int8_t dsap;
+-  u_int8_t ssap;
+-  u_int8_t ctl;
+-  u_int8_t org1;
+-  u_int8_t org2;
+-  u_int8_t org3;
+-  u_int16_t ether_type;          /* ethernet type */
++  uint8_t dsap;
++  uint8_t ssap;
++  uint8_t ctl;
++  uint8_t org1;
++  uint8_t org2;
++  uint8_t org3;
++  uint16_t ether_type;          /* ethernet type */
+ };
+ 
+ /*
+--- a/src/network/layer3.c
++++ b/src/network/layer3.c
+@@ -12,6 +12,7 @@
+ 
+ #include "compat/compat.h"
+ 
++#include <stdint.h>
+ #include <string.h>
+ #include <assert.h>
+ 
+@@ -30,8 +31,8 @@
+ int layer3_find_tcp(const u_char *pkt, uint8_t nextproto, int * offset,
+ 		struct sockaddr * src, struct sockaddr * dst, struct tcphdr * tcp)
+ {
+-	u_int16_t *sport = NULL;
+-	u_int16_t *dport = NULL;
++	uint16_t *sport = NULL;
++	uint16_t *dport = NULL;
+ 
+ 	while (1) {
+ 		switch (nextproto) {