Ethereal for Debian
-------------------
-Q. Why isn't ethereal linked against libssl ?
+Q. Why isn't wireshark linked against libssl ?
A. Because it can't be linked against libssl.
See http://www.openssl.org/support/faq.html#LEGAL2
-Q. Why isn't ethereal linked against libsnmp ?
+Q. Why isn't wireshark linked against libsnmp ?
A. Because it would also need to be linked against libssl
Frederic Peters <fpeters@debian.org>, Tue, 21 May 2002 08:37:52 +0200
+wireshark (0.99.2-2) unstable; urgency=low
+
+ * debian/rules: set --datadir so that DATAFILE_DIR is correct (it was
+ wrongly set to "${prefix}/share/wireshark" and not expanded.
+ * AUTHORS-SHORT is now displayed correclty in about dialog
+ * colofilters is now found and used properly
+
+ -- Frederic Peters <fpeters@debian.org> Wed, 26 Jul 2006 13:27:54 +0200
+
+wireshark (0.99.2-1) unstable; urgency=high
+
+ * New upstream release. (closes: #378745)
+ * The project changed name, ethereal is now wireshark. (closes: #351941)
+ See http://www.wireshark.org/news/20060607.html
+ * tethereal has been renamed to tshark
+ * idl2eth has been renamed to idl2wrs
+ * Urgency high since it fixes security issues
+ * http://www.wireshark.org/security/wnpa-sec-2006-01.html has details
+ * crash in GSM BSSMAP dissector (CVE-2006-3627)
+ * format string overflow in ANSI MAP dissector (CVE-2006-3628)
+ * format string overflow in Checkpoint FW-1 dissector (CVE-2006-3628)
+ * format string overflow in MQ dissector (CVE-2006-3628)
+ * format string overflow in XML dissector (CVE-2006-3628)
+ * large memory allocation in MOUNT dissector (CVE-2006-3629)
+ * off-by-one errors in NCP NMAS and NDPS dissectors (CVE-2006-3630)
+ * format string overflow in NTP dissector (CVE-2006-3628)
+ * infinite loop in SSH dissector (CVE-2006-3631)
+ * buffer overflow in NFS dissector (CVE-2006-3632)
+ * debian/wireshark-dev.header-files: includes missing files
+ (closes: #376522, #368860)
+ * debian/copyright: list source files that are under a license different
+ than Wireshark.
+
+ -- Frederic Peters <fpeters@debian.org> Mon, 24 Jul 2006 19:29:26 +0200
+
+ethereal (0.99.0-1) unstable; urgency=high
+
+ * New upstream release (urgency high since it fixes security issues;
+ see http://www.ethereal.com/appnotes/enpa-sa-00023.html advisory)
+ * crash in H.248 dissector (CVE-2006-1937)
+ * infinite loop in UMA dissector (CVE-2006-1933)
+ * crash in X.509if dissector (CVE-2006-1937)
+ * crash in SRVLOC dissector (CVE-2006-1937)
+ * crash in H.245 dissector (CVE-2006-1937)
+ * off-by-one error in OID printing routine (CVE-2006-1932)
+ * buffer overflow in COPS dissector (CVE-2006-1935)
+ * buffer overflow in ALCAP dissector (CVE-2006-1934)
+ * crash in statistics counter (CVE-2006-1937)
+ * crash with malformed capture (CVE-2006-1938)
+ * crash with invalid display filter (CVE-2006-1939)
+ * crash in general packet dissector (CVE-2006-1937)
+ * crash in AIM dissector (CVE-2006-1937)
+ * crash in RPC dissector (CVE-2006-1939)
+ * crash in DCERPC dissector (CVE-2006-1939)
+ * crash in ASN.1 dissector (CVE-2006-1939)
+ * crash in SMB PIPE dissector (CVE-2006-1938)
+ * excessive loop in BER dissector (CVE-2006-1933)
+ * abort in SNDCP dissector (CVE-2006-1940)
+ * buffer overrun in Network Instruments file code (CVE-2006-1934)
+ * buffer overrun in NetXray/Windows Sniffer file code (CVE-2006-1934)
+ * crash in GSM SMS dissector (CVE-2006-1939)
+ * buffer overrun in ALCAP dissector (CVE-2006-1934)
+ * buffer overrun in telnet dissector (CVE-2006-1936)
+ * crash in ASN.1 based dissectors (CVE-2006-1939)
+ * crash in DCERPC NT dissector (CVE-2006-1939)
+ * crash in PER dissector (CVE-2006-1939)
+ * debian/patches/04_drop-capabilities.dpatch: updated.
+ * debian/control: added build-depends on libgnutls-dev since libgnutls can
+ now be used for SSL support.
+
+ -- Frederic Peters <fpeters@debian.org> Mon, 1 May 2006 14:50:42 +0200
+
+ethereal (0.10.14-2) unstable; urgency=low
+
+ * debian/watch: added watch file.
+
+ -- Frederic Peters <fpeters@debian.org> Mon, 6 Mar 2006 00:03:13 +0100
+
+ethereal (0.10.14-1) unstable; urgency=low
+
+ * New upstream release.
+ * Acknowledge NMU, thanks for the support while I was away.
+ * debian/patches/11-security-CVE-2005-3651.dpatch: removed since included
+ upstream.
+ * debian/patches/07_gcc4.dpatch: removed part about packet-cms since it now
+ causes the build to fail.
+
+ -- Frederic Peters <fpeters@debian.org> Thu, 23 Feb 2006 11:04:11 +0100
+
+ethereal (0.10.13-1.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Build-conflict with libsnmp-dev, not just libsnmp5-dev, to prevent
+ accidental linkage with openssl. Closes: #353613.
+
+ -- Steve Langasek <vorlon@debian.org> Sun, 19 Feb 2006 18:03:20 -0800
+
+ethereal (0.10.13-1.2) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * High-urgency upload for RC bugfix.
+ * Add missing epan/gnuc_format_check.h, epan/ipv6-utils.h headers to
+ ethereal-dev. Closes: #344011.
+ * Build-depend on automake1.9 instead of automake; the latter points to
+ the ancient automake1.4 package, which was not what's used upstream.
+
+ -- Steve Langasek <vorlon@debian.org> Fri, 17 Feb 2006 17:47:37 -0800
+
+ethereal (0.10.13-1.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Fix buffer overflow in OSPF dissector (CVE-2005-3651)
+
+ -- Moritz Muehlenhoff <jmm@debian.org> Sun, 25 Dec 2005 11:15:28 +0100
+
+ethereal (0.10.13-1) unstable; urgency=high
+
+ * New upstream release (urgency high since it fixes security issues;
+ see http://www.ethereal.com/appnotes/enpa-sa-00021.html advisory)
+ * memory exhaustion by ISAKMP, FC-FCS, RSVP, ISIS LSP dissectors
+ (CAN-2005-3241)
+ * crash in IrDA dissector and SMB transaction payload reassembly
+ (CAN-2005-3242)
+ * buffer overflow in AgentX and SLIMP3 dissectors (CAN-2005-3243)
+ * infinite loop in BER dissector (CAN-2005-3244)
+ * memory exhaustion by ONC RPC dissector with option "Dissect unknown RPC
+ program numbers" (CAN-2005-3245)
+ * NULL pointer in sFlow, RTnet, SCSI dissectors (CAN-2005-3246)
+ * infinite loop and crash in SigComp UDVM (CAN-2005-3247)
+ * division by zero in X11 dissector (CAN-2005-3248)
+ * invalid pointer freed in WSP dissecto (CAN-2005-3249)
+ * buffer overflow in SRVLOC dissector (CAN-2005-3184)
+ * debian/patches/04_drop-capabilities.dpatch: updated
+ * debian/patches/08_ethereal-desktop-menu.dpatch: updated
+ * debian/patches/09_idl2eth.dpatch: updated
+
+ -- Frederic Peters <fpeters@debian.org> Thu, 8 Dec 2005 14:18:07 +0100
+
+ethereal (0.10.12-6) unstable; urgency=low
+
+ * Rebuilt with gtk/atk from unstable. (closes: #329889)
+
+ -- Frederic Peters <fpeters@debian.org> Sat, 24 Sep 2005 11:11:40 +0200
+
+ethereal (0.10.12-5) unstable; urgency=low
+
+ * debian/ethereal-dev.header-files: added missing epan/range.h
+ (closes: #306426)
+
+ -- Frederic Peters <fpeters@debian.org> Fri, 23 Sep 2005 18:28:04 +0200
+
+ethereal (0.10.12-4) unstable; urgency=low
+
+ * debian/control: upgraded automake dependency of ethereal-dev to 1.8.
+ * debian/patches/11_diameter_vendors.dpatch: removed, wrong.
+ * debian/ethereal-common.files: add capinfos.
+ * debian/ethereal-common.manpages: add capinfos man page.
+ * debian/changelog: fixed 0.6.3-2 header line since lintian now complains
+ about the old way of closing bugs from changelogs.
+
+ -- Frederic Peters <fpeters@debian.org> Fri, 12 Aug 2005 00:43:39 +0200
+
ethereal (0.10.12-3) unstable; urgency=low
* debian/patches/04_drop-capabilities.dpatch: don't exit on failure, simply
(closes: #71994)
* added another .desktop entry to start ethereal with gksu from Gnome menu
* Upstream changes; libethereal and libwiretap handled differently; they may
- end up in new packages (but go in wireshark-common for now)
+ end up in new packages (but go in ethereal-common for now)
-- Frederic Peters <fpeters@debian.org> Sat, 27 Mar 2004 14:09:49 +0100
ethereal (0.10.2-2) unstable; urgency=low
- * New files in wireshark-dev (closes: #236702)
+ * New files in ethereal-dev (closes: #236702)
-- Frederic Peters <fpeters@debian.org> Sun, 7 Mar 2004 21:43:17 +0100
ethereal (0.9.1-5) unstable; urgency=low
- * debian/rules: added --disable-ssl so that wireshark is not built with
+ * debian/rules: added --disable-ssl so that ethereal is not built with
ssl support and may be uploaded to main. (closes: #134273)
-- Frederic Peters <fpeters@debian.org> Mon, 18 Feb 2002 09:33:30 +0100
-- Frederic Peters <fpeters@debian.org> Sat, 7 Aug 1999 16:29:03 +0200
-ethereal (0.6.3-2) unstable; urgency=low, closes=41908
+ethereal (0.6.3-2) unstable; urgency=low
* Renamed NEWS to changelog since this is the upstream ChangeLog
(fixes bug #41908)
-Source: ethereal
+Source: wireshark
Section: net
Priority: optional
Maintainer: Frederic Peters <fpeters@debian.org>
-Standards-Version: 3.6.1.0
-Build-Depends: libgtk2.0-dev (>=2.4.0-0), libpcap0.8-dev, flex, libz-dev, dpatch, debhelper (>= 3.0), libtool, python, automake, autoconf, autotools-dev, libadns1-dev, xsltproc, docbook-xsl (>= 1.64.1.0-0), libpcre3-dev, libcap-dev
-Build-Conflicts: libsnmp4.2-dev, libsnmp5-dev
+Standards-Version: 3.7.2.0
+Build-Depends: libgtk2.0-dev (>=2.4.0-0), libpcap0.8-dev, flex, libz-dev, dpatch, debhelper (>= 3.0), libtool, python, automake1.9, autoconf, autotools-dev, libadns1-dev, xsltproc, docbook-xsl (>= 1.64.1.0-0), libpcre3-dev, libcap-dev, bison, libgnutls-dev
+Build-Conflicts: libsnmp4.2-dev, libsnmp-dev
-Package: ethereal-common
+Package: wireshark-common
Architecture: any
Depends: ${shlibs:Depends}
-Recommends: ethereal (>= 0.9.1-3) | tethereal (>= 0.9.1-3)
-Conflicts: ethereal (<< 0.9.1-3), tethereal (<< 0.9.1-3)
+Recommends: wireshark (>= ${Source-Version}) | tshark (>= ${Source-Version})
+Replaces: ethereal-common
+Conflicts: ethereal-common
Description: network traffic analyser (common files)
Wireshark is a network traffic analyzer, or "sniffer", for Unix and
Unix-like operating systems. A sniffer is a tool used to capture
- packets off the wire. Ethereal decodes numerous protocols (too many
+ packets off the wire. Wireshark decodes numerous protocols (too many
to list).
.
- This package provides files common to both ethereal (the GTK+ version)
- and tethereal (the console version).
+ This package provides files common to both wireshark (the GTK+ version)
+ and tshark (the console version).
-Package: ethereal
+Package: wireshark
Architecture: any
-Depends: ${shlibs:Depends}, ethereal-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, wireshark-common (= ${Source-Version})
Recommends: gksu
+Replaces: ethereal
+Conflicts: ethereal
Description: network traffic analyzer
Wireshark is a network traffic analyzer, or "sniffer", for Unix and
Unix-like operating systems. A sniffer is a tool used to capture
- packets off the wire. Ethereal decodes numerous protocols (too many
+ packets off the wire. Wireshark decodes numerous protocols (too many
to list).
.
- This package provides ethereal (the GTK+ version)
+ This package provides wireshark (the GTK+ version)
-Package: tethereal
+Package: tshark
Architecture: any
-Depends: ${shlibs:Depends}, ethereal-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, wireshark-common (= ${Source-Version})
+Replaces: tethereal
+Conflicts: tethereal
Description: network traffic analyzer (console)
Wireshark is a network traffic analyzer, or "sniffer", for Unix and
Unix-like operating systems. A sniffer is a tool used to capture
- packets off the wire. Ethereal decodes numerous protocols (too many
+ packets off the wire. Wireshark decodes numerous protocols (too many
to list).
.
- This package provides the console version of ethereal, named
- "tethereal".
+ This package provides the console version of wireshark, named
+ "tshark".
-Package: ethereal-dev
+Package: wireshark-dev
Architecture: any
Section: devel
-Depends: ${shlibs:Depends}, omniidl (>> 1:3.0.4.1-10) | omniidl4 (>= 4.0.1-2) , libpcap0.8-dev, libtool, libglib2.0-dev, python, snacc, autotools-dev, debhelper, cdbs, automake1.7, autoconf
+Depends: ${shlibs:Depends}, omniidl (>> 1:3.0.4.1-10) | omniidl4 (>= 4.0.1-2) , libpcap0.8-dev, libtool, libglib2.0-dev, python, snacc, autotools-dev, debhelper, cdbs, automake1.8, autoconf
+Replaces: ethereal-dev
+Conflicts: ethereal-dev
Description: network traffic analyser (development tools)
Wireshark is a network traffic analyzer, or "sniffer", for Unix and
Unix-like operating systems. A sniffer is a tool used to capture
- packets off the wire. Ethereal decodes numerous protocols (too many
+ packets off the wire. Wireshark decodes numerous protocols (too many
to list).
.
- This package provides idl2eth and other necessary files to develop
+ This package provides idl2wrs and other necessary files to develop
new packet dissectors.
-This package was debianized by Frederic Peters <fpeters@debian.org> on
+his package was debianized by Frederic Peters <fpeters@debian.org> on
Sun, 13 Sep 1998 23:05:47 +0200
-It was downloaded from http://www.ethereal.com/distribution/
+It was downloaded from http://www.wireshark.org/download/src/all-versions/
+
+The Wireshark web site URL is http://www.wireshark.org/
Upstream Authors:
- Gerald Combs <gerald@wireshark.org>
- (as well as many contributors)
+ Gerald Combs <gerald@wireshark.org> and contributors
+
+Except where otherwise noted in the source code, Wireshark is covered under
+the GNU General Public License (v2 or later).
+
+Wireshark is copyright (c) 1998-2006 Gerald Combs.
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+On Debian systems the GNU GPL may be viewed in /usr/share/common-licenses/GPL.
+
+Wireshark and the "fin" logo are trademarks of Gerald Combs.
+
+Source files included in Wireshark and with other licenses are listed below:
+
+
+Public Domain
+-------------
+
+g711.c:
+ * This source code is a product of Sun Microsystems, Inc. and is provided
+ * for unrestricted use. Users may copy or modify this source code without
+ * charge.
+ *
+ * SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
+ * THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ *
+ * Sun source code is provided with no support and without any obligation on
+ * the part of Sun Microsystems, Inc. to assist in its use, correction,
+ * modification or enhancement.
+ *
+ * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
+ * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
+ * OR ANY PART THEREOF.
+ *
+ * In no event will Sun Microsystems, Inc. be liable for any lost revenue
+ * or profits or other special, indirect and consequential damages, even if
+ * Sun has been advised of the possibility of such damages.
+ *
+ * Sun Microsystems, Inc.
+ * 2550 Garcia Avenue
+ * Mountain View, California 94043
+
+
+LGPL
+----
+
+mkstemp.c: LGPL, from GNU C Library
+mkstemp.h: idem
+strcasecmp.c: idem
+strncasecmp.c: idem
+strptime.c: idem
+ps.c: idem
+ * Copyright (C) 1991, 1992, 1996, 1998 Free Software Foundation, Inc.
+ * This file is part of the GNU C Library.
+ *
+ * The GNU C Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The GNU C Library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with the GNU C Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+
+
+epan/g_ascii_strtoull.c: LGPL, from GLIB
+epan/g_ascii_strtoull.h: idem
+gtk/ethclist.c: idem
+gtk/ethclist.h: idem
+ * GLIB - Library of useful routines for C programming
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ * Copyright (C) 1997-1998 Jay Painter <jpaint@serv.net><jpaint@gimp.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+
+
+epan/dfilter/grammar.c: LGPL, Copyright 1991-1995 by D. Richard Hipp
+tools/lemon/lempar.c: idem
+ * Copyright 1991-1995 by D. Richard Hipp.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+
+
+MIT
+---
+
+epan/xmlstub.h:
+ * This is part of tree.h from the libxml2 distribution. It is used
+ * for structure reference when dynamically linking to libxml.
+ *
+ * The GPL agreement for this file and for libxml2 can be found at
+ * http://www.xmlsoft.org
+
+Note that libxml2 is MIT-licensed, not GPL.
+
+
+BSD & BSD-like
+--------------
+
+epan/crypt-md5.c:
+epan/crypt-md5.h:
+ * Copyright (C) 1999, 2000, 2002 Aladdin Enterprises. All rights reserved.
+ *
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ *
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 3. This notice may not be removed or altered from any source distribution.
+ *
+ * L. Peter Deutsch
+ * ghost@aladdin.com
+
+
+epan/except.c:
+epan/except.h:
+ * Portable Exception Handling for ANSI C.
+ * Copyright (C) 1999 Kaz Kylheku <kaz@ashi.footprints.net>
+ *
+ * Free Software License:
+ *
+ * All rights are reserved by the author, with the following exceptions:
+ * Permission is granted to freely reproduce and distribute this software,
+ * possibly in exchange for a fee, provided that this copyright notice appears
+ * intact. Permission is also granted to adapt this software to produce
+ * derivative works, as long as the modified versions carry this copyright
+ * notice and additional notices stating that the work has been modified.
+ * This source code may be translated into executable form and incorporated
+ * into proprietary software; there is no requirement for such software to
+ * contain a copyright notice related to this source.
+
+
+epan/in_cksum.c:
+epan/inet_aton.c:
+ * Copyright (c) 1988, 1992, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * 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
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+
+
+epan/inet_ntop.c:
+epan/inet_pton.c:
+ * Copyright (c) 1996-1999 by Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+
+
+epan/dissectors/packet-enc.c:
+epan/dissectors/packet-etherip.c:
+epan/dissectors/packet-ipsec-udp.c:
+ * Copyright (c) 2003 Markus Friedl. All rights reserved.
+ *
+ * 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
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+epan/dissectors/packet-pflog.c:
+epan/dissectors/packet-pflog.h:
+ * Copyright 2001 Mike Frantzen
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+
+
+epan/dissectors/packet-vj.c:
+ * This file created by Irfan Khan <ikhan@qualcomm.com>
+ * Copyright (c) 2001 by QUALCOMM, Incorporated.
+ * All Rights reserved.
+ *
+ * Routines to compress and uncompress TCP packets (for transmission
+ * over low speed serial lines).
+ *
+ * Copyright (c) 1989 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley. The name of the
+ * University 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.
+
+
+wiretap/erf.c:
+wiretap/erf.h:
+ * Copyright (c) 2003 Endace Technology Ltd, Hamilton, New Zealand.
+ * All rights reserved.
+ *
+ * This software and documentation has been developed by Endace Technology Ltd.
+ * along with the DAG PCI network capture cards. For further information please
+ * visit http://www.endace.com/.
+ *
+ * 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
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * 3. The name of Endace Technology Ltd may not be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ENDACE TECHNOLOGY LTD ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ * EVENT SHALL ENDACE TECHNOLOGY LTD BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+
+
+wiretap/i4b_trace.h:
+ * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
+ *
+ * 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
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+
+
+Files missing license notices
+-----------------------------
+
+tap-funnel.c:
+ Wireshark terms, according to author on wireshark-dev@, message-id:
+ <f20d86b70607200240x2a6f7b0as68daf43b2eef6a56@mail.gmail.com>
+
+editcap.c:
+merge.c:
+mergecap.c:
+ Wireshark terms, according to wireshark-dev@, message-id:
+ <c9a3e4540607210110v50758766wf272c4e6c74d48f3@mail.gmail.com>
+
+epan/epan.c:
+epan/exceptions.h:
+epan/dfilter/gencode.h:
+epan/dfilter/glib-util.c:
+epan/dfilter/glib-util.h:
+ Contributed by Gilbert Ramirez, he has been contacted, his other files are
+ under Wireshark terms, (message-id: <44C1EFA2.3050907@alum.mit.edu>)
+
+epan/dissectors/packet-bootparams.h:
+epan/dissectors/packet-mount.h:
+epan/dissectors/packet-nfs.h:
+epan/dissectors/packet-x11-keysym.h:
+ Corresponding .c files have GPL notices, authors have been contacted for
+ clarification.
+
+epan/dissectors/packet-nlm.h: no license info
+ Wireshark terms, according to wireshark-dev@, message-id:
+ <c9a3e4540607221458j407d552ekf28309c494487a8b@mail.gmail.com>
+
+gtk/win32-file-dlg.h:
+ Contributed by Gerald Combs, Wireshark author, no answer yet but there is no
+ reason why it would not have standard Wireshark terms. Message-id:
+ <44C1EFA2.3050907@alum.mit.edu>
-Copyright:
+epan/in_cksum.h:
+ BSD, like in_cksum.c, according to wireshark-dev@, message-id:
+ <44C1EFA2.3050907@alum.mit.edu>
-GPL, as evidenced by existence of GPL license file "COPYING".
-(the GNU GPL may be viewed on Debian systems in /usr/share/common-licenses/GPL)
+epan/dissectors/packet-diameter-defs.h:
+ GNU GPL notice added in current Subversion repository, will be in file for
+ 0.99.3.
+snprintf.h:
+ no longer used, according to wireshark-dev@, but it was under GPL like .c
+ message-id: <c9a3e4540607200322j2225fdf8q8687b1b1fd13543a@mail.gmail.com>
05_plugin-libdir
06_giop-buffer
07_gcc4
+08_wireshark-desktop-menu
+09_idl2wrs
+10_wireshark_gen
+01_idl2deb
+02_asn2deb
+03_preferences
+04_drop-capabilities
+05_plugin-libdir
+06_giop-buffer
+07_gcc4
08_ethereal-desktop-menu
09_idl2wrs
10_ethereal_gen
## 01_idl2deb.dpatch by <fpeters@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
+## DP: idl2deb - create Debian packages from idl2wrs modules
+
+@DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./idl2deb /tmp/dpep-work.K2bQz4/wireshark-0.10.11/idl2deb
+--- ./idl2deb 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep-work.K2bQz4/wireshark-0.10.11/idl2deb 2005-07-17 19:35:08.000000000 +0200
+@@ -0,0 +1,252 @@
++#!/usr/bin/env python
++
++# idl2deb - quick hack by W. Borgert <debacle@debian.org> to create
++# Debian GNU/Linux packages from idl2wrs modules for Wireshark.
++# Copyright 2003, W. Borgert
++
++# Makefile.am and configure.ac code by:
++# Copyright 2001, Ericsson Inc.
++# Frank Singleton <frank.singleton@ericsson.com>
++#
++# Wireshark - Network traffic analyzer
++# By Gerald Combs <gerald@wireshark.com>
++# Copyright 1998 Gerald Combs
++
++# This program is free software; you can redistribute it and/or
++# modify it under the terms of the GNU General Public License
++# as published by the Free Software Foundation; either version 2
++# of the License, or (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++
++import getopt, os, string, sys, time
++
++scriptinfo = """idl2deb version 2003-10-03
++Copyright 2003, W. Borgert
++Free software, released under the terms of the GPL."""
++
++options = {'dbopts': "",
++ 'email': "invalid@invalid.invalid",
++ 'help': 0,
++ 'idl': None,
++ 'name': "No Name",
++ 'preserve': 0,
++ 'version': 0}
++
++def bootstrap():
++ """Generate Makefile.in and configure script."""
++ os.system("aclocal")
++ os.system("autoconf")
++ os.system("libtoolize --automake --copy --force")
++ os.system("automake --add-missing --copy --foreign")
++
++def create_file(filename, content, mode = None):
++ """Create a file with given content."""
++ global options
++ if options['preserve'] and os.path.isfile(filename):
++ return
++ f = open(filename, 'w')
++ f.write(content)
++ f.close()
++ if mode:
++ os.chmod(filename, mode)
++
++def create_files(version, deb, email, idl, name, iso, rfc):
++ """Create all files for the .deb build process."""
++ base = idl.lower()[:-4]
++ create_file("Makefile.am", """#
++
++plugindir = @plugindir@
++
++plugin_LTLIBRARIES = %s.la
++%s_la_SOURCES = packet-%s.c
++%s_la_LDFLAGS = -module -avoid-version
++
++GLIB_CFLAGS = `pkg-config --cflags glib-2.0`
++GLIB_LIBS = `pkg-config --libs glib-2.0`
++BUILT_SOURCES = packet-%s.c
++INCLUDES = -DHAVE_CONFIG -DHAVE_SYS_TYPES_H -DHAVE_SYS_TIME_H \\
++ -DHAVE_STDARG_H -D_U_=\"__attribute__((unused))\" \\
++ -I/usr/include/wireshark -DWS_VAR_IMPORT=extern $(GLIB_CFLAGS)
++LDADD = $(GLIB_LIBS)
++
++# Libs must be cleared, or else libtool won't create a shared module.
++# If your module needs to be linked against any particular libraries,
++# add them here.
++LIBS =
++
++%s_la_DEPENDENCIES = packet-%s-static.o
++
++packet-%s-static.o: packet-%s.c
++ $(LTCOMPILE) -c -o packet-%s-static.o \\
++ -D__WIRESHARK_STATIC__ packet-%s.c
++
++packet-%s.c: """ % ((base,) * 12) + idl + """
++ $(IDL2WRS) $< > $@
++""")
++
++ create_file("configure.ac", """AC_INIT(%s, 1.0)
++AC_PROG_LIBTOOL
++AM_INIT_AUTOMAKE
++AM_MAINTAINER_MODE
++AC_PROG_CC
++AC_STDC_HEADERS
++AC_PROG_INSTALL
++AC_SUBST(CFLAGS)
++AC_SUBST(CPPFLAGS)
++AC_SUBST(LDFLAGS)
++PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.2.2)
++AC_SUBST(GLIB_CFLAGS)
++AC_SUBST(GLIB_LIBS)
++IDL2WRS=\"`type -p idl2wrs`\"
++AC_SUBST(IDL2WRS)
++WIRESHARK_VERSION=\"%s\"
++plugindir=\"$libdir/wireshark/plugins/$WIRESHARK_VERSION\"
++AC_SUBST(plugindir)
++AC_OUTPUT([Makefile])
++""" % (base, version))
++
++ if not os.path.isdir("debian"):
++ os.mkdir("debian")
++
++ create_file("debian/rules", """#!/usr/bin/make -f
++
++include /usr/share/cdbs/1/rules/debhelper.mk
++include /usr/share/cdbs/1/class/autotools.mk
++
++PREFIX=`pwd`/debian/wireshark-giop-%s
++
++binary-post-install/wireshark-giop-%s::
++ rm -f $(PREFIX)/usr/lib/wireshark/plugins/%s/*.a
++""" % (base, base, version), 0755)
++
++ create_file("debian/control", """Source: wireshark-giop-%s
++Section: net
++Priority: optional
++Maintainer: %s <%s>
++Standards-Version: 3.6.1.0
++Build-Depends: wireshark-dev, autotools-dev, debhelper, cdbs
++
++Package: wireshark-giop-%s
++Architecture: any
++Depends: wireshark (= %s), ${shlibs:Depends}
++Description: GIOP dissector for CORBA interface %s
++ This package provides a dissector for GIOP (General Inter-ORB
++ Protocol) for the Wireshark protocol analyser. It decodes the CORBA
++ (Common Object Request Broker Architecture) interfaces described
++ in the IDL (Interface Definition Language) file '%s.idl'.
++""" % (base, name, email, base, deb, base, base))
++
++ create_file("debian/changelog",
++ """wireshark-giop-%s (0.0.1-1) unstable; urgency=low
++
++ * Automatically created package.
++
++ -- %s <%s> %s
++""" % (base, name, email, rfc + "\n (" + iso + ")"))
++
++ create_file("debian/copyright",
++ """This package has been created automatically by idl2deb on
++%s for Debian GNU/Linux.
++
++Wireshark: http://www.wireshark.org/
++
++Copyright:
++
++GPL, as evidenced by existence of GPL license file \"COPYING\".
++(the GNU GPL may be viewed on Debian systems in
++/usr/share/common-licenses/GPL)
++""" % (iso))
++
++def get_wrs_version():
++ """Detect version of wireshark-dev package."""
++ deb = os.popen(
++ "dpkg-query -W --showformat='${Version}' wireshark-dev").read()
++ debv = string.find(deb, "-")
++ if debv == -1: debv = len(deb)
++ version = deb[string.find(deb, ":")+1:debv]
++ return version, deb
++
++def get_time():
++ """Detect current time and return ISO and RFC time string."""
++ currenttime = time.gmtime()
++ return time.strftime("%Y-%m-%d %H:%M:%S +0000", currenttime), \
++ time.strftime("%a, %d %b %Y %H:%M:%S +0000", currenttime)
++
++def main():
++ global options
++ process_opts(sys.argv)
++ iso, rfc = get_time()
++ version, deb = get_wrs_version()
++ create_files(version, deb,
++ options['email'], options['idl'], options['name'],
++ iso, rfc)
++ bootstrap()
++ os.system("dpkg-buildpackage " + options['dbopts'])
++
++def process_opts(argv):
++ """Process command line options."""
++ global options
++ try:
++ opts, args = getopt.getopt(argv[1:], "d:e:hi:n:pv",
++ ["dbopts=",
++ "email=",
++ "help",
++ "idl=",
++ "name=",
++ "preserve",
++ "version"])
++ except getopt.GetoptError:
++ usage(argv[0])
++ sys.exit(1)
++ for o, a in opts:
++ if o in ("-d", "--dbopts"):
++ options['dbopts'] = a
++ if o in ("-e", "--email"):
++ options['email'] = a
++ if o in ("-h", "--help"):
++ options['help'] = 1
++ if o in ("-i", "--idl"):
++ options['idl'] = a
++ if o in ("-n", "--name"):
++ options['name'] = a
++ if o in ("-p", "--preserve"):
++ options['preserve'] = 1
++ if o in ("-v", "--version"):
++ options['version'] = 1
++ if options['help']:
++ usage(argv[0])
++ sys.exit(0)
++ if options['version']:
++ print scriptinfo
++ sys.exit(0)
++ if not options['idl']:
++ print "mandatory IDL file parameter missing"
++ sys.exit(1)
++ if not os.access(options['idl'], os.R_OK):
++ print "IDL file not accessible"
++ sys.exit(1)
++
++def usage(name):
++ """Print usage help."""
++ print "Usage: " + name + " <parameters>\n" + \
++ "Parameters are\n" + \
++ " --dbopts -d opts, options for dpkg-buildpackage\n" + \
++ " --email -e address, use e-mail address\n" + \
++ " --idl -i idlfile, IDL file to use (mandatory)\n" + \
++ " --help -h, print help and exit\n" + \
++ " --name -n name, use user name\n" + \
++ " --preserve -p, do not overwrite files\n" + \
++ " --version -v, print version and exit\n" + \
++ "Example:\n" + \
++ name + " -e me@foo.net -i bar.idl -n \"My Name\" " + \
++ "-d \"-rfakeroot -uc -us\""
++if __name__ == '__main__':
++ main()
+diff -urNad --exclude=CVS --exclude=.svn ./idl2deb.dbk /tmp/dpep-work.K2bQz4/wireshark-0.10.11/idl2deb.dbk
+--- ./idl2deb.dbk 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep-work.K2bQz4/wireshark-0.10.11/idl2deb.dbk 2005-07-17 19:35:08.000000000 +0200
+@@ -0,0 +1,157 @@
++<?xml version='1.0' encoding='ISO-8859-1'?>
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
++"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
++ <!ENTITY command "<command>idl2deb</command>">
++ <!ENTITY email "<email>debacle@debian.org</email>">
++ <!ENTITY author "W. Borgert">
++ <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
++]>
++
++<refentry>
++ <refentryinfo>
++ <address>
++ &email;
++ </address>
++ <author>
++ <firstname>W.</firstname>
++ <surname>Borgert</surname>
++ </author>
++ <copyright>
++ <year>2003</year>
++ <year>2005</year>
++ <holder>&author;</holder>
++ </copyright>
++ <date>2003-08-17</date>
++ <keywordset>
++ <keyword>CORBA</keyword>
++ <keyword>IDL</keyword>
++ <keyword>Wireshark</keyword>
++ </keywordset>
++ <revhistory>
++ <revision>
++ <revnumber>2003-08-17</revnumber>
++ <date>2003-08-17</date>
++ <authorinitials>debacle</authorinitials>
++ <revremark>First version.</revremark>
++ </revision>
++ </revhistory>
++ </refentryinfo>
++ <refmeta>
++ <refentrytitle>idl2deb</refentrytitle>
++
++ <manvolnum>1</manvolnum>
++ </refmeta>
++ <refnamediv>
++ <refname>idl2deb</refname>
++
++ <refpurpose>create a Debian package for CORBA monitoring from IDL</refpurpose>
++ </refnamediv>
++ <refsynopsisdiv>
++ <cmdsynopsis>
++ &command;
++ <arg><option>-d <replaceable>opts</replaceable></option></arg>
++ <arg><option>--dbopts=<replaceable>opts</replaceable></option></arg>
++ <arg><option>-e <replaceable>address</replaceable></option></arg>
++ <arg><option>--email=<replaceable>address</replaceable></option></arg>
++ <arg>-i <replaceable>idlfile</replaceable></arg>
++ <arg>--idl=<replaceable>idlfile</replaceable></arg>
++ <arg><option>-h</option></arg>
++ <arg><option>--help</option></arg>
++ <arg><option>-n <replaceable>name</replaceable></option></arg>
++ <arg><option>--name=<replaceable>name</replaceable></option></arg>
++ <arg><option>-p</option></arg>
++ <arg><option>--preserve</option></arg>
++ <arg><option>-v</option></arg>
++ <arg><option>--version</option></arg>
++ </cmdsynopsis>
++ </refsynopsisdiv>
++ <refsect1>
++ <title>Description</title>
++
++ <para>This manual page documents briefly the
++ <command>idl2deb</command> command.</para>
++
++ <para>&command; takes an CORBA IDL file as input and creates a
++ Debian package from it. The package contains a loadable module
++ for the wireshark network analyser.</para>
++ </refsect1>
++ <refsect1>
++ <title>Options</title>
++
++ <variablelist>
++ <varlistentry>
++ <term><option>-d <replaceable>opts</replaceable></option>
++ <option>--dbopts=<replaceable>opts</replaceable></option></term>
++ <listitem>
++ <para>options for dpkg-buildpackage.</para>
++ </listitem>
++ </varlistentry>
++ <varlistentry>
++ <term><option>-e <replaceable>address</replaceable></option>
++ <option>--email=<replaceable>address</replaceable></option></term>
++ <listitem>
++ <para>use e-mail address.</para>
++ </listitem>
++ </varlistentry>
++ <varlistentry>
++ <term><option>-i <replaceable>idlfile</replaceable></option>
++ <option>--idl=<replaceable>idlfile</replaceable></option></term>
++ <listitem>
++ <para>IDL file to use (mandatory).</para>
++ </listitem>
++ </varlistentry>
++ <varlistentry>
++ <term><option>-h</option>
++ <option>--help</option>
++ </term>
++ <listitem>
++ <para>print help and exit.</para>
++ </listitem>
++ </varlistentry>
++ <varlistentry>
++ <term><option>-n <replaceable>name</replaceable></option>
++ <option>--name=<replaceable>name</replaceable></option></term>
++ <listitem>
++ <para>use user name.</para>
++ </listitem>
++ </varlistentry>
++ <varlistentry>
++ <term><option>-p</option>
++ <option>--preserve</option></term>
++ <listitem>
++ <para>do not overwrite files.</para>
++ </listitem>
++ </varlistentry>
++ <varlistentry>
++ <term><option>-v</option>
++ <option>--version</option></term>
++ <listitem>
++ <para>print version and exit.</para>
++ </listitem>
++ </varlistentry>
++ </variablelist>
++
++ <para>Example:</para>
++
++ <programlisting>/usr/bin/idl2deb -e me@foo.net -i bar.idl \
++-n "My Name" -d "-rfakeroot -uc -us"</programlisting>
++
++ </refsect1>
++ <refsect1>
++ <title>See Also</title>
++
++ <para>A lot of tools are used, which you have to
++ <command>apt-get install</command>: wireshark-dev, python,
++ cdbs, autotools-dev, debhelper, dpkg-dev.</para>
++ </refsect1>
++
++ <refsect1>
++ <title>Copying</title>
++
++ <para>This manual page was written by &author; &email; for
++ &debian; (but may be used by others). Permission is granted to
++ copy, distribute and/or modify this document under the terms of
++ the GNU General Public License, Version 2 or any later
++ version published by the Free Software Foundation.</para>
++ </refsect1>
++</refentry>
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_idl2deb.dpatch by <fpeters@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
## DP: idl2deb - create Debian packages from idl2eth modules
@DPATCH@
## All lines beginning with `## DP:' are a description of the patch.
## DP: asn2deb - create Debian packages from ASN.1 files
+@DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./asn2deb /tmp/dpep-work.5BSR7A/wireshark-0.10.11/asn2deb
+--- ./asn2deb 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep-work.5BSR7A/wireshark-0.10.11/asn2deb 2005-07-17 19:37:02.000000000 +0200
+@@ -0,0 +1,219 @@
++#!/usr/bin/env python
++
++# asn2deb - quick hack by W. Borgert <debacle@debian.org> to create
++# Debian GNU/Linux packages from ASN.1 files for Wireshark.
++# Copyright 2004, W. Borgert
++
++# ASN.1 module for Wireshark, use of snacc type table:
++# Copyright 2003, Matthijs Melchior <matthijs.melchior@xs4all.nl>
++#
++# Wireshark - Network traffic analyzer
++# By Gerald Combs <gerald@wireshark.com>
++# Copyright 1998 Gerald Combs
++
++# This program is free software; you can redistribute it and/or
++# modify it under the terms of the GNU General Public License
++# as published by the Free Software Foundation; either version 2
++# of the License, or (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++
++import getopt, os, string, sys, time
++
++scriptinfo = """asn2deb version 2004-02-17
++Copyright 2004, W. Borgert
++Free software, released under the terms of the GPL."""
++
++options = {'asn': None,
++ 'dbopts': "",
++ 'email': "invalid@invalid.invalid",
++ 'help': 0,
++ 'name': "No Name",
++ 'preserve': 0,
++ 'version': 0}
++
++def bootstrap():
++ """Generate Makefile.in and configure script."""
++ os.system("aclocal-1.7")
++ os.system("autoconf")
++ os.system("automake-1.7 --add-missing --copy --foreign")
++
++def create_file(filename, content, mode = None):
++ """Create a file with given content."""
++ global options
++ if options['preserve'] and os.path.isfile(filename):
++ return
++ f = open(filename, 'w')
++ f.write(content)
++ f.close()
++ if mode:
++ os.chmod(filename, mode)
++
++def create_files(version, deb, email, asn, name, iso, rfc):
++ """Create all files for the .deb build process."""
++ base = asn.lower()[:-5]
++ create_file("Makefile.am", """#
++
++BUILT_SOURCES = %s.tt
++asn1ttdir = $(datadir)/wireshark/asn1
++asn1tt_DATA = %s.tt
++
++%s.tt: """ % ((base,) * 3) + asn + """
++ snacc -u /usr/include/snacc/asn1/asn-useful.asn1 -T $@ $<
++""")
++
++ create_file("configure.ac", """AC_INIT(%s, 1.0)
++AM_INIT_AUTOMAKE
++AM_MAINTAINER_MODE
++AC_PROG_INSTALL
++SNACC=\"`type -p snacc`\"
++AC_SUBST(SNACC)
++dnl WIRESHARK_VERSION=\"%s\"
++dnl plugindir=\"$prefix/share/wireshark/asn.1\"
++dnl AC_SUBST(plugindir)
++AC_OUTPUT([Makefile])
++""" % (base, version))
++
++ if not os.path.isdir("debian"):
++ os.mkdir("debian")
++
++ create_file("debian/rules", """#!/usr/bin/make -f
++
++include /usr/share/cdbs/1/rules/debhelper.mk
++include /usr/share/cdbs/1/class/autotools.mk
++
++PREFIX=`pwd`/debian/wireshark-asn1-%s
++
++binary-post-install/wireshark-asn1-%s::
++ rm -f $(PREFIX)/usr/lib/wireshark/plugins/%s/*.a
++""" % (base, base, version), 0755)
++
++ create_file("debian/control", """Source: wireshark-asn1-%s
++Section: net
++Priority: optional
++Maintainer: %s <%s>
++Standards-Version: 3.6.1.0
++Build-Depends: snacc, autotools-dev, debhelper, cdbs
++
++Package: wireshark-asn1-%s
++Architecture: all
++Depends: wireshark (= %s)
++Description: ASN.1/BER dissector for %s
++ This package provides a type table for decoding BER (Basic Encoding
++ Rules) data over TCP or UDP, described by an ASN.1 (Abstract Syntax
++ Notation 1) file '%s.asn1'.
++""" % (base, name, email, base, deb, base, base))
++
++ create_file("debian/changelog",
++ """wireshark-asn1-%s (0.0.1-1) unstable; urgency=low
++
++ * Automatically created package.
++
++ -- %s <%s> %s
++""" % (base, name, email, rfc + "\n (" + iso + ")"))
++
++ create_file("debian/copyright",
++ """This package has been created automatically be asn2deb on
++%s for Debian GNU/Linux.
++
++Wireshark: http://www.wireshark.com/
++
++Copyright:
++
++GPL, as evidenced by existence of GPL license file \"COPYING\".
++(the GNU GPL may be viewed on Debian systems in
++/usr/share/common-licenses/GPL)
++""" % (iso))
++
++def get_wrs_version():
++ """Detect version of wireshark-dev package."""
++ deb = os.popen(
++ "dpkg-query -W --showformat='${Version}' wireshark-dev").read()
++ debv = string.find(deb, "-")
++ if debv == -1: debv = len(deb)
++ version = deb[string.find(deb, ":")+1:debv]
++ return version, deb
++
++def get_time():
++ """Detect current time and return ISO and RFC time string."""
++ currenttime = time.gmtime()
++ return time.strftime("%Y-%m-%d %H:%M:%S +0000", currenttime), \
++ time.strftime("%a, %d %b %Y %H:%M:%S +0000", currenttime)
++
++def main():
++ global options
++ process_opts(sys.argv)
++ iso, rfc = get_time()
++ version, deb = get_wrs_version()
++ create_files(version, deb,
++ options['email'], options['asn'], options['name'],
++ iso, rfc)
++ bootstrap()
++ os.system("dpkg-buildpackage " + options['dbopts'])
++
++def process_opts(argv):
++ """Process command line options."""
++ global options
++ try:
++ opts, args = getopt.getopt(argv[1:], "a:d:e:hn:pv",
++ ["asn=",
++ "dbopts=",
++ "email=",
++ "help",
++ "name=",
++ "preserve",
++ "version"])
++ except getopt.GetoptError:
++ usage(argv[0])
++ sys.exit(1)
++ for o, a in opts:
++ if o in ("-a", "--asn"):
++ options['asn'] = a
++ if o in ("-d", "--dbopts"):
++ options['dbopts'] = a
++ if o in ("-e", "--email"):
++ options['email'] = a
++ if o in ("-h", "--help"):
++ options['help'] = 1
++ if o in ("-n", "--name"):
++ options['name'] = a
++ if o in ("-p", "--preserve"):
++ options['preserve'] = 1
++ if o in ("-v", "--version"):
++ options['version'] = 1
++ if options['help']:
++ usage(argv[0])
++ sys.exit(0)
++ if options['version']:
++ print scriptinfo
++ sys.exit(0)
++ if not options['asn']:
++ print "mandatory ASN.1 file parameter missing"
++ sys.exit(1)
++ if not os.access(options['asn'], os.R_OK):
++ print "ASN.1 file not accessible"
++ sys.exit(1)
++
++def usage(name):
++ """Print usage help."""
++ print "Usage: " + name + " <parameters>\n" + \
++ "Parameters are\n" + \
++ " --asn -a asn1file, ASN.1 file to use (mandatory)\n" + \
++ " --dbopts -d opts, options for dpkg-buildpackage\n" + \
++ " --email -e address, use e-mail address\n" + \
++ " --help -h, print help and exit\n" + \
++ " --name -n name, use user name\n" + \
++ " --preserve -p, do not overwrite files\n" + \
++ " --version -v, print version and exit\n" + \
++ "Example:\n" + \
++ name + " -e me@foo.net -a bar.asn1 -n \"My Name\" " + \
++ "-d \"-rfakeroot -uc -us\""
++if __name__ == '__main__':
++ main()
+diff -urNad --exclude=CVS --exclude=.svn ./asn2deb.dbk /tmp/dpep-work.5BSR7A/wireshark-0.10.11/asn2deb.dbk
+--- ./asn2deb.dbk 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep-work.5BSR7A/wireshark-0.10.11/asn2deb.dbk 2005-07-17 19:37:02.000000000 +0200
+@@ -0,0 +1,158 @@
++<?xml version='1.0' encoding='ISO-8859-1'?>
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
++"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
++ <!ENTITY command "<command>asn2deb</command>">
++ <!ENTITY email "<email>debacle@debian.org</email>">
++ <!ENTITY author "W. Borgert">
++ <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
++]>
++
++<refentry>
++ <refentryinfo>
++ <address>
++ &email;
++ </address>
++ <author>
++ <firstname>W.</firstname>
++ <surname>Borgert</surname>
++ </author>
++ <copyright>
++ <year>2003</year>
++ <year>2005</year>
++ <holder>&author;</holder>
++ </copyright>
++ <date>2004-02-18</date>
++ <keywordset>
++ <keyword>ASN.1</keyword>
++ <keyword>BER</keyword>
++ <keyword>Wireshark</keyword>
++ </keywordset>
++ <revhistory>
++ <revision>
++ <revnumber>1</revnumber>
++ <date>2004-02-18</date>
++ <authorinitials>debacle</authorinitials>
++ <revremark>First version.</revremark>
++ </revision>
++ </revhistory>
++ </refentryinfo>
++ <refmeta>
++ <refentrytitle>asn2deb</refentrytitle>
++
++ <manvolnum>1</manvolnum>
++ </refmeta>
++ <refnamediv>
++ <refname>asn2deb</refname>
++
++ <refpurpose>create a Debian package for BER monitoring from ASN.1</refpurpose>
++ </refnamediv>
++ <refsynopsisdiv>
++ <cmdsynopsis>
++ &command;
++ <arg>-a <replaceable>ASN.1 file</replaceable></arg>
++ <arg>--asn=<replaceable>ASN.1 file</replaceable></arg>
++ <arg><option>-d <replaceable>opts</replaceable></option></arg>
++ <arg><option>--dbopts=<replaceable>opts</replaceable></option></arg>
++ <arg><option>-e <replaceable>address</replaceable></option></arg>
++ <arg><option>--email=<replaceable>address</replaceable></option></arg>
++ <arg><option>-h</option></arg>
++ <arg><option>--help</option></arg>
++ <arg><option>-n <replaceable>name</replaceable></option></arg>
++ <arg><option>--name=<replaceable>name</replaceable></option></arg>
++ <arg><option>-p</option></arg>
++ <arg><option>--preserve</option></arg>
++ <arg><option>-v</option></arg>
++ <arg><option>--version</option></arg>
++ </cmdsynopsis>
++ </refsynopsisdiv>
++ <refsect1>
++ <title>Description</title>
++
++ <para>This manual page documents briefly the
++ <command>asn2deb</command> command.</para>
++
++ <para>&command; takes an ASN.1 file as input and creates a Debian
++ package from it. The package contains a loadable type table file
++ for the wireshark network analyser. The type table is generated by
++ the ASN.1 compiler <command>snacc</command>.</para>
++ </refsect1>
++ <refsect1>
++ <title>Options</title>
++
++ <variablelist>
++ <varlistentry>
++ <term><option>-a <replaceable>ASN.1 file</replaceable></option>
++ <option>--asn=<replaceable>ASN.1 file</replaceable></option></term>
++ <listitem>
++ <para>ASN.1 file to use (mandatory).</para>
++ </listitem>
++ </varlistentry>
++ <varlistentry>
++ <term><option>-d <replaceable>opts</replaceable></option>
++ <option>--dbopts=<replaceable>opts</replaceable></option></term>
++ <listitem>
++ <para>options for dpkg-buildpackage.</para>
++ </listitem>
++ </varlistentry>
++ <varlistentry>
++ <term><option>-e <replaceable>address</replaceable></option>
++ <option>--email=<replaceable>address</replaceable></option></term>
++ <listitem>
++ <para>use e-mail address.</para>
++ </listitem>
++ </varlistentry>
++ <varlistentry>
++ <term><option>-h</option>
++ <option>--help</option>
++ </term>
++ <listitem>
++ <para>print help and exit.</para>
++ </listitem>
++ </varlistentry>
++ <varlistentry>
++ <term><option>-n <replaceable>name</replaceable></option>
++ <option>--name=<replaceable>name</replaceable></option></term>
++ <listitem>
++ <para>use user name.</para>
++ </listitem>
++ </varlistentry>
++ <varlistentry>
++ <term><option>-p</option>
++ <option>--preserve</option></term>
++ <listitem>
++ <para>do not overwrite files.</para>
++ </listitem>
++ </varlistentry>
++ <varlistentry>
++ <term><option>-v</option>
++ <option>--version</option></term>
++ <listitem>
++ <para>print version and exit.</para>
++ </listitem>
++ </varlistentry>
++ </variablelist>
++
++ <para>Example:</para>
++
++ <programlisting>/usr/bin/asn2deb -e me@foo.net -a bar.asn1 \
++-n "My Name" -d "-rfakeroot -uc -us"</programlisting>
++
++ </refsect1>
++ <refsect1>
++ <title>See Also</title>
++
++ <para>A lot of tools are used, which you have to
++ <command>apt-get install</command>: wireshark-dev, python,
++ cdbs, autotools-dev, debhelper, dpkg-dev, snacc.</para>
++ </refsect1>
++
++ <refsect1>
++ <title>Copying</title>
++
++ <para>This manual page was written by &author; &email; for
++ &debian; (but may be used by others). Permission is granted to
++ copy, distribute and/or modify this document under the terms of
++ the GNU General Public License, Version 2 or any later
++ version published by the Free Software Foundation.</para>
++ </refsect1>
++</refentry>
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_asn2deb.dpatch by <fpeters@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: asn2deb - create Debian packages from ASN.1 files
+
@DPATCH@
diff -urNad --exclude=CVS --exclude=.svn ./asn2deb /tmp/dpep-work.5BSR7A/ethereal-0.10.11/asn2deb
--- ./asn2deb 1970-01-01 01:00:00.000000000 +0100
#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_preferences.dpatch by <fred@candle>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: use Debian sensible-browser
+
+@DPATCH@
+diff -urNad wireshark-0.10.13~/configure.in wireshark-0.10.13/configure.in
+--- wireshark-0.10.13~/configure.in 2005-12-08 12:47:00.000000000 +0100
++++ wireshark-0.10.13/configure.in 2005-12-08 12:53:33.000000000 +0100
+@@ -38,12 +38,12 @@
+ #
+ AC_MSG_ERROR(I couldn't find pod2html; make sure it's installed and in your path)
+ fi
+-AC_PATH_PROG(HTML_VIEWER, htmlview)
++AC_PATH_PROG(HTML_VIEWER, sensible-browser)
+ if test "x$HTML_VIEWER" = x
+ then
+- AC_DEFINE_UNQUOTED(HTML_VIEWER, "mozilla", [HTML viewer, e.g. mozilla])
++ AC_DEFINE_UNQUOTED(HTML_VIEWER, "sensible-browser", [HTML viewer, e.g. sensible-browser])
+ else
+- AC_DEFINE_UNQUOTED(HTML_VIEWER, "htmlview", [HTML viewer, e.g. mozilla])
++ AC_DEFINE_UNQUOTED(HTML_VIEWER, "sensible-browser", [HTML viewer, e.g. mozilla])
+ fi
+
+ AC_PATH_PROG(LEX, flex)
+#! /bin/sh /usr/share/dpatch/dpatch-run
## 03_preferences.dpatch by <fpeters@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## All lines beginning with `## DP:' are a description of the patch.
## DP: Drop all capabilities but CAP_NET_RAW
+@DPATCH@
+diff -urNad wireshark-0.99.2~/configure.in wireshark-0.99.2/configure.in
+--- wireshark-0.99.2~/configure.in 2006-07-18 21:59:41.000000000 +0200
++++ wireshark-0.99.2/configure.in 2006-07-18 21:59:46.000000000 +0200
+@@ -831,6 +831,47 @@
+ fi
+
+
++dnl libcap check
++AC_MSG_CHECKING(whether to use libcap to improve security)
++
++AC_ARG_WITH(cap,
++[ --with-cap[[=DIR]] use libcap (located in directory DIR, if supplied) to improve security. [[default=yes, if available]]],
++[
++ if test $withval = no
++ then
++ want_cap=no
++ elif test $withval = yes
++ then
++ want_cap=yes
++ else
++ want_cap=yes
++ cap_dir=$withval
++ fi
++],[
++ #
++ # Use libcap if it's present, otherwise don't.
++ #
++ want_cap=ifavailable
++ cap_dir=
++])
++if test "x$want_cap" = "xno" ; then
++ AC_MSG_RESULT(no)
++ cap_message="no (disabled by explicit request)"
++else
++ AC_MSG_RESULT(yes)
++ AC_CHECK_LIB(cap, cap_init, [
++ AC_DEFINE(HAVE_LIBCAP, 1, [
++ Define if libcap is available to restrict process capabilities
++ ])
++ LIBS="$LIBS -lcap"
++ cap_message="yes"
++ ], [
++ AC_MSG_WARN([libcap check failed])
++ cap_message="no (check failed)"
++ ])
++fi
++
++
+ dnl Check if wireshark should be installed setuid
+ AC_ARG_ENABLE(setuid-install,
+ [ --enable-setuid-install install wireshark as setuid. DANGEROUS!!! [default=no]],enable_setuid_install=$enableval,enable_setuid_install=no)
+@@ -1448,3 +1489,4 @@
+ echo " Use IPv6 name resolution : $enable_ipv6"
+ echo " Use UCD SNMP/Net-SNMP library : $snmp_libs_message"
+ echo " Use gnutls library : $tls_message"
++echo " Use cap library : $cap_message"
+diff -urNad wireshark-0.99.2~/gtk/main.c wireshark-0.99.2/gtk/main.c
+--- wireshark-0.99.2~/gtk/main.c 2006-07-17 21:56:45.000000000 +0200
++++ wireshark-0.99.2/gtk/main.c 2006-07-18 21:59:46.000000000 +0200
+@@ -1718,6 +1718,9 @@
+ {
+ gchar *capture_msg;
+
++#ifdef HAVE_LIBCAP
++ dropexcesscapabilities();
++#endif
+
+ gtk_statusbar_pop(GTK_STATUSBAR(packets_bar), packets_ctx);
+
+diff -urNad wireshark-0.99.2~/tshark.c wireshark-0.99.2/tshark.c
+--- wireshark-0.99.2~/tshark.c 2006-07-17 22:00:06.000000000 +0200
++++ wireshark-0.99.2/tshark.c 2006-07-18 22:01:35.000000000 +0200
+@@ -749,6 +749,10 @@
+ capture_opts_init(&capture_opts, NULL /* cfile */);
+ #endif
+
++#ifdef HAVE_LIBCAP
++ dropexcesscapabilities();
++#endif
++
+ timestamp_set_type(TS_RELATIVE);
+ timestamp_set_precision(TS_PREC_AUTO);
+
+diff -urNad wireshark-0.99.2~/util.c wireshark-0.99.2/util.c
+--- wireshark-0.99.2~/util.c 2006-07-17 22:00:05.000000000 +0200
++++ wireshark-0.99.2/util.c 2006-07-18 21:59:46.000000000 +0200
+@@ -40,6 +40,10 @@
+ #include <epan/address.h>
+ #include <epan/addr_resolv.h>
+
++#ifdef HAVE_LIBCAP
++#include <sys/capability.h>
++#endif
++
+ #include "util.h"
+
+ /*
+@@ -180,3 +184,46 @@
+ }
+ return "";
+ }
++
++
++#ifdef HAVE_LIBCAP
++void dropexcesscapabilities(void)
++{
++ cap_t cap_d;
++ cap_value_t cap_values[] = {
++ /* capabilities we need to keep */
++ CAP_NET_RAW,
++ CAP_DAC_READ_SEARCH
++ };
++ cap_flag_value_t current_cap;
++
++ cap_d = cap_get_proc();
++ if (!cap_d) {
++ g_warning("Could not get capabilities\n");
++ return;
++ }
++
++ cap_get_flag(cap_d, CAP_NET_RAW, CAP_EFFECTIVE, ¤t_cap);
++ cap_free(&cap_d);
++ if (current_cap == CAP_CLEAR) {
++ return;
++ }
++
++ cap_d = cap_init();
++ if (!cap_d) {
++ g_warning("Could not alloc cap struct\n");
++ return;
++ }
++
++ cap_clear(cap_d);
++ cap_set_flag(cap_d, CAP_PERMITTED, 2, cap_values, CAP_SET);
++ cap_set_flag(cap_d, CAP_EFFECTIVE, 2, cap_values, CAP_SET);
++
++ if (cap_set_proc(cap_d) != 0) {
++ g_warning("Could not set capabilities: %s\n", strerror(errno));
++ cap_free(&cap_d);
++ return;
++ }
++ cap_free(&cap_d);
++}
++#endif /* HAVE_LIBCAP */
+diff -urNad wireshark-0.99.2~/util.h wireshark-0.99.2/util.h
+--- wireshark-0.99.2~/util.h 2006-07-17 22:00:06.000000000 +0200
++++ wireshark-0.99.2/util.h 2006-07-18 22:01:52.000000000 +0200
+@@ -53,6 +53,15 @@
+ const char *get_conn_cfilter(void);
+
+
++#ifdef HAVE_LIBCAP
++/*
++ * Limit the potential impact of undiscovered security vulnerabilities by
++ * dropping all capabilities except the sniffer capability we need to do our
++ * job.
++ */
++void dropexcesscapabilities(void);
++#endif /* HAVE_LIBCAP */
++
+ #ifdef __cplusplus
+ }
+ #endif /* __cplusplus */
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_drop-capabilities.dpatch by <fpeters@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Drop all capabilities but CAP_NET_RAW
+
@DPATCH@
diff -urNad --exclude=CVS --exclude=.svn ./config.h.in /tmp/dpep-work.rT2mW8/ethereal-0.10.12/config.h.in
--- ./config.h.in 2005-07-31 12:50:13.000000000 +0200
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
+@DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./configure.in /tmp/dpep-work.avwGQ1/wireshark-0.10.11/configure.in
+--- ./configure.in 2005-05-02 23:28:53.000000000 +0200
++++ /tmp/dpep-work.avwGQ1/wireshark-0.10.11/configure.in 2005-07-17 18:46:26.000000000 +0200
+@@ -1130,7 +1130,7 @@
+ dnl check whether plugins should be enabled and, if they should be,
+ dnl check for plugins directory - stolen from Amanda's configure.in
+ dnl
+-plugindir="$libdir/wireshark/plugins/$VERSION"
++plugindir="$libdir/plugins/$VERSION"
+ AC_ARG_WITH(plugins,
+ [ --with-plugins[[=DIR]] support plugins (installed in DIR, if supplied).],
+ [
+@@ -1172,7 +1172,7 @@
+ #
+ # The plugin dissectors reside in ./plugins/PROTO/
+ #
+-PLUGIN_LIBS="-L../../epan -lwireshark $GLIB_LIBS"
++PLUGIN_LIBS="-L../../epan $GLIB_LIBS"
+ AC_SUBST(PLUGIN_LIBS)
+
+ dnl libtool defs
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_plugin-libdir.dpatch by <fpeters@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
@DPATCH@
diff -urNad --exclude=CVS --exclude=.svn ./configure.in /tmp/dpep-work.avwGQ1/ethereal-0.10.11/configure.in
--- ./configure.in 2005-05-02 23:28:53.000000000 +0200
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
+@DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./epan/dissectors/packet-giop.c /tmp/dpep-work.7N90PO/wireshark-0.10.11/epan/dissectors/packet-giop.c
+--- ./epan/dissectors/packet-giop.c 2005-07-17 18:52:08.000000000 +0200
++++ /tmp/dpep-work.7N90PO/wireshark-0.10.11/epan/dissectors/packet-giop.c 2005-07-17 18:55:32.000000000 +0200
+@@ -1760,6 +1760,8 @@
+
+ if (len == 0)
+ return FALSE;
++ if (*offset > header->message_size)
++ return FALSE;
+
+ saved_proto = pinfo->current_proto;
+ for (i=0; i<len; i++) {
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_giop-buffer.dpatch by <fpeters@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
@DPATCH@
diff -urNad --exclude=CVS --exclude=.svn ./epan/dissectors/packet-giop.c /tmp/dpep-work.7N90PO/ethereal-0.10.11/epan/dissectors/packet-giop.c
--- ./epan/dissectors/packet-giop.c 2005-07-17 18:52:08.000000000 +0200
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
+@DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./epan/dissectors/packet-cmip.c /tmp/dpep-work.5KBC28/wireshark-0.10.11/epan/dissectors/packet-cmip.c
+--- ./epan/dissectors/packet-cmip.c 2005-07-17 18:52:24.000000000 +0200
++++ /tmp/dpep-work.5KBC28/wireshark-0.10.11/epan/dissectors/packet-cmip.c 2005-07-17 18:53:53.000000000 +0200
+@@ -1895,7 +1895,8 @@
+ return offset;
+ }
+
+-
++int
++dissect_cmip_InvokeIDType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_);
+
+ static int
+ dissect_cmip_Argument(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_gcc4.dpatch by <fpeters@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
@DPATCH@
diff -urNad --exclude=CVS --exclude=.svn ./epan/dissectors/packet-cmip.c /tmp/dpep-work.5KBC28/ethereal-0.10.11/epan/dissectors/packet-cmip.c
--- ./epan/dissectors/packet-cmip.c 2005-07-17 18:52:24.000000000 +0200
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-export DH_COMPAT=3
-
include /usr/share/dpatch/dpatch.make
DB2MAN=/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl
asn2deb.1: asn2deb.dbk
xsltproc --nonet --novalid $(DB2MAN) $<
+
+CONFIGURE_FLAGS=--prefix=/usr --sysconfdir=/usr/share/wireshark --datadir=/usr/share/wireshark --disable-static --disable-ssl --without-ucdsnmp --enable-gtk2 --libdir=/usr/lib/wireshark CFLAGS="$(CFLAGS)";
+
configure: configure-stamp
configure-stamp: patch
dh_testdir
cp /usr/share/misc/config.guess /usr/share/misc/config.sub .
libtoolize --force --copy
+ autoheader
autoconf
-mkdir aclocal-missing
(if [ ! -x ./configure ]; then \
- ./autogen.sh --prefix=/usr --sysconfdir=/usr/share/ethereal --disable-static --disable-ssl --without-ucdsnmp --enable-gtk2 --libdir=/usr/lib/ethereal CFLAGS="$(CFLAGS)"; \
+ ./autogen.sh $(CONFIGURE_FLAGS) CFLAGS="$(CFLAGS)"; \
fi)
- ./configure --prefix=/usr --sysconfdir=/usr/share/ethereal --disable-static --disable-ssl --without-ucdsnmp --enable-gtk2 --libdir=/usr/lib/ethereal CFLAGS="$(CFLAGS)"
+ ./configure $(CONFIGURE_FLAGS) CFLAGS="$(CFLAGS)"
touch configure-stamp
dh_testroot
rm -f build-stamp configure-stamp
- cp /usr/share/misc/config.guess /usr/share/misc/config.sub .
-$(MAKE) distclean
- rm -f rdps ethereal.1 tshark.1 idl2deb.1 wireshark-filter.4 asn2deb.1
+ rm -f rdps wireshark.1 tshark.1 idl2deb.1 wireshark-filter.4 asn2deb.1
rm -f conftest conftest.c
rm -f config.guess config.sub config.log
+ rm -f config.h.in config.h configure
dh_clean
# Add here commands to install the files into debian/tmp
$(MAKE) install DESTDIR=`pwd`/debian/tmp
mkdir -p `pwd`/debian/tmp/usr/share/applications/
- cp ethereal.desktop `pwd`/debian/tmp/usr/share/applications/
+ cp wireshark.desktop `pwd`/debian/tmp/usr/share/applications/
+ cp tools/idl2wrs.sh `pwd`/debian/tmp/usr/bin/
cp debian/wireshark-root.desktop `pwd`/debian/tmp/usr/share/applications/
mkdir -p `pwd`/debian/tmp/usr/share/pixmaps/
- cp image/hi48-app-ethereal.png `pwd`/debian/tmp/usr/share/pixmaps/
+ cp image/hi48-app-wireshark.png `pwd`/debian/tmp/usr/share/pixmaps/
cp image/wsicon32.xpm `pwd`/debian/tmp/usr/share/pixmaps/
mkdir -p `pwd`/debian/tmp/usr/lib/$(PYTHON_VERSION)/site-packages/
install -m 755 `pwd`/idl2deb `pwd`/debian/tmp/usr/bin/
install -m 755 `pwd`/asn2deb `pwd`/debian/tmp/usr/bin/
- cp `pwd`/ethereal_be.py `pwd`/ethereal_gen.py \
+ cp `pwd`/tools/wireshark_be.py `pwd`/tools/wireshark_gen.py \
`pwd`/debian/tmp/usr/lib/$(PYTHON_VERSION)/site-packages/
- mkdir -p `pwd`/debian/tmp/usr/include/ethereal/
+ mkdir -p `pwd`/debian/tmp/usr/include/wireshark/
for F in `cat debian/wireshark-dev.header-files`; do \
- cp --parents $$F `pwd`/debian/tmp/usr/include/ethereal; \
+ cp --parents $$F `pwd`/debian/tmp/usr/include/wireshark; \
done
# .a is no longer built; why was is used ?
#cp `pwd`/wiretap/libwiretap.a `pwd`/debian/tmp/usr/lib/
/usr/bin/tshark
+/usr/bin/tshark
+
tshark.1
tshark.1
tshark.1
+tshark.1
+/usr/bin/dumpcap
+/usr/bin/capinfos
+/usr/bin/editcap
+/usr/bin/mergecap
+/usr/bin/text2pcap
+/usr/lib/wireshark/libwireshark.so.0
+/usr/lib/wireshark/libwireshark.so.0.0.1
+/usr/lib/wireshark/libwiretap.so.0
+/usr/lib/wireshark/libwiretap.so.0.0.1
+/usr/lib/wireshark/plugins/*
+/usr/share/wireshark/*
/usr/bin/editcap
/usr/bin/mergecap
/usr/bin/text2pcap
mergecap.1
text2pcap.1
wireshark-filter.4
+capinfos.1
+editcap.1
+mergecap.1
+text2pcap.1
+wireshark-filter.4
editcap.1
mergecap.1
doc/README.developer
doc/README.idl2wrs
doc/README.plugins
+doc/README.xml-output
+doc/README.design
+doc/README.developer
+doc/README.idl2wrs
+doc/README.plugins
doc/README.design
doc/README.developer
+/usr/bin/idl2wrs
+/usr/bin/idl2deb
+/usr/bin/asn2deb
+/usr/lib/wireshark/libwireshark.so
+/usr/lib/wireshark/libwireshark.la
+/usr/lib/wireshark/libwiretap.so
+/usr/lib/wireshark/libwiretap.la
+/usr/lib/python2.3/*
+/usr/include/wireshark/*
+
/usr/bin/idl2wrs
/usr/bin/idl2deb
/usr/bin/asn2deb
epan/pint.h
epan/prefs.h
epan/proto.h
+epan/range.h
+epan/reassemble.h
+epan/report_err.h
+epan/slab.h
+epan/tap.h
+epan/to_str.h
+epan/tvbuff.h
+epan/value_string.h
+epan/xdlc.h
+plugins/plugin_api_defs.h
+plugins/plugin_api.h
+plugins/plugin_table.h
+wiretap/wtap.h
+epan/gnuc_format_check.h
+epan/ipv6-utils.h
+epan/dissectors/format-oid.h
+epan/guid-utils.h
+color.h
+config.h
+epan/asn1.h
+epan/address.h
+epan/column_info.h
+epan/column-utils.h
+epan/conversation.h
+epan/crc16.h
+epan/crc32.h
+epan/dfilter/dfilter.h
+epan/dfilter/drange.h
+epan/dissectors/packet-ber.h
+epan/dissectors/packet-giop.h
+epan/dissectors/packet-per.h
+epan/dissectors/packet-rpc.h
+epan/dissectors/packet-tcp.h
+epan/dissectors/packet-tpkt.h
+epan/epan.h
+epan/except.h
+epan/exceptions.h
+epan/filesystem.h
+epan/frame_data.h
+epan/ftypes/ftypes.h
+epan/ipv4.h
+epan/nstime.h
+epan/packet.h
+epan/packet_info.h
+epan/pint.h
+epan/prefs.h
+epan/proto.h
epan/reassemble.h
epan/report_err.h
epan/slab.h
idl2deb.1
asn2deb.1
idl2wrs.1
+idl2deb.1
+asn2deb.1
+idl2wrs.1
#! /bin/sh -e
+PYTHON=python2.3
+
+case "$1" in
+ configure|abort-upgrade|abort-remove|abort-deconfigure)
+ /usr/bin/$PYTHON -O /usr/lib/$PYTHON/compileall.py -q \
+ /usr/lib/$PYTHON/site-packages/
+ ;;
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
+#! /bin/sh -e
+
PYTHON=python2.2
case "$1" in
#DEBHELPER#
+#! /bin/bash -e
+#
+# Debian prerm script for Python x.y hierarchical modules
+# Written by Gregor Hoffleit <flight@debian.org>
+# Extended by Matthias Klose <doko@debian.org>
+#
+
+PACKAGE=`basename $0 | sed -e 's/\.[^.]*$//'`
+
+dpkg --listfiles $PACKAGE |
+ awk '$0~/\.py$/ {print $0"c\n" $0"o"}' |
+ xargs rm -f >&2
+
+#DEBHELPER#
+
Type=Application
Version=1.0
Encoding=UTF-8
+Name=Wireshark (as root)
+GenericName=Network Analyzer
+GenericName[af]=Netwerk Analiseerder
+GenericName[az]=Şəbəkə Analiz Proqramı
+GenericName[bg]=Анализатор на мрежови трафик
+GenericName[bs]=Mrežni analizer
+GenericName[ca]=Analitzador de xarxa
+GenericName[cs]=Analyzátor sítě
+GenericName[da]=Netværksanalyse
+GenericName[de]=Programm für die Netzwerk-Analyse
+GenericName[el]=Αναλυτής Δικτύων
+GenericName[en_GB]=Network Analyser
+GenericName[eo]=Retanalizilo
+GenericName[es]=Analizador de redes
+GenericName[et]=Võrguliikluse analüsaator
+GenericName[eu]=Sare ikerketaria
+GenericName[fa]=تحلیلگر شبکه
+GenericName[fi]=Verkkoanalysaattori
+GenericName[fr]=Analyseur réseau
+GenericName[he]=מאבחן רשת
+GenericName[hr]=Program za analiziranje mreža
+GenericName[hu]=hálózatanalizáló
+GenericName[id]=Analisis jaringan
+GenericName[is]=Netskoðunartól
+GenericName[it]=Analizzatore di rete
+GenericName[ja]=ネットワークアナライザ
+GenericName[ko]=네트웍 분석기
+GenericName[lo]=ເຄື່ອງມືວິເຄາະເຄືອຂ່າຍ
+GenericName[lt]=Tinklo analizatorius
+GenericName[lv]=Tīkla Analizators
+GenericName[mk]=Анализатор на мрежи
+GenericName[mn]=Сүлжээ-шинжлэлийн програм
+GenericName[mt]=Analizzatur tan-network
+GenericName[nb]=Nettverksanalyse
+GenericName[nl]=netwerkanalyseprogramma
+GenericName[nn]=Nettverksanalyse
+GenericName[nso]=Moahlaahli wa Kgokagano
+GenericName[pl]=Analizator sieci
+GenericName[pt]=Analisador de Redes
+GenericName[pt_BR]=Analisador de rede
+GenericName[ro]=Analizor de reţea
+GenericName[ru]=Анализатор сетевого трафика
+GenericName[se]=Fierbmeanalysa
+GenericName[sk]=Analyzátor siete
+GenericName[sl]=Analizator omrežij
+GenericName[sr]=Analizatror mreže
+GenericName[ss]=Sihlatiyi seluchungechunge
+GenericName[sv]=Nätverksanalyserare
+GenericName[ta]=Å¨Ä ¬öÅ¡Ç÷
+GenericName[th]=เครื่องมือวิเคราะห์เครือข่าย
+GenericName[tr]=Ağ Analiz Programı
+GenericName[uk]=Аналізатор мережі
+GenericName[ven]=Musengulusi wa Vhukwamani
+GenericName[vi]=Trình phân tích mạng
+GenericName[xh]=Umcukucezi Womsebenzi womnatha
+GenericName[zh_CN]=网络分析程序
+GenericName[zh_TW]=網路分析程式
+GenericName[zu]=Umhloli Woxhumano olusakazekile
+Comment=Network traffic analyzer
+Comment[fr]=Analyseur de trafic réseau
+Comment[fi]=Verkkoliikenne analysaattori
+Comment[sv]=Nätverkstrafikanalysator
+Icon=hi48-app-wireshark.png
+TryExec=gksu
+Exec=gksu -u root /usr/bin/wireshark
+Path=
+Terminal=false
+MimeType=
+Categories=GNOME;Application;Network;
+# Found in Suse 9.1:
+X-KDE-SubstituteUID=true
+# Deprecated:
+# TerminalOptions=
+# BinaryPattern=wireshark
+# MapNotify=true
+# Protocols=
+[Desktop Entry]
+# $Id$
+# The format of this file is specified at
+# http://freedesktop.org/Standards/desktop-entry-spec/
+# The entries are in the order they are listed in version 0.9.4
+Type=Application
+Version=1.0
+Encoding=UTF-8
Name=Ethereal (as root)
GenericName=Network Analyzer
GenericName[af]=Netwerk Analiseerder
+/usr/bin/wireshark
+/usr/share/applications/
+/usr/share/pixmaps/
/usr/bin/ethereal
/usr/share/applications/
/usr/share/pixmaps/
+wireshark.1
ethereal.1
ethereal.1
ethereal.1
+?package(wireshark):needs="X11" section="Apps/Net" title="Wireshark" \
+ command="/usr/bin/wireshark" \
+ icon="/usr/share/pixmaps/wsicon32.xpm"
+
?package(ethereal):needs="X11" section="Apps/Net" title="Ethereal" \
command="/usr/bin/ethereal" \
icon="/usr/share/pixmaps/wsicon32.xpm"
git.samba.org / obnox / wireshark / wip.git / commitdiff