Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/libpcap/dist Numbers seem to be off here:



details:   https://anonhg.NetBSD.org/src/rev/519c730bbac4
branches:  trunk
changeset: 337067:519c730bbac4
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Mar 31 21:25:19 2015 +0000

description:
Numbers seem to be off here:

Thursday Feb. 12, 2015 guy%alum.mit.edu@localhost/mcr%sandelman.ca@localhost
  Summary for 1.8.0 libpcap release
        Support for filtering Geneve encapsulated packets.

Wednesday Nov. 12, 2014 guy%alum.mit.edu@localhost/mcr%sandelman.ca@localhost
  Summary for 1.7.0 libpcap release
        Fix handling of zones for BPF on Solaris
        new DLT for ZWAVE
        clarifications for read timeouts.
        added bpf_filter1() with extensions
        some fixes to compilation without stdint.h
        EBUSY can now be returned by SNFv3 code.

diffstat:

 external/bsd/libpcap/dist/CHANGES                            |   21 +-
 external/bsd/libpcap/dist/CREDITS                            |    7 +-
 external/bsd/libpcap/dist/INSTALL.txt                        |    9 +-
 external/bsd/libpcap/dist/LICENSE                            |    6 +-
 external/bsd/libpcap/dist/Makefile.in                        |   16 +-
 external/bsd/libpcap/dist/README                             |   10 +-
 external/bsd/libpcap/dist/README.Win32                       |   42 +-
 external/bsd/libpcap/dist/README.aix                         |    4 +-
 external/bsd/libpcap/dist/README.hpux                        |   40 +-
 external/bsd/libpcap/dist/README.linux                       |    6 +-
 external/bsd/libpcap/dist/README.septel                      |    2 +-
 external/bsd/libpcap/dist/README.tru64                       |    2 +-
 external/bsd/libpcap/dist/TODO                               |   10 +-
 external/bsd/libpcap/dist/VERSION                            |    2 +-
 external/bsd/libpcap/dist/Win32/Include/addrinfo.h           |   10 +-
 external/bsd/libpcap/dist/Win32/Include/arpa/nameser.h       |   10 +-
 external/bsd/libpcap/dist/Win32/Include/bittypes.h           |    6 +-
 external/bsd/libpcap/dist/Win32/Include/cdecl_ext.h          |    4 +-
 external/bsd/libpcap/dist/Win32/Include/net/if.h             |    2 +-
 external/bsd/libpcap/dist/Win32/Include/net/netdb.h          |    4 +-
 external/bsd/libpcap/dist/Win32/Include/sockstorage.h        |    4 +-
 external/bsd/libpcap/dist/Win32/Prj/libpcap.dsp              |   14 +-
 external/bsd/libpcap/dist/Win32/Src/gai_strerror.c           |    2 +-
 external/bsd/libpcap/dist/Win32/Src/getaddrinfo.c            |   24 +-
 external/bsd/libpcap/dist/Win32/Src/getnetent.c              |    2 +-
 external/bsd/libpcap/dist/Win32/Src/inet_aton.c              |   12 +-
 external/bsd/libpcap/dist/Win32/Src/inet_pton.c              |   12 +-
 external/bsd/libpcap/dist/aclocal.m4                         |    4 +-
 external/bsd/libpcap/dist/config.guess                       |  373 ++++------
 external/bsd/libpcap/dist/config.h.in                        |    3 +
 external/bsd/libpcap/dist/config.sub                         |  128 ++-
 external/bsd/libpcap/dist/configure                          |  151 ++-
 external/bsd/libpcap/dist/configure.in                       |  164 +++-
 external/bsd/libpcap/dist/install-sh                         |   14 +-
 external/bsd/libpcap/dist/mkdep                              |    3 -
 external/bsd/libpcap/dist/msdos/makefile.dj                  |    2 +-
 external/bsd/libpcap/dist/msdos/readme.dos                   |    2 +-
 external/bsd/libpcap/dist/pcap-filter.manmisc.in             |   18 +-
 external/bsd/libpcap/dist/pcap-savefile.manfile.in           |    2 +-
 external/bsd/libpcap/dist/pcap-tstamp.manmisc.in             |   49 +-
 external/bsd/libpcap/dist/pcap_list_datalinks.3pcap.in       |    2 +-
 external/bsd/libpcap/dist/pcap_set_tstamp_precision.3pcap.in |    2 +-
 external/bsd/libpcap/dist/pcap_set_tstamp_type.3pcap.in      |    2 +-
 external/bsd/libpcap/dist/runlex.sh                          |    4 +-
 external/bsd/libpcap/dist/scanner.c.top                      |    3 +
 45 files changed, 655 insertions(+), 554 deletions(-)

diffs (truncated from 2796 to 300 lines):

diff -r bb0e8495b273 -r 519c730bbac4 external/bsd/libpcap/dist/CHANGES
--- a/external/bsd/libpcap/dist/CHANGES Tue Mar 31 21:08:06 2015 +0000
+++ b/external/bsd/libpcap/dist/CHANGES Tue Mar 31 21:25:19 2015 +0000
@@ -1,5 +1,18 @@
+Thursday Feb. 12, 2015 guy%alum.mit.edu@localhost/mcr%sandelman.ca@localhost
+  Summary for 1.8.0 libpcap release
+       Support for filtering Geneve encapsulated packets.
+
+Wednesday Nov. 12, 2014 guy%alum.mit.edu@localhost/mcr%sandelman.ca@localhost
+  Summary for 1.7.0 libpcap release
+       Fix handling of zones for BPF on Solaris
+       new DLT for ZWAVE
+       clarifications for read timeouts.
+       added bpf_filter1() with extensions
+       some fixes to compilation without stdint.h
+       EBUSY can now be returned by SNFv3 code.
+
 Monday Aug. 12, 2014 guy%alum.mit.edu@localhost
-  Summary for 1.6.2 tcpdump release
+  Summary for 1.6.2 libpcap release
        Don't crash on filters testing a non-existent link-layer type
            field.
        Fix sending in non-blocking mode on Linux with memory-mapped
@@ -8,12 +21,12 @@
            machines.
 
 Saturday  Jul. 19, 2014 mcr%sandelman.ca@localhost
-  Summary for 1.6.1 tcpdump release
+  Summary for 1.6.1 libpcap release
        some fixes for the any device
-       changes for how --enable-XXX works
+       changes for how --enable-XXX (--enable-sniffing, --enable-can) works
 
 Wednesday Jul. 2, 2014 mcr%sandelman.ca@localhost
-  Summary for 1.6.0 tcpdump release
+  Summary for 1.6.0 libpcap release
         Don't support D-Bus sniffing on OS X
         fixes for byte order issues with NFLOG captures
         Handle using cooked mode for DLT_NETLINK in activate_new().
diff -r bb0e8495b273 -r 519c730bbac4 external/bsd/libpcap/dist/CREDITS
--- a/external/bsd/libpcap/dist/CREDITS Tue Mar 31 21:08:06 2015 +0000
+++ b/external/bsd/libpcap/dist/CREDITS Tue Mar 31 21:25:19 2015 +0000
@@ -2,11 +2,12 @@
 
 The current maintainers:
     Bill Fenner                   <fenner at research dot att dot com>
-    Denis Ovsienko                <infrastation at yandex dot ru>
+    Denis Ovsienko                <denis at ovsienko dot info>
     Fulvio Risso                  <risso at polito dot it>
     Guy Harris                    <guy at alum dot mit dot edu>
     Hannes Gredler                <hannes at juniper dot net>
     Michael Richardson            <mcr at sandelman dot ottawa dot on dot ca>
+    Francois-Xavier Le Bail       <fx dot lebail at yahoo dot com>
 
 Additional people who have contributed patches:
 
@@ -45,7 +46,7 @@
     David Young                   <dyoung at ojctech dot com>
     Dean Gaudet                   <dean at arctic dot org>
     dhruv                         <rsrivat at sourceforge dot net>
-    Don Ebright                   <Don dot Ebright at compuware dot com> 
+    Don Ebright                   <Don dot Ebright at compuware dot com>
     Dug Song                      <dugsong at monkey dot org>
     Dustin Spicuzza               <dustin at virtualroadside dot com>
     dzejarczech                   <dzejarczech at sourceforge dot net>
@@ -83,6 +84,7 @@
     Jefferson Ogata               <jogata at nodc dot noaa dot gov>
     Jesper Dangaard Brouer        <hawk at comx dot dk>
     Jesper Peterson               <jesper at endace dot com>
+    Jesse Gross                   <jesse at nicira dot com>
     Jiri Slaby                    <jirislaby at gmail dot com>
     Joerg Mayer                   <jmayer at loplof dot de>
     John Bankier                  <jbankier at rainfinity dot com>
@@ -105,6 +107,7 @@
     Mansour Behabadi              <mansour at oxplot dot com>
     Marcus Felipe Pereira         <marcus at task dot com dot br>
     Mark C. Brown                 <mbrown at hp dot com>
+    Mark Johnston                 <markjdb at gmail dot com>
     Mark Pizzolato                <List-tcpdump-workers at subscriptions dot pizzolato dot net>
     Markus Mayer                  <markus_mayer at sourceforge dot net>
     Martin Husemann               <martin at netbsd dot org>
diff -r bb0e8495b273 -r 519c730bbac4 external/bsd/libpcap/dist/INSTALL.txt
--- a/external/bsd/libpcap/dist/INSTALL.txt     Tue Mar 31 21:08:06 2015 +0000
+++ b/external/bsd/libpcap/dist/INSTALL.txt     Tue Mar 31 21:25:19 2015 +0000
@@ -178,14 +178,14 @@
 handling of the timestamp in the kernel.
 
 Note well: there is rumoured to be a version of tcpdump floating around
-called 3.0.3 that includes libpcap and is supposed to support Linux. 
+called 3.0.3 that includes libpcap and is supposed to support Linux.
 You should be advised that neither the Network Research Group at LBNL
-nor the Tcpdump Group ever generated a release with this version number. 
+nor the Tcpdump Group ever generated a release with this version number.
 The LBNL Network Research Group notes with interest that a standard
 cracker trick to get people to install trojans is to distribute bogus
-packages that have a version number higher than the current release. 
+packages that have a version number higher than the current release.
 They also noted with annoyance that 90% of the Linux related bug reports
-they got are due to changes made to unofficial versions of their page. 
+they got are due to changes made to unofficial versions of their page.
 If you are having trouble but aren't using a version that came from
 tcpdump.org, please try that before submitting a bug report!
 
@@ -345,7 +345,6 @@
 nlpid.h                - OSI network layer protocol identifier definitions
 net            - symlink to bpf/net
 optimize.c     - BPF optimization routines
-packaging      - packaging information for building libpcap RPMs
 pcap/bluetooth.h - public definition of DLT_BLUETOOTH_HCI_H4_WITH_PHDR header
 pcap/bpf.h     - BPF definitions
 pcap/namedb.h  - public libpcap name database definitions
diff -r bb0e8495b273 -r 519c730bbac4 external/bsd/libpcap/dist/LICENSE
--- a/external/bsd/libpcap/dist/LICENSE Tue Mar 31 21:08:06 2015 +0000
+++ b/external/bsd/libpcap/dist/LICENSE Tue Mar 31 21:25:19 2015 +0000
@@ -1,9 +1,9 @@
 License: BSD
- 
+
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
-  
+
   1. Redistributions of source code must retain the above copyright
      notice, this list of conditions and the following disclaimer.
   2. Redistributions in binary form must reproduce the above copyright
@@ -13,7 +13,7 @@
   3. The names of the authors may not be used to endorse or promote
      products derived from this software without specific prior
      written permission.
-  
+
 THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
 IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
diff -r bb0e8495b273 -r 519c730bbac4 external/bsd/libpcap/dist/Makefile.in
--- a/external/bsd/libpcap/dist/Makefile.in     Tue Mar 31 21:08:06 2015 +0000
+++ b/external/bsd/libpcap/dist/Makefile.in     Tue Mar 31 21:25:19 2015 +0000
@@ -53,8 +53,9 @@
 ADDLOBJS = @ADDLOBJS@
 ADDLARCHIVEOBJS = @ADDLARCHIVEOBJS@
 LIBS = @LIBS@
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
+CROSSFLAGS=
+CFLAGS = @CFLAGS@   ${CROSSFLAGS}
+LDFLAGS = @LDFLAGS@ ${CROSSFLAGS}
 DYEXT = @DYEXT@
 V_RPATH_OPT = @V_RPATH_OPT@
 DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@
@@ -291,7 +292,6 @@
        msdos/pktdrvr.h \
        msdos/readme.dos \
        org.tcpdump.chmod_bpf.plist \
-       packaging/pcap.spec.in \
        pcap-bpf.c \
        pcap-bt-linux.c \
        pcap-bt-linux.h \
@@ -332,6 +332,7 @@
        pcap-usb-linux.h \
        pcap-win32.c \
        runlex.sh \
+       scanner.c.top \
        scanner.l \
        Win32/Include/Gnuc.h \
        Win32/Include/addrinfo.h \
@@ -443,8 +444,11 @@
 libpcap.none:
 
 scanner.c: $(srcdir)/scanner.l
-       @rm -f $@
+       @rm -f $@ $@.bottom
        $(srcdir)/runlex.sh $(LEX) -o$@ $<
+       mv $@ $@.bottom
+       cat $@.top $@.bottom > $@
+       @rm $@.bottom
 
 scanner.o: scanner.c tokdefs.h
        $(CC) $(FULL_CFLAGS) -c scanner.c
@@ -731,10 +735,6 @@
 tags: $(TAGFILES)
        ctags -wtd $(TAGFILES)
 
-packaging/pcap.spec: packaging/pcap.spec.in VERSION
-       RPMVERSION=`cat VERSION | sed s/-.*//g`; \
-               sed -e s/@VERSION@/$$RPMVERSION/ -e s/@NAME@/libpcap-`cat VERSION`/ $<   > $@
-
 releasetar:
        @cwd=`pwd` ; dir=`basename $$cwd` ; name=$(PROG)-`cat VERSION` ; \
           mkdir $$name; \
diff -r bb0e8495b273 -r 519c730bbac4 external/bsd/libpcap/dist/README
--- a/external/bsd/libpcap/dist/README  Tue Mar 31 21:08:06 2015 +0000
+++ b/external/bsd/libpcap/dist/README  Tue Mar 31 21:25:19 2015 +0000
@@ -76,15 +76,15 @@
 
 Note to Linux distributions and *BSD systems that include libpcap:
 
-There's now a rule to make a shared library, which should work on Linux 
+There's now a rule to make a shared library, which should work on Linux
 and *BSD, among other platforms.
 
-It sets the soname of the library to "libpcap.so.1"; this is what it 
-should be, *NOT* libpcap.so.1.x or libpcap.so.1.x.y or something such as 
+It sets the soname of the library to "libpcap.so.1"; this is what it
+should be, *NOT* libpcap.so.1.x or libpcap.so.1.x.y or something such as
 that.
 
-We've been maintaining binary compatibility between libpcap releases for 
-quite a while; there's no reason to tie a binary linked with libpcap to 
+We've been maintaining binary compatibility between libpcap releases for
+quite a while; there's no reason to tie a binary linked with libpcap to
 a particular release of libpcap.
 
 Problems, bugs, questions, desirable enhancements, etc. should be sent
diff -r bb0e8495b273 -r 519c730bbac4 external/bsd/libpcap/dist/README.Win32
--- a/external/bsd/libpcap/dist/README.Win32    Tue Mar 31 21:08:06 2015 +0000
+++ b/external/bsd/libpcap/dist/README.Win32    Tue Mar 31 21:25:19 2015 +0000
@@ -1,9 +1,9 @@
-Under Win32, libpcap is integrated in the WinPcap packet capture system. 
-WinPcap provides a framework that allows libpcap to capture the packets 
-under Windows 95, Windows 98, Windows ME, Windows NT 4, Windows 2000 
+Under Win32, libpcap is integrated in the WinPcap packet capture system.
+WinPcap provides a framework that allows libpcap to capture the packets
+under Windows 95, Windows 98, Windows ME, Windows NT 4, Windows 2000
 and Windows XP.
-WinPcap binaries and source code can be found at http://winpcap.polito.it: 
-they include also a developer's pack with all the necessary to compile 
+WinPcap binaries and source code can be found at http://winpcap.polito.it:
+they include also a developer's pack with all the necessary to compile
 libpcap-based applications under Windows.
 
 How to compile libpcap with Visual Studio
@@ -12,35 +12,35 @@
 In order to compile libpcap you will need:
 
 - version 6 (or higher) of Microsoft Visual Studio
-- The November 2001 (or later) edition of Microsoft Platform 
-Software Development Kit (SDK), that contains some necessary includes 
+- The November 2001 (or later) edition of Microsoft Platform
+Software Development Kit (SDK), that contains some necessary includes
 for IPv6 support. You can download it from http://www.microsoft.com/sdk
-- the latest WinPcap sources from http://winpcap.polito.it/install 
+- the latest WinPcap sources from http://winpcap.polito.it/install
 
-The WinPcap source code already contains a recent (usually the latest 
-stable) version of libpcap. If you need to compile a different one, 
-simply download it from www.tcpdump.org and copy the sources in the 
+The WinPcap source code already contains a recent (usually the latest
+stable) version of libpcap. If you need to compile a different one,
+simply download it from www.tcpdump.org and copy the sources in the
 winpcap\wpcap\libpcap folder of the WinPcap distribution. If you want to
-compile a libpcap source retrieved from the tcpdump.org Git, you will 
-have to create the scanner and the grammar by hand (with lex and yacc) 
+compile a libpcap source retrieved from the tcpdump.org Git, you will
+have to create the scanner and the grammar by hand (with lex and yacc)
 or with the cygnus makefile, since The Visual Studio project is not able
 to build them.
 
-Open the project file winpcap\wpcap\prj\wpcap.dsw with Visual Studio and 
-build wpcap.dll. wpcap.lib, the library file to link with the applications, 
-will be generated in winpcap\wpcap\lib\. wpcap.dll will be generated in 
-winpcap\wpcap\prj\release or winpcap\wpcap\prj\debug depending on the type 
+Open the project file winpcap\wpcap\prj\wpcap.dsw with Visual Studio and
+build wpcap.dll. wpcap.lib, the library file to link with the applications,
+will be generated in winpcap\wpcap\lib\. wpcap.dll will be generated in
+winpcap\wpcap\prj\release or winpcap\wpcap\prj\debug depending on the type
 of binary that is being created.
 
 How to compile libpcap with Cygnus
 ----------------------------------
 
-To build wpcap.dll, cd to the directory WPCAP/PRJ of the WinPcap source code 
-distribution and type "make". libwpcap.a, the library file to link with the 
-applications, will be generated in winpcap\wpcap\lib\. wpcap.dll will be 
+To build wpcap.dll, cd to the directory WPCAP/PRJ of the WinPcap source code
+distribution and type "make". libwpcap.a, the library file to link with the
+applications, will be generated in winpcap\wpcap\lib\. wpcap.dll will be
 generated in winpcap\wpcap\prj.
 
-Remember, you CANNOT use the MSVC-generated .lib files with gcc, use 
+Remember, you CANNOT use the MSVC-generated .lib files with gcc, use
 libwpcap.a instead.
 
 "make install" installs wpcap.dll in the Windows system folder.
diff -r bb0e8495b273 -r 519c730bbac4 external/bsd/libpcap/dist/README.aix
--- a/external/bsd/libpcap/dist/README.aix      Tue Mar 31 21:08:06 2015 +0000
+++ b/external/bsd/libpcap/dist/README.aix      Tue Mar 31 21:25:19 2015 +0000
@@ -76,8 +76,8 @@
     Then you need to type:
 
            strload -f /etc/dlpi.conf
- 
-    Check again with strload -q -d dlpi that the dlpi driver is loaded.  
+
+    Check again with strload -q -d dlpi that the dlpi driver is loaded.
 
     Alternatively, you can uncomment the lines for DLPI in
     /etc/pse.conf and reboot the machine; this way DLPI will always
diff -r bb0e8495b273 -r 519c730bbac4 external/bsd/libpcap/dist/README.hpux
--- a/external/bsd/libpcap/dist/README.hpux     Tue Mar 31 21:08:06 2015 +0000



Home | Main Index | Thread Index | Old Index