From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1300645-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5529D139345 for <garchives@archives.gentoo.org>; Fri, 9 Jul 2021 08:08:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ADF80E0AA0; Fri, 9 Jul 2021 08:08:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8678AE0AA0 for <gentoo-commits@lists.gentoo.org>; Fri, 9 Jul 2021 08:08:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1CCE7342B69 for <gentoo-commits@lists.gentoo.org>; Fri, 9 Jul 2021 08:08:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A59263F for <gentoo-commits@lists.gentoo.org>; Fri, 9 Jul 2021 08:08:13 +0000 (UTC) From: "Lars Wendler" <polynomial-c@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" <polynomial-c@gentoo.org> Message-ID: <1625818087.c73f0b2c73bf56baf76668272098d1c71b396234.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/ethtool/files/, sys-apps/ethtool/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/ethtool/Manifest sys-apps/ethtool/ethtool-5.4.ebuild sys-apps/ethtool/ethtool-5.8-r1.ebuild sys-apps/ethtool/files/ethtool-5.8-avoid_bashisms.patch sys-apps/ethtool/files/ethtool-5.8-only-memset-non-NULL-link-settings.patch X-VCS-Directories: sys-apps/ethtool/files/ sys-apps/ethtool/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: c73f0b2c73bf56baf76668272098d1c71b396234 X-VCS-Branch: master Date: Fri, 9 Jul 2021 08:08:13 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7c552c4a-5595-435d-ab17-5b74de43b45f X-Archives-Hash: 275e85d5d5a766026b425af9c0bc0281 commit: c73f0b2c73bf56baf76668272098d1c71b396234 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Fri Jul 9 08:07:44 2021 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Fri Jul 9 08:08:07 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c73f0b2c sys-apps/ethtool: Removed old Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> sys-apps/ethtool/Manifest | 2 -- sys-apps/ethtool/ethtool-5.4.ebuild | 14 ----------- sys-apps/ethtool/ethtool-5.8-r1.ebuild | 26 ------------------- .../ethtool/files/ethtool-5.8-avoid_bashisms.patch | 29 ---------------------- ...ol-5.8-only-memset-non-NULL-link-settings.patch | 20 --------------- 5 files changed, 91 deletions(-) diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest index 437687fbf1a..5bffba1c47c 100644 --- a/sys-apps/ethtool/Manifest +++ b/sys-apps/ethtool/Manifest @@ -1,5 +1,3 @@ DIST ethtool-5.10.tar.xz 310536 BLAKE2B acc91ff2f7cf233a5a7bc85e32fbcf78e3923b240ab3e3300fa11d42769b664b1b5740ad6577daf4ef1b1054432e2323429ee63774af5e0210c1ec1c7d6aa4ac SHA512 128ecc0445ec44e231d95158a71cea2c03f059314f1a844cfb2f424970bd68608fb73b8dc5e8905b88ad0da2b65a8884a626be78d6d25f770ce043c6c87580a6 DIST ethtool-5.12.tar.xz 311004 BLAKE2B 640d4a1576afea60c673a6060b649d10ccb2d2be64a817e4d74daeb6de4da2d30ccb059ff1113e05f9c44898f08beefd706be2ea6e323c42032c4d93926d380a SHA512 9825f0bf10851f0bd9c3e621785144a5ed5f3fbedacb1801aa6a9b4685c870fa9bfac8eb552c900d20be06240c017dd001fde6be7aecc8c466bbe9ade8b1d002 DIST ethtool-5.13.tar.xz 318204 BLAKE2B 5e693368ce56fa155c5d371bc650e5fb7e8e1c8fd30982b45a674da63119e54f005484bea68c7b85e8d070efbf7aa15e92637e7a3b8b2010b4022851154a6809 SHA512 44426653aabd20707d2e597707113f4d30d12696b4f32c0ab0450af0dccece1b6a11e529a22d1299204f63c9e71ae41a1495d3d36b8f630f1734a72694d779be -DIST ethtool-5.4.tar.xz 239288 BLAKE2B 8c8b2bee53fe3e71510684ca7c6f64153cb6f1c5ebe44cd4d1dc351885d2d9957eb206a96bda9efadb5faa0e15a3f0ba07923d7e29b27694e3e3f605151a940d SHA512 c7bfe7eae2ba207d710716274e9f5ae275c57d0bebc0a9acb95677125e64f1b42ef610032011fb59894aab46973988bad40fddbc5ccc238893e7da66f913255b -DIST ethtool-5.8.tar.xz 299416 BLAKE2B ea7433205eba831b6ba56e140c73cfe283cc5dc56ced963414a017b0d6b6fbde9d0195ff64ebdc060351e5e9844af8beb8f00f7e04d76b04f958b166cda7e589 SHA512 5eada909f82573ad93bc5476e6f8d50f68ce2c9948558877eb6ace8dc17aee895b2f27343592f5f23eaef0e0fc70b5f776f76e75d9614bab305a2819ca82370e diff --git a/sys-apps/ethtool/ethtool-5.4.ebuild b/sys-apps/ethtool/ethtool-5.4.ebuild deleted file mode 100644 index 159377da21d..00000000000 --- a/sys-apps/ethtool/ethtool-5.4.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces" -HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/" -SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" - -BDEPEND="app-arch/xz-utils" diff --git a/sys-apps/ethtool/ethtool-5.8-r1.ebuild b/sys-apps/ethtool/ethtool-5.8-r1.ebuild deleted file mode 100644 index 8e1cf0073e3..00000000000 --- a/sys-apps/ethtool/ethtool-5.8-r1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces" -HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/" -SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" -IUSE="+netlink" - -BDEPEND="app-arch/xz-utils" -RDEPEND="netlink? ( net-libs/libmnl )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-5.8-avoid_bashisms.patch" - "${FILESDIR}/${P}-only-memset-non-NULL-link-settings.patch" -) - -src_configure() { - econf $(use_enable netlink) -} 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 9cd9fd86fb7..00000000000 --- 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 573ee645615..00000000000 --- 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; -