Buildworld fails if WITHOUT_INET6=YES defined

[Alex Deiter]

Hello,

Please apply patch from upstream:

https://github.com/the-tcpdump-group/libpcap/pull/541

Fix compilation if INET6 isn't defined.
Addresses GitHub issue #541, but differently from the pull request (it
defines gen_gateway() with a function prototype rather than using a
pre-prototype-style definition).

https://github.com/the-tcpdump-group/libpcap/commit/470df104c6f55f6d6f390df7448d8eb65c7642b9#diff-021c0dd9e9ed7100b9e31d8d95c930f2

Thank you!

Alex Deiter
alex.deiter at gmail.com



> On 18 Feb 2017, at 00:09, Bryan Drewery <bdrewery at FreeBSD.org> wrote:
> 
> On 2/17/2017 1:03 PM, Bryan Drewery wrote:
>> On 2/16/2017 10:07 AM, Ngie Cooper (yaneurabeya) wrote:
>>> 
>>>> On Feb 16, 2017, at 07:30, Oleg V. Nauman <oleg at opentransfer.com> wrote:
>>>> 
>>>> cc -target i386-unknown-freebsd12.0 --sysroot=/usr/obj/usr/src/tmp -
>>>> B/usr/obj/usr/src/tmp/usr/bin  -O2 -pipe -march=core2  -DHAVE_CONFIG_H -
>>>> I/usr/src/lib/libpcap -I/usr/obj/usr/src/lib/libpcap -
>>>> D_U_="__attribute__((unused))" -DHAVE_SNPRINTF -DHAVE_VSNPRINTF -
>>>> DBUILDING_PCAP -DHAVE_NET_PFVAR_H -I/usr/src/contrib/libpcap -MD  -
>>>> MF.depend.fad-getad.o -MTfad-getad.o -std=gnu99 -fstack-protector-strong -Wno-
>>>> pointer-sign -Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable -
>>>> Wno-tautological-compare -Wno-unused-value -Wno-parentheses-equality -Wno-
>>>> unused-function -Wno-enum-conversion -Wno-unused-local-typedef -Wno-switch -
>>>> Wno-switch-enum -Wno-knr-promoted-parameter -Wno-parentheses  -Qunused-
>>>> arguments  -c /usr/src/contrib/libpcap/fad-getad.c -o fad-getad.o
>>>> cc -target i386-unknown-freebsd12.0 --sysroot=/usr/obj/usr/src/tmp -
>>>> B/usr/obj/usr/src/tmp/usr/bin  -O2 -pipe -march=core2  -DHAVE_CONFIG_H -
>>>> I/usr/src/lib/libpcap -I/usr/obj/usr/src/lib/libpcap -
>>>> D_U_="__attribute__((unused))" -DHAVE_SNPRINTF -DHAVE_VSNPRINTF -
>>>> DBUILDING_PCAP -DHAVE_NET_PFVAR_H -I/usr/src/contrib/libpcap -MD  -
>>>> MF.depend.gencode.o -MTgencode.o -std=gnu99 -fstack-protector-strong -Wno-
>>>> pointer-sign -Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable -
>>>> Wno-tautological-compare -Wno-unused-value -Wno-parentheses-equality -Wno-
>>>> unused-function -Wno-enum-conversion -Wno-unused-local-typedef -Wno-switch -
>>>> Wno-switch-enum -Wno-knr-promoted-parameter -Wno-parentheses  -Qunused-
>>>> arguments  -c /usr/src/contrib/libpcap/gencode.c -o gencode.o
>>>> /usr/src/contrib/libpcap/gencode.c:695:9: error: no member named 'ai' in
>>>> 'struct _compiler_state'
>>>>       cstate.ai = NULL;
>>>>       ~~~~~~ ^
>>>> /usr/src/contrib/libpcap/gencode.c:4916:13: error: use of undeclared
>>>> identifier 'cstate'
>>>>               bpf_error(cstate, "direction applied to 'gateway'");
>>>>                         ^
>>>> /usr/src/contrib/libpcap/gencode.c:4923:11: error: use of undeclared
>>>> identifier 'cstate'
>>>>               switch (cstate->linktype) {
>>>>                       ^
>>>> /usr/src/contrib/libpcap/gencode.c:4961:17: error: use of undeclared
>>>> identifier 'cstate'
>>>>               b1 = gen_host(cstate, **alist++, 0xffffffff, proto, Q_OR,
>>>> Q_HOST);
>>>>                             ^
>>>> /usr/src/contrib/libpcap/gencode.c:4963:19: error: use of undeclared
>>>> identifier 'cstate'
>>>>                       tmp = gen_host(cstate, **alist++, 0xffffffff, proto,
>>>> Q_OR,
>>>>                                      ^
>>>> /usr/src/contrib/libpcap/gencode.c:4972:12: error: use of undeclared
>>>> identifier 'cstate'
>>>>       bpf_error(cstate, "illegal modifier of 'gateway'");
>>>>                 ^
>>>> 6 errors generated.
>>>> *** Error code 1
>>>> 
>>>> Stop.
>>>> make[5]: stopped in /usr/src/lib/libpcap
>>>> *** Error code 1
>>> 
>>> CCing Xin, who did the libpcap upgrade.
>>> -Ngie
>>> 
>> 
>> I get an error even with INET6 building grammar.o:
>> 
>>> /root/git/freebsd/contrib/libpcap/grammar.y:348:15: error: use of undeclared identifier 'cstate'; did you mean 'cstat'?
>>>        finish_parse(cstate, yystack.l_mark[0].blk.b);                                                                 
>>>                     ^~~~~~                                                                                            
>>>                     cstat                                                                                             
>>> grammar.c:1291:1: note: 'cstat' declared here                                                                          
>>> YYPARSE_DECL()                                                                                                         
>>> ^                                                                                                                      
>> 
> 
> Ignore me, my yacc is just outdated.
> 
> -- 
> Regards,
> Bryan Drewery
>