From df62d49c7e04f0fed747defbd0a997a1b41bc987 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 13:09:13 +0000
Subject: [PATCH] auto-import changelog data from tcpdump-3.6.2-7.src.rpm
 3.6.2-7 - added shared library to libpcap (#47174) - afs printing security
 patch (#49294)

---
 tcpdump.spec | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/tcpdump.spec b/tcpdump.spec
index 2d49731..f567993 100644
--- a/tcpdump.spec
+++ b/tcpdump.spec
@@ -1,13 +1,15 @@
 %define	_vararpwatch	%{_localstatedir}/arpwatch
+%define PCAP_UID 77
+%define PCAP_GID 77
 
 Summary: A network traffic monitoring tool.
 Name: tcpdump
 Version: 3.6.2
 %define	tcpdump_dir	tcpdump-3.6.2
 %define tcpslice_dir	tcpslice
-Release: 6
+Release: 7
 # XXX epoch is necessary to obsolete tcpdump-3.4a5
-Epoch: 9
+Epoch: 10
 Copyright: BSD
 Group: Applications/Internet
 Source0: http://www.tcpdump.org/release/tcpdump-3.6.2.tar.gz
@@ -15,6 +17,8 @@ Source1: http://www.tcpdump.org/release/libpcap-0.6.2.tar.gz
 Source2: ftp://ftp.ee.lbl.gov/arpwatch-2.1a11.tar.gz
 Source3: arpwatch.init
 Source4: tcpslice-CVS.20010207.tar.gz
+Source5: arpwatch.sysconfig
+Source6: arpwatch-ethercodes.dat 
 
 
 Patch5: tcpdump-3.6.2-tcpslice-time.patch
@@ -24,12 +28,15 @@ Patch8: tcpdump-3.6.1-droproot2.patch
 Patch9: tcpdump-3.6.1-smb-quiet.patch
 Patch10: tcpdump-3.6.1-portnumbers.patch
 Patch11: tcpdump-3.6.1-non-promisc-default.patch
+Patch12: tcpdump-3.6.2-afsprinting.patch
 
 Patch34: arpwatch-2.1a4-fhs.patch
 Patch35: arpwatch-2.1a10-man.patch
 Patch38: arpwatch-drop.patch
 Patch39: arpwatch-drop-man.patch
 
+Patch50: libpcap-shared.patch
+
 Prefix: %{_prefix}
 BuildRequires: kernel-headers >= 2.2.0 openssl-devel
 Requires: kernel >= 2.2.0
@@ -86,6 +93,7 @@ network.
 %patch7 -p0 -b .rh
 
 pushd %libpcap_dir
+%patch50 -p1 -b .shared 
 popd
 
 pushd %tcpdump_dir
@@ -94,6 +102,7 @@ pushd %tcpdump_dir
 %patch9 -p1 -b .smb
 %patch10 -p1 -b .portnumbers
 #%patch11 -p1 -b .nonpromisc		# Not by default
+%patch12 -p1 -b .afsprinting
 popd
 
 pushd %arpwatch_dir
@@ -102,7 +111,7 @@ pushd %arpwatch_dir
 %patch38 -p1 -b .droproot
 %patch39 -p0 -b .droprootman
 chmod u+w ethercodes.dat
-cp %SOURCE4 ethercodes.dat
+cp %SOURCE6 ethercodes.dat
 popd
 
 %build
@@ -182,6 +191,8 @@ done
 ( cd ${RPM_BUILD_ROOT}
   mkdir -p ./etc/rc.d/init.d
   install -c -m755 $RPM_SOURCE_DIR/arpwatch.init ./etc/rc.d/init.d/arpwatch
+  mkdir -p ./etc/sysconfig
+  install -c -m644 $RPM_SOURCE_DIR/arpwatch.sysconfig ./etc/sysconfig/arpwatch
 )
 popd
 
@@ -195,6 +206,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %post -n arpwatch
 /sbin/chkconfig --add arpwatch
 
+%pre -n arpwatch
+/usr/sbin/groupadd -g %{PCAP_GID} pcap  2> /dev/null || :  
+/usr/sbin/useradd -u %{PCAP_UID} -g %{PCAP_GID} \
+        -s /bin/nologin -M -r -d %{_vararpwatch} pcap 2> /dev/null || :
+
 %postun -n arpwatch
 if [ "$1" -ge "1" ]; then
   /sbin/service arpwatch condrestart >/dev/null 2>&1
@@ -206,6 +222,10 @@ if [ $1 = 0 ]; then
 	/sbin/chkconfig --del arpwatch
 fi
 
+%post -n libpcap -p /sbin/ldconfig
+ 
+%postun -n libpcap -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root)
 %doc	%tcpdump_dir/README %tcpdump_dir/CHANGES
@@ -218,7 +238,7 @@ fi
 %defattr(-,root,root)
 %doc	%libpcap_dir/README %libpcap_dir/CHANGES
 %{_includedir}/pcap
-%{_libdir}/libpcap.a
+%{_libdir}/libpcap.*
 %{_mandir}/man3/pcap.3*
 
 %files -n arpwatch
@@ -229,6 +249,8 @@ fi
 %{_mandir}/man8/arpwatch.8*
 %{_mandir}/man8/arpsnmp.8*
 %config	/etc/rc.d/init.d/arpwatch
+%config(noreplace) /etc/sysconfig/arpwatch
+%defattr(-,pcap,pcap)
 %dir	%{_vararpwatch}
 %config	%{_vararpwatch}/arp.dat
 %config	%{_vararpwatch}/ethercodes.dat
@@ -240,6 +262,10 @@ fi
 %{_vararpwatch}/massagevendor-old
 
 %changelog
+* Thu Jul 19 2001 Harald Hoyer <harald@redhat.de> 10:3.6.2-7
+- added shared library to libpcap (#47174)
+- afs printing security patch (#49294)
+
 * Wed Jun 20 2001 Harald Hoyer <harald@redhat.de>
 - use initgroups, instead of setgroups