gentoo auto-resync : 18:08:2023 - 09:35:26

5 files changed, 32 insertions, 2 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 3c7f3b39490f..8636def4f048 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/r8152/Manifest b/net-misc/r8152/Manifest
index afe06ef30a40..ac17e320bef1 100644
--- a/net-misc/r8152/Manifest
+++ b/net-misc/r8152/Manifest
@@ -1,7 +1,8 @@
 AUX r8152-2.16.3-asus-c5000-support.patch 581 BLAKE2B a502be8abc3e714fd6c1d904472e40989d051cef8a1d5fb9a1f4437f47c0cbb0a408fb612f0feb4bdd28fa2bfc9097118746ded59cc05ba9a75eed0e1273647b SHA512 f7055796e243e1783f50677aef850448b85253ed3eb5a4490ae12c245d3f9ebbd6fe3fd9546bce312313537455a1a71076c0d61109d146a42c8a1ba39caa1b75
 AUX r8152-2.16.3-kernel-5.19-fix.patch 1599 BLAKE2B e1300601e2dcd98729481a6d146ffcc0b55e6163c405608ed783bc56acca65654317804c1da780203d96945b49d815b6efd740a752335d4c0aa562f2ba84bbf3 SHA512 6cdb4ee02c6727d87d94fbd4058b7bbd18e3bb4542c2489d4080217ef323faddbf5b998a83dd42b8e1a1e4c1eb6f65762616382fc5fd8519db07d6dd01f83b4a
 AUX r8152-2.16.3-kernel-6.1-fix.patch 1473 BLAKE2B bebafaeaed61bff9ee058ddc64fef6299703bdf9b0c2cd086c86643b362122a8d691577963b9b64f45729bfa4e72f09fe33d6c61fc195d0675bdcd7affd63d7a SHA512 4c5115946a1086d88bc19aa556782aec45fc05f3e38fab8255bb13a863bd2744c08bca0fd6ed72da8c5171fe801436665f4b10bfc22203c500460942a0a6db2d
+AUX r8152-2.16.3-kernel-6.4.10-fix.patch 731 BLAKE2B 2d7820d7dc749bdd4dbbb165116135af2d6831f17b4721afc9c37bbd078f6915cc6c44ce9cb77941ffc52a399a6065269a578128b2c1bb0823658972f8f81dc2 SHA512 a274fc2d5f998ba0c6bfad74c0a56d50c9b146abe012fdd5eebe9719615876e63f55203f3dcf17397e4e28040cd0b253ef861e2cb9636da9c1d050fa844c226c
 DIST r8152-2.16.3.tar.bz2 73331 BLAKE2B 9e22ee6d9d0197def782f77bfd0c88a2d8827d4f8cc0bbb1a6583ab67533cd07ba79a16cd9350272ed18c733fe809ea1ff70596627abdc65d452bdf817628bc8 SHA512 c37bf5199d3a857c9a7a12f3aa4ecfe9c04b49413aea862a053ebee24c137cd35769e5d5cc7e2bb7dd3bf9057f51ffada0b4e0c53cb3d417e05c8e3fc830705c
-EBUILD r8152-2.16.3-r1.ebuild 1264 BLAKE2B 9cd2284d503adf7bd61d60b5dd7e2de73392de167b1a7a8fbfc0a7e67d08697d0f053d39788cc974a7d1381ad80043ef9f8a14975a1e81beffb6934b846293a1 SHA512 de1c6227201560dc9cf32e63ca1155a8cfcf56248184ead3c14e9ac73493ecdf4c77aaf4463e4d18b9584e0bbe1bd431500539a20d8fc6cc60fb1f39776d2afc
-EBUILD r8152-2.16.3.ebuild 1234 BLAKE2B c62eebc8b8cc8efb3d9675b9a92404c6bed446d81a4f538f815958ca2e50c108ac1aac897e22f729f6521a32d60e97356bd74815d5037f344bfd0a33dec1cb76 SHA512 cbca5020766a214f360b0660e515728c59457c4a72a74425fbbe18a933c41b83caadc062fce99fa091ad73785eb1ecb809f8ec50059455304a62f19cffb851cc
+EBUILD r8152-2.16.3-r1.ebuild 1316 BLAKE2B 671c089324780a0cc9e4b2640de8602df8a56ebe93b5c2ff1f7ac6f1be033d903423c7d8760cacf60b8cacb34ced043cd7ba58b604634c6d5012533dc774500a SHA512 f0a627e4074a641a222ae7198b6133e3f8365ddd85868b4636a64ca3420348cbc84c47633b0d635650f2bc705442c3562cf954a37f0c7c06acfdfa3b6df94b2a
+EBUILD r8152-2.16.3.ebuild 1286 BLAKE2B 190e7a6f4306ac604089b36ef3605b4ef64780cacc53f2ff3fc29884fc49719717fd09e1969db064380c7197765f57dbb17e0c869583d7dd8c4865f0467417d2 SHA512 cb4360c62fbfc2b54dc699285db3d8f58b76d7e6005f3c98b29c0677819147567a3731274db03f85efc45aceec07ec1b1df9f363ef7880a5bbfc63b8cdb1b55d
 MISC metadata.xml 660 BLAKE2B 1f7bd7d75e5fc3b88b140f88b82390b09cbffed8770b73b4584f7d9114fd1b97a84f745881d424f30c1a738c332bb04bab3d651bd9734f0170164eb8158ef098 SHA512 c0258ae24671a18801a9a499869267b2c3d2d0350e1fbbf91db6fe2358326bb27551623ef93c9c9a9bebde3c08520463eae00a05802053a0f5b7ade1b0f5ea4d
diff --git a/net-misc/r8152/files/r8152-2.16.3-kernel-6.4.10-fix.patch b/net-misc/r8152/files/r8152-2.16.3-kernel-6.4.10-fix.patch
new file mode 100644
index 000000000000..016e6c24fb0c
--- /dev/null
+++ b/net-misc/r8152/files/r8152-2.16.3-kernel-6.4.10-fix.patch
@@ -0,0 +1,27 @@
+From: https://github.com/wget/realtek-r8152-linux/pull/33.patch
+From ea0387211368754fb1d3fe9f72ddc766ba2dacce Mon Sep 17 00:00:00 2001
+From: Martin Pecka <peckama2@fel.cvut.cz>
+Date: Mon, 14 Aug 2023 13:44:36 +0200
+Subject: [PATCH] Fixed compatibility with Linux 6.4.10+
+
+---
+ r8152.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/r8152.c b/r8152.c
+index c3ba2ca..47aad6d 100644
+--- a/r8152.c
++++ b/r8152.c
+@@ -25,6 +25,12 @@
+ #include <linux/ip.h>
+ #include <linux/ipv6.h>
+ #include <net/ip6_checksum.h>
++// Linux 6.4.10 added net/gso.h
++#if defined __has_include
++#if __has_include (<net/gso.h>)
++#include <net/gso.h>
++#endif
++#endif
+ #include <linux/usb/cdc.h>
+ #include <linux/suspend.h>
+ #include <linux/atomic.h>
diff --git a/net-misc/r8152/r8152-2.16.3-r1.ebuild b/net-misc/r8152/r8152-2.16.3-r1.ebuild
index aeaed97ff0a8..d37cee6a6d2d 100644
--- a/net-misc/r8152/r8152-2.16.3-r1.ebuild
+++ b/net-misc/r8152/r8152-2.16.3-r1.ebuild
@@ -23,6 +23,7 @@ IUSE="+center-tap-short"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.16.3-kernel-5.19-fix.patch
 	"${FILESDIR}"/${PN}-2.16.3-kernel-6.1-fix.patch
+	"${FILESDIR}"/${PN}-2.16.3-kernel-6.4.10-fix.patch
 	"${FILESDIR}"/${PN}-2.16.3-asus-c5000-support.patch
 )
 
diff --git a/net-misc/r8152/r8152-2.16.3.ebuild b/net-misc/r8152/r8152-2.16.3.ebuild
index b4d899b3c45e..5130aa2dfa1d 100644
--- a/net-misc/r8152/r8152-2.16.3.ebuild
+++ b/net-misc/r8152/r8152-2.16.3.ebuild
@@ -25,6 +25,7 @@ IUSE="+center-tap-short"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.16.3-kernel-5.19-fix.patch
 	"${FILESDIR}"/${PN}-2.16.3-kernel-6.1-fix.patch
+	"${FILESDIR}"/${PN}-2.16.3-kernel-6.4.10-fix.patch
 )
 
 pkg_setup() {