svn commit: r334277 - in head: contrib/libpcap contrib/ofed/usr.lib/3 contrib/pf/pflogd contrib/wpa/src/l2_packet lib lib/libpcap share/mk usr.sbin/cxgbetool

[Kyle Evans]

On Mon, Nov 25, 2019 at 1:17 PM Kyle Evans <kevans at freebsd.org> wrote:
>
> On Mon, May 28, 2018 at 3:12 AM Hans Petter Selasky
> <hselasky at freebsd.org> wrote:
> >
> > Author: hselasky
> > Date: Mon May 28 08:12:18 2018
> > New Revision: 334277
> > URL: https://svnweb.freebsd.org/changeset/base/334277
> >
> > Log:
> >   MFV r333789: libpcap 1.9.0 (pre-release)
> >
> >   MFC after:    1 month
> >   Sponsored by: Mellanox Technologies
> >
> > Replaced:
> >   head/contrib/libpcap/
> >      - copied from r333789, vendor/libpcap/dist/
> > Deleted:
> >   head/lib/libpcap/pcap-netmap.c
> > Modified:
> >   head/contrib/ofed/usr.lib/3/Makefile
> >   head/contrib/pf/pflogd/pflogd.c
> >   head/contrib/wpa/src/l2_packet/l2_packet_freebsd.c
> >   head/lib/Makefile
> >   head/lib/libpcap/Makefile
> >   head/lib/libpcap/config.h
> >   head/share/mk/src.libnames.mk
> >   head/usr.sbin/cxgbetool/cxgbetool.c
> >
> > [ ... snip ... ]
> > Modified: head/lib/libpcap/Makefile
> > ==============================================================================
> > --- head/lib/libpcap/Makefile   Mon May 28 06:01:02 2018        (r334276)
> > +++ head/lib/libpcap/Makefile   Mon May 28 08:12:18 2018        (r334277)
> > @@ -7,16 +7,51 @@ SHLIBDIR?= /lib
> >
> >  PACKAGE=lib${LIB}
> >  LIB=   pcap
> > -SRCS=  grammar.y tokdefs.h pcap_version.h pcap-bpf.c \
> > -       pcap-netmap.c fad-helpers.c \
> > -       pcap.c pcap-common.c inet.c fad-getad.c gencode.c optimize.c nametoaddr.c \
> > -       etherent.c savefile.c bpf_filter.c bpf_image.c bpf_dump.c \
> > -       scanner.l sf-pcap.c sf-pcap-ng.c version.c
> >
> > +SRCS=  bpf_dump.c \
> > +       bpf_filter.c \
> > +       bpf_image.c \
> > +       etherent.c \
> > +       fad-getad.c \
> > +       fmtutils.c \
> > +       gencode.c \
> > +       grammar.y \
> > +       nametoaddr.c \
> > +       optimize.c \
> > +       pcap-bpf.c \
> > +       pcap-common.c \
> > +       pcap-netmap.c \
> > +       pcap-netmap.h \
> > +       pcap.c \
> > +       savefile.c \
> > +       scanner.l \
> > +       sf-pcap.c \
> > +       sf-pcapng.c \
> > +       tokdefs.h
> > +
> >  # Old compatibility headers
> > -INCS=  pcap.h pcap-namedb.h pcap-bpf.h
> > +INCS=  fmtutils.h \
> > +       pcap-bpf.h \
> > +       pcap-namedb.h \
> > +       pcap-netmap.h \
> > +       pcap.h
> >
> > -PCAPINCS=      pcap/pcap.h pcap/namedb.h pcap/bpf.h pcap/dlt.h pcap/export-defs.h
> > +PCAPINCS= \
> > +       pcap/bluetooth.h \
> > +       pcap/bpf.h \
> > +       pcap/can_socketcan.h \
> > +       pcap/compiler-tests.h \
> > +       pcap/dlt.h \
> > +       pcap/funcattrs.h \
> > +       pcap/ipnet.h \
> > +       pcap/namedb.h \
> > +       pcap/nflog.h \
> > +       pcap/pcap-inttypes.h \
> > +       pcap/pcap.h \
> > +       pcap/sll.h \
> > +       pcap/usb.h \
> > +       pcap/vlan.h
> > +
> >  PCAPINCSDIR=   ${INCLUDEDIR}/pcap
> >  INCSGROUPS=    INCS PCAPINCS
> >
> > @@ -40,6 +75,7 @@ MAN=  pcap.3 \
> >         pcap_fileno.3 \
> >         pcap_findalldevs.3 \
> >         pcap_freecode.3 \
> > +       pcap_get_required_select_timeout.3 \
> >         pcap_get_selectable_fd.3 \
> >         pcap_get_tstamp_precision.3 \
> >         pcap_geterr.3 \
> > @@ -61,6 +97,7 @@ MAN=  pcap.3 \
> >         pcap_set_datalink.3 \
> >         pcap_set_immediate_mode.3 \
> >         pcap_set_promisc.3 \
> > +       pcap_set_protocol.3 \
> >         pcap_set_rfmon.3 \
> >         pcap_set_snaplen.3 \
> >         pcap_set_timeout.3 \
> > @@ -73,12 +110,11 @@ MAN=       pcap.3 \
> >         pcap_stats.3 \
> >         pcap_statustostr.3 \
> >         pcap_strerror.3 \
> > -       pcap-savefile.5 \
> >         pcap_tstamp_type_name_to_val.3 \
> > -       pcap_tstamp_type_val_to_name.3 \
> > -       pcap-filter.7 \
> > -       pcap-linktype.7
> > -MLINKS=        pcap_datalink_val_to_name.3 pcap_datalink_val_to_description.3 \
> > +       pcap_tstamp_type_val_to_name.3
> > +
> > +MLINKS= \
> > +       pcap_datalink_val_to_name.3 pcap_datalink_val_to_description.3 \
> >         pcap_dump_open.3 pcap_dump_fopen.3 \
> >         pcap_findalldevs.3 pcap_freealldevs.3 \
> >         pcap_geterr.3 pcap_perror.3 \
>
> Hi Hans,
>
> This stopped installing pcap-filter(7) by default, but that wasn't
> mentioned in the commit message and it's xref'd in other manpages --
> any objections to reinstating it?
>
> Thanks,
>
> Kyle Evans

Resend at the request of Hans; please see above. Also, open PR [0]
with a patch included dating back to May.

Thanks!

Kyle Evans

[0] http://bugs.freebsd.org/237893