sys-kernel/hardened-kernel: remove ClearLinux patches

net-vpn/amneziawg-linux-kernel-module/Manifest

@@ -1,2 +1,2 @@
 DIST amneziawg-linux-kernel-module-1.0.20241023.tar.gz 415325 BLAKE2B e56448d1793c060b57a8dece6d17f6fa372ac6b6242290ed87d777105876e228ed682b59f6f11eedeb7fc415bb35c48bfe82ecec99bc171175864be0a6ba39d2 SHA512 2154f749d91adc2be185a02b58a6b20a079b3985277b8cb874b4affda00bfaabe949e01088c157d71e7d4a6e2e073f07e9dc370d8165465156f30ed8c9178a25
-EBUILD amneziawg-linux-kernel-module-1.0.20241023.ebuild 3199 BLAKE2B 47ac8cbae4b78912484d74fd3cbef5a859a989993d83a7ce1d426caed6211c062c8da0a21cad2289f42fd46547d0fd8fa5a2815f68eea55775ecd736c588b93f SHA512 9653931f27333cd6767e165aaca15372d2b0ac56f933c38f08bd9df73ef396a1772767089aeb415ab7b7e40af07fa8ea6b3f3786d38b635a01fe8fb03a940a29
+EBUILD amneziawg-linux-kernel-module-1.0.20241023.ebuild 4520 BLAKE2B 47fee9a9876fda689674a5de469f7a8ac3bc8bcce5788a2705b08df3d699b6002c73a9759ee8dae256fd079c0b091ecc707785a944bbb3408b30e8831ba8d323 SHA512 83a13a223b99456e7425361b0eb10ae6c1ae3a086e9b2baaa68b7cb168f3a7e31fa1626a12dac11289cb09672cf4275535a1e9b87400361a8b91e72b1b2f7cfd

net-vpn/amneziawg-linux-kernel-module/amneziawg-linux-kernel-module-1.0.20241023.ebuild

@@ -1,4 +1,3 @@
-# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,6 +23,13 @@ IUSE="debug +module module-src"
 
 CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_ALGAPI"
 
+# On modern kernels AmneziaWG needs Wireguard sources from kernel to generate
+# own sources from. On a typical Gentoo installation 'sys-kernel/*-sources'
+# package contains needed kernel sources. But installations based on
+# distribution kernel (sys-kernel/*-kernel) have no kernel sources installed.
+# That is why this ebuild has a build dependency on gentoo-sources or vanilla-sources.
+BDEPEND="|| ( sys-kernel/gentoo-sources sys-kernel/vanilla-sources )"
+
 pkg_setup() {
 	if use module; then
 		linux-mod-r1_pkg_setup
@@ -34,12 +40,35 @@ pkg_setup() {
 }
 
 src_prepare() {
-    default
+	default
 
-    cd src
-	sed -i "s@^KERNELRELEASE ?= .*@KERNELRELEASE ?= ${KV_FULL}@" Makefile
-	ln -s /usr/src/linux kernel
-	emake apply-patches || die
+	if kernel_is -ge 5 6 0; then
+		# We need to select a directory with kernel sources.
+		# Usually, /usr/src/linux is the right choise, so we check it first.
+		# If /usr/src/linux contains no sources (distribution kernel), we check
+		# other subdirectories in /usr/src sorted by version in reverse order.
+		echo "Searching for kernel sources..."
+		dirs=$(find /usr/src -maxdepth 1 -name 'linux-*' -type d | sort --reverse --version-sort --field-separator=- --key=2,2)
+		dirs="/usr/src/linux ${dirs}"
+		for kernel_dir in ${dirs}; do
+			[ -d "$kernel_dir" ] || continue
+			if [[ -f ${kernel_dir}/drivers/net/wireguard/main.c ]]; then
+				echo "- ${kernel_dir} -> found"
+				KERNEL_SOURCES_DIR=${KERNEL_SOURCES_DIR:-${kernel_dir}}
+			else
+				echo "- ${kernel_dir} -> not found"
+			fi
+		done
+
+		if [[ -d ${KERNEL_SOURCES_DIR} ]]; then
+			einfo "Using kernel sources in ${KERNEL_SOURCES_DIR}"
+		else
+			die "Kernel sources not found, but required for building."
+		fi
+
+		ln -s ${KERNEL_SOURCES_DIR} src/kernel
+		emake -C ${S}/src apply-patches
+	fi
 }
 
 src_compile() {

sys-kernel/hardened-kernel/Manifest

@@ -1,6 +1,5 @@
 AUX linux-6.10.amd64.config 187289 BLAKE2B 11f06aff9983d6476ac66699601dfd91ebecbae80e751bf9428b4bb725fdde3567752b860646f185a8926428047644cffee03fb23b5d9002ce3f55e9b364936d SHA512 bbed04c7d3d2ae4c6d131dbcd420de156b0232dfb75e74874a2aa3b62607521b88daae386226a196c9ff05ab743282843b2fd1aa91bc99de02e785023a38d577
 AUX linux-6.6.amd64.config 183290 BLAKE2B 3da242321cba8173f61a9946df4a27276193e2fe7c029ff8ae9e883aeb326efa4d4b65173d4c940b17c1f4c801752871f7737e65862e686e516f8bc85e028f28 SHA512 a949c6875184e005395b527dd58c06ea10e0efd7c1a36eea8139ee61ae7b6c218b54625cc469ae377b5518d87e2ab710f9ecfb9463538d8eae3ed8256fb94227
-DIST 6.10.12-1467.tar.gz 1651884 BLAKE2B b4fc2ff81071ca8078bcc4d093cdf19cd3f6ac1debeca809ee0b7ab9e984a825925aebfe0b60c40ba9c5a333ad350eaf943d6603cd134c13cf5a0a4391ab67db SHA512 38b703eb075d8c24215c7ce4f32981854b0628110bf10ba293d74531b2a489f35522f2bd17e1688febf1adfb0eb629bb41d5d91f8572d0f5f35df726d42a5e82
 DIST genpatches-6.10-16.base.tar.xz 973248 BLAKE2B f91a03c3d8c1f09a4c51f17eddcbe3ef733da7242a61891647efae6c79b49bfdb589342a76a4955ae3e908e533b29f974ba414ea5649ec0a93826cf61ae625e9 SHA512 df9fb97cf87a0255afe9eb6c74c51dbe90bab5851f20097c17abc72ab00d63d2d7b4f2622f3db18daeee6cc8d0bdda9dae60bc42ef7844c5544c4eb147ded50f
 DIST genpatches-6.10-16.experimental.tar.xz 81200 BLAKE2B 7029757b6c300b4da086c087576fb04a0e3fed9655d37204ef2a1af67cdc4480f1e2d08b04e7f5e08ac443d5b69fc4685c09581f69fa0295ba467631f2c15ca3 SHA512 a206f745393efddfd7bd7ea5b2a070ecb8159357d97a4f161f31a67c5dad0eb0ab9f518dca53a4849393cf099ba6fb69db220fdbe6fb3c0472a64c2838fcb0a2
 DIST genpatches-6.10-16.extras.tar.xz 4056 BLAKE2B 3a0dcfe962509bc0ab802688055d1f001b2508276f6860944c94d45e69cb9a453d9381f450f86dcf120ded7c161cc8714411d0bcb22edfc3ba1b78cab4ca21dc SHA512 a279b9fb36e66b5017ab142e71134d35097859f755c480a0ad3434d347ad5611b16b79f47a0f329a43aa3a8d4301279280212d76381d8bd45fe57fe1a6c2e9b7
@@ -20,6 +19,6 @@ DIST linux-6.10.tar.xz 145142812 BLAKE2B bb243ea7493b9d63aa2df2050a3f1ae2b89ee84
 DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
 DIST linux-hardened-v6.10.13-hardened1.patch 94944 BLAKE2B f4345c653452cbf9376c13094bb265feb29b847f9c20589d2b8a046fce19aea0d801491fd5db7a996eba7cf3c22ff625108d8213bd5d748e79107fd7359bd8ad SHA512 a5101ae71c61d0645661de6912b296926ff0a39d73ca010bd0ffd1ff5f885309bc04c6828432e98c796e8c68228f8b48f8f9801cd8a364819781a73bbf591423
 DIST linux-hardened-v6.6.53-hardened1.patch 98239 BLAKE2B f06c47bc88a9c0b1bf15ee9f6cfef16c4d2a40b167dc005b9233a632c8aebe62fd532d0798bfd3cf9d5df2479f6c66be03d4f26e3ecc13b72b0d5a12d9f7c9d8 SHA512 bc1fd920ff763d725bf188ded906e0524da0eb0ef1358f51b9d93e008b6f305b48376b98d564ae8d667294625d54d9671968af20fc3fd5cf5214ff2a3cab4e26
-EBUILD hardened-kernel-6.10.13.ebuild 5120 BLAKE2B 25e1619e2e08230513fa0b2809e814ebe9ec621757012d4e01d6ebb9bdc985be72310edf08d2d68b8cf2e2e9c018293ef5002609681bb96a6bc7e7b99601249d SHA512 972a40afd555b48c0e6523c9124eab14de5d3def313f1ff072e61ad3b8ef4556de8ab76e26c2dca218841eae4cc6afce5f3c350cfa78d396782ff2e99b3d765e
+EBUILD hardened-kernel-6.10.13.ebuild 4568 BLAKE2B 3fc322ee3962ca7d1a6fa712cbf0d901deb8b5fcef66d34a2f43a3ba15e58626f7f8924481a196f9a5c1a79626af331cfbd189e52e1088894ff2f7843a4be115 SHA512 2893e9ace6cfdfebd386c9afb83bdf5aefaec157671fdd8ae45683dad508e535c0741be9be1708bdf2c317e26b142b4a500fbb69dacf69737dd6dddbedaf23eb
 EBUILD hardened-kernel-6.6.53.ebuild 4327 BLAKE2B 9f9e97a711087eebf8b12782f5ec5beda1b0754727929f61874e41a404b4d183044d710e3ba857fc0d22249a255826ed95e2591539385bf869604aad364711f2 SHA512 5d4afefcea6fcfe84d2eb23af9cda50a6cd8080cc94df8003f1075752bcef7a3d7f29f8e6065cb0665b464ca6aebd69311a51839ea383a523322e29a5dd249d2
 MISC metadata.xml 345 BLAKE2B 4003222d76459210cbeba27d68bcef9b42f500dd3dafe53505dae42004c5224eeae395fb30d7582de614654d2fde19d118c8c31fbc35e5335c9150d93f42efc9 SHA512 994d288cd16858bad3177d383a279f0f549ddf40ef87c62683815540b331bd48d4afa4d0c6af947e409c58f8abb5e1da045bb98dc00a422ea724cdf0610d6619

sys-kernel/hardened-kernel/hardened-kernel-6.10.13.ebuild

@@ -40,7 +40,6 @@ SRC_URI+="
 		https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.experimental.tar.xz
 	)
 	https://github.com/anthraxx/linux-hardened/releases/download/v${HARDENED_PATCH_VER}/linux-hardened-v${HARDENED_PATCH_VER}.patch
-	https://github.com/clearlinux-pkgs/linux/archive/refs/tags/${CLEARLINUX_PATCH_VER}.tar.gz
 	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
 		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
 	amd64? (
@@ -97,22 +96,10 @@ src_prepare() {
 	# include linux-hardened patch with priority
 	cp ${DISTDIR}/linux-hardened-v${HARDENED_PATCH_VER}.patch ${WORKDIR}/1199_linux-hardened-${HARDENED_PATCH_VER}.patch
 
-	# remove some ClearLinux patches causes conflicts
-	for patch in ${CLEARLINUXPATCHES_EXCLUDE}; do
-		rm -f "${WORKDIR}/linux-${CLEARLINUX_PATCH_VER}/${patch}"
-		sed -i "/${patch}/Id" "${WORKDIR}"/linux-"${CLEARLINUX_PATCH_VER}"/linux.spec
-	done
-
-	local CLP=$(grep "^Patch" "${WORKDIR}"/linux-"${CLEARLINUX_PATCH_VER}"/linux.spec|cut -f2 -d ' '|sed "s@^@"${WORKDIR}"/linux-"${CLEARLINUX_PATCH_VER}"/@g")
-
 	local PATCHES=(
 		# meh, genpatches have no directory
 		"${WORKDIR}"/*.patch
 	)
-	# Add ClearLinux patches list
-	PATCHES+=(
-	    ${CLP}
-	)
 	default
 
 	sed -i "s@\-hardened1@@g" Makefile || die