From 443cfbefc0bbd1e252d323db7597b33ace434817 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Mar 2024 01:07:00 +0000 Subject: gentoo auto-resync : 08:03:2024 - 01:06:59 --- sys-apps/Manifest.gz | Bin 50835 -> 50838 bytes sys-apps/keyutils/Manifest | 3 +- sys-apps/keyutils/files/keyutils-1.6.3-tests.patch | 76 +++++++++++ sys-apps/keyutils/keyutils-1.6.3-r1.ebuild | 1 + sys-apps/kmod/Manifest | 4 +- sys-apps/kmod/kmod-32-r1.ebuild | 145 +++++++++++++++++++++ sys-apps/kmod/kmod-9999.ebuild | 19 +-- 7 files changed, 232 insertions(+), 16 deletions(-) create mode 100644 sys-apps/keyutils/files/keyutils-1.6.3-tests.patch create mode 100644 sys-apps/kmod/kmod-32-r1.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 3323175fdbb0..bf6bb56b65cd 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest index ae302d4a6846..4fa5ebecfead 100644 --- a/sys-apps/keyutils/Manifest +++ b/sys-apps/keyutils/Manifest @@ -2,6 +2,7 @@ AUX keyutils-1.5.10-disable-tests.patch 1214 BLAKE2B ac79e98a45b02575433e3604a04 AUX keyutils-1.5.9-header-extern-c.patch 1154 BLAKE2B df4ecd72145c8634b2ea043e45e05ca95374234a0aa2babf0eaabfd429997c96099f6698d33104ad45cb9e90a83316a2db93b0f73b9138be7618591bc1b1e235 SHA512 f6e91c6eb9785ff8e661fc80ab275a3a35d87cfc73ab9cc45195734aaa5126e5ddc219dce8a78834869b67448a730265f2b72390f0b517dedf6c729bf22d828e AUX keyutils-1.6-makefile-fixup.patch 756 BLAKE2B 8e4e187859933ca4359adff5307bba833cae1a5e4b7c6975fc88e6848ba76ee30e0c59a42ee2110b9874da5db8e60880265f93798abe55f6a12e71346a6b01de SHA512 4becdbc7b1a68b3e6e8e32b2d08005e435f838d02a3406757216717ec82712f181ff0a32397c995b36264469e29cf39fe9311a762e62427f4507f94418c9400b AUX keyutils-1.6.3-fix-rpmspec-check.patch 1400 BLAKE2B 135c2f9caf216ea57997ea48b6fe0a2546a6f087f39261bb28521c570455d0dd6ce54cd74f007b3cb1611e5ab7e6330513823adba5006151d8fb99d7ac14774c SHA512 8bf8ff09af6f1e763ecfcaff842a9edfbcecaba3e4187805db2ce11d46c789e58133464fb73297934f078a49c2420a010541a6e9c860f3918dc46e1d909bd7d7 +AUX keyutils-1.6.3-tests.patch 2335 BLAKE2B cedda01c2cc02dd6ae20c4300fce71ecc505a4db2543ddfafd1e525651998b13a3d8d781eea54c89a68b16478de875249f77c71c1fedf090f4226c94838f6a86 SHA512 cf0ce9f56e45a9d9aa72b2d0d28b93f59dacae7f69eaf24d9c40121ff44dacceaec9a5d0bf01fcc836c58aa954dfd2cabc8d1402e7393a8139f77869880379b0 DIST keyutils-1.6.3.tar.gz 137022 BLAKE2B b5620b1b6109415fec1268963c2c65d774f3ef7a69eb1ce8d5d8e78b4b807e4fdfda861662a1b5556975ef867add8f985362a31b6608ac2dc198c8d0395d516b SHA512 f65965b8566037078b8eeffa66c6fdbe121c8c2bea7fa5bce04cf7ba5ccc50d5b48e51f4a67ca91e4d5d9a12469e7e3eb3036c920ab25e3feba6e93b4c149cf9 -EBUILD keyutils-1.6.3-r1.ebuild 3548 BLAKE2B b94b376d01649312b1e82d6de39de03f5cdfcf216952a7f6563f1482527f72710e93b934c8ae1d5f492388406b3e340eb7748b7caf6a912e8ebd7b6997a8ae23 SHA512 13d1c9f79ca06983505989526040aae5bb222eafd91e23aba1871d173b0a3e916f624d66e6dee6d7a16675634095a9a84e6ebff40497e8f4c417b2391cf9363a +EBUILD keyutils-1.6.3-r1.ebuild 3580 BLAKE2B 3167910b21fb3dbefc7707bffb512feeb6d823c5c3c330318f04f59be0b56dc5a007b07b0758feee17f991920216b03d34812d3da4a3c73dcf616277463217b2 SHA512 3140119c875adb25d766f975b78b1ef87d3ab3fac8dbaeb95ad00e40f92ce7c9ebd8d37db6f55710320859b13256fac5762dc20b4048daec017c0c432cfeba92 MISC metadata.xml 519 BLAKE2B c0bf6f0d10e2ba0230b8789bb20cd186ac7e01b44038eb01b3461e6bc663ddbb74af569d84477aa058e34e72a65aa12da59f922e83fa019f41ef54ca0137ff88 SHA512 e8b988a0a7b200d5d07822ca136d2532a4dd13c12f019aae27ae1958d93b75fa8f2bf5f05a2f492bb39274eea992e219a1bf0a1c821637859d4da19a50f632fc diff --git a/sys-apps/keyutils/files/keyutils-1.6.3-tests.patch b/sys-apps/keyutils/files/keyutils-1.6.3-tests.patch new file mode 100644 index 000000000000..d9414e800a6c --- /dev/null +++ b/sys-apps/keyutils/files/keyutils-1.6.3-tests.patch @@ -0,0 +1,76 @@ +https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/commit/?id=c076dff259e99d84d3822b4d2ad7f3f66532f411 + +From c076dff259e99d84d3822b4d2ad7f3f66532f411 Mon Sep 17 00:00:00 2001 +From: Pavel Reichl +Date: Tue, 20 Dec 2022 14:13:29 +0100 +Subject: test: Fix test expectation based on kernel config + +Some test results are dependent on the kernel configuration option +CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE. + +Check the kernel configuration file for its presence and expect appropriate +test results. + +Function has_kernel_config is based on its xfstsests counterpart. + +Signed-off-by: Pavel Reichl +Signed-off-by: David Howells +--- a/tests/features/builtin_trusted/runtest.sh ++++ b/tests/features/builtin_trusted/runtest.sh +@@ -33,7 +33,11 @@ expect_error EACCES + create_key --fail user a a $stk + expect_error EOPNOTSUPP + create_key --fail user a a $blk +-expect_error EACCES ++if has_kernel_config "CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE"; then ++ expect_error EOPNOTSUPP ++else ++ expect_error EACCES ++fi + + # Try adding a key to the keyrings + marker "TRY ADDING ASYMMETRIC KEYS" +@@ -89,7 +93,11 @@ expect_error EACCES + create_key --fail -x asymmetric "" "$x509" $stk + expect_error ENOKEY + create_key --fail -x asymmetric "" "$x509" $blk +-expect_error EACCES ++if has_kernel_config "CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE"; then ++ expect_error EOPNOTSUPP ++else ++ expect_error EACCES ++fi + + echo "++++ FINISHED TEST: $result" >>$OUTPUTFILE + +--- a/tests/prepare.inc.sh ++++ b/tests/prepare.inc.sh +@@ -4,6 +4,26 @@ + includes=${BASH_SOURCE[0]} + includes=${includes%/*}/ + ++# Check if currently running kernel has option set ++function has_kernel_config() ++{ ++ local option=$1 ++ local uname=$(uname -r) ++ local config_list="$KCONFIG_PATH ++ /lib/modules/$uname/build/.config ++ /boot/config-$uname ++ /lib/kernel/config-$uname" ++ ++ for config in $config_list; do ++ [ ! -f $config ] && continue ++ grep -qE "^${option}=[my]" $config ++ return ++ done ++ ++ echo "Failed to find kernel configuration file" ++ return false ++} ++ + # --- need to run in own session keyring + watch_fd=0 + if [ "$1" != "--inside-test-session" ] +-- +cgit 1.2.3-korg diff --git a/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild b/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild index b0f539de7b97..c8d82212103a 100644 --- a/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild +++ b/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild @@ -23,6 +23,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.5.10-disable-tests.patch #519062 #522050 "${FILESDIR}"/${PN}-1.5.9-header-extern-c.patch "${FILESDIR}"/${PN}-1.6.3-fix-rpmspec-check.patch + "${FILESDIR}"/${P}-tests.patch ) pkg_setup() { diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest index e93636b2f929..4fdf1384d19c 100644 --- a/sys-apps/kmod/Manifest +++ b/sys-apps/kmod/Manifest @@ -1,7 +1,9 @@ AUX kmod-31-musl-basename.patch 3352 BLAKE2B 3fc8fa107d22de1806b40ea2c52110952813877cb98798f15a76aafb900b3cf7382d5ca7d5c6acc0ca540099cc1eaf575d61a3ec0aa71a4a46d0dab61b1f963f SHA512 4349ac247039aed1015a14e6eda5ac479edaff97804d251adf2f48ff492706c0bc55a5258b1e37c38f6fefe9069589693ad66b99bf21eeec18c87ec296f8bd72 AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63 DIST kmod-31.tar.xz 570936 BLAKE2B 0dc8572da570315cf0aadd87fa7e83d0f88dea91c8566749e6f3004f9a6df916dce337ca99ea5929d41f45b408c1e3effa50f9d24615d7fa28688150a5ce91cf SHA512 05ca70381808bec5f262b94db625662c385408988178a35e4aaf4960ee0716dc0cbfc327160ea4b61098d0c2130ab1b5142ea8156bea8e06ded7f4d288b6d085 +DIST kmod-32.tar.xz 511988 BLAKE2B 5b5dac4639406549b23bb1da44bedd86a42885304ef4c7c67344dc8fd70b9e0ca3f83d033c6b80f6e00371d7188e205f4b68fadc56a9ddbf9d6a9d28e9b1e9a4 SHA512 29162135aabd025dff178a4147a754b5da5964855dbeee65ca867dec3b84437f35c1c97f0f027e974a021d3ee9a4940309a716859cc3cfe93c7ed0aada338f24 EBUILD kmod-31-r1.ebuild 4060 BLAKE2B 51002c2d019b425de450833fd11776d68d35e8536ca8c52b3d431393f5eb089492c6ba16726eaf6de07ab8377427daba841028b8e44abcdb8890db4e3a896296 SHA512 3dbf1d3320920204e740fece6e05ffa37025bd16ce51eb44b738f0497144786f4c8c4f8a68c55a7fed849f7186c16e782652a8d93c07c843b4e67a61beb8e884 EBUILD kmod-31.ebuild 5880 BLAKE2B 636d01e1c32f4f22e64c868e56d49c238bd6beed835ed5d1b3aef655162ac5741adba02b03e5ed6d89e7303465a7727cf4dcfaed0f87b78318f2142edbb6d1c1 SHA512 eed9173f25d7a9436652a0f0661308ac68a85ef6fdfb88949264189bc836401b6394f62f5bcefadb1564f350a2e011873a3c73d8eadde3a0fc5686d017f0b12e -EBUILD kmod-9999.ebuild 4060 BLAKE2B 51002c2d019b425de450833fd11776d68d35e8536ca8c52b3d431393f5eb089492c6ba16726eaf6de07ab8377427daba841028b8e44abcdb8890db4e3a896296 SHA512 3dbf1d3320920204e740fece6e05ffa37025bd16ce51eb44b738f0497144786f4c8c4f8a68c55a7fed849f7186c16e782652a8d93c07c843b4e67a61beb8e884 +EBUILD kmod-32-r1.ebuild 3933 BLAKE2B 9a80b9fd4b0a197965d57ff600af8b3b01fcf531e9e8887fb1900dcae5ff295ca13aa6e148d6742a8f2098914e82f3e6932a3c21b3081402cb61e91e33ff3f2e SHA512 15b1baf7b6f40eff083fb8e96172a2b586941083737062c0110ac10f2a110e98668afe3ce82e26ee086e261cdee0fda22c70b5f9bd732a50a3f9f436a1f6c6bd +EBUILD kmod-9999.ebuild 3933 BLAKE2B 9a80b9fd4b0a197965d57ff600af8b3b01fcf531e9e8887fb1900dcae5ff295ca13aa6e148d6742a8f2098914e82f3e6932a3c21b3081402cb61e91e33ff3f2e SHA512 15b1baf7b6f40eff083fb8e96172a2b586941083737062c0110ac10f2a110e98668afe3ce82e26ee086e261cdee0fda22c70b5f9bd732a50a3f9f436a1f6c6bd MISC metadata.xml 681 BLAKE2B d99a380ff37258528d263ede7c4752ffbb9abfb458674e884504a3618d574cffd0cad0da260e9bca208c5bdce1878ce7b3bf26e48fe883e812c5221c6ae38a53 SHA512 032d9a89779ae60a3e34f4d5cdb6b89c6f07bec68dc23b063e1b06f57825cb071ea89322f3bd9408b2503dab423fef3bac42ab5c8a9ae899849f51e38e0ecef3 diff --git a/sys-apps/kmod/kmod-32-r1.ebuild b/sys-apps/kmod/kmod-32-r1.ebuild new file mode 100644 index 000000000000..341d36a4f5e2 --- /dev/null +++ b/sys-apps/kmod/kmod-32-r1.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools libtool bash-completion-r1 + +DESCRIPTION="Library and tools for managing linux kernel modules" +HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git" + +if [[ ${PV} == 9999* ]]; then + EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" + inherit git-r3 +else + SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +LICENSE="LGPL-2" +SLOT="0" +IUSE="debug doc +lzma pkcs7 split-usr static-libs +tools +zlib +zstd" + +# Upstream does not support running the test suite with custom configure flags. +# I was also told that the test suite is intended for kmod developers. +# So we have to restrict it. +# See bug #408915. +#RESTRICT="test" + +# - >=zlib-1.2.6 required because of bug #427130 +# - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch +# - >=zstd-1.5.2-r1 required for bug #771078 +RDEPEND=" + !sys-apps/module-init-tools + !sys-apps/modutils + !=app-arch/xz-utils-5.0.4-r1 ) + pkcs7? ( >=dev-libs/openssl-1.1.0:= ) + zlib? ( >=sys-libs/zlib-1.2.6 ) + zstd? ( >=app-arch/zstd-1.5.2-r1:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( + dev-util/gtk-doc + dev-build/gtk-doc-am + ) + lzma? ( virtual/pkgconfig ) + zlib? ( virtual/pkgconfig ) +" +if [[ ${PV} == 9999* ]]; then + BDEPEND+=" dev-libs/libxslt" +fi + +PATCHES=( + "${FILESDIR}"/${PN}-31-musl-basename.patch +) + +src_prepare() { + default + + if [[ ! -e configure ]] || use doc ; then + if use doc; then + cp "${BROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die + gtkdocize --copy --docdir libkmod/docs || die + else + touch libkmod/docs/gtk-doc.make + fi + eautoreconf + else + elibtoolize + fi + + # Restore possibility of running --enable-static, bug #472608 + sed -i \ + -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \ + configure || die +} + +src_configure() { + local myeconfargs=( + --enable-shared + --with-bashcompletiondir="$(get_bashcompdir)" + $(use_enable debug) + $(usev doc '--enable-gtk-doc') + $(use_enable static-libs static) + $(use_enable tools) + $(use_with lzma xz) + $(use_with pkcs7 openssl) + $(use_with zlib) + $(use_with zstd) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + find "${ED}" -type f -name "*.la" -delete || die + + if use tools && use split-usr; then + # Move modprobe to /sbin to match CONFIG_MODPROBE_PATH from kernel + rm "${ED}/usr/bin/modprobe" || die + dosym ../usr/bin/kmod /sbin/modprobe + fi + + cat <<-EOF > "${T}"/usb-load-ehci-first.conf + softdep uhci_hcd pre: ehci_hcd + softdep ohci_hcd pre: ehci_hcd + EOF + + insinto /lib/modprobe.d + # bug #260139 + doins "${T}"/usb-load-ehci-first.conf + + newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes +} + +pkg_postinst() { + if [[ -L ${EROOT}/etc/runlevels/boot/static-nodes ]]; then + ewarn "Removing old conflicting static-nodes init script from the boot runlevel" + rm -f "${EROOT}"/etc/runlevels/boot/static-nodes + fi + + # Add kmod to the runlevel automatically if this is the first install of this package. + if [[ -z ${REPLACING_VERSIONS} ]]; then + if [[ ! -d ${EROOT}/etc/runlevels/sysinit ]]; then + mkdir -p "${EROOT}"/etc/runlevels/sysinit + fi + if [[ -x ${EROOT}/etc/init.d/kmod-static-nodes ]]; then + ln -s /etc/init.d/kmod-static-nodes "${EROOT}"/etc/runlevels/sysinit/kmod-static-nodes + fi + fi + + if [[ -e ${EROOT}/etc/runlevels/sysinit ]]; then + if ! has_version sys-apps/systemd && [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then + ewarn + ewarn "You need to add kmod-static-nodes to the sysinit runlevel for" + ewarn "kernel modules to have required static nodes!" + ewarn "Run this command:" + ewarn "\trc-update add kmod-static-nodes sysinit" + fi + fi +} diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild index d0de1d663e3e..341d36a4f5e2 100644 --- a/sys-apps/kmod/kmod-9999.ebuild +++ b/sys-apps/kmod/kmod-9999.ebuild @@ -18,7 +18,7 @@ fi LICENSE="LGPL-2" SLOT="0" -IUSE="debug doc +lzma pkcs7 static-libs +tools +zlib +zstd" +IUSE="debug doc +lzma pkcs7 split-usr static-libs +tools +zlib +zstd" # Upstream does not support running the test suite with custom configure flags. # I was also told that the test suite is intended for kmod developers. @@ -79,11 +79,8 @@ src_prepare() { src_configure() { local myeconfargs=( - --bindir="${EPREFIX}/bin" --enable-shared --with-bashcompletiondir="$(get_bashcompdir)" - --with-rootlibdir="${EPREFIX}/$(get_libdir)" - --disable-python $(use_enable debug) $(usev doc '--enable-gtk-doc') $(use_enable static-libs static) @@ -102,16 +99,10 @@ src_install() { find "${ED}" -type f -name "*.la" -delete || die - if use tools; then - local cmd - for cmd in depmod insmod modprobe rmmod; do - dosym ../bin/kmod /sbin/${cmd} - done - - # These are also usable as normal user - for cmd in lsmod modinfo; do - dosym kmod /bin/${cmd} - done + if use tools && use split-usr; then + # Move modprobe to /sbin to match CONFIG_MODPROBE_PATH from kernel + rm "${ED}/usr/bin/modprobe" || die + dosym ../usr/bin/kmod /sbin/modprobe fi cat <<-EOF > "${T}"/usb-load-ehci-first.conf -- cgit v1.2.3