osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Update Debian packaging files for Wireshark 1.0. 

These files build the package with all features and
minimum changes from the released sources.

svn path=/trunk/; revision=25406
This commit is contained in:
Jaap Keuter 2008-05-31 16:44:02 +00:00
parent fa2b419e60
commit 9323e90cc5
35 changed files with 198 additions and 2616 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
debian/README.debian vendored
View File

@ -1,11 +0,0 @@
Ethereal for Debian
-------------------
Q. Why isn't wireshark linked against libssl ?
A. Because it can't be linked against libssl.
See http://www.openssl.org/support/faq.html#LEGAL2
Q. Why isn't wireshark linked against libsnmp ?
A. Because it would also need to be linked against libssl
Frederic Peters <fpeters@debian.org>, Tue, 21 May 2002 08:37:52 +0200

1301
debian/changelog vendored
View File

File diff suppressed because it is too large Load Diff

2
debian/compat vendored
View File

@ -1 +1 @@
4
6

61
debian/control vendored
View File

@ -1,9 +1,11 @@
Source: wireshark
Section: net
Priority: optional
Maintainer: Frederic Peters <fpeters@debian.org>
Standards-Version: 3.7.2.0
Build-Depends: libgtk2.0-dev (>=2.4.0-0), libpcap0.8-dev, flex, libz-dev, dpatch, debhelper (>= 5.0.37.2), 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), libportaudio-dev | portaudio19-dev, libkrb5-dev
Maintainer: Wireshark Self-made package <wireshark@example.com>
X-Orig-Maintainer: Frederic Peters <fpeters@debian.org>
X-Orig-Uploaders: Joost Yervante Damad <andete@debian.org>
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, libsmi2-dev
Build-Conflicts: libsnmp4.2-dev, libsnmp-dev
XS-Python-Version: all
@ -66,56 +68,3 @@ Description: network traffic analyser (development tools)
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.

1
debian/docs vendored
View File

@ -1 +0,0 @@
README AUTHORS README.linux

4
debian/headers-check.c vendored Normal file
View File

@ -0,0 +1,4 @@
#include <wireshark/config.h>
#include <epan/packet.h>
#include <epan/prefs.h>

2
debian/menu vendored
View File

@ -1,2 +0,0 @@
?package(ethereal):needs=X11 section=Apps/Net title="Ethereal" \
command="/usr/bin/ethereal"

22
debian/patches/00list vendored
View File

@ -1,10 +1,14 @@
01_idl2deb
02_asn2deb
#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
#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

424
debian/patches/01_idl2deb.dpatch vendored
View File

@ -1,424 +0,0 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_idl2deb.dpatch by <fpeters@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: idl2deb - create Debian packages from idl2wrs modules
@DPATCH@
diff -urNad --exclude=CVS --exclude=.svn ./idl2deb /tmp/dpep-work.K2bQz4/wireshark-0.10.11/idl2deb
--- ./idl2deb 1970-01-01 01:00:00.000000000 +0100
+++ /tmp/dpep-work.K2bQz4/wireshark-0.10.11/idl2deb 2005-07-17 19:35:08.000000000 +0200
@@ -0,0 +1,252 @@
+#!/usr/bin/env python
+
+# idl2deb - quick hack by W. Borgert <debacle@debian.org> to create
+# Debian GNU/Linux packages from idl2wrs modules for Wireshark.
+# Copyright 2003, W. Borgert
+
+# Makefile.am and configure.ac code by:
+# Copyright 2001, Ericsson Inc.
+# Frank Singleton <frank.singleton@ericsson.com>
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.com>
+# Copyright 1998 Gerald Combs
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+import getopt, os, string, sys, time
+
+scriptinfo = """idl2deb version 2003-10-03
+Copyright 2003, W. Borgert
+Free software, released under the terms of the GPL."""
+
+options = {'dbopts': "",
+ 'email': "invalid@invalid.invalid",
+ 'help': 0,
+ 'idl': None,
+ 'name': "No Name",
+ 'preserve': 0,
+ 'version': 0}
+
+def bootstrap():
+ """Generate Makefile.in and configure script."""
+ os.system("aclocal")
+ os.system("autoconf")
+ os.system("libtoolize --automake --copy --force")
+ os.system("automake --add-missing --copy --foreign")
+
+def create_file(filename, content, mode = None):
+ """Create a file with given content."""
+ global options
+ if options['preserve'] and os.path.isfile(filename):
+ return
+ f = open(filename, 'w')
+ f.write(content)
+ f.close()
+ if mode:
+ os.chmod(filename, mode)
+
+def create_files(version, deb, email, idl, name, iso, rfc):
+ """Create all files for the .deb build process."""
+ base = idl.lower()[:-4]
+ create_file("Makefile.am", """#
+
+plugindir = @plugindir@
+
+plugin_LTLIBRARIES = %s.la
+%s_la_SOURCES = packet-%s.c
+%s_la_LDFLAGS = -module -avoid-version
+
+GLIB_CFLAGS = `pkg-config --cflags glib-2.0`
+GLIB_LIBS = `pkg-config --libs glib-2.0`
+BUILT_SOURCES = packet-%s.c
+INCLUDES = -DHAVE_CONFIG -DHAVE_SYS_TYPES_H -DHAVE_SYS_TIME_H \\
+ -DHAVE_STDARG_H -D_U_=\"__attribute__((unused))\" \\
+ -I/usr/include/wireshark -DWS_VAR_IMPORT=extern $(GLIB_CFLAGS)
+LDADD = $(GLIB_LIBS)
+
+# Libs must be cleared, or else libtool won't create a shared module.
+# If your module needs to be linked against any particular libraries,
+# add them here.
+LIBS =
+
+%s_la_DEPENDENCIES = packet-%s-static.o
+
+packet-%s-static.o: packet-%s.c
+ $(LTCOMPILE) -c -o packet-%s-static.o \\
+ -D__WIRESHARK_STATIC__ packet-%s.c
+
+packet-%s.c: """ % ((base,) * 12) + idl + """
+ $(IDL2WRS) $< > $@
+""")
+
+ create_file("configure.ac", """AC_INIT(%s, 1.0)
+AC_PROG_LIBTOOL
+AM_INIT_AUTOMAKE
+AM_MAINTAINER_MODE
+AC_PROG_CC
+AC_STDC_HEADERS
+AC_PROG_INSTALL
+AC_SUBST(CFLAGS)
+AC_SUBST(CPPFLAGS)
+AC_SUBST(LDFLAGS)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.2.2)
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
+IDL2WRS=\"`type -p idl2wrs`\"
+AC_SUBST(IDL2WRS)
+WIRESHARK_VERSION=\"%s\"
+plugindir=\"$libdir/wireshark/plugins/$WIRESHARK_VERSION\"
+AC_SUBST(plugindir)
+AC_OUTPUT([Makefile])
+""" % (base, version))
+
+ if not os.path.isdir("debian"):
+ os.mkdir("debian")
+
+ create_file("debian/rules", """#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
+PREFIX=`pwd`/debian/wireshark-giop-%s
+
+binary-post-install/wireshark-giop-%s::
+ rm -f $(PREFIX)/usr/lib/wireshark/plugins/%s/*.a
+""" % (base, base, version), 0755)
+
+ create_file("debian/control", """Source: wireshark-giop-%s
+Section: net
+Priority: optional
+Maintainer: %s <%s>
+Standards-Version: 3.6.1.0
+Build-Depends: wireshark-dev, autotools-dev, debhelper, cdbs
+
+Package: wireshark-giop-%s
+Architecture: any
+Depends: wireshark (= %s), ${shlibs:Depends}
+Description: GIOP dissector for CORBA interface %s
+ This package provides a dissector for GIOP (General Inter-ORB
+ Protocol) for the Wireshark protocol analyser. It decodes the CORBA
+ (Common Object Request Broker Architecture) interfaces described
+ in the IDL (Interface Definition Language) file '%s.idl'.
+""" % (base, name, email, base, deb, base, base))
+
+ create_file("debian/changelog",
+ """wireshark-giop-%s (0.0.1-1) unstable; urgency=low
+
+ * Automatically created package.
+
+ -- %s <%s> %s
+""" % (base, name, email, rfc + "\n (" + iso + ")"))
+
+ create_file("debian/copyright",
+ """This package has been created automatically by idl2deb on
+%s for Debian GNU/Linux.
+
+Wireshark: http://www.wireshark.org/
+
+Copyright:
+
+GPL, as evidenced by existence of GPL license file \"COPYING\".
+(the GNU GPL may be viewed on Debian systems in
+/usr/share/common-licenses/GPL)
+""" % (iso))
+
+def get_wrs_version():
+ """Detect version of wireshark-dev package."""
+ deb = os.popen(
+ "dpkg-query -W --showformat='${Version}' wireshark-dev").read()
+ debv = string.find(deb, "-")
+ if debv == -1: debv = len(deb)
+ version = deb[string.find(deb, ":")+1:debv]
+ return version, deb
+
+def get_time():
+ """Detect current time and return ISO and RFC time string."""
+ currenttime = time.gmtime()
+ return time.strftime("%Y-%m-%d %H:%M:%S +0000", currenttime), \
+ time.strftime("%a, %d %b %Y %H:%M:%S +0000", currenttime)
+
+def main():
+ global options
+ process_opts(sys.argv)
+ iso, rfc = get_time()
+ version, deb = get_wrs_version()
+ create_files(version, deb,
+ options['email'], options['idl'], options['name'],
+ iso, rfc)
+ bootstrap()
+ os.system("dpkg-buildpackage " + options['dbopts'])
+
+def process_opts(argv):
+ """Process command line options."""
+ global options
+ try:
+ opts, args = getopt.getopt(argv[1:], "d:e:hi:n:pv",
+ ["dbopts=",
+ "email=",
+ "help",
+ "idl=",
+ "name=",
+ "preserve",
+ "version"])
+ except getopt.GetoptError:
+ usage(argv[0])
+ sys.exit(1)
+ for o, a in opts:
+ if o in ("-d", "--dbopts"):
+ options['dbopts'] = a
+ if o in ("-e", "--email"):
+ options['email'] = a
+ if o in ("-h", "--help"):
+ options['help'] = 1
+ if o in ("-i", "--idl"):
+ options['idl'] = a
+ if o in ("-n", "--name"):
+ options['name'] = a
+ if o in ("-p", "--preserve"):
+ options['preserve'] = 1
+ if o in ("-v", "--version"):
+ options['version'] = 1
+ if options['help']:
+ usage(argv[0])
+ sys.exit(0)
+ if options['version']:
+ print scriptinfo
+ sys.exit(0)
+ if not options['idl']:
+ print "mandatory IDL file parameter missing"
+ sys.exit(1)
+ if not os.access(options['idl'], os.R_OK):
+ print "IDL file not accessible"
+ sys.exit(1)
+
+def usage(name):
+ """Print usage help."""
+ print "Usage: " + name + " <parameters>\n" + \
+ "Parameters are\n" + \
+ " --dbopts -d opts, options for dpkg-buildpackage\n" + \
+ " --email -e address, use e-mail address\n" + \
+ " --idl -i idlfile, IDL file to use (mandatory)\n" + \
+ " --help -h, print help and exit\n" + \
+ " --name -n name, use user name\n" + \
+ " --preserve -p, do not overwrite files\n" + \
+ " --version -v, print version and exit\n" + \
+ "Example:\n" + \
+ name + " -e me@foo.net -i bar.idl -n \"My Name\" " + \
+ "-d \"-rfakeroot -uc -us\""
+if __name__ == '__main__':
+ main()
diff -urNad --exclude=CVS --exclude=.svn ./idl2deb.dbk /tmp/dpep-work.K2bQz4/wireshark-0.10.11/idl2deb.dbk
--- ./idl2deb.dbk 1970-01-01 01:00:00.000000000 +0100
+++ /tmp/dpep-work.K2bQz4/wireshark-0.10.11/idl2deb.dbk 2005-07-17 19:35:08.000000000 +0200
@@ -0,0 +1,157 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+ <!ENTITY command "<command>idl2deb</command>">
+ <!ENTITY email "<email>debacle@debian.org</email>">
+ <!ENTITY author "W. Borgert">
+ <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
+]>
+
+<refentry>
+ <refentryinfo>
+ <address>
+ &email;
+ </address>
+ <author>
+ <firstname>W.</firstname>
+ <surname>Borgert</surname>
+ </author>
+ <copyright>
+ <year>2003</year>
+ <year>2005</year>
+ <holder>&author;</holder>
+ </copyright>
+ <date>2003-08-17</date>
+ <keywordset>
+ <keyword>CORBA</keyword>
+ <keyword>IDL</keyword>
+ <keyword>Wireshark</keyword>
+ </keywordset>
+ <revhistory>
+ <revision>
+ <revnumber>2003-08-17</revnumber>
+ <date>2003-08-17</date>
+ <authorinitials>debacle</authorinitials>
+ <revremark>First version.</revremark>
+ </revision>
+ </revhistory>
+ </refentryinfo>
+ <refmeta>
+ <refentrytitle>idl2deb</refentrytitle>
+
+ <manvolnum>1</manvolnum>
+ </refmeta>
+ <refnamediv>
+ <refname>idl2deb</refname>
+
+ <refpurpose>create a Debian package for CORBA monitoring from IDL</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ &command;
+ <arg><option>-d <replaceable>opts</replaceable></option></arg>
+ <arg><option>--dbopts=<replaceable>opts</replaceable></option></arg>
+ <arg><option>-e <replaceable>address</replaceable></option></arg>
+ <arg><option>--email=<replaceable>address</replaceable></option></arg>
+ <arg>-i <replaceable>idlfile</replaceable></arg>
+ <arg>--idl=<replaceable>idlfile</replaceable></arg>
+ <arg><option>-h</option></arg>
+ <arg><option>--help</option></arg>
+ <arg><option>-n <replaceable>name</replaceable></option></arg>
+ <arg><option>--name=<replaceable>name</replaceable></option></arg>
+ <arg><option>-p</option></arg>
+ <arg><option>--preserve</option></arg>
+ <arg><option>-v</option></arg>
+ <arg><option>--version</option></arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+ <refsect1>
+ <title>Description</title>
+
+ <para>This manual page documents briefly the
+ <command>idl2deb</command> command.</para>
+
+ <para>&command; takes an CORBA IDL file as input and creates a
+ Debian package from it. The package contains a loadable module
+ for the wireshark network analyser.</para>
+ </refsect1>
+ <refsect1>
+ <title>Options</title>
+
+ <variablelist>
+ <varlistentry>
+ <term><option>-d <replaceable>opts</replaceable></option>
+ <option>--dbopts=<replaceable>opts</replaceable></option></term>
+ <listitem>
+ <para>options for dpkg-buildpackage.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-e <replaceable>address</replaceable></option>
+ <option>--email=<replaceable>address</replaceable></option></term>
+ <listitem>
+ <para>use e-mail address.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-i <replaceable>idlfile</replaceable></option>
+ <option>--idl=<replaceable>idlfile</replaceable></option></term>
+ <listitem>
+ <para>IDL file to use (mandatory).</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-h</option>
+ <option>--help</option>
+ </term>
+ <listitem>
+ <para>print help and exit.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-n <replaceable>name</replaceable></option>
+ <option>--name=<replaceable>name</replaceable></option></term>
+ <listitem>
+ <para>use user name.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-p</option>
+ <option>--preserve</option></term>
+ <listitem>
+ <para>do not overwrite files.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-v</option>
+ <option>--version</option></term>
+ <listitem>
+ <para>print version and exit.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <para>Example:</para>
+
+ <programlisting>/usr/bin/idl2deb -e me@foo.net -i bar.idl \
+-n &quot;My Name&quot; -d &quot;-rfakeroot -uc -us&quot;</programlisting>
+
+ </refsect1>
+ <refsect1>
+ <title>See Also</title>
+
+ <para>A lot of tools are used, which you have to
+ <command>apt-get install</command>: wireshark-dev, python,
+ cdbs, autotools-dev, debhelper, dpkg-dev.</para>
+ </refsect1>
+
+ <refsect1>
+ <title>Copying</title>
+
+ <para>This manual page was written by &author; &email; for
+ &debian; (but may be used by others). Permission is granted to
+ copy, distribute and/or modify this document under the terms of
+ the GNU General Public License, Version 2 or any later
+ version published by the Free Software Foundation.</para>
+ </refsect1>
+</refentry>

392
debian/patches/02_asn2deb.dpatch vendored
View File

@ -1,392 +0,0 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 02_asn2deb.dpatch by <fpeters@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: asn2deb - create Debian packages from ASN.1 files
@DPATCH@
diff -urNad --exclude=CVS --exclude=.svn ./asn2deb /tmp/dpep-work.5BSR7A/wireshark-0.10.11/asn2deb
--- ./asn2deb 1970-01-01 01:00:00.000000000 +0100
+++ /tmp/dpep-work.5BSR7A/wireshark-0.10.11/asn2deb 2005-07-17 19:37:02.000000000 +0200
@@ -0,0 +1,219 @@
+#!/usr/bin/env python
+
+# asn2deb - quick hack by W. Borgert <debacle@debian.org> to create
+# Debian GNU/Linux packages from ASN.1 files for Wireshark.
+# Copyright 2004, W. Borgert
+
+# ASN.1 module for Wireshark, use of snacc type table:
+# Copyright 2003, Matthijs Melchior <matthijs.melchior@xs4all.nl>
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.com>
+# Copyright 1998 Gerald Combs
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+import getopt, os, string, sys, time
+
+scriptinfo = """asn2deb version 2004-02-17
+Copyright 2004, W. Borgert
+Free software, released under the terms of the GPL."""
+
+options = {'asn': None,
+ 'dbopts': "",
+ 'email': "invalid@invalid.invalid",
+ 'help': 0,
+ 'name': "No Name",
+ 'preserve': 0,
+ 'version': 0}
+
+def bootstrap():
+ """Generate Makefile.in and configure script."""
+ os.system("aclocal-1.7")
+ os.system("autoconf")
+ os.system("automake-1.7 --add-missing --copy --foreign")
+
+def create_file(filename, content, mode = None):
+ """Create a file with given content."""
+ global options
+ if options['preserve'] and os.path.isfile(filename):
+ return
+ f = open(filename, 'w')
+ f.write(content)
+ f.close()
+ if mode:
+ os.chmod(filename, mode)
+
+def create_files(version, deb, email, asn, name, iso, rfc):
+ """Create all files for the .deb build process."""
+ base = asn.lower()[:-5]
+ create_file("Makefile.am", """#
+
+BUILT_SOURCES = %s.tt
+asn1ttdir = $(datadir)/wireshark/asn1
+asn1tt_DATA = %s.tt
+
+%s.tt: """ % ((base,) * 3) + asn + """
+ snacc -u /usr/include/snacc/asn1/asn-useful.asn1 -T $@ $<
+""")
+
+ create_file("configure.ac", """AC_INIT(%s, 1.0)
+AM_INIT_AUTOMAKE
+AM_MAINTAINER_MODE
+AC_PROG_INSTALL
+SNACC=\"`type -p snacc`\"
+AC_SUBST(SNACC)
+dnl WIRESHARK_VERSION=\"%s\"
+dnl plugindir=\"$prefix/share/wireshark/asn.1\"
+dnl AC_SUBST(plugindir)
+AC_OUTPUT([Makefile])
+""" % (base, version))
+
+ if not os.path.isdir("debian"):
+ os.mkdir("debian")
+
+ create_file("debian/rules", """#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
+PREFIX=`pwd`/debian/wireshark-asn1-%s
+
+binary-post-install/wireshark-asn1-%s::
+ rm -f $(PREFIX)/usr/lib/wireshark/plugins/%s/*.a
+""" % (base, base, version), 0755)
+
+ create_file("debian/control", """Source: wireshark-asn1-%s
+Section: net
+Priority: optional
+Maintainer: %s <%s>
+Standards-Version: 3.6.1.0
+Build-Depends: snacc, autotools-dev, debhelper, cdbs
+
+Package: wireshark-asn1-%s
+Architecture: all
+Depends: wireshark (= %s)
+Description: ASN.1/BER dissector for %s
+ This package provides a type table for decoding BER (Basic Encoding
+ Rules) data over TCP or UDP, described by an ASN.1 (Abstract Syntax
+ Notation 1) file '%s.asn1'.
+""" % (base, name, email, base, deb, base, base))
+
+ create_file("debian/changelog",
+ """wireshark-asn1-%s (0.0.1-1) unstable; urgency=low
+
+ * Automatically created package.
+
+ -- %s <%s> %s
+""" % (base, name, email, rfc + "\n (" + iso + ")"))
+
+ create_file("debian/copyright",
+ """This package has been created automatically be asn2deb on
+%s for Debian GNU/Linux.
+
+Wireshark: http://www.wireshark.com/
+
+Copyright:
+
+GPL, as evidenced by existence of GPL license file \"COPYING\".
+(the GNU GPL may be viewed on Debian systems in
+/usr/share/common-licenses/GPL)
+""" % (iso))
+
+def get_wrs_version():
+ """Detect version of wireshark-dev package."""
+ deb = os.popen(
+ "dpkg-query -W --showformat='${Version}' wireshark-dev").read()
+ debv = string.find(deb, "-")
+ if debv == -1: debv = len(deb)
+ version = deb[string.find(deb, ":")+1:debv]
+ return version, deb
+
+def get_time():
+ """Detect current time and return ISO and RFC time string."""
+ currenttime = time.gmtime()
+ return time.strftime("%Y-%m-%d %H:%M:%S +0000", currenttime), \
+ time.strftime("%a, %d %b %Y %H:%M:%S +0000", currenttime)
+
+def main():
+ global options
+ process_opts(sys.argv)
+ iso, rfc = get_time()
+ version, deb = get_wrs_version()
+ create_files(version, deb,
+ options['email'], options['asn'], options['name'],
+ iso, rfc)
+ bootstrap()
+ os.system("dpkg-buildpackage " + options['dbopts'])
+
+def process_opts(argv):
+ """Process command line options."""
+ global options
+ try:
+ opts, args = getopt.getopt(argv[1:], "a:d:e:hn:pv",
+ ["asn=",
+ "dbopts=",
+ "email=",
+ "help",
+ "name=",
+ "preserve",
+ "version"])
+ except getopt.GetoptError:
+ usage(argv[0])
+ sys.exit(1)
+ for o, a in opts:
+ if o in ("-a", "--asn"):
+ options['asn'] = a
+ if o in ("-d", "--dbopts"):
+ options['dbopts'] = a
+ if o in ("-e", "--email"):
+ options['email'] = a
+ if o in ("-h", "--help"):
+ options['help'] = 1
+ if o in ("-n", "--name"):
+ options['name'] = a
+ if o in ("-p", "--preserve"):
+ options['preserve'] = 1
+ if o in ("-v", "--version"):
+ options['version'] = 1
+ if options['help']:
+ usage(argv[0])
+ sys.exit(0)
+ if options['version']:
+ print scriptinfo
+ sys.exit(0)
+ if not options['asn']:
+ print "mandatory ASN.1 file parameter missing"
+ sys.exit(1)
+ if not os.access(options['asn'], os.R_OK):
+ print "ASN.1 file not accessible"
+ sys.exit(1)
+
+def usage(name):
+ """Print usage help."""
+ print "Usage: " + name + " <parameters>\n" + \
+ "Parameters are\n" + \
+ " --asn -a asn1file, ASN.1 file to use (mandatory)\n" + \
+ " --dbopts -d opts, options for dpkg-buildpackage\n" + \
+ " --email -e address, use e-mail address\n" + \
+ " --help -h, print help and exit\n" + \
+ " --name -n name, use user name\n" + \
+ " --preserve -p, do not overwrite files\n" + \
+ " --version -v, print version and exit\n" + \
+ "Example:\n" + \
+ name + " -e me@foo.net -a bar.asn1 -n \"My Name\" " + \
+ "-d \"-rfakeroot -uc -us\""
+if __name__ == '__main__':
+ main()
diff -urNad --exclude=CVS --exclude=.svn ./asn2deb.dbk /tmp/dpep-work.5BSR7A/wireshark-0.10.11/asn2deb.dbk
--- ./asn2deb.dbk 1970-01-01 01:00:00.000000000 +0100
+++ /tmp/dpep-work.5BSR7A/wireshark-0.10.11/asn2deb.dbk 2005-07-17 19:37:02.000000000 +0200
@@ -0,0 +1,158 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+ <!ENTITY command "<command>asn2deb</command>">
+ <!ENTITY email "<email>debacle@debian.org</email>">
+ <!ENTITY author "W. Borgert">
+ <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
+]>
+
+<refentry>
+ <refentryinfo>
+ <address>
+ &email;
+ </address>
+ <author>
+ <firstname>W.</firstname>
+ <surname>Borgert</surname>
+ </author>
+ <copyright>
+ <year>2003</year>
+ <year>2005</year>
+ <holder>&author;</holder>
+ </copyright>
+ <date>2004-02-18</date>
+ <keywordset>
+ <keyword>ASN.1</keyword>
+ <keyword>BER</keyword>
+ <keyword>Wireshark</keyword>
+ </keywordset>
+ <revhistory>
+ <revision>
+ <revnumber>1</revnumber>
+ <date>2004-02-18</date>
+ <authorinitials>debacle</authorinitials>
+ <revremark>First version.</revremark>
+ </revision>
+ </revhistory>
+ </refentryinfo>
+ <refmeta>
+ <refentrytitle>asn2deb</refentrytitle>
+
+ <manvolnum>1</manvolnum>
+ </refmeta>
+ <refnamediv>
+ <refname>asn2deb</refname>
+
+ <refpurpose>create a Debian package for BER monitoring from ASN.1</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ &command;
+ <arg>-a <replaceable>ASN.1 file</replaceable></arg>
+ <arg>--asn=<replaceable>ASN.1 file</replaceable></arg>
+ <arg><option>-d <replaceable>opts</replaceable></option></arg>
+ <arg><option>--dbopts=<replaceable>opts</replaceable></option></arg>
+ <arg><option>-e <replaceable>address</replaceable></option></arg>
+ <arg><option>--email=<replaceable>address</replaceable></option></arg>
+ <arg><option>-h</option></arg>
+ <arg><option>--help</option></arg>
+ <arg><option>-n <replaceable>name</replaceable></option></arg>
+ <arg><option>--name=<replaceable>name</replaceable></option></arg>
+ <arg><option>-p</option></arg>
+ <arg><option>--preserve</option></arg>
+ <arg><option>-v</option></arg>
+ <arg><option>--version</option></arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+ <refsect1>
+ <title>Description</title>
+
+ <para>This manual page documents briefly the
+ <command>asn2deb</command> command.</para>
+
+ <para>&command; takes an ASN.1 file as input and creates a Debian
+ package from it. The package contains a loadable type table file
+ for the wireshark network analyser. The type table is generated by
+ the ASN.1 compiler <command>snacc</command>.</para>
+ </refsect1>
+ <refsect1>
+ <title>Options</title>
+
+ <variablelist>
+ <varlistentry>
+ <term><option>-a <replaceable>ASN.1 file</replaceable></option>
+ <option>--asn=<replaceable>ASN.1 file</replaceable></option></term>
+ <listitem>
+ <para>ASN.1 file to use (mandatory).</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-d <replaceable>opts</replaceable></option>
+ <option>--dbopts=<replaceable>opts</replaceable></option></term>
+ <listitem>
+ <para>options for dpkg-buildpackage.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-e <replaceable>address</replaceable></option>
+ <option>--email=<replaceable>address</replaceable></option></term>
+ <listitem>
+ <para>use e-mail address.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-h</option>
+ <option>--help</option>
+ </term>
+ <listitem>
+ <para>print help and exit.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-n <replaceable>name</replaceable></option>
+ <option>--name=<replaceable>name</replaceable></option></term>
+ <listitem>
+ <para>use user name.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-p</option>
+ <option>--preserve</option></term>
+ <listitem>
+ <para>do not overwrite files.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-v</option>
+ <option>--version</option></term>
+ <listitem>
+ <para>print version and exit.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <para>Example:</para>
+
+ <programlisting>/usr/bin/asn2deb -e me@foo.net -a bar.asn1 \
+-n &quot;My Name&quot; -d &quot;-rfakeroot -uc -us&quot;</programlisting>
+
+ </refsect1>
+ <refsect1>
+ <title>See Also</title>
+
+ <para>A lot of tools are used, which you have to
+ <command>apt-get install</command>: wireshark-dev, python,
+ cdbs, autotools-dev, debhelper, dpkg-dev, snacc.</para>
+ </refsect1>
+
+ <refsect1>
+ <title>Copying</title>
+
+ <para>This manual page was written by &author; &email; for
+ &debian; (but may be used by others). Permission is granted to
+ copy, distribute and/or modify this document under the terms of
+ the GNU General Public License, Version 2 or any later
+ version published by the Free Software Foundation.</para>
+ </refsect1>
+</refentry>

33
debian/patches/03_preferences.dpatch vendored
View File

@ -1,26 +1,19 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 03_preferences.dpatch by <fred@candle>
## 03_preferences.dpatch by <fpeters@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: use Debian sensible-browser
@DPATCH@
diff -urNad wireshark-0.10.13~/configure.in wireshark-0.10.13/configure.in
--- wireshark-0.10.13~/configure.in 2005-12-08 12:47:00.000000000 +0100
+++ wireshark-0.10.13/configure.in 2005-12-08 12:53:33.000000000 +0100
@@ -38,12 +38,12 @@
#
AC_MSG_ERROR(I couldn't find pod2html; make sure it's installed and in your path)
fi
-AC_PATH_PROG(HTML_VIEWER, htmlview)
+AC_PATH_PROG(HTML_VIEWER, sensible-browser)
if test "x$HTML_VIEWER" = x
then
- AC_DEFINE_UNQUOTED(HTML_VIEWER, "mozilla", [HTML viewer, e.g. mozilla])
+ AC_DEFINE_UNQUOTED(HTML_VIEWER, "sensible-browser", [HTML viewer, e.g. sensible-browser])
else
- AC_DEFINE_UNQUOTED(HTML_VIEWER, "htmlview", [HTML viewer, e.g. mozilla])
+ AC_DEFINE_UNQUOTED(HTML_VIEWER, "sensible-browser", [HTML viewer, e.g. mozilla])
fi
AC_PATH_PROG(LEX, flex)
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;

170
debian/patches/04_drop-capabilities.dpatch vendored
View File

@ -1,170 +0,0 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 04_drop-capabilities.dpatch by <fpeters@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Drop all capabilities but CAP_NET_RAW
@DPATCH@
diff -urNad wireshark-0.99.4/configure.in /tmp/dpep.4XA51P/wireshark-0.99.4/configure.in
--- wireshark-0.99.4/configure.in 2006-11-01 10:29:08.241544023 +0100
+++ /tmp/dpep.4XA51P/wireshark-0.99.4/configure.in 2006-11-01 10:29:56.756554526 +0100
@@ -869,6 +869,47 @@
fi
+dnl libcap check
+AC_MSG_CHECKING(whether to use libcap to improve security)
+
+AC_ARG_WITH(cap,
+[ --with-cap[[=DIR]] use libcap (located in directory DIR, if supplied) to improve security. [[default=yes, if available]]],
+[
+ if test $withval = no
+ then
+ want_cap=no
+ elif test $withval = yes
+ then
+ want_cap=yes
+ else
+ want_cap=yes
+ cap_dir=$withval
+ fi
+],[
+ #
+ # Use libcap if it's present, otherwise don't.
+ #
+ want_cap=ifavailable
+ cap_dir=
+])
+if test "x$want_cap" = "xno" ; then
+ AC_MSG_RESULT(no)
+ cap_message="no (disabled by explicit request)"
+else
+ AC_MSG_RESULT(yes)
+ AC_CHECK_LIB(cap, cap_init, [
+ AC_DEFINE(HAVE_LIBCAP, 1, [
+ Define if libcap is available to restrict process capabilities
+ ])
+ LIBS="$LIBS -lcap"
+ cap_message="yes"
+ ], [
+ AC_MSG_WARN([libcap check failed])
+ cap_message="no (check failed)"
+ ])
+fi
+
+
dnl Check if wireshark should be installed setuid
AC_ARG_ENABLE(setuid-install,
[ --enable-setuid-install install wireshark as setuid. DANGEROUS!!! [default=no]],enable_setuid_install=$enableval,enable_setuid_install=no)
@@ -1480,3 +1521,4 @@
echo " Use IPv6 name resolution : $enable_ipv6"
echo " Use UCD SNMP/Net-SNMP library : $snmp_libs_message"
echo " Use gnutls library : $tls_message"
+echo " Use cap library : $cap_message"
diff -urNad wireshark-0.99.4/gtk/main.c /tmp/dpep.4XA51P/wireshark-0.99.4/gtk/main.c
--- wireshark-0.99.4/gtk/main.c 2006-11-01 10:28:14.113375310 +0100
+++ /tmp/dpep.4XA51P/wireshark-0.99.4/gtk/main.c 2006-11-01 10:29:11.095132827 +0100
@@ -1775,6 +1775,9 @@
{
gchar *capture_msg;
+#ifdef HAVE_LIBCAP
+ dropexcesscapabilities();
+#endif
gtk_statusbar_pop(GTK_STATUSBAR(packets_bar), packets_ctx);
diff -urNad wireshark-0.99.4/tshark.c /tmp/dpep.4XA51P/wireshark-0.99.4/tshark.c
--- wireshark-0.99.4/tshark.c 2006-11-01 10:28:14.115375722 +0100
+++ /tmp/dpep.4XA51P/wireshark-0.99.4/tshark.c 2006-11-01 10:29:11.097133240 +0100
@@ -751,6 +751,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.4/util.c /tmp/dpep.4XA51P/wireshark-0.99.4/util.c
--- wireshark-0.99.4/util.c 2006-11-01 10:28:14.116375929 +0100
+++ /tmp/dpep.4XA51P/wireshark-0.99.4/util.c 2006-11-01 10:29:11.098133446 +0100
@@ -40,6 +40,10 @@
#include <epan/address.h>
#include <epan/addr_resolv.h>
+#ifdef HAVE_LIBCAP
+#include <sys/capability.h>
+#endif
+
#include "util.h"
/*
@@ -192,3 +196,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, &current_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.4/util.h /tmp/dpep.4XA51P/wireshark-0.99.4/util.h
--- wireshark-0.99.4/util.h 2006-11-01 10:28:14.116375929 +0100
+++ /tmp/dpep.4XA51P/wireshark-0.99.4/util.h 2006-11-01 10:29:11.098133446 +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 */

28
debian/patches/05_plugin-libdir.dpatch vendored
View File

@ -1,28 +0,0 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 05_plugin-libdir.dpatch by <fpeters@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
diff -urNad --exclude=CVS --exclude=.svn ./configure.in /tmp/dpep-work.avwGQ1/wireshark-0.10.11/configure.in
--- ./configure.in 2005-05-02 23:28:53.000000000 +0200
+++ /tmp/dpep-work.avwGQ1/wireshark-0.10.11/configure.in 2005-07-17 18:46:26.000000000 +0200
@@ -1130,7 +1130,7 @@
dnl check whether plugins should be enabled and, if they should be,
dnl check for plugins directory - stolen from Amanda's configure.in
dnl
-plugindir="$libdir/wireshark/plugins/$VERSION"
+plugindir="$libdir/plugins/$VERSION"
AC_ARG_WITH(plugins,
[ --with-plugins[[=DIR]] support plugins (installed in DIR, if supplied).],
[
@@ -1172,7 +1172,7 @@
#
# The plugin dissectors reside in ./plugins/PROTO/
#
-PLUGIN_LIBS="-L../../epan -lwireshark $GLIB_LIBS"
+PLUGIN_LIBS="-L../../epan $GLIB_LIBS"
AC_SUBST(PLUGIN_LIBS)
dnl libtool defs

19
debian/patches/06_giop-buffer.dpatch vendored
View File

@ -1,19 +0,0 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 06_giop-buffer.dpatch by <fpeters@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
diff -urNad --exclude=CVS --exclude=.svn ./epan/dissectors/packet-giop.c /tmp/dpep-work.7N90PO/wireshark-0.10.11/epan/dissectors/packet-giop.c
--- ./epan/dissectors/packet-giop.c 2005-07-17 18:52:08.000000000 +0200
+++ /tmp/dpep-work.7N90PO/wireshark-0.10.11/epan/dissectors/packet-giop.c 2005-07-17 18:55:32.000000000 +0200
@@ -1760,6 +1760,8 @@
if (len == 0)
return FALSE;
+ if (*offset > header->message_size)
+ return FALSE;
saved_proto = pinfo->current_proto;
for (i=0; i<len; i++) {

20
debian/patches/07_gcc4.dpatch vendored
View File

@ -1,20 +0,0 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 07_gcc4.dpatch by <fpeters@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
diff -urNad --exclude=CVS --exclude=.svn ./epan/dissectors/packet-cmip.c /tmp/dpep-work.5KBC28/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_) {

24
debian/patches/08_wireshark-desktop-menu.dpatch vendored
View File

@ -1,24 +0,0 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 08_wireshark-desktop-menu.dpatch by <fred@candle>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
diff -urNad wireshark-0.99.4/wireshark.desktop /tmp/dpep.1jXNTW/wireshark-0.99.4/wireshark.desktop
--- wireshark-0.99.4/wireshark.desktop 2006-11-01 10:31:40.011860048 +0100
+++ /tmp/dpep.1jXNTW/wireshark-0.99.4/wireshark.desktop 2006-11-01 10:32:13.727816940 +0100
@@ -68,11 +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
Path=
Terminal=false
MimeType=
-Categories=Application;GTK;Network;X-Red-Hat-Extra;
+Categories=GNOME;Application;Network;
X-KDE-SubstituteUID=true

51
debian/patches/09_idl2wrs.dpatch vendored
View File

@ -1,51 +0,0 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 09_idl2wrs.dpatch by <fpeters@debian.org>
##
## 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
-
-
-

19
debian/patches/10_wireshark_gen.dpatch vendored
View File

@ -1,19 +0,0 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 10_wireshark_gen.dpatch by <fpeters@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
diff -urNad --exclude=CVS --exclude=.svn ./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 <glib.h>
#include <epan/packet.h>
#include <epan/proto.h>
#include <epan/dissectors/packet-giop.h>
+#include <plugins/plugin_api_defs.h>
#ifndef ENABLE_STATIC
G_MODULE_EXPORT const gchar version[] = "0.0.1";

4
debian/prerm vendored
View File

@ -1,4 +0,0 @@
#! /bin/sh
#DEBHELPER#

91
debian/rules vendored
View File

@ -13,21 +13,16 @@ 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.3
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 CFLAGS="$(CFLAGS)";
CONFIGURE_FLAGS=--prefix=/usr --sysconfdir=/usr/share --datadir=/usr/share --libdir=/usr/lib/wireshark --disable-static --enable-gtk2 --enable-warnings-as-errors=no --enable-setuid-install --with-plugins=/usr/lib/wireshark/plugins --with-lua=/usr/
configure: configure-stamp
configure-stamp: patch
@ -35,18 +30,13 @@ configure-stamp: patch
cp /usr/share/misc/config.guess /usr/share/misc/config.sub .
libtoolize --force --copy
autoheader
autoconf
-mkdir aclocal-missing
(if [ ! -x ./configure ]; then \
./autogen.sh $(CONFIGURE_FLAGS) CFLAGS="$(CFLAGS)"; \
fi)
./configure $(CONFIGURE_FLAGS) CFLAGS="$(CFLAGS)"
./autogen.sh
CFLAGS="$(CFLAGS)" ./configure $(CONFIGURE_FLAGS)
touch configure-stamp
build: build-stamp idl2deb.1 asn2deb.1
build: build-stamp
build-stamp: configure-stamp
$(MAKE)
@ -63,7 +53,7 @@ clean: unpatch-stamp
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 rdps wireshark.1 tshark.1 wireshark-filter.4
rm -f conftest conftest.c
rm -f config.guess config.sub config.log
rm -f config.h.in config.h configure
@ -75,59 +65,64 @@ unpatch-stamp:
dpatch deapply-all
rm -rf patch-stamp debian/patched
# Build architecture-independent files here.
binary-indep: build
# We have nothing to do by default.
# Build architecture-dependent files here.
binary-arch: build
install: build
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
# Add here commands to install the files into debian/tmp
$(MAKE) install DESTDIR=`pwd`/debian/tmp
mkdir -p `pwd`/debian/tmp/usr/share/applications/
cp wireshark.desktop `pwd`/debian/tmp/usr/share/applications/
cp tools/idl2wrs.sh `pwd`/debian/tmp/usr/bin/
cp debian/wireshark-root.desktop `pwd`/debian/tmp/usr/share/applications/
mkdir -p `pwd`/debian/tmp/usr/share/pixmaps/
cp image/hi48-app-wireshark.png `pwd`/debian/tmp/usr/share/pixmaps/
cp image/wsicon32.xpm `pwd`/debian/tmp/usr/share/pixmaps/
mkdir -p `pwd`/debian/tmp/usr/lib/$(PYTHON_VERSION)/site-packages/
install -m 755 `pwd`/idl2deb `pwd`/debian/tmp/usr/bin/
install -m 755 `pwd`/asn2deb `pwd`/debian/tmp/usr/bin/
cp `pwd`/tools/wireshark_be.py `pwd`/tools/wireshark_gen.py \
`pwd`/debian/tmp/usr/lib/$(PYTHON_VERSION)/site-packages/
mkdir -p `pwd`/debian/tmp/usr/include/wireshark/
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
mkdir -p $(CURDIR)/debian/tmp/usr/share/applications/
cp debian/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/etc/wireshark/
mv $(CURDIR)/debian/tmp/usr/share/wireshark/init.lua \
$(CURDIR)/debian/tmp/etc/wireshark/
ln -s /etc/wireshark/init.lua \
$(CURDIR)/debian/tmp/usr/share/wireshark/init.lua
mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(PYTHON_VERSION)/site-packages/
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 `pwd`/debian/tmp/usr/include/wireshark; \
cp --parents $$F $(CURDIR)/debian/tmp/usr/include/wireshark; \
done
# .a is no longer built; why was is used ?
#cp `pwd`/wiretap/libwiretap.a `pwd`/debian/tmp/usr/lib/
-rm -rf `pwd`/debian/tmp/usr/man
-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_fixperms -Xdumpcap
dh_installdeb
dh_shlibdeps
LD_LIBRARY_PATH=/usr/lib/wireshark/ dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
source diff:
source diff:
@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary
.PHONY: build clean install check binary-indep binary-arch binary

2
debian/tshark.manpages vendored
View File

@ -1 +1 @@
tshark.1
tshark.1

4
debian/wireshark-common.files vendored
View File

@ -3,9 +3,11 @@
/usr/bin/editcap
/usr/bin/mergecap
/usr/bin/text2pcap
/usr/bin/rawshark
/usr/lib/wireshark/libwireshark.so.0
/usr/lib/wireshark/libwireshark.so.0.0.1
/usr/lib/wireshark/libwiretap.so.0
/usr/lib/wireshark/libwiretap.so.0.0.1
/usr/lib/wireshark/plugins/*
/usr/share/wireshark/*
/usr/share/wireshark/*
/etc/wireshark/init.lua

4
debian/wireshark-common.manpages vendored
View File

@ -1,5 +1,7 @@
dumpcap.1
editcap.1
mergecap.1
text2pcap.1
wireshark-filter.4
capinfos.1
capinfos.1
rawshark.1

2
debian/wireshark-common.shlibs vendored Normal file
View File

@ -0,0 +1,2 @@
libwireshark 0 wireshark-common
libwiretap 0 wireshark-common

11
debian/wireshark-dev.docs vendored
View File

@ -1,5 +1,14 @@
doc/README.binarytrees
doc/README.capture
doc/README.design
doc/README.developer
doc/README.display_filter
doc/README.idl2wrs
doc/README.malloc
doc/README.packaging
doc/README.plugins
doc/README.xml-output
doc/README.regression
doc/README.request_response_tracking
doc/README.stats_tree
doc/README.tapping
doc/README.xml-output

2
debian/wireshark-dev.files vendored
View File

@ -1,6 +1,4 @@
/usr/bin/idl2wrs
/usr/bin/idl2deb
/usr/bin/asn2deb
/usr/lib/wireshark/libwireshark.so
/usr/lib/wireshark/libwireshark.la
/usr/lib/wireshark/libwiretap.so

6
debian/wireshark-dev.header-files vendored
View File

@ -1,5 +1,9 @@
color.h
config.h
register.h
epan/*.h
epan/crypt/*.h
epan/dfilter/*.h
epan/dissectors/*.h
wiretap/*.h
epan/ftypes/*.h
wiretap/*.h

2
debian/wireshark-dev.manpages vendored
View File

@ -1,3 +1 @@
idl2wrs.1
idl2deb.1
asn2deb.1

5
debian/wireshark-dev.postinst vendored
View File

@ -1,5 +0,0 @@
#! /bin/sh -e
#DEBHELPER#
exit 0

1
debian/wireshark-dev.prerm vendored
View File

@ -12,3 +12,4 @@ dpkg --listfiles $PACKAGE |
xargs rm -f >&2
#DEBHELPER#

6
debian/wireshark-root.desktop vendored
View File

@ -68,9 +68,11 @@ Comment[fr]=Analyseur de trafic réseau
Comment[fi]=Verkkoliikenne analysaattori
Comment[sv]=Nätverkstrafikanalysator
Icon=hi48-app-wireshark.png
TryExec=gksu
Exec=gksu -u root /usr/bin/wireshark
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

82
debian/wireshark.desktop vendored Normal file
View File

@ -0,0 +1,82 @@
[Desktop Entry]
# $Id$
# The format of this file is specified at
# http://freedesktop.org/Standards/desktop-entry-spec/
# The entries are in the order they are listed in version 0.9.4
Type=Application
Version=1.0
Name=Wireshark
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
Exec=/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=

2
debian/wireshark.files vendored
View File

@ -1,3 +1,3 @@
/usr/bin/wireshark
/usr/share/applications/
/usr/share/pixmaps/
/usr/share/pixmaps/

2
debian/wireshark.manpages vendored
View File

@ -1 +1 @@
wireshark.1
wireshark.1

4
debian/wireshark.menu vendored
View File

@ -1,3 +1,5 @@
?package(wireshark):needs="X11" section="Apps/Net" title="Wireshark" \
?package(wireshark):needs="X11" section="Applications/Network/Monitoring" \
title="Wireshark" \
command="/usr/bin/wireshark" \
icon="/usr/share/pixmaps/wsicon32.xpm"