removed conflicting libpcap spec file, really ready for 3.91 release I hope

CHANGELOG

@@ -1,5 +1,7 @@
 # Nmap Changelog ($Id$)
 
+Nmap 3.91
+
 o Fixed a crash on Windows when you -P0 scan an unused IP on a local
   network (or a range that contains unused IPs).  This could also
   happen on UNIX if you specified the new --send_eth option.  Thanks
@@ -16,7 +18,10 @@ o Updated the included libpcre (used for version detection) from
   version 4.3 to 6.3.  A libpcre securty issue was fixed in 6.3, but
   that issue never affected Nmap.
 
-o Updated the included libpcap from 0.8.3 to 0.9.3.
+o Updated the included libpcap from 0.8.3 to 0.9.3.  I also changed
+  the directory name in the Nmap tarball from libpcap-possiblymodified
+  to just libpcap.  As usual, the modifications are described in the
+  NMAP_MODIFICATIONS in that directory.
 
 Nmap 3.90
 

configure

@@ -1341,7 +1341,7 @@ if test "$user_localdirs" = 1; then
    fi
 fi
 
-libpcapdir=libpcap-possiblymodified
+libpcapdir=libpcap
 
 
 pcredir=libpcre

configure.ac

@@ -27,7 +27,7 @@ if test "$user_localdirs" = 1; then
    fi
 fi
 
-libpcapdir=libpcap-possiblymodified
+libpcapdir=libpcap
 AC_SUBST(libpcapdir)
 
 pcredir=libpcre

libpcap-possiblymodified/packaging/pcap.spec

@@ -1,65 +0,0 @@
-%define prefix   /usr
-%define version 0.9
-
-Summary: packet capture library
-Name: libpcap
-Version: %version
-Release: 1
-Group: Development/Libraries
-Copyright: BSD
-Source: libpcap-0.9-PRE-CVS.tar.gz
-BuildRoot: /tmp/%{name}-buildroot
-URL: http://www.tcpdump.org
-
-%description
-Packet-capture library LIBPCAP 0.9
-Now maintained by "The Tcpdump Group"
-See http://www.tcpdump.org
-Please send inquiries/comments/reports to tcpdump-workers@tcpdump.org
-
-%prep
-%setup
-
-%post
-ldconfig
-
-%build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix
-make
-
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/{lib,include}
-mkdir -p $RPM_BUILD_ROOT/usr/share/man
-mkdir -p $RPM_BUILD_ROOT/usr/include/net
-mkdir -p $RPM_BUILD_ROOT/usr/man/man3
-make install DESTDIR=$RPM_BUILD_ROOT mandir=/usr/share/man
-cd $RPM_BUILD_ROOT/usr/lib
-V1=`echo 0.9 | sed 's/\\.[^\.]*$//g'`
-V2=`echo 0.9 | sed 's/\\.[^\.]*\.[^\.]*$//g'`
-ln -sf libpcap.so.0.9 libpcap.so.$V1
-if test "$V2" -ne "$V1"; then
-    ln -sf libpcap.so.$V1 libpcap.so.$V2
-    ln -sf libpcap.so.$V2 libpcap.so
-else
-    ln -sf libpcap.so.$V1 libpcap.so
-fi
-
-#install -m 755 -o root libpcap.a $RPM_BUILD_ROOT/usr/lib
-#install -m 644 -o root pcap.3 $RPM_BUILD_ROOT/usr/man/man3
-#install -m 644 -o root pcap.h $RPM_BUILD_ROOT/usr/include
-#install -m 644 -o root pcap-bpf.h $RPM_BUILD_ROOT/usr/include/net
-#install -m 644 -o root pcap-namedb.h $RPM_BUILD_ROOT/usr/include
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-%doc LICENSE CHANGES INSTALL.txt README.linux TODO VERSION CREDITS packaging/pcap.spec
-/usr/lib/libpcap.a
-/usr/share/man/man3/*
-/usr/include/pcap.h
-/usr/include/pcap-bpf.h
-/usr/include/pcap-namedb.h
-/usr/lib/libpcap.so*

libpcap/NMAP_MODIFICATIONS

@@ -1,10 +1,13 @@
+NOTE: This has been upgraded to pcap 0.9.3 since the instructions
+below were written.  That upgrade was done by applying a diff
+between pcap 0.8.3 and 0.9.3 to the Nmap libpcap dir.
 
 Nmap currently includes a modified version of the tcpdump.org release
 of libpcap version 0.8.3 (released March 30, 2004).  My
 (fyodor@insecure.org) modifications are as follows:
 
 o Included this file, renamed directory from libpcap-0.8.3 to
-  libpcap-possiblymodified.
+  libpcap.
 
 o Renamed configure.in to configure.ac, which is the name now
   recommended by the autoconf project.
@@ -16,7 +19,7 @@ o Rewrote Win32 version of eth_open() as the previous verson didn't
   
 o Added the gcc debugging flag (-g) to aclocal.m4 if gcc is being used:
 --- libpcap-0.8.3/aclocal.m4    2003-11-16 01:45:51.000000000 -0800
-+++ libpcap-possiblymodified/aclocal.m4 2004-07-31 22:34:47.000000000 -0700
++++ libpcap/aclocal.m4 2004-07-31 22:34:47.000000000 -0700
 @@ -1,4 +1,4 @@
 -dnl @(#) $Header$ (LBL)
 +dnl @(#) $Header$ (LBL)
@@ -49,7 +52,7 @@ o Changed pcap-linux.c by adding a select() call guarding recvfrom()
   to insure that it returns after the timeout period specified in
   pcap_open_live() rather than blocking forever.
 --- libpcap-0.8.3/pcap-linux.c  2003-11-21 02:20:46.000000000 -0800
-+++ libpcap-possiblymodified/pcap-linux.c       2004-07-31 22:34:47.000000000 -0700
++++ libpcap/pcap-linux.c       2004-07-31 22:34:47.000000000 -0700
 @@ -27,7 +27,7 @@
  
  #ifndef lint
@@ -106,7 +109,7 @@ o Eliminated Lex/Yacc requirement (I now ship the generated .c files).
 
    o Changes to Makefile.in
 --- libpcap-0.8.3/Makefile.in   2003-12-14 17:42:23.000000000 -0800
-+++ libpcap-possiblymodified/Makefile.in        2004-07-31 22:34:47.000000000 -0700
++++ libpcap/Makefile.in        2004-07-31 22:34:47.000000000 -0700
 @@ -17,7 +17,7 @@
  #  WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
@@ -138,7 +141,7 @@ o Eliminated Lex/Yacc requirement (I now ship the generated .c files).
  
   o Ripped LEX/YACC detection code from configure.in:
 --- libpcap-0.8.3/configure.in  2004-03-28 13:43:34.000000000 -0800
-+++ libpcap-possiblymodified/configure.ac       2004-07-31 22:34:47.000000000 -0700
++++ libpcap/configure.ac       2004-07-31 22:34:47.000000000 -0700
 @@ -1,4 +1,4 @@
 -dnl @(#) $Header$ (LBL)
 +dnl @(#) $Header$ (LBL)
@@ -243,3 +246,4 @@ Ben Harris (bjh21(a)cam.ac.uk)
  
         /*
 
+o Removed packaging/pcap.spec because it conflicted with the Nmap spec file when building RPMs from the tarball.