commit: a84760409cc3b31a2fa15db5ba7d7bb03135d2d4 Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> AuthorDate: Tue Jun 10 16:27:27 2025 +0000 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> CommitDate: Tue Jun 10 16:28:47 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8476040
sys-kernel/genkernel: bump to 4.3.17 Adds new json-c-0.18 & includes backported fixes Bug: https://bugs.gentoo.org/957178 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> sys-kernel/genkernel/Manifest | 2 ++ ...nkernel-9999.ebuild => genkernel-4.3.17.ebuild} | 31 +++++++++++++--------- sys-kernel/genkernel/genkernel-9999.ebuild | 31 +++++++++++++--------- 3 files changed, 38 insertions(+), 26 deletions(-) diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest index d59f8b2104a6..c701cc0d9809 100644 --- a/sys-kernel/genkernel/Manifest +++ b/sys-kernel/genkernel/Manifest @@ -23,10 +23,12 @@ DIST genkernel-4.3.12.tar.xz 463308 BLAKE2B 81bcc841110db63940f6bdbaf15016a877ee DIST genkernel-4.3.14.tar.xz 469672 BLAKE2B 8ccc7b4b1ccda0771b4e701610e7be32980b6ee8348013ebc670a596a566463b848c4089b596ba1d0e7412abc0f854e05178b9a71227d947ad5a4baf2d3a65d6 SHA512 80cd67e62dc135baa6d3a947cdacef9261ce83003c94946708d924a5b0ee31f3bb5ccd54af48b7a8f4ca1cb525c5753e4aca56bc23844fb46a0a80d66a03acee DIST genkernel-4.3.15.tar.xz 470256 BLAKE2B 12ab3308e8ae8a4cf55d27c0b346ced820320a544e64ba4cb5ba49bb03f6a16dc0c3c0323aa0cc13cc1f296132be55059cb66e30df3d72d31eb22ee35d9d05f3 SHA512 ae7a9cb2e0b54f9878f6079f217754c395f2a15e2d19f74c4e53207bc60b1f3328ae563beaa7d67a6274f394f84802eb598b069a6833bd1f4f790a5bb646f30b DIST genkernel-4.3.16.tar.xz 470516 BLAKE2B 87e62f7c97268bd567e9e7bb34914abb6a518215b364fe9fd1aa01db4015ff6a47e5d53479239181176867f626dab3f5a1d2af3036e6af1b684ade87b01b0faa SHA512 87d6bd335e2610dadb56fc3f0775927fc642b200c9dfd7f7a823a544a17f25fbc007a7fc4b04fefadfd31d172bf58cebd8958ebec6deea91cdf101bbb7f8792d +DIST genkernel-4.3.17.tar.xz 472852 BLAKE2B 82b134eb4c122d1a332dd5908aa6698dde55d15c97f5e3831e4d06868180ab6a673c6d046831f223473cfd4780ac3f03b09483c6b6532676ac907f111442a107 SHA512 96a1e43662d77b7bfe795dd52381514f40ade93edca167c3d0e9bd72c2dc305bc5de22de823bf09a42ec7dd89344b624a34603da4fd8594a4e718047ee0fdb96 DIST gnupg-1.4.23.tar.bz2 3749353 BLAKE2B ec5e6bef0c7bb2a65813d7852cebeaa24c4855f9d9d9e802070da50b89fff56b747682933aa766dd130f849efcfe28f7aa74f3153405429bcf3845ef29c6dd6e SHA512 78dc52a2010202a4afc8814b29fda657a6c9fe230d5e7db11ae040edd2b0ca819e1baa4dbd6c0d04d36cd353df484e83f52d17759d2891c2cf7025c0b5d36612 DIST hwids-20210613.tar.gz 3867741 BLAKE2B 64c4b0a83058a2052f7b132241008a3cc75452e93a9a57a9159c357c23fd09ee256abc2b94e700b5d8e8bd4e231ae12932d2c2f32fb03853207739cb3387047d SHA512 4568f6b8c0ca80ec772bd2785d4dc169d1d13a721472a15399158d9a7f31abbe414c5c8cfdf1a3b81cce4e33742a4b6e005e97e3e907643d0afdc8e953624fea DIST json-c-0.13.1.tar.gz 639425 BLAKE2B 1da310309f9ce03306a9fd4a161670e460cf0b2222348df7c006902390f74a4cf100aab1ce6ac8a361a278dd917c114a278de5b3445817f3a40ae287478add46 SHA512 e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1 DIST json-c-0.17.tar.gz 390045 BLAKE2B 26be25141447f2b652fa09d7096141a8bf7992469bcc53b275c1bc0108fc36a8898a8185c381218d3146d00fa03bdd0b837be073410fc93af943b5f083dbaa69 SHA512 4cbedd559502bf9014cfcd1d0bb8bb80d2abac4e969d95d4170123cd9cbafb0756b913fdbb83f666d14f674d6539a60ed1c5d0eb03c36b8037a2e00dc1636e19 +DIST json-c-0.18.tar.gz 401788 BLAKE2B d39bab289976cb2f76bcf3ad8254f7f5b4d11e2aa4dedebd60dc7d131a3f6ec57beacdc575aeeb191cf449d16c549d424172e78464731eeb66305f47f72371c2 SHA512 4763f2352414dac3599bc2183b4fa57dbfaac0ca24de890097bd7d0bdda93c91efa280f6566e949e6d94212ef39a63fc76c5f9d0c54ff3d04b13c859717dba5a DIST keyutils-1.6.3.tar.gz 137022 BLAKE2B b5620b1b6109415fec1268963c2c65d774f3ef7a69eb1ce8d5d8e78b4b807e4fdfda861662a1b5556975ef867add8f985362a31b6608ac2dc198c8d0395d516b SHA512 f65965b8566037078b8eeffa66c6fdbe121c8c2bea7fa5bce04cf7ba5ccc50d5b48e51f4a67ca91e4d5d9a12469e7e3eb3036c920ab25e3feba6e93b4c149cf9 DIST kmod-30.tar.xz 567484 BLAKE2B c5cb690dbb8fad66ac603648ff330794b417ff2fa2f8f61b6e9cb76dab93f984128b3d83a826203f39f3fb94f174f0db7395db6a47e52e8b7c561486f9d00778 SHA512 e2cd34e600a72e44710760dfda9364b790b8352a99eafbd43e683e4a06f37e6b5c0b5d14e7c28070e30fc5fc6ceddedf7b97f3b6c2c5c2d91204fefd630b9a3e DIST kmod-31.tar.xz 570936 BLAKE2B 0dc8572da570315cf0aadd87fa7e83d0f88dea91c8566749e6f3004f9a6df916dce337ca99ea5929d41f45b408c1e3effa50f9d24615d7fa28688150a5ce91cf SHA512 05ca70381808bec5f262b94db625662c385408988178a35e4aaf4960ee0716dc0cbfc327160ea4b61098d0c2130ab1b5142ea8156bea8e06ded7f4d288b6d085 diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-4.3.17.ebuild similarity index 93% copy from sys-kernel/genkernel/genkernel-9999.ebuild copy to sys-kernel/genkernel/genkernel-4.3.17.ebuild index 8e46b9bd80eb..78af34b210c6 100644 --- a/sys-kernel/genkernel/genkernel-9999.ebuild +++ b/sys-kernel/genkernel/genkernel-4.3.17.ebuild @@ -6,9 +6,9 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) -inherit bash-completion-r1 eapi9-ver python-single-r1 +inherit bash-completion-r1 python-single-r1 # Whenever you bump a GKPKG, check if you have to move # or add new patches! @@ -30,8 +30,7 @@ VERSION_GPG="1.4.23" VERSION_HWIDS="20210613" # open-iscsi-2.1.9 static build not working yet VERSION_ISCSI="2.1.8" -# json-c-0.17 needs gkbuild ported to meson -VERSION_JSON_C="0.17" +VERSION_JSON_C="0.18" VERSION_KMOD="31" VERSION_LIBAIO="0.3.113" VERSION_LIBGCRYPT="1.10.3" @@ -62,7 +61,7 @@ COMMON_URI=" https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2 - https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz + https://github.com/eudev-project/eudev/releases/download/v${VERSION_EUDEV}/eudev-${VERSION_EUDEV}.tar.gz https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz @@ -217,15 +216,21 @@ pkg_postinst() { #elog 'https://wiki.gentoo.org/wiki/Genkernel' #echo - if ver_replacing -lt 4 ; then - # This is an upgrade which requires user review + local replacing_version + for replacing_version in ${REPLACING_VERSIONS} ; do + if ver_test "${replacing_version}" -lt 4 ; then + # This is an upgrade which requires user review - ewarn "" - ewarn "Genkernel v4.x is a new major release which touches" - ewarn "nearly everything. Be careful, read updated manpage" - ewarn "and pay special attention to program output regarding" - ewarn "changed kernel command-line parameters!" - fi + ewarn "" + ewarn "Genkernel v4.x is a new major release which touches" + ewarn "nearly everything. Be careful, read updated manpage" + ewarn "and pay special attention to program output regarding" + ewarn "changed kernel command-line parameters!" + + # Show this elog only once + break + fi + done if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then ewarn '' diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild index 8e46b9bd80eb..78af34b210c6 100644 --- a/sys-kernel/genkernel/genkernel-9999.ebuild +++ b/sys-kernel/genkernel/genkernel-9999.ebuild @@ -6,9 +6,9 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) -inherit bash-completion-r1 eapi9-ver python-single-r1 +inherit bash-completion-r1 python-single-r1 # Whenever you bump a GKPKG, check if you have to move # or add new patches! @@ -30,8 +30,7 @@ VERSION_GPG="1.4.23" VERSION_HWIDS="20210613" # open-iscsi-2.1.9 static build not working yet VERSION_ISCSI="2.1.8" -# json-c-0.17 needs gkbuild ported to meson -VERSION_JSON_C="0.17" +VERSION_JSON_C="0.18" VERSION_KMOD="31" VERSION_LIBAIO="0.3.113" VERSION_LIBGCRYPT="1.10.3" @@ -62,7 +61,7 @@ COMMON_URI=" https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2 - https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz + https://github.com/eudev-project/eudev/releases/download/v${VERSION_EUDEV}/eudev-${VERSION_EUDEV}.tar.gz https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz @@ -217,15 +216,21 @@ pkg_postinst() { #elog 'https://wiki.gentoo.org/wiki/Genkernel' #echo - if ver_replacing -lt 4 ; then - # This is an upgrade which requires user review + local replacing_version + for replacing_version in ${REPLACING_VERSIONS} ; do + if ver_test "${replacing_version}" -lt 4 ; then + # This is an upgrade which requires user review - ewarn "" - ewarn "Genkernel v4.x is a new major release which touches" - ewarn "nearly everything. Be careful, read updated manpage" - ewarn "and pay special attention to program output regarding" - ewarn "changed kernel command-line parameters!" - fi + ewarn "" + ewarn "Genkernel v4.x is a new major release which touches" + ewarn "nearly everything. Be careful, read updated manpage" + ewarn "and pay special attention to program output regarding" + ewarn "changed kernel command-line parameters!" + + # Show this elog only once + break + fi + done if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then ewarn ''
