gentoo auto-resync : 26:12:2022 - 14:07:48

3 files changed, 0 insertions, 170 deletions

diff --git a/sys-apps/nvme-cli/files/nvme-cli-1.16-bash-completions.patch b/sys-apps/nvme-cli/files/nvme-cli-1.16-bash-completions.patch
deleted file mode 100644
index 27a80eda9955..000000000000
--- a/sys-apps/nvme-cli/files/nvme-cli-1.16-bash-completions.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-This fixes several issues:
-* the upstream rebase error (unclosed double quote)
-* typo "lugin_seagate_opts"
-* "readonly" with assignment is problematic on Bash 5.1.x
-
-Gentoo bug: https://bugs.gentoo.org/852764
-Upstream: https://github.com/linux-nvme/nvme-cli/pull/1574
-Upstream: https://github.com/linux-nvme/nvme-cli/commit/25fd8c707b106ca0763402566ad657ef710bf09e
-
-Author: Karlson2k (Evgeny Grin)
-Signed-off-by: Karlson2k (Evgeny Grin) <k2k@narod.ru>
-
-diff --git a/completions/bash-nvme-completion.sh b/completions/bash-nvme-completion.sh
-index 41938d77..31afb3b3 100644
---- a/completions/bash-nvme-completion.sh
-+++ b/completions/bash-nvme-completion.sh
-@@ -3,12 +3,13 @@
- # Kelly Kaoudis kelly.n.kaoudis at intel.com, Aug. 2015
- 
- # Constant to indicate command has no options
--readonly NO_OPTS=""
-+NO_OPTS=""
-+readonly NO_OPTS
- 
- # Associative array of plugins and associated subcommands
- # Order here is same as PLUGIN_OBJS in Makefile
- typeset -A _plugin_subcmds
--readonly _plugin_subcmds=(
-+_plugin_subcmds=(
- 	[intel]="id-ctrl internal-log lat-stats \
- 		set-bucket-thresholds lat-stats-tracking \
- 		market-name smart-log-add temp-stats"
-@@ -55,10 +56,11 @@ readonly _plugin_subcmds=(
- 	[nvidia]="id-ctrl"
- 	[ymtc]="smart-log-add"
- )
-+readonly _plugin_subcmds
- 
- # Associative array mapping plugins to coresponding option completions
- typeset -A _plugin_funcs
--readonly _plugin_funcs=(
-+_plugin_funcs=(
- 	[intel]="plugin_intel_opts"
- 	[amzn]="plugin_amzn_opts"
- 	[lnvm]="plugin_lnvm_opts"
-@@ -77,6 +79,7 @@ readonly _plugin_funcs=(
- 	[nvidia]="plugin_nvidia_opts"
- 	[ymtc]="plugin_ymtc_opts"
- )
-+readonly _plugin_funcs
- 
- # Top level commands
- _cmds="list list-subsys id-ctrl id-ns \
-@@ -101,8 +104,7 @@ _cmds="list list-subsys id-ctrl id-ns \
- 	connect disconnect disconnect-all gen-hostnqn \
- 	show-hostnqn dir-receive dir-send virt-mgmt \
- 	rpmb boot-part-log fid-support-effects-log \
--	supported-log-pages lockdown"
--	supported-log-pages list-endgrp"
-+	supported-log-pages lockdown list-endgrp"
- 
- # Add plugins:
- for plugin in "${!_plugin_subcmds[@]}"; do
-@@ -983,7 +985,7 @@ plugin_micron_opts () {
- 	return 0
- }
- 
--lugin_seagate_opts () {
-+plugin_seagate_opts () {
-     local opts=""
- 	local compargs=""
- 
diff --git a/sys-apps/nvme-cli/files/nvme-cli-1.16-musl-limits.patch b/sys-apps/nvme-cli/files/nvme-cli-1.16-musl-limits.patch
deleted file mode 100644
index 27c9667c827c..000000000000
--- a/sys-apps/nvme-cli/files/nvme-cli-1.16-musl-limits.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://github.com/linux-nvme/nvme-cli/commit/4729b13f36d4713ce1162dc1d4425d44e1474078.patch
-https://bugs.gentoo.org/829705
-(and an additional hunk for https://bugs.gentoo.org/830744)
-
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Mon, 26 Apr 2021 00:41:20 -0600
-Subject: [PATCH] nvme-rpmb: Add limits.h due to missing PATH_MAX definition
-
-Commit 21f40f38b introduced new use of PATH_MAX, but did not add the
-limits.h header.  This resulted in nvme-cli failing to build on
-ppc64le systems using the musl C library.
-
-Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
-[dwagner: removed nvme-topology.c bits]
-Signed-off-by: Daniel Wagner <dwagner@suse.de>
---- a/nvme-rpmb.c
-+++ b/nvme-rpmb.c
-@@ -25,6 +25,7 @@
- #include <sys/socket.h>
- #include <linux/if_alg.h>
- #include <linux/socket.h>
-+#include <limits.h>
- 
- #include "nvme.h"
- #include "libnvme.h"
-diff --git a/nvme-topology.c b/nvme-topology.c
-index 0a22f6b..6d510f2 100644
---- a/nvme-topology.c
-+++ b/nvme-topology.c
-@@ -1,6 +1,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <errno.h>
-+#include <limits.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/stat.h>
diff --git a/sys-apps/nvme-cli/files/nvme-cli-2.0-bash-completions.patch b/sys-apps/nvme-cli/files/nvme-cli-2.0-bash-completions.patch
deleted file mode 100644
index 3ddad04a5518..000000000000
--- a/sys-apps/nvme-cli/files/nvme-cli-2.0-bash-completions.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-This fixes several issues:
-* typo "lugin_seagate_opts"
-* "readonly" with assignment resulting in error on Bash 5.x
-
-Gentoo bug: https://bugs.gentoo.org/852764
-Upstream: https://github.com/linux-nvme/nvme-cli/pull/1574
-Upstream: https://github.com/linux-nvme/nvme-cli/commit/25fd8c707b106ca0763402566ad657ef710bf09e
-
-Author: Karlson2k (Evgeny Grin)
-Signed-off-by: Karlson2k (Evgeny Grin) <k2k@narod.ru>
-
-diff --git a/completions/bash-nvme-completion.sh b/completions/bash-nvme-completion.sh
-index 5e0eb23b..469ba3e2 100644
---- a/completions/bash-nvme-completion.sh
-+++ b/completions/bash-nvme-completion.sh
-@@ -3,12 +3,13 @@
- # Kelly Kaoudis kelly.n.kaoudis at intel.com, Aug. 2015
- 
- # Constant to indicate command has no options
--readonly NO_OPTS=""
-+NO_OPTS=""
-+readonly NO_OPTS
- 
- # Associative array of plugins and associated subcommands
- # Order here is same as PLUGIN_OBJS in Makefile
- typeset -A _plugin_subcmds
--readonly _plugin_subcmds=(
-+_plugin_subcmds=(
- 	[intel]="id-ctrl internal-log lat-stats \
- 		set-bucket-thresholds lat-stats-tracking \
- 		market-name smart-log-add temp-stats"
-@@ -53,10 +54,11 @@ readonly _plugin_subcmds=(
- 	[nvidia]="id-ctrl"
- 	[ymtc]="smart-log-add"
- )
-+readonly _plugin_subcmds
- 
- # Associative array mapping plugins to coresponding option completions
- typeset -A _plugin_funcs
--readonly _plugin_funcs=(
-+_plugin_funcs=(
- 	[intel]="plugin_intel_opts"
- 	[amzn]="plugin_amzn_opts"
- 	[memblaze]="plugin_memblaze_opts"
-@@ -74,6 +76,7 @@ readonly _plugin_funcs=(
- 	[nvidia]="plugin_nvidia_opts"
- 	[ymtc]="plugin_ymtc_opts"
- )
-+readonly _plugin_funcs
- 
- # Top level commands
- _cmds="list list-subsys id-ctrl id-ns \
-@@ -939,7 +942,7 @@ plugin_micron_opts () {
- 	return 0
- }
- 
--lugin_seagate_opts () {
-+plugin_seagate_opts () {
-     local opts=""
- 	local compargs=""
-