Bug 265561 - net/wackamole: fix build on armv7
Summary: net/wackamole: fix build on armv7
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Nuno Teixeira
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2022-08-01 22:33 UTC by Robert Clausecker
Modified: 2022-08-16 14:56 UTC (History)
2 users (show)

See Also:
fuz: maintainer-feedback-
eduardo: merge-quarterly+


Attachments
net/wackamole: fix build on armv7 (3.51 KB, patch)
2022-08-01 22:33 UTC, Robert Clausecker
fuz: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Robert Clausecker freebsd_committer freebsd_triage 2022-08-01 22:33:26 UTC
Created attachment 235618 [details]
net/wackamole: fix build on armv7

Jails may not have a bpf(4) device, but can still build with BPF.

 - fix the configure test for BPF detection
 - define LICENSE
 - fix two obvious bugs in the code

Tested with Poudriere on armv7 arm64 FreeBSD 13.1.
Please MFH if possible.
Comment 1 Robert Clausecker freebsd_committer freebsd_triage 2022-08-16 03:33:39 UTC
maintainer timeout
Comment 2 Robert Clausecker freebsd_committer freebsd_triage 2022-08-16 03:33:52 UTC
Comment on attachment 235618 [details]
net/wackamole: fix build on armv7

maintainer timeout on patch
Comment 3 Nuno Teixeira freebsd_committer freebsd_triage 2022-08-16 11:09:08 UTC
Hi Robert,

files/patches-* were not generated with `make makepatch`. Is there any problem of loosing patches upstream info and use makepatch?
Comment 4 Nuno Teixeira freebsd_committer freebsd_triage 2022-08-16 11:12:43 UTC
(In reply to Nuno Teixeira from comment #3)

(...)
And what about include license comment in commit msg only (instead of Makefile)?
Comment 5 Robert Clausecker freebsd_committer freebsd_triage 2022-08-16 13:45:31 UTC
(In reply to Nuno Teixeira from comment #4)

I did not regenerate existing, pre-makepatch patches to make the diff less noisy.  Feel free to change these.

> And what about include license comment in commit msg only (instead of Makefile)?

I think the comment is valuable to keep in the Makefile.
Proceed as you wish.
Comment 6 commit-hook freebsd_committer freebsd_triage 2022-08-16 14:52:16 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4d98b01b6fff7b4c1dd36d5f0849ed6dc1f3eb9e

commit 4d98b01b6fff7b4c1dd36d5f0849ed6dc1f3eb9e
Author:     Robert Clausecker <fuz@fuz.su>
AuthorDate: 2022-08-16 14:48:13 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2022-08-16 14:51:50 +0000

    net/wackamole: Fix build on armv7

     Jails may not have a bpf(4) device, but can still build with BPF.

     - fix the configure test for BPF detection
     - define LICENSE
     - fix two obvious bugs in the code

    PR:             265561
    Approved by:    maintainer timeout, >2 weeks
    MFH:            2022Q3

 net/wackamole/Makefile                     |  7 +++++++
 net/wackamole/files/patch-alarm.c          |  8 ++++----
 net/wackamole/files/patch-arpcache.c (new) | 11 +++++++++++
 net/wackamole/files/patch-config_gram.y    |  6 +++---
 net/wackamole/files/patch-configuration.c  |  6 +++---
 net/wackamole/files/patch-configure (new)  | 11 +++++++++++
 net/wackamole/files/patch-defines.h        | 11 +++++------
 net/wackamole/files/patch-ife-bpf.c (new)  | 11 +++++++++++
 net/wackamole/files/patch-wackamole.c      |  8 ++++----
 9 files changed, 59 insertions(+), 20 deletions(-)
Comment 7 commit-hook freebsd_committer freebsd_triage 2022-08-16 14:54:17 UTC
A commit in branch 2022Q3 references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cdad97dcc46b2971ef6a2ef632dc688fcc19e5e5

commit cdad97dcc46b2971ef6a2ef632dc688fcc19e5e5
Author:     Robert Clausecker <fuz@fuz.su>
AuthorDate: 2022-08-16 14:48:13 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2022-08-16 14:53:04 +0000

    net/wackamole: Fix build on armv7

     Jails may not have a bpf(4) device, but can still build with BPF.

     - fix the configure test for BPF detection
     - define LICENSE
     - fix two obvious bugs in the code

    PR:             265561
    Approved by:    maintainer timeout, >2 weeks
    MFH:            2022Q3

    (cherry picked from commit 4d98b01b6fff7b4c1dd36d5f0849ed6dc1f3eb9e)

 net/wackamole/Makefile                     |  7 +++++++
 net/wackamole/files/patch-alarm.c          |  8 ++++----
 net/wackamole/files/patch-arpcache.c (new) | 11 +++++++++++
 net/wackamole/files/patch-config_gram.y    |  6 +++---
 net/wackamole/files/patch-configuration.c  |  6 +++---
 net/wackamole/files/patch-configure (new)  | 11 +++++++++++
 net/wackamole/files/patch-defines.h        | 11 +++++------
 net/wackamole/files/patch-ife-bpf.c (new)  | 11 +++++++++++
 net/wackamole/files/patch-wackamole.c      |  8 ++++----
 9 files changed, 59 insertions(+), 20 deletions(-)
Comment 8 Nuno Teixeira freebsd_committer freebsd_triage 2022-08-16 14:56:35 UTC
(In reply to Robert Clausecker from comment #5)

I used makepatch to silence portlint and kept license comment.
Comment 9 Nuno Teixeira freebsd_committer freebsd_triage 2022-08-16 14:56:54 UTC
Committed, thanks!