Github messages for voidlinux
 help / color / mirror / Atom feed
From: mhmdanas <mhmdanas@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] ethtool: update to 6.1.
Date: Mon, 23 Jan 2023 22:13:56 +0100	[thread overview]
Message-ID: <20230123211356.5_w8u69U_RTU48tCdzslUrmxaKWaMxJJKH0rQ8z0NAM@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41822@inbox.vuxu.org>

[-- 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

  parent reply	other threads:[~2023-01-23 21:13 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-23 14:36 [PR PATCH] " mhmdanas
2023-01-23 20:31 ` leahneukirchen
2023-01-23 21:13 ` mhmdanas [this message]
2023-01-23 21:14 ` mhmdanas
2023-01-24 18:28 ` leahneukirchen
2023-01-26 21:10 ` mhmdanas
2023-01-27 14:07 ` [PR PATCH] [Updated] " mhmdanas
2023-01-27 16:54 ` [PR PATCH] [Merged]: " leahneukirchen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230123211356.5_w8u69U_RTU48tCdzslUrmxaKWaMxJJKH0rQ8z0NAM@z \
    --to=mhmdanas@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).