From: Keith Owens <kaos@ocs.com.au>
To: David Miller <davem@davemloft.net>
Cc: kaber@trash.net, linux-kernel@vger.kernel.org
Subject: Re: Recent copy of libpcap from CVS
Date: Thu, 11 Sep 2008 09:57:08 +1000 [thread overview]
Message-ID: <7381.1221091028@ocs10w> (raw)
In-Reply-To: Your message of "Wed, 10 Sep 2008 15:57:06 MST." <20080910.155706.100960963.davem@davemloft.net>
David Miller (on Wed, 10 Sep 2008 15:57:06 -0700 (PDT)) wrote:
>From: Patrick McHardy <kaber@trash.net>
>Date: Tue, 09 Sep 2008 05:11:59 +0200
>
>> Thats odd, the version I had has USB support and that one also appears
>> to be missing my VLAN patches that are in current CVS.
>>
>> I'll try to figure out what went wrong and send you both a new tarball.
>
>I just rebuilt the libpcap repo from an updated tarball Patrick sent me.
>Let me know if it's still screwed up :)
Comparing git://git.kernel.org/pub/scm/linux/kernel/git/davem/libpcap.git
against Patrick's tarball. git is missing some mode and some rcsid
lines like this example below, I assume that the removal of these lines
in git was deliberate.
diff -urp libpcap-0.9-PRE-CVS/fad-getad.c libpcap/fad-getad.c
--- libpcap-0.9-PRE-CVS/fad-getad.c 2007-10-18 04:11:49.000000000 +1000
+++ libpcap/fad-getad.c 2008-09-11 09:45:20.144341324 +1000
@@ -1,4 +1,3 @@
-/* -*- Mode: c; tab-width: 8; indent-tabs-mode: 1; c-basic-offset: 8; -*- */
/*
* Copyright (c) 1994, 1995, 1996, 1997, 1998
* The Regents of the University of California. All rights reserved.
@@ -32,11 +31,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] _U_ =
- "@(#) $Header: /tcpdump/master/libpcap/fad-getad.c,v 1.12 2007/09/14 00:44:55 guy Exp $ (LBL)";
-#endif
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
However the removal of the #ifndef lint lines also removed a copyright
notice from the object. The copyright line should be reinstated.
diff -urp libpcap-0.9-PRE-CVS/filtertest.c libpcap/filtertest.c
--- libpcap-0.9-PRE-CVS/filtertest.c 2007-10-11 16:56:22.000000000 +1000
+++ libpcap/filtertest.c 2008-09-11 09:45:20.148341971 +1000
@@ -19,14 +19,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char copyright[] _U_ =
- "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
-The Regents of the University of California. All rights reserved.\n";
-static const char rcsid[] _U_ =
- "@(#) $Header: /tcpdump/master/libpcap/filtertest.c,v 1.2 2005/08/08 17:50:13 guy Exp $ (LBL)";
-#endif
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
next prev parent reply other threads:[~2008-09-10 23:57 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-08 12:27 Recent copy of libpcap from CVS Keith Owens
2008-09-08 12:45 ` Patrick McHardy
2008-09-09 0:07 ` Keith Owens
2008-09-09 0:10 ` David Miller
2008-09-09 3:11 ` Patrick McHardy
2008-09-10 22:57 ` David Miller
2008-09-10 23:57 ` Keith Owens [this message]
2008-09-10 23:59 ` David Miller
2008-09-11 0:09 ` Keith Owens
2008-09-11 0:15 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7381.1221091028@ocs10w \
--to=kaos@ocs.com.au \
--cc=davem@davemloft.net \
--cc=kaber@trash.net \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.