release/4.8.0_cvs

11 files changed, 10 insertions, 22 deletions

diff --git a/contrib/libpcap/.cvsignore b/contrib/libpcap/.cvsignore
deleted file mode 100644
index a1cfe23a02e0..000000000000
--- a/contrib/libpcap/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-config.log
-config.cache
-config.status
-config.h
-.devel
-stamp-h
-stamp-h.in
-Makefile
-scanner.c
-grammar.c
-tokdefs.h
-version.c
diff --git a/contrib/libpcap/bpf/net/bpf.h b/contrib/libpcap/bpf/net/bpf.h
index 405842eadda9..028091c13423 100644
--- a/contrib/libpcap/bpf/net/bpf.h
+++ b/contrib/libpcap/bpf/net/bpf.h
@@ -39,7 +39,7 @@
  *
  * @(#) $Header: /tcpdump/master/libpcap/bpf/net/bpf.h,v 1.51 2001/11/28 05:50:05 guy Exp $ (LBL)
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/bpf/net/bpf.h,v 1.2.2.2 2002/07/05 14:40:00 fenner Exp $
  */
 
 #ifndef BPF_MAJOR_VERSION
diff --git a/contrib/libpcap/gencode.c b/contrib/libpcap/gencode.c
index ea622dec8d44..4a1c89367528 100644
--- a/contrib/libpcap/gencode.c
+++ b/contrib/libpcap/gencode.c
@@ -19,7 +19,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/gencode.c,v 1.8.2.2 2002/07/05 14:39:58 fenner Exp $
  */
 #ifndef lint
 static const char rcsid[] =
diff --git a/contrib/libpcap/gencode.h b/contrib/libpcap/gencode.h
index c790547f4861..c5aa9e2f9dbc 100644
--- a/contrib/libpcap/gencode.h
+++ b/contrib/libpcap/gencode.h
@@ -20,7 +20,7 @@
  *
  * @(#) $Header: /tcpdump/master/libpcap/gencode.h,v 1.53 2001/05/10 14:48:02 fenner Exp $ (LBL)
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/gencode.h,v 1.3.2.2 2002/07/05 14:39:58 fenner Exp $
  */
 
 /* Address qualifiers. */
diff --git a/contrib/libpcap/grammar.y b/contrib/libpcap/grammar.y
index ea7501251ae5..aa45b03d1a4b 100644
--- a/contrib/libpcap/grammar.y
+++ b/contrib/libpcap/grammar.y
@@ -19,7 +19,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/grammar.y,v 1.5.2.2 2002/07/05 14:39:58 fenner Exp $
  */
 #ifndef lint
 static const char rcsid[] =
diff --git a/contrib/libpcap/nametoaddr.c b/contrib/libpcap/nametoaddr.c
index 3043a58cdf12..68afee49ac48 100644
--- a/contrib/libpcap/nametoaddr.c
+++ b/contrib/libpcap/nametoaddr.c
@@ -21,7 +21,7 @@
  * Name to id translation routines used by the scanner.
  * These functions are not time critical.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/nametoaddr.c,v 1.6.2.3 2002/07/05 14:39:58 fenner Exp $
  */
 
 #ifndef lint
diff --git a/contrib/libpcap/pcap-int.h b/contrib/libpcap/pcap-int.h
index dbac5886ab03..98b112b3cb15 100644
--- a/contrib/libpcap/pcap-int.h
+++ b/contrib/libpcap/pcap-int.h
@@ -32,7 +32,7 @@
  *
  * @(#) $Header: /tcpdump/master/libpcap/pcap-int.h,v 1.33 2001/08/24 07:46:52 guy Exp $ (LBL)
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/pcap-int.h,v 1.3.2.2 2002/07/05 14:39:58 fenner Exp $
  */
 
 #ifndef pcap_int_h
diff --git a/contrib/libpcap/pcap-namedb.h b/contrib/libpcap/pcap-namedb.h
index 43fe1edf55e4..8019a31353f6 100644
--- a/contrib/libpcap/pcap-namedb.h
+++ b/contrib/libpcap/pcap-namedb.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/pcap-namedb.h,v 1.3.2.1 2001/08/01 00:23:07 fenner Exp $
  * @(#) $Header: /tcpdump/master/libpcap/pcap-namedb.h,v 1.8 2000/07/29 07:36:43 guy Exp $ (LBL)
  */
 
diff --git a/contrib/libpcap/pcap.3 b/contrib/libpcap/pcap.3
index 76a8855ec468..74e5963f256c 100644
--- a/contrib/libpcap/pcap.3
+++ b/contrib/libpcap/pcap.3
@@ -19,7 +19,7 @@
 .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/contrib/libpcap/pcap.3,v 1.7.2.2 2002/07/05 14:39:58 fenner Exp $
 .\"
 .TH PCAP 3 "3 January 2001"
 .SH NAME
diff --git a/contrib/libpcap/pcap.h b/contrib/libpcap/pcap.h
index e4ea023ffc24..9e6879613f71 100644
--- a/contrib/libpcap/pcap.h
+++ b/contrib/libpcap/pcap.h
@@ -33,7 +33,7 @@
  *
  * @(#) $Header: /tcpdump/master/libpcap/pcap.h,v 1.34 2001/12/09 05:10:03 guy Exp $ (LBL)
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/pcap.h,v 1.4.2.2 2002/07/05 14:39:58 fenner Exp $
  */
 
 #ifndef lib_pcap_h
diff --git a/contrib/libpcap/scanner.l b/contrib/libpcap/scanner.l
index 15c26733aec0..1f5f0a407ce3 100644
--- a/contrib/libpcap/scanner.l
+++ b/contrib/libpcap/scanner.l
@@ -19,7 +19,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/contrib/libpcap/scanner.l,v 1.5.2.3 2002/07/05 14:39:58 fenner Exp $
  */
 
 #ifndef lint