--- wireshark-1.0.0.orig/debian/patches/00list +++ wireshark-1.0.0/debian/patches/00list @@ -0,0 +1,14 @@ +01_idl2deb +02_asn2deb +03_preferences +#04_drop-capabilities +#05_plugin-libdir +06_giop-buffer +07_gcc4 +08_wireshark-desktop-menu +09_idl2wrs +10_wireshark_gen +14_disable-cmip +15_sensitive_open +16_licence_about_location +17_clique_rm_support --- wireshark-1.0.0.orig/debian/patches/04_drop-capabilities.dpatch +++ wireshark-1.0.0/debian/patches/04_drop-capabilities.dpatch @@ -0,0 +1,125 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_drop-capabilities.dpatch by +## +## 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.7~pre1~/configure.in wireshark-0.99.7~pre1/configure.in +--- wireshark-0.99.7~pre1~/configure.in 2007-11-22 17:57:27.000000000 +0100 ++++ wireshark-0.99.7~pre1/configure.in 2007-11-22 19:49:04.123227069 +0100 +@@ -1092,6 +1092,7 @@ + AC_WIRESHARK_LIBCAP_CHECK + fi + AC_SUBST(LIBCAP_LIBS) ++LIBS="$LIBS $LIBCAP_LIBS" + + dnl Checks for header files. + AC_HEADER_STDC +diff -urNad wireshark-0.99.7~pre1~/gtk/main.c wireshark-0.99.7~pre1/gtk/main.c +--- wireshark-0.99.7~pre1~/gtk/main.c 2007-11-22 17:57:26.000000000 +0100 ++++ wireshark-0.99.7~pre1/gtk/main.c 2007-11-22 19:47:17.867228596 +0100 +@@ -1827,6 +1827,9 @@ + { + gchar *capture_msg; + ++#ifdef HAVE_LIBCAP ++ dropexcesscapabilities(); ++#endif + + gtk_statusbar_pop(GTK_STATUSBAR(packets_bar), packets_ctx); + +diff -urNad wireshark-0.99.7~pre1~/tshark.c wireshark-0.99.7~pre1/tshark.c +--- wireshark-0.99.7~pre1~/tshark.c 2007-11-22 17:57:25.000000000 +0100 ++++ wireshark-0.99.7~pre1/tshark.c 2007-11-22 19:47:17.871228775 +0100 +@@ -792,6 +792,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.7~pre1~/util.c wireshark-0.99.7~pre1/util.c +--- wireshark-0.99.7~pre1~/util.c 2007-11-22 17:57:26.000000000 +0100 ++++ wireshark-0.99.7~pre1/util.c 2007-11-22 19:47:17.871228775 +0100 +@@ -41,6 +41,10 @@ + #include + #include + ++#ifdef HAVE_LIBCAP ++#include ++#endif ++ + #include "util.h" + + /* +@@ -317,3 +321,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.7~pre1~/util.h wireshark-0.99.7~pre1/util.h +--- wireshark-0.99.7~pre1~/util.h 2007-11-22 17:57:25.000000000 +0100 ++++ wireshark-0.99.7~pre1/util.h 2007-11-22 19:47:17.871228775 +0100 +@@ -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 */ --- wireshark-1.0.0.orig/debian/patches/09_idl2wrs.dpatch +++ wireshark-1.0.0/debian/patches/09_idl2wrs.dpatch @@ -0,0 +1,51 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 09_idl2wrs.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad wireshark-0.99.5~/tools/idl2wrs.sh.in wireshark-0.99.5/tools/idl2wrs.sh.in +--- wireshark-0.99.5~/tools/idl2wrs.sh.in 2007-02-01 22:53:43.000000000 +0000 ++++ wireshark-0.99.5/tools/idl2wrs.sh.in 2007-04-01 08:56:28.000000000 +0000 +@@ -48,40 +48,6 @@ + exit 1; + fi + +-# +-# Run wireshark backend, looking for wireshark_be.py and wireshark_gen.py +-# in pythons's "site-packages" directory. If cannot find that, then +-# try looking in current directory. If still cannot, then exit with +-# error. +- +-if [ -f $PYTHONPATH/site-packages/wireshark_be.py ] && [ -f $PYTHONPATH/site-packages/wireshark_gen.py ]; then +- exec omniidl -p $PYTHONPATH/site-packages -b wireshark_be $@ +- /* not reached */ +-fi +- +-# Try current directory. +- +-if [ -f ./wireshark_be.py ] && [ -f ./wireshark_gen.py ]; then +- exec omniidl -p ./ -b wireshark_be $@ +- /* not reached */ +-fi +- +-# Could not find both wireshark_be.py AND wireshark_gen.py +-# So let's just try to run it without -p, hoping that the installation +-# set up a valid path. + + exec omniidl -b wireshark_be $@ + +-old code: not reached +- +-echo "idl2wrs Error: Could not find both wireshark_be.py AND wireshark_gen.py." +-echo "Please ensure you have the PYTHONPATH variable set, or that wireshark_be.py " +-echo "and wireshark_gen.py exist in the current directory. " +-echo +-echo "On this system, PYTHONPATH is : $PYTHONPATH" +-echo +- +-exit 2 +- +- +- --- wireshark-1.0.0.orig/debian/patches/15_sensitive_open.dpatch +++ wireshark-1.0.0/debian/patches/15_sensitive_open.dpatch @@ -0,0 +1,24 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 15_sensitive_open.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: don't make the open button unsensitive with the new GtkFileChooser +## DP: dialog since filename can also be changed from the location bar +## DP: closes: #439198 + +@DPATCH@ +diff -urNad wireshark-0.99.6~/gtk/capture_file_dlg.c wireshark-0.99.6/gtk/capture_file_dlg.c +--- wireshark-0.99.6~/gtk/capture_file_dlg.c 2007-07-05 19:22:28.000000000 +0000 ++++ wireshark-0.99.6/gtk/capture_file_dlg.c 2007-08-23 10:09:17.000000000 +0000 +@@ -339,7 +339,11 @@ + + /* make the open/save/... dialog button sensitive */ + #if (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 4) || GTK_MAJOR_VERSION > 2 ++ /* don't make the open button unsensitive with the new GtkFileChooser ++ * dialog since filename can also be changed from the location bar */ ++ /* + gtk_dialog_set_response_sensitive(file_sel, GTK_RESPONSE_ACCEPT, have_preview); ++ */ + #else + gtk_widget_set_sensitive(GTK_FILE_SELECTION(file_sel)->ok_button, have_preview); + #endif --- wireshark-1.0.0.orig/debian/patches/02_asn2deb.dpatch +++ wireshark-1.0.0/debian/patches/02_asn2deb.dpatch @@ -0,0 +1,392 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_asn2deb.dpatch by +## +## 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 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 ++# ++# Wireshark - Network traffic analyzer ++# By Gerald Combs ++# 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 + " \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 @@ ++ ++asn2deb"> ++ debacle@debian.org"> ++ ++ Debian GNU/Linux"> ++]> ++ ++ ++ ++
++ &email; ++
++ ++ W. ++ Borgert ++ ++ ++ 2003 ++ 2005 ++ &author; ++ ++ 2004-02-18 ++ ++ ASN.1 ++ BER ++ Wireshark ++ ++ ++ ++ 1 ++ 2004-02-18 ++ debacle ++ First version. ++ ++ ++ ++ ++ asn2deb ++ ++ 1 ++ ++ ++ asn2deb ++ ++ create a Debian package for BER monitoring from ASN.1 ++ ++ ++ ++ &command; ++ -a ASN.1 file ++ --asn=ASN.1 file ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ Description ++ ++ This manual page documents briefly the ++ asn2deb command. ++ ++ &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 snacc. ++ ++ ++ Options ++ ++ ++ ++ ++ ++ ++ ASN.1 file to use (mandatory). ++ ++ ++ ++ ++ ++ ++ options for dpkg-buildpackage. ++ ++ ++ ++ ++ ++ ++ use e-mail address. ++ ++ ++ ++ ++ ++ ++ ++ print help and exit. ++ ++ ++ ++ ++ ++ ++ use user name. ++ ++ ++ ++ ++ ++ ++ do not overwrite files. ++ ++ ++ ++ ++ ++ ++ print version and exit. ++ ++ ++ ++ ++ Example: ++ ++ /usr/bin/asn2deb -e me@foo.net -a bar.asn1 \ ++-n "My Name" -d "-rfakeroot -uc -us" ++ ++ ++ ++ See Also ++ ++ A lot of tools are used, which you have to ++ apt-get install: wireshark-dev, python, ++ cdbs, autotools-dev, debhelper, dpkg-dev, snacc. ++ ++ ++ ++ Copying ++ ++ 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. ++ ++ --- wireshark-1.0.0.orig/debian/patches/01_idl2deb.dpatch +++ wireshark-1.0.0/debian/patches/01_idl2deb.dpatch @@ -0,0 +1,424 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_idl2deb.dpatch by +## +## 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 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 ++# ++# Wireshark - Network traffic analyzer ++# By Gerald Combs ++# 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 + " \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 @@ ++ ++idl2deb"> ++ debacle@debian.org"> ++ ++ Debian GNU/Linux"> ++]> ++ ++ ++ ++
++ &email; ++
++ ++ W. ++ Borgert ++ ++ ++ 2003 ++ 2005 ++ &author; ++ ++ 2003-08-17 ++ ++ CORBA ++ IDL ++ Wireshark ++ ++ ++ ++ 2003-08-17 ++ 2003-08-17 ++ debacle ++ First version. ++ ++ ++ ++ ++ idl2deb ++ ++ 1 ++ ++ ++ idl2deb ++ ++ create a Debian package for CORBA monitoring from IDL ++ ++ ++ ++ &command; ++ ++ ++ ++ ++ -i idlfile ++ --idl=idlfile ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ Description ++ ++ This manual page documents briefly the ++ idl2deb command. ++ ++ &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. ++ ++ ++ Options ++ ++ ++ ++ ++ ++ ++ options for dpkg-buildpackage. ++ ++ ++ ++ ++ ++ ++ use e-mail address. ++ ++ ++ ++ ++ ++ ++ IDL file to use (mandatory). ++ ++ ++ ++ ++ ++ ++ ++ print help and exit. ++ ++ ++ ++ ++ ++ ++ use user name. ++ ++ ++ ++ ++ ++ ++ do not overwrite files. ++ ++ ++ ++ ++ ++ ++ print version and exit. ++ ++ ++ ++ ++ Example: ++ ++ /usr/bin/idl2deb -e me@foo.net -i bar.idl \ ++-n "My Name" -d "-rfakeroot -uc -us" ++ ++ ++ ++ See Also ++ ++ A lot of tools are used, which you have to ++ apt-get install: wireshark-dev, python, ++ cdbs, autotools-dev, debhelper, dpkg-dev. ++ ++ ++ ++ Copying ++ ++ 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. ++ ++ --- wireshark-1.0.0.orig/debian/patches/17_clique_rm_support.dpatch +++ wireshark-1.0.0/debian/patches/17_clique_rm_support.dpatch @@ -0,0 +1,1185 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 17_clique_rm_support.patch.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad wireshark-0.99.7~/configure.in wireshark-0.99.7/configure.in +--- wireshark-0.99.7~/configure.in 2007-12-21 13:51:15.267121914 +0100 ++++ wireshark-0.99.7/configure.in 2007-12-21 13:51:16.079128594 +0100 +@@ -1624,6 +1624,7 @@ + plugins/pcli/Makefile + plugins/profinet/Makefile + plugins/rlm/Makefile ++ plugins/clique-rm/Makefile + plugins/rtnet/Makefile + plugins/rudp/Makefile + plugins/sbus/Makefile +diff -urNad wireshark-0.99.7~/plugins/Makefile.am wireshark-0.99.7/plugins/Makefile.am +--- wireshark-0.99.7~/plugins/Makefile.am 2007-12-18 02:14:52.000000000 +0100 ++++ wireshark-0.99.7/plugins/Makefile.am 2007-12-21 13:51:16.079128594 +0100 +@@ -40,6 +40,7 @@ + pcli \ + profinet \ + rlm \ ++ clique-rm \ + rtnet \ + rudp \ + sbus \ +diff -urNad wireshark-0.99.7~/plugins/clique-rm/AUTHORS wireshark-0.99.7/plugins/clique-rm/AUTHORS +--- wireshark-0.99.7~/plugins/clique-rm/AUTHORS 1970-01-01 01:00:00.000000000 +0100 ++++ wireshark-0.99.7/plugins/clique-rm/AUTHORS 2007-12-21 13:51:16.079128594 +0100 +@@ -0,0 +1,2 @@ ++Author: ++Sjoerd Simons +diff -urNad wireshark-0.99.7~/plugins/clique-rm/COPYING wireshark-0.99.7/plugins/clique-rm/COPYING +--- wireshark-0.99.7~/plugins/clique-rm/COPYING 1970-01-01 01:00:00.000000000 +0100 ++++ wireshark-0.99.7/plugins/clique-rm/COPYING 2007-12-21 13:51:16.079128594 +0100 +@@ -0,0 +1,340 @@ ++ GNU GENERAL PUBLIC LICENSE ++ Version 2, June 1991 ++ ++ Copyright (C) 1989, 1991 Free Software Foundation, Inc. ++ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ Everyone is permitted to copy and distribute verbatim copies ++ of this license document, but changing it is not allowed. ++ ++ Preamble ++ ++ The licenses for most software are designed to take away your ++freedom to share and change it. By contrast, the GNU General Public ++License is intended to guarantee your freedom to share and change free ++software--to make sure the software is free for all its users. This ++General Public License applies to most of the Free Software ++Foundation's software and to any other program whose authors commit to ++using it. (Some other Free Software Foundation software is covered by ++the GNU Library General Public License instead.) You can apply it to ++your programs, too. ++ ++ When we speak of free software, we are referring to freedom, not ++price. Our General Public Licenses are designed to make sure that you ++have the freedom to distribute copies of free software (and charge for ++this service if you wish), that you receive source code or can get it ++if you want it, that you can change the software or use pieces of it ++in new free programs; and that you know you can do these things. ++ ++ To protect your rights, we need to make restrictions that forbid ++anyone to deny you these rights or to ask you to surrender the rights. ++These restrictions translate to certain responsibilities for you if you ++distribute copies of the software, or if you modify it. ++ ++ For example, if you distribute copies of such a program, whether ++gratis or for a fee, you must give the recipients all the rights that ++you have. You must make sure that they, too, receive or can get the ++source code. And you must show them these terms so they know their ++rights. ++ ++ We protect your rights with two steps: (1) copyright the software, and ++(2) offer you this license which gives you legal permission to copy, ++distribute and/or modify the software. ++ ++ Also, for each author's protection and ours, we want to make certain ++that everyone understands that there is no warranty for this free ++software. If the software is modified by someone else and passed on, we ++want its recipients to know that what they have is not the original, so ++that any problems introduced by others will not reflect on the original ++authors' reputations. ++ ++ Finally, any free program is threatened constantly by software ++patents. We wish to avoid the danger that redistributors of a free ++program will individually obtain patent licenses, in effect making the ++program proprietary. To prevent this, we have made it clear that any ++patent must be licensed for everyone's free use or not licensed at all. ++ ++ The precise terms and conditions for copying, distribution and ++modification follow. ++ ++ GNU GENERAL PUBLIC LICENSE ++ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION ++ ++ 0. This License applies to any program or other work which contains ++a notice placed by the copyright holder saying it may be distributed ++under the terms of this General Public License. The "Program", below, ++refers to any such program or work, and a "work based on the Program" ++means either the Program or any derivative work under copyright law: ++that is to say, a work containing the Program or a portion of it, ++either verbatim or with modifications and/or translated into another ++language. (Hereinafter, translation is included without limitation in ++the term "modification".) Each licensee is addressed as "you". ++ ++Activities other than copying, distribution and modification are not ++covered by this License; they are outside its scope. The act of ++running the Program is not restricted, and the output from the Program ++is covered only if its contents constitute a work based on the ++Program (independent of having been made by running the Program). ++Whether that is true depends on what the Program does. ++ ++ 1. You may copy and distribute verbatim copies of the Program's ++source code as you receive it, in any medium, provided that you ++conspicuously and appropriately publish on each copy an appropriate ++copyright notice and disclaimer of warranty; keep intact all the ++notices that refer to this License and to the absence of any warranty; ++and give any other recipients of the Program a copy of this License ++along with the Program. ++ ++You may charge a fee for the physical act of transferring a copy, and ++you may at your option offer warranty protection in exchange for a fee. ++ ++ 2. You may modify your copy or copies of the Program or any portion ++of it, thus forming a work based on the Program, and copy and ++distribute such modifications or work under the terms of Section 1 ++above, provided that you also meet all of these conditions: ++ ++ a) You must cause the modified files to carry prominent notices ++ stating that you changed the files and the date of any change. ++ ++ b) You must cause any work that you distribute or publish, that in ++ whole or in part contains or is derived from the Program or any ++ part thereof, to be licensed as a whole at no charge to all third ++ parties under the terms of this License. ++ ++ c) If the modified program normally reads commands interactively ++ when run, you must cause it, when started running for such ++ interactive use in the most ordinary way, to print or display an ++ announcement including an appropriate copyright notice and a ++ notice that there is no warranty (or else, saying that you provide ++ a warranty) and that users may redistribute the program under ++ these conditions, and telling the user how to view a copy of this ++ License. (Exception: if the Program itself is interactive but ++ does not normally print such an announcement, your work based on ++ the Program is not required to print an announcement.) ++ ++These requirements apply to the modified work as a whole. If ++identifiable sections of that work are not derived from the Program, ++and can be reasonably considered independent and separate works in ++themselves, then this License, and its terms, do not apply to those ++sections when you distribute them as separate works. But when you ++distribute the same sections as part of a whole which is a work based ++on the Program, the distribution of the whole must be on the terms of ++this License, whose permissions for other licensees extend to the ++entire whole, and thus to each and every part regardless of who wrote it. ++ ++Thus, it is not the intent of this section to claim rights or contest ++your rights to work written entirely by you; rather, the intent is to ++exercise the right to control the distribution of derivative or ++collective works based on the Program. ++ ++In addition, mere aggregation of another work not based on the Program ++with the Program (or with a work based on the Program) on a volume of ++a storage or distribution medium does not bring the other work under ++the scope of this License. ++ ++ 3. You may copy and distribute the Program (or a work based on it, ++under Section 2) in object code or executable form under the terms of ++Sections 1 and 2 above provided that you also do one of the following: ++ ++ a) Accompany it with the complete corresponding machine-readable ++ source code, which must be distributed under the terms of Sections ++ 1 and 2 above on a medium customarily used for software interchange; or, ++ ++ b) Accompany it with a written offer, valid for at least three ++ years, to give any third party, for a charge no more than your ++ cost of physically performing source distribution, a complete ++ machine-readable copy of the corresponding source code, to be ++ distributed under the terms of Sections 1 and 2 above on a medium ++ customarily used for software interchange; or, ++ ++ c) Accompany it with the information you received as to the offer ++ to distribute corresponding source code. (This alternative is ++ allowed only for noncommercial distribution and only if you ++ received the program in object code or executable form with such ++ an offer, in accord with Subsection b above.) ++ ++The source code for a work means the preferred form of the work for ++making modifications to it. For an executable work, complete source ++code means all the source code for all modules it contains, plus any ++associated interface definition files, plus the scripts used to ++control compilation and installation of the executable. However, as a ++special exception, the source code distributed need not include ++anything that is normally distributed (in either source or binary ++form) with the major components (compiler, kernel, and so on) of the ++operating system on which the executable runs, unless that component ++itself accompanies the executable. ++ ++If distribution of executable or object code is made by offering ++access to copy from a designated place, then offering equivalent ++access to copy the source code from the same place counts as ++distribution of the source code, even though third parties are not ++compelled to copy the source along with the object code. ++ ++ 4. You may not copy, modify, sublicense, or distribute the Program ++except as expressly provided under this License. Any attempt ++otherwise to copy, modify, sublicense or distribute the Program is ++void, and will automatically terminate your rights under this License. ++However, parties who have received copies, or rights, from you under ++this License will not have their licenses terminated so long as such ++parties remain in full compliance. ++ ++ 5. You are not required to accept this License, since you have not ++signed it. However, nothing else grants you permission to modify or ++distribute the Program or its derivative works. These actions are ++prohibited by law if you do not accept this License. Therefore, by ++modifying or distributing the Program (or any work based on the ++Program), you indicate your acceptance of this License to do so, and ++all its terms and conditions for copying, distributing or modifying ++the Program or works based on it. ++ ++ 6. Each time you redistribute the Program (or any work based on the ++Program), the recipient automatically receives a license from the ++original licensor to copy, distribute or modify the Program subject to ++these terms and conditions. You may not impose any further ++restrictions on the recipients' exercise of the rights granted herein. ++You are not responsible for enforcing compliance by third parties to ++this License. ++ ++ 7. If, as a consequence of a court judgment or allegation of patent ++infringement or for any other reason (not limited to patent issues), ++conditions are imposed on you (whether by court order, agreement or ++otherwise) that contradict the conditions of this License, they do not ++excuse you from the conditions of this License. If you cannot ++distribute so as to satisfy simultaneously your obligations under this ++License and any other pertinent obligations, then as a consequence you ++may not distribute the Program at all. For example, if a patent ++license would not permit royalty-free redistribution of the Program by ++all those who receive copies directly or indirectly through you, then ++the only way you could satisfy both it and this License would be to ++refrain entirely from distribution of the Program. ++ ++If any portion of this section is held invalid or unenforceable under ++any particular circumstance, the balance of the section is intended to ++apply and the section as a whole is intended to apply in other ++circumstances. ++ ++It is not the purpose of this section to induce you to infringe any ++patents or other property right claims or to contest validity of any ++such claims; this section has the sole purpose of protecting the ++integrity of the free software distribution system, which is ++implemented by public license practices. Many people have made ++generous contributions to the wide range of software distributed ++through that system in reliance on consistent application of that ++system; it is up to the author/donor to decide if he or she is willing ++to distribute software through any other system and a licensee cannot ++impose that choice. ++ ++This section is intended to make thoroughly clear what is believed to ++be a consequence of the rest of this License. ++ ++ 8. If the distribution and/or use of the Program is restricted in ++certain countries either by patents or by copyrighted interfaces, the ++original copyright holder who places the Program under this License ++may add an explicit geographical distribution limitation excluding ++those countries, so that distribution is permitted only in or among ++countries not thus excluded. In such case, this License incorporates ++the limitation as if written in the body of this License. ++ ++ 9. The Free Software Foundation may publish revised and/or new versions ++of the General Public License from time to time. Such new versions will ++be similar in spirit to the present version, but may differ in detail to ++address new problems or concerns. ++ ++Each version is given a distinguishing version number. If the Program ++specifies a version number of this License which applies to it and "any ++later version", you have the option of following the terms and conditions ++either of that version or of any later version published by the Free ++Software Foundation. If the Program does not specify a version number of ++this License, you may choose any version ever published by the Free Software ++Foundation. ++ ++ 10. If you wish to incorporate parts of the Program into other free ++programs whose distribution conditions are different, write to the author ++to ask for permission. For software which is copyrighted by the Free ++Software Foundation, write to the Free Software Foundation; we sometimes ++make exceptions for this. Our decision will be guided by the two goals ++of preserving the free status of all derivatives of our free software and ++of promoting the sharing and reuse of software generally. ++ ++ NO WARRANTY ++ ++ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY ++FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN ++OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES ++PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED ++OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS ++TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE ++PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, ++REPAIR OR CORRECTION. ++ ++ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING ++WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR ++REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, ++INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING ++OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED ++TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY ++YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER ++PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE ++POSSIBILITY OF SUCH DAMAGES. ++ ++ END OF TERMS AND CONDITIONS ++ ++ How to Apply These Terms to Your New Programs ++ ++ If you develop a new program, and you want it to be of the greatest ++possible use to the public, the best way to achieve this is to make it ++free software which everyone can redistribute and change under these terms. ++ ++ To do so, attach the following notices to the program. It is safest ++to attach them to the start of each source file to most effectively ++convey the exclusion of warranty; and each file should have at least ++the "copyright" line and a pointer to where the full notice is found. ++ ++ ++ Copyright (C) ++ ++ 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 ++ ++ ++Also add information on how to contact you by electronic and paper mail. ++ ++If the program is interactive, make it output a short notice like this ++when it starts in an interactive mode: ++ ++ Gnomovision version 69, Copyright (C) year name of author ++ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. ++ This is free software, and you are welcome to redistribute it ++ under certain conditions; type `show c' for details. ++ ++The hypothetical commands `show w' and `show c' should show the appropriate ++parts of the General Public License. Of course, the commands you use may ++be called something other than `show w' and `show c'; they could even be ++mouse-clicks or menu items--whatever suits your program. ++ ++You should also get your employer (if you work as a programmer) or your ++school, if any, to sign a "copyright disclaimer" for the program, if ++necessary. Here is a sample; alter the names: ++ ++ Yoyodyne, Inc., hereby disclaims all copyright interest in the program ++ `Gnomovision' (which makes passes at compilers) written by James Hacker. ++ ++ , 1 April 1989 ++ Ty Coon, President of Vice ++ ++This General Public License does not permit incorporating your program into ++proprietary programs. If your program is a subroutine library, you may ++consider it more useful to permit linking proprietary applications with the ++library. If this is what you want to do, use the GNU Library General ++Public License instead of this License. +diff -urNad wireshark-0.99.7~/plugins/clique-rm/Makefile.am wireshark-0.99.7/plugins/clique-rm/Makefile.am +--- wireshark-0.99.7~/plugins/clique-rm/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ wireshark-0.99.7/plugins/clique-rm/Makefile.am 2007-12-21 13:51:16.079128594 +0100 +@@ -0,0 +1,124 @@ ++# Makefile.am ++# Automake file for Cisco SS7 Redundant Link Management plugin ++# Copyright 2004, Duncan Sargeant ++# ++# $Id: Makefile.am 21961 2007-05-27 18:35:55Z guy $ ++# ++# Wireshark - Network traffic analyzer ++# By Gerald Combs ++# 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. ++# ++ ++INCLUDES = -I$(top_srcdir) -I$(includedir) ++ ++include Makefile.common ++ ++if HAVE_WARNINGS_AS_ERRORS ++AM_CFLAGS = -Werror ++endif ++ ++plugindir = @plugindir@ ++ ++plugin_LTLIBRARIES = clique-rm.la ++clique_rm_la_SOURCES = \ ++ plugin.c \ ++ moduleinfo.h \ ++ $(DISSECTOR_SRC) \ ++ $(DISSECTOR_INCLUDES) ++clique_rm_la_LDFLAGS = -module -avoid-version ++clique_rm_la_LIBADD = @PLUGIN_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 = ++ ++# ++# Build plugin.c, which contains the plugin version[] string, a ++# function plugin_register() that calls the register routines for all ++# protocols, and a function plugin_reg_handoff() that calls the handoff ++# registration routines for all protocols. ++# ++# We do this by scanning sources. If that turns out to be too slow, ++# maybe we could just require every .o file to have an register routine ++# of a given name (packet-aarp.o -> proto_register_aarp, etc.). ++# ++# Formatting conventions: The name of the proto_register_* routines an ++# proto_reg_handoff_* routines must start in column zero, or must be ++# preceded only by "void " starting in column zero, and must not be ++# inside #if. ++# ++# DISSECTOR_SRC is assumed to have all the files that need to be scanned. ++# ++# For some unknown reason, having a big "for" loop in the Makefile ++# to scan all the files doesn't work with some "make"s; they seem to ++# pass only the first few names in the list to the shell, for some ++# reason. ++# ++# Therefore, we have a script to generate the plugin.c file. ++# The shell script runs slowly, as multiple greps and seds are run ++# for each input file; this is especially slow on Windows. Therefore, ++# if Python is present (as indicated by PYTHON being defined), we run ++# a faster Python script to do that work instead. ++# ++# The first argument is the directory in which the source files live. ++# The second argument is "plugin", to indicate that we should build ++# a plugin.c file for a plugin. ++# All subsequent arguments are the files to scan. ++# ++plugin.c: $(DISSECTOR_SRC) $(top_srcdir)/tools/make-dissector-reg \ ++ $(top_srcdir)/tools/make-dissector-reg.py ++ @if test -n $(PYTHON); then \ ++ echo Making plugin.c with python ; \ ++ $(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \ ++ plugin $(DISSECTOR_SRC) ; \ ++ else \ ++ echo Making plugin.c with shell script ; \ ++ $(top_srcdir)/tools/make-dissector-reg $(srcdir) \ ++ $(plugin_src) plugin $(DISSECTOR_SRC) ; \ ++ fi ++ ++# ++# Currently plugin.c can be included in the distribution because ++# we always build all protocol dissectors. We used to have to check ++# whether or not to build the snmp dissector. If we again need to ++# variably build something, making plugin.c non-portable, uncomment ++# the dist-hook line below. ++# ++# Oh, yuk. We don't want to include "plugin.c" in the distribution, as ++# its contents depend on the configuration, and therefore we want it ++# to be built when the first "make" is done; however, Automake insists ++# on putting *all* source into the distribution. ++# ++# We work around this by having a "dist-hook" rule that deletes ++# "plugin.c", so that "dist" won't pick it up. ++# ++#dist-hook: ++# @rm -f $(distdir)/plugin.c ++ ++CLEANFILES = \ ++ *~ ++ ++MAINTAINERCLEANFILES = \ ++ Makefile.in \ ++ plugin.c ++ ++EXTRA_DIST = \ ++ Makefile.common \ ++ Makefile.nmake \ ++ moduleinfo.nmake \ ++ plugin.rc.in +diff -urNad wireshark-0.99.7~/plugins/clique-rm/Makefile.common wireshark-0.99.7/plugins/clique-rm/Makefile.common +--- wireshark-0.99.7~/plugins/clique-rm/Makefile.common 1970-01-01 01:00:00.000000000 +0100 ++++ wireshark-0.99.7/plugins/clique-rm/Makefile.common 2007-12-21 13:51:16.079128594 +0100 +@@ -0,0 +1,31 @@ ++# Makefile.common for Cisco SS7 Redundant Link Management plugin ++# Contains the stuff from Makefile.am and Makefile.nmake that is ++# a) common to both files and ++# b) portable between both files ++# ++# $Id: Makefile.common 18197 2006-05-21 05:12:17Z sahlberg $ ++# ++# Wireshark - Network traffic analyzer ++# By Gerald Combs ++# 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. ++ ++# the name of the plugin ++PLUGIN_NAME = clique-rm ++ ++# the dissector sources (without any helpers) ++DISSECTOR_SRC = \ ++ packet-clique-rm.c +diff -urNad wireshark-0.99.7~/plugins/clique-rm/Makefile.nmake wireshark-0.99.7/plugins/clique-rm/Makefile.nmake +--- wireshark-0.99.7~/plugins/clique-rm/Makefile.nmake 1970-01-01 01:00:00.000000000 +0100 ++++ wireshark-0.99.7/plugins/clique-rm/Makefile.nmake 2007-12-21 13:51:16.079128594 +0100 +@@ -0,0 +1,99 @@ ++# Makefile.nmake ++# nmake file for Wireshark plugin ++# ++# $Id: Makefile.nmake 22696 2007-08-27 22:56:27Z wmeier $ ++# ++ ++include ..\..\config.nmake ++include moduleinfo.nmake ++ ++include Makefile.common ++ ++CFLAGS=/WX /DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ ++ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) ++ ++.c.obj:: ++ $(CC) $(CFLAGS) -Fd.\ -c $< ++ ++LDFLAGS = $(PLUGIN_LDFLAGS) ++ ++!IFDEF ENABLE_LIBWIRESHARK ++LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib ++CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS) ++ ++DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj) ++ ++DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj) ++ ++OBJECTS = $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) plugin.obj ++ ++RESOURCE=$(PLUGIN_NAME).res ++ ++all: $(PLUGIN_NAME).dll ++ ++$(PLUGIN_NAME).rc : moduleinfo.nmake ++ sed -e s/@PLUGIN_NAME@/$(PLUGIN_NAME)/ \ ++ -e s/@RC_MODULE_VERSION@/$(RC_MODULE_VERSION)/ \ ++ -e s/@RC_VERSION@/$(RC_VERSION)/ \ ++ -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ ++ -e s/@PACKAGE@/$(PACKAGE)/ \ ++ -e s/@VERSION@/$(VERSION)/ \ ++ -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ ++ < plugin.rc.in > $@ ++ ++$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) ++ link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ ++ $(GLIB_LIBS) $(RESOURCE) ++ ++# ++# Build plugin.c, which contains the plugin version[] string, a ++# function plugin_register() that calls the register routines for all ++# protocols, and a function plugin_reg_handoff() that calls the handoff ++# registration routines for all protocols. ++# ++# We do this by scanning sources. If that turns out to be too slow, ++# maybe we could just require every .o file to have an register routine ++# of a given name (packet-aarp.o -> proto_register_aarp, etc.). ++# ++# Formatting conventions: The name of the proto_register_* routines an ++# proto_reg_handoff_* routines must start in column zero, or must be ++# preceded only by "void " starting in column zero, and must not be ++# inside #if. ++# ++# DISSECTOR_SRC is assumed to have all the files that need to be scanned. ++# ++# For some unknown reason, having a big "for" loop in the Makefile ++# to scan all the files doesn't work with some "make"s; they seem to ++# pass only the first few names in the list to the shell, for some ++# reason. ++# ++# Therefore, we have a script to generate the plugin.c file. ++# The shell script runs slowly, as multiple greps and seds are run ++# for each input file; this is especially slow on Windows. Therefore, ++# if Python is present (as indicated by PYTHON being defined), we run ++# a faster Python script to do that work instead. ++# ++# The first argument is the directory in which the source files live. ++# The second argument is "plugin", to indicate that we should build ++# a plugin.c file for a plugin. ++# All subsequent arguments are the files to scan. ++# ++plugin.c: $(DISSECTOR_SRC) ../../tools/make-dissector-reg.py ../../tools/make-dissector-reg ++!IFDEF PYTHON ++ @echo Making plugin.c (using python) ++ @$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(DISSECTOR_SRC) ++!ELSE ++ @echo Making plugin.c (using sh) ++ @$(SH) ../../tools/make-dissector-reg . plugin $(DISSECTOR_SRC) ++!ENDIF ++ ++!ENDIF ++ ++clean: ++ rm -f $(OBJECTS) $(RESOURCE) plugin.c *.pdb \ ++ $(PLUGIN_NAME).dll $(PLUGIN_NAME).dll.manifest $(PLUGIN_NAME).lib \ ++ $(PLUGIN_NAME).exp $(PLUGIN_NAME).rc ++ ++distclean: clean ++ ++maintainer-clean: distclean +diff -urNad wireshark-0.99.7~/plugins/clique-rm/moduleinfo.h wireshark-0.99.7/plugins/clique-rm/moduleinfo.h +--- wireshark-0.99.7~/plugins/clique-rm/moduleinfo.h 1970-01-01 01:00:00.000000000 +0100 ++++ wireshark-0.99.7/plugins/clique-rm/moduleinfo.h 2007-12-21 13:51:16.083125699 +0100 +@@ -0,0 +1,16 @@ ++/* Included *after* config.h, in order to re-define these macros */ ++ ++#ifdef PACKAGE ++#undef PACKAGE ++#endif ++ ++/* Name of package */ ++#define PACKAGE "clique-rm" ++ ++ ++#ifdef VERSION ++#undef VERSION ++#endif ++ ++/* Version number of package */ ++#define VERSION "0.0.1" +diff -urNad wireshark-0.99.7~/plugins/clique-rm/moduleinfo.nmake wireshark-0.99.7/plugins/clique-rm/moduleinfo.nmake +--- wireshark-0.99.7~/plugins/clique-rm/moduleinfo.nmake 1970-01-01 01:00:00.000000000 +0100 ++++ wireshark-0.99.7/plugins/clique-rm/moduleinfo.nmake 2007-12-21 13:51:16.083125699 +0100 +@@ -0,0 +1,28 @@ ++# ++# $Id: moduleinfo.nmake 20170 2006-12-19 22:27:31Z jake $ ++# ++ ++# The name ++PACKAGE=clique-rm ++ ++# The version ++MODULE_VERSION_MAJOR=0 ++MODULE_VERSION_MINOR=0 ++MODULE_VERSION_MICRO=1 ++MODULE_VERSION_EXTRA=0 ++ ++# ++# The RC_VERSION should be comma-separated, not dot-separated, ++# as per Graham Bloice's message in ++# ++# http://www.ethereal.com/lists/ethereal-dev/200303/msg00283.html ++# ++# "The RC_VERSION variable in config.nmake should be comma separated. ++# This allows the resources to be built correctly and the version ++# number to be correctly displayed in the explorer properties dialog ++# for the executables, and XP's tooltip, rather than 0.0.0.0." ++# ++ ++MODULE_VERSION=$(MODULE_VERSION_MAJOR).$(MODULE_VERSION_MINOR).$(MODULE_VERSION_MICRO).$(MODULE_VERSION_EXTRA) ++RC_MODULE_VERSION=$(MODULE_VERSION_MAJOR),$(MODULE_VERSION_MINOR),$(MODULE_VERSION_MICRO),$(MODULE_VERSION_EXTRA) ++ +diff -urNad wireshark-0.99.7~/plugins/clique-rm/packet-clique-rm.c wireshark-0.99.7/plugins/clique-rm/packet-clique-rm.c +--- wireshark-0.99.7~/plugins/clique-rm/packet-clique-rm.c 1970-01-01 01:00:00.000000000 +0100 ++++ wireshark-0.99.7/plugins/clique-rm/packet-clique-rm.c 2007-12-21 13:51:16.083125699 +0100 +@@ -0,0 +1,446 @@ ++/* packet-clique_rm.c ++ * ++ * $Id$ ++ * ++ * Routines for clique reliable multicast dissector ++ * Copyright 2007, Collabora Ltd. ++ * @author: Sjoerd Simons ++ * Based on code from Wireshark - Network traffic analyzer ++ * By Gerald Combs ++ * 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. ++ */ ++ ++#ifdef HAVE_CONFIG_H ++# include "config.h" ++#endif ++ ++#include ++#include ++#include ++ ++#include ++#include ++ ++/* Initialize the protocol and registered fields */ ++static int proto_clique_rm = -1; ++ ++static int hf_clique_rm_version = -1; ++static int hf_clique_rm_type = -1; ++static int hf_clique_rm_sender = -1; ++static int hf_clique_rm_packet_id = -1; ++static int hf_clique_rm_data_flags = -1; ++static int hf_clique_rm_data_size = -1; ++static int hf_clique_rm_data_stream_id = -1; ++static int hf_clique_rm_data_data = -1; ++static int hf_clique_rm_whois_request_id = -1; ++static int hf_clique_rm_whois_reply_name = -1; ++static int hf_clique_rm_repair_request_sender_id = -1; ++static int hf_clique_rm_repair_request_packet_id = -1; ++ ++/* Initialize the subtree pointers */ ++static gint ett_clique_rm = -1; ++static gint ett_clique_rm_data = -1; ++static gint ett_clique_rm_depends = -1; ++static gint ett_clique_rm_failures = -1; ++static gint ett_clique_rm_attempt_join = -1; ++static gint ett_clique_rm_join = -1; ++ ++/* Packet types */ ++typedef enum { ++ /* Unreliable packets */ ++ PACKET_TYPE_WHOIS_REQUEST = 0, ++ PACKET_TYPE_WHOIS_REPLY, ++ PACKET_TYPE_REPAIR_REQUEST, ++ PACKET_TYPE_SESSION, ++ /* Reliable packets */ ++ FIRST_RELIABLE_PACKET = 0xf, ++ PACKET_TYPE_DATA = FIRST_RELIABLE_PACKET, ++ /* No data just acknowledgement */ ++ PACKET_TYPE_NO_DATA, ++ /* Some nodes failed */ ++ PACKET_TYPE_FAILURE, ++ /* Start a joining attempt */ ++ PACKET_TYPE_ATTEMPT_JOIN, ++ /* The real join */ ++ PACKET_TYPE_JOIN, ++ /* Leaving now, bye */ ++ PACKET_TYPE_BYE, ++ PACKET_TYPE_INVALID ++} GibberRMulticastPacketType; ++ ++#define IS_RELIABLE(type) (type >= FIRST_RELIABLE_PACKET) ++ ++static gchar * ++type_to_str (guint8 type) ++{ ++ switch (type) ++ { ++ case PACKET_TYPE_WHOIS_REQUEST: ++ return "Whois request"; ++ case PACKET_TYPE_WHOIS_REPLY: ++ return "Whois reply"; ++ case PACKET_TYPE_REPAIR_REQUEST: ++ return "Repair request"; ++ case PACKET_TYPE_SESSION: ++ return "Session"; ++ case PACKET_TYPE_DATA: ++ return "Data"; ++ /* No data just acknowledgement */ ++ case PACKET_TYPE_NO_DATA: ++ return "No data"; ++ /* Some nodes failed */ ++ case PACKET_TYPE_FAILURE: ++ return "Failure"; ++ /* Start a joining attempt */ ++ case PACKET_TYPE_ATTEMPT_JOIN: ++ return "Attempt join"; ++ /* The real join */ ++ case PACKET_TYPE_JOIN: ++ return "Join"; ++ /* Leaving now, bye */ ++ case PACKET_TYPE_BYE: ++ return "Bye"; ++ } ++ return "Unknown"; ++} ++ ++static gsize ++dissect_sender_array (proto_tree *clique_rm_tree, gchar *header, ++ tvbuff_t *tvb, gsize offset) ++{ ++ guint8 count; ++ gsize len; ++ proto_item *ti; ++ proto_tree *tree; ++ ++ ++ count = tvb_get_guint8(tvb, offset); ++ len = 1 + 4 * count; ++ ti = proto_tree_add_text (clique_rm_tree, tvb, offset, len , ++ "%s (%d)", header, count); ++ tree = proto_item_add_subtree (ti, ett_clique_rm_failures); ++ offset++; ++ ++ for (; count > 0 ; count--) ++ { ++ guint32 sender; ++ sender = tvb_get_ntohl (tvb, offset); ++ proto_tree_add_text (tree, tvb, offset, 4, "Sender: %x", sender); ++ offset += 4; ++ } ++ return len; ++} ++ ++static void ++dissect_data_packet (proto_tree *clique_rm_tree, tvbuff_t *tvb, gsize offset) ++{ ++ proto_item *ti; ++ proto_tree *tree; ++ ++ ti = proto_tree_add_text (clique_rm_tree, tvb, offset, -1, "Data"); ++ tree = proto_item_add_subtree (ti, ett_clique_rm_data); ++ ++ proto_tree_add_item(tree, hf_clique_rm_data_flags, tvb, offset, 1, FALSE); ++ offset += 1; ++ ++ proto_tree_add_item(tree, hf_clique_rm_data_stream_id, tvb, offset, 2, ++ FALSE); ++ offset += 2; ++ ++ proto_tree_add_item(tree, hf_clique_rm_data_size, tvb, offset, 4, FALSE); ++ offset += 4; ++ ++ ++ proto_tree_add_item(tree, hf_clique_rm_data_data, tvb, offset, ++ tvb_length_remaining(tvb, offset), FALSE); ++} ++ ++static gsize ++dissect_depends (proto_tree *clique_rm_tree, tvbuff_t *tvb, gsize offset) ++{ ++ proto_item *ti; ++ proto_tree *tree; ++ guint8 count; ++ gsize len; ++ ++ count = tvb_get_guint8 (tvb, offset); ++ len = 1 + count * 8; ++ ++ ti = proto_tree_add_text (clique_rm_tree, tvb, offset, 1 + count * 8, ++ "Depends (%d)", count); ++ offset += 1; ++ ++ tree = proto_item_add_subtree (ti, ett_clique_rm_depends); ++ for ( ; count > 0 ; count--) ++ { ++ guint32 d; ++ guint32 d_id; ++ ++ d = tvb_get_ntohl (tvb, offset); ++ d_id = tvb_get_ntohl (tvb, offset + 4); ++ proto_tree_add_text (tree, tvb, offset, 8, ++ "Sender: %x Packet id: %x", d, d_id); ++ offset += 8; ++ } ++ ++ return len; ++} ++ ++/* Code to actually dissect the packets */ ++static void ++dissect_reliable_packet (proto_tree *clique_rm_tree, guint8 type, ++ tvbuff_t *tvb, gsize offset) ++{ ++ proto_tree_add_item(clique_rm_tree, hf_clique_rm_packet_id, tvb, offset, 4, ++ FALSE); ++ offset += 4; ++ ++ offset += dissect_depends (clique_rm_tree, tvb, offset); ++ ++ switch (type) ++ { ++ case PACKET_TYPE_DATA: ++ dissect_data_packet (clique_rm_tree, tvb, offset); ++ break; ++ case PACKET_TYPE_NO_DATA: ++ break; ++ case PACKET_TYPE_FAILURE: ++ dissect_sender_array (clique_rm_tree, "Failures", tvb, offset); ++ break; ++ case PACKET_TYPE_ATTEMPT_JOIN: ++ dissect_sender_array (clique_rm_tree, "New attempt join senders", tvb, ++ offset); ++ break; ++ case PACKET_TYPE_JOIN: ++ dissect_sender_array (clique_rm_tree, "Join failures", tvb, offset); ++ break; ++ case PACKET_TYPE_BYE: ++ break; ++ default: ++ break; ++ } ++} ++ ++static void ++dissect_unreliable_packet (proto_tree *clique_rm_tree, guint8 type, ++ tvbuff_t *tvb, gsize offset) ++{ ++ guint8 len; ++ ++ switch (type) ++ { ++ case PACKET_TYPE_WHOIS_REQUEST: ++ proto_tree_add_item(clique_rm_tree, ++ hf_clique_rm_whois_request_id, tvb, offset, 4, FALSE); ++ break; ++ case PACKET_TYPE_WHOIS_REPLY: ++ len = tvb_get_guint8 (tvb, offset); ++ proto_tree_add_text (clique_rm_tree, tvb, offset, 1, ++ "Whois reply name length: %d", len); ++ offset += 1; ++ ++ proto_tree_add_item(clique_rm_tree, ++ hf_clique_rm_whois_reply_name, tvb, offset, len, FALSE); ++ break; ++ case PACKET_TYPE_REPAIR_REQUEST: ++ proto_tree_add_item(clique_rm_tree, ++ hf_clique_rm_repair_request_sender_id, tvb, offset, 4, FALSE); ++ offset += 4; ++ ++ proto_tree_add_item(clique_rm_tree, ++ hf_clique_rm_repair_request_packet_id, tvb, offset, 4, FALSE); ++ break; ++ case PACKET_TYPE_SESSION: ++ dissect_depends (clique_rm_tree, tvb, offset); ++ break; ++ default: ++ break; ++ } ++} ++ ++ ++static gboolean ++dissect_clique_rm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ++{ ++ guint8 version = 0; ++ guint8 type = 0; ++ gsize offset = 0; ++ ++ if (tvb_length (tvb) < 12) ++ return FALSE; ++ ++ if (tvb_strneql (tvb, offset, "Clique", 6)) ++ return FALSE; ++ offset += 6; ++ ++ version = tvb_get_guint8 (tvb, offset); ++ if (version != 1) ++ return FALSE; ++ offset++; ++ ++ type = tvb_get_guint8 (tvb, offset); ++ offset++; ++ ++ if (check_col(pinfo->cinfo, COL_PROTOCOL)) ++ col_set_str(pinfo->cinfo, COL_PROTOCOL, "Clique-rm"); ++ ++ if (check_col(pinfo->cinfo, COL_INFO)) ++ col_add_fstr(pinfo->cinfo, COL_INFO, "%s", ++ type_to_str (type)); ++ ++ if (tree) { ++ proto_item *ti = NULL; ++ proto_tree *clique_rm_tree = NULL; ++ ++ /* rewind back to just behind the prefix */ ++ offset = 6; ++ ++ ti = proto_tree_add_item(tree, proto_clique_rm, tvb, 0, -1, FALSE); ++ clique_rm_tree = proto_item_add_subtree(ti, ett_clique_rm); ++ ++ proto_tree_add_item(clique_rm_tree, hf_clique_rm_version, tvb, offset, 1, ++ FALSE); ++ offset++; ++ ++ ti = proto_tree_add_item(clique_rm_tree, hf_clique_rm_type, tvb, offset, 1, ++ FALSE); ++ proto_item_append_text(ti, ", %s", type_to_str (type)); ++ offset++; ++ ++ if (check_col(pinfo->cinfo, COL_INFO)) ++ col_append_fstr(pinfo->cinfo, COL_INFO, ", sender: 0x%x", ++ tvb_get_ntohl (tvb, offset)); ++ ++ proto_tree_add_item(clique_rm_tree, hf_clique_rm_sender, tvb, offset, ++ 4, FALSE); ++ offset += 4; ++ ++ if (IS_RELIABLE(type)) { ++ if (check_col(pinfo->cinfo, COL_INFO)) ++ col_append_fstr(pinfo->cinfo, COL_INFO, ", id: 0x%x", ++ tvb_get_ntohl (tvb, offset)); ++ ++ dissect_reliable_packet(clique_rm_tree, type, tvb, offset); ++ } else { ++ dissect_unreliable_packet(clique_rm_tree, type, tvb, offset); ++ } ++ } ++ ++ return TRUE; ++} ++ ++ ++/* Register the protocol with Wireshark */ ++ ++/* this format is require because a script is used to build the C function ++ that calls all the protocol registration. ++*/ ++ ++void ++proto_reg_handoff_clique_rm(void) ++{ ++ heur_dissector_add("udp", dissect_clique_rm, proto_clique_rm); ++} ++ ++void ++proto_register_clique_rm(void) ++{ ++ ++/* Setup list of header fields See Section 1.6.1 for details*/ ++ static hf_register_info hf[] = { ++ { &hf_clique_rm_version, ++ { "Version", "clique_rm.version", ++ FT_UINT8, BASE_DEC, NULL, 0x0, ++ "", HFILL } ++ }, ++ { &hf_clique_rm_type, ++ { "Type", "clique_rm.type", ++ FT_UINT8, BASE_HEX, NULL, 0x0, ++ "", HFILL } ++ }, ++ { &hf_clique_rm_sender, ++ { "Sender", "clique_rm.sender", ++ FT_UINT32, BASE_HEX, NULL, 0x0, ++ "", HFILL } ++ }, ++ { &hf_clique_rm_packet_id, ++ { "Packet id", "clique_rm.packet_id", ++ FT_UINT32, BASE_HEX, NULL, 0x0, ++ "", HFILL } ++ }, ++ { &hf_clique_rm_data_flags, ++ { "Data flags", "clique_rm.data.flags", ++ FT_UINT8, BASE_HEX, NULL, 0x0, ++ "", HFILL } ++ }, ++ { &hf_clique_rm_data_size, ++ { "Data total size", "clique_rm.data.size", ++ FT_UINT32, BASE_DEC, NULL, 0x0, ++ "", HFILL } ++ }, ++ { &hf_clique_rm_data_stream_id, ++ { "Data stream id", "clique_rm.data.stream_id", ++ FT_UINT16, BASE_HEX, NULL, 0x0, ++ "", HFILL } ++ }, ++ { &hf_clique_rm_data_data, ++ { "Raw data", "clique_rm.data.data", ++ FT_STRINGZ, BASE_HEX, NULL, 0x0, ++ "", HFILL } ++ }, ++ { &hf_clique_rm_whois_request_id, ++ { "Whois request id", "clique_rm.whois_request.id", ++ FT_UINT32, BASE_HEX, NULL, 0x0, ++ "", HFILL } ++ }, ++ { &hf_clique_rm_whois_reply_name, ++ { "Whois reply name", "clique_rm.whois_reply.name", ++ FT_STRINGZ, BASE_DEC, NULL, 0x0, ++ "", HFILL } ++ }, ++ { &hf_clique_rm_repair_request_sender_id, ++ { "Repair request for sender", ++ "clique_rm.repair_request.sender_id", ++ FT_UINT32, BASE_HEX, NULL, 0x0, ++ "", HFILL } ++ }, ++ { &hf_clique_rm_repair_request_packet_id, ++ { "Repair request for packet", ++ "clique_rm.repair_request.packet_id", ++ FT_UINT32, BASE_HEX, NULL, 0x0, ++ "", HFILL } ++ }, ++ }; ++ ++/* Setup protocol subtree array */ ++ static gint *ett[] = { ++ &ett_clique_rm, ++ &ett_clique_rm_depends, ++ &ett_clique_rm_data, ++ &ett_clique_rm_failures, ++ &ett_clique_rm_attempt_join, ++ &ett_clique_rm_join, ++ }; ++ ++/* Register the protocol name and description */ ++ proto_clique_rm = proto_register_protocol( ++ "Clique Reliable Multicast Protocol", "Clique-rm", "clique-rm"); ++ ++/* Required function calls to register the header fields and subtrees used */ ++ proto_register_field_array(proto_clique_rm, hf, array_length(hf)); ++ proto_register_subtree_array(ett, array_length(ett)); ++} +diff -urNad wireshark-0.99.7~/plugins/clique-rm/plugin.rc.in wireshark-0.99.7/plugins/clique-rm/plugin.rc.in +--- wireshark-0.99.7~/plugins/clique-rm/plugin.rc.in 1970-01-01 01:00:00.000000000 +0100 ++++ wireshark-0.99.7/plugins/clique-rm/plugin.rc.in 2007-12-21 13:51:16.083125699 +0100 +@@ -0,0 +1,34 @@ ++#include "winver.h" ++ ++VS_VERSION_INFO VERSIONINFO ++ FILEVERSION @RC_MODULE_VERSION@ ++ PRODUCTVERSION @RC_VERSION@,0 ++ FILEFLAGSMASK 0x0L ++#ifdef _DEBUG ++ FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG ++#else ++ FILEFLAGS VS_FF_PRERELEASE ++#endif ++ FILEOS VOS_NT_WINDOWS32 ++ FILETYPE VFT_DLL ++BEGIN ++ BLOCK "StringFileInfo" ++ BEGIN ++ BLOCK "040904b0" ++ BEGIN ++ VALUE "CompanyName", "Collabora Ltd.\0" ++ VALUE "FileDescription", "@PACKAGE@ dissector\0" ++ VALUE "FileVersion", "@MODULE_VERSION@\0" ++ VALUE "InternalName", "@PACKAGE@ @MODULE_VERSION@\0" ++ VALUE "LegalCopyright", " Copyright © 2007 Collabora Ltd. Copyright © 1998 Gerald Combs , Gilbert Ramirez and others\0" ++ VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0" ++ VALUE "ProductName", "Wireshark\0" ++ VALUE "ProductVersion", "@VERSION@\0" ++ VALUE "Comments", "Build with @MSVC_VARIANT@\0" ++ END ++ END ++ BLOCK "VarFileInfo" ++ BEGIN ++ VALUE "Translation", 0x409, 1200 ++ END ++END --- wireshark-1.0.0.orig/debian/patches/16_licence_about_location.dpatch +++ wireshark-1.0.0/debian/patches/16_licence_about_location.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 16_licence_about_location.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad wireshark-0.99.6rel~/gtk/about_dlg.c wireshark-0.99.6rel/gtk/about_dlg.c +--- wireshark-0.99.6rel~/gtk/about_dlg.c 2007-07-05 21:22:28.000000000 +0200 ++++ wireshark-0.99.6rel/gtk/about_dlg.c 2007-09-29 15:53:16.822998083 +0200 +@@ -411,7 +411,7 @@ + GtkWidget *page; + char *absolute_path; + +- absolute_path = get_datafile_path("COPYING"); ++ absolute_path = get_datafile_path("ABOUT.GPL"); + page = text_page_new(absolute_path); + + return page; --- wireshark-1.0.0.orig/debian/patches/05_plugin-libdir.dpatch +++ wireshark-1.0.0/debian/patches/05_plugin-libdir.dpatch @@ -0,0 +1,7 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_plugin-libdir.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ --- wireshark-1.0.0.orig/debian/patches/14_disable-cmip.dpatch +++ wireshark-1.0.0/debian/patches/14_disable-cmip.dpatch @@ -0,0 +1,105 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 14_disable-cmip.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Disable CMIP and GNM dissectors (CMIP doesn't build and GNM depends on +## DP: CMIP) + +@DPATCH@ +diff -urNad trunk~/epan/dissectors/Makefile.common trunk/epan/dissectors/Makefile.common +--- trunk~/epan/dissectors/Makefile.common 2008-03-29 18:26:32.000000000 +0100 ++++ trunk/epan/dissectors/Makefile.common 2008-04-01 20:22:45.000000000 +0200 +@@ -85,7 +85,6 @@ + packet-ansi_tcap.c \ + packet-camel.c \ + packet-cdt.c \ +- packet-cmip.c \ + packet-cmp.c \ + packet-cms.c \ + packet-crmf.c \ +@@ -97,7 +96,6 @@ + packet-erf.c \ + packet-ess.c \ + packet-ftam.c \ +- packet-gnm.c \ + packet-gsm_map.c \ + packet-h225.c \ + packet-h235.c \ +@@ -832,7 +830,6 @@ + packet-cip.h \ + packet-clearcase.h \ + packet-clip.h \ +- packet-cmip.h \ + packet-cmp.h \ + packet-cms.h \ + packet-crmf.h \ +@@ -901,7 +898,6 @@ + packet-frame.h \ + packet-ftam.h \ + packet-giop.h \ +- packet-gnm.h \ + packet-gnutella.h \ + packet-gre.h \ + packet-gsm_a.h \ +diff -urNad trunk~/epan/dissectors/register.c trunk/epan/dissectors/register.c +--- trunk~/epan/dissectors/register.c 2008-03-29 18:28:04.000000000 +0100 ++++ trunk/epan/dissectors/register.c 2008-04-01 20:26:06.000000000 +0200 +@@ -124,7 +124,6 @@ + {extern void proto_register_clip (void); if(cb) (*cb)(RA_REGISTER, "proto_register_clip", client_data); proto_register_clip ();} + {extern void proto_register_clnp (void); if(cb) (*cb)(RA_REGISTER, "proto_register_clnp", client_data); proto_register_clnp ();} + {extern void proto_register_cltp (void); if(cb) (*cb)(RA_REGISTER, "proto_register_cltp", client_data); proto_register_cltp ();} +- {extern void proto_register_cmip (void); if(cb) (*cb)(RA_REGISTER, "proto_register_cmip", client_data); proto_register_cmip ();} + {extern void proto_register_cmp (void); if(cb) (*cb)(RA_REGISTER, "proto_register_cmp", client_data); proto_register_cmp ();} + {extern void proto_register_cmpp (void); if(cb) (*cb)(RA_REGISTER, "proto_register_cmpp", client_data); proto_register_cmpp ();} + {extern void proto_register_cms (void); if(cb) (*cb)(RA_REGISTER, "proto_register_cms", client_data); proto_register_cms ();} +@@ -268,7 +267,6 @@ + {extern void proto_register_gift (void); if(cb) (*cb)(RA_REGISTER, "proto_register_gift", client_data); proto_register_gift ();} + {extern void proto_register_giop (void); if(cb) (*cb)(RA_REGISTER, "proto_register_giop", client_data); proto_register_giop ();} + {extern void proto_register_gmrp (void); if(cb) (*cb)(RA_REGISTER, "proto_register_gmrp", client_data); proto_register_gmrp ();} +- {extern void proto_register_gnm (void); if(cb) (*cb)(RA_REGISTER, "proto_register_gnm", client_data); proto_register_gnm ();} + {extern void proto_register_gnutella (void); if(cb) (*cb)(RA_REGISTER, "proto_register_gnutella", client_data); proto_register_gnutella ();} + {extern void proto_register_gprs_ns (void); if(cb) (*cb)(RA_REGISTER, "proto_register_gprs_ns", client_data); proto_register_gprs_ns ();} + {extern void proto_register_gre (void); if(cb) (*cb)(RA_REGISTER, "proto_register_gre", client_data); proto_register_gre ();} +@@ -882,7 +880,6 @@ + {extern void proto_reg_handoff_clearcase (void); if(cb) (*cb)(RA_HANDOFF, "proto_reg_handoff_clearcase", client_data); proto_reg_handoff_clearcase ();} + {extern void proto_reg_handoff_clip (void); if(cb) (*cb)(RA_HANDOFF, "proto_reg_handoff_clip", client_data); proto_reg_handoff_clip ();} + {extern void proto_reg_handoff_clnp (void); if(cb) (*cb)(RA_HANDOFF, "proto_reg_handoff_clnp", client_data); proto_reg_handoff_clnp ();} +- {extern void proto_reg_handoff_cmip (void); if(cb) (*cb)(RA_HANDOFF, "proto_reg_handoff_cmip", client_data); proto_reg_handoff_cmip ();} + {extern void proto_reg_handoff_cmp (void); if(cb) (*cb)(RA_HANDOFF, "proto_reg_handoff_cmp", client_data); proto_reg_handoff_cmp ();} + {extern void proto_reg_handoff_cmpp (void); if(cb) (*cb)(RA_HANDOFF, "proto_reg_handoff_cmpp", client_data); proto_reg_handoff_cmpp ();} + {extern void proto_reg_handoff_cms (void); if(cb) (*cb)(RA_HANDOFF, "proto_reg_handoff_cms", client_data); proto_reg_handoff_cms ();} +@@ -1020,7 +1017,6 @@ + {extern void proto_reg_handoff_gift (void); if(cb) (*cb)(RA_HANDOFF, "proto_reg_handoff_gift", client_data); proto_reg_handoff_gift ();} + {extern void proto_reg_handoff_giop (void); if(cb) (*cb)(RA_HANDOFF, "proto_reg_handoff_giop", client_data); proto_reg_handoff_giop ();} + {extern void proto_reg_handoff_gmrp (void); if(cb) (*cb)(RA_HANDOFF, "proto_reg_handoff_gmrp", client_data); proto_reg_handoff_gmrp ();} +- {extern void proto_reg_handoff_gnm (void); if(cb) (*cb)(RA_HANDOFF, "proto_reg_handoff_gnm", client_data); proto_reg_handoff_gnm ();} + {extern void proto_reg_handoff_gnutella (void); if(cb) (*cb)(RA_HANDOFF, "proto_reg_handoff_gnutella", client_data); proto_reg_handoff_gnutella ();} + {extern void proto_reg_handoff_gprs_ns (void); if(cb) (*cb)(RA_HANDOFF, "proto_reg_handoff_gprs_ns", client_data); proto_reg_handoff_gprs_ns ();} + {extern void proto_reg_handoff_gre (void); if(cb) (*cb)(RA_HANDOFF, "proto_reg_handoff_gre", client_data); proto_reg_handoff_gre ();} +@@ -1496,6 +1492,6 @@ + + gulong register_count(void) + { +- return 759 + 723; ++ return 757 + 723; + + } +diff -urNad trunk~/epan/dissectors/register.c.rej trunk/epan/dissectors/register.c.rej +--- trunk~/epan/dissectors/register.c.rej 1970-01-01 01:00:00.000000000 +0100 ++++ trunk/epan/dissectors/register.c.rej 2008-04-01 20:22:45.000000000 +0200 +@@ -0,0 +1,15 @@ ++*************** ++*** 1490,1495 **** ++ ++ gulong register_count(void) ++ { ++- return 753 + 717; ++ ++ } ++--- 1486,1491 ---- ++ ++ gulong register_count(void) ++ { +++ return 751 + 717; ++ ++ } --- wireshark-1.0.0.orig/debian/patches/06_giop-buffer.dpatch +++ wireshark-1.0.0/debian/patches/06_giop-buffer.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 06_giop-buffer.dpatch by +## +## 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 +## +## 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_) { --- wireshark-1.0.0.orig/debian/patches/03_preferences.dpatch +++ wireshark-1.0.0/debian/patches/03_preferences.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_preferences.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: use Debian sensible-browser + +@DPATCH@ +diff -urNad wireshark-0.99.7~pre1~/epan/prefs.c wireshark-0.99.7~pre1/epan/prefs.c +--- wireshark-0.99.7~pre1~/epan/prefs.c 2007-11-22 17:57:25.000000000 +0100 ++++ wireshark-0.99.7~pre1/epan/prefs.c 2007-11-22 18:04:50.555226510 +0100 +@@ -1198,7 +1198,7 @@ + prefs.gui_ask_unsaved = TRUE; + prefs.gui_find_wrap = TRUE; + prefs.gui_use_pref_save = FALSE; +- prefs.gui_webbrowser = g_strdup(HTML_VIEWER " %s"); ++ prefs.gui_webbrowser = g_strdup("sensible-browser %s"); + prefs.gui_window_title = g_strdup(""); + prefs.gui_layout_type = layout_type_5; + prefs.gui_layout_content_1 = layout_pane_content_plist; --- wireshark-1.0.0.orig/debian/patches/08_wireshark-desktop-menu.dpatch +++ wireshark-1.0.0/debian/patches/08_wireshark-desktop-menu.dpatch @@ -0,0 +1,24 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 08_wireshark-desktop-menu.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad trunk~/wireshark.desktop trunk/wireshark.desktop +--- trunk~/wireshark.desktop 2008-02-27 20:59:35.000000000 +0100 ++++ trunk/wireshark.desktop 2008-03-12 21:21:00.000000000 +0100 +@@ -68,10 +68,11 @@ + Comment[fi]=Verkkoliikenne analysaattori + Comment[fr]=Analyseur de trafic réseau + Comment[sv]=Nätverkstrafikanalysator +-Icon=wireshark.png ++Icon=hi48-app-wireshark.png + TryExec=wireshark + Exec=wireshark + Terminal=false + # Categorie entry according to version 1.0 of + # http://www.freedesktop.org/wiki/Specifications/menu-spec +-Categories=System;Monitor;GTK; ++Categories=GNOME;Network; ++Encoding=UTF-8 --- wireshark-1.0.0.orig/debian/patches/10_wireshark_gen.dpatch +++ wireshark-1.0.0/debian/patches/10_wireshark_gen.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_wireshark_gen.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./wireshark_gen.py /tmp/dpep-work.vCo5MH/wireshark-0.10.11/wireshark_gen.py +--- ./tools/wireshark_gen.py 2005-07-17 19:42:15.000000000 +0200 ++++ /tmp/dpep-work.vCo5MH/wireshark-0.10.11/ools/wireshark_gen.py 2005-07-17 19:42:34.000000000 +0200 +@@ -2188,7 +2188,8 @@ + #include + #include + #include + #include ++#include + + #ifndef ENABLE_STATIC + G_MODULE_EXPORT const gchar version[] = "0.0.1"; --- wireshark-1.0.0.orig/debian/license-text-about-dialog +++ wireshark-1.0.0/debian/license-text-about-dialog @@ -0,0 +1,14 @@ +Wireshark is distributed under the GNU GPL. There are no restrictions +on its use. There are significant restrictions on its distribution. + +Parts of Wireshark can be built and distributed as libraries. These +parts are still covered by the GPL, and NOT by the Lesser General Public +License or any other license. + +If you create a combined work using all or part of Wireshark, then your +combined work must be released under a license compatible with the GPL. + +...and don't get us started on trademarks. + +The full text of the GNU GPL may be viewed in /usr/share/common-licenses/GPL. + --- wireshark-1.0.0.orig/debian/headers-check.c +++ wireshark-1.0.0/debian/headers-check.c @@ -0,0 +1,4 @@ +#include +#include +#include + --- wireshark-1.0.0.orig/debian/tshark.manpages +++ wireshark-1.0.0/debian/tshark.manpages @@ -0,0 +1 @@ +tshark.1 --- wireshark-1.0.0.orig/debian/dirs +++ wireshark-1.0.0/debian/dirs @@ -0,0 +1 @@ +usr/bin --- wireshark-1.0.0.orig/debian/rules +++ wireshark-1.0.0/debian/rules @@ -0,0 +1,143 @@ +#!/usr/bin/make -f +# MAde with the aid of dh_make, by Craig Small +# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. +# Some lines taken from debmake, by Cristoph Lameter. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/dpatch/dpatch.make +DB2MAN=/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl + + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +PYTHON_VERSION=python2.4 + +CFLAGS=-g -O2 + +# Enable IEEE-conformant floating point math on alphas (not the default) +ifeq (alpha-linux,$(DEB_HOST_GNU_TYPE)) + CFLAGS += -mieee +endif + +idl2deb.1: idl2deb.dbk + xsltproc --nonet --novalid $(DB2MAN) $< + +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 --enable-warnings-as-errors=no --with-plugins=/usr/lib/wireshark/plugins --with-lua=/usr/ + +configure: configure-stamp +configure-stamp: patch + dh_testdir + + cp /usr/share/misc/config.guess /usr/share/misc/config.sub . + libtoolize --force --copy + -mkdir aclocal-missing + ./autogen.sh + CFLAGS="$(CFLAGS)" ./configure $(CONFIGURE_FLAGS) + + touch configure-stamp + +build: build-stamp idl2deb.1 asn2deb.1 +build-stamp: configure-stamp + $(MAKE) + + touch build-stamp + +patch: patch-stamp +patch-stamp: + dpatch apply-all + + +clean: unpatch-stamp + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + [ ! -f Makefile ] || $(MAKE) distclean + 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 + +unpatch: unpatch-stamp +unpatch-stamp: + dpatch deapply-all + rm -rf patch-stamp debian/patched + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the files into debian/tmp + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + rm -rf $(CURDIR)/debian/tmp/usr/share/wireshark/wireshark/COPYING + cp debian/license-text-about-dialog $(CURDIR)/debian/tmp/usr/share/wireshark/wireshark/ABOUT.GPL + mkdir -p $(CURDIR)/debian/tmp/usr/share/applications/ + cp wireshark.desktop $(CURDIR)/debian/tmp/usr/share/applications/ + cp tools/idl2wrs.sh $(CURDIR)/debian/tmp/usr/bin/ + cp debian/wireshark-root.desktop $(CURDIR)/debian/tmp/usr/share/applications/ + mkdir -p $(CURDIR)/debian/tmp/usr/share/pixmaps/ + cp image/hi48-app-wireshark.png $(CURDIR)/debian/tmp/usr/share/pixmaps/ + cp image/wsicon32.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/ + mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(PYTHON_VERSION)/site-packages/ + install -m 755 $(CURDIR)/idl2deb $(CURDIR)/debian/tmp/usr/bin/ + install -m 755 $(CURDIR)/asn2deb $(CURDIR)/debian/tmp/usr/bin/ + mkdir -p $(CURDIR)/debian/tmp/etc/wireshark/ + mv $(CURDIR)/debian/tmp/usr/share/wireshark/wireshark/init.lua \ + $(CURDIR)/debian/tmp/etc/wireshark/ + ln -s /etc/wireshark/init.lua \ + $(CURDIR)/debian/tmp/usr/share/wireshark/wireshark/init.lua + cp $(CURDIR)/tools/wireshark_be.py $(CURDIR)/tools/wireshark_gen.py \ + $(CURDIR)/debian/tmp/usr/lib/$(PYTHON_VERSION)/site-packages/ + mkdir -p $(CURDIR)/debian/tmp/usr/include/wireshark/ + for F in `cat debian/wireshark-dev.header-files`; do \ + cp --parents $$F $(CURDIR)/debian/tmp/usr/include/wireshark; \ + done + # .a is no longer built; why was is used ? + #cp $(CURDIR)/wiretap/libwiretap.a $(CURDIR)/debian/tmp/usr/lib/ + -rm -rf $(CURDIR)/debian/tmp/usr/man + dh_installman + + dh_movefiles + dh_pysupport + dh_python + dh_installdocs + -rm debian/menu # from upstream debian/ package + dh_installmenu + dh_installchangelogs NEWS + +# Build architecture-independent files here. +binary-indep: install +# We have nothing to do by default. + +check: install + # check all necessary headers are included + gcc -c debian/headers-check.c `pkg-config --cflags glib-2.0` -Idebian/wireshark-dev/usr/include/ -Idebian/wireshark-dev/usr/include/wireshark/ -o /dev/null + +# Build architecture-dependent files here. +binary-arch: install check + dh_strip + dh_compress + dh_fixperms + + dh_installdeb + LD_LIBRARY_PATH=/usr/lib/wireshark/ dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +source diff: + @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false + +binary: binary-indep binary-arch +.PHONY: build clean install check binary-indep binary-arch binary --- wireshark-1.0.0.orig/debian/compat +++ wireshark-1.0.0/debian/compat @@ -0,0 +1 @@ +6 --- wireshark-1.0.0.orig/debian/wireshark-dev.docs +++ wireshark-1.0.0/debian/wireshark-dev.docs @@ -0,0 +1,5 @@ +doc/README.design +doc/README.developer +doc/README.idl2wrs +doc/README.plugins +doc/README.xml-output --- wireshark-1.0.0.orig/debian/postinst +++ wireshark-1.0.0/debian/postinst @@ -0,0 +1,6 @@ +#! /bin/sh -e + +if test -e /usr/etc/manuf ; then rm /usr/etc/manuf ; fi + +#DEBHELPER# + --- wireshark-1.0.0.orig/debian/wireshark-root.desktop +++ wireshark-1.0.0/debian/wireshark-root.desktop @@ -0,0 +1,83 @@ +[Desktop Entry] +# $Id: wireshark.desktop 11808 2004-08-22 09:22:15Z jmayer $ +# 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 +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=su-to-root +Exec=su-to-root -X -c /usr/bin/wireshark +Path= +Terminal=false +MimeType= +Categories=GNOME;Network; +# Found in Suse 9.1: +X-KDE-SubstituteUID=true +# Deprecated: +# TerminalOptions= +# BinaryPattern=wireshark +# MapNotify=true +# Protocols= --- wireshark-1.0.0.orig/debian/changelog +++ wireshark-1.0.0/debian/changelog @@ -0,0 +1,1514 @@ +wireshark (1.0.0-1) unstable; urgency=low + + * Several security issues were solved in 0.99.7 already: + (closes: #452381) + * allow remote attackers to cause a denial of service (crash) via (1) a + crafted MP3 file or (2) unspecified vectors to the NCP dissector + (CVE-2007-6111) + * Buffer overflow in the PPP dissector Wireshark (formerly Ethereal) + 0.99.6 allows remote attackers to cause a denial of service (crash) + and possibly execute arbitrary code via unknown vectors. + (CVE-2007-6112) + * Wireshark (formerly Ethereal) 0.10.12 to 0.99.6 allows remote + attackers to cause a denial of service (long loop) via a malformed DNP + packet (CVE-2007-6113) + * Multiple buffer overflows in Wireshark (formerly Ethereal) 0.99.0 + through 0.99.6 allow remote attackers to cause a denial of service + (crash) and possibly execute arbitrary code via (1) the SSL dissector + or (2) the iSeries (OS/400) Communication trace file parser + (CVE-2007-6114) + * Buffer overflow in the ANSI MAP dissector for Wireshark (formerly + Ethereal) 0.99.5 to 0.99.6, when running on unspecified platforms, + allows remote attackers to cause a denial of service and possibly + execute arbitrary code via unknown vectors. (CVE-2007-6115) + * The Firebird/Interbase dissector in Wireshark (formerly Ethereal) + 0.99.6 allows remote attackers to cause a denial of service (infinite + loop or crash) via unknown vectors. (CVE-2007-6116) + * Unspecified vulnerability in the HTTP dissector for Wireshark + (formerly Ethereal) 0.10.14 to 0.99.6 has unknown impact and remote + attack vectors related to chunked messages. (CVE-2007-6117) + * The MEGACO dissector in Wireshark (formerly Ethereal) 0.9.14 to 0.99.6 + allows remote attackers to cause a denial of service (long loop and + resource consumption) via unknown vectors. (CVE-2007-6118) + * The DCP ETSI dissector in Wireshark (formerly Ethereal) 0.99.6 allows + remote attackers to cause a denial of service (long loop and resource + consumption) via unknown vectors. (CVE-2007-6119) + * The Bluetooth SDP dissector Wireshark (formerly Ethereal) 0.99.2 to + 0.99.6 allows remote attackers to cause a denial of service (infinite + loop) via unknown vectors. (CVE-2007-6120) + * Wireshark (formerly Ethereal) 0.8.16 to 0.99.6 allows remote attackers + to cause a denial of service (crash) via a malformed RPC Portmap + packet. (CVE-2007-6121) + * current wireshark has SSL support (closes: #172939) + * and H323 support (closes: #117201) + * resizing columns bugfix was applied last year (closes: #369044) + * new upstream release 1.0.0 + http://www.wireshark.org/docs/relnotes/wireshark-1.0.0.html + * remove debian/ directory from upstream + * update 14_disable-cmip.dpatch. + * if wireshark has no priv, it now prints: + dumpcap: There are no interfaces on which a capture can be done + (closes: #468400) + * wireshark uses su-to-root now (closes: #472478) + * vulnerabilities fixed: + * The X.509sat and other dissector could crash (CVE-2008-1561) + * The LDAP dissector could crash on Windows and other platforms. + (CVE-2008-1562) + * The SCCP dissector could crash while using the "decode as" + feature (CVE-2008-1563) + + -- Joost Yervante Damad Tue, 01 Apr 2008 19:48:19 +0200 + +wireshark (0.99.8-1) unstable; urgency=medium + + * New upstream release. + * release notes: + http://www.wireshark.org/docs/relnotes/wireshark-0.99.8.html + * Fixes strptime() problem; debian/patches/18_strptime_proto.dpatch + no longer needed; (closes: #452772) + * Fixed security issues: + * The SCTP dissector could crash. (CVE-2008-1070) + * The SNMP dissector could crash. (CVE-2008-1071) + * (closes: #469488) + * updated debian/patches/05_plugin-libdir.dpatch, as upstream + incorporated part of the patch + * updated debian/patches/08_wireshark-desktop-menu.dpatch + * updated debian/patches/14_disable-cmip.dpatch + * use su-to-root isof gksu (closes: #454051) + * make init.lua a conffile (closes: #458689) + * use $(CURDIR) isof `pwd` in debian/rules + * lintian fixes: + * I: wireshark binary: desktop-entry-contains-encoding-key + /usr/share/applications/wireshark-root.desktop + * W: wireshark binary: su-wrapper-not-su-to-root + /usr/share/applications/wireshark-root.desktop gksu + * bump standards version to 3.7.2.2 (3.7.3.0 still needs more checking) + * update debhelper compat to 5 + * bump standards version to 3.7.3.0 + * update debhelper compat to 6 + * remove debian/ dir from upstream tar file + + -- Joost Yervante Damad Wed, 12 Mar 2008 20:47:56 +0100 + +wireshark (0.99.7-1.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches/18_strptime_proto.dpatch: Define __USE_XOPEN when + using the strptime function. (closes: #452772) + + -- dann frazier Mon, 10 Mar 2008 14:16:45 -0600 + +wireshark (0.99.7-1) unstable; urgency=high + + * New upstream release. + * fixes several security issues: + * The IPv6 dissector could loop excessively. (CVE-2007-6439) + * The USB dissector could loop excessively or crash. (CVE-2007-6439) + * The SMB dissector could crash. (CVE-2007-6438) + * The RPL dissector could go into an infinite loop. (CVE-2007-6450) + * The WiMAX dissector could crash due to unaligned access on some + platforms. (CVE-2007-6441) + * The CIP dissector could attempt to allocate a huge amount of memory + and crash. (CVE-2007-6451) + * debian/patches/04_drop-capabilities.dpatch: disable "drop capabilities" + patch as Wireshark now has a dumpcap binary that drop capabilities and + capture network. This fixes issues of dropping too many capabilities. + (closes: #453292) + * debian/control, debian/rules: enabled LUA support. (closes: #412097) + * debian/patches/17_clique_rm_support.dpatch: add support for the CliqueRM + protocol. (closes: #454739) + * debian/patches/05_plugin-libdir.dpatch: updated to fix plugin installation. + (closes: #454758) + + -- Frederic Peters Fri, 21 Dec 2007 17:56:59 +0100 + +wireshark (0.99.7~pre1-2) unstable; urgency=low + + * debian/rules: adds LD_LIBRARY_PATH when calling dpkg-shlibdeps and adds + a wireshark-common shlibs file. (closes: #453801) + + -- Frederic Peters Wed, 05 Dec 2007 16:27:59 +0100 + +wireshark (0.99.7~pre1-1) unstable; urgency=high + + * New upstream pre-version; packaged since it fixes security issues: + * Could crash when reading an MP3 file. + * Could loop excessively while reading a malformed DNP packet. + * The SSL dissector could overflow a buffer. + * The ANSI MAP dissector could be susceptible to a buffer overflow on some + platforms. + * The Firebird/Interbase dissector could go into an infinite loop or + crash. + * The NCP dissector could cause a crash. + * The HTTP dissector could crash on some systems while decoding chunked + messages. + * The MEGACO dissector could enter a large loop and consume system + resources. + * The DCP ETSI dissector could enter a large loop and consume system + resources. + * The iSeries (OS/400) Communication trace file parser could overflow a + buffer. + * The PPP dissector could overflow a buffer. + * The Bluetooth SDP dissector could go into an infinite loop. + * A malformed RPC Portmap packet could cause a crash. + * debian/patches/03_preferences.dpatch: modified to directly change + epan/prefs.c instead of going through configure.in modification. + * debian/patches/04_drop-capabilities.dpatch: configure check for libcap has + been integrated upstream, removed from patch, but added required explicit + -lcap linkage. + * debian/patches/05_plugin-libdir.dpatch, debian/rules: reduced patch; using + a configure flag instead of overriding plugindir. + * debian/patches/08_wireshark-desktop-menu.dpatch: updated. + * debian/patches/14_disable-cmip.dpatch: updated. + + -- Frederic Peters Thu, 22 Nov 2007 19:49:41 +0100 + +wireshark (0.99.6rel-5) unstable; urgency=low + + * debian/patches/16_licence_about_location.dpatch: removed GPL copy from + file used to fill the About dialog and created a new file with reference + to copy in /usr/share/common-licences/ + + -- Frederic Peters Sat, 29 Sep 2007 15:56:38 +0200 + +wireshark (0.99.6rel-4) unstable; urgency=low + + * debian/patches/14_disable-cmip.dpatch: removed automake generated part as + it can cause problems on a second build. (closes: #442760) + * debian/control: upgraded build-depends from libportaudio-dev to + portaudio19-dev (closes: #431222) + * debian/patches/08_wireshark-desktop-menu.dpatch: updated to add Encoding + entry, as required by desktop file spec + * debian/patches/08_wireshark-desktop-menu.dpatch: updated Categories entry + to remove Application. + * debian/wireshark-root.desktop: updated Categories to remove Application. + * debian/wireshark.menu: renamed Apps to Applications and Net to Network, + and added a subsubmenu, "Monitoring", to comply with new menu policy. + + -- Frederic Peters Fri, 28 Sep 2007 21:02:41 +0200 + +wireshark (0.99.6rel-3) unstable; urgency=low + + * debian/rules: added check for wireshark-dev headers (closes: #436247) + + -- Frederic Peters Fri, 24 Aug 2007 14:19:01 +0000 + +wireshark (0.99.6rel-2) unstable; urgency=low + + * debian/rules: added -02 -g CFLAGS (closes: #439298) + + -- Frederic Peters Fri, 24 Aug 2007 07:48:08 +0000 + +wireshark (0.99.6rel-1) unstable; urgency=low + + * New upstream release. + * named 0.99.6rel to be greater than 0.99.6pre + * added epan/ subdirectories to dev header files (closes: #436247) + * I still need someone to provide me with test code so an extension can + actually be built and tested at build time. + * debian/rules: added --enable-warnings-as-errors=no to configure flags + * debian/patches/15_sensitive_open.dpatch: new patch to allow keyboard + selection of capture file in open dialog (closes: #439198) + + -- Frederic Peters Thu, 23 Aug 2007 09:13:00 +0000 + +wireshark (0.99.6pre1-1) unstable; urgency=high + + * New upstream pre-release, with security fixes: + * could crash when dissecting an HTTP chunked response + * could crash while reading iSeries capture files + * could exhaust system memory while reading a malformed DCP ETSI packet + * could loop excessively while reading a malformed SSL packet + * DHCP/BOOTP dissector was susceptible to an off-by-one error + * could loop excessively while reading a malformed MMS packet + * debian/control: added libkrb5-dev to build-deps so Kerberos support is + built. + * debian/control: replaced {Source-Version} with appropriate {binary:Version} + * debian/wireshark-dev.header-files: use wildcards to get all headers + (closes: #423000) + * debian/patches/14_disable-cmip.dpatch: disable CMIP dissector which + doesn't build at the moment. + * debian/rules: don't ignore all errors on make distclean + + -- Frederic Peters Mon, 25 Jun 2007 13:33:43 +0200 + +wireshark (0.99.5-1) unstable; urgency=low + + * New upstream release. + * debian/patches/09_idl2wrs.dpatch: updated to patch idl2wrs.sh.in. + + -- Frederic Peters Sun, 01 Apr 2007 08:58:40 +0000 + +wireshark (0.99.4-5) unstable; urgency=high + + * debian/patches/00list: really include backported security fixes, stupid me. + + -- Frederic Peters Mon, 26 Feb 2007 09:30:29 +0000 + +wireshark (0.99.4-4) unstable; urgency=high + + * Backported security fixes from 0.99.5pre1 + * The TCP dissector could hang or crash while reassembling HTTP packets. + * The HTTP dissector could crash. + * On some systems, the IEEE 802.11 dissector could crash. + * On some systems, the LLT dissector could crash. + + -- Frederic Peters Fri, 19 Jan 2007 21:49:04 +0100 + +wireshark (0.99.4-3) unstable; urgency=low + + * debian/control: added build dependency on libportaudio-dev so sniffed voip + G.711 calls are listenable. (closes: #398673) + * debian/patches/08_wireshark-desktop-menu.dpatch: removed extraneous .rej + file from patch. + + -- Frederic Peters Sun, 19 Nov 2006 16:39:26 +0000 + +wireshark (0.99.4-2) unstable; urgency=low + + * debian/wireshark-dev.files: added more headers, so that dissectors for + DCE/RPC interfaces can be build externally. (closes: #397292) + + -- Frederic Peters Mon, 6 Nov 2006 12:48:20 +0100 + +wireshark (0.99.4-1) unstable; urgency=high + + * Backported security patches from yet unreleased 0.99.4 (closes: #396258) + * http://www.wireshark.org/security/wnpa-sec-2006-03.html has details + * HTTP dissector could crash (CVE-2006-5468) + * LDAP dissector (and others) could crash (CVE-2006-5740) + * XOT dissector could attempt to allocate a large amount of memory and + crash (CVE-2006-4805) + * WBXML dissector could crash (CVE-2006-5469) + * MIME Multipart dissectar was susceptible to an off-by-one error + (CVE-2006-4574) + * Parsing a WEP key could cause a crash + * debian/control: disabled libcap-dev for kfreebsd and hurd + (closes: #375022) + + -- Frederic Peters Wed, 1 Nov 2006 10:05:05 +0100 + +wireshark (0.99.3a-2) unstable; urgency=low + + * debian/ethereal-common.NEWS: added a note about ethereal -> wireshark name + change. + + -- Frederic Peters Thu, 12 Oct 2006 15:42:48 +0200 + +wireshark (0.99.3a-1) unstable; urgency=low + + * New upstream release. + * debian/patches/11_iscsi_dissector.dpatch, 12_ipsec_dissector.dpatch, + 13_q2931_security_fix.dpatch: security patches that were backported. + * debian/patches/11_typo_packet-dap: fixed a typo s/diwsect/dissect/ + + -- Frederic Peters Mon, 18 Sep 2006 18:56:12 +0200 + +wireshark (0.99.2-6) unstable; urgency=low + + * Acknowledge NMU, thank Steinar. + * debian/wireshark-dev.postinst: removed rests of old Python module + compilation, it is not needed by new policy. (closes: #385357) + + -- Frederic Peters Wed, 6 Sep 2006 23:34:36 +0200 + +wireshark (0.99.2-5.1) unstable; urgency=medium + + * Non-maintainer upload. + * Backport security fixes from 0.99.3a (via Subversion); fixes + CVE-2006-4331, CVE-2006-4333 (CVE-2006-4330 was fixed in last upload, + and CVE-2006-4332 is not relevant for Debian). (Closes: #384529) + + -- Steinar H. Gunderson Tue, 5 Sep 2006 02:15:53 +0200 + +wireshark (0.99.2-5) unstable; urgency=low + + * debian/patches/11_iscsi_dissector.dpatch: new patch, fixing bug reported + against iSCSI dissector, taken from upstream (r18832) (closes: #381860) + + -- Frederic Peters Mon, 7 Aug 2006 16:59:50 +0200 + +wireshark (0.99.2-4) unstable; urgency=low + + * debian/control: set ethereal-dev section to devel, it was lost in copy + pasting. + * debian/control, debian/rules, debian/pyversions: updated to new Python + policy. (closes: #380986) + + -- Frederic Peters Tue, 1 Aug 2006 13:05:21 +0200 + +wireshark (0.99.2-3) unstable; urgency=low + + * debian/control: added dummy transitional packages to provide an upgrade + path from ethereal. (closes: #380647) + + -- Frederic Peters Mon, 31 Jul 2006 18:21:27 +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 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 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 Mon, 1 May 2006 14:50:42 +0200 + +ethereal (0.10.14-2) unstable; urgency=low + + * debian/watch: added watch file. + + -- Frederic Peters 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 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 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 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 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 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 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 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 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 + skip the capabilities part; use g_warning to output messages. + (closes: #321204) + + -- Frederic Peters Thu, 4 Aug 2005 09:41:24 +0200 + +ethereal (0.10.12-2) unstable; urgency=low + + * debian/patches/04_drop-capabilities.dpatch: preserves CAP_DAC_READ_SEARCH + which seems necessary for sudo usage (closes: #320453) + + -- Frederic Peters Sun, 31 Jul 2005 12:56:50 +0200 + +ethereal (0.10.12-1) unstable; urgency=high + + * New upstream release; urgency high since it fixes security issues in many + dissectors; see http://www.ethereal.com/appnotes/enpa-sa-00020.html + + -- Frederic Peters Wed, 27 Jul 2005 09:57:17 +0200 + +ethereal (0.10.11-5) unstable; urgency=low + + * debian/patches/11_diameter_vendors.dpatch: correctly add diameter vendors + (patch by Joost Yervante Damad) (closes: #316082) + + -- Frederic Peters Mon, 18 Jul 2005 20:18:43 +0200 + +ethereal (0.10.11-4) unstable; urgency=low + + * debian/: now using dpatch, started from Ubuntu patch, merged with current + package patches. + + -- Frederic Peters Sun, 17 Jul 2005 18:58:05 +0200 + +ethereal (0.10.11-3) unstable; urgency=low + + * Modified capabilities patch so it doesn't try to keep CAP_NET_RAW if it + doesn't have it. (closes: #318689) + + -- Frederic Peters Sun, 17 Jul 2005 10:29:31 +0200 + +ethereal (0.10.11-2) unstable; urgency=low + + * Use capabilities to mitigate security risk, patch from J.H.M. Dassen (Ray) + (closes: #315670) + * debian/control: build-depends on libcap-dev + * epan/dissectors/packet-cmip.c: fixed dissect_cmip_InvokeIDType declaration + mismatch. + + -- Frederic Peters Sat, 16 Jul 2005 10:58:03 +0200 + +ethereal (0.10.11-1) unstable; urgency=high + + * New upstream release; urgency high since it fixes security issues in the + following dissectors: + * format string vulnerabilities: ANSI A, DHCP + * segmentation faults: GSM MAP, AIM, TZSP, Bittorrent, SMB, GSM, SMB + NETLOGON + * buffer overflows: DISTCC, FCELS, SIP, ISIS, CMIP, CMP, CMS, CRMF, ESS, + OCSP, PKIX1Explitit, PKIX Qualified, X.509, NCP, ISUP, TCAP, + Presentation + * null pointer exception: KINK, WSP, SMB Mailslot, H.245, MGCP, RPC + * infinite loops: LMP, EIGRP, MEGACO, L2TP + * uncaught assertions: Telnet, 802.3, BER, IAX2, RADIUS, SMB PIPE, MRDISC + * memory exhaustion: DICOM + * unclassified: Fibre Channel, LDAP, NTLMSSP + + -- Frederic Peters Thu, 5 May 2005 08:43:00 +0200 + +ethereal (0.10.10-2) unstable; urgency=high + + * Several security fixes from upstream subversion tree for the following + dissectors: + * DLSw (infinite loop) + * ICEP (double free) + * NDPS (memory exhaustion) + * Q931 (buffer overflow) + * RSVP (infinite loop) (CAN-2005-1281) + * SRVLOC (infinite loop) + + -- Frederic Peters Mon, 25 Apr 2005 15:30:55 +0200 + +ethereal (0.10.10-1) unstable; urgency=high + + * New upstream release; urgency high since it fixes security issues. + * Fixes buffer overflow in Etheric dissector. (CAN-2005-0704) + * Fixes crash in GPRS-LLC dissector. (CAN-2005-0705) + * Fixes buffer overflow in 3G-A11 dissector. (CAN-2005-0699) + (was already fixed in Debian package) + * debian/ethereal-dev.header-files: some files moved to epan/ + + -- Frederic Peters Mon, 14 Mar 2005 10:16:03 +0100 + +ethereal (0.10.9-2) unstable; urgency=high + + * Backported packet-3g-a11.c from upstream subversion trunk. + (fixes buffer overflows in 3G-A11 dissector) + (CAN-2005-0699 (under review)) (closes: #298771) + + -- Frederic Peters Thu, 10 Mar 2005 10:25:08 +0100 + +ethereal (0.10.9-1) unstable; urgency=high + + * New upstream release; urgency high since it fixes security issues. + * Fixes infinite loop in COPS dissector. (CAN-2005-0006) + * Fixes assertion in DLSw dissector. (CAN-2005-0007) + * Fixes memory corruption in DNP dissector. (CAN-2005-0008) + * Fixes assertion in Gnutella dissector. (CAN-2005-0009) + * Fixes memory corruption in MMSE dissector. (CAN-2005-0010) + * Fixes buffer overflow in X11 dissector. (CAN-2005-0084) + * asn2deb and idl2deb manpages relicensed by W. Borgert from GFDL to GPL + + -- Frederic Peters Thu, 20 Jan 2005 23:03:19 +0100 + +ethereal (0.10.8-4) unstable; urgency=low + + * Updated libtool version in wiretap/ directory. (closes: #289962) + + -- Frederic Peters Wed, 12 Jan 2005 10:14:41 +0100 + +ethereal (0.10.8-3) unstable; urgency=low + + * Fixed dissect_cmip_InvokeIDType declaration (FTBFS with gcc-4.0) + (closes: #288990) + * epan/dissectors/packet-giop.c: fixed segfault with some GIOP packets + (closes: #288746) + + -- Frederic Peters Fri, 7 Jan 2005 14:43:03 +0100 + +ethereal (0.10.8-2) unstable; urgency=low + + * Restored lost patch to idl2eth; sorry. (closes: #288740) + * ethereal_gen.py: fixed some includes. + * epan/prefs.c: Use sensible-brower as default browser. + * debian/control: build-depends on libpcap0.8-dev. + * debian/control: lower-case first letter of descriptions. + + -- Frederic Peters Wed, 5 Jan 2005 14:34:57 +0100 + +ethereal (0.10.8-1) unstable; urgency=high + + * New upstream release. + * Now parses Auth option in DHCPv6 (closes: #283534) + * Urgency high since it fixes security issues with DICOM, RTP, HTTP + and SMB + (CAN-2004-1139, CAN-2004-1140, CAN-2004-1141 and CAN-2004-1142) + + -- Frederic Peters Wed, 15 Dec 2004 22:13:41 +0100 + +ethereal (0.10.7-3) unstable; urgency=low + + * epan/prefs.c: changed default font to "monospace 10" (closes: #232408) + + -- Frederic Peters Fri, 19 Nov 2004 18:31:22 +0100 + +ethereal (0.10.7-2) unstable; urgency=low + + * plugins/opsi/packet-opsi.c: backported resource exhaustion fix + (closes: #280556) + + -- Frederic Peters Thu, 18 Nov 2004 21:50:28 +0100 + +ethereal (0.10.7-1) unstable; urgency=low + + * New upstream release. (closes: #277923) + + -- Frederic Peters Mon, 1 Nov 2004 14:11:35 +0100 + +ethereal (0.10.6-4) unstable; urgency=low + + * Build in clean chroot; stupid me. (closes: #276560) + * debian/rules: remove config.log on clean. + + -- Frederic Peters Fri, 15 Oct 2004 00:12:58 +0200 + +ethereal (0.10.6-3) unstable; urgency=medium + + * Upgrades libtool (closes: #276515) + + -- Frederic Peters Thu, 14 Oct 2004 18:40:03 +0200 + +ethereal (0.10.6-2) unstable; urgency=medium + + * debian/ethereal-dev.header-files: added missing header files + (closes: #270581) + + -- Frederic Peters Wed, 8 Sep 2004 10:34:12 +0200 + +ethereal (0.10.6-1) unstable; urgency=high + + * New upstream realease. + * Gtk-Critical messages are fixed (closes: #260341, #263118) + * debian/rules: run libtoolize to fix sonames; fix a FTBFS bug + (closes: #265379) + + -- Frederic Peters Sun, 15 Aug 2004 11:58:03 +0200 + +ethereal (0.10.5-4) unstable; urgency=low + + * link libethereal.so to libadns and libm (closes: #262015) + (since this is a private shared library I don't think it was required) + + -- Frederic Peters Thu, 29 Jul 2004 15:41:02 +0200 + +ethereal (0.10.5-3) unstable; urgency=low + + * debian/ethereal-dev.header-files: install packet-rpc.h, crc16.h and crc32.h + (closes: #259375) + + -- Frederic Peters Wed, 14 Jul 2004 12:50:34 +0200 + +ethereal (0.10.5-2) unstable; urgency=low + + * Compile and install plugins (closes: #259199) + + -- Frederic Peters Tue, 13 Jul 2004 13:40:41 +0000 + +ethereal (0.10.5-1) unstable; urgency=low + + * New upstream release with security fixes. + + + + Fixed the crash in protocol hierarchy (closes: #244743) + + Ethereal can be configured not to bug you about unsaved captures + (closes: #235721) + * Updated omniorb URL (closes: #257512) + + -- Frederic Peters Tue, 13 Jul 2004 10:16:55 +0200 + +ethereal (0.10.4-3) unstable; urgency=low + + * debian/rules: install libethereal in /usr/lib/ethereal, not /usr/lib/ + * debian/ethereal-dev.header-files: added packet-ber.h + * idl2deb: ETH_VER_IMPORT and non-versioned autotools (closes: #255570) + * debian/control: updated depends to libpcap0.7-dev, no more libpcap-dev + + -- Frederic Peters Tue, 22 Jun 2004 09:02:39 +0200 + +ethereal (0.10.4-2) unstable; urgency=low + + * Rebuilt against GTK+ 2.4; now in unstable. + + -- Frederic Peters Tue, 25 May 2004 22:28:37 +0200 + +ethereal (0.10.4-1) unstable; urgency=high + + * New upstream release with security fixes. + + * (sorry about the delay; I was away and forgot about this release) + + -- Frederic Peters Sun, 16 May 2004 00:02:53 +0200 + +ethereal (0.10.3-3) unstable; urgency=low + + * debian/control: removed dependency on gksu; moved to recommends + * debian/EtherealAsRoot.desktop: added TryExec=gksu so that the menu is + only shown when gksu is installed + * debian/ethereal.menu: removed entry for "ethereal as root" since + """running ethereal itself requires some wits, and user possesing + such skills would be able to launch it from xterm.""" + * "Our Priorities are Our Users (...)", but ignore them if they ask + about gksu support; it's against the holy Debian Policy Manual and + a """300kB dependency *is* a big dependency""". + * This closes the bug and everybody is happy (closes: #240682) + + -- Frederic Peters Sat, 10 Apr 2004 21:16:30 +0200 + +ethereal (0.10.3-2) unstable; urgency=high + + * Acknowledge NMU. (sorry) (urgency high, security fixes) + * debian/control: added Build-Conflicts on libsnmp-dev + + -- Frederic Peters Sun, 28 Mar 2004 23:14:51 +0200 + +ethereal (0.10.3-1.0.1) unstable; urgency=low + + * Recompile-only NMU. + * i386 package was uploaded with dependencies on GNOME libs from + experimental; rebuild using only dependencies from unstable. + + -- Steve Langasek Sat, 27 Mar 2004 21:27:01 -0600 + +ethereal (0.10.3-1) unstable; urgency=high + + * New upstream release with security fixes. (hence urgency high) + http://www.ethereal.com/appnotes/enpa-sa-00013.html + * debian/rules: remove upstream debian/menu on build + * debian/control: added dependency on gksu + * debian/menu: added an entry to start ethereal with gksu + (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 ethereal-common for now) + + -- Frederic Peters Sat, 27 Mar 2004 14:09:49 +0100 + +ethereal (0.10.2-2) unstable; urgency=low + + * New files in ethereal-dev (closes: #236702) + + -- Frederic Peters Sun, 7 Mar 2004 21:43:17 +0100 + +ethereal (0.10.2-1) unstable; urgency=low + + * New upstream release. + * debian/control: added libpcre3-dev to Build-Depends + + -- Frederic Peters Fri, 5 Mar 2004 15:56:50 +0100 + +ethereal (0.10.1-1) unstable; urgency=low + + * New upstream release. + * Include W. Bogert asn2deb (closes: #233603) + + -- Frederic Peters Thu, 19 Feb 2004 18:02:08 +0100 + +ethereal (0.10.0-6) unstable; urgency=low + + * debian/ethereal-common.manpages: added ethereal-filter.4 + (closes: #230256) + * debian/control: updated build-depends on docbook-xsl since docbook.xsl + moved. + + -- Frederic Peters Thu, 29 Jan 2004 18:11:43 +0100 + +ethereal (0.10.0-5) unstable; urgency=low + + * debian/rules: quotes around CFLAGS. (closes: #228492) + + -- Frederic Peters Mon, 19 Jan 2004 12:14:02 +0100 + +ethereal (0.10.0-4) unstable; urgency=low + + * Backported hexdump summary fix from CVS (closes: #226248) + http://www.ethereal.com/lists/ethereal-cvs/200312/msg00257.html + + -- Frederic Peters Mon, 5 Jan 2004 15:27:06 +0100 + +ethereal (0.10.0-3) unstable; urgency=low + + * ethereal_gen.py: patched to handle ushort/ulong union discriminators. + + -- Frederic Peters Thu, 18 Dec 2003 23:27:51 +0100 + +ethereal (0.10.0-2) unstable; urgency=low + + * debian/ethereal-dev.header-files: added missing header files. + (closes: #224246) + + -- Frederic Peters Wed, 17 Dec 2003 13:24:21 +0100 + +ethereal (0.10.0-1) unstable; urgency=low + + * New upstream release. (closes: #223857) + * correct fonts with GTK2. (closes: #197571) + * Includes missing help/ directory from CVS. + * Acknowledge NMU, thanks Ray. + * Security issues. (closes: #219590) + * idl2deb permissions. (closes: #211506) + * New idl2deb version, thanks. (closes: #213962) + * debian/ethereal-dev.header-files: include some missing header files + (closes the remaining of #211506) + * debian/control: versioned build-depends on debhelper. + + -- Frederic Peters Sat, 13 Dec 2003 17:11:09 +0100 + +ethereal (0.9.16-0.1) unstable; urgency=high + + * NMU. + * New upstream release (addresses #219590 for sid). + Fixes potential security issues with several dissectors: + * GTP (http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0925) + * ISAKMP and MEGACO + (http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0926) + * SOCKS (http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0927) + The upstream security advisory is enpa-sa-00011, available at + http://www.ethereal.com/appnotes/enpa-sa-00011.html + * [debian/rules] + * Don't remove doc/ethereal.pod and doc/tethereal.pod so the package + builds with pbuilder. + * Install idl2deb with execute permissions. + + -- J.H.M. Dassen (Ray) Mon, 10 Nov 2003 12:11:55 +0100 + +ethereal (0.9.15-1) unstable; urgency=low + + * New upstream release. (closes: #210272) + + -- Frederic Peters Wed, 10 Sep 2003 16:13:17 +0200 + +ethereal (0.9.14-5) unstable; urgency=low + + * debian/control: versioned build-depends on docbook-xsl (closes: #208734) + * debian/rules: compiles with -mieee on alpha + + -- Frederic Peters Sun, 7 Sep 2003 09:57:25 +0200 + +ethereal (0.9.14-4) unstable; urgency=low + + * debian/rules: install .desktop and images for menu. + (closes: #207271) + * debian/control: updated policy to 3.6.1.0 (no changes needed) + + -- Frederic Peters Sat, 30 Aug 2003 23:27:00 +0200 + +ethereal (0.9.14-3) unstable; urgency=low + + * Add manpage for idl2deb + * Include missing header files. (closes: #197181) + - from same bug: remove dependency of ethereal-dev against ethereal-common + - from same bug: added dependency to libglib2.0-dev + + -- Frederic Peters Tue, 19 Aug 2003 11:55:27 +0200 + +ethereal (0.9.14-2) unstable; urgency=low + + * Built for Python 2.3 since omniidl4 has been updated quickly. + + -- Frederic Peters Thu, 14 Aug 2003 10:19:18 +0200 + +ethereal (0.9.14-1) unstable; urgency=low + + * The "I'm so happy to be alive I'll fix plenty of bugs" release + * New upstream release. (closes: #204345) + * Include W. Bogert idl2deb script + * debian/control: depends on current versions of omniidl or omniidl4 since + they only exist for Python 2.2 and I don't want ethereal-dev to break when + they will switch to Python 2.3. I'll then release a new version. + * Several UI issues resolved upstream (closes: #199763) + * ethereal can now decode Jabber protocol (closes: #133099) + * debian/control: build-depends on libadns1-dev so that it now use the GNU + ADNS library for name resolution (closes: #197505) + + -- Frederic Peters Wed, 13 Aug 2003 00:06:27 +0200 + +ethereal (0.9.13-1) unstable; urgency=low + + * New upstream release. Fixing several security issues. + (closes: #197107) + + -- Frederic Peters Thu, 12 Jun 2003 10:00:57 +0200 + +ethereal (0.9.12-3) unstable; urgency=low + + * Rebuilt with new libpcap. (closes: #196831) + * Built with GTK+ 2.2 (instead of GTK+ 1.2). (closes: #193450) + + -- Frederic Peters Wed, 11 Jun 2003 17:45:07 +0200 + +ethereal (0.9.12-2) unstable; urgency=low + + * Forgot to update version-depends and it didn't use ${source-version}. + Fixed. (closes: #192213) + + -- Frederic Peters Wed, 7 May 2003 01:16:45 +0200 + +ethereal (0.9.12-1) unstable; urgency=high + + * New upstream release. Fixing several security issues. + (closes: #192107) + + -- Frederic Peters Tue, 6 May 2003 22:03:10 +0200 + +ethereal (0.9.9-2) unstable; urgency=low + + * Updated config.guess and config.sub to work on mips and mipsel + architectures (manually then through the patch provided by + Martin Godisch). (closes: #178701) + * Update to packet-socks.c + * debian/control: ethereal-dev now depends upon omniidl | omniidl4 + (closes: #182620) + * idl2eth no longer needs PYTHONPATH to be set explicitely. + (closes: #182621) + * debian/ethereal-dev.header-files: included config.h and reassemble.h since + they seem necessary. (closes: #183625) + * Thanks to W. Borgert for bug reporting. + + -- Frederic Peters Fri, 7 Mar 2003 22:52:27 +0000 + +ethereal (0.9.9-1) unstable; urgency=low + + * New upstream release. + * debian/control: Tightened ethereal-common dependencies. + (closes: #172861, #176236, #178027) + + -- Frederic Peters Fri, 24 Jan 2003 14:38:53 +0100 + +ethereal (0.9.8-3) unstable; urgency=low + + * debian/control: added versioned dependency between (t)ethereal and + ethereal-common to get the plug-ins. (closes: #172861) + + -- Frederic Peters Fri, 13 Dec 2002 10:39:27 +0100 + +ethereal (0.9.8-2) unstable; urgency=low + + * Updated config.sub and config.guess with the ones from autotools-dev + (closes: #172407) + + -- Frederic Peters Tue, 10 Dec 2002 09:52:45 +0100 + +ethereal (0.9.8-1) unstable; urgency=low + + * New upstream release. + * This added (some) support for counting IPv6 packets during capture. + (closes: #164472) + * 0.9.7 fixed the LMP dissector. (closes: #163513) + + -- Frederic Peters Mon, 9 Dec 2002 10:00:51 +0100 + +ethereal (0.9.7-2) unstable; urgency=low + + * debian/control: added libgtk2.0-dev to build depends. + * debian/control: removed libsnmp-dev from build depends (ethereal is + compiled without SNMP support since it would link against libssl) + (the build-dep caused failure to build on architectures where perl 5.8 + wasn't ready (dependency on libsnmp-perl)) + * debian/control: added python, automake and autoconf to build depends. + * debian/rules: creating aclocal-missing directory on build. + (those bugs closes: #163443) (patch by LaMont Jones) + * debian/rules: install Python files to 2.2 directory, not 2.1 + * debian/ethereal-dev.postinst: fixed Python version (closes: #163153) + + -- Frederic Peters Mon, 7 Oct 2002 15:06:06 +0200 + +ethereal (0.9.7-1) unstable; urgency=low + + * New upstream release. (closes: #162972) + * debian/copyright: include upstream author name. (closes: #151015) + + -- Frederic Peters Tue, 1 Oct 2002 16:20:45 +0200 + +ethereal (0.9.6-2) unstable; urgency=low + + * debian/control: changed Python dep to >= 2.2 and << 2.3 since 2.2 is now + the default version in sid. + + -- Frederic Peters Sat, 14 Sep 2002 23:29:23 +0200 + +ethereal (0.9.6-1) unstable; urgency=low + + * New upstream release. + * Fixes security issue in the ISIS protocol dissector (susceptible to + buffer overflow). + (see http://www.ethereal.com/appnotes/enpa-sa-00006.html) + * Add missing header files (packet-tcp.h and packet-tpkt.h) to ethereal-dev + (closes: #158808) + * Add default PYTHONPATH to idl2eth (closes: #158909) + + -- Frederic Peters Mon, 2 Sep 2002 10:13:06 +0200 + +ethereal (0.9.5-3) unstable; urgency=low + + * Rebuilt with new libpcap0.7. (closes: #156206) + + -- Frederic Peters Sat, 10 Aug 2002 19:25:29 +0200 + +ethereal (0.9.5-2) unstable; urgency=low + + * Do not run libtoolize since it creates a bogus libtool file. + + -- Frederic Peters Mon, 8 Jul 2002 16:07:00 +0200 + +ethereal (0.9.5-1) unstable; urgency=low + + * New upstream release. + * Fixes several security issues. + (http://www.ethereal.com/appnotes/enpa-sa-00005.html) + + -- Frederic Peters Sat, 29 Jun 2002 19:13:30 +0200 + +ethereal (0.9.4-1) unstable; urgency=medium + + * New upstream release. + * Fixes four security issues. (closes: #147595) + (http://www.ethereal.com/appnotes/enpa-sa-00004.html) + + -- Frederic Peters Mon, 20 May 2002 01:10:21 +0200 + +ethereal (0.9.3-1) unstable; urgency=medium + + * New upstream release + * Fixes ASN.1 zero-length g_malloc that could lead to security problems. + (see http://www.ethereal.com/appnotes/enpa-sa-00003.html) + + -- Frederic Peters Sun, 31 Mar 2002 21:45:11 +0200 + +ethereal (0.9.2-3) unstable; urgency=low + + * debian/rules: fixed typo that could have caused snmp not to be built. + (closes: #140147) This would happen if 1) built from the CVS tree and 2) + built on a system without libsnmp-dev ("impossible" since we build-depend + on it). Anyway it is fixed for correctness. + + -- Frederic Peters Wed, 27 Mar 2002 14:00:31 +0100 + +ethereal (0.9.2-2) unstable; urgency=low + + * Added libwiretap.a to ethereal-dev (closes: #137971) + + -- Frederic Peters Tue, 12 Mar 2002 11:59:04 +0100 + +ethereal (0.9.2-1) unstable; urgency=low + + * New upstream release. + + -- Frederic Peters Tue, 5 Mar 2002 10:30:24 +0100 + +ethereal (0.9.1-8) unstable; urgency=low + + * debian/control: changed ethereal-dev section to devel. + + -- Frederic Peters Mon, 25 Feb 2002 14:50:49 +0100 + +ethereal (0.9.1-7) unstable; urgency=low + + * debian/control: changed ethereal-dev Depends line to use omniidl-python + and no omniorb. + + -- Frederic Peters Mon, 25 Feb 2002 13:47:42 +0100 + +ethereal (0.9.1-6) unstable; urgency=low + + * debian/control: fix Depends line for ethereal-dev (added libpcap-dev) + * idl2eth: added PYTHONPATH so that it runs. + + -- Frederic Peters Mon, 18 Feb 2002 11:48:01 +0100 + +ethereal (0.9.1-5) unstable; urgency=low + + * debian/rules: added --disable-ssl so that ethereal is not built with + ssl support and may be uploaded to main. (closes: #134273) + + -- Frederic Peters Mon, 18 Feb 2002 09:33:30 +0100 + +ethereal (0.9.1-4) unstable; urgency=low + + * debian/rules: added forgotten header files to ethereal-dev. + (really closes: #105916) + + -- Frederic Peters Fri, 15 Feb 2002 10:12:15 +0100 + +ethereal (0.9.1-3) unstable; urgency=low + + * debian/rules: after the quick and dirty repackaging of 0.9.1-1 this one + should be much better: 4 packages: ethereal-common, ethereal, tethereal + and etherel-dev (last three depending on ethereal-common). + This should address Christian Kurz remarks. + (closes: #133798, #133796, #133806) + This should also please W. Borgert. (closes: #105916) + + -- Frederic Peters Wed, 13 Feb 2002 20:36:12 +0100 + +ethereal (0.9.1-2) unstable; urgency=low + + * debian/control: fixed typo in tethereal description (closes: #133019) + + -- Frederic Peters Fri, 8 Feb 2002 23:55:49 +0100 + +ethereal (0.9.1-1) unstable; urgency=low + + * New upstream release. + * Fixed protocol hierarchy display (closes: #131676) + * It is possible to see TOS fields instead of DS fields in IP header. + (option in preferences dialog) (closes: #121046) + * debian/rules: totally revamped build process: create an additional + tethereal package that doesn't depend on GTK+ (closes: #103488) + It is not yet perfect but I'm working on it... + + -- Frederic Peters Mon, 28 Jan 2002 18:25:25 +0100 + +ethereal (0.9.0-1) unstable; urgency=low + + * New upstream release. + * Upstream fixed SNMP bugs (closes: #114361, #119580) + * Upstream fixed Sender->Receiver bug (closes: #112327) + * debian/copyright: fixed 'license' spelling. + * debian/rules: fixed 'clean' target to remove temporary files. + * debian/rules: moved $sysconfdir to /usr/share/ethereal since $sysconfdir + is not used here to store config files. (closes: #127638) + + -- Frederic Peters Thu, 3 Jan 2002 19:43:18 +0100 + +ethereal (0.8.20-1) unstable; urgency=low + + * New upstream release. + + -- Frederic Peters Fri, 19 Oct 2001 10:49:35 +0200 + +ethereal (0.8.19-2) unstable; urgency=low + + * debian/rules: added call to libtoolize so that it compiles on hppa. + (closes: #108662) + + -- Frederic Peters Mon, 17 Sep 2001 14:23:34 +0200 + +ethereal (0.8.19-1) unstable; urgency=low + + * New upstream release. + * debian/control: improved description of package. (closes: #104744) + + -- Frederic Peters Sat, 14 Jul 2001 11:57:12 +0200 + +ethereal (0.8.17-1) unstable; urgency=low + + * New upstream release. + + -- Frederic Peters Fri, 13 Apr 2001 13:33:35 +0200 + +ethereal (0.8.16-1) unstable; urgency=low + + * New upstream release. + + -- Frederic Peters Thu, 8 Mar 2001 09:07:34 +0100 + +ethereal (0.8.15-2) unstable; urgency=low + + * Rebuilt against libsnmp4.2 (closes: #83720) + * It is possible to not go in promiscuous mode (-p) (actually it was for + some time...) (closes: #34376) + + -- Frederic Peters Sat, 27 Jan 2001 13:39:05 +0100 + +ethereal (0.8.15-1) unstable; urgency=low + + * New upstream release. + + -- Frederic Peters Sat, 13 Jan 2001 19:36:26 +0100 + +ethereal (0.8.14-2) unstable; urgency=low + + * Fix for the socks dissector. (closes: #81164) + (patch by Jeff Foster ) + + -- Frederic Peters Thu, 11 Jan 2001 00:27:02 +0100 + +ethereal (0.8.14-1) unstable; urgency=low + + * New upstream release. + * Officially fixes the buffer overflow exploit mentioned below (as well + as other possible ones) + + -- Frederic Peters Tue, 21 Nov 2000 22:48:16 +0100 + +ethereal (0.8.13-3) unstable; urgency=low + + * Fixed possible buffer overflow exploit in packet-afs.c (I could not + reproduce it so I don't know if my fix really works, please test it) + (exploit is on http://www.hacksware.com) + + -- Frederic Peters Tue, 21 Nov 2000 22:47:59 +0100 + +ethereal (0.8.13-2) unstable; urgency=low + + * Rebuilt against XFree86 4.0 libs (now that I'm allowed to...) + * Rebuilt against zlibg1 1.1.13-1 that has a correct shlibs file + (closes: #76533, #76552) + + -- Frederic Peters Fri, 10 Nov 2000 17:39:40 +0100 + +ethereal (0.8.13-1) unstable; urgency=low + + * New upstream release. + + -- Frederic Peters Sun, 29 Oct 2000 23:58:38 +0100 + +ethereal (0.8.12-1) unstable; urgency=low + + * New upstream release. + * Patch for SRVLOC frames has been applied upstrem. + + -- Frederic Peters Mon, 18 Sep 2000 10:22:27 +0200 + +ethereal (0.8.11-1) unstable; urgency=low + + * New upstream release. + * Applied patch to fix hang on some SRVLOC frames (closes: #68024) + + -- Frederic Peters Thu, 10 Aug 2000 21:06:52 +0200 + +ethereal (0.8.10-1) unstable; urgency=low + + * New upstream release. + * Added debhelper to Build-depends (closes: #66391) + + -- Frederic Peters Tue, 11 Jul 2000 22:36:45 +0200 + +ethereal (0.8.9-2) unstable; urgency=low + + * Updated Build-depends to match libsnmp (closes: #66018) (it's the same + entry as for 0.8.7-2; I need some sleep) + + -- Frederic Peters Thu, 22 Jun 2000 23:59:29 +0200 + +ethereal (0.8.9-1) unstable; urgency=low + + * New upstream release. + + -- Frederic Peters Tue, 20 Jun 2000 14:17:00 +0200 + +ethereal (0.8.8-1) unstable; urgency=low + + * New upstream release. + + -- Frederic Peters Wed, 10 May 2000 17:20:36 +0200 + +ethereal (0.8.7-2) unstable; urgency=low + + * Updated Build-depends to match libsnmp (closes: #63753) + + -- Frederic Peters Mon, 8 May 2000 19:02:29 +0200 + +ethereal (0.8.7-1) unstable; urgency=low + + * New upstream release. + + -- Frederic Peters Mon, 17 Apr 2000 18:41:21 +0200 + +ethereal (0.8.6-1) unstable; urgency=low + + * New upstream release. + * Linked against libsnmp4.1 (closes: #62324) + + -- Frederic Peters Fri, 14 Apr 2000 19:45:53 +0200 + +ethereal (0.8.4-1) unstable; urgency=low + + * New upstream release. + * Applied fix for correct decapsulation of PPP frames (closes: #59663) + (patch provided by Thomas Quinot ) + + -- Frederic Peters Sun, 5 Mar 2000 20:04:11 +0100 + +ethereal (0.8.3-1) unstable; urgency=low + + * New upstream release. + * Checked PPTP problems (fix was introduced in 0.8.2) (closes: #55347) + + -- Frederic Peters Sat, 5 Feb 2000 23:51:26 +0100 + +ethereal (0.8.2-2) unstable; urgency=low + + * debian/control: fixed Build-Depends line (closes: #56707) + + -- Frederic Peters Mon, 31 Jan 2000 19:29:21 +0100 + +ethereal (0.8.2-1) unstable; urgency=low + + * New upstream release. + + -- Frederic Peters Sat, 29 Jan 2000 01:53:50 +0100 + +ethereal (0.8.1-2) unstable; urgency=low + + * debian/control: added Build-Depends + * debian/control: modified description to match the README file + * debian/rules: added --disable-static to ./configure + * compiled with SNMP support (through libsnmp) + + -- Frederic Peters Thu, 20 Jan 2000 18:30:40 +0100 + +ethereal (0.8.1-1) unstable; urgency=low + + * New upstream release. + * Fixed duplicate manpage installation. (closes: #55438) + + -- Frederic Peters Wed, 19 Jan 2000 09:29:56 +0100 + +ethereal (0.8.0-1) unstable; urgency=low + + * New upstream release. + + -- Frederic Peters Sat, 1 Jan 2000 23:50:44 +0100 + +ethereal (0.7.9-1) unstable; urgency=low + + * New upstream release. + + -- Frederic Peters Sat, 25 Dec 1999 00:55:00 +0100 + +ethereal (0.7.7-1) unstable; urgency=low + + * New upstream release. + + -- Frederic Peters Fri, 29 Oct 1999 14:09:01 +0200 + +ethereal (0.7.3-2) unstable; urgency=low + + * Fixed debian/rules to work with the new debhelper that create FHS compliant + packages. (Fixes: #44613) + + -- Frederic Peters Thu, 9 Sep 1999 18:29:12 +0200 + +ethereal (0.7.3-1) unstable; urgency=low + + * New upstream release. + + -- Frederic Peters Sun, 5 Sep 1999 20:06:10 +0200 + +ethereal (0.7.2-1) unstable; urgency=low + + * New upstream release. + + -- Frederic Peters Sat, 14 Aug 1999 18:32:28 +0200 + +ethereal (0.7.1-1) unstable; urgency=low + + * New upstream release. + + -- Frederic Peters Sat, 7 Aug 1999 16:29:03 +0200 + +ethereal (0.6.3-2) unstable; urgency=low + + * Renamed NEWS to changelog since this is the upstream ChangeLog + (fixes bug #41908) + + -- Frederic Peters Tue, 27 Jul 1999 20:19:28 +0200 + +ethereal (0.6.3-1) unstable; urgency=low + + * New upstream release. + * Moved directories to comply with FHS (and Standards 3.0.0) + + -- Frederic Peters Sat, 24 Jul 1999 00:36:46 +0200 + +ethereal (0.6.2-1) unstable; urgency=low + + * New upstream release. + + -- Frederic Peters Tue, 25 May 1999 16:47:08 +0200 + +ethereal (0.6.1-1) unstable; urgency=low + + * New upstream release. + + -- Frederic Peters Sun, 2 May 1999 23:30:38 +0200 + +ethereal (0.5.1-3) unstable; urgency=low + + * Fixed package building (Bug#35657 (report and patch from bartw@xs4all.nl) + + -- Frederic Peters Sat, 10 Apr 1999 19:20:29 +0200 + +ethereal (0.5.1-2) unstable; urgency=low + + * Compiled against libgtk1.2 + * Moved /usr/etc/manuf to /etc/manuf (it's now lintian clean) + + -- Frederic Peters Mon, 8 Mar 1999 22:33:04 +0100 + +ethereal (0.5.1-1) unstable; urgency=low + + * New upstream release. + + -- Frederic Peters Sat, 9 Jan 1999 16:51:28 +0100 + +ethereal (0.5.0-2) unstable; urgency=low + + * Fixed package building (Bug#30110) + + -- Frederic Peters Thu, 3 Dec 1998 13:15:53 +0100 + +ethereal (0.5.0-1) unstable; urgency=low + + * New upstream release. + + -- Frederic Peters Tue, 24 Nov 1998 16:04:15 +0100 + +ethereal (0.4.0-1) unstable; urgency=low + + * New upstream release. + + -- Frederic Peters Sat, 17 Oct 1998 17:20:01 +0200 + +ethereal (0.3.17-1) unstable; urgency=low + + * New upstream release. + + -- Frederic Peters Tue, 29 Sep 1998 20:01:11 +0200 + +ethereal (0.3.16-2) unstable; urgency=low + + * New versions aren't just for Alpha people :) (fixes #26914) + + -- Frederic Peters Fri, 25 Sep 1998 17:03:39 +0200 + +ethereal (0.3.16-1) unstable; urgency=low + + * New upstream version + + -- Frederic Peters Sat, 19 Sep 1998 10:55:48 +0200 + +ethereal (0.3.15-1.1) unstable; urgency=low + + * non-maintainer upload for Alpha + * GTK cflags ans library flags were not passed to the compiler. + + -- Paul Slootman Mon, 21 Sep 1998 22:49:32 +0200 + +ethereal (0.3.15-1) unstable; urgency=low + + * Initial Release. + + -- Frederic Peters Sun, 13 Sep 1998 23:05:47 +0200 + --- wireshark-1.0.0.orig/debian/watch +++ wireshark-1.0.0/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://www.wireshark.org/download/src/all-versions/wireshark-(.*)\.tar\.gz --- wireshark-1.0.0.orig/debian/wireshark-dev.prerm +++ wireshark-1.0.0/debian/wireshark-dev.prerm @@ -0,0 +1,15 @@ +#! /bin/bash -e +# +# Debian prerm script for Python x.y hierarchical modules +# Written by Gregor Hoffleit +# Extended by Matthias Klose +# + +PACKAGE=`basename $0 | sed -e 's/\.[^.]*$//'` + +dpkg --listfiles $PACKAGE | + awk '$0~/\.py$/ {print $0"c\n" $0"o"}' | + xargs rm -f >&2 + +#DEBHELPER# + --- wireshark-1.0.0.orig/debian/wireshark-common.manpages +++ wireshark-1.0.0/debian/wireshark-common.manpages @@ -0,0 +1,5 @@ +editcap.1 +mergecap.1 +text2pcap.1 +wireshark-filter.4 +capinfos.1 --- wireshark-1.0.0.orig/debian/wireshark-dev.manpages +++ wireshark-1.0.0/debian/wireshark-dev.manpages @@ -0,0 +1,3 @@ +idl2wrs.1 +idl2deb.1 +asn2deb.1 --- wireshark-1.0.0.orig/debian/wireshark.menu +++ wireshark-1.0.0/debian/wireshark.menu @@ -0,0 +1,5 @@ +?package(wireshark):needs="X11" section="Applications/Network/Monitoring" \ + title="Wireshark" \ + command="/usr/bin/wireshark" \ + icon="/usr/share/pixmaps/wsicon32.xpm" + --- wireshark-1.0.0.orig/debian/pyversions +++ wireshark-1.0.0/debian/pyversions @@ -0,0 +1 @@ +2.3- --- wireshark-1.0.0.orig/debian/copyright +++ wireshark-1.0.0/debian/copyright @@ -0,0 +1,428 @@ +his package was debianized by Frederic Peters on +Sun, 13 Sep 1998 23:05:47 +0200 + +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 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 + * + * 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 + * + * 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 + * 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: + + +editcap.c: +merge.c: +mergecap.c: + Wireshark terms, according to wireshark-dev@, message-id: + + +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: + + +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> + +epan/in_cksum.h: + BSD, like in_cksum.c, according to wireshark-dev@, message-id: + <44C1EFA2.3050907@alum.mit.edu> + +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: --- wireshark-1.0.0.orig/debian/pycompat +++ wireshark-1.0.0/debian/pycompat @@ -0,0 +1 @@ +2 --- wireshark-1.0.0.orig/debian/wireshark-common.shlibs +++ wireshark-1.0.0/debian/wireshark-common.shlibs @@ -0,0 +1,2 @@ +libwireshark 0 wireshark-common +libwiretap 0 wireshark-common --- wireshark-1.0.0.orig/debian/tshark.files +++ wireshark-1.0.0/debian/tshark.files @@ -0,0 +1,2 @@ +/usr/bin/tshark + --- wireshark-1.0.0.orig/debian/wireshark.manpages +++ wireshark-1.0.0/debian/wireshark.manpages @@ -0,0 +1 @@ +wireshark.1 --- wireshark-1.0.0.orig/debian/ethereal-common.NEWS +++ wireshark-1.0.0/debian/ethereal-common.NEWS @@ -0,0 +1,13 @@ +wireshark (0.99.2-1) unstable; urgency=low + + Same developers, same code, different name. The Ethereal network protocol + analyzer has changed its name to Wireshark. + + Name changes: + - ethereal -> wireshark + - tethereal -> tshark + - idl2eth -> idl2wrs + + See http://www.wireshark.org/news/20060607.html for more information. + + -- Frederic Peters Thu, 12 Oct 2006 15:35:25 +0200 --- wireshark-1.0.0.orig/debian/wireshark-common.files +++ wireshark-1.0.0/debian/wireshark-common.files @@ -0,0 +1,12 @@ +/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/* +/etc/wireshark/init.lua --- wireshark-1.0.0.orig/debian/wireshark-dev.files +++ wireshark-1.0.0/debian/wireshark-dev.files @@ -0,0 +1,10 @@ +/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/* + --- wireshark-1.0.0.orig/debian/control +++ wireshark-1.0.0/debian/control @@ -0,0 +1,122 @@ +Source: wireshark +Section: net +Priority: optional +Maintainer: Frederic Peters +Uploaders: Joost Yervante Damad +Standards-Version: 3.7.3.0 +Build-Depends: libgtk2.0-dev (>=2.4.0-0), libpcap0.8-dev, flex, libz-dev, dpatch, debhelper (>= 6), libtool, python, automake1.9, autoconf, autotools-dev, libadns1-dev, xsltproc, docbook-xsl (>= 1.64.1.0-0), libpcre3-dev, libcap-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], bison, libgnutls-dev, python-support (>= 0.3), portaudio19-dev, libkrb5-dev, liblua5.1-0-dev +Build-Conflicts: libsnmp4.2-dev, libsnmp-dev +XS-Python-Version: all + +Package: wireshark-common +Architecture: any +Depends: ${shlibs:Depends} +Recommends: wireshark (>= ${binary:Version}) | tshark (>= ${binary:Version}) +Replaces: ethereal-common (<< 0.99.2-0) +Conflicts: ethereal-common (<< 0.99.2-0) +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. Wireshark decodes numerous protocols (too many + to list). + . + This package provides files common to both wireshark (the GTK+ version) + and tshark (the console version). + +Package: wireshark +Architecture: any +Depends: ${shlibs:Depends}, wireshark-common (= ${binary:Version}) +Recommends: gksu +Replaces: ethereal (<< 0.99.2-0) +Conflicts: ethereal (<< 0.99.2-0) +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. Wireshark decodes numerous protocols (too many + to list). + . + This package provides wireshark (the GTK+ version) + +Package: tshark +Architecture: any +Depends: ${shlibs:Depends}, wireshark-common (= ${binary:Version}) +Replaces: tethereal (<< 0.99.2-0) +Conflicts: tethereal (<< 0.99.2-0) +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. Wireshark decodes numerous protocols (too many + to list). + . + This package provides the console version of wireshark, named + "tshark". + +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:Depends}, snacc, autotools-dev, debhelper, cdbs, automake1.8, autoconf +Replaces: ethereal-dev (<< 0.99.2-0) +Conflicts: ethereal-dev (<< 0.99.2-0) +XB-Python-Version: ${python:Versions} +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. Wireshark decodes numerous protocols (too many + to list). + . + This package provides idl2wrs and other necessary files to develop + new packet dissectors. + +Package: ethereal-common +Architecture: any +Depends: wireshark-common (= ${binary:Version}) +Description: dummy upgrade package for ethereal -> wireshark + 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. Wireshark decodes numerous protocols (too many + to list). + . + It was previously named ethereal. This is a transitional package + so ethereal users get wireshark on upgrades. This package handles + ethereal-common -> wireshark-common. It can be safely removed. + +Package: ethereal-dev +Architecture: any +Section: devel +Depends: wireshark-dev (= ${binary:Version}) +Description: dummy upgrade package for ethereal -> wireshark + 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. Wireshark decodes numerous protocols (too many + to list). + . + It was previously named ethereal. This is a transitional package + so ethereal users get wireshark on upgrades. This package handles + ethereal-dev -> wireshark-dev. It can be safely removed. + +Package: ethereal +Architecture: any +Depends: wireshark (= ${binary:Version}) +Description: dummy upgrade package for ethereal -> wireshark + 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. Wireshark decodes numerous protocols (too many + to list). + . + It was previously named ethereal. This is a transitional package + so ethereal users get wireshark on upgrades. This package handles + ethereal -> wireshark. It can be safely removed. + +Package: tethereal +Architecture: any +Depends: tshark (= ${binary:Version}) +Description: dummy upgrade package for ethereal -> wireshark + 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. Wireshark decodes numerous protocols (too many + to list). + . + It was previously named ethereal. This is a transitional package + so ethereal users get wireshark on upgrades. This package handles + tethereal -> tshark. It can be safely removed. + --- wireshark-1.0.0.orig/debian/wireshark-dev.header-files +++ wireshark-1.0.0/debian/wireshark-dev.header-files @@ -0,0 +1,9 @@ +color.h +config.h +register.h +epan/*.h +epan/crypt/*.h +epan/dfilter/*.h +epan/dissectors/*.h +epan/ftypes/*.h +wiretap/*.h --- wireshark-1.0.0.orig/debian/wireshark.files +++ wireshark-1.0.0/debian/wireshark.files @@ -0,0 +1,3 @@ +/usr/bin/wireshark +/usr/share/applications/ +/usr/share/pixmaps/