CVS commit: src/external/bsd/libpcap/lib
Module Name:src
Committed By: christos
Date: Sun Mar 29 19:50:46 UTC 2020
Modified Files:
src/external/bsd/libpcap/lib: Makefile
Log Message:
rpcap:///interface support.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/external/bsd/libpcap/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libpcap/lib/Makefile
diff -u src/external/bsd/libpcap/lib/Makefile:1.28 src/external/bsd/libpcap/lib/Makefile:1.29
--- src/external/bsd/libpcap/lib/Makefile:1.28 Sun Mar 29 13:49:52 2020
+++ src/external/bsd/libpcap/lib/Makefile Sun Mar 29 15:50:46 2020
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.28 2020/03/29 17:49:52 christos Exp $
+# $NetBSD: Makefile,v 1.29 2020/03/29 19:50:46 christos Exp $
USE_SHLIBDIR=yes
.include
USE_FORT?= yes # network protocol library
CPPFLAGS+= -DPCAP_DONT_INCLUDE_PCAP_BPF_H -DHAVE_CONFIG_H -DENABLE_REMOTE
+CPPFLAGS+= -DPCAP_SUPPORT_RPCAP
CPPFLAGS+= -I${.OBJDIR}
.SUFFIXES: .3 .3pcap
@@ -138,6 +139,7 @@ pcap-bpf.c \
pcap-common.c \
pcap-new.c \
pcap-rpcap.c \
+pcap-rpcap-unix.c \
pcap.c \
rpcap-protocol.c \
savefile.c \
CVS commit: src/external/bsd/libpcap/lib
Module Name:src Committed By: christos Date: Sun Mar 29 17:49:52 UTC 2020 Modified Files: src/external/bsd/libpcap/lib: Makefile Log Message: need bsd.init.mk to grab Makefile.inc To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/external/bsd/libpcap/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/libpcap/lib/Makefile diff -u src/external/bsd/libpcap/lib/Makefile:1.27 src/external/bsd/libpcap/lib/Makefile:1.28 --- src/external/bsd/libpcap/lib/Makefile:1.27 Sun Mar 29 13:12:45 2020 +++ src/external/bsd/libpcap/lib/Makefile Sun Mar 29 13:49:52 2020 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.27 2020/03/29 17:12:45 christos Exp $ +# $NetBSD: Makefile,v 1.28 2020/03/29 17:49:52 christos Exp $ USE_SHLIBDIR=yes -.include +.include USE_FORT?= yes # network protocol library CPPFLAGS+= -DPCAP_DONT_INCLUDE_PCAP_BPF_H -DHAVE_CONFIG_H -DENABLE_REMOTE
CVS commit: src/external/bsd/libpcap/lib
Module Name:src
Committed By: mrg
Date: Tue Feb 5 07:45:35 UTC 2019
Modified Files:
src/external/bsd/libpcap/lib: Makefile
Log Message:
ignore a format truncation issue.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/libpcap/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libpcap/lib/Makefile
diff -u src/external/bsd/libpcap/lib/Makefile:1.22 src/external/bsd/libpcap/lib/Makefile:1.23
--- src/external/bsd/libpcap/lib/Makefile:1.22 Mon Feb 4 04:05:16 2019
+++ src/external/bsd/libpcap/lib/Makefile Tue Feb 5 07:45:35 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/02/04 04:05:16 mrg Exp $
+# $NetBSD: Makefile,v 1.23 2019/02/05 07:45:35 mrg Exp $
USE_SHLIBDIR=yes
.include
@@ -175,4 +175,8 @@ tokdefs.h: grammar.h
CLEANFILES+= tokdefs.h scanner.h
COPTS.bpf_image.c = -Wno-format-nonliteral
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+COPTS.pcap.c+= -Wno-error=format-truncation
+.endif
+
.include
CVS commit: src/external/bsd/libpcap/lib
Module Name:src
Committed By: christos
Date: Wed Sep 5 17:10:27 UTC 2018
Modified Files:
src/external/bsd/libpcap/lib: Makefile
Log Message:
search first for the kernel bpf_filter.c
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/libpcap/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libpcap/lib/Makefile
diff -u src/external/bsd/libpcap/lib/Makefile:1.20 src/external/bsd/libpcap/lib/Makefile:1.21
--- src/external/bsd/libpcap/lib/Makefile:1.20 Mon Sep 3 17:26:19 2018
+++ src/external/bsd/libpcap/lib/Makefile Wed Sep 5 13:10:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2018/09/03 21:26:19 kre Exp $
+# $NetBSD: Makefile,v 1.21 2018/09/05 17:10:27 christos Exp $
USE_SHLIBDIR=yes
.include
@@ -24,6 +24,8 @@ __sed: .USE
-e 's,3PCAP,3,g' < ${.ALLSRC} > ${.TARGET}
+# Search first in the kernel for bpf_filter.c
+.PATH: ${NETBSDSRCDIR}/sys/net
SRCDIR= ${.CURDIR}/../dist
.PATH: ${SRCDIR}
@@ -136,6 +138,7 @@ CPPFLAGS+= -DINET6
SRCS= \
bpf_dump.c \
+bpf_filter.c \
bpf_image.c \
etherent.c \
fad-getad.c \
@@ -152,8 +155,6 @@ scanner.l \
sf-pcap.c \
sf-pcapng.c
-.PATH: ${NETBSDSRCDIR}/sys/net
-SRCS+= bpf_filter.c
INCS= pcap/pcap.h pcap/namedb.h pcap/funcattrs.h \
pcap/pcap-inttypes.h pcap/compiler-tests.h
CVS commit: src/external/bsd/libpcap/lib
Module Name:src
Committed By: christos
Date: Mon Sep 3 21:03:07 UTC 2018
Modified Files:
src/external/bsd/libpcap/lib: Makefile
Log Message:
fix includes
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/libpcap/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libpcap/lib/Makefile
diff -u src/external/bsd/libpcap/lib/Makefile:1.18 src/external/bsd/libpcap/lib/Makefile:1.19
--- src/external/bsd/libpcap/lib/Makefile:1.18 Mon Sep 3 15:32:58 2018
+++ src/external/bsd/libpcap/lib/Makefile Mon Sep 3 17:03:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/09/03 19:32:58 kre Exp $
+# $NetBSD: Makefile,v 1.19 2018/09/03 21:03:07 christos Exp $
USE_SHLIBDIR=yes
.include
@@ -155,7 +155,7 @@ sf-pcapng.c
.PATH: ${NETBSDSRCDIR}/sys/net
SRCS+= bpf_filter.c
-INCS= pcap/pcap.h pcap/namedb.h
+INCS= pcap/pcap.h pcap/namedb.h pcap/funcattrs.h pcap/pcap-inttypes.h
INCSDIR= /usr/include
INCSYMLINKS+= ../net/bpf.h ${INCSDIR}/pcap/bpf.h
INCSYMLINKS+= pcap/pcap.h ${INCSDIR}/pcap.h
CVS commit: src/external/bsd/libpcap/lib
Module Name:src
Committed By: kre
Date: Mon Sep 3 19:32:58 UTC 2018
Modified Files:
src/external/bsd/libpcap/lib: Makefile
Log Message:
pcap/export-defs.h no longer exists, so don't attempt to install it.
Allows builds after libpcap update to get further, if there is fallout
from the file being missing elsewhere, that can be fixed later.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/libpcap/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libpcap/lib/Makefile
diff -u src/external/bsd/libpcap/lib/Makefile:1.17 src/external/bsd/libpcap/lib/Makefile:1.18
--- src/external/bsd/libpcap/lib/Makefile:1.17 Mon Sep 3 15:26:44 2018
+++ src/external/bsd/libpcap/lib/Makefile Mon Sep 3 19:32:58 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2018/09/03 15:26:44 christos Exp $
+# $NetBSD: Makefile,v 1.18 2018/09/03 19:32:58 kre Exp $
USE_SHLIBDIR=yes
.include
@@ -155,7 +155,7 @@ sf-pcapng.c
.PATH: ${NETBSDSRCDIR}/sys/net
SRCS+= bpf_filter.c
-INCS= pcap/pcap.h pcap/namedb.h pcap/export-defs.h
+INCS= pcap/pcap.h pcap/namedb.h
INCSDIR= /usr/include
INCSYMLINKS+= ../net/bpf.h ${INCSDIR}/pcap/bpf.h
INCSYMLINKS+= pcap/pcap.h ${INCSDIR}/pcap.h
CVS commit: src/external/bsd/libpcap/lib
Module Name:src
Committed By: christos
Date: Tue Jan 24 23:26:58 UTC 2017
Modified Files:
src/external/bsd/libpcap/lib: Makefile
Log Message:
add another header file
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/libpcap/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libpcap/lib/Makefile
diff -u src/external/bsd/libpcap/lib/Makefile:1.14 src/external/bsd/libpcap/lib/Makefile:1.15
--- src/external/bsd/libpcap/lib/Makefile:1.14 Tue Jan 24 17:37:31 2017
+++ src/external/bsd/libpcap/lib/Makefile Tue Jan 24 18:26:58 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2017/01/24 22:37:31 christos Exp $
+# $NetBSD: Makefile,v 1.15 2017/01/24 23:26:58 christos Exp $
USE_SHLIBDIR=yes
.include
@@ -142,7 +142,7 @@ SRCS= scanner.l savefile.c pcap.c pcap-b
.PATH: ${NETBSDSRCDIR}/sys/net
SRCS+= bpf_filter.c
-INCS= pcap/pcap.h pcap/namedb.h
+INCS= pcap/pcap.h pcap/namedb.h pcap/export-defs.h
INCSDIR= /usr/include
INCSYMLINKS+= ../net/bpf.h ${INCSDIR}/pcap/bpf.h
INCSYMLINKS+= pcap/pcap.h ${INCSDIR}/pcap.h
CVS commit: src/external/bsd/libpcap/lib
Module Name:src
Committed By: christos
Date: Tue Jan 24 22:37:31 UTC 2017
Modified Files:
src/external/bsd/libpcap/lib: Makefile
Log Message:
Add more files
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/libpcap/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libpcap/lib/Makefile
diff -u src/external/bsd/libpcap/lib/Makefile:1.13 src/external/bsd/libpcap/lib/Makefile:1.14
--- src/external/bsd/libpcap/lib/Makefile:1.13 Tue Jan 24 17:29:29 2017
+++ src/external/bsd/libpcap/lib/Makefile Tue Jan 24 17:37:31 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/01/24 22:29:29 christos Exp $
+# $NetBSD: Makefile,v 1.14 2017/01/24 22:37:31 christos Exp $
USE_SHLIBDIR=yes
.include
@@ -136,7 +136,8 @@ CPPFLAGS+= -DINET6
SRCS= scanner.l savefile.c pcap.c pcap-bpf.c optimize.c nametoaddr.c \
inet.c grammar.y gencode.c fad-getad.c etherent.c bpf_image.c \
- bpf_dump.c version.c sf-pcap-ng.c sf-pcap.c pcap-common.c
+ bpf_dump.c pcap_version.c sf-pcap-ng.c sf-pcap.c pcap-common.c \
+ fad-getad.c fad-helpers.c
.PATH: ${NETBSDSRCDIR}/sys/net
SRCS+= bpf_filter.c
CVS commit: src/external/bsd/libpcap/lib
Module Name:src
Committed By: christos
Date: Sat Apr 6 17:29:12 UTC 2013
Modified Files:
src/external/bsd/libpcap/lib: Makefile shlib_version version.c
version.h
Log Message:
new libpcap
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/libpcap/lib/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libpcap/lib/shlib_version \
src/external/bsd/libpcap/lib/version.c \
src/external/bsd/libpcap/lib/version.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libpcap/lib/Makefile
diff -u src/external/bsd/libpcap/lib/Makefile:1.8 src/external/bsd/libpcap/lib/Makefile:1.9
--- src/external/bsd/libpcap/lib/Makefile:1.8 Wed Dec 21 14:00:28 2011
+++ src/external/bsd/libpcap/lib/Makefile Sat Apr 6 13:29:12 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/12/21 19:00:28 christos Exp $
+# $NetBSD: Makefile,v 1.9 2013/04/06 17:29:12 christos Exp $
.include bsd.own.mk
@@ -7,7 +7,7 @@ USE_FORT?= yes # network protocol librar
CWARNFLAGS.clang+= -Wno-format-extra-args \
-Wno-unneeded-internal-declaration
-CPPFLAGS+= -DPCAP_DONT_INCLUDE_PCAP_BPF_H
+CPPFLAGS+= -DPCAP_DONT_INCLUDE_PCAP_BPF_H -DHAVE_CONFIG_H
.SUFFIXES: .3 .3pcap
@@ -28,30 +28,78 @@ SRCDIR= ${.CURDIR}/../dist
.PATH: ${SRCDIR}
LIB= pcap
-MAN= pcap.3 pcap_activate.3 pcap_breakloop.3 pcap_can_set_rfmon.3 \
- pcap_close.3 pcap_compile.3 pcap_create.3 pcap_datalink.3 \
- pcap_datalink_name_to_val.3 pcap_datalink_val_to_name.3 \
- pcap_dump.3 pcap_dump_close.3 pcap_dump_file.3 \
- pcap_dump_flush.3 pcap_dump_ftell.3 pcap_dump_open.3 \
- pcap_file.3 pcap_fileno.3 pcap_findalldevs.3 \
- pcap_free_datalinks.3 pcap_freealldevs.3 pcap_freecode.3 \
- pcap_get_selectable_fd.3 pcap_geterr.3 pcap_inject.3 \
- pcap_is_swapped.3 pcap_lib_version.3 pcap_list_datalinks.3 \
- pcap_lookupdev.3 pcap_lookupnet.3 pcap_loop.3 \
- pcap_major_version.3 pcap_next_ex.3 pcap_offline_filter.3 \
- pcap_open_dead.3 pcap_open_live.3 pcap_open_offline.3 \
- pcap_set_buffer_size.3 pcap_set_datalink.3 pcap_set_promisc.3 \
- pcap_set_rfmon.3 pcap_set_snaplen.3 pcap_set_timeout.3 \
- pcap_setdirection.3 pcap_setfilter.3 pcap_setnonblock.3 \
- pcap_snapshot.3 pcap_stats.3 pcap_statustostr.3 \
- pcap_strerror.3 pcap-savefile.5 pcap-filter.7 pcap-linktype.7
-
-
-MAN3IN= pcap.3pcap.in pcap_compile.3pcap.in pcap_datalink.3pcap.in \
- pcap_dump_open.3pcap.in pcap_list_datalinks.3pcap.in \
- pcap_open_dead.3pcap.in pcap_open_offline.3pcap.in
-MANMISCIN= pcap-filter.manmisc.in pcap-linktype.manmisc.in
-MANFILEIN= pcap-savefile.manfile.in
+MANSRC= \
+pcap.3pcap \
+pcap_activate.3pcap \
+pcap_breakloop.3pcap \
+pcap_can_set_rfmon.3pcap \
+pcap_close.3pcap \
+pcap_compile.3pcap \
+pcap_create.3pcap \
+pcap_datalink.3pcap \
+pcap_datalink_name_to_val.3pcap \
+pcap_datalink_val_to_name.3pcap \
+pcap_dump.3pcap \
+pcap_dump_close.3pcap \
+pcap_dump_file.3pcap \
+pcap_dump_flush.3pcap \
+pcap_dump_ftell.3pcap \
+pcap_dump_open.3pcap \
+pcap_file.3pcap \
+pcap_fileno.3pcap \
+pcap_findalldevs.3pcap \
+pcap_freecode.3pcap \
+pcap_get_selectable_fd.3pcap \
+pcap_geterr.3pcap \
+pcap_inject.3pcap \
+pcap_is_swapped.3pcap \
+pcap_lib_version.3pcap \
+pcap_list_datalinks.3pcap \
+pcap_list_tstamp_types.3pcap \
+pcap_lookupdev.3pcap \
+pcap_lookupnet.3pcap \
+pcap_loop.3pcap \
+pcap_major_version.3pcap \
+pcap_next_ex.3pcap \
+pcap_offline_filter.3pcap \
+pcap_open_dead.3pcap \
+pcap_open_live.3pcap \
+pcap_open_offline.3pcap \
+pcap_set_buffer_size.3pcap \
+pcap_set_datalink.3pcap \
+pcap_set_promisc.3pcap \
+pcap_set_rfmon.3pcap \
+pcap_set_snaplen.3pcap \
+pcap_set_timeout.3pcap \
+pcap_set_tstamp_type.3pcap \
+pcap_setdirection.3pcap \
+pcap_setfilter.3pcap \
+pcap_setnonblock.3pcap \
+pcap_snapshot.3pcap \
+pcap_stats.3pcap \
+pcap_statustostr.3pcap \
+pcap_strerror.3pcap \
+pcap_tstamp_type_name_to_val.3pcap \
+pcap_tstamp_type_val_to_name.3pcap
+
+MAN=${MANSRC:S/3pcap/3/g}
+
+MAN3IN= \
+pcap.3pcap.in \
+pcap_compile.3pcap.in \
+pcap_datalink.3pcap.in \
+pcap_dump_open.3pcap.in \
+pcap_list_datalinks.3pcap.in \
+pcap_list_tstamp_types.3pcap.in \
+pcap_open_dead.3pcap.in \
+pcap_open_offline.3pcap.in \
+pcap_set_tstamp_type.3pcap.in
+
+MANMISCIN= \
+pcap-filter.manmisc.in \
+pcap-linktype.manmisc.in \
+pcap-tstamp.manmisc.in
+MANFILEIN= pcap-savefile.manfile.in
CLEANFILES+= ${MAN}
WARNS?= 4
Index: src/external/bsd/libpcap/lib/shlib_version
diff -u src/external/bsd/libpcap/lib/shlib_version:1.1 src/external/bsd/libpcap/lib/shlib_version:1.2
--- src/external/bsd/libpcap/lib/shlib_version:1.1 Sat Dec 4 20:45:46 2010
+++ src/external/bsd/libpcap/lib/shlib_version Sat Apr 6 13:29:12 2013
@@ -1,5 +1,5 @@
-# $NetBSD: shlib_version,v 1.1 2010/12/05 01:45:46 christos Exp $
+# $NetBSD: shlib_version,v 1.2 2013/04/06 17:29:12 christos Exp $
# Remember to update distrib/sets/lists/base/shl.*
CVS commit: src/external/bsd/libpcap/lib
Module Name:src Committed By: christos Date: Sat Apr 6 17:36:41 UTC 2013 Modified Files: src/external/bsd/libpcap/lib: Makefile Log Message: install in /lib per rmind's request To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/bsd/libpcap/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/libpcap/lib/Makefile diff -u src/external/bsd/libpcap/lib/Makefile:1.9 src/external/bsd/libpcap/lib/Makefile:1.10 --- src/external/bsd/libpcap/lib/Makefile:1.9 Sat Apr 6 13:29:12 2013 +++ src/external/bsd/libpcap/lib/Makefile Sat Apr 6 13:36:40 2013 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2013/04/06 17:29:12 christos Exp $ +# $NetBSD: Makefile,v 1.10 2013/04/06 17:36:40 christos Exp $ +USE_SHLIBDIR=yes .include bsd.own.mk - USE_FORT?= yes # network protocol library CWARNFLAGS.clang+= -Wno-format-extra-args \
CVS commit: src/external/bsd/libpcap/lib
Module Name:src
Committed By: christos
Date: Sun Apr 7 00:18:55 UTC 2013
Modified Files:
src/external/bsd/libpcap/lib: Makefile
Log Message:
add the rest of the man pages.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/libpcap/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libpcap/lib/Makefile
diff -u src/external/bsd/libpcap/lib/Makefile:1.10 src/external/bsd/libpcap/lib/Makefile:1.11
--- src/external/bsd/libpcap/lib/Makefile:1.10 Sat Apr 6 13:36:40 2013
+++ src/external/bsd/libpcap/lib/Makefile Sat Apr 6 20:18:55 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/04/06 17:36:40 christos Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/07 00:18:55 christos Exp $
USE_SHLIBDIR=yes
.include bsd.own.mk
@@ -28,7 +28,7 @@ SRCDIR= ${.CURDIR}/../dist
.PATH: ${SRCDIR}
LIB= pcap
-MANSRC= \
+MAN3= \
pcap.3pcap \
pcap_activate.3pcap \
pcap_breakloop.3pcap \
@@ -82,7 +82,6 @@ pcap_strerror.3pcap \
pcap_tstamp_type_name_to_val.3pcap \
pcap_tstamp_type_val_to_name.3pcap
-MAN=${MANSRC:S/3pcap/3/g}
MAN3IN= \
pcap.3pcap.in \
@@ -102,6 +101,8 @@ pcap-tstamp.manmisc.in
MANFILEIN= pcap-savefile.manfile.in
CLEANFILES+= ${MAN}
+MAN= ${MAN3:S/3pcap/3/g} ${MAN3IN:S/3pcap.in/3/g} \
+ ${MANMISCIN:S/manmisc.in/7/g} ${MANFILEIN:S/manfile.in/5/g}
WARNS?= 4
.for i in ${MAN3IN}
CVS commit: src/external/bsd/libpcap/lib
Module Name:src
Committed By: plunky
Date: Thu Sep 15 17:59:45 UTC 2011
Modified Files:
src/external/bsd/libpcap/lib: Makefile
Log Message:
revert v1.31 (when this was lib/libpcap/Makefile), the HAVE_PCC
is not any longer required since pcc understands gcc attributes
now
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libpcap/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libpcap/lib/Makefile
diff -u src/external/bsd/libpcap/lib/Makefile:1.5 src/external/bsd/libpcap/lib/Makefile:1.6
--- src/external/bsd/libpcap/lib/Makefile:1.5 Tue Aug 16 10:34:23 2011
+++ src/external/bsd/libpcap/lib/Makefile Thu Sep 15 17:59:45 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/08/16 10:34:23 christos Exp $
+# $NetBSD: Makefile,v 1.6 2011/09/15 17:59:45 plunky Exp $
.include bsd.own.mk
@@ -73,12 +73,7 @@
YHEADER= 1
CPPFLAGS+= -DHAVE_CONFIG_H
-
-.if defined(HAVE_PCC)
-CPPFLAGS+= -D_U_=
-.elif defined(HAVE_GCC)
CPPFLAGS+= -D_U_=__attribute__((__unused__))
-.endif
.if (${USE_INET6} != no)
CPPFLAGS+= -DINET6
CVS commit: src/external/bsd/libpcap/lib
Module Name:src
Committed By: dholland
Date: Tue Jul 19 03:07:09 UTC 2011
Modified Files:
src/external/bsd/libpcap/lib: Makefile
Log Message:
Remove spurious trailing slash; PR 45067 from Henning Petersen.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libpcap/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libpcap/lib/Makefile
diff -u src/external/bsd/libpcap/lib/Makefile:1.3 src/external/bsd/libpcap/lib/Makefile:1.4
--- src/external/bsd/libpcap/lib/Makefile:1.3 Thu May 26 12:56:25 2011
+++ src/external/bsd/libpcap/lib/Makefile Tue Jul 19 03:07:09 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/05/26 12:56:25 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2011/07/19 03:07:09 dholland Exp $
.include bsd.own.mk
@@ -22,7 +22,7 @@
-e 's,3PCAP,3,g' ${.ALLSRC} ${.TARGET}
-SRCDIR= ${.CURDIR}/../dist/
+SRCDIR= ${.CURDIR}/../dist
.PATH: ${SRCDIR}
LIB= pcap
CVS commit: src/external/bsd/libpcap/lib
Module Name:src
Committed By: christos
Date: Sun Dec 5 03:03:27 UTC 2010
Modified Files:
src/external/bsd/libpcap/lib: Makefile
Log Message:
we need some more files here.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libpcap/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libpcap/lib/Makefile
diff -u src/external/bsd/libpcap/lib/Makefile:1.1 src/external/bsd/libpcap/lib/Makefile:1.2
--- src/external/bsd/libpcap/lib/Makefile:1.1 Sat Dec 4 20:45:46 2010
+++ src/external/bsd/libpcap/lib/Makefile Sat Dec 4 22:03:27 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/12/05 01:45:46 christos Exp $
+# $NetBSD: Makefile,v 1.2 2010/12/05 03:03:27 christos Exp $
.include bsd.own.mk
@@ -6,9 +6,17 @@
.SUFFIXES: .3 .3pcap
+__sed: .USE
+ @rm -f ${.TARGET}
+ ${TOOL_SED} -e 's,@MAN_FILE_FORMATS@,5,g' \
+ -e 's,@MAN_MISC_INFO@,7,g' \
+ -e 's,3PCAP,3,g' ${.ALLSRC} ${.TARGET}
+
.3pcap.3:
- rm -f ${.TARGET}
- cp ${.IMPSRC} ${.TARGET}
+ @rm -f ${.TARGET}
+ ${TOOL_SED} -e 's,@MAN_FILE_FORMATS@,5,g' \
+ -e 's,@MAN_MISC_INFO@,7,g' \
+ -e 's,3PCAP,3,g' ${.ALLSRC} ${.TARGET}
SRCDIR= ${.CURDIR}/../dist/
@@ -43,11 +51,6 @@
WARNS?= 5
-__sed: .USE
- @rm -f ${.TARGET}
- ${TOOL_SED} -e 's,@MAN_FILE_FORMATS@,5,g' \
- -e 's,@MAN_MISC_INFO@,7,g' ${.ALLSRC} ${.TARGET}
-
.for i in ${MAN3IN}
${i:S/pcap.in//}: ${i} __sed
.endfor
@@ -80,12 +83,12 @@
SRCS= scanner.l savefile.c pcap.c pcap-bpf.c optimize.c nametoaddr.c \
inet.c grammar.y gencode.c fad-getad.c etherent.c bpf_image.c \
- bpf_dump.c version.c
+ bpf_dump.c version.c sf-pcap-ng.c sf-pcap.c pcap-common.c
.PATH: ${NETBSDSRCDIR}/sys/net
SRCS+= bpf_filter.c
-INCS= pcap-namedb.h pcap.h
+INCS= pcap-namedb.h pcap.h pcap/pcap.h pcap/namedb.h pcap/bpf.h
INCSDIR= /usr/include
scanner.d scanner.o: tokdefs.h
