gentoo resync : 28.07.2021

4 files changed, 0 insertions, 294 deletions

diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index a8d65bce06ae..478e671ef0fd 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -1,7 +1,4 @@
-AUX genkernel-4.1.2-post-release-fixes.patch 7326 BLAKE2B fef31b298c8e75dc74e3c883668185bd72578b5232b9dc19aecbc07488dec6ccc0e6d4fa9ba913dbe79945f6191baac3754c2a4074a06e3b5cd2b028cb011575 SHA512 f124cf7b30187b8b0444d1224d250712c00091ade7c357699667e4a3ce1b24f98431fa8ccf756081ffb5af1e649644400e922c057ff45a2f6d653af2860a6d44
-AUX genkernel-4.2.1-post-release-fixes.patch 1792 BLAKE2B 1291c8246c69a5541a07d2de49b7337423a030c99a8f284d9b8aeafdd3785ddb139662785f96aec259d5c071952e95c2464a50d4543e6cf7c95c2bedf97e426a SHA512 ad3abafaeb682216ed4528077c122fc384e86072b85900347c02141e5f5398d1260e82878fe0c427580bae4ec05e2dbee5d6d35b62d4c9694135b4fd9ff5e9ef
 AUX genkernel-4.bash 2479 BLAKE2B e5504698ab49bb62623fcdfdd4a54b19ee6d88f96a682f08dc282e46ec26bd22d9c54bcdc9b2bdcc6a96295de1ab96351d35b304eb176f5d177c221cd8d82180 SHA512 6a5709a410c5c07b7a343ecc141aa72de73d3b4acd0a69c05c61c801835a59dd17d9a528f6b68f12ac00ff4b6e5954b03237472501383aa390eb1365dd69c281
-AUX genkernel.bash 2438 BLAKE2B 31f1eaa826ab12bba07a2dc45b3394e14ceba9bc98b3f0ce609ca48a9306f2aec507787d457abdee18f4a83ea868de787cc6f9bd085298c396ecab6da14df9c3 SHA512 2bfe23606f919577bb2d174ffe18cd00fbb4ce642fb8860b319e059745d46ff8459b99374159f78af9f3aebb0a352a74ccd74c3be581980f5e298293b96e983d
 AUX initramfs.mounts 816 BLAKE2B 4f36e51fef78435369d43647db853c7bfde217cc93002fc010900692f67171512366e6599f08c5f2093490713aa7715e903b7e06528e3f2c6d8468f506938ed5 SHA512 97e5f92d135cff3911a68c7f1afd0f781ec1c1b794cdc824d74f8c119104ecb40bd7180be8414dc72f3a5a811143d6b4bf443ac1d3ff7a71b1e88cbf7c179665
 DIST LVM2.2.02.187.tgz 2405544 BLAKE2B be804be3c64927a8848e8ea8de228fb563b6f8c22628b785aabb33fc993629e5370788216bd814246aeb3a5546fd5446383ce24342e716579887556edf2bbed2 SHA512 3ce56f0c0d2e7dbcdae5be263199f73ee5c4c052599d53cde9b16500a326d0340893344f4671839be06b5b4225d592175d01c9974db14f2dc220d6e9a1d47e91
 DIST LVM2.2.02.188.tgz 2421550 BLAKE2B bed90c8454cd4b20fdeec6dcbf5a9f97c9310671aea3b2252f8069cfa439fcb050f5ad95f928a7125a1734a4dc5ac985da99a4a570538e377a7205191a505476 SHA512 8c9db17c49dc8ebcab6c7f246ab85870a80658be811cf7f4d8f36abbebafa355b030bfc1e3bcbad73ccccb7fcd06d4a95ac547ca15d18d33715126da92703dca
diff --git a/sys-kernel/genkernel/files/genkernel-4.1.2-post-release-fixes.patch b/sys-kernel/genkernel/files/genkernel-4.1.2-post-release-fixes.patch
deleted file mode 100644
index ec72ab098661..000000000000
--- a/sys-kernel/genkernel/files/genkernel-4.1.2-post-release-fixes.patch
+++ /dev/null
@@ -1,189 +0,0 @@
---- a/defaults/initrd.defaults
-+++ b/defaults/initrd.defaults
-@@ -101,9 +101,11 @@ GK_UDEV_TIMEOUT=120
- GK_USERINTERACTION_DISABLED_STATEFILE='/tmp/user-interaction.disabled'
- 
- CRYPT_ENV_FILE='/etc/CRYPT_ENV.conf'
--CRYPT_KEYFILE_ROOT='/tmp/root.key'
--CRYPT_KEYFILE_SWAP='/tmp/swap.key'
-+CRYPT_ROOT_KEYDEV_FSTYPE='auto'
-+CRYPT_ROOT_KEYFILE='/tmp/root.key'
- CRYPT_ROOT_OPENED_LOCKFILE='/tmp/ROOT.opened'
-+CRYPT_SWAP_KEYDEV_FSTYPE='auto'
-+CRYPT_SWAP_KEYFILE='/tmp/swap.key'
- CRYPT_SWAP_OPENED_LOCKFILE='/tmp/SWAP.opened'
- 
- ZFS_ENC_ENV_FILE='/etc/ZFS_ENC_ENV.conf'
---- a/defaults/initrd.scripts
-+++ b/defaults/initrd.scripts
-@@ -1780,7 +1780,7 @@ openLUKS() {
- 		exit 1
- 	fi
- 
--	case $1 in
-+	case ${1} in
- 		root)
- 			local TYPE=ROOT
- 			;;
-@@ -1789,8 +1789,12 @@ openLUKS() {
- 			;;
- 	esac
- 
--	eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"' LUKS_NAME="$1" LUKS_KEY='"${CRYPT_'${TYPE}'_KEY}"'
--	eval local LUKS_KEYDEV='"${CRYPT_'${TYPE}'_KEYDEV}"' LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"'
-+	local LUKS_NAME="${1}"
-+	eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"'
-+	eval local LUKS_KEY='"${CRYPT_'${TYPE}'_KEY}"'
-+	eval local LUKS_KEYDEV='"${CRYPT_'${TYPE}'_KEYDEV}"'
-+	eval local LUKS_KEYDEV_FSTYPE='"${CRYPT_'${TYPE}'_KEYDEV_FSTYPE}"'
-+	eval local LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"'
- 	eval local OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}"'
- 	local DEV_ERROR=0 KEY_ERROR=0 KEYDEV_ERROR=0
- 	local mntkey="/mnt/key/" crypt_filter_ret=
-@@ -1886,7 +1890,10 @@ openLUKS() {
- 						# At this point a device was recognized, now let's see if the key is there
- 						[ ! -d "${mntkey}" ] && mkdir -p "${mntkey}" >/dev/null 2>&1
- 
--						if ! run mount -n -o ro ${REAL_LUKS_KEYDEV} ${mntkey} >/dev/null 2>&1
-+						# determine fs -- 'auto' will not trigger module loading!
-+						LUKS_KEYDEV_FSTYPE=$(determine_fs "${REAL_LUKS_KEYDEV}" "${LUKS_KEYDEV_FSTYPE}")
-+
-+						if ! run mount -n -t ${LUKS_KEYDEV_FSTYPE} -o ro ${REAL_LUKS_KEYDEV} ${mntkey} >/dev/null 2>&1
- 						then
- 							KEYDEV_ERROR=1
- 							bad_msg "Mounting of device ${REAL_LUKS_KEYDEV} failed." ${CRYPT_SILENT}
---- a/defaults/linuxrc
-+++ b/defaults/linuxrc
-@@ -2,7 +2,7 @@
- 
- # shellcheck source=initrd.defaults
- . /etc/initrd.defaults
--# shellche2ck source=initrd.scripts
-+# shellcheck source=initrd.scripts
- . /etc/initrd.scripts
- 
- # shellcheck source=/dev/null
-@@ -257,6 +257,9 @@ do
- 		root_keydev=*)
- 			CRYPT_ROOT_KEYDEV=${x#*=}
- 		;;
-+		root_keydev_fstype=*)
-+			CRYPT_ROOT_KEYDEV_FSTYPE=${x#*=}
-+		;;
- 		root_trim=*)
- 			CRYPT_ROOT_TRIM=${x#*=}
- 		;;
-@@ -266,6 +269,9 @@ do
- 		swap_keydev=*)
- 			CRYPT_SWAP_KEYDEV=${x#*=}
- 		;;
-+		swap_keydev_fstype=*)
-+			CRYPT_SWAP_KEYDEV_FSTYPE=${x#*=}
-+		;;
- 		real_resume=*|resume=*)
- 			REAL_RESUME=${x#*=}
- 		;;
---- a/defaults/login-remote.sh
-+++ b/defaults/login-remote.sh
-@@ -24,10 +24,10 @@ fi
- receivefile() {
- 	case ${1} in
- 		root)
--			file=${CRYPT_KEYFILE_ROOT}
-+			file=${CRYPT_ROOT_KEYFILE}
- 			;;
- 		swap)
--			file=${CRYPT_KEYFILE_SWAP}
-+			file=${CRYPT_SWAP_KEYFILE}
- 			;;
- 		'')
- 			bad_msg "No keyfile specified." "${CRYPT_SILENT}"
---- a/defaults/unlock-luks.sh
-+++ b/defaults/unlock-luks.sh
-@@ -43,8 +43,11 @@ main() {
- 		exit 1
- 	fi
- 
--	eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"' LUKS_NAME="${NAME}" LUKS_KEY='"${CRYPT_KEYFILE_'${TYPE}'}"'
--	eval local LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"' OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}"'
-+	local LUKS_NAME="${NAME}"
-+	eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"'
-+	eval local LUKS_KEY='"${CRYPT_'${TYPE}'_KEYFILE}"'
-+	eval local LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"'
-+	eval local OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}"'
- 
- 	while true
- 	do
---- a/doc/genkernel.8.txt
-+++ b/doc/genkernel.8.txt
-@@ -646,6 +646,9 @@ recognized by the kernel itself.
-     root_key.   If unset while using root_key, it will automatically
-     look for the device in every boot.
- 
-+*root_keydev_fstype*=<...>::
-+    Used filesystem for *root_keydev*. See *rootfstype* for more details.
-+
- *root_trim*=(yes|no)::
-     Enables TRIM support for a LUKS-based root device.  Only useful
-     with SSD setups.  Have a look at 'https://en.wikipedia.org/wiki/TRIM'
-@@ -657,6 +660,9 @@ recognized by the kernel itself.
- *swap_keydev*=<...>::
-     Same as root_keydev for swap.
- 
-+*swap_keydev_fstype*=<...>::
-+    Used filesystem for *swap_keydev*. See *rootfstype* for more details.
-+
- *crypt_silent*::
-     Set this to silent all the output related to the cryptographic
-     software,  and in case your encrypted device isn't open with the
-@@ -790,7 +796,8 @@ when not set. This will allow remote user to provide answer through
- *rootfstype*=<...>::
-     Specify the file system type to mount the real root filesystem as.
-     This can be useful when support for ext2/ext3/ext4 are
--    in competition.  Default is "auto".
-+    in competition or used filesystem was not built into kernel.
-+    Default is "auto".
- 
- *docache*::
- *nocache*::
---- a/gen_determineargs.sh
-+++ b/gen_determineargs.sh
-@@ -415,7 +415,6 @@ determine_real_args() {
- 	set_config_with_override BOOL   GENZIMAGE                             CMD_GENZIMAGE                             "no"
- 	set_config_with_override BOOL   KEYMAP                                CMD_KEYMAP                                "yes"
- 	set_config_with_override BOOL   DOKEYMAPAUTO                          CMD_DOKEYMAPAUTO                          "no"
--	set_config_with_override STRING BUSYBOX_CONFIG                        CMD_BUSYBOX_CONFIG
- 	set_config_with_override STRING STRIP_TYPE                            CMD_STRIP_TYPE                            "modules"
- 	set_config_with_override BOOL   INSTALL                               CMD_INSTALL                               "yes"
- 	set_config_with_override BOOL   CLEANUP                               CMD_CLEANUP                               "yes"
---- a/gen_funcs.sh
-+++ b/gen_funcs.sh
-@@ -1853,7 +1853,7 @@ check_disk_space_requirements() {
- 			gen_die "--check-free-disk-space-bootdir value '${CHECK_FREE_DISK_SPACE_BOOTDIR}' is not a valid number!"
- 		fi
- 
--		available_free_disk_space=$(unset POSIXLY_CORRECT && df -BM "${BOOTDIR}" | awk '$3 ~ /[0-9]+/ { print $4 }')
-+		available_free_disk_space=$(unset POSIXLY_CORRECT && LC_ALL="C" df -BM "${BOOTDIR}" | awk '$3 ~ /[0-9]+/ { print $4 }')
- 		if [ -n "${available_free_disk_space}" ]
- 		then
- 			print_info 2 '' 1 0
-@@ -1890,7 +1890,7 @@ check_disk_space_requirements() {
- 			gen_die "--check-free-disk-space-kerneloutputdir value '${CHECK_FREE_DISK_SPACE_KERNELOUTPUTDIR}' is not a valid number!"
- 		fi
- 
--		available_free_disk_space=$(unset POSIXLY_CORRECT && df -BM "${KERNEL_OUTPUTDIR}" | awk '$3 ~ /[0-9]+/ { print $4 }')
-+		available_free_disk_space=$(unset POSIXLY_CORRECT && LC_ALL="C" df -BM "${KERNEL_OUTPUTDIR}" | awk '$3 ~ /[0-9]+/ { print $4 }')
- 		if [ -n "${available_free_disk_space}" ]
- 		then
- 			print_info 2 '' 1 0
---- a/genkernel.conf
-+++ b/genkernel.conf
-@@ -378,7 +378,7 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
- # Compress generated initramfs
- #COMPRESS_INITRD="yes"
- 
--# Types of compression: best, xz, lzma, bzip2, gzip, lzop, fastest
-+# Types of compression: best, xz, lzma, bzip2, gzip, lzop, lz4, zstd, fastest
- # "best" selects the best available compression method
- # "fastest" selects the fastest available compression method
- #COMPRESS_INITRD_TYPE="best"
diff --git a/sys-kernel/genkernel/files/genkernel-4.2.1-post-release-fixes.patch b/sys-kernel/genkernel/files/genkernel-4.2.1-post-release-fixes.patch
deleted file mode 100644
index f04dbc8c951b..000000000000
--- a/sys-kernel/genkernel/files/genkernel-4.2.1-post-release-fixes.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From cdaef312247a3ed18c9fdcea084058e5f25a7f3e Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Sat, 27 Mar 2021 17:07:21 +0100
-Subject: defaults/modules_load: Add support for Lenovo / Thinkpad devices
-
-Support for IBM/Lenovo devices that are not fully compliant with HID standard.
-
-Reported-by: Patrick Lauer <patrick@gentoo.org>
-Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
----
- defaults/modules_load | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/defaults/modules_load b/defaults/modules_load
-index 1cc1478..cee5f4d 100644
---- a/defaults/modules_load
-+++ b/defaults/modules_load
-@@ -24,7 +24,7 @@ MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
- # Hardware (Pluggable)
- MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
- MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide-cs firmware_class"
--MODULES_USB="ehci-pci ehci-hcd xhci-hcd xhci-pci xhci-plat xhci-plat-hcd uhci usb-ohci hid usb-storage uas uhci-hcd ohci-hcd usbhid hid-generic sl811-hcd hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey hid-gyration hid-logitech hid-logitech-dj hid-microsoft hid-monterey hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus"
-+MODULES_USB="ehci-pci ehci-hcd xhci-hcd xhci-pci xhci-plat xhci-plat-hcd uhci usb-ohci hid usb-storage uas uhci-hcd ohci-hcd usbhid hid-generic sl811-hcd hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey hid-gyration hid-lenovo hid-logitech hid-logitech-dj hid-microsoft hid-monterey hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus"
- 
- # Filesystems
- MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse virtiofs loop squashfs aufs overlay cramfs configfs fscrypto msdos"
--- 
-cgit v1.2.3
-
diff --git a/sys-kernel/genkernel/files/genkernel.bash b/sys-kernel/genkernel/files/genkernel.bash
deleted file mode 100644
index ed6b1c16604e..000000000000
--- a/sys-kernel/genkernel/files/genkernel.bash
+++ /dev/null
@@ -1,73 +0,0 @@
-# genkernel (8) completion
-# Copyright 2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Written by Aron Griffis <agriffis@gentoo.org>
-
-_genkernel()
-{
-    declare cur prev genkernel_help actions params
-    COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
-    prev=${COMP_WORDS[COMP_CWORD-1]}
-
-    # extract initial list of params/actions from genkernel --help
-    genkernel_help=$(command genkernel --help)
-    actions=( $(<<<"$genkernel_help" sed -n \
-	'/^Available Actions:/,/^$/s/^[[:space:]]\+\([^[:space:]]\+\).*/\1/p') )
-    params=( $(<<<"$genkernel_help" egrep -oe '--[^[:space:]]{2,}') )
-
-    # attempt to complete the current parameter based on the list
-    COMPREPLY=($(compgen -W "${params[*]/=*/=} ${actions[*]}" -- "$cur"))
-
-    # if we don't have a rhs to complete
-    if [[ ${#COMPREPLY[@]} -gt 1 ]]; then
-	return
-    elif [[ ${#COMPREPLY[@]} -eq 0 && $cur != --*=* ]]; then
-	return
-    elif [[ ${#COMPREPLY[@]} -eq 1 && $COMPREPLY != --*= ]]; then
-	# using nospace completion, add an explicit space
-	COMPREPLY="${COMPREPLY} "
-	return
-    fi
-
-    # we have a unique lhs and need to complete the rhs
-    declare args lhs rhs
-    if [[ ${#COMPREPLY[@]} -eq 1 ]]; then
-	lhs=$COMPREPLY
-    else
-	lhs=${cur%%=*}=
-	rhs=${cur#*=}
-    fi
-
-    # genkernel's help gives clues as to what belongs on the rhs.
-    # extract the clue for the current parameter
-    args=" ${params[*]} "
-    args="${args##* $lhs}"
-    args="${args%% *}"
-
-    # generate a list of completions for the argument; this replaces args with
-    # an array of results
-    args=( $(case $args in
-	('<0-5>') compgen -W "$(echo {1..5})" -- "$rhs" ;;
-	('<outfile>'|'<file>') compgen -A file -o plusdirs -- "$rhs" ;;
-	('<dir>') compgen -A directory -S / -- "$rhs" ;;
-	('<tbz2>') compgen -G '*.tbz2' -G '*.tar.bz2' -o plusdirs -- "$rhs" ;;
-	(*) compgen -o bashdefault -- "$rhs" ;; # punt
-    esac) )
-
-    # we're using nospace completion to prevent spaces after paths that aren't
-    # "done" yet.  So do some hacking to the args to add spaces after
-    # non-directories.
-    declare slash=/
-    args=( "${args[@]/%/ }" )			# add space to all
-    args=( "${args[@]/%$slash /$slash}" )	# remove space from dirs
-
-    # recreate COMPREPLY
-    if [[ $cur == "$lhs"* ]]; then
-	COMPREPLY=( "${args[@]}" )
-    elif [[ ${#args[@]} -gt 0 ]]; then
-	COMPREPLY=( "${args[@]/#/$lhs}" )
-    fi
-}
-
-complete -o nospace -F _genkernel genkernel