net/aquantia-atlantic-kmod: Fix CURRENT build post r353868 (iflib changes)

[nyan_myuji.xyz]

Summary

net/aquantia-atlantic-kmod: Fix CURRENT build post r353868 (iflib changes)

This patch enable the port to build working if_atlantic.ko
on 13-CURRENT, broken since r353868, where `if_multi_apply`
and `if_multiaddr_count` were removed.

PR: 252642
Approved by: koobs (maintainer)
Differential_Revision: D28135
MFH: 2021Q1 (blanket: build fix)

Test Plan

• portlint: ???
• testport: ??? (poudriere; at least current and 12amd64)
• hardware: AQC107 (device id 0x07b1) tested

[lwhsu]

net/aquantia-atlantic-kmod/Makefile

5

I believe PORTREVISION is enough here.

[nyan_myuji.xyz]

net/aquantia-atlantic-kmod/Makefile

5

The reason why PORTEPOCH is used here is to keep the versioning in-sync with the upstream. or should we change PORTVERSION to something like 0.0.5p1 ?

[lwhsu]

net/aquantia-atlantic-kmod/Makefile

5

PORTREVISION is exactly what to use to add local patch and keep PORTVSION (or DISTVERSION) sync with upstream. PORTEPOCH should be used carefully because it will stay forever once comes in.

[nyan_myuji.xyz]

net/aquantia-atlantic-kmod/Makefile

5

my bad, I thought you mean PORTVERSION lmao

[nyan_myuji.xyz]

Use PORTREVISION instead of PORTEPOCH

[philip]

If the iflib changes have been tested and are known to work, they're probably okay.

Is the extra patch to aq_hw.c intentional? Using random() to generate a MAC address isn't great. Not seeding it makes it even worse.

[koobs]

This needs:

• Confirmation of QA: portlint/poudriere on at least CURRENT and 12amd64 (fill in TEST PLAN section)
• PR created upstream
• Comment added to patch with upstream issue/PR reference and URL

Thank you for the report and patch

[koobs]

net/aquantia-atlantic-kmod/Makefile

5

Is this actually required since the build fails to produce a package?

[nyan_myuji.xyz]

In D28135#628982, @philip wrote:

If the iflib changes have been tested and are known to work, they're probably okay.

Is the extra patch to aq_hw.c intentional? Using random() to generate a MAC address isn't great. Not seeding it makes it even worse.

Yes it is. This is because random has been deprecated and srandom has been removed at https://reviews.freebsd.org/rS356097

[nyan_myuji.xyz]

net/aquantia-atlantic-kmod/Makefile

5

I think I don't exactly know what you mean..
On my side poudriere testport passed and is able to produce package for both current and 12.2-release...
Portlint also passed.

[lwhsu]

net/aquantia-atlantic-kmod/Makefile

5

Yes bump PORTVERSION in this case can be discussed more, but since the package content has changed and it would be good for notifying people using -CURRENT. I believe it's a good step.

[nyan_myuji.xyz]

Use arc4random instead of random

[philip]

Thanks for the changes!

[koobs]

@philip @lwhsu Thank you both for review. Feel free to commit this (pending adding upstream comments to patches).

net/aquantia-atlantic-kmod/files/patch-aq__hw.c

2

Lets add the upstream (PR) description and link here

net/aquantia-atlantic-kmod/files/patch-aq__main.c

2

Lets add the upstream (PR) description and link here

[nyan_myuji.xyz]

Add link to upstream pr

[debdrup]

Has all the feedback that's been given been addressed?

If so, who's going to have the honour of commiting and pushing this? :)

[nyan_myuji.xyz]

@koobs Please review and commit this if it's alright?

[philip]

I'm happy to commit this later today if @koobs doesn't beat me to it.

[koobs]

@philip I may not have time to day, but the change is otherwise approved

[philip]

Committed as r564758.

[lwhsu]

@koobs If you really don't have time, how about passing maintainership to @nyan_myuji.xyz ? He has more changes planned and is willing to take care of this port. I will help him to land more patches.

[koobs]

In D28135#639065, @lwhsu wrote:

@koobs If you really don't have time, how about passing maintainership to @nyan_myuji.xyz ? He has more changes planned and is willing to take care of this port. I will help him to land more patches.

To clarify: I don't currently have time

I have no qualms with a MAINTAINER change however.

[lwhsu]

In D28135#639079, @koobs wrote:

In D28135#639065, @lwhsu wrote:

@koobs If you really don't have time, how about passing maintainership to @nyan_myuji.xyz ? He has more changes planned and is willing to take care of this port. I will help him to land more patches.

To clarify: I don't currently have time

I have no qualms with a MAINTAINER change however.

Sounds good. I will see what his next updating to this port looks like.