It contains only documentation changes, debdiff below:

diff -u tcpdump-3.8.3/debian/copyright tcpdump-3.8.3/debian/copyright
--- tcpdump-3.8.3/debian/copyright
+++ tcpdump-3.8.3/debian/copyright
@@ -8,7 +8,7 @@
 
 Upstream Authors: [email protected]
 
-Licensed under the 3-clause BSD license: 
+Licensed under the 3-clause BSD license:
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
@@ -28,6 +28,41 @@
   IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
+Some files in this package are licensed under the 4-clause BSD license,
+the copyright on most of them belongs to The Regents of the University
+of California.  Since the license was retroactively changed in 1999 to
+remove the advertising clause, they are effectively under the 3-clause
+license even if the text of the license in the files hasn't been
+updated.  See the following document for more details:
+
+   <URL: ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change>
+
+Other files under the 4-clause BSD license and whose copyright doesn't
+belong to the The Regents of the University of California are listed
+below:
+- aodv.h, Copyright (c) 2003 Bruce M. Simpson
+- atmuni31.h, Copyright (c) 1997 Yen Yen Lim and North Dakota State University
+- ieee802_11.h, Copyright (c) 2001 Fortress Technologies and Charlie Lenahan
+- print-802_11.c, Copyright (c) 2001 Fortress Technologies and Charlie Lenahan
+- print-aodv.c, Copyright (c) 2003 Bruce M. Simpson
+- print-ascii.c, Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
+- print-cnfp.c, Copyright (c) 1998 Michael Shalayeff
+- print-gre.c, Copyright (c) 2002 Jason L. Wright
+- print-mobile.c, Copyright (c) 1998 The NetBSD Foundation, Inc.
+- print-sunatm.c, Copyright (c) 1997 Yen Yen Lim and North Dakota State
+                 University
+- print-telnet.c, Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
+- print-timed.c, Copyright (c) 2000 Ben Smithurst
+- missing/inet_aton.c, Copyright (c) 1995, 1996, 1997 Kungliga Tekniska
+                      H�gskolan (Royal Institute of Technology, Stockholm,
+                      Sweden).
+- missing/inet_ntop.c, Copyright (c) 1995, 1996, 1997 Kungliga Tekniska
+                      H�gskolan (Royal Institute of Technology, Stockholm,
+                      Sweden).
+- missing/inet_pton.c, Copyright (c) 1995, 1996, 1997 Kungliga Tekniska
+                      H�gskolan (Royal Institute of Technology, Stockholm,
+                      Sweden).
+
 Current upstream maintainers:
        Bill Fenner                     <[EMAIL PROTECTED]>
        Fulvio Risso                    <[EMAIL PROTECTED]>
@@ -53,7 +88,7 @@
        Darren Reed                     <[EMAIL PROTECTED]>
        David Kaelbling                 <[EMAIL PROTECTED]>
        David Young                     <[EMAIL PROTECTED]>
-       Don Ebright                     <[EMAIL PROTECTED]> 
+       Don Ebright                     <[EMAIL PROTECTED]>
        Eric Anderson                   <[EMAIL PROTECTED]>
        Franz Schaefer                  <[EMAIL PROTECTED]>
        Gianluca Varenni                <[EMAIL PROTECTED]>
diff -u tcpdump-3.8.3/debian/changelog tcpdump-3.8.3/debian/changelog
--- tcpdump-3.8.3/debian/changelog
+++ tcpdump-3.8.3/debian/changelog
@@ -1,9 +1,18 @@
+tcpdump (3.8.3-5) unstable; urgency=low
+
+  * debian/copyright: Clarify license conditions, some files in the
+    distribution are still under the 4-clause BSD license (closes: #283008).
+  * debian/changelog: Revise 3.8.3-4 entry to add CAN numbers (which have
+    been assigned in the meantime).
+
+ -- Romain Francoise <[EMAIL PROTECTED]>  Sun,  1 May 2005 17:23:45 +0200
+
 tcpdump (3.8.3-4) unstable; urgency=high
 
   * Urgency set to high due to security fixes.
   * debian/patches/50_misc_dos.dpatch: Security fixes stolen from the 3.8
     branch fix infinite loops in the BGP, ISIS, LDP and RSVP dissectors
-    (closes: #306529).
+    [CAN-2005-1278, CAN-2005-1279, CAN-2005-1280] (closes: #306529).
   * debian/patches/00list: Add 50_misc_dos.
 
  -- Romain Francoise <[EMAIL PROTECTED]>  Wed, 27 Apr 2005 21:05:37 +0200

-- 
  ,''`.
 : :' :        Romain Francoise <[EMAIL PROTECTED]>
 `. `'         http://people.debian.org/~rfrancoise/
   `-


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to