[Bug 265976] net/wireguard-kmod: Broken since 1400066 on CURRENT

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=265976

            Bug ID: 265976
           Summary: net/wireguard-kmod: Broken since 1400066 on CURRENT
           Product: Ports & Packages
           Version: Latest
          Hardware: Any
                OS: Any
            Status: New
          Severity: Affects Some People
          Priority: ---
         Component: Individual Port(s)
          Assignee: decke@FreeBSD.org
          Reporter: rhurlin@FreeBSD.org
             Flags: maintainer-feedback?(decke@FreeBSD.org)
          Assignee: decke@FreeBSD.org

Created attachment 236047
  --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=236047&action=edit
patch to add support for changed struct on 1400066 and newer

Since OSVERSION 1400066, one get the following breakage when try to build
net/wireguard on CURRENT:

cc  -O2 -pipe -fno-strict-aliasing -include
/usr/ports/net/wireguard-kmod/work/wireguard-freebsd-0.0.20220615/src/compat.h 
-Werror -D_KERNEL -DKLD_MODULE -nostdinc   -include
/usr/ports/net/wireguard-kmod/work/wireguard-freebsd-0.0.20220615/src/opt_global.h
-I. -I/usr/src/sys -I/usr/src/sys/contrib/ck/include -fno-common 
-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
-fdebug-prefix-map=./machine=/usr/src/sys/amd64/include
-fdebug-prefix-map=./x86=/usr/src/sys/x86/include
-fdebug-prefix-map=./i386=/usr/src/sys/i386/include     -MD  -MF.depend.if_wg.o
-MTif_wg.o -mcmodel=kernel -mno-red-zone -mno-mmx -mno-sse -msoft-float 
-fno-asynchronous-unwind-tables -ffreestanding -fwrapv -fstack-protector -Wall
-Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith
-Wcast-qual -Wundef -Wno-pointer-sign -D__printf__=__freebsd_kprintf__
-Wmissing-include-dirs -fdiagnostics-show-option -Wno-unknown-pragmas
-Wno-error=tautological-compare -Wno-error=empty-body
-Wno-error=parentheses-equality -Wno-error=unused-function
-Wno-error=pointer-sign -Wno-error=shift-negative-value
-Wno-address-of-packed-member -Wno-format-zero-length   -mno-aes -mno-avx 
-std=iso9899:1999 -c if_wg.c -o if_wg.o
In file included from if_wg.c:74:
./support.h:40:26: error: no member named 'pr_usrreqs' in 'struct protosw'
        error = (*so->so_proto->pr_usrreqs->pru_sockaddr)(so, nam);
                  ~~~~~~~~~~~~  ^
1 error generated.
*** Error code 1
Stop.
make[1]: stopped in
/usr/ports/net/wireguard-kmod/work/wireguard-freebsd-0.0.20220615/src


Since commit e7d02be, the struct pr_usrreqs is merged into struct protosw. The
attached patch uses this change for CURRENT >= 1400066.

The patch builds and installs fine on Poudriere and on my box. Working with the
patched wireguard-kmod seems to have no regressions so far.

-- 
You are receiving this mail because:
You are the assignee for the bug.