gentoo auto-resync : 03:06:2024 - 00:07:25

6 files changed, 65 insertions, 3 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index d26be7783b3e..2f3f57dba120 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/rtsp-conntrack/Manifest b/net-firewall/rtsp-conntrack/Manifest
index 7e8ed4f113bb..10f46d4c487f 100644
--- a/net-firewall/rtsp-conntrack/Manifest
+++ b/net-firewall/rtsp-conntrack/Manifest
@@ -1,4 +1,6 @@
+AUX rtsp-conntrack-5.3-strlcpy.patch 888 BLAKE2B 2b106270b7ab915624ddb2dc2677f382b7514665015d65359c7db2ddb99370d7a9a43ce90ab7c728bbdda39e060b8028d2dfede0feba150f80c7561b53d758e9 SHA512 704fc37e3f477819a63832298300ab085eeca53009c29296cd10a014196b218e4973d8cc5c64956e2af55112eded101e19870f381181f9378f73d3a515e93a41
 DIST rtsp-conntrack-5.3.tar.gz 12409 BLAKE2B 91bc82f404c3d5b32100684625f5fc9641d60df457c25b2bf93988bad7acd76fdc46e2e76d12dccf42eb61bd3f724752a974728a8b229bb59df6bec545e22151 SHA512 660cf212cb5802f0d9a02c45948d02729e686fe96e12d5e2294f5d9a588d872677d4f8ef39f4abac6ec3adb2ef5e1c884858e63275a84e1035d13c21537530ab
 EBUILD rtsp-conntrack-5.3-r1.ebuild 598 BLAKE2B c6fcfc39d717fc8f7750e931e401f88de295123e64912acd39cc9483ba6114f6cc6f27e3f374046abd5077e2322372a32e83ae7e0cd104c24f1b3c39ef14a94f SHA512 97e48aee8ee73d2e4270bbe8fb448f69c2c8982fc2502a0c8630707481e4cd2f63c10506e2a846be27a0f36263868535b7a1d2a5abe6b1b81c6af853a76299f0
+EBUILD rtsp-conntrack-5.3-r2.ebuild 648 BLAKE2B 163761ab81a4f75fa9f5a04a2436dddb97cdd16fbcd8415efb104462cba1b699ac6f58f0067fcffbd4171aeec26fb590f3cccb56d919dbea71e4066418a018e2 SHA512 6733fc0f9587572faf190ab038a5467d8c1967e7813f9fe5eff5018ab4e7520ddd2549015ed738c4777145fb96974c3195da507ff32f05949fe4833ff702d1d3
 EBUILD rtsp-conntrack-5.3.ebuild 713 BLAKE2B 8559fc61f630373fe571805219ac94de0de02b6e9061b52f508f6e986da3a0c8b9c1a9c4bf688d4f5e2ad373825e72ccabeb99676afa97b66e868122694674f9 SHA512 edab69d7b9bf2cd6936831f12a6d2582a64b088a24573955eac978c6e255904570de16a052c3bab9f76df06fa68e83269060c5de8ec52c1e41ad1fd2f048885d
 MISC metadata.xml 253 BLAKE2B 6c0ff48fb0bc43e945ed68a2f4a5f067ecef5c84a32c013616037dd8de51b7ce80bbe6560800bb16c4c24e0318a592bbf943c4182b826d694780b46e0d8dd95e SHA512 8487052b487f4d0aea42dcddcbb32e1c55ed9da79074c12971b9f31f84acc3df9d67735e247a55057312840ffc7e1ea1fa54a5fd5bb1638ca20924cb04d60919
diff --git a/net-firewall/rtsp-conntrack/files/rtsp-conntrack-5.3-strlcpy.patch b/net-firewall/rtsp-conntrack/files/rtsp-conntrack-5.3-strlcpy.patch
new file mode 100644
index 000000000000..4051421a0f84
--- /dev/null
+++ b/net-firewall/rtsp-conntrack/files/rtsp-conntrack-5.3-strlcpy.patch
@@ -0,0 +1,29 @@
+https://patch-diff.githubusercontent.com/raw/maru-sama/rtsp-linux/pull/12.patch
+From: Brahmajit Das <brahmajit.xyz@gmail.com>
+Date: Sun, 28 Apr 2024 01:48:03 +0530
+Subject: [PATCH 1/1] Fix build with Linux 6.8
+
+With commit
+https://github.com/torvalds/linux/commit/57f22c8dab6b266ae36b89b073a4a33dea71e762
+strlcpy has been removed in favor of strscpy. Thus giving us build error
+such as nf_conntrack_rtsp.c: error: implicit declaration of function
+strlcpy.
+
+First reported on Gentoo Linux, please reffer:
+https://bugs.gentoo.org/928590
+
+Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
+--- a/nf_conntrack_rtsp.c
++++ b/nf_conntrack_rtsp.c
+@@ -550,7 +550,7 @@ init(void)
+ 		}
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
+-		strlcpy(hlpr->name, tmpname, sizeof(hlpr->name));
++		strscpy(hlpr->name, tmpname, sizeof(hlpr->name));
+ #else
+ 		hlpr->name = tmpname;
+ #endif
+-- 
+2.44.0
+
diff --git a/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r2.ebuild b/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r2.ebuild
new file mode 100644
index 000000000000..b53a2b6b90ce
--- /dev/null
+++ b/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-mod-r1
+
+DESCRIPTION="RTSP conntrack module for Netfilter"
+HOMEPAGE="https://mike.it-loops.com/rtsp"
+SRC_URI="https://github.com/maru-sama/rtsp-linux/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/rtsp-linux-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CONFIG_CHECK="NF_CONNTRACK"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-strlcpy.patch
+)
+
+src_compile() {
+	local modlist=(
+		nf_conntrack_rtsp=net/netfilter
+		nf_nat_rtsp=net/ipv4/netfilter
+	)
+	local modargs=( KERNELDIR="${KV_OUT_DIR}" )
+
+	linux-mod-r1_src_compile
+}
diff --git a/net-firewall/ufw/Manifest b/net-firewall/ufw/Manifest
index 67904eec6ee9..ac962b4bbaf3 100644
--- a/net-firewall/ufw/Manifest
+++ b/net-firewall/ufw/Manifest
@@ -9,5 +9,5 @@ AUX ufw-2.initd 2611 BLAKE2B b6a75e023ad0efeeef168e7e074c716ec66f40d3bde9f99cf1a
 AUX ufw.confd 219 BLAKE2B 8ed5dec5dd9acc84715918240e31398268ff36f73bb2cfc10e64e0593e59cc7f5b988f8545ddea37f19d9b40e870d743bea66edd7da1e3d2753b6edda8afa352 SHA512 a010532c97b9cf83f1fb5fa707228e0542a8b109c76e5942aaf2d6552c63e033d32e39e5a6ac87cb9e2ed4c3fdbc5d03c75127e6378665e592b143bc1eda52c7
 AUX ufw.service 329 BLAKE2B e817fc85b3bdb21b47a3089c6f2204292a019eaeae510832530f0e09f8784a312dd636fa3cf90610bb3159d52b4bdaadf803699ac4bff31576b566a3e977b2d2 SHA512 a365e704ca958c83c86f8a6b1623ce3f9ad72dcfb0cfc7758bfc787e0877f897ccf8b200db83df17130ca5dcc54f938178b8cabfe3ee0c0896c814ee7d2439c7
 DIST ufw-0.36.1.tar.gz 583123 BLAKE2B 16e1ee67493d5db10a04667b646a019aa3aeb06345d0facc334fb07eeff4d4f6674a4699b2bd7bd6ed29de1c05c4e14812e9e8ec55c4bfb8579b8e3e2e577f6a SHA512 77d01fef661083eac041be6d6eabffb1d8aedb215f73e44e18a9a63a48da96414b3c0166e3ffd9402c22c72a6de5d774ba14b15368b02997aae8e08d1c5dd4c0
-EBUILD ufw-0.36.1.ebuild 6135 BLAKE2B 161fe91a1dd61e998e6f7d7025fbf0a711130dbac37047c14a1b52a5c2162667540751f0af4fd984b7d8a837d0dd968a00e751fd03ac7a29d9bb1760b60673b3 SHA512 821ce06de3f8e289f79a5bb487be03dcde98a74d73c4927ae549418ef90f8735610b34a4a44d65e879ce463d6b97ef844811b0b6a2bda4ebd0bdd6d95d9cc44c
+EBUILD ufw-0.36.1.ebuild 6136 BLAKE2B de9c978991593488f9d8557b70501f9c14e61e726eb00514c00878502d4f12b906148b73d552a56176415094c3372c4950c3d0428765754356bb6d99d08256c1 SHA512 288721f0bd9fc07f549357f70dc110267c1b763ed84e60791485cd29f3287b864e1528aa0eb3fa67d923e1b90da276321da1d3757496919f70c431e5fb29719b
 MISC metadata.xml 686 BLAKE2B 6d415e2295cf7facf8908aab2fbd7d4150d24595c9eb30ccf7f105ff2263cd7dc6c393dc8ad8303b264d76be37bb11da3ce4d4b666c0648e974b7585e9e7e452 SHA512 c1dee02a7458095069243337abb01a66dc132de15a51114cc1b39778f02b3a05d28a869cfa8cef55cf8701bb7f872232b63d432c1c5e45d71d90fa6099f74dd5
diff --git a/net-firewall/ufw/ufw-0.36.1.ebuild b/net-firewall/ufw/ufw-0.36.1.ebuild
index 922d7aa76f9d..29c289c00534 100644
--- a/net-firewall/ufw/ufw-0.36.1.ebuild
+++ b/net-firewall/ufw/ufw-0.36.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_IN_SOURCE_BUILD=1
 DISTUTILS_USE_SETUPTOOLS=no