6 files changed, 24 insertions, 125 deletions
diff --git a/sys-kernel/kpatch/Manifest b/sys-kernel/kpatch/Manifest
index 4d089ca7ecd0..6f0b9a3ae254 100644
--- a/sys-kernel/kpatch/Manifest
+++ b/sys-kernel/kpatch/Manifest
@@ -1,9 +1,7 @@
-AUX kpatch-0.7.1-disable-dwarf-compression.patch 1120 BLAKE2B 443956fb6937973040efdae4a59ed925d6dad6e540bcd88146e08bfb3061b299b4f2a14226f3f52647cb27b163223d93cb729511e564dabc7814e287c8527a16 SHA512 eb51965bfe701cc0235ab442f68cb7c86cac55f6dbacac2beca39ffb94fbc767545bd598cb34c1c85b19dc2e830890eba3e28f28628f16e6a37c155e8a4324ff
-DIST kpatch-0.6.3.tar.gz 153100 BLAKE2B e95d1880ffc9ff6038bba98902d0f1e97c9f7f8d0f90eedc281c4bf0570217668cf7b701d038d6f06e9885ebdbb4407cc554d5175cf17eb8fd5051381f75deb3 SHA512 0d266dd837ad651d7f46047cf2c8de527d08274a885a154c53354f4b3c5679d91c766d7d42294ffe71cc548e5ee865c7555f24001882b806f2fb48825f9b0c06
-DIST kpatch-0.7.1.tar.gz 181732 BLAKE2B da3ff8a6bbd31c3bdc353a3d2b75c6947b915fb309a6f19c57b31a6cbad1d82b9e1611bc2c412c5d049511e217a01719eb9a017d1fbbe7c7bbf2e5b02a381f40 SHA512 c1b149e9532dc16ee4f7578aadf3eda73b53c889a055229490a7afd1fca8e6df755c98c938353f937b81679fe8d08e065c473a6c31e588b1eb67f2de56bfddea
+AUX kpatch-0.9.4-no-werror.patch 373 BLAKE2B b7e0d7c35fc87df6d2cb9f0a86a82f01d5a72561d62281abaf7290696d890a997ce3221be506e6213dda891a2f5100b9de83edccac8c6b6af3322353fef9f394 SHA512 3a4392ca1d56a3b2625f11b8a91c140a51d8a5ce45bec8f1a5d901d7515d07ffc85922623464576af0f89966a725faec99b9bc801610ead9102d7f69108f5cc6
 DIST kpatch-0.9.4.tar.gz 257885 BLAKE2B 3c84dd120b0b512e6a55d342b5950ce5d3a81c8c1e956f167bdb25c0c89dde5d4c2bd91fad687ab9eec4d6f965c21ff647f330f1fbcbfe560ca1f3cd37c6ac54 SHA512 647509fb9772b7564c0533ea043a15a66e29d413e045258036e78890c1d9cb072622bf458dda9bd4a87fe0855522c9b6ec3761f9bb4ab7e08157a179abfbaa62
-EBUILD kpatch-0.6.3-r1.ebuild 2456 BLAKE2B 7a37a9232c27d3c3914317ac434b33694f65db5b43d64b63a24ab8c8c4d22dd13c2563314daeb1e0b4578e115668d9ee749e6eedfa43a1ccdc3578ced45e6087 SHA512 eeec109841819c5411879ee0abd69286ccb645cb735169e50fb4c13cf5c7ef5fe9f529fe59ce150b5ad3cf18a539b06ef59d514e6ea840c13388c76c820e3185
-EBUILD kpatch-0.7.1-r1.ebuild 2755 BLAKE2B 02b8fd7e4650b359059c1812514f99498d1c92aef683e09d09fa63969996ef3ec71291e88f34b5f60dd17053ae41091c94b667e4e3f620cf7ddba9d7f6f38c48 SHA512 1020a0b61971baadc040b66987cb1ed48b7dff55509afd2f98e0f7c1bc3a502517faf890ccfac9b54ca54bb2fdbe7c340bea737b7593cd789d4e5b209602ba80
-EBUILD kpatch-0.9.4.ebuild 2691 BLAKE2B 1406a8ce94cdbbfdacd38051bd08cd9f057c5ea32aa81e9497944130387a5e8e433016576aed3762158434f56380111a33c4089e3fad2394d21c013aafee6722 SHA512 bbf937b697346f71f0b2272db96108fa6f656785c6ea21b547125bdc656c9de0efc158278af5511c1aa81918f1aaf33a01bbaaf0f6255a40a6a51ab32ed84f0d
+DIST kpatch-0.9.6.tar.gz 260687 BLAKE2B 5c535af463f54d7be00fe987716dcb84ed17df69e4ccf5c0a6b4bde32704756c1c217ec43d9f338ce478ff6e0403e5c10f15055c56fbfa786b592b7d67427c6f SHA512 898c5704098c473187f2eab9bccd5fb3cfc31f4211492d658abcd0b7cac6d03f11a27df19a56ad17c20163803084ddf54a27defcf12b4975a8a8eb5dbad73f21
+EBUILD kpatch-0.9.4.ebuild 2747 BLAKE2B 76d7a2a7b6bfaab3e054ebfae9c3f739f63c8dd07854800403d1470022b78e43402d79b9f217c758a3ed1e9857ab2431cb60b857f93280a7a329fd893f9c76b8 SHA512 1d4e1e21131a7a1107900fef7bffc038cbb49cb27b307fd0c3ef4c04b4580d486a7e2e32e0c3f9c5e94ce86ba1d2d04d4163f94c3660e1199587330ee40594ce
+EBUILD kpatch-0.9.6.ebuild 2747 BLAKE2B 76d7a2a7b6bfaab3e054ebfae9c3f739f63c8dd07854800403d1470022b78e43402d79b9f217c758a3ed1e9857ab2431cb60b857f93280a7a329fd893f9c76b8 SHA512 1d4e1e21131a7a1107900fef7bffc038cbb49cb27b307fd0c3ef4c04b4580d486a7e2e32e0c3f9c5e94ce86ba1d2d04d4163f94c3660e1199587330ee40594ce
 EBUILD kpatch-9999.ebuild 2691 BLAKE2B d507a6b69f149e395718182c2ba3a104ea36728f58886ea99469705c6176f485f142b0d71733a4ad2d8264377009d31538f357fe2609b5bb144e1ed05246eb74 SHA512 34c3e911c2ee18ae1ac61464d666e85b363adf6c6581a419612a0d9d3e6008b4066965d64238e19096825d033de48ecbc45cba2d2466ff06d4c868939e5c7b25
 MISC metadata.xml 671 BLAKE2B 27b8de92bfdcd0343388ee8c657a3a3625a3f3879ec597b18516ff5dbe78e6ba93ffb8e0f251a0920ca11405d6c9344378865a65799009a53c71c627dd159ef3 SHA512 e960dac661381d042b3a9fcaf6e7d1e4b246970e262d972596ed3eaf5f25ee5c9a8eca0a88d416f3c360073cf5d25db481b10550db58b3f3b47ceadcf0d85668
diff --git a/sys-kernel/kpatch/files/kpatch-0.7.1-disable-dwarf-compression.patch b/sys-kernel/kpatch/files/kpatch-0.7.1-disable-dwarf-compression.patch
deleted file mode 100644
index 85f2862df54a..000000000000
--- a/sys-kernel/kpatch/files/kpatch-0.7.1-disable-dwarf-compression.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From fe6e3f51bfe17945205445904c1fc602008ac7dd Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Mon, 29 Jul 2019 13:20:20 +0300
-Subject: [PATCH] create-diff-object: disable DWARF compression explicitly
-
-On some systems the linker produces compressed debug sections by
-default. It is not supported by create-diff-object for now.
-
-Fixes: #877
-
-Upstream-Status: Submitted [https://github.com/dynup/kpatch/pull/1011]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- kpatch-build/kpatch-build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build
-index 9ef3809..365655c 100755
---- a/kpatch-build/kpatch-build
-+++ b/kpatch-build/kpatch-build
-@@ -748,7 +748,7 @@ if [[ "$ARCH" = "ppc64le" ]]; then
- 	ARCH_KCFLAGS="-mcmodel=large -fplugin=$PLUGINDIR/ppc64le-plugin.so"
- fi
- 
--export KCFLAGS="-I$DATADIR/patch -ffunction-sections -fdata-sections $ARCH_KCFLAGS"
-+export KCFLAGS="-I$DATADIR/patch -ffunction-sections -fdata-sections -gz=none $ARCH_KCFLAGS"
- 
- echo "Reading special section data"
- find_special_section_data
--- 
-2.22.0
-
diff --git a/sys-kernel/kpatch/files/kpatch-0.9.4-no-werror.patch b/sys-kernel/kpatch/files/kpatch-0.9.4-no-werror.patch
new file mode 100644
index 000000000000..0667fdd91ca1
--- /dev/null
+++ b/sys-kernel/kpatch/files/kpatch-0.9.4-no-werror.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/776925
+--- a/kpatch-build/Makefile
++++ b/kpatch-build/Makefile
+@@ -1,7 +1,7 @@
+ include ../Makefile.inc
+ 
+ CFLAGS += -MMD -MP -I../kmod/patch -Iinsn -Wall -Wsign-compare \
+-	  -Wconversion -Wno-sign-conversion -g -Werror
++	  -Wconversion -Wno-sign-conversion -g
+ LDLIBS = -lelf
+ 
+ TARGETS = create-diff-object create-klp-module create-kpatch-module
diff --git a/sys-kernel/kpatch/kpatch-0.6.3-r1.ebuild b/sys-kernel/kpatch/kpatch-0.6.3-r1.ebuild
deleted file mode 100644
index 175fecf308b0..000000000000
--- a/sys-kernel/kpatch/kpatch-0.6.3-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic linux-mod
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dynup/${PN}.git"
-else
-	SRC_URI="https://github.com/dynup/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Dynamic kernel patching for Linux"
-HOMEPAGE="https://github.com/dynup/kpatch"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+kpatch-build +kpatch kmod doc contrib test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-crypt/pesign
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	sys-apps/pciutils
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-libs/elfutils
-	sys-devel/bison
-	test? ( dev-util/shellcheck-bin )
-"
-
-pkg_setup() {
-	if use kmod; then
-		if kernel_is gt 3 9 0; then
-			if ! linux_config_exists; then
-				eerror "Unable to check the currently running kernel for kpatch support"
-				eerror "Please be sure a .config file is available in the kernel src dir"
-				eerror "and ensure the kernel has been built."
-			else
-				# Fail to build if these kernel options are not enabled (see kpatch/kmod/core/Makefile)
-				CONFIG_CHECK="FUNCTION_TRACER HAVE_FENTRY MODULES SYSFS KALLSYMS_ALL"
-				ERROR_FUNCTION_TRACER="CONFIG_FUNCTION_TRACER must be enabled in the kernel's config file"
-				ERROR_HAVE_FENTRY="CONFIG_HAVE_FENTRY must be enabled in the kernel's config file"
-				ERROR_MODULES="CONFIG_MODULES must be enabled in the kernel's config file"
-				ERROR_SYSFS="CONFIG_SYSFS must be enabled in the kernel's config file"
-				ERROR_KALLSYMS_ALL="CONFIG_KALLSYMS_ALL must be enabled in the kernel's config file"
-			fi
-		else
-			eerror
-			eerror "kpatch is not available for Linux kernels below 4.0.0"
-			eerror
-			die "Upgrade the kernel sources before installing kpatch."
-		fi
-	check_extra_config
-	fi
-
-}
-
-src_prepare() {
-	replace-flags '-O?' '-O1'
-	default
-}
-
-src_compile() {
-	use kpatch-build && emake -C kpatch-build
-	use kpatch && emake -C kpatch
-	use kmod && set_arch_to_kernel && emake -C kmod
-	use doc && emake -C doc
-	use contrib && emake -C contrib
-	use test && emake check
-}
-
-src_install() {
-	use kpatch-build && emake DESTDIR="${D}" PREFIX="/usr" install -C kpatch-build
-	use kpatch && emake DESTDIR="${D}" PREFIX="/usr" install -C kpatch
-	use kmod && set_arch_to_kernel && emake DESTDIR="${D}" PREFIX="/usr" install -C kmod
-	use contrib && emake DESTDIR="${D}" PREFIX="/usr" install -C contrib
-	use doc && einstalldocs
-}
diff --git a/sys-kernel/kpatch/kpatch-0.9.4.ebuild b/sys-kernel/kpatch/kpatch-0.9.4.ebuild
index 5cdcff76d491..e30e6e2e09cf 100644
--- a/sys-kernel/kpatch/kpatch-0.9.4.ebuild
+++ b/sys-kernel/kpatch/kpatch-0.9.4.ebuild
@@ -34,6 +34,10 @@ DEPEND="
 	test? ( dev-util/shellcheck-bin )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.4-no-werror.patch
+)
+
 pkg_setup() {
 	if use kmod; then
 		if kernel_is gt 3 9 0; then
diff --git a/sys-kernel/kpatch/kpatch-0.7.1-r1.ebuild b/sys-kernel/kpatch/kpatch-0.9.6.ebuild
index 2a2b069afca4..e30e6e2e09cf 100644
--- a/sys-kernel/kpatch/kpatch-0.7.1-r1.ebuild
+++ b/sys-kernel/kpatch/kpatch-0.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,7 +34,9 @@ DEPEND="
 	test? ( dev-util/shellcheck-bin )
 "
 
-PATCHES=( "${FILESDIR}"/${P}-disable-dwarf-compression.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.4-no-werror.patch
+)
 
 pkg_setup() {
 	if use kmod; then