From 360a4595b83fc7318f819e9675099629d3f426ee Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Mon, 23 Jan 2023 14:36:31 +0000 Subject: [PATCH] ethtool: update to 6.1. --- srcpkgs/ethtool/patches/fix-musl.diff | 43 +++++++++++++++++++++++++++ srcpkgs/ethtool/template | 7 +++-- 2 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/ethtool/patches/fix-musl.diff diff --git a/srcpkgs/ethtool/patches/fix-musl.diff b/srcpkgs/ethtool/patches/fix-musl.diff new file mode 100644 index 000000000000..b06c86650b9f --- /dev/null +++ b/srcpkgs/ethtool/patches/fix-musl.diff @@ -0,0 +1,43 @@ +--- a/marvell.c 2023-01-23 21:03:11.025636022 +0000 ++++ b/marvell.c 2023-01-27 14:02:36.278115472 +0000 +@@ -31,23 +31,23 @@ + static void dump_queue(const char *name, const void *a, int rx) + { + struct desc { +- u_int32_t ctl; +- u_int32_t next; +- u_int32_t data_lo; +- u_int32_t data_hi; +- u_int32_t status; +- u_int32_t timestamp; +- u_int16_t csum2; +- u_int16_t csum1; +- u_int16_t csum2_start; +- u_int16_t csum1_start; +- u_int32_t addr_lo; +- u_int32_t addr_hi; +- u_int32_t count_lo; +- u_int32_t count_hi; +- u_int32_t byte_count; +- u_int32_t csr; +- u_int32_t flag; ++ uint32_t ctl; ++ uint32_t next; ++ uint32_t data_lo; ++ uint32_t data_hi; ++ uint32_t status; ++ uint32_t timestamp; ++ uint16_t csum2; ++ uint16_t csum1; ++ uint16_t csum2_start; ++ uint16_t csum1_start; ++ uint32_t addr_lo; ++ uint32_t addr_hi; ++ uint32_t count_lo; ++ uint32_t count_hi; ++ uint32_t byte_count; ++ uint32_t csr; ++ uint32_t flag; + }; + const struct desc *d = a; + diff --git a/srcpkgs/ethtool/template b/srcpkgs/ethtool/template index 3bd17d9dcb41..4ed39b335326 100644 --- a/srcpkgs/ethtool/template +++ b/srcpkgs/ethtool/template @@ -1,6 +1,6 @@ # Template file for 'ethtool' pkgname=ethtool -version=5.19 +version=6.1 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -9,5 +9,6 @@ short_desc="Utility for controlling network drivers and hardware" maintainer="Enno Boland " license="GPL-2.0-only" homepage="https://www.kernel.org/pub/software/network/ethtool/" -distfiles="https://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=3b752a3329827907ac3812f2831dfecf51c8c41c55d2d69cfb9c53ca06449fc6 +changelog="https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/plain/NEWS" +distfiles="https://www.kernel.org/pub/software/network/ethtool/ethtool-${version}.tar.xz" +checksum=c41fc881ffa5a40432d2dd829eb44c64a49dee482e716baacf9262c64daa8f90