[PR PATCH] ethtool: update to 6.1.

[PR PATCH] ethtool: update to 6.1.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 1222 bytes --]

There is a new pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages ethtool-6.1
https://github.com/void-linux/void-packages/pull/41822

ethtool: update to 6.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41822.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ethtool-6.1-41822.patch --]
[-- Type: text/x-diff, Size: 1250 bytes --]

From dfe41e0da05872d8b8169fbf76e4b28bc558c430 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 23 Jan 2023 14:36:31 +0000
Subject: [PATCH] ethtool: update to 6.1.

---
 srcpkgs/ethtool/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ethtool/template b/srcpkgs/ethtool/template
index 3bd17d9dcb41..d47fb00b85ea 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 <gottox@voidlinux.org>"
 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
+distfiles="https://www.kernel.org/pub/software/network/ethtool/ethtool-${version}.tar.xz"
+changelog="https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/plain/NEWS"
+checksum=c41fc881ffa5a40432d2dd829eb44c64a49dee482e716baacf9262c64daa8f90

Re: ethtool: update to 6.1.

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 201 bytes --]

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/41822#issuecomment-1400940712

Comment:
Please fix xlint and musl (needs stdint.h probably).

Re: [PR PATCH] [Updated] ethtool: update to 6.1.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 1227 bytes --]

There is an updated pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages ethtool-6.1
https://github.com/void-linux/void-packages/pull/41822

ethtool: update to 6.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41822.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ethtool-6.1-41822.patch --]
[-- Type: text/x-diff, Size: 2833 bytes --]

From d8a07d3994dea3264557cb1669026e8ce9ccb6c1 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 23 Jan 2023 14:36:31 +0000
Subject: [PATCH] ethtool: update to 6.1.

---
 srcpkgs/ethtool/patches/fix-musl.diff | 51 +++++++++++++++++++++++++++
 srcpkgs/ethtool/template              |  7 ++--
 2 files changed, 55 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..f31187dcbbec
--- /dev/null
+++ b/srcpkgs/ethtool/patches/fix-musl.diff
@@ -0,0 +1,51 @@
+--- a/marvell.c	2023-01-23 21:03:11.025636022 +0000
++++ b/marvell.c	2023-01-23 21:09:50.994082789 +0000
+@@ -6,6 +6,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdint.h>
+ 
+ #include "internal.h"
+ 
+@@ -31,23 +32,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 <gottox@voidlinux.org>"
 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

Re: ethtool: update to 6.1.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 205 bytes --]

New comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/41822#issuecomment-1400988093

Comment:
@leahneukirchen done, should I also submit the patch upstream?

Re: ethtool: update to 6.1.

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 192 bytes --]

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/41822#issuecomment-1402399776

Comment:
The include is in "internal.h" already tho.

Re: ethtool: update to 6.1.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 187 bytes --]

New comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/41822#issuecomment-1405655295

Comment:
@leahneukirchen whoops, I'll remove it then.

Re: [PR PATCH] [Updated] ethtool: update to 6.1.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 1227 bytes --]

There is an updated pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages ethtool-6.1
https://github.com/void-linux/void-packages/pull/41822

ethtool: update to 6.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41822.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ethtool-6.1-41822.patch --]
[-- Type: text/x-diff, Size: 2735 bytes --]

From 360a4595b83fc7318f819e9675099629d3f426ee Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 <gottox@voidlinux.org>"
 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

Re: [PR PATCH] [Merged]: ethtool: update to 6.1.

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 1065 bytes --]

There's a merged pull request on the void-packages repository

ethtool: update to 6.1.
https://github.com/void-linux/void-packages/pull/41822

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->