diff options
| author | guy <guy> | 2008-05-30 01:35:33 +0000 |
|---|---|---|
| committer | guy <guy> | 2008-05-30 01:35:33 +0000 |
| commit | 757827db5f43e2674d69940aa0d0d17cae2a71ed (patch) | |
| tree | 54607ec7615c82c2341baaf0814e88c3fc05e425 | |
| parent | d9e031714d4a45db4a06c5b4f97b115b6eb3a08b (diff) | |
packaging/pcap.spec is generated from packaging/pcap.spec.in; don't
check in the generated version, and don't put it into the distribution.
Fix a bunch of references to tcpdump-workers@tcpdump.org to refer to the
new address, tcpdump-workers@lists.tcpdump.org.
Fix a reference to the pcap man page from the pcap-filter(4) man page.
Note that patches should be submitted on the SourceForge site, not sent
to the spam-trap patches@tcpdump.org list.
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | README | 11 | ||||
| -rw-r--r-- | README.aix | 6 | ||||
| -rw-r--r-- | packaging/pcap.spec | 65 | ||||
| -rw-r--r-- | packaging/pcap.spec.in | 2 | ||||
| -rw-r--r-- | pcap-filter.4 | 6 | ||||
| -rw-r--r-- | pcap-int.h | 6 | ||||
| -rw-r--r-- | pcap.3pcap | 4 | ||||
| -rw-r--r-- | pcap/bpf.h | 16 | ||||
| -rw-r--r-- | pcap/pcap.h | 15 | ||||
| -rw-r--r-- | pcap/sll.h | 6 | ||||
| -rw-r--r-- | pcap1.h | 6 | ||||
| -rw-r--r-- | savefile.c | 19 |
13 files changed, 52 insertions, 113 deletions
diff --git a/Makefile.in b/Makefile.in index c666e75..4f14e30 100644 --- a/Makefile.in +++ b/Makefile.in @@ -17,7 +17,7 @@ # WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. # -# @(#) $Header: /tcpdump/master/libpcap/Makefile.in,v 1.124 2008-05-28 02:14:10 guy Exp $ (LBL) +# @(#) $Header: /tcpdump/master/libpcap/Makefile.in,v 1.125 2008-05-30 01:35:33 guy Exp $ (LBL) # # Various configurable paths (remember to edit Makefile.in, not Makefile) @@ -241,7 +241,6 @@ EXTRA_DIST = \ msdos/readme.dos \ net/bpf_filter.c \ org.tcpdump.chmod_bpf.plist \ - packaging/pcap.spec \ packaging/pcap.spec.in \ pcap-bpf.c \ pcap-bpf.h \ @@ -1,10 +1,11 @@ -@(#) $Header: /tcpdump/master/libpcap/README,v 1.30 2004-10-12 02:02:28 guy Exp $ (LBL) +@(#) $Header: /tcpdump/master/libpcap/README,v 1.31 2008-05-30 01:35:33 guy Exp $ (LBL) LIBPCAP 0.9 Now maintained by "The Tcpdump Group" See www.tcpdump.org -Please send inquiries/comments/reports to tcpdump-workers@tcpdump.org +Please send inquiries/comments/reports to: + tcpdump-workers@lists.tcpdump.org Anonymous CVS is available via: cvs -d :pserver:tcpdump@cvs.tcpdump.org:/tcpdump/master login @@ -78,9 +79,9 @@ mechanism that accepts BPF filters; see the README.linux file for information on configuring that option. Problems, bugs, questions, desirable enhancements, etc. should be sent -to the address "tcpdump-workers@tcpdump.org". Bugs, support requests, -and feature requests may also be submitted on the SourceForge site for -libpcap at +to the address "tcpdump-workers@lists.tcpdump.org". Bugs, support +requests, and feature requests may also be submitted on the SourceForge +site for libpcap at http://sourceforge.net/projects/libpcap/ @@ -13,9 +13,9 @@ Using BPF: (2) If libpcap doesn't compile on your machine when configured to use BPF, or if the workarounds fail to make it work correctly, you - should send to tcpdump-workers@tcpdump.org a detailed bug report (if - the compile fails, send us the compile error messages; if it - compiles but fails to work correctly, send us as detailed as + should send to tcpdump-workers@lists.tcpdump.org a detailed bug + report (if the compile fails, send us the compile error messages; + if it compiles but fails to work correctly, send us as detailed as possible a description of the symptoms, including indications of the network link-layer type being wrong or time stamps being wrong). diff --git a/packaging/pcap.spec b/packaging/pcap.spec deleted file mode 100644 index 11cd0f7..0000000 --- a/packaging/pcap.spec +++ /dev/null @@ -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* diff --git a/packaging/pcap.spec.in b/packaging/pcap.spec.in index a81bf90..9e1e1d5 100644 --- a/packaging/pcap.spec.in +++ b/packaging/pcap.spec.in @@ -15,7 +15,7 @@ URL: http://www.tcpdump.org Packet-capture library LIBPCAP @VERSION@ Now maintained by "The Tcpdump Group" See http://www.tcpdump.org -Please send inquiries/comments/reports to tcpdump-workers@tcpdump.org +Please send inquiries/comments/reports to tcpdump-workers@lists.tcpdump.org %prep %setup diff --git a/pcap-filter.4 b/pcap-filter.4 index bd6fa3c..47618df 100644 --- a/pcap-filter.4 +++ b/pcap-filter.4 @@ -1,4 +1,4 @@ -.\" @(#) $Header: /tcpdump/master/libpcap/Attic/pcap-filter.4,v 1.1 2008-01-06 21:14:16 guy Exp $ (LBL) +.\" @(#) $Header: /tcpdump/master/libpcap/Attic/pcap-filter.4,v 1.2 2008-05-30 01:35:33 guy Exp $ (LBL) .\" .\" Copyright (c) 1987, 1988, 1989, 1990, 1991, 1992, 1994, 1995, 1996, 1997 .\" The Regents of the University of California. All rights reserved. @@ -904,7 +904,7 @@ icmp[icmptype] != icmp-echo and icmp[icmptype] != icmp-echoreply .fi .RE .SH "SEE ALSO" -pcap(3) +pcap(3PCAP) .SH AUTHORS The original authors are: .LP @@ -930,7 +930,7 @@ The original distribution is available via anonymous ftp: Please send problems, bugs, questions, desirable enhancements, etc. to: .LP .RS -tcpdump-workers@tcpdump.org +tcpdump-workers@lists.tcpdump.org .RE .LP Filter expressions on fields other than those in Token Ring headers will @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#) $Header: /tcpdump/master/libpcap/pcap-int.h,v 1.90 2008-04-14 20:40:58 guy Exp $ (LBL) + * @(#) $Header: /tcpdump/master/libpcap/pcap-int.h,v 1.91 2008-05-30 01:35:33 guy Exp $ (LBL) */ #ifndef pcap_int_h @@ -309,8 +309,8 @@ struct pcap_timeval { * * introduce a new structure for the new format; * - * send mail to "tcpdump-workers@tcpdump.org", requesting a new - * magic number for your new capture file format, and, when + * send mail to "tcpdump-workers@lists.tcpdump.org", requesting + * a new magic number for your new capture file format, and, when * you get the new magic number, put it in "savefile.c"; * * use that magic number for save files with the changed record @@ -1,4 +1,4 @@ -.\" @(#) $Header: /tcpdump/master/libpcap/Attic/pcap.3pcap,v 1.5 2008-04-10 01:56:24 guy Exp $ +.\" @(#) $Header: /tcpdump/master/libpcap/Attic/pcap.3pcap,v 1.6 2008-05-30 01:35:33 guy Exp $ .\" .\" Copyright (c) 1994, 1996, 1997 .\" The Regents of the University of California. All rights reserved. @@ -382,5 +382,5 @@ The current version is available from "The Tcpdump Group"'s Web site at Please send problems, bugs, questions, desirable enhancements, etc. to: .LP .RS -tcpdump-workers@tcpdump.org +tcpdump-workers@lists.tcpdump.org .RE @@ -37,7 +37,7 @@ * * @(#)bpf.h 7.1 (Berkeley) 5/7/91 * - * @(#) $Header: /tcpdump/master/libpcap/pcap/bpf.h,v 1.25 2008-04-06 18:09:48 guy Exp $ (LBL) + * @(#) $Header: /tcpdump/master/libpcap/pcap/bpf.h,v 1.26 2008-05-30 01:35:33 guy Exp $ (LBL) */ /* @@ -113,12 +113,12 @@ struct bpf_version { * Data-link level type codes. * * Do *NOT* add new values to this list without asking - * "tcpdump-workers@tcpdump.org" for a value. Otherwise, you run the - * risk of using a value that's already being used for some other purpose, - * and of having tools that read libpcap-format captures not being able - * to handle captures with your new DLT_ value, with no hope that they - * will ever be changed to do so (as that would destroy their ability - * to read captures using that value for that other purpose). + * "tcpdump-workers@lists.tcpdump.org" for a value. Otherwise, you run + * the risk of using a value that's already being used for some other + * purpose, and of having tools that read libpcap-format captures not + * being able to handle captures with your new DLT_ value, with no hope + * that they will ever be changed to do so (as that would destroy their + * ability to read captures using that value for that other purpose). */ /* @@ -482,7 +482,7 @@ struct bpf_version { * for *their* private type and tools using them for *your* private type * would have to read them. * - * Instead, ask "tcpdump-workers@tcpdump.org" for a new DLT_ value, + * Instead, ask "tcpdump-workers@lists.tcpdump.org" for a new DLT_ value, * as per the comment above, and use the type you're given. */ #define DLT_USER0 147 diff --git a/pcap/pcap.h b/pcap/pcap.h index 4c4f819..c7bc8a0 100644 --- a/pcap/pcap.h +++ b/pcap/pcap.h @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#) $Header: /tcpdump/master/libpcap/pcap/pcap.h,v 1.12 2008-05-26 19:58:06 guy Exp $ (LBL) + * @(#) $Header: /tcpdump/master/libpcap/pcap/pcap.h,v 1.13 2008-05-30 01:35:33 guy Exp $ (LBL) */ #ifndef lib_pcap_pcap_h @@ -95,8 +95,8 @@ typedef struct pcap_addr pcap_addr_t; * introduce a new structure for the new format, if the layout * of the structure changed; * - * send mail to "tcpdump-workers@tcpdump.org", requesting a new - * magic number for your new capture file format, and, when + * send mail to "tcpdump-workers@lists.tcpdump.org", requesting + * a new magic number for your new capture file format, and, when * you get the new magic number, put it in "savefile.c"; * * use that magic number for save files with the changed file @@ -106,9 +106,12 @@ typedef struct pcap_addr pcap_addr_t; * the old file header as well as files with the new file header * (using the magic number to determine the header format). * - * Then supply the changes to "patches@tcpdump.org", so that future - * versions of libpcap and programs that use it (such as tcpdump) will - * be able to read your new capture file format. + * Then supply the changes as a patch at + * + * http://sourceforge.net/projects/libpcap/ + * + * so that future versions of libpcap and programs that use it (such as + * tcpdump) will be able to read your new capture file format. */ struct pcap_file_header { bpf_u_int32 magic; @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#) $Header: /tcpdump/master/libpcap/pcap/sll.h,v 1.2 2006-10-05 10:23:35 guy Exp $ (LBL) + * @(#) $Header: /tcpdump/master/libpcap/pcap/sll.h,v 1.3 2008-05-30 01:35:33 guy Exp $ (LBL) */ /* @@ -64,8 +64,8 @@ * DO NOT change the layout of this structure, or change any of the * LINUX_SLL_ values below. If you must change the link-layer header * for a "cooked" Linux capture, introduce a new DLT_ type (ask - * "tcpdump-workers@tcpdump.org" for one, so that you don't give it a - * value that collides with a value already being used), and use the + * "tcpdump-workers@lists.tcpdump.org" for one, so that you don't give it + * a value that collides with a value already being used), and use the * new header in captures of that type, so that programs that can * handle DLT_LINUX_SLL captures will continue to handle them correctly * without any change, and so that capture files with different headers @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#) $Header: /tcpdump/master/libpcap/pcap1.h,v 1.3 2006-10-04 18:09:22 guy Exp $ (LBL) + * @(#) $Header: /tcpdump/master/libpcap/pcap1.h,v 1.4 2008-05-30 01:35:33 guy Exp $ (LBL) */ #ifndef lib_pcap_h @@ -92,8 +92,8 @@ typedef struct pcap_addr pcap_addr_t; * introduce a new structure for the new format, if the layout * of the structure changed; * - * send mail to "tcpdump-workers@tcpdump.org", requesting a new - * magic number for your new capture file format, and, when + * send mail to "tcpdump-workers@lists.tcpdump.org", requesting + * a new magic number for your new capture file format, and, when * you get the new magic number, put it in "savefile.c"; * * use that magic number for save files with the changed file @@ -30,7 +30,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.175 2008-04-14 20:40:58 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.176 2008-05-30 01:35:33 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -147,11 +147,12 @@ static const char rcsid[] _U_ = * * In order to ensure that a given LINKTYPE_* code's value will refer to * the same encapsulation type on all platforms, you should not allocate - * a new LINKTYPE_* value without consulting "tcpdump-workers@tcpdump.org". - * The tcpdump developers will allocate a value for you, and will not - * subsequently allocate it to anybody else; that value will be added to - * the "pcap.h" in the tcpdump.org CVS repository, so that a future - * libpcap release will include it. + * a new LINKTYPE_* value without consulting + * "tcpdump-workers@lists.tcpdump.org". The tcpdump developers will + * allocate a value for you, and will not subsequently allocate it to + * anybody else; that value will be added to the "pcap.h" in the + * tcpdump.org CVS repository, so that a future libpcap release will + * include it. * * You should, if possible, also contribute patches to libpcap and tcpdump * to handle the new encapsulation type, so that they can also be checked @@ -313,9 +314,9 @@ static const char rcsid[] _U_ = * for *their* private type and tools using them for *your* private type * would have to read them. * - * Instead, in those cases, ask "tcpdump-workers@tcpdump.org" for a new DLT_ - * and LINKTYPE_ value, as per the comment in pcap/bpf.h, and use the type - * you're given. + * Instead, in those cases, ask "tcpdump-workers@lists.tcpdump.org" for a + * new DLT_ and LINKTYPE_ value, as per the comment in pcap/bpf.h, and use + * the type you're given. */ #define LINKTYPE_USER0 147 #define LINKTYPE_USER1 148 |