summaryrefslogtreecommitdiff
path: root/sys-apps/ethtool/files
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps/ethtool/files')
-rw-r--r--sys-apps/ethtool/files/ethtool-5.8-avoid_bashisms.patch29
-rw-r--r--sys-apps/ethtool/files/ethtool-5.8-only-memset-non-NULL-link-settings.patch20
2 files changed, 0 insertions, 49 deletions
diff --git a/sys-apps/ethtool/files/ethtool-5.8-avoid_bashisms.patch b/sys-apps/ethtool/files/ethtool-5.8-avoid_bashisms.patch
deleted file mode 100644
index 9cd9fd86fb70..000000000000
--- a/sys-apps/ethtool/files/ethtool-5.8-avoid_bashisms.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Running this script with dash results in an endless loop spitting out this:
-
- ./test-driver: 62: [: --test-name: unexpected operator
- ./test-driver: 78: [[: not found
-
-This is caused by two bashisms which are being fixed by the below patch
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
-
---- ethtool-5.8/test-driver
-+++ ethtool-5.8/test-driver
-@@ -59,7 +59,7 @@
- while test $# -gt 1; do
- arg=${1%=*}
- val=${1#*=}
-- if [ $arg == $val ]; then
-+ if [ $arg = $val ]; then
- val=$2
- shift
- fi
-@@ -75,7 +75,7 @@
- --) break;;
- -*) usage_error "invalid option: '$1'";;
- esac
-- [[ $arg != $val ]] && shift
-+ [ $arg != $val ] && shift
- done
-
- missing_opts=
diff --git a/sys-apps/ethtool/files/ethtool-5.8-only-memset-non-NULL-link-settings.patch b/sys-apps/ethtool/files/ethtool-5.8-only-memset-non-NULL-link-settings.patch
deleted file mode 100644
index 573ee645615b..000000000000
--- a/sys-apps/ethtool/files/ethtool-5.8-only-memset-non-NULL-link-settings.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.gentoo.org/740114
-https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/commit/?id=cf12872ebe7d8fac2088e7d2cd5e2a0a5f03499d
-
---- a/ethtool.c
-+++ b/ethtool.c
-@@ -3048,10 +3048,11 @@ static int do_sset(struct cmd_context *ctx)
- struct ethtool_link_usettings *link_usettings;
-
- link_usettings = do_ioctl_glinksettings(ctx);
-- memset(&link_usettings->deprecated, 0,
-- sizeof(link_usettings->deprecated));
- if (link_usettings == NULL)
- link_usettings = do_ioctl_gset(ctx);
-+ else
-+ memset(&link_usettings->deprecated, 0,
-+ sizeof(link_usettings->deprecated));
- if (link_usettings == NULL) {
- perror("Cannot get current device settings");
- err = -1;
-