On 2018/08/12 11:47, Klemens Nanni wrote: > On Sat, Aug 11, 2018 at 09:18:21PM -0600, [email protected] wrote: > > http://build-failures.rhaalovely.net//sparc64/2018-07-31/sysutils/pftop.log > > bpf_image.c: In function 'bpf_image': > bpf_image.c:41: error: argument 'p' doesn't match prototype > /usr/include/pcap.h:233: error: prototype declaration > > The following commit to lib/libpcap/pcap.h caused this: > > revision 1.20 > date: 2018/06/03 10:29:28; author: sthen; state: Exp; lines: +6 -6; > commitid: yMmArqThiDSrYVYu; > Change some libpcap functions which use pointers as arguments and > returns to const pointers: > > - the prefix argument to pcap_perror(); > - the return value of pcap_strerror(); > - the filter expression argument to pcap_compile() and > pcap_compile_nopcap(); > - the BPF filter program argument to bpf_image(). > > Matches changes made earlier in tcpdump.org's version of libpcap. > From Guy Harris, ok tb@, been through a bulk ports build. > > Tested on sparc64 and amd64, OK? > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/sysutils/pftop/Makefile,v > retrieving revision 1.33 > diff -u -p -r1.33 Makefile > --- Makefile 15 Feb 2018 11:17:05 -0000 1.33 > +++ Makefile 12 Aug 2018 09:41:39 -0000 > @@ -5,7 +5,7 @@ > COMMENT= curses-based real time state and rule display for pf > > DISTNAME= pftop-0.7 > -REVISION= 17 > +REVISION= 18 > CATEGORIES= sysutils
Bump not needed for this. OK > > HOMEPAGE= http://www.eee.metu.edu.tr/~canacar/pftop/ > Index: patches/patch-bpf_image_c > =================================================================== > RCS file: /cvs/ports/sysutils/pftop/patches/patch-bpf_image_c,v > retrieving revision 1.1 > diff -u -p -r1.1 patch-bpf_image_c > --- patches/patch-bpf_image_c 19 Jun 2013 03:46:55 -0000 1.1 > +++ patches/patch-bpf_image_c 12 Aug 2018 09:38:27 -0000 > @@ -2,8 +2,9 @@ $OpenBSD: patch-bpf_image_c,v 1.1 2013/0 > > pcap-int.h no longer exists in /usr/include > > ---- bpf_image.c.orig Wed Nov 7 01:34:18 2007 > -+++ bpf_image.c Thu Jun 13 15:24:21 2013 > +Index: bpf_image.c > +--- bpf_image.c.orig > ++++ bpf_image.c > @@ -28,7 +28,7 @@ > #include <stdio.h> > #include <string.h> > @@ -13,3 +14,12 @@ pcap-int.h no longer exists in /usr/incl > > #ifdef HAVE_OS_PROTO_H > #include "os-proto.h" > +@@ -36,7 +36,7 @@ > + > + char * > + bpf_image(p, n) > +- struct bpf_insn *p; > ++ const struct bpf_insn *p; > + int n; > + { > + int v; >
