From ae413cde127b56193b00444d34f6d0cd38a8fdad Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@fedoraproject.org>
Date: Nov 17 2006 09:14:36 +0000
Subject: - fix processing of Prism and AVS headers (#206686)

- fix arp2ethers script
- update ethercodes.dat
- move pcap man page to devel package Resolves: #206686

---

diff --git a/.cvsignore b/.cvsignore
index 3cee86c..e9bfe82 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -9,3 +9,4 @@ tcpdump-3.9.3.tar.gz
 libpcap-0.9.3.tar.gz
 tcpdump-3.9.4.tar.gz
 libpcap-0.9.4.tar.gz
+ethercodes-2.1a15.dat.bz2
diff --git a/sources b/sources
index ed5270b..569a465 100644
--- a/sources
+++ b/sources
@@ -3,3 +3,4 @@ b9ff9739cdd2c0e9807b2d05860e4811  arpwatch-2.1a13.tar.gz
 6e65ea04ab6773c937986098028c8f21  rpc.tar.gz
 4b64755bbc8ba1af49c747271a6df5b8  tcpdump-3.9.4.tar.gz
 79025766e8027df154cb1f32de8a7974  libpcap-0.9.4.tar.gz
+4df4ce9cfedcc0bac894dfac61190f89  ethercodes-2.1a15.dat.bz2
diff --git a/tcpdump.spec b/tcpdump.spec
index f6c7123..81b0117 100644
--- a/tcpdump.spec
+++ b/tcpdump.spec
@@ -2,8 +2,8 @@
 %define PCAP_UID 77
 %define PCAP_GID 77
 
-%define releaseno        8
-%define arpwatch_release 15.%{releaseno}
+%define releaseno        9%{?dist}
+%define arpwatch_release 16%{?dist}
 %define pcap_release %{releaseno}
 %define tcpdump_release %{releaseno}
 
@@ -19,7 +19,7 @@ Name: tcpdump
 Version: %{tcpdump_version}
 %define	tcpdump_dir	tcpdump-%{tcpdump_version}
 %define tcpslice_dir	tcpslice
-Release: %{tcpdump_release}.1
+Release: %{tcpdump_release}
 
 # XXX epoch is necessary to obsolete tcpdump-3.4a5
 Epoch: 14
@@ -34,6 +34,7 @@ Source3: arpwatch.init
 Source4: tcpslice-CVS.20010207.tar.gz
 Source5: arpwatch.sysconfig
 Source6: rpc.tar.gz
+Source7: ethercodes-2.1a15.dat.bz2
 
 Patch5:  tcpdump-3.6.2-tcpslice-time.patch
 Patch7:  tcpdump-3.9.1-redhat.patch
@@ -51,11 +52,12 @@ Patch38: arpwatch-drop.patch
 Patch39: arpwatch-drop-man.patch
 Patch41: arpwatch-addr.patch
 Patch42: arpwatch-dir-man.patch
-Patch43: arpwatch-ethcodes.patch.bz2
+Patch43: arpwatch-arp2ethers.patch
 
 Patch50: libpcap-shared.patch
 Patch52: tcpdump-3.7.2-s390.patch
 Patch53: libpcap-0.8.3-ppp.patch
+Patch54: libpcap-0.9.4-off_ll.patch
 
 Patch70: tcpslice-CVS.20010207-bpf.patch
 
@@ -77,13 +79,12 @@ Install tcpdump if you need a program to monitor network traffic.
 # if you change the Version, don't forget to edit libpcap-shared.patch
 # could be sed'd automatically
 Version: %{pcap_version}
-Release: %{pcap_release}.1
+Release: %{pcap_release}
 %define	libpcap_dir	libpcap-%{pcap_version}
 Summary: A system-independent interface for user-level packet capture.
 Group: Development/Libraries
 License: BSD
 URL: http://www.tcpdump.org
-Requires: openssl
 
 %description -n libpcap
 Libpcap provides a portable framework for low-level network
@@ -99,7 +100,7 @@ on your network.
 
 %package -n libpcap-devel
 Version: %{pcap_version}
-Release: %{pcap_release}.1
+Release: %{pcap_release}
 Summary: A pcap library.
 Group: Development/Libraries
 License: BSD
@@ -120,7 +121,7 @@ resources needed for developing libpcap applications.
  
 %package -n arpwatch
 Version: 2.1a13
-Release: %{arpwatch_release}.1
+Release: %{arpwatch_release}
 %define	arpwatch_dir	arpwatch-2.1a13
 Summary: Network monitoring tools for tracking IP addresses on a network.
 Group: Applications/System
@@ -149,6 +150,7 @@ pushd %libpcap_dir
 %patch50 -p1 -b .shared 
 %patch52 -p1 -b .s390
 %patch53 -p0 -b .ppp
+%patch54 -p1 -b .off_ll
 popd
 
 pushd %tcpdump_dir
@@ -169,7 +171,9 @@ pushd %arpwatch_dir
 %patch39 -p0 -b .droprootman
 %patch41 -p1 -b .mailuser
 %patch42 -p1 -b .dirman
-%patch43 -p1
+%patch43 -p1 -b .arp2ethers
+bzip2 -dc %{SOURCE7} > ethercodes.dat
+> missingcodes.txt
 popd
 
 pushd tcpslice
@@ -313,13 +317,13 @@ exit 0
 %defattr(-,root,root)
 %doc	%libpcap_dir/LICENSE %libpcap_dir/README %libpcap_dir/CHANGES
 %{_libdir}/libpcap.so.*
-%{_mandir}/man3/pcap.3*
 
 %files -n libpcap-devel
 %defattr(-,root,root)
 %{_includedir}/*
 %{_libdir}/libpcap.so
 %{_libdir}/libpcap.a
+%{_mandir}/man3/pcap.3*
 
 %files -n arpwatch
 %defattr(-,root,root)
@@ -342,6 +346,12 @@ exit 0
 %{_vararpwatch}/massagevendor-old
 
 %changelog
+* Fri Nov 17 2006 Miroslav Lichvar <mlichvar@redhat.com> - 14:3.9.4-9
+- fix processing of Prism and AVS headers (#206686)
+- fix arp2ethers script
+- update ethercodes.dat
+- move pcap man page to devel package
+
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 14:3.9.4-8.1
 - rebuild