Merge branch 'kernel_cve' into 'master'
sys-kernel/xanmod-kernel: Backport CVE-2023-32233 fix to 6.1.27-r1 See uest src_prepare/src_prepare-overlay!386
This commit is contained in:
Parona
commit
4587aac6db
@ -2,12 +2,16 @@ DIST genpatches-6.1-30.base.tar.xz 1467496 BLAKE2B 7e442668319addb39f4812669463c
|
||||
DIST genpatches-6.1-30.extras.tar.xz 3812 BLAKE2B 8797213e32516d6f5cd88061574201951f5803f9e26e0662eae391704521c9530c47bcf2498a469b3e8f0696a1fa1a329fa097e983476ae4aaf38af465c1593e SHA512 58f4e9d6791b3e9903703349f4cb5456fe2e4d871cdf6f7c3dcf0338982c55c82c1da80b65a768d8efd2d992386c176821f4858aedaefcfc4b293c55a7aa8a1a
|
||||
DIST genpatches-6.1-31.base.tar.xz 1473456 BLAKE2B 2bee72cc97ba8a27bab8f69ab11ca7ac3aab81c9d9a00a8cdbe4ab6a50a378d6ea0de3b825ea2acc2fc3cac900b5bb2c3dd7e652a38f804237bb478020be9b5b SHA512 da57c6f5495b0768807c064f7045a19f0d6cb1d90150b6987d6ea0e21756668fb29fdd40329061acfcb923ac3d1dda2144853c33fe5f1bb5d21df05fd30bac65
|
||||
DIST genpatches-6.1-31.extras.tar.xz 3812 BLAKE2B 2d599eba0488cce5ff711080e61cc94aef9265c710c5b68ca7badb4a13147cf8f19e4660988321a0f929a3d3a9dd78adf30f905d4eeb63de4e45f41bc5063fd3 SHA512 87db9b58bb212c5182927012b95d04628dec1cb884cf52b83c566fc52262a5684dcea298260233f8a02974b30640f538754893b2c87cb34a71b5d7674b482ae2
|
||||
DIST genpatches-6.1-32.base.tar.xz 1474460 BLAKE2B 43060d16a84ca2c65ef9d7447747e6b857423134fd518e05c3c052bf5c664c9a0f8af97b84e7d911c84766cf478b71695537a3c56a367589bf37adaac032a7e0 SHA512 cf8bd867d09b68a197368c546ffa4c626b1c30f0f7a63138129d3abe8a0479c88717dff6ea0a79c53d7f108d2a1fedc433b7b2088e20f082be921701e5d7d790
|
||||
DIST genpatches-6.1-32.extras.tar.xz 3808 BLAKE2B b697db5da31e471ab0af978e722c12ca2d8c5cc371f1d4c2d11c5816b34b479e6ac17f1cd9ab26826bacb065e0a254e18b767c9cfcc12fb16c40f9d73aa1e3d9 SHA512 9113f7505f8dd5a535e2550863dc8d69a6961fc4180d5a7b77206a397db570571f083e39f6be87da072b588e4a2d1b9c1e4b2a725172c9a799b3dc8e88542f66
|
||||
DIST genpatches-6.2-13.base.tar.xz 700552 BLAKE2B 53187881831a5ee8ac1581d78d89b56d5e6cbd45a1267f294312fbd648818530f029280b6face5c1c7f7c6d2c13c5e3fc6d1747f4abea8b2065f960a42a45d2e SHA512 2ca287f97bb3c01291eb5faa1de40827d014547e2cbb5063e77597e027f58672a262bcc51f1f2111cb5621f75b59c61a3cfa40f30fe8bc923136f8de3dd3e1ca
|
||||
DIST genpatches-6.2-13.extras.tar.xz 3812 BLAKE2B 2e0620c2c03f6775a4ee7d29aeace0ed2474edf371bdea0aff7ec8b11db0804641ba4d2cb1993fdd7936ad6075c1b7de0bca6c055327b25f17a74d4f3a9d5d4c SHA512 5a146e403f04c1b8fec69ff2824f4d0b446fea895126839aacc511b47b4eadcfcf61ced441e3886ad4fc018379b029305d72a99d34d98ef1fdf486e28e888ce2
|
||||
DIST genpatches-6.2-14.base.tar.xz 737376 BLAKE2B a31157486ed656f479c36a1d728627ba1361656e8a2d8a2dcaee0ee59e6edd6c046ad7799d2458e42990d53ea9893e49f26447a380b0c5bb02f8033e8ed3fc1b SHA512 126b365b3d5dd435e3ce8eac2b030bdeb227c3047d9b7182a289adc3746fd35f6454f08fa9ac323b83544d2ed614d9d1c1da569c74d8c61c50b14ab358ce4115
|
||||
DIST genpatches-6.2-14.extras.tar.xz 3812 BLAKE2B 8ed801102acaade5ee6191264cab8a982a707e6b8419094e044b411a7c042689457c1351299b9ca0676c7223bad8e87b241938059fb1f3fb664be3d8ec31ef70 SHA512 f8ee31a4456482e23609797d87822da87940f97925fab08ff8828746fc93ba5023f4b1d4f21dfd76931ac37ac2465accc4e999b631bce6e16c83bad7689432b7
|
||||
DIST genpatches-6.3-2.base.tar.xz 8036 BLAKE2B 754d46f15ab113a1bae41d154b47c4cde2a93df9dbc4333b93e7d3abc424ef19dca2993c25705020096ab9d500f794a852c4cff68f29907e7667edbec7503ff6 SHA512 45eb038e9118a2feff7625cefc7bbb96ef4fd8fa29fce118943dbd0685075fbf9c525202879abf6308d7e80e94b8e9704799e3c863105add026c86b97314d580
|
||||
DIST genpatches-6.3-2.extras.tar.xz 3808 BLAKE2B 6eccde5d3591804ef50d800dc7ec4cb8b2192d805832cde3496c519bf4ff0f9eef62a76f1e77677df66a054ed1f1efe341f71b8f86b185b10145de8200bc2c70 SHA512 8d79b8c2eed3c962a4c8fda80934720a2ee1436d4e42d762d3f945972537491f415aa6b3615f7a81a727bbb239cd0277ecfb18c83a90ba57252674bf135b35f8
|
||||
DIST genpatches-6.3-3.base.tar.xz 9340 BLAKE2B e163214c2f648a410b6253caf1cd2fa60beff29341cfba23674cf41712e11893c1f9574a1bfc4df797e69900a3a3f18e65399f5be720c58ab32c5780a41891c4 SHA512 8d308cac9a26c32688588fc8aa34f6798f5c0334fa01f3b813922ab46f0d53cde6c94a5c71817f929c5fd4f96741380da1d97c6ba6a3a5091549651c32fc99c9
|
||||
DIST genpatches-6.3-3.extras.tar.xz 3804 BLAKE2B 53064668f5f323d3146f16e96a7864ec41048fcc632aad93ce2c5e2b81f496e9b3f50c7730adfb8d4032d69c7277002419bd17d2698c4a1c4fa97ff86bb56411 SHA512 b24a3dee17f10bb60674792522ac6c39ad891bfd46e0c710fef554eb7393446c0071cac74f46507f9ffb206c798bbf881c2690743c33cd40dedcb41ded592a88
|
||||
DIST gentoo-kernel-config-g7.tar.gz 4625 BLAKE2B 72ba0d038ee34ca5eb26d43bd373735aef3a50d02b414993ea05485e49d83d46df98a6cb0f6f3170a8ec0c99b557432fd9a11cbb92ff7c2837625a7f4469831e SHA512 2d74a8ca9f5402b4290ed93cd3ddba04a7f2ff42c8d8d3f2cbbe22fc20daa0fca119368daa8af39b7a26b1b99e4e3187c3c5d95886a651675ad94ff98d686628
|
||||
DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
|
||||
DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d SHA512 a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
|
||||
|
||||
78
sys-kernel/xanmod-kernel/xanmod-kernel-6.1.27-r1.ebuild
Normal file
78
sys-kernel/xanmod-kernel/xanmod-kernel-6.1.27-r1.ebuild
Normal file
@ -0,0 +1,78 @@
|
||||
# Copyright 2022-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit kernel-build
|
||||
|
||||
MY_P=linux-${PV%.*}
|
||||
GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
|
||||
GENTOO_CONFIG_VER=g7
|
||||
|
||||
DESCRIPTION="Linux kernel built with XanMod and Gentoo patches"
|
||||
HOMEPAGE="https://www.kernel.org/ https://xanmod.org/"
|
||||
SRC_URI="
|
||||
https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
|
||||
https://github.com/xanmod/linux/releases/download/${PV}-xanmod1/patch-${PV}-xanmod1.xz
|
||||
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
|
||||
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
|
||||
https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
|
||||
-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
|
||||
"
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="-* ~amd64"
|
||||
IUSE="debug"
|
||||
|
||||
RDEPEND="
|
||||
!sys-kernel/xanmod-kernel-bin:${SLOT}
|
||||
"
|
||||
BDEPEND="
|
||||
debug? ( dev-util/pahole )
|
||||
"
|
||||
PDEPEND="
|
||||
>=virtual/dist-kernel-${PV}
|
||||
"
|
||||
|
||||
QA_FLAGS_IGNORED="
|
||||
usr/src/linux-.*/scripts/gcc-plugins/.*.so
|
||||
usr/src/linux-.*/vmlinux
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
# Remove linux-stable patches (see 0000_README)
|
||||
find "${WORKDIR}" -maxdepth 1 -name "1[0-4][0-9][0-9]*.patch" -exec rm {} + || die
|
||||
|
||||
local PATCHES=(
|
||||
# meh, genpatches have no directory
|
||||
"${WORKDIR}"/patch-${PV}-xanmod1
|
||||
"${WORKDIR}"/*.patch
|
||||
)
|
||||
default
|
||||
|
||||
# prepare the default config
|
||||
case ${ARCH} in
|
||||
amd64)
|
||||
cp "${S}/CONFIGS/xanmod/gcc/config_x86-64-v1" .config || die
|
||||
;;
|
||||
*)
|
||||
die "Unsupported arch ${ARCH}"
|
||||
;;
|
||||
esac
|
||||
|
||||
rm "${S}/localversion" || die
|
||||
local myversion="-xanmod1-dist"
|
||||
echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
|
||||
local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
|
||||
|
||||
local merge_configs=(
|
||||
"${T}"/version.config
|
||||
"${dist_conf_path}"/base.config
|
||||
)
|
||||
use debug || merge_configs+=(
|
||||
"${dist_conf_path}"/no-debug.config
|
||||
)
|
||||
|
||||
kernel-build_merge_configs "${merge_configs[@]}"
|
||||
}
|
||||
78
sys-kernel/xanmod-kernel/xanmod-kernel-6.3.1-r1.ebuild
Normal file
78
sys-kernel/xanmod-kernel/xanmod-kernel-6.3.1-r1.ebuild
Normal file
@ -0,0 +1,78 @@
|
||||
# Copyright 2022-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit kernel-build
|
||||
|
||||
MY_P=linux-${PV%.*}
|
||||
GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
|
||||
GENTOO_CONFIG_VER=g7
|
||||
|
||||
DESCRIPTION="Linux kernel built with XanMod and Gentoo patches"
|
||||
HOMEPAGE="https://www.kernel.org/ https://xanmod.org/"
|
||||
SRC_URI="
|
||||
https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
|
||||
https://github.com/xanmod/linux/releases/download/${PV}-xanmod1/patch-${PV}-xanmod1.xz
|
||||
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
|
||||
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
|
||||
https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
|
||||
-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
|
||||
"
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="-* ~amd64"
|
||||
IUSE="debug"
|
||||
|
||||
RDEPEND="
|
||||
!sys-kernel/xanmod-kernel-bin:${SLOT}
|
||||
"
|
||||
BDEPEND="
|
||||
debug? ( dev-util/pahole )
|
||||
"
|
||||
PDEPEND="
|
||||
>=virtual/dist-kernel-${PV}
|
||||
"
|
||||
|
||||
QA_FLAGS_IGNORED="
|
||||
usr/src/linux-.*/scripts/gcc-plugins/.*.so
|
||||
usr/src/linux-.*/vmlinux
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
# Remove linux-stable patches (see 0000_README)
|
||||
find "${WORKDIR}" -maxdepth 1 -name "1[0-4][0-9][0-9]*.patch" -exec rm {} + || die
|
||||
|
||||
local PATCHES=(
|
||||
# meh, genpatches have no directory
|
||||
"${WORKDIR}"/patch-${PV}-xanmod1
|
||||
"${WORKDIR}"/*.patch
|
||||
)
|
||||
default
|
||||
|
||||
# prepare the default config
|
||||
case ${ARCH} in
|
||||
amd64)
|
||||
cp "${S}/CONFIGS/xanmod/gcc/config_x86-64-v1" .config || die
|
||||
;;
|
||||
*)
|
||||
die "Unsupported arch ${ARCH}"
|
||||
;;
|
||||
esac
|
||||
|
||||
rm "${S}/localversion" || die
|
||||
local myversion="-xanmod1-dist"
|
||||
echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
|
||||
local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
|
||||
|
||||
local merge_configs=(
|
||||
"${T}"/version.config
|
||||
"${dist_conf_path}"/base.config
|
||||
)
|
||||
use debug || merge_configs+=(
|
||||
"${dist_conf_path}"/no-debug.config
|
||||
)
|
||||
|
||||
kernel-build_merge_configs "${merge_configs[@]}"
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user