--- wireshark-0.99.4.orig/Makefile.in
+++ wireshark-0.99.4/Makefile.in
@@ -359,6 +359,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -477,12 +478,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -502,9 +501,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -513,6 +515,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -520,15 +523,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/aclocal.m4
+++ wireshark-0.99.4/aclocal.m4
@@ -13,7 +13,7 @@
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 48 Debian 1.5.22-2 AC_PROG_LIBTOOL
+# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -1397,18 +1397,6 @@
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -1564,7 +1552,7 @@
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -1605,18 +1593,6 @@
   dynamic_linker='NetBSD ld.elf_so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -2322,7 +2298,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu | dragonfly*)
+freebsd* | dragonfly*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
@@ -2376,11 +2352,11 @@
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+netbsd* | netbsdelf*-gnu)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
@@ -3128,7 +3104,7 @@
   freebsd-elf*)
     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
     ;;
-  freebsd* | kfreebsd*-gnu | dragonfly*)
+  freebsd* | dragonfly*)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
@@ -3287,7 +3263,7 @@
     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
     ;;
-  linux*)
+  linux* | k*bsd*-gnu)
     case $cc_basename in
       KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -3389,7 +3365,7 @@
 	;;
     esac
     ;;
-  netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+  netbsd* | netbsdelf*-gnu)
     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
       wlarc=
@@ -4654,7 +4630,7 @@
   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
   ;;
-linux*)
+linux* | k*bsd*-gnu)
   if test "$host_cpu" = ia64; then
     symcode='[[ABCDGIRSTW]]'
     lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
@@ -4927,7 +4903,7 @@
 	    ;;
 	esac
 	;;
-      freebsd* | kfreebsd*-gnu | dragonfly*)
+      freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
@@ -4970,7 +4946,7 @@
 	    ;;
 	esac
 	;;
-      linux*)
+      linux* | k*bsd*-gnu)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -5013,7 +4989,7 @@
 	    ;;
 	esac
 	;;
-      netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+      netbsd* | netbsdelf*-gnu)
 	;;
       osf3* | osf4* | osf5*)
 	case $cc_basename in
@@ -5224,7 +5200,7 @@
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       ;;
 
-    linux*)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       icc* | ecc*)
 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -5365,10 +5341,7 @@
   cygwin* | mingw*)
     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
-  kfreebsd*-gnu)
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-  ;;
-  linux*)
+  linux* | k*bsd*-gnu)
     _LT_AC_TAGVAR(link_all_deplibs, $1)=no
   ;;
   *)
@@ -5541,7 +5514,7 @@
       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux*)
+    linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@@ -5573,7 +5546,7 @@
       fi
       ;;
 
-    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -5909,15 +5882,6 @@
       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
-      
-    # GNU/kFreeBSD uses gcc -shared to do shared libraries.
-    kfreebsd*-gnu)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-      ;;
 
     hpux9*)
       if test "$GCC" = yes; then
@@ -6014,7 +5978,7 @@
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
-    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
--- wireshark-0.99.4.orig/asn1/Makefile.in
+++ wireshark-0.99.4/asn1/Makefile.in
@@ -123,6 +123,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -241,12 +242,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -266,9 +265,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -277,6 +279,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -284,15 +287,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/codecs/Makefile.in
+++ wireshark-0.99.4/codecs/Makefile.in
@@ -143,6 +143,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -261,12 +262,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -286,9 +285,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -297,6 +299,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -304,15 +307,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/debian/changelog
+++ wireshark-0.99.4/debian/changelog
@@ -1,3 +1,145 @@
+wireshark (0.99.4-5.etch.3) stable-security; urgency=high
+
+  * Backport further security fixes:
+  * CVE-2008-4683, CVE-2008-4684, CVE-2008-4685 and a backport of
+    have_postdissector(), which is needed for the fixes	
+  * CVE-2008-3933
+  * CVE-2008-3145
+  * CVE-2008-3141
+  * CVE-2008-3138
+  * CVE-2008-3137
+	
+ -- Moritz Muehlenhoff <jmm@debian.org>  Sat, 29 Nov 2008 10:52:26 +0100
+
+wireshark (0.99.4-5.etch.2) stable-security; urgency=high
+
+  * Backport two further security fixes reported later:
+    CVE-2007-6450, CVE-2007-6451
+
+ -- Moritz Muehlenhoff <jmm@debian.org>  Fri, 28 Dec 2007 17:44:06 +0000
+
+wireshark (0.99.4-5.etch.1) stable-security; urgency=high
+
+  * Backported security fixes from 0.99.7
+
+ -- Moritz Muehlenhoff <jmm@debian.org>  Fri, 23 Nov 2007 20:11:17 +0100
+
+wireshark (0.99.4-5.etch.0) stable-security; urgency=high
+
+  * Backported security fixes from 0.99.6pre1
+    * could crash while reading iSeries capture files (bug 1415)
+    * could loop excessively while reading a malformed SSL packet (bug 1582)
+    * DHCP/BOOTP dissector was susceptible to an off-by-one error (bug 1416)
+    * could loop excessively while reading a malformed MMS packet (bug 1382)
+    * see http://www.wireshark.org/security/wnpa-sec-2007-02.html
+
+ -- Frederic Peters <fpeters@debian.org>  Sat, 23 Jun 2007 12:43:19 +0200
+
+wireshark (0.99.4-5) unstable; urgency=high
+
+  * debian/patches/00list: really include backported security fixes, stupid me.
+
+ -- Frederic Peters <fpeters@debian.org>  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 <fpeters@debian.org>  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 <fpeters@debian.org>  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 <fpeters@debian.org>  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 <fpeters@debian.org>  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 <fpeters@debian.org>  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 <fpeters@debian.org>  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 <fpeters@debian.org>  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 <sesse@debian.org>  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 <fpeters@debian.org>  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 <fpeters@debian.org>  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 <fpeters@debian.org>  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
--- wireshark-0.99.4.orig/debian/control
+++ wireshark-0.99.4/debian/control
@@ -3,15 +3,16 @@
 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 (>= 3.0), libtool, python, automake1.9, autoconf, autotools-dev, libadns1-dev, xsltproc, docbook-xsl (>= 1.64.1.0-0), libpcre3-dev, libcap-dev, bison, libgnutls-dev
+Build-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
 Build-Conflicts: libsnmp4.2-dev, libsnmp-dev
+XS-Python-Version: all
 
 Package: wireshark-common
 Architecture: any
 Depends: ${shlibs:Depends}
 Recommends: wireshark (>= ${Source-Version}) | tshark (>= ${Source-Version})
-Replaces: ethereal-common
-Conflicts: ethereal-common
+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 
@@ -25,8 +26,8 @@
 Architecture: any
 Depends: ${shlibs:Depends}, wireshark-common (= ${Source-Version})
 Recommends: gksu
-Replaces: ethereal
-Conflicts: ethereal
+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 
@@ -38,8 +39,8 @@
 Package: tshark
 Architecture: any
 Depends: ${shlibs:Depends}, wireshark-common (= ${Source-Version})
-Replaces: tethereal
-Conflicts: tethereal
+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 
@@ -52,9 +53,10 @@
 Package: wireshark-dev
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}, omniidl (>> 1:3.0.4.1-10) | omniidl4 (>= 4.0.1-2) , libpcap0.8-dev, libtool, libglib2.0-dev, python, snacc, autotools-dev, debhelper, cdbs, automake1.8, autoconf
-Replaces: ethereal-dev
-Conflicts: ethereal-dev
+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 
@@ -64,3 +66,56 @@
  This package provides idl2wrs and other necessary files to develop
  new packet dissectors.
 
+Package: ethereal-common
+Architecture: any
+Depends: wireshark-common (= ${Source-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 (= ${Source-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 (= ${Source-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 (= ${Source-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-0.99.4.orig/debian/rules
+++ wireshark-0.99.4/debian/rules
@@ -110,6 +110,8 @@
 	dh_installman
 
 	dh_movefiles
+	dh_pysupport
+	dh_python
 	dh_installdocs
 	-rm debian/menu   # from upstream debian/ package
 	dh_installmenu
--- wireshark-0.99.4.orig/debian/wireshark-dev.header-files
+++ wireshark-0.99.4/debian/wireshark-dev.header-files
@@ -0,0 +1,48 @@
+color.h
+config.h
+epan/asn1.h
+epan/address.h
+epan/column_info.h
+epan/column-utils.h
+epan/conversation.h
+epan/crc16.h
+epan/crc32.h
+epan/dfilter/dfilter.h
+epan/dfilter/drange.h
+epan/dissectors/packet-ber.h
+epan/dissectors/packet-giop.h
+epan/dissectors/packet-per.h
+epan/dissectors/packet-rpc.h
+epan/dissectors/packet-tcp.h
+epan/dissectors/packet-tpkt.h
+epan/epan.h
+epan/except.h
+epan/exceptions.h
+epan/filesystem.h
+epan/frame_data.h
+epan/ftypes/ftypes.h
+epan/ipv4.h
+epan/nstime.h
+epan/packet.h
+epan/packet_info.h
+epan/pint.h
+epan/prefs.h
+epan/proto.h
+epan/range.h
+epan/reassemble.h
+epan/report_err.h
+epan/slab.h
+epan/tap.h
+epan/to_str.h
+epan/tvbuff.h
+epan/value_string.h
+epan/xdlc.h
+wiretap/wtap.h
+epan/gnuc_format_check.h
+epan/ipv6-utils.h
+epan/dissectors/format-oid.h
+epan/guid-utils.h
+epan/dissectors/packet-dcerpc.h
+epan/dissectors/packet-dcerpc-nt.h
+epan/dissectors/packet-windows-common.h
+
--- wireshark-0.99.4.orig/debian/ethereal-common.NEWS
+++ wireshark-0.99.4/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 <fpeters@debian.org>  Thu, 12 Oct 2006 15:35:25 +0200
--- wireshark-0.99.4.orig/debian/wireshark-dev.docs
+++ wireshark-0.99.4/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-0.99.4.orig/debian/wireshark-dev.files
+++ wireshark-0.99.4/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-0.99.4.orig/debian/wireshark-dev.manpages
+++ wireshark-0.99.4/debian/wireshark-dev.manpages
@@ -0,0 +1,3 @@
+idl2wrs.1
+idl2deb.1
+asn2deb.1
--- wireshark-0.99.4.orig/debian/wireshark-dev.postinst
+++ wireshark-0.99.4/debian/wireshark-dev.postinst
@@ -0,0 +1,6 @@
+#! /bin/sh -e
+
+#DEBHELPER#
+
+exit 0
+
--- wireshark-0.99.4.orig/debian/wireshark-dev.prerm
+++ wireshark-0.99.4/debian/wireshark-dev.prerm
@@ -0,0 +1,15 @@
+#! /bin/bash -e
+#
+# Debian prerm script for Python x.y hierarchical modules
+# Written by Gregor Hoffleit <flight@debian.org>
+# Extended by Matthias Klose <doko@debian.org>
+#
+
+PACKAGE=`basename $0 | sed -e 's/\.[^.]*$//'`
+
+dpkg --listfiles $PACKAGE |
+	awk '$0~/\.py$/ {print $0"c\n" $0"o"}' |
+	xargs rm -f >&2
+
+#DEBHELPER#
+
--- wireshark-0.99.4.orig/debian/wireshark.files
+++ wireshark-0.99.4/debian/wireshark.files
@@ -0,0 +1,3 @@
+/usr/bin/wireshark
+/usr/share/applications/
+/usr/share/pixmaps/
--- wireshark-0.99.4.orig/debian/wireshark.manpages
+++ wireshark-0.99.4/debian/wireshark.manpages
@@ -0,0 +1 @@
+wireshark.1
--- wireshark-0.99.4.orig/debian/wireshark.menu
+++ wireshark-0.99.4/debian/wireshark.menu
@@ -0,0 +1,4 @@
+?package(wireshark):needs="X11" section="Apps/Net" title="Wireshark" \
+	command="/usr/bin/wireshark" \
+	icon="/usr/share/pixmaps/wsicon32.xpm"
+
--- wireshark-0.99.4.orig/debian/wireshark-root.desktop
+++ wireshark-0.99.4/debian/wireshark-root.desktop
@@ -0,0 +1,84 @@
+[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
+Encoding=UTF-8
+Name=Wireshark (as root)
+GenericName=Network Analyzer
+GenericName[af]=Netwerk Analiseerder
+GenericName[az]=Şəbəkə Analiz Proqramı
+GenericName[bg]=Анализатор на мрежови трафик
+GenericName[bs]=Mrežni analizer
+GenericName[ca]=Analitzador de xarxa
+GenericName[cs]=Analyzátor sítě
+GenericName[da]=Netværksanalyse
+GenericName[de]=Programm für die Netzwerk-Analyse
+GenericName[el]=Αναλυτής Δικτύων
+GenericName[en_GB]=Network Analyser
+GenericName[eo]=Retanalizilo
+GenericName[es]=Analizador de redes
+GenericName[et]=Võrguliikluse analüsaator
+GenericName[eu]=Sare ikerketaria
+GenericName[fa]=تحلیل‌گر شبکه
+GenericName[fi]=Verkkoanalysaattori
+GenericName[fr]=Analyseur réseau
+GenericName[he]=מאבחן רשת
+GenericName[hr]=Program za analiziranje mreža
+GenericName[hu]=hálózatanalizáló
+GenericName[id]=Analisis jaringan
+GenericName[is]=Netskoðunartól
+GenericName[it]=Analizzatore di rete
+GenericName[ja]=ネットワークアナライザ
+GenericName[ko]=네트웍 분석기
+GenericName[lo]=ເຄື່ອງມືວິເຄາະເຄືອຂ່າຍ
+GenericName[lt]=Tinklo analizatorius
+GenericName[lv]=Tīkla Analizators
+GenericName[mk]=Анализатор на мрежи
+GenericName[mn]=Сүлжээ-шинжлэлийн програм
+GenericName[mt]=Analizzatur tan-network
+GenericName[nb]=Nettverksanalyse
+GenericName[nl]=netwerkanalyseprogramma
+GenericName[nn]=Nettverksanalyse
+GenericName[nso]=Moahlaahli wa Kgokagano
+GenericName[pl]=Analizator sieci
+GenericName[pt]=Analisador de Redes
+GenericName[pt_BR]=Analisador de rede
+GenericName[ro]=Analizor de reţea
+GenericName[ru]=Анализатор сетевого трафика
+GenericName[se]=Fierbmeanalysa
+GenericName[sk]=Analyzátor siete
+GenericName[sl]=Analizator omrežij
+GenericName[sr]=Analizatror mreže
+GenericName[ss]=Sihlatiyi seluchungechunge
+GenericName[sv]=Nätverksanalyserare
+GenericName[ta]=Å¨Ä ¬öÅ¡Ç÷
+GenericName[th]=เครื่องมือวิเคราะห์เครือข่าย
+GenericName[tr]=Ağ Analiz Programı
+GenericName[uk]=Аналізатор мережі
+GenericName[ven]=Musengulusi wa Vhukwamani
+GenericName[vi]=Trình phân tích  mạng
+GenericName[xh]=Umcukucezi Womsebenzi womnatha
+GenericName[zh_CN]=网络分析程序
+GenericName[zh_TW]=網路分析程式
+GenericName[zu]=Umhloli Woxhumano olusakazekile
+Comment=Network traffic analyzer
+Comment[fr]=Analyseur de trafic réseau
+Comment[fi]=Verkkoliikenne analysaattori
+Comment[sv]=Nätverkstrafikanalysator
+Icon=hi48-app-wireshark.png
+TryExec=gksu
+Exec=gksu -u root /usr/bin/wireshark
+Path=
+Terminal=false
+MimeType=
+Categories=GNOME;Application;Network;
+# Found in Suse 9.1:
+X-KDE-SubstituteUID=true
+# Deprecated:
+# TerminalOptions=
+# BinaryPattern=wireshark
+# MapNotify=true
+# Protocols=
--- wireshark-0.99.4.orig/debian/tshark.manpages
+++ wireshark-0.99.4/debian/tshark.manpages
@@ -0,0 +1 @@
+tshark.1
--- wireshark-0.99.4.orig/debian/tshark.files
+++ wireshark-0.99.4/debian/tshark.files
@@ -0,0 +1,2 @@
+/usr/bin/tshark
+
--- wireshark-0.99.4.orig/debian/watch
+++ wireshark-0.99.4/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://www.wireshark.org/download/src/all-versions/wireshark-(.*)\.tar\.gz
--- wireshark-0.99.4.orig/debian/patches/00list
+++ wireshark-0.99.4/debian/patches/00list
@@ -0,0 +1,31 @@
+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
+12_secu_0.99.5_r19859
+12_secu_0.99.5_r19899
+12_secu_0.99.5_r20007
+12_secu_0.99.5_r20126
+13_secu_0.99.6_bug-1382
+13_secu_0.99.6_bug-1415
+13_secu_0.99.6_bug-1416
+13_secu_0.99.6_bug-1582
+14_secu_0.99.7
+15_CVE-2007-6450
+16_CVE-2007-6451
+17_CVE-2008-4683-to-CVE-2008-4685
+18_backport_postdissector
+19_CVE-2008-3933
+20_CVE-2008-3145
+21_CVE-2008-3141
+22_CVE-2008-3138
+23_CVE-2008-3137
+24_backport_exception
+
+
--- wireshark-0.99.4.orig/debian/patches/18_backport_postdissector.dpatch
+++ wireshark-0.99.4/debian/patches/18_backport_postdissector.dpatch
@@ -0,0 +1,45 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Backport helper function needed for security fixes from 1.0.4 <jmm@debian.org>
+
+@DPATCH@
+diff -aur wireshark-0.99.4.orig/epan/packet.c wireshark-0.99.4/epan/packet.c
+--- wireshark-0.99.4.orig/epan/packet.c	2008-07-10 19:39:28.000000000 +0200
++++ wireshark-0.99.4/epan/packet.c	2008-11-14 00:34:02.000000000 +0100
+@@ -1865,6 +1865,24 @@
+     num_of_postdissectors++;
+ }
+ 
++gboolean
++have_postdissector()
++{
++    guint i;
++    dissector_handle_t handle;
++
++    for(i = 0; i < num_of_postdissectors; i++) {
++	handle = (dissector_handle_t) g_ptr_array_index(post_dissectors,i);
++
++	if (handle->protocol != NULL
++	    && proto_is_protocol_enabled(handle->protocol)) {
++	    /* We have at least one enabled postdissector */
++	    return TRUE;
++	}
++    }
++    return FALSE;
++}
++
+ extern void call_all_postdissectors(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
+     guint i;
+     for(i=0;i<num_of_postdissectors;i++) {
+diff -aur wireshark-0.99.4.orig/epan/packet.h wireshark-0.99.4/epan/packet.h
+--- wireshark-0.99.4.orig/epan/packet.h	2008-07-10 19:39:28.000000000 +0200
++++ wireshark-0.99.4/epan/packet.h	2008-11-14 00:34:27.000000000 +0100
+@@ -413,6 +413,7 @@
+  * dissector has been called.
+  */
+ extern void register_postdissector(dissector_handle_t);
++extern gboolean have_postdissector();
+ extern void call_all_postdissectors(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+ 
+ #ifdef __cplusplus
--- wireshark-0.99.4.orig/debian/patches/16_CVE-2007-6451.dpatch
+++ wireshark-0.99.4/debian/patches/16_CVE-2007-6451.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## CVE-2007-6451
+##
+## All lines beginning with `## DP:' are a description of the patch.
+
+@DPATCH@
+--- wireshark-0.99.4.orig/epan/dissectors/packet-cip.c	2007/12/09 21:10:25	23819
++++ wireshark-0.99.4/epan/dissectors/packet-cip.c	2007/12/10 03:12:11	23820
+@@ -405,6 +405,9 @@
+       tmp2_length = ( length * 2 ) + 1;
+    }
+ 
++
++   /* Throw an exception if tmp_length is negative */
++   tvb_ensure_bytes_exist( tvb, start, tmp_length );
+    tmp = tvb_get_ptr( tvb, start, tmp_length );
+    tmp2 = (char*)ep_alloc( tmp2_length );
+ 
--- wireshark-0.99.4.orig/debian/patches/19_CVE-2008-3933.dpatch
+++ wireshark-0.99.4/debian/patches/19_CVE-2008-3933.dpatch
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## CVE-2008-3933
+##
+## All lines beginning with `## DP:' are a description of the patch.
+
+@DPATCH@
+--- trunk/epan/tvbuff.c	2008/07/08 16:32:56	25676
++++ wireshark-0.99.4/epan/tvbuff.c	2008/07/08 20:04:11	25677
+@@ -2893,7 +2893,7 @@
+ 			if (flags & (1 << 3)) {
+ 				/* A null terminated filename */
+ 
+-				while (*c != '\0') {
++				while ((c - compr) < comprlen && *c != '\0') {
+ 					c++;
+ 				}
+ 
+@@ -2903,7 +2903,7 @@
+ 			if (flags & (1 << 4)) {
+ 				/* A null terminated comment */
+ 
+-				while (*c != '\0') {
++				while ((c - compr) < comprlen && *c != '\0') {
+ 					c++;
+ 				}
+ 
--- wireshark-0.99.4.orig/debian/patches/14_secu_0.99.7.dpatch
+++ wireshark-0.99.4/debian/patches/14_secu_0.99.7.dpatch
@@ -0,0 +1,170 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Backports of Wireshark security issues fixed in 0.99.7
+##
+## All lines beginning with `## DP:' are a description of the patch.
+
+@DPATCH@
+diff -Naurw wireshark-0.99.4.orig/epan/dissectors/packet-btsdp.c wireshark-0.99.4/epan/dissectors/packet-btsdp.c
+--- wireshark-0.99.4.orig/epan/dissectors/packet-btsdp.c	2006-10-31 18:59:05.000000000 +0100
++++ wireshark-0.99.4/epan/dissectors/packet-btsdp.c	2007-11-23 09:42:07.000000000 +0100
+@@ -326,6 +326,8 @@
+ 					    tvb_get_ntohs(tvb, offset + 3));
+ 			offset+=5;
+ 			bytes_to_go-=5;
++		} else {
++			break;
+ 		}
+ 	}
+ 	return offset - start_offset;
+@@ -462,6 +464,9 @@
+ 			}
+ 
+ 			size = dissect_sdp_type(st, tvb, offset, &substr);
++			if (size < 1) {
++				break;
++			}
+ 			if(strpos<MAX_SDP_LEN){
+ 				strpos+=g_snprintf(str+strpos, MAX_SDP_LEN-strpos, "%s ", substr);
+ 			}
+@@ -600,6 +605,9 @@
+ 	while(bytes_to_go>0) {
+ 		size = dissect_sdp_type(st, tvb, offset, &str);
+ 		proto_item_append_text(st, " %s", str);
++		if (size < 1) {
++			break;
++		}
+ 		offset+=size;
+ 		bytes_to_go-=size;
+ 	}
+@@ -669,6 +677,9 @@
+ 		char *str;
+ 		size = dissect_sdp_type(st, tvb, offset, &str);
+ 		proto_item_append_text(st, " %s", str);
++		if (size < 1) {
++			break;
++		}
+ 		offset+=size;
+ 		bytes_to_go-=size;
+ 	}
+@@ -690,7 +701,7 @@
+ {
+ 	proto_tree *st;
+ 	proto_item *ti;
+-	guint16 curr_count;
++	gint curr_count;
+ 	
+ 	proto_tree_add_item(t, hf_ssr_total_count, tvb, offset, 2, FALSE);
+ 	offset+=2;
+diff -Naurw wireshark-0.99.4.orig/epan/dissectors/packet-http.c wireshark-0.99.4/epan/dissectors/packet-http.c
+--- wireshark-0.99.4.orig/epan/dissectors/packet-http.c	2006-10-31 18:59:06.000000000 +0100
++++ wireshark-0.99.4/epan/dissectors/packet-http.c	2007-11-23 09:42:31.000000000 +0100
+@@ -1050,12 +1050,6 @@
+ 				add_new_data_source(pinfo, next_tvb,
+ 				    "Uncompressed entity body");
+ 			} else {
+-				if (chunks_decoded > 1) {
+-					tvb_set_child_real_data_tvbuff(tvb,
+-					    next_tvb);
+-					add_new_data_source(pinfo, next_tvb,
+-					    "Compressed entity body");
+-				}
+ 				call_dissector(data_handle, next_tvb, pinfo,
+ 				    e_tree);
+ 
+diff -Naurw wireshark-0.99.4.orig/epan/dissectors/packet-rpc.c wireshark-0.99.4/epan/dissectors/packet-rpc.c
+--- wireshark-0.99.4.orig/epan/dissectors/packet-rpc.c	2006-10-31 18:59:07.000000000 +0100
++++ wireshark-0.99.4/epan/dissectors/packet-rpc.c	2007-11-23 09:42:43.000000000 +0100
+@@ -1252,6 +1252,7 @@
+ {
+ 	const char *saved_proto;
+ 
++	tvb_ensure_length_remaining(tvb, offset);
+ 	if (dissect_function != NULL) {
+ 		/* set the current protocol name */
+ 		saved_proto = pinfo->current_proto;
+diff -Naurw wireshark-0.99.4.orig/epan/dissectors/packet-ssl.c wireshark-0.99.4/epan/dissectors/packet-ssl.c
+--- wireshark-0.99.4.orig/epan/dissectors/packet-ssl.c	2006-10-31 18:59:07.000000000 +0100
++++ wireshark-0.99.4/epan/dissectors/packet-ssl.c	2007-11-23 09:42:49.000000000 +0100
+@@ -466,7 +466,7 @@
+                                SslDecryptSession* ssl);
+ 
+ /* client hello dissector */
+-static void dissect_ssl2_hnd_client_hello(tvbuff_t *tvb,
++static void dissect_ssl2_hnd_client_hello(tvbuff_t *tvb, packet_info *pinfo,
+                                           proto_tree *tree,
+                                           guint32 offset,
+                                           SslDecryptSession* ssl);
+@@ -2271,7 +2271,7 @@
+         /* dissect the message (only handle client hello right now) */
+         switch (msg_type) {
+         case SSL2_HND_CLIENT_HELLO:
+-            dissect_ssl2_hnd_client_hello(tvb, ssl_record_tree, offset, ssl);
++            dissect_ssl2_hnd_client_hello(tvb, pinfo, ssl_record_tree, offset, ssl);
+             break;
+ 
+         case SSL2_HND_CLIENT_MASTER_KEY:
+@@ -2323,7 +2323,7 @@
+ }
+ 
+ static void
+-dissect_ssl2_hnd_client_hello(tvbuff_t *tvb,
++dissect_ssl2_hnd_client_hello(tvbuff_t *tvb, packet_info *pinfo,
+                               proto_tree *tree, guint32 offset,
+                               SslDecryptSession* ssl)
+ {
+@@ -2375,6 +2375,15 @@
+         if (tree)
+             proto_tree_add_item(tree, hf_ssl2_handshake_session_id_len,
+                             tvb, offset, 2, FALSE);
++        if (session_id_length > SSLV2_MAX_SESSION_ID_LENGTH_IN_BYTES) {
++                proto_tree_add_text(tree, tvb, offset, 2,
++                    "Invalid session ID length: %d", session_id_length);
++                expert_add_info_format(pinfo, NULL, PI_MALFORMED, PI_ERROR,
++                    "Session ID length (%u) must be less than %u.",
++                    session_id_length, SSLV2_MAX_SESSION_ID_LENGTH_IN_BYTES);
++                offset = tvb_length(tvb);
++                return;
++        }
+         offset += 2;
+ 
+         challenge_length = tvb_get_ntohs(tvb, offset);
+diff -Naurw wireshark-0.99.4.orig/epan/dissectors/packet-ssl-utils.h wireshark-0.99.4/epan/dissectors/packet-ssl-utils.h
+--- wireshark-0.99.4.orig/epan/dissectors/packet-ssl-utils.h	2006-10-31 18:58:57.000000000 +0100
++++ wireshark-0.99.4/epan/dissectors/packet-ssl-utils.h	2007-11-23 09:42:47.000000000 +0100
+@@ -578,6 +578,8 @@
+ 
+ #define SSL_DEBUG_USE_STDERR "-"
+ 
++#define SSLV2_MAX_SESSION_ID_LENGTH_IN_BYTES 16
++
+ typedef struct _SslCipherSuite {
+      gint number;
+      gint kex;
+diff -Naurw wireshark-0.99.4.orig/plugins/megaco/packet-megaco.c wireshark-0.99.4/plugins/megaco/packet-megaco.c
+--- wireshark-0.99.4.orig/plugins/megaco/packet-megaco.c	2006-10-31 18:52:58.000000000 +0100
++++ wireshark-0.99.4/plugins/megaco/packet-megaco.c	2007-11-23 09:48:26.000000000 +0100
+@@ -1764,10 +1764,11 @@
+ 
+ 			}
+ 
++			tvb_previous_offset = tvb_current_offset;
+ 			tvb_current_offset  = tvb_find_guint8(tvb, tvb_RBRKT,
+ 				tvb_events_end_offset, ',');
+ 
+-			if (tvb_current_offset == -1 || tvb_current_offset > tvb_events_end_offset ){
++			if (tvb_current_offset == -1 || tvb_current_offset > tvb_events_end_offset || tvb_current_offset < tvb_previous_offset ) {
+ 				tvb_current_offset = tvb_events_end_offset;
+ 			}
+ 
+diff -Naurw wireshark-0.99.4.orig/wiretap/iseries.c wireshark-0.99.4/wiretap/iseries.c
+--- wireshark-0.99.4.orig/wiretap/iseries.c	2006-10-31 18:59:54.000000000 +0100
++++ wireshark-0.99.4/wiretap/iseries.c	2007-11-23 09:41:43.000000000 +0100
+@@ -506,7 +506,7 @@
+       /* look for packet header */
+       num_items_scanned =
+ 	sscanf (data,
+-		"%6d   %1s   %6d  %d:%d:%d.%d               %12s  %12s  ETHV2   Type: %s",
++		"%6d   %1s   %6d  %d:%d:%d.%d               %12s  %12s  ETHV2   Type: %4s",
+ 		&pktnum, direction, &cap_len, &hr, &min, &sec, &csec, destmac,
+ 		srcmac, type);
+       if (num_items_scanned == 10)
--- wireshark-0.99.4.orig/debian/patches/17_CVE-2008-4683-to-CVE-2008-4685.dpatch
+++ wireshark-0.99.4/debian/patches/17_CVE-2008-4683-to-CVE-2008-4685.dpatch
@@ -0,0 +1,114 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## CVE-2008-4683 to CVE-2008-4685
+##
+## All lines beginning with `## DP:' are a description of the patch.
+
+@DPATCH@
+diff -aur wireshark-0.99.4.orig/epan/dissectors/packet-bthci_acl.c wireshark-0.99.4/epan/dissectors/packet-bthci_acl.c
+--- wireshark-0.99.4.orig/epan/dissectors/packet-bthci_acl.c	2006-10-31 18:59:09.000000000 +0100
++++ wireshark-0.99.4/epan/dissectors/packet-bthci_acl.c	2008-11-29 10:47:43.000000000 +0100
+@@ -169,7 +169,9 @@
+ 				mfp->first_frame=pinfo->fd->num;
+ 				mfp->last_frame=0;
+ 				mfp->tot_len=l2cap_length+4;
+-				mfp->reassembled=se_alloc(l2cap_length+4);
++				mfp->reassembled=se_alloc(mfp->tot_len);
++				tvb_memcpy(tvb, (guint8*)mfp->reassembled, offset, mfp->tot_len);
++				mfp->cur_off=mfp->tot_len;
+ 				tvb_memcpy(tvb, mfp->reassembled, offset, tvb_length_remaining(tvb, offset));
+ 				mfp->cur_off=tvb_length_remaining(tvb, offset);
+ 				se_tree_insert32(chandle_data->start_fragments, pinfo->fd->num, mfp);
+diff -aur wireshark-0.99.4.orig/epan/dissectors/packet-frame.c wireshark-0.99.4/epan/dissectors/packet-frame.c
+--- wireshark-0.99.4.orig/epan/dissectors/packet-frame.c	2006-10-31 18:59:09.000000000 +0100
++++ wireshark-0.99.4/epan/dissectors/packet-frame.c	2008-11-29 10:49:17.000000000 +0100
+@@ -324,7 +324,49 @@
+ 		pinfo->layer_names = NULL;
+ 	}
+ 
+-    call_all_postdissectors(tvb,pinfo,parent_tree);
++	/*  Call postdissectors if we have any (while trying to avoid another
++	 *  TRY/CATCH)
++	 */
++	if (have_postdissector()) {
++	    TRY {
++#ifdef _MSC_VER
++	    /* Win32: Visual-C Structured Exception Handling (SEH) to trap hardware exceptions like memory access violations */
++	    /* (a running debugger will be called before the except part below) */
++	    __try {
++#endif
++		call_all_postdissectors(tvb, pinfo, parent_tree);
++#ifdef _MSC_VER
++	    } __except(TRUE /* handle all exceptions */) {
++		switch(GetExceptionCode()) {
++		case(STATUS_ACCESS_VIOLATION):
++			    show_exception(tvb, pinfo, parent_tree, DissectorError,
++			"STATUS_ACCESS_VIOLATION: dissector accessed an invalid memory address");
++		    break;
++		case(STATUS_INTEGER_DIVIDE_BY_ZERO):
++			    show_exception(tvb, pinfo, parent_tree, DissectorError,
++			"STATUS_INTEGER_DIVIDE_BY_ZERO: dissector tried an integer division by zero");
++		    break;
++		case(STATUS_STACK_OVERFLOW):
++			    show_exception(tvb, pinfo, parent_tree, DissectorError,
++			"STATUS_STACK_OVERFLOW: dissector overflowed the stack (e.g. endless loop)");
++		    /* XXX - this will have probably corrupted the stack, which makes problems later in the exception code */
++		    break;
++		/* XXX - add other hardware exception codes as required */
++		default:
++			    show_exception(tvb, pinfo, parent_tree, DissectorError,
++			g_strdup_printf("dissector caused an unknown exception: 0x%x", GetExceptionCode()));
++		}
++	    }
++#endif
++	    }
++	    CATCH(OutOfMemoryError) {
++		    RETHROW;
++	    }
++	    CATCH_ALL {
++		    show_exception(tvb, pinfo, parent_tree, EXCEPT_CODE, GET_MESSAGE);
++	    }
++	    ENDTRY;
++	}
+ 
+ 	tap_queue_packet(frame_tap, pinfo, NULL);
+     
+diff -aur wireshark-0.99.4.orig/epan/dissectors/packet-q931.c wireshark-0.99.4/epan/dissectors/packet-q931.c
+--- wireshark-0.99.4.orig/epan/dissectors/packet-q931.c	2006-10-31 18:59:04.000000000 +0100
++++ wireshark-0.99.4/epan/dissectors/packet-q931.c	2008-11-29 10:49:45.000000000 +0100
+@@ -1181,8 +1181,8 @@
+ 	{ 0x00, NULL }
+ };
+ 
+-void
+-dissect_q931_cause_ie(tvbuff_t *tvb, int offset, int len,
++static void
++dissect_q931_cause_ie_unsafe(tvbuff_t *tvb, int offset, int len,
+     proto_tree *tree, int hf_cause_value, guint8 *cause_value)
+ {
+ 	guint8 octet;
+@@ -1340,6 +1340,16 @@
+ 	}
+ }
+ 
++void
++dissect_q931_cause_ie(tvbuff_t *tvb, int offset, int len,
++    proto_tree *tree, int hf_cause_value, guint8 *cause_value)
++{
++  gboolean have_valid_q931_pi_save = have_valid_q931_pi;
++  have_valid_q931_pi = FALSE;
++  dissect_q931_cause_ie_unsafe(tvb, offset, len, tree, hf_cause_value, cause_value);
++  have_valid_q931_pi =  have_valid_q931_pi_save;
++}
++
+ /*
+  * Dissect a Call state information element.
+  */
+@@ -2767,7 +2777,7 @@
+ 					break;
+ 
+ 				case CS0 | Q931_IE_CAUSE:
+-					dissect_q931_cause_ie(tvb,
++					dissect_q931_cause_ie_unsafe(tvb,
+ 						offset + 2, info_element_len,
+ 						ie_tree,
+ 						hf_q931_cause_value, &dummy);
--- wireshark-0.99.4.orig/debian/patches/08_wireshark-desktop-menu.dpatch
+++ wireshark-0.99.4/debian/patches/08_wireshark-desktop-menu.dpatch
@@ -0,0 +1,24 @@
+#! /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
--- wireshark-0.99.4.orig/debian/patches/20_CVE-2008-3145.dpatch
+++ wireshark-0.99.4/debian/patches/20_CVE-2008-3145.dpatch
@@ -0,0 +1,64 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## CVE-2008-3145
+##
+## All lines beginning with `## DP:' are a description of the patch.
+
+@DPATCH@
+--- trunk/epan/reassemble.c	2008/05/21 16:40:15	25342
++++ wireshark-0.99.4/epan/reassemble.c	2008/05/21 16:53:07	25343
+@@ -794,22 +794,19 @@
+ 	/* add all data fragments */
+ 	for (dfpos=0,fd_i=fd_head;fd_i;fd_i=fd_i->next) {
+ 		if (fd_i->len) {
+-			if (fd_i->offset < dfpos) {
+-				fd_i->flags    |= FD_OVERLAP;
+-				fd_head->flags |= FD_OVERLAP;
+-				if ( memcmp(fd_head->data+fd_i->offset,
+-					fd_i->data,
+-					MIN(fd_i->len,(dfpos-fd_i->offset))
+-				   	) ){
+-					fd_i->flags    |= FD_OVERLAPCONFLICT;
+-					fd_head->flags |= FD_OVERLAPCONFLICT;
+-				}
+-			}
+ 			/* dfpos is always >= than fd_i->offset */
+ 			/* No gaps can exist here, max_loop(above) does this */
+ 			/* XXX - true? Can we get fd_i->offset+fd-i->len */
+ 			/* overflowing, for example? */
+-			if( fd_i->offset+fd_i->len > dfpos ) {
++			/*  Actually: there is at least one pathological case wherein there can be fragments
++			    on the list which are for offsets greater than max (i.e.: following a gap after max).
++			    (Something related to "defrag_until_fin" where the fin packet has an offset less than
++			    the highestfragment  offset seen ? [Seen from a fuzz-test: bug #2470]).
++                            So: the "overlap" compare must only be done for fragments with (offset+len) <= max
++			    and thus within the newly g_malloc'd buffer.
++			*/
++			    
++			if ( fd_i->offset+fd_i->len > dfpos ) {
+ 				if (fd_i->offset+fd_i->len > max)
+ 					g_warning("Reassemble error in frame %u: offset %u + len %u > max %u",
+ 					    pinfo->fd->num, fd_i->offset,
+@@ -821,10 +818,22 @@
+ 					g_warning("Reassemble error in frame %u: dfpos %u - offset %u > len %u",
+ 					    pinfo->fd->num, dfpos, fd_i->offset,
+ 					    fd_i->len);
+-				else
++				else {
++					if (fd_i->offset < dfpos) {
++						fd_i->flags    |= FD_OVERLAP;
++						fd_head->flags |= FD_OVERLAP;
++						if ( memcmp(fd_head->data+fd_i->offset,
++							    fd_i->data,
++							    MIN(fd_i->len,(dfpos-fd_i->offset))
++							     ) ) {
++							fd_i->flags    |= FD_OVERLAPCONFLICT;
++							fd_head->flags |= FD_OVERLAPCONFLICT;
++						}
++					}
+ 					memcpy(fd_head->data+dfpos,
+ 					    fd_i->data+(dfpos-fd_i->offset),
+ 					    fd_i->len-(dfpos-fd_i->offset));
++				}
+ 			} else {
+ 				if (fd_i->offset+fd_i->len < fd_i->offset)
+ 					g_warning("Reassemble error in frame %u: offset %u + len %u < offset",
--- wireshark-0.99.4.orig/debian/patches/15_CVE-2007-6450.dpatch
+++ wireshark-0.99.4/debian/patches/15_CVE-2007-6450.dpatch
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## CVE-2007-6450
+##
+## All lines beginning with `## DP:' are a description of the patch.
+
+@DPATCH@
+--- wireshark-0.99.4.orig/epan/dissectors/packet-rpl.c	2007/11/30 15:37:21	23686
++++ wireshark-0.99.4/epan/dissectors/packet-rpl.c	2007/11/30 15:55:28	23687
+@@ -148,11 +148,16 @@
+ 				reported_length = tvb_reported_length_remaining(tvb, offset);
+ 				if (reported_length > sublen)
+ 					reported_length = sublen;
+-				dissect_rpl_container(tvb_new_subset(tvb, 
++				if ( length > 0) {
++				  dissect_rpl_container(tvb_new_subset(tvb, 
+ 					offset, length, reported_length),
+ 					pinfo, rpl_container_tree);
+-
+-				offset += sublen;
++				  offset += reported_length;
++				} else {
++				  /* no more data, exit the loop */
++				  offset += reported_length;
++				  break;
++				}
+ 			}	
+ 			break;
+ 
--- wireshark-0.99.4.orig/debian/patches/21_CVE-2008-3141.dpatch
+++ wireshark-0.99.4/debian/patches/21_CVE-2008-3141.dpatch
@@ -0,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## CVE-2008-3141
+##
+## All lines beginning with `## DP:' are a description of the patch.
+
+@DPATCH@
+diff -aur wireshark-0.99.4.orig/epan/dissectors/packet-rmi.c wireshark-0.99.4/epan/dissectors/packet-rmi.c
+--- wireshark-0.99.4.orig/epan/dissectors/packet-rmi.c	2006-10-31 18:59:08.000000000 +0100
++++ wireshark-0.99.4/epan/dissectors/packet-rmi.c	2008-11-29 11:23:55.000000000 +0100
+@@ -125,7 +125,8 @@
+ 
+     rmi_type   rmitype;
+ 
+-    char epid_hostname[256];
++    char *epid_hostname;
++	guint epid_len;
+ 
+     offset     = 0;
+     rmitype    = 0;
+@@ -202,18 +203,15 @@
+ 		len = tvb_get_ntohs(tvb, 1);
+ 		proto_tree_add_uint(rmi_tree, hf_rmi_epid_length,
+ 				       tvb, offset + 1, 2, len);
+-		memset(epid_hostname, 0, sizeof(epid_hostname));
+-		if (len < sizeof(epid_hostname)) {
+-		    strncpy(epid_hostname,tvb_get_ptr(tvb, offset + 3, len),
+-			    sizeof(epid_hostname));
++		epid_len = len < ITEM_LABEL_LENGTH ? len : ITEM_LABEL_LENGTH;
++		if (epid_len > 0) {
++			epid_hostname = tvb_format_text(tvb, offset + 3, epid_len);
+ 		} else {
+-		    strncpy(epid_hostname,
+-			    "<string too long>", sizeof(epid_hostname));
++			epid_hostname = "[Empty]";
+ 		}
+ 		epid_hostname[sizeof(epid_hostname)-1] = '\0';
+ 		proto_tree_add_string(rmi_tree, hf_rmi_epid_hostname,
+-				      tvb, offset + 3, strlen(epid_hostname),
+-				      epid_hostname);
++				      tvb, offset + 3, epid_len, epid_hostname);
+ 
+ 		port = tvb_get_ntohs(tvb, offset + len + 5);
+   		proto_tree_add_uint(rmi_tree, hf_rmi_epid_port,
+Only in wireshark-0.99.4/epan/dissectors: packet-rmi.c~
--- wireshark-0.99.4.orig/debian/patches/03_preferences.dpatch
+++ wireshark-0.99.4/debian/patches/03_preferences.dpatch
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_preferences.dpatch by  <fred@candle>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: use Debian sensible-browser
+
+@DPATCH@
+diff -urNad wireshark-0.10.13~/configure.in wireshark-0.10.13/configure.in
+--- wireshark-0.10.13~/configure.in	2005-12-08 12:47:00.000000000 +0100
++++ wireshark-0.10.13/configure.in	2005-12-08 12:53:33.000000000 +0100
+@@ -38,12 +38,12 @@
+ 	#
+ 	AC_MSG_ERROR(I couldn't find pod2html; make sure it's installed and in your path)
+ fi
+-AC_PATH_PROG(HTML_VIEWER, htmlview)
++AC_PATH_PROG(HTML_VIEWER, sensible-browser)
+ if test "x$HTML_VIEWER" = x
+ then
+-	AC_DEFINE_UNQUOTED(HTML_VIEWER, "mozilla", [HTML viewer, e.g. mozilla])
++	AC_DEFINE_UNQUOTED(HTML_VIEWER, "sensible-browser", [HTML viewer, e.g. sensible-browser])
+ else
+-	AC_DEFINE_UNQUOTED(HTML_VIEWER, "htmlview", [HTML viewer, e.g. mozilla])
++	AC_DEFINE_UNQUOTED(HTML_VIEWER, "sensible-browser", [HTML viewer, e.g. mozilla])
+ fi
+ 
+ AC_PATH_PROG(LEX, flex)
--- wireshark-0.99.4.orig/debian/patches/22_CVE-2008-3138.dpatch
+++ wireshark-0.99.4/debian/patches/22_CVE-2008-3138.dpatch
@@ -0,0 +1,144 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## CVE-2008-3138
+##
+## All lines beginning with `## DP:' are a description of the patch.
+
+@DPATCH@
+diff -aur wireshark-0.99.4.orig/epan/dissectors/packet-kismet.c wireshark-0.99.4/epan/dissectors/packet-kismet.c
+--- wireshark-0.99.4.orig/epan/dissectors/packet-kismet.c	2006-10-31 18:58:57.000000000 +0100
++++ wireshark-0.99.4/epan/dissectors/packet-kismet.c	2008-11-29 11:33:15.000000000 +0100
+@@ -178,7 +178,7 @@
+ 					 * No request dissection
+ 					 */
+ 				} else {
+-					g_assert(reqresp);
++					DISSECTOR_ASSERT(reqresp);
+ 					/*
+ 					 * *KISMET: {Version} {Start time} \001{Server name}\001 {Build Revision}
+ 					 * two fields left undocumented: {???} {?ExtendedVersion?}
+diff -aur wireshark-0.99.4.orig/epan/dissectors/packet-pana.c wireshark-0.99.4/epan/dissectors/packet-pana.c
+--- wireshark-0.99.4.orig/epan/dissectors/packet-pana.c	2006-10-31 18:58:58.000000000 +0100
++++ wireshark-0.99.4/epan/dissectors/packet-pana.c	2008-11-29 11:33:15.000000000 +0100
+@@ -369,19 +369,10 @@
+        proto_tree *avp_eap_tree;
+ 
+        offset = 0;
+-       buffer_length = 0;
+-       buffer_length = tvb_length(tvb);
+-
+-       if (buffer_length <= 0) {
+-               proto_tree_add_text(avp_tree, tvb, offset, tvb_length(tvb),     "No Attribute Value Pairs Found");
+-               return;
+-       }
++       buffer_length = tvb_reported_length(tvb);
+ 
+        /* Go through all AVPs */
+-       while (buffer_length > 0 ) {
+-               /* Check buffer length */
+-               if (buffer_length < MIN_AVP_SIZE) return;
+-
++       while (buffer_length > 0) {
+                avp_code = tvb_get_ntohs(tvb, offset);
+                avp_flags = tvb_get_ntohs(tvb, offset + 2);
+                avp_length = tvb_get_ntohs(tvb, offset + 4);
+@@ -398,11 +389,34 @@
+                /* Check AVP type */
+                avp_type = pana_avp_get_type(avp_code, vendor_id);
+ 
+-               /* AVP data length */
+-               avp_data_length = avp_length - avp_hdr_length;
+-
+                /* Check AVP length */
+-               if ((avp_length < MIN_AVP_SIZE) || (avp_length > buffer_length)) bad_avp = TRUE;
++               if (avp_length < avp_hdr_length) {
++                       single_avp_item = proto_tree_add_text(avp_tree, tvb, offset, avp_length,
++                                                             "%s (%s) length: %d bytes (shorter than header length %d)",
++                                                             val_to_str(avp_code, avp_code_names, "Unknown (%d)"),
++                                                             val_to_str(avp_type, avp_type_names, "Unknown (%d)"),
++                                                             avp_length,
++                                                             avp_hdr_length);
++
++                       single_avp_tree = proto_item_add_subtree(single_avp_item, ett_pana_avp_info);
++
++                       if (single_avp_tree != NULL) {
++                               /* AVP Code */
++                               proto_tree_add_uint_format_value(single_avp_tree, hf_pana_avp_code, tvb,
++                                                                offset, 2, avp_code, "%s (%u)",
++                                                                val_to_str(avp_code, avp_code_names, "Unknown (%d)"),
++                                                                avp_code);
++                               offset += 2;
++                               /* AVP Flags */
++                               dissect_pana_avp_flags(single_avp_tree, tvb, offset, avp_flags);
++                               offset += 2;
++                               /* AVP Length */
++                               proto_tree_add_item(single_avp_tree, hf_pana_avp_length, tvb, offset, 2, FALSE);
++                               offset += 2;
++                       }
++                       return;
++               }
++
+                /* Check AVP flags */
+                if (avp_flags & PANA_AVP_FLAG_RES) bad_avp = TRUE;
+ 
+@@ -418,27 +432,40 @@
+ 
+                single_avp_tree = proto_item_add_subtree(single_avp_item, ett_pana_avp_info);
+ 
++               /* AVP data length */
++               avp_data_length = avp_length - avp_hdr_length;
++
+                if (single_avp_tree != NULL) {
+                        /* AVP Code */
+                        proto_tree_add_uint_format_value(single_avp_tree, hf_pana_avp_code, tvb,
+                                                        offset, 2, avp_code, "%s (%u)",
+                                                        val_to_str(avp_code, avp_code_names, "Unknown (%d)"),
+                                                        avp_code);
+-                       offset += 2;
++               }
++               offset += 2;
++               if (single_avp_tree != NULL) {
+                        /* AVP Flags */
+                        dissect_pana_avp_flags(single_avp_tree, tvb, offset, avp_flags);
+-                       offset += 2;
++               }
++               offset += 2;
++               if (single_avp_tree != NULL) {
+                        /* AVP Length */
+                        proto_tree_add_item(single_avp_tree, hf_pana_avp_length, tvb, offset, 2, FALSE);
+-                       offset += 2;
++               }
++               offset += 2;
++               if (single_avp_tree != NULL) {
+                        /* Reserved */
+                        proto_tree_add_item(single_avp_tree, hf_pana_avp_reserved, tvb, offset, 2, FALSE);
+-                       offset += 2;
+-                       /* Vendor ID */
+-                       if (avp_flags & PANA_AVP_FLAG_V) {
++               }
++               offset += 2;
++               if (avp_flags & PANA_AVP_FLAG_V) {
++                       if (single_avp_tree != NULL) {
++                               /* Vendor ID */
+                                proto_tree_add_item(single_avp_tree, hf_pana_avp_vendorid, tvb, offset, 4, FALSE);
+-                               offset += 4;
+                        }
++                       offset += 4;
++               }
++               if (avp_flags & PANA_AVP_FLAG_V) {
+                        /* AVP Value */
+                        switch(avp_type) {
+                                case PANA_GROUPED: {
+@@ -531,11 +558,8 @@
+                                        break;
+                                }
+                        }
+-                       /* Just check that offset will advance */
+-                       g_assert((avp_length+padding)!=0);
+-
+-                       offset += avp_data_length + padding;
+                }
++               offset += avp_data_length + padding;
+ 
+                /* Update the buffer length */
+                buffer_length -=  avp_length + padding;
+Only in wireshark-0.99.4/epan/dissectors: packet-pana.c~
--- wireshark-0.99.4.orig/debian/patches/12_secu_0.99.5_r19859.dpatch
+++ wireshark-0.99.4/debian/patches/12_secu_0.99.5_r19859.dpatch
@@ -0,0 +1,102 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12_secu_0.99.5_r19859.dpatch by  <fpeters@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Backport of r19859 to 0.99.4
+
+@DPATCH@
+diff -urNad wireshark-0.99.4~/epan/dissectors/packet-tcp.c wireshark-0.99.4/epan/dissectors/packet-tcp.c
+--- wireshark-0.99.4~/epan/dissectors/packet-tcp.c	2006-10-31 18:59:05.000000000 +0100
++++ wireshark-0.99.4/epan/dissectors/packet-tcp.c	2007-01-19 21:59:42.193993192 +0100
+@@ -374,6 +374,7 @@
+ 	msp->first_frame=pinfo->fd->num;
+ 	msp->last_frame=pinfo->fd->num;
+ 	msp->last_frame_time=pinfo->fd->abs_ts;
++	msp->flags=0;
+ 	se_tree_insert32(tcpd->fwd->multisegment_pdus, seq, (void *)msp);
+ 	return msp;
+ }
+@@ -1096,7 +1097,14 @@
+ 		/* OK, this PDU was found, which means the segment continues
+ 		   a higher-level PDU and that we must desegment it.
+ 		*/
+-		len=MIN(nxtseq, msp->nxtpdu) - seq;
++		if(msp->flags&MSP_FLAGS_REASSEMBLE_ENTIRE_SEGMENT){
++			/* The dissector asked for the entire segment */
++			len=tvb_length_remaining(tvb, offset);
++			msp->flags&=(~MSP_FLAGS_REASSEMBLE_ENTIRE_SEGMENT);
++		} else {
++			len=MIN(nxtseq, msp->nxtpdu) - seq;
++		}
++
+ 		ipfd_head = fragment_add(tvb, offset, pinfo, msp->first_frame,
+ 			tcp_fragment_table,
+ 			seq - msp->seq,
+@@ -1317,8 +1325,20 @@
+ 
+ 	    if( ((nxtseq - deseg_seq) <= 1024*1024)
+ 	    &&  (!pinfo->fd->flags.visited) ){
+-		msp = pdu_store_sequencenumber_of_next_pdu(pinfo, deseg_seq,
+-			nxtseq + pinfo->desegment_len, tcpd);
++		if(pinfo->desegment_len==DESEGMENT_ONE_MORE_SEGMENT){
++			/* The subdissector asked to reassemble using the
++			 * entire next segment.
++			 * Just ask reassembly for one more byte
++			 * but set this msp flag so we can pick it up
++			 * above.
++			 */
++			msp = pdu_store_sequencenumber_of_next_pdu(pinfo, 
++				deseg_seq, nxtseq+1, tcpd);
++			msp->flags|=MSP_FLAGS_REASSEMBLE_ENTIRE_SEGMENT;
++		} else {
++			msp = pdu_store_sequencenumber_of_next_pdu(pinfo, 
++				deseg_seq, nxtseq+pinfo->desegment_len, tcpd);
++		}
+ 
+ 		/* add this segment as the first one for this new pdu */
+ 		fragment_add(tvb, deseg_offset, pinfo, msp->first_frame,
+diff -urNad wireshark-0.99.4~/epan/dissectors/packet-tcp.h wireshark-0.99.4/epan/dissectors/packet-tcp.h
+--- wireshark-0.99.4~/epan/dissectors/packet-tcp.h	2006-10-31 18:59:05.000000000 +0100
++++ wireshark-0.99.4/epan/dissectors/packet-tcp.h	2007-01-19 21:59:46.786254890 +0100
+@@ -116,6 +116,8 @@
+ 	guint32 first_frame;
+ 	guint32 last_frame;
+         nstime_t last_frame_time;
++	guint32 flags;
++#define MSP_FLAGS_REASSEMBLE_ENTIRE_SEGMENT	0x00000001
+ };
+ 
+ typedef struct _tcp_flow_t {
+diff -urNad wireshark-0.99.4~/epan/packet_info.h wireshark-0.99.4/epan/packet_info.h
+--- wireshark-0.99.4~/epan/packet_info.h	2006-10-31 18:59:14.000000000 +0100
++++ wireshark-0.99.4/epan/packet_info.h	2007-01-19 21:59:38.257768880 +0100
+@@ -91,7 +91,7 @@
+ 				   or 
+ 				   DESEGMENT_ONE_MORE_SEGMENT:
+ 				     Desegment one more full segment 
+-				     (not yet implemented)
++				     (warning! only partially implemented)
+ 				   DESEGMENT_UNTIL_FIN:
+ 				     Desgment all data for this tcp session 
+ 				     until the FIN segment.
+diff -urNad wireshark-0.99.4~/epan/req_resp_hdrs.c wireshark-0.99.4/epan/req_resp_hdrs.c
+--- wireshark-0.99.4~/epan/req_resp_hdrs.c	2006-10-31 18:59:13.000000000 +0100
++++ wireshark-0.99.4/epan/req_resp_hdrs.c	2007-01-19 21:59:34.253540692 +0100
+@@ -107,7 +107,7 @@
+ 			 */
+ 			if (reported_length_remaining < 1) {
+ 				pinfo->desegment_offset = offset;
+-				pinfo->desegment_len = 1;
++				pinfo->desegment_len = DESEGMENT_ONE_MORE_SEGMENT;
+ 				return FALSE;
+ 			}
+ 
+@@ -124,7 +124,7 @@
+ 				 * byte.
+ 				 */
+ 				pinfo->desegment_offset = offset;
+-				pinfo->desegment_len = 1;
++				pinfo->desegment_len = DESEGMENT_ONE_MORE_SEGMENT;
+ 				return FALSE;
+ 			} else if (linelen == 0) {
+ 				/*
--- wireshark-0.99.4.orig/debian/patches/23_CVE-2008-3137.dpatch
+++ wireshark-0.99.4/debian/patches/23_CVE-2008-3137.dpatch
@@ -0,0 +1,62 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## CVE-2008-3137
+##
+## All lines beginning with `## DP:' are a description of the patch.
+
+@DPATCH@
+diff -aur wireshark-0.99.4.orig/epan/dissectors/packet-gsm_sms.c wireshark-0.99.4/epan/dissectors/packet-gsm_sms.c
+--- wireshark-0.99.4.orig/epan/dissectors/packet-gsm_sms.c	2006-10-31 18:59:08.000000000 +0100
++++ wireshark-0.99.4/epan/dissectors/packet-gsm_sms.c	2008-11-29 11:47:57.000000000 +0100
+@@ -215,6 +215,7 @@
+ 	oct); \
+ }
+ 
++#define MAX_ADDR_SIZE 20
+ static void
+ dis_field_addr(tvbuff_t *tvb, proto_tree *tree, guint32 *offset_p, const gchar *title)
+ {
+@@ -227,7 +228,7 @@
+     guint32		numdigocts;
+     guint32		length;
+     guint32		i, j;
+-    char                addrbuf[20];
++    char                addrbuf[MAX_ADDR_SIZE+1];
+ 
+     offset = *offset_p;
+ 
+@@ -319,7 +320,7 @@
+     switch ((oct & 0x70) >> 4)
+     {
+     case 0x05: /* "Alphanumeric (coded according to 3GPP TS 23.038 GSM 7-bit default alphabet)" */
+-	i = gsm_sms_char_7bit_unpack(0, numdigocts, sizeof(addrbuf), tvb_get_ptr(tvb, offset, numdigocts), addrbuf);
++	i = gsm_sms_char_7bit_unpack(0, numdigocts, MAX_ADDR_SIZE, tvb_get_ptr(tvb, offset, numdigocts), addrbuf);
+ 	addrbuf[i] = '\0';
+ 	gsm_sms_char_ascii_decode(bigbuf, addrbuf, i);
+ 	break;
+@@ -1778,6 +1779,7 @@
+ 
+ /* 9.2.3.24 */
+ #define NUM_FILL_BITS_MASKS 6
++#define SMS_MAX_MESSAGE_SIZE 160
+ static void
+ dis_field_ud(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint32 length, gboolean udhi, guint8 udl,
+     gboolean seven_bit, gboolean eight_bit, gboolean ucs2, gboolean compressed)
+@@ -1792,7 +1794,7 @@
+     guint	fill_bits;
+     guint32	out_len;
+     char	*ustr;
+-    char        messagebuf[160];
++    char        messagebuf[SMS_MAX_MESSAGE_SIZE+1];
+ 
+     fill_bits = 0;
+ 
+@@ -1861,7 +1863,7 @@
+ 		if (seven_bit)
+ 		{
+ 		    out_len =
+-			gsm_sms_char_7bit_unpack(fill_bits, length, sizeof(messagebuf),
++			gsm_sms_char_7bit_unpack(fill_bits, length, SMS_MAX_MESSAGE_SIZE,
+ 		    tvb_get_ptr(tvb, offset, length), messagebuf);
+ 		    messagebuf[out_len] = '\0';
+ 		    gsm_sms_char_ascii_decode(bigbuf, messagebuf, out_len);
+Only in wireshark-0.99.4/epan/dissectors: packet-gsm_sms.c~
--- wireshark-0.99.4.orig/debian/patches/04_drop-capabilities.dpatch
+++ wireshark-0.99.4/debian/patches/04_drop-capabilities.dpatch
@@ -0,0 +1,170 @@
+#! /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 */
--- wireshark-0.99.4.orig/debian/patches/24_backport_exception.dpatch
+++ wireshark-0.99.4/debian/patches/24_backport_exception.dpatch
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Backport OutOfMemoryError exception
+##
+## All lines beginning with `## DP:' are a description of the patch.
+
+@DPATCH@
+diff -aur wireshark-0.99.4.orig/epan/exceptions.h wireshark-0.99.4/epan/exceptions.h
+--- wireshark-0.99.4.orig/epan/exceptions.h	2006-10-31 18:59:15.000000000 +0100
++++ wireshark-0.99.4/epan/exceptions.h	2008-11-29 13:43:44.000000000 +0100
+@@ -68,6 +68,13 @@
+ #define ScsiBoundsError		5	
+ 
+ 
++/**
++    Running out of memory.
++    A dissector tried to allocate memory but that failed.
++**/
++#define OutOfMemoryError        6
++
++
+ /* Usage:
+  *
+  * TRY {
+Only in wireshark-0.99.4/epan: exceptions.h~
--- wireshark-0.99.4.orig/debian/patches/12_secu_0.99.5_r19899.dpatch
+++ wireshark-0.99.4/debian/patches/12_secu_0.99.5_r19899.dpatch
@@ -0,0 +1,57 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12_secu_0.99.5_r19899.dpatch by  <fpeters@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Backport of r19899 to 0.99.4
+
+@DPATCH@
+diff -urNad wireshark-0.99.4~/epan/dissectors/packet-http.c wireshark-0.99.4/epan/dissectors/packet-http.c
+--- wireshark-0.99.4~/epan/dissectors/packet-http.c	2006-10-31 18:59:06.000000000 +0100
++++ wireshark-0.99.4/epan/dissectors/packet-http.c	2007-01-19 22:00:32.216843832 +0100
+@@ -142,9 +142,6 @@
+ #define TCP_PORT_HKP			11371
+ #define TCP_PORT_DAAP			3689
+ 
+-#define HTTP_PORTS (TCP_PORT_HTTP || TCP_PORT_PROXY_HTTP || TCP_PORT_PROXY_ADMIN_HTTP || TCP_ALT_PORT_HTTP || TCP_RADAN_HTTP || \
+-		    TCP_PORT_HKP || TCP_PORT_DAAP)
+-
+ /*
+  * SSDP is implemented atop HTTP (yes, it really *does* run over UDP).
+  */
+@@ -1430,18 +1427,30 @@
+ 			proto_tree_add_text(sub_tree, next_tvb, 0, 0, "Proxy connect hostname: %s", strings[0]);
+ 			proto_tree_add_text(sub_tree, next_tvb, 0, 0, "Proxy connect port: %s", strings[1]);
+ 
+-			/* Replaces the pinfo->destport or srcport with the port the http connect was done to */
+-			/* pinfo->srcport and destport are guint32 variables (epan/packet_info.h) */
+-			if (pinfo->destport  == HTTP_PORTS)
++			/* Replaces the pinfo->destport or srcport with the port the http connect was done to by
++			 * checking to see which is the http port. */
++			if (pinfo->destport == TCP_PORT_HTTP             || pinfo->destport == TCP_PORT_PROXY_HTTP ||
++			    pinfo->destport == TCP_PORT_PROXY_ADMIN_HTTP || pinfo->destport == TCP_ALT_PORT_HTTP   ||
++			    pinfo->destport == TCP_RADAN_HTTP            || pinfo->destport == TCP_PORT_HKP        ||
++			    pinfo->destport == TCP_PORT_DAAP             || pinfo->destport == http_alternate_tcp_port)
+ 				ptr = &pinfo->destport;
+ 			else
+ 				ptr = &pinfo->srcport;
+ 
+ 			*ptr = (int)strtol(strings[1], NULL, 10); /* Convert string to a base-10 integer */
+ 
+-			dissect_tcp_payload(next_tvb, pinfo, 0, tcpinfo->seq, /* 0 = offset */
+-					    tcpinfo->nxtseq, pinfo->srcport, pinfo->destport,
+-					    tree, tree, tcpd);
++			/* We're going to get stuck in a loop if we call let dissect_tcp_payload call
++			   us, so call the data dissector instead for proxy connections to http ports. */
++			if(*ptr == TCP_PORT_HTTP             || *ptr == TCP_PORT_PROXY_HTTP ||
++			   *ptr == TCP_PORT_PROXY_ADMIN_HTTP || *ptr == TCP_ALT_PORT_HTTP   ||
++			   *ptr == TCP_RADAN_HTTP            || *ptr == TCP_PORT_HKP        ||
++			   *ptr == TCP_PORT_DAAP             || *ptr == http_alternate_tcp_port) {
++				call_dissector(data_handle, next_tvb, pinfo, tree);
++			} else {
++				dissect_tcp_payload(next_tvb, pinfo, 0, tcpinfo->seq, /* 0 = offset */
++						    tcpinfo->nxtseq, pinfo->srcport, pinfo->destport,
++						    tree, tree, tcpd);
++			}
+ 		}
+ 
+ 		g_strfreev(strings); /* Free the result of g_strsplit() above */
--- wireshark-0.99.4.orig/debian/patches/05_plugin-libdir.dpatch
+++ wireshark-0.99.4/debian/patches/05_plugin-libdir.dpatch
@@ -0,0 +1,28 @@
+#! /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
--- wireshark-0.99.4.orig/debian/patches/12_secu_0.99.5_r20126.dpatch
+++ wireshark-0.99.4/debian/patches/12_secu_0.99.5_r20126.dpatch
@@ -0,0 +1,653 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12_secu_0.99.5_r20126.dpatch by  <fpeters@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Backport of r20126 to 0.99.4
+
+@DPATCH@
+diff -urNad wireshark-0.99.4~/epan/dissectors/packet-ieee80211.c wireshark-0.99.4/epan/dissectors/packet-ieee80211.c
+--- wireshark-0.99.4~/epan/dissectors/packet-ieee80211.c	2006-10-31 18:59:04.000000000 +0100
++++ wireshark-0.99.4/epan/dissectors/packet-ieee80211.c	2007-01-19 22:02:26.427352318 +0100
+@@ -379,9 +379,9 @@
+ #define TAG_VENDOR_SPECIFIC_IE	 0xDD
+ #define TAG_SYMBOL_PROPRIETARY	 0xAD
+ 
+-#define WPA_OUI	"\x00\x50\xF2"
+-#define RSN_OUI "\x00\x0F\xAC"
+-#define WME_OUI "\x00\x50\xF2"
++#define WPA_OUI	 (const guint8 *) "\x00\x50\xF2"
++#define RSN_OUI (const guint8 *) "\x00\x0F\xAC"
++#define WME_OUI (const guint8 *) "\x00\x50\xF2"
+ 
+ #define PMKID_LEN 16
+ 
+@@ -1014,97 +1014,87 @@
+     }
+ }
+ 
+-static const char *wpa_cipher_str[] =
++static const value_string wpa_cipher_vals[] =
+ {
+-  "NONE",
+-  "WEP (40-bit)",
+-  "TKIP",
+-  "AES (OCB)",
+-  "AES (CCM)",
+-  "WEP (104-bit)",
++	{0, "NONE"},
++	{1, "WEP (40-bit)"},
++	{2, "TKIP"},
++	{3, "AES (OCB)"},
++	{4, "AES (CCM)"},
++	{5, "WEP (104-bit)"},
++	{0, NULL}
+ };
+ 
+-static const char *
+-wpa_cipher_idx2str(guint idx)
+-{
+-  if (idx < sizeof(wpa_cipher_str)/sizeof(wpa_cipher_str[0]))
+-    return wpa_cipher_str[idx];
+-  return "UNKNOWN";
+-}
+-
+-static const char *wpa_keymgmt_str[] =
++static const value_string wpa_keymgmt_vals[] =
+ {
+-  "NONE",
+-  "WPA",
+-  "PSK",
++	{0, "NONE"},
++	{1, "WPA"},
++	{2, "PSK"},
++	{0, NULL}
+ };
+ 
+-static const char *
+-wpa_keymgmt_idx2str(guint idx)
+-{
+-  if (idx < sizeof(wpa_keymgmt_str)/sizeof(wpa_keymgmt_str[0]))
+-    return wpa_keymgmt_str[idx];
+-  return "UNKNOWN";
+-}
+-
+ static void
+-dissect_vendor_ie_wpawme(proto_tree * ietree, proto_tree * tree, tvbuff_t * tvb,
+-	int offset, guint32 tag_len, const guint8 *tag_val)
++dissect_vendor_ie_wpawme(proto_tree * ietree, proto_tree * tree, tvbuff_t * tag_tvb)
+ {
+-      guint32 tag_val_off = 0;
+-      char out_buff[SHORT_STR];
+-      guint i;
++      guint tag_off = 0;
++      guint tag_len = tvb_length_remaining(tag_tvb, 0);
++      gchar out_buff[SHORT_STR];
++      guint i, byte1, byte2;
+ 
+       /* Wi-Fi Protected Access (WPA) Information Element */
+-      if (tag_val_off + 6 <= tag_len && !memcmp(tag_val, WPA_OUI"\x01", 4)) {
++      if (tag_off + 6 <= tag_len && !tvb_memeql(tag_tvb, tag_off, WPA_OUI"\x01", 4)) {
+         g_snprintf(out_buff, SHORT_STR, "WPA IE, type %u, version %u",
+-                  tag_val[tag_val_off + 3], pletohs(&tag_val[tag_val_off + 4]));
+-        proto_tree_add_string(tree, tag_interpretation, tvb, offset, 6, out_buff);
+-        offset += 6;
+-        tag_val_off += 6;
+-        if (tag_val_off + 4 <= tag_len) {
++		tvb_get_guint8(tag_tvb, tag_off + 3), tvb_get_letohs(tag_tvb, tag_off + 4));
++        proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 6, out_buff);
++        tag_off += 6;
++        if (tag_off + 4 <= tag_len) {
+           /* multicast cipher suite */
+-          if (!memcmp(&tag_val[tag_val_off], WPA_OUI, 3)) {
++          if (!tvb_memeql(tag_tvb, tag_off, WPA_OUI, 3)) {
+             g_snprintf(out_buff, SHORT_STR, "Multicast cipher suite: %s",
+-                      wpa_cipher_idx2str(tag_val[tag_val_off + 3]));
+-            proto_tree_add_string(tree, tag_interpretation, tvb, offset, 4, out_buff);
+-            offset += 4;
+-            tag_val_off += 4;
++		    val_to_str(tvb_get_guint8(tag_tvb, tag_off + 3), wpa_cipher_vals,
++			    "UNKNOWN"));
++            proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 4,
++		    out_buff);
++            tag_off += 4;
+             /* unicast cipher suites */
+-            if (tag_val_off + 2 <= tag_len) {
+-              g_snprintf(out_buff, SHORT_STR, "# of unicast cipher suites: %u",
+-                        pletohs(tag_val + tag_val_off));
+-              proto_tree_add_string(tree, tag_interpretation, tvb, offset, 2, out_buff);
+-              offset += 2;
+-              tag_val_off += 2;
++            if (tag_off + 2 <= tag_len) {
++              g_snprintf(out_buff, SHORT_STR,
++		      "# of unicast cipher suites: %u", tvb_get_letohs(tag_tvb, tag_off));
++              proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 2,
++		      out_buff);
++              tag_off += 2;
+               i = 1;
+-              while (tag_val_off + 4 <= tag_len) {
+-                if (!memcmp(&tag_val[tag_val_off], WPA_OUI, 3)) {
+-                  g_snprintf(out_buff, SHORT_STR, "Unicast cipher suite %u: %s",
+-                            i, wpa_cipher_idx2str(tag_val[tag_val_off + 3]));
+-                  proto_tree_add_string(tree, tag_interpretation, tvb, offset, 4, out_buff);
+-                  offset += 4;
+-                  tag_val_off += 4;
++              while (tag_off + 4 <= tag_len) {
++                if (!tvb_memeql(tag_tvb, tag_off, WPA_OUI, 3)) {
++                  g_snprintf(out_buff, SHORT_STR,
++			   "Unicast cipher suite %u: %s", i,
++			   val_to_str(tvb_get_guint8(tag_tvb, tag_off + 3),
++				   wpa_cipher_vals, "UNKNOWN"));
++                  proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 4,
++			  out_buff);
++                  tag_off += 4;
+                   i ++;
+                 }
+                 else
+                   break;
+               }
+ 	      /* authenticated key management suites */
+-              if (tag_val_off + 2 <= tag_len) {
+-                g_snprintf(out_buff, SHORT_STR, "# of auth key management suites: %u",
+-                          pletohs(tag_val + tag_val_off));
+-                proto_tree_add_string(tree, tag_interpretation, tvb, offset, 2, out_buff);
+-                offset += 2;
+-                tag_val_off += 2;
++              if (tag_off + 2 <= tag_len) {
++                g_snprintf(out_buff, SHORT_STR,
++			"# of auth key management suites: %u", tvb_get_letohs(tag_tvb, tag_off));
++                proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 2,
++			out_buff);
++                tag_off += 2;
+                 i = 1;
+-                while (tag_val_off + 4 <= tag_len) {
+-                  if (!memcmp(&tag_val[tag_val_off], WPA_OUI, 3)) {
+-                    g_snprintf(out_buff, SHORT_STR, "auth key management suite %u: %s",
+-                              i, wpa_keymgmt_idx2str(tag_val[tag_val_off + 3]));
+-                    proto_tree_add_string(tree, tag_interpretation, tvb, offset, 4, out_buff);
+-                    offset += 4;
+-                    tag_val_off += 4;
++                while (tag_off + 4 <= tag_len) {
++                  if (!tvb_memeql(tag_tvb, tag_off, WPA_OUI, 3)) {
++                    g_snprintf(out_buff, SHORT_STR,
++			    "auth key management suite %u: %s", i,
++			    val_to_str(tvb_get_guint8(tag_tvb, tag_off + 3),
++				    wpa_keymgmt_vals, "UNKNOWN"));
++                    proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 4,
++			    out_buff);
++                    tag_off += 4;
+                     i ++;
+                   }
+                   else
+@@ -1114,40 +1104,43 @@
+             }
+           }
+         }
+-        if (tag_val_off < tag_len)
+-          proto_tree_add_string(tree, tag_interpretation, tvb,
+-                                 offset, tag_len - tag_val_off, "Not interpreted");
++        if (tag_off < tag_len)
++          proto_tree_add_string(tree, tag_interpretation, tag_tvb,
++                                 tag_off, tag_len - tag_off, "Not interpreted");
+ 	proto_item_append_text(ietree, ": WPA");
+-      } else if (tag_val_off + 7 <= tag_len && !memcmp(tag_val, WME_OUI"\x02\x00", 5)) {
++      } else if (tag_off + 7 <= tag_len && !tvb_memeql(tag_tvb, tag_off, WME_OUI"\x02\x00", 5)) {
+       /* Wireless Multimedia Enhancements (WME) Information Element */
+-        g_snprintf(out_buff, SHORT_STR, "WME IE: type %u, subtype %u, version %u, parameter set %u",
+-		 tag_val[tag_val_off + 3], tag_val[tag_val_off + 4], tag_val[tag_val_off + 5],
+-		 tag_val[tag_val_off + 6]);
+-        proto_tree_add_string(tree, tag_interpretation, tvb, offset, 7, out_buff);
+-	proto_item_append_text(ietree, ": WME");
+-      } else if (tag_val_off + 24 <= tag_len && !memcmp(tag_val, WME_OUI"\x02\x01", 5)) {
++        g_snprintf(out_buff, SHORT_STR,
++		"WME IE: type %u, subtype %u, version %u, parameter set %u",
++		tvb_get_guint8(tag_tvb, tag_off+3), tvb_get_guint8(tag_tvb, tag_off+4),
++		tvb_get_guint8(tag_tvb, tag_off+5), tvb_get_guint8(tag_tvb, tag_off+6));
++        proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 7,
++		out_buff);
++        proto_item_append_text(ietree, ": WME");
++      } else if (tag_off + 24 <= tag_len && !tvb_memeql(tag_tvb, tag_off, WME_OUI"\x02\x01", 5)) {
+       /* Wireless Multimedia Enhancements (WME) Parameter Element */
+-        g_snprintf(out_buff, SHORT_STR, "WME PE: type %u, subtype %u, version %u, parameter set %u",
+-		 tag_val[tag_val_off + 3], tag_val[tag_val_off + 4], tag_val[tag_val_off + 5],
+-		 tag_val[tag_val_off + 6]);
+-        proto_tree_add_string(tree, tag_interpretation, tvb, offset, 7, out_buff);
+-	offset += 8;
+-	tag_val_off += 8;
++        g_snprintf(out_buff, SHORT_STR,
++		"WME PE: type %u, subtype %u, version %u, parameter set %u",
++		tvb_get_guint8(tag_tvb, tag_off+3), tvb_get_guint8(tag_tvb, tag_off+4),
++		tvb_get_guint8(tag_tvb, tag_off+5), tvb_get_guint8(tag_tvb, tag_off+6));
++        proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 7,
++		out_buff);
++	tag_off += 8;
+ 	for (i = 0; i < 4; i++) {
+-	  g_snprintf(out_buff, SHORT_STR, "WME AC Parameters: ACI %u (%s), Admission Control %sMandatory, AIFSN %u, ECWmin %u, ECWmax %u, TXOP %u",
+-		   (tag_val[tag_val_off] & 0x60) >> 5,
+-		   wme_acs[(tag_val[tag_val_off] & 0x60) >> 5],
+-		   (tag_val[tag_val_off] & 0x10) ? "" : "not ",
+-		   tag_val[tag_val_off] & 0x0f,
+-		   tag_val[tag_val_off + 1] & 0x0f,
+-		   (tag_val[tag_val_off + 1] & 0xf0) >> 4,
+-		   tvb_get_letohs(tvb, offset + 2));
+-	  proto_tree_add_string(tree, tag_interpretation, tvb, offset, 4, out_buff);
+-	  offset += 4;
+-	  tag_val_off += 4;
++	  byte1 = tvb_get_guint8(tag_tvb, tag_off);
++	  byte2 = tvb_get_guint8(tag_tvb, tag_off + 1);
++	  g_snprintf(out_buff, SHORT_STR,
++		  "WME AC Parameters: ACI %u (%s), Admission Control %sMandatory, AIFSN %u, ECWmin %u, ECWmax %u, TXOP %u",
++		   (byte1 & 0x60) >> 5, wme_acs[(byte1 & 0x60) >> 5],
++		   (byte1 & 0x10) ? "" : "not ", byte1 & 0x0f,
++		   byte2 & 0x0f, byte2 & 0xf0 >> 4,
++		   tvb_get_letohs(tag_tvb, tag_off + 2));
++	  proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 4,
++		  out_buff);
++	  tag_off += 4;
+ 	}
+ 	proto_item_append_text(ietree, ": WME");
+-      } else if (tag_val_off + 56 <= tag_len && !memcmp(tag_val, WME_OUI"\x02\x02", 5)) {
++      } else if (tag_off + 56 <= tag_len && !tvb_memeql(tag_tvb, tag_off, WME_OUI"\x02\x02", 5)) {
+       /* Wireless Multimedia Enhancements (WME) TSPEC Element */
+ 	guint16 ts_info, msdu_size, surplus_bandwidth;
+ 	const char *direction[] = { "Uplink", "Downlink", "Reserved", "Bi-directional" };
+@@ -1166,78 +1159,84 @@
+ 	};
+ 	const char *field;
+ 
+-        g_snprintf(out_buff, SHORT_STR, "WME TSPEC: type %u, subtype %u, version %u",
+-		 tag_val[tag_val_off + 3], tag_val[tag_val_off + 4], tag_val[tag_val_off + 5]);
+-        proto_tree_add_string(tree, tag_interpretation, tvb, offset, 6, out_buff);
+-	offset += 6;
+-	tag_val_off += 6;
++        g_snprintf(out_buff, SHORT_STR,
++		"WME TSPEC: type %u, subtype %u, version %u",
++		tvb_get_guint8(tag_tvb, tag_off+3), tvb_get_guint8(tag_tvb, tag_off+4),
++		tvb_get_guint8(tag_tvb, tag_off+5));
++        proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 6,
++		out_buff);
++	tag_off += 6;
+ 
+-	ts_info = tvb_get_letohs(tvb, offset);
+-	g_snprintf(out_buff, SHORT_STR, "WME TS Info: Priority %u (%s) (%s), Contention-based access %sset, %s",
+-		 (ts_info >> 11) & 0x7, qos_tags[(ts_info >> 11) & 0x7], qos_acs[(ts_info >> 11) & 0x7],
++	ts_info = tvb_get_letohs(tag_tvb, tag_off);
++	byte1 = (ts_info >> 11) & 0x7;
++	g_snprintf(out_buff, SHORT_STR,
++		"WME TS Info: Priority %u (%s) (%s), Contention-based access %sset, %s",
++		 byte1, qos_tags[byte1], qos_acs[byte1],
+ 		 (ts_info & 0x0080) ? "" : "not ",
+ 		 direction[(ts_info >> 5) & 0x3]);
+-	proto_tree_add_string(tree, tag_interpretation, tvb, offset, 2, out_buff);
+-	offset += 2;
+-	tag_val_off += 2;
++	proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 2,
++		out_buff);
++	tag_off += 2;
+ 
+-	msdu_size = tvb_get_letohs(tvb, offset);
+-	g_snprintf(out_buff, SHORT_STR, "WME TSPEC: %s MSDU Size %u",
+-		 (msdu_size & 0x8000) ? "Fixed" : "Nominal", msdu_size & 0x7fff);
+-	proto_tree_add_string(tree, tag_interpretation, tvb, offset, 2, out_buff);
+-	offset += 2;
+-	tag_val_off += 2;
++	msdu_size = tvb_get_letohs(tag_tvb, tag_off);
++	g_snprintf(out_buff, SHORT_STR,
++		"WME TSPEC: %s MSDU Size %u",
++		(msdu_size & 0x8000) ? "Fixed" : "Nominal", msdu_size & 0x7fff);
++	proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 2,
++		out_buff);
++	tag_off += 2;
+ 
+-	g_snprintf(out_buff, SHORT_STR, "WME TSPEC: Maximum MSDU Size %u", tvb_get_letohs(tvb, offset));
+-	proto_tree_add_string(tree, tag_interpretation, tvb, offset, 2, out_buff);
+-	offset += 2;
+-	tag_val_off += 2;
++	g_snprintf(out_buff, SHORT_STR,
++		"WME TSPEC: Maximum MSDU Size %u", tvb_get_letohs(tag_tvb, tag_off));
++	proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 2,
++		out_buff);
++	tag_off += 2;
+ 
+-	while ((field = val_to_str(tag_val_off, fields, "Unknown"))) {
+-	  g_snprintf(out_buff, SHORT_STR, "WME TSPEC: %s %u", field, tvb_get_letohl(tvb, offset));
+-	  proto_tree_add_string(tree, tag_interpretation, tvb, offset, 4, out_buff);
+-	  offset += 4;
+-	  tag_val_off += 4;
+-	  if (tag_val_off == 52)
++	while ((field = val_to_str(tag_off, fields, "Unknown"))) {
++	  g_snprintf(out_buff, SHORT_STR,
++		  "WME TSPEC: %s %u", field, tvb_get_letohl(tag_tvb, tag_off));
++	  proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 4,
++		  out_buff);
++	  tag_off += 4;
++	  if (tag_off == 52)
+ 	    break;
+ 	}
+ 
+-	surplus_bandwidth = tvb_get_letohs(tvb, offset);
+-	g_snprintf(out_buff, SHORT_STR, "WME TSPEC: Surplus Bandwidth Allowance Factor %u.%u",
++	surplus_bandwidth = tvb_get_letohs(tag_tvb, tag_off);
++	g_snprintf(out_buff, SHORT_STR,
++		"WME TSPEC: Surplus Bandwidth Allowance Factor %u.%u",
+ 		 (surplus_bandwidth >> 13) & 0x7, (surplus_bandwidth & 0x1fff));
+-	offset += 2;
+-	tag_val_off += 2;
++	proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 2,
++		out_buff);
++	tag_off += 2;
+ 
+-	g_snprintf(out_buff, SHORT_STR, "WME TSPEC: Medium Time %u", tvb_get_letohs(tvb, offset));
+-	proto_tree_add_string(tree, tag_interpretation, tvb, offset, 2, out_buff);
+-	offset += 2;
+-	tag_val_off += 2;
++	g_snprintf(out_buff, SHORT_STR,
++		"WME TSPEC: Medium Time %u", tvb_get_letohs(tag_tvb, tag_off));
++	proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 2,
++		out_buff);
++	tag_off += 2;
+ 	proto_item_append_text(ietree, ": WME");
+       }
+ }
+ 
+ static void
+-dissect_vendor_ie_rsn(proto_tree * ietree, proto_tree * tree, tvbuff_t * tvb,
+-	int offset, guint32 tag_len, const guint8 *tag_val)
++dissect_vendor_ie_rsn(proto_tree * ietree, proto_tree * tree, tvbuff_t * tag_tvb)
+ {
+-	guint32 tag_val_off = 0;
+-	char out_buff[SHORT_STR], *pos;
+-	guint i;
++	guint tag_off = 0;
++	guint tag_len = tvb_length_remaining(tag_tvb, 0);
++	guint pmkid_len = tag_len - 4;
++	char out_buff[SHORT_STR], valid_str[SHORT_STR] = "";
+ 
+-	if (tag_val_off + 4 <= tag_len && !memcmp(tag_val, RSN_OUI"\x04", 4)) {
++	if (tag_len >= 4 && !tvb_memeql(tag_tvb, tag_off, RSN_OUI"\x04", 4)) {
+ 		/* IEEE 802.11i / Key Data Encapsulation / Data Type=4 - PMKID.
+ 		 * This is only used within EAPOL-Key frame Key Data. */
+-		pos = out_buff;
+-		pos += g_snprintf(pos, out_buff + SHORT_STR - pos, "RSN PMKID: ");
+-		if (tag_len - 4 != PMKID_LEN) {
+-			pos += g_snprintf(pos, out_buff + SHORT_STR - pos,
+-				"(invalid PMKID len=%d, expected 16) ", tag_len - 4);
+-		}
+-		for (i = 0; i < tag_len - 4; i++) {
+-			pos += g_snprintf(pos, out_buff + SHORT_STR - pos, "%02X",
+-				tag_val[tag_val_off + 4 + i]);
++		if (pmkid_len != PMKID_LEN) {
++			g_snprintf(valid_str, SHORT_STR,
++				"(invalid PMKID len=%d, expected 16) ", pmkid_len);
+ 		}
+-		proto_tree_add_string(tree, tag_interpretation, tvb, offset,
++		g_snprintf(out_buff, SHORT_STR, "RSN PMKID: %s%s", valid_str,
++			tvb_bytes_to_str(tag_tvb, 4, pmkid_len));
++		proto_tree_add_string(tree, tag_interpretation, tag_tvb, 0,
+ 			tag_len, out_buff);
+ 	}
+ 	proto_item_append_text(ietree, ": RSN");
+@@ -1320,133 +1319,122 @@
+ }
+ 
+ static void
+-dissect_rsn_ie(proto_tree * tree, tvbuff_t * tvb, int offset,
+-	       guint32 tag_len, const guint8 *tag_val)
++dissect_rsn_ie(proto_tree * tree, tvbuff_t * tag_tvb)
+ {
+-  guint32 tag_val_off = 0;
++  guint tag_off = 0;
++  guint tag_len = tvb_length_remaining(tag_tvb, 0);
+   guint16 rsn_capab;
+   char out_buff[SHORT_STR];
+-  int i, j, count;
++  int i, count;
+   proto_item *cap_item;
+   proto_tree *cap_tree;
+ 
+-  if (tag_val_off + 2 > tag_len) {
+-    proto_tree_add_string(tree, tag_interpretation, tvb, offset, tag_len,
++  if (tag_off + 2 > tag_len) {
++    proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, tag_len,
+ 			  "Not interpreted");
+     return;
+   }
+ 
+   g_snprintf(out_buff, SHORT_STR, "RSN IE, version %u",
+-	   pletohs(&tag_val[tag_val_off]));
+-  proto_tree_add_string(tree, tag_interpretation, tvb, offset, 2, out_buff);
++	   tvb_get_letohs(tag_tvb, tag_off));
++  proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 2, out_buff);
+ 
+-  offset += 2;
+-  tag_val_off += 2;
++  tag_off += 2;
+ 
+-  if (tag_val_off + 4 > tag_len)
++  if (tag_off + 4 > tag_len)
+     goto done;
+ 
+   /* multicast cipher suite */
+-  if (!memcmp(&tag_val[tag_val_off], RSN_OUI, 3)) {
++  if (!tvb_memeql(tag_tvb, tag_off, RSN_OUI, 3)) {
+     g_snprintf(out_buff, SHORT_STR, "Multicast cipher suite: %s",
+-	     wpa_cipher_idx2str(tag_val[tag_val_off + 3]));
+-    proto_tree_add_string(tree, tag_interpretation, tvb, offset, 4, out_buff);
+-    offset += 4;
+-    tag_val_off += 4;
++	     val_to_str(tvb_get_guint8(tag_tvb, tag_off + 3),
++		     wpa_cipher_vals, "UNKNOWN"));
++    proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 4, out_buff);
++    tag_off += 4;
+   }
+ 
+-  if (tag_val_off + 2 > tag_len)
++  if (tag_off + 2 > tag_len)
+     goto done;
+ 
+   /* unicast cipher suites */
+-  count = pletohs(tag_val + tag_val_off);
++  count = tvb_get_letohs(tag_tvb, tag_off);
+   g_snprintf(out_buff, SHORT_STR, "# of unicast cipher suites: %u", count);
+-  proto_tree_add_string(tree, tag_interpretation, tvb, offset, 2, out_buff);
+-  offset += 2;
+-  tag_val_off += 2;
++  proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 2, out_buff);
++  tag_off += 2;
+   i = 1;
+-  while (tag_val_off + 4 <= tag_len && i <= count) {
+-    if (memcmp(&tag_val[tag_val_off], RSN_OUI, 3) != 0)
++  while (tag_off + 4 <= tag_len && i <= count) {
++    if (tvb_memeql(tag_tvb, tag_off, RSN_OUI, 3) != 0)
+       goto done;
+     g_snprintf(out_buff, SHORT_STR, "Unicast cipher suite %u: %s",
+-	     i, wpa_cipher_idx2str(tag_val[tag_val_off + 3]));
+-    proto_tree_add_string(tree, tag_interpretation, tvb, offset, 4, out_buff);
+-    offset += 4;
+-    tag_val_off += 4;
++	     i, val_to_str(tvb_get_guint8(tag_tvb, tag_off + 3),
++		     wpa_cipher_vals, "UNKNOWN"));
++    proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 4, out_buff);
++    tag_off += 4;
+     i++;
+   }
+ 
+-  if (i <= count || tag_val_off + 2 > tag_len)
++  if (i <= count || tag_off + 2 > tag_len)
+     goto done;
+ 
+   /* authenticated key management suites */
+-  count = pletohs(tag_val + tag_val_off);
++  count = tvb_get_letohs(tag_tvb, tag_off);
+   g_snprintf(out_buff, SHORT_STR, "# of auth key management suites: %u", count);
+-  proto_tree_add_string(tree, tag_interpretation, tvb, offset, 2, out_buff);
+-  offset += 2;
+-  tag_val_off += 2;
++  proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 2, out_buff);
++  tag_off += 2;
+   i = 1;
+-  while (tag_val_off + 4 <= tag_len && i <= count) {
+-    if (memcmp(&tag_val[tag_val_off], RSN_OUI, 3) != 0)
++  while (tag_off + 4 <= tag_len && i <= count) {
++    if (tvb_memeql(tag_tvb, tag_off, RSN_OUI, 3) != 0)
+       goto done;
+     g_snprintf(out_buff, SHORT_STR, "auth key management suite %u: %s",
+-	     i, wpa_keymgmt_idx2str(tag_val[tag_val_off + 3]));
+-    proto_tree_add_string(tree, tag_interpretation, tvb, offset, 4, out_buff);
+-    offset += 4;
+-    tag_val_off += 4;
++	     i, val_to_str(tvb_get_guint8(tag_tvb, tag_off + 3),
++		     wpa_keymgmt_vals, "UNKNOWN"));
++    proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 4, out_buff);
++    tag_off += 4;
+     i++;
+   }
+ 
+-  if (i <= count || tag_val_off + 2 > tag_len)
++  if (i <= count || tag_off + 2 > tag_len)
+     goto done;
+ 
+-  rsn_capab = pletohs(&tag_val[tag_val_off]);
++  rsn_capab = tvb_get_letohs(tag_tvb, tag_off);
+   g_snprintf(out_buff, SHORT_STR, "RSN Capabilities 0x%04x", rsn_capab);
+-  cap_item = proto_tree_add_uint_format(tree, rsn_cap, tvb,
+-					offset, 2, rsn_capab,
++  cap_item = proto_tree_add_uint_format(tree, rsn_cap, tag_tvb,
++					tag_off, 2, rsn_capab,
+ 					"RSN Capabilities: 0x%04X", rsn_capab);
+   cap_tree = proto_item_add_subtree(cap_item, ett_rsn_cap_tree);
+-  proto_tree_add_boolean(cap_tree, rsn_cap_preauth, tvb, offset, 2,
++  proto_tree_add_boolean(cap_tree, rsn_cap_preauth, tag_tvb, tag_off, 2,
+ 			 rsn_capab);
+-  proto_tree_add_boolean(cap_tree, rsn_cap_no_pairwise, tvb, offset, 2,
++  proto_tree_add_boolean(cap_tree, rsn_cap_no_pairwise, tag_tvb, tag_off, 2,
+ 			 rsn_capab);
+-  proto_tree_add_uint(cap_tree, rsn_cap_ptksa_replay_counter, tvb, offset, 2,
++  proto_tree_add_uint(cap_tree, rsn_cap_ptksa_replay_counter, tag_tvb, tag_off, 2,
+ 		      rsn_capab);
+-  proto_tree_add_uint(cap_tree, rsn_cap_gtksa_replay_counter, tvb, offset, 2,
++  proto_tree_add_uint(cap_tree, rsn_cap_gtksa_replay_counter, tag_tvb, tag_off, 2,
+ 		      rsn_capab);
+-  offset += 2;
+-  tag_val_off += 2;
++  tag_off += 2;
+ 
+-  if (tag_val_off + 2 > tag_len)
++  if (tag_off + 2 > tag_len)
+     goto done;
+ 
+-  count = pletohs(tag_val + tag_val_off);
++  count = tvb_get_letohs(tag_tvb, tag_off);
+   g_snprintf(out_buff, SHORT_STR, "# of PMKIDs: %u", count);
+-  proto_tree_add_string(tree, tag_interpretation, tvb, offset, 2, out_buff);
+-  offset += 2;
+-  tag_val_off += 2;
++  proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off, 2, out_buff);
++  tag_off += 2;
+ 
+   /* PMKID List (16 * n octets) */
+   for (i = 0; i < count; i++) {
+-    char *pos;
+-    if (tag_val_off + PMKID_LEN > tag_len)
++    if (tag_off + PMKID_LEN > tag_len)
+       goto done;
+-    pos = out_buff;
+-    pos += g_snprintf(pos, out_buff + SHORT_STR - pos, "PMKID %u: ", i);
+-    for (j = 0; j < PMKID_LEN; j++) {
+-      pos += g_snprintf(pos, out_buff + SHORT_STR - pos, "%02X",
+-		      tag_val[tag_val_off + j]);
+-    }
+-    proto_tree_add_string(tree, tag_interpretation, tvb, offset,
++    g_snprintf(out_buff, SHORT_STR, "PMKID %u: %s", i,
++        tvb_bytes_to_str(tag_tvb, tag_off, PMKID_LEN));
++    proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off,
+ 			  PMKID_LEN, out_buff);
+-    offset += PMKID_LEN;
+-    tag_val_off += PMKID_LEN;
++    tag_off += PMKID_LEN;
+   }
+ 
+  done:
+-  if (tag_val_off < tag_len)
+-    proto_tree_add_string(tree, tag_interpretation, tvb, offset,
+-			  tag_len - tag_val_off, "Not interpreted");
++  if (tag_off < tag_len)
++    proto_tree_add_string(tree, tag_interpretation, tag_tvb, tag_off,
++			  tag_len - tag_off, "Not interpreted");
+ }
+ 
+ /* ************************************************************************* */
+@@ -1507,7 +1495,7 @@
+ add_tagged_field (packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int offset)
+ {
+   guint32 oui;
+-  const guint8 *tag_val;
++  tvbuff_t *tag_tvb;
+   const guint8 *tag_data_ptr;
+   guint32 tag_no, tag_len;
+   unsigned int i;
+@@ -1541,11 +1529,11 @@
+     case TAG_SSID:
+       if(beacon_padding == 0) /* padding bug */
+       {
+-        char *ssid;
++        guint8 *ssid; /* The SSID may consist of arbitrary bytes */
+ 
+         ssid = tvb_get_ephemeral_string(tvb, offset + 2, tag_len);
+         proto_tree_add_string (tree, tag_interpretation, tvb, offset + 2,
+-                               tag_len, ssid);
++                               tag_len, (char *) ssid);
+         if (check_col (pinfo->cinfo, COL_INFO)) {
+           if (tag_len > 0) {
+             col_append_fstr(pinfo->cinfo, COL_INFO, ", SSID: \"%s\"",
+@@ -1885,25 +1873,26 @@
+       tvb_ensure_bytes_exist (tvb, offset + 2, tag_len);
+       if (tag_len >= 3) {
+ 		oui = tvb_get_ntoh24(tvb, offset + 2);
+-		tag_val = tvb_get_ptr(tvb, offset + 2, tag_len);
++		tag_tvb = tvb_new_subset(tvb, offset + 2, tag_len, tag_len);
+ 
+ #define WPAWME_OUI	0x0050F2
+ #define RSNOUI_VAL	0x000FAC
+ 
+ 		switch (oui) {
+ 		case WPAWME_OUI:
+-			dissect_vendor_ie_wpawme(ti, tree, tvb, offset + 2, tag_len, tag_val);
++			dissect_vendor_ie_wpawme(ti, tree, tag_tvb);
+ 			break;
+ 		case RSNOUI_VAL:
+-			dissect_vendor_ie_rsn(ti, tree, tvb, offset + 2, tag_len, tag_val);
++			dissect_vendor_ie_rsn(ti, tree, tag_tvb);
+ 			break;
+ 		case OUI_CISCOWL:	/* Cisco Wireless (Aironet) */
+ 			dissect_vendor_ie_aironet(ti, tree, tvb, offset + 5, tag_len - 3);
+ 			break;
+ 		default:
++			tag_data_ptr = tvb_get_ptr(tag_tvb, 0, 3);
+ 			proto_tree_add_bytes_format (tree, tag_oui, tvb, offset + 2, 3,
+-				"", "Vendor: %s", get_manuf_name(tag_val));
+-			proto_item_append_text(ti, ": %s", get_manuf_name(tag_val));
++				tag_data_ptr, "Vendor: %s", get_manuf_name(tag_data_ptr));
++			proto_item_append_text(ti, ": %s", get_manuf_name(tag_data_ptr));
+ 			proto_tree_add_string (tree, tag_interpretation, tvb, offset + 5,
+ 				tag_len - 3, "Not interpreted");
+ 			break;
+@@ -1913,8 +1902,8 @@
+       break;
+ 
+     case TAG_RSN_IE:
+-      dissect_rsn_ie(tree, tvb, offset + 2, tag_len,
+-                     tvb_get_ptr (tvb, offset + 2, tag_len));
++      tag_tvb = tvb_new_subset(tvb, offset + 2, tag_len, tag_len);
++      dissect_rsn_ie(tree, tag_tvb);
+       break;
+ 
+     default:
+@@ -4182,7 +4171,7 @@
+ 	    "length you're using", i + 1);
+ 
+     prefs_register_string_preference(wlan_module, key_name->str,
+-	    key_title->str, key_desc->str, &wep_keystr[i]);
++	    key_title->str, key_desc->str, (const char **) &wep_keystr[i]);
+ 
+     g_string_free(key_name, FALSE);
+     g_string_free(key_title, FALSE);
--- wireshark-0.99.4.orig/debian/patches/06_giop-buffer.dpatch
+++ wireshark-0.99.4/debian/patches/06_giop-buffer.dpatch
@@ -0,0 +1,19 @@
+#! /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++) {
--- wireshark-0.99.4.orig/debian/patches/12_secu_0.99.5_r20007.dpatch
+++ wireshark-0.99.4/debian/patches/12_secu_0.99.5_r20007.dpatch
@@ -0,0 +1,86 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12_secu_0.99.5_r20007.dpatch by  <fpeters@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Backport of r20007 to 0.99.4
+
+@DPATCH@
+diff -urNad wireshark-0.99.4~/epan/dissectors/packet-llt.c wireshark-0.99.4/epan/dissectors/packet-llt.c
+--- wireshark-0.99.4~/epan/dissectors/packet-llt.c	2006-10-31 18:59:06.000000000 +0100
++++ wireshark-0.99.4/epan/dissectors/packet-llt.c	2007-01-19 22:03:03.129443851 +0100
+@@ -73,16 +73,16 @@
+ 	proto_item *ti=NULL;
+ 	proto_tree *llt_tree=NULL;
+ 	guint8 message_type;
+-	
++
+ 	/* Make entries in Protocol column and Info column on summary display */
+-	if(check_col(pinfo->cinfo, COL_PROTOCOL)) 
++	if(check_col(pinfo->cinfo, COL_PROTOCOL))
+ 		col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLT");
+ 
+ 	message_type = tvb_get_guint8(tvb, 3);
+ 
+ 	if(check_col(pinfo->cinfo, COL_INFO)) {
+ 		col_clear(pinfo->cinfo, COL_INFO);
+-		col_add_fstr(pinfo->cinfo, COL_INFO, "Message type: %s", match_strval(message_type, message_type_vs));
++		col_add_fstr(pinfo->cinfo, COL_INFO, "Message type: %s", val_to_str(message_type, message_type_vs, "Unknown (0x%02x)"));
+ 	}
+ 
+ 	if (tree) {
+@@ -95,38 +95,38 @@
+ 	proto_tree_add_item(llt_tree, hf_llt_node_id, tvb, 7, 1, FALSE);
+ 	proto_tree_add_item(llt_tree, hf_llt_sequence_num, tvb, 24, 4, FALSE);
+ 	proto_tree_add_item(llt_tree, hf_llt_message_time, tvb, 40, 4, FALSE);
+-	
++
+ }
+ 
+ /* Register the protocol with Wireshark */
+ void
+ proto_register_llt(void)
+-{                 
++{
+ 	module_t *llt_module;
+ 
+ 	static hf_register_info hf[] = {
+-		
++
+ 		{ &hf_llt_cluster_num,  { "Cluster number", "llt.cluster_num",
+ 					  FT_UINT8, BASE_DEC, NULL, 0,
+ 					  "Cluster number that this node belongs to", HFILL } },
+-		
++
+ 		{ &hf_llt_message_type, { "Message type", "llt.message_type",
+ 					  FT_UINT8, BASE_HEX, VALS(message_type_vs), 0,
+ 					  "Type of LLT message contained in this frame", HFILL } },
+-		
++
+ 		{ &hf_llt_node_id,      { "Node ID", "llt.node_id",
+ 					  FT_UINT8, BASE_DEC, NULL, 0,
+ 					  "Number identifying this node within the cluster", HFILL } },
+-		
++
+ 		{ &hf_llt_sequence_num, { "Sequence number", "llt.sequence_num",
+ 					  FT_UINT32, BASE_DEC, NULL, 0,
+ 					  "Sequence number of this frame", HFILL } },
+-		
++
+ 		{ &hf_llt_message_time, { "Message time", "llt.message_time",
+ 					  FT_UINT32, BASE_DEC, NULL, 0,
+ 					  "Number of ticks since this node was last rebooted", HFILL } }
+ 	};
+-	
++
+ 	/* Setup protocol subtree array */
+ 	static gint *ett[] = {
+ 		&ett_llt,
+@@ -156,7 +156,7 @@
+ 	llt_handle = create_dissector_handle(dissect_llt, proto_llt);
+ 	dissector_add("ethertype", ETHERTYPE_LLT, llt_handle);
+ 
+-	if((preference_alternate_ethertype != 0xCAFE) 
++	if((preference_alternate_ethertype != 0xCAFE)
+ 	&& (preference_alternate_ethertype != 0x0)){
+ 		dissector_delete("ethertype", preference_alternate_ethertype_last, llt_handle);
+ 		preference_alternate_ethertype_last = preference_alternate_ethertype; /* Save the setting to see if it has changed later */
--- wireshark-0.99.4.orig/debian/patches/02_asn2deb.dpatch
+++ wireshark-0.99.4/debian/patches/02_asn2deb.dpatch
@@ -0,0 +1,392 @@
+#! /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>
--- wireshark-0.99.4.orig/debian/patches/07_gcc4.dpatch
+++ wireshark-0.99.4/debian/patches/07_gcc4.dpatch
@@ -0,0 +1,20 @@
+#! /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_) {
--- wireshark-0.99.4.orig/debian/patches/01_idl2deb.dpatch
+++ wireshark-0.99.4/debian/patches/01_idl2deb.dpatch
@@ -0,0 +1,424 @@
+#! /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>
--- wireshark-0.99.4.orig/debian/patches/09_idl2wrs.dpatch
+++ wireshark-0.99.4/debian/patches/09_idl2wrs.dpatch
@@ -0,0 +1,57 @@
+#! /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.2~/tools/idl2wrs.sh wireshark-0.99.2/tools/idl2wrs.sh
+--- wireshark-0.99.2~/tools/idl2wrs.sh	2006-07-18 22:53:59.000000000 +0200
++++ wireshark-0.99.2/tools/idl2wrs.sh	2006-07-18 22:57:54.000000000 +0200
+@@ -1,4 +1,4 @@
+-#! @SHELL@
++#! /bin/sh
+ #
+ #  $Id: idl2wrs.sh 18271 2006-05-31 19:12:15Z gerald $
+ #
+@@ -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-0.99.4.orig/debian/patches/10_wireshark_gen.dpatch
+++ wireshark-0.99.4/debian/patches/10_wireshark_gen.dpatch
@@ -0,0 +1,19 @@
+#! /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";
--- wireshark-0.99.4.orig/debian/patches/13_secu_0.99.6_bug-1415.dpatch
+++ wireshark-0.99.4/debian/patches/13_secu_0.99.6_bug-1415.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13_secu_0.99.6_bug-1415.dpatch by  <fpeters@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Backport of r20990 to 0.99.4
+
+@DPATCH@
+diff -urNad wireshark-0.99.4~/wiretap/iseries.c wireshark-0.99.4/wiretap/iseries.c
+--- wireshark-0.99.4~/wiretap/iseries.c	2006-10-31 18:59:54.000000000 +0100
++++ wireshark-0.99.4/wiretap/iseries.c	2007-06-23 12:34:58.021913467 +0200
+@@ -254,7 +254,7 @@
+ {
+   guint line;
+   int num_items_scanned;
+-  char buf[ISERIES_LINE_LENGTH], protocol[8], tcpformat[1];
++  char buf[ISERIES_LINE_LENGTH], protocol[9], tcpformat[2];
+   guint8 *sdate;
+ 
+   /* Save trace format for passing between packets */
--- wireshark-0.99.4.orig/debian/patches/13_secu_0.99.6_bug-1582.dpatch
+++ wireshark-0.99.4/debian/patches/13_secu_0.99.6_bug-1582.dpatch
@@ -0,0 +1,77 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13_secu_0.99.6_bug-1582.dpatch by  <fpeters@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Backport of r21665 to 0.99.4
+
+@DPATCH@
+diff -urNad wireshark-0.99.4~/epan/dissectors/packet-ssl.c wireshark-0.99.4/epan/dissectors/packet-ssl.c
+--- wireshark-0.99.4~/epan/dissectors/packet-ssl.c	2006-10-31 18:59:07.000000000 +0100
++++ wireshark-0.99.4/epan/dissectors/packet-ssl.c	2007-06-23 12:36:15.526330192 +0200
+@@ -109,6 +109,7 @@
+ #include <epan/dissectors/packet-x509af.h>
+ #include <epan/emem.h>
+ #include <epan/tap.h>
++#include <epan/expert.h>
+ #include "packet-ssl.h"
+ #include "packet-ssl-utils.h"
+ 
+@@ -430,7 +431,7 @@
+                                    SslDecryptSession *conv_data, guint8 content_type);
+ 
+ 
+-static void dissect_ssl3_hnd_cli_hello(tvbuff_t *tvb,
++static void dissect_ssl3_hnd_cli_hello(tvbuff_t *tvb, packet_info *pinfo,
+                                        proto_tree *tree,
+                                        guint32 offset, guint32 length,
+                                        SslDecryptSession* ssl);
+@@ -1394,7 +1395,7 @@
+                 break;
+ 
+             case SSL_HND_CLIENT_HELLO:
+-                dissect_ssl3_hnd_cli_hello(tvb, ssl_hand_tree, offset, length, ssl);
++                dissect_ssl3_hnd_cli_hello(tvb, pinfo, ssl_hand_tree, offset, length, ssl);
+             break;
+ 
+             case SSL_HND_SERVER_HELLO:
+@@ -1636,7 +1637,7 @@
+ }
+ 
+ static void
+-dissect_ssl3_hnd_cli_hello(tvbuff_t *tvb,
++dissect_ssl3_hnd_cli_hello(tvbuff_t *tvb, packet_info *pinfo,
+        proto_tree *tree, guint32 offset, guint32 length,
+        SslDecryptSession*ssl)
+ {
+@@ -1652,10 +1653,11 @@
+      */
+     proto_tree *ti;
+     proto_tree *cs_tree;
+-    guint16 cipher_suite_length;
++    gint cipher_suite_length;
+     guint8  compression_methods_length;
+     guint8  compression_method;
+     guint16 start_offset;
++
+     cipher_suite_length = 0;
+     compression_methods_length = 0;
+     start_offset = offset;
+@@ -1685,9 +1687,17 @@
+             ti = proto_tree_add_none_format(tree,
+                                             hf_ssl_handshake_cipher_suites,
+                                             tvb, offset, cipher_suite_length,
+-                                            "Cipher Suites (%u suite%s)",
++                                            "Cipher Suites (%d suite%s)",
+                                             cipher_suite_length / 2,
+                                             plurality(cipher_suite_length/2, "", "s"));
++            if (cipher_suite_length % 2) {
++                proto_tree_add_text(tree, tvb, offset, 2,
++                    "Invalid cipher suite length: %d", cipher_suite_length);
++                expert_add_info_format(pinfo, NULL, PI_MALFORMED, PI_ERROR,
++                    "Cipher suite length (%d) must be a multiple of 2",
++                    cipher_suite_length);
++                return;
++            }
+ 
+             /* make this a subtree */
+             cs_tree = proto_item_add_subtree(ti, ett_ssl_cipher_suites);
--- wireshark-0.99.4.orig/debian/patches/13_secu_0.99.6_bug-1416.dpatch
+++ wireshark-0.99.4/debian/patches/13_secu_0.99.6_bug-1416.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13_secu_0.99.6_bug-1416.dpatch by  <fpeters@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Backport of r21947 to 0.99.4
+
+@DPATCH@
+diff -urNad wireshark-0.99.4~/epan/dissectors/packet-bootp.c wireshark-0.99.4/epan/dissectors/packet-bootp.c
+--- wireshark-0.99.4~/epan/dissectors/packet-bootp.c	2006-10-31 18:59:08.000000000 +0100
++++ wireshark-0.99.4/epan/dissectors/packet-bootp.c	2007-06-23 12:36:59.528837752 +0200
+@@ -2348,7 +2348,7 @@
+ 	unsigned long raw_val;
+ 	int off = DOCS_CM_TLV_OFF + voff;
+ 	int tlv_len, i;
+-	guint8 asc_val[3] = "  ";
++	guint8 asc_val[4] = "  ";
+ 	proto_item *ti;
+ 
+ 	tvb_memcpy (tvb, asc_val, off, 2);
--- wireshark-0.99.4.orig/debian/patches/13_secu_0.99.6_bug-1382.dpatch
+++ wireshark-0.99.4/debian/patches/13_secu_0.99.6_bug-1382.dpatch
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13_secu_0.99.6_bug-1382.dpatch by  <fpeters@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Backport of r20837 to 0.99.4
+
+@DPATCH@
+diff -urNad wireshark-0.99.4~/asn1/spnego/packet-spnego-template.c wireshark-0.99.4/asn1/spnego/packet-spnego-template.c
+--- wireshark-0.99.4~/asn1/spnego/packet-spnego-template.c	2006-10-31 18:51:26.000000000 +0100
++++ wireshark-0.99.4/asn1/spnego/packet-spnego-template.c	2007-06-23 12:37:44.531402302 +0200
+@@ -1022,6 +1022,8 @@
+ 	/* Register protocol */
+ 	proto_spnego = proto_register_protocol(PNAME, PSNAME, PFNAME);
+ 
++	register_dissector("spnego", dissect_spnego, proto_spnego);
++
+ 	proto_spnego_krb5 = proto_register_protocol("SPNEGO-KRB5",
+ 						    "SPNEGO-KRB5",
+ 						    "spnego-krb5");
+diff -urNad wireshark-0.99.4~/epan/dissectors/packet-spnego.c wireshark-0.99.4/epan/dissectors/packet-spnego.c
+--- wireshark-0.99.4~/epan/dissectors/packet-spnego.c	2006-10-31 18:58:59.000000000 +0100
++++ wireshark-0.99.4/epan/dissectors/packet-spnego.c	2007-06-23 12:37:49.531687252 +0200
+@@ -1623,6 +1623,8 @@
+ 	/* Register protocol */
+ 	proto_spnego = proto_register_protocol(PNAME, PSNAME, PFNAME);
+ 
++	register_dissector("spnego", dissect_spnego, proto_spnego);
++
+ 	proto_spnego_krb5 = proto_register_protocol("SPNEGO-KRB5",
+ 						    "SPNEGO-KRB5",
+ 						    "spnego-krb5");
--- wireshark-0.99.4.orig/debian/compat
+++ wireshark-0.99.4/debian/compat
@@ -0,0 +1 @@
+4
--- wireshark-0.99.4.orig/debian/wireshark-common.files
+++ wireshark-0.99.4/debian/wireshark-common.files
@@ -0,0 +1,11 @@
+/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/*
--- wireshark-0.99.4.orig/debian/wireshark-common.manpages
+++ wireshark-0.99.4/debian/wireshark-common.manpages
@@ -0,0 +1,5 @@
+editcap.1
+mergecap.1
+text2pcap.1
+wireshark-filter.4
+capinfos.1
--- wireshark-0.99.4.orig/debian/pyversions
+++ wireshark-0.99.4/debian/pyversions
@@ -0,0 +1 @@
+2.3-
--- wireshark-0.99.4.orig/debian/pycompat
+++ wireshark-0.99.4/debian/pycompat
@@ -0,0 +1 @@
+2
--- wireshark-0.99.4.orig/doc/Makefile.in
+++ wireshark-0.99.4/doc/Makefile.in
@@ -126,6 +126,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -244,12 +245,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -269,9 +268,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -280,6 +282,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -287,15 +290,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/epan/Makefile.in
+++ wireshark-0.99.4/epan/Makefile.in
@@ -200,6 +200,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -318,12 +319,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -343,9 +342,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -354,6 +356,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -361,15 +364,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/epan/dfilter/Makefile.in
+++ wireshark-0.99.4/epan/dfilter/Makefile.in
@@ -144,6 +144,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -262,12 +263,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -287,9 +286,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -298,6 +300,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -305,15 +308,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/epan/dissectors/Makefile.in
+++ wireshark-0.99.4/epan/dissectors/Makefile.in
@@ -385,6 +385,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -503,12 +504,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -528,9 +527,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -539,6 +541,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -546,15 +549,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/epan/ftypes/Makefile.in
+++ wireshark-0.99.4/epan/ftypes/Makefile.in
@@ -143,6 +143,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -261,12 +262,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -286,9 +285,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -297,6 +299,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -304,15 +307,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/epan/wslua/Makefile.in
+++ wireshark-0.99.4/epan/wslua/Makefile.in
@@ -155,6 +155,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -273,12 +274,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -298,9 +297,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -309,6 +311,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -316,15 +319,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/gtk/Makefile.in
+++ wireshark-0.99.4/gtk/Makefile.in
@@ -298,6 +298,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -416,12 +417,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -441,9 +440,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -452,6 +454,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -459,15 +462,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/help/Makefile.in
+++ wireshark-0.99.4/help/Makefile.in
@@ -133,6 +133,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -251,12 +252,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -276,9 +275,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -287,6 +289,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -294,15 +297,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/ltmain.sh
+++ wireshark-0.99.4/ltmain.sh
@@ -43,7 +43,7 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="1.5.22 Debian 1.5.22-2"
+VERSION="1.5.22 Debian 1.5.22-4"
 TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
 
 # See if we are running on zsh, and set the options which allow our
--- wireshark-0.99.4.orig/packaging/Makefile.in
+++ wireshark-0.99.4/packaging/Makefile.in
@@ -109,6 +109,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -227,12 +228,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -252,9 +251,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -263,6 +265,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -270,15 +273,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/packaging/nsis/Makefile.in
+++ wireshark-0.99.4/packaging/nsis/Makefile.in
@@ -100,6 +100,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -218,12 +219,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -243,9 +242,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -254,6 +256,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -261,15 +264,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/packaging/rpm/Makefile.in
+++ wireshark-0.99.4/packaging/rpm/Makefile.in
@@ -109,6 +109,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -227,12 +228,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -252,9 +251,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -263,6 +265,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -270,15 +273,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/packaging/rpm/SPECS/Makefile.in
+++ wireshark-0.99.4/packaging/rpm/SPECS/Makefile.in
@@ -101,6 +101,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -219,12 +220,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -244,9 +243,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -255,6 +257,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -262,15 +265,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/packaging/svr4/Makefile.in
+++ wireshark-0.99.4/packaging/svr4/Makefile.in
@@ -101,6 +101,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -219,12 +220,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -244,9 +243,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -255,6 +257,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -262,15 +265,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/plugins/Makefile.in
+++ wireshark-0.99.4/plugins/Makefile.in
@@ -132,6 +132,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -250,12 +251,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -275,9 +274,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -286,6 +288,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -293,15 +296,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/plugins/acn/Makefile.in
+++ wireshark-0.99.4/plugins/acn/Makefile.in
@@ -178,6 +178,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -300,12 +301,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -325,9 +324,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -336,6 +338,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -343,15 +346,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/plugins/agentx/Makefile.in
+++ wireshark-0.99.4/plugins/agentx/Makefile.in
@@ -177,6 +177,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -299,12 +300,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -324,9 +323,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -335,6 +337,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -342,15 +345,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/plugins/artnet/Makefile.in
+++ wireshark-0.99.4/plugins/artnet/Makefile.in
@@ -177,6 +177,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -299,12 +300,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -324,9 +323,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -335,6 +337,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -342,15 +345,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/plugins/asn1/Makefile.in
+++ wireshark-0.99.4/plugins/asn1/Makefile.in
@@ -177,6 +177,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -299,12 +300,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -324,9 +323,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -335,6 +337,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -342,15 +345,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/plugins/ciscosm/Makefile.in
+++ wireshark-0.99.4/plugins/ciscosm/Makefile.in
@@ -178,6 +178,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -300,12 +301,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -325,9 +324,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -336,6 +338,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -343,15 +346,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/plugins/docsis/Makefile.in
+++ wireshark-0.99.4/plugins/docsis/Makefile.in
@@ -187,6 +187,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -309,12 +310,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -334,9 +333,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -345,6 +347,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -352,15 +355,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/plugins/enttec/Makefile.in
+++ wireshark-0.99.4/plugins/enttec/Makefile.in
@@ -177,6 +177,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -299,12 +300,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -324,9 +323,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -335,6 +337,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -342,15 +345,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/plugins/giop/Makefile.in
+++ wireshark-0.99.4/plugins/giop/Makefile.in
@@ -165,6 +165,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -287,12 +288,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -312,9 +311,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -323,6 +325,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -330,15 +333,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/plugins/gryphon/Makefile.in
+++ wireshark-0.99.4/plugins/gryphon/Makefile.in
@@ -180,6 +180,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -302,12 +303,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -327,9 +326,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -338,6 +340,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -345,15 +348,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/plugins/h223/Makefile.in
+++ wireshark-0.99.4/plugins/h223/Makefile.in
@@ -180,6 +180,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -302,12 +303,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -327,9 +326,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -338,6 +340,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -345,15 +348,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/plugins/irda/Makefile.in
+++ wireshark-0.99.4/plugins/irda/Makefile.in
@@ -178,6 +178,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -300,12 +301,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -325,9 +324,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -336,6 +338,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -343,15 +346,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/plugins/lwres/Makefile.in
+++ wireshark-0.99.4/plugins/lwres/Makefile.in
@@ -177,6 +177,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -299,12 +300,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -324,9 +323,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -335,6 +337,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -342,15 +345,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/plugins/mate/Makefile.in
+++ wireshark-0.99.4/plugins/mate/Makefile.in
@@ -152,6 +152,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -274,12 +275,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -299,9 +298,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -310,6 +312,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -317,15 +320,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/plugins/megaco/Makefile.in
+++ wireshark-0.99.4/plugins/megaco/Makefile.in
@@ -177,6 +177,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -299,12 +300,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -324,9 +323,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -335,6 +337,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -342,15 +345,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/plugins/mgcp/Makefile.in
+++ wireshark-0.99.4/plugins/mgcp/Makefile.in
@@ -178,6 +178,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -300,12 +301,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -325,9 +324,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -336,6 +338,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -343,15 +346,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/plugins/opsi/Makefile.in
+++ wireshark-0.99.4/plugins/opsi/Makefile.in
@@ -178,6 +178,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -300,12 +301,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -325,9 +324,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -336,6 +338,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -343,15 +346,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/plugins/pcli/Makefile.in
+++ wireshark-0.99.4/plugins/pcli/Makefile.in
@@ -177,6 +177,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -299,12 +300,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -324,9 +323,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -335,6 +337,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -342,15 +345,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/plugins/profinet/Makefile.in
+++ wireshark-0.99.4/plugins/profinet/Makefile.in
@@ -178,6 +178,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -300,12 +301,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -325,9 +324,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -336,6 +338,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -343,15 +346,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/plugins/rlm/Makefile.in
+++ wireshark-0.99.4/plugins/rlm/Makefile.in
@@ -178,6 +178,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -300,12 +301,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -325,9 +324,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -336,6 +338,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -343,15 +346,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/plugins/rtnet/Makefile.in
+++ wireshark-0.99.4/plugins/rtnet/Makefile.in
@@ -177,6 +177,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -299,12 +300,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -324,9 +323,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -335,6 +337,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -342,15 +345,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/plugins/rudp/Makefile.in
+++ wireshark-0.99.4/plugins/rudp/Makefile.in
@@ -178,6 +178,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -300,12 +301,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -325,9 +324,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -336,6 +338,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -343,15 +346,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/plugins/sbus/Makefile.in
+++ wireshark-0.99.4/plugins/sbus/Makefile.in
@@ -176,6 +176,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -298,12 +299,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -323,9 +322,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -334,6 +336,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -341,15 +344,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/plugins/stats_tree/Makefile.in
+++ wireshark-0.99.4/plugins/stats_tree/Makefile.in
@@ -150,6 +150,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -272,12 +273,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -297,9 +296,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -308,6 +310,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -315,15 +318,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/plugins/v5ua/Makefile.in
+++ wireshark-0.99.4/plugins/v5ua/Makefile.in
@@ -177,6 +177,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -299,12 +300,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -324,9 +323,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -335,6 +337,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -342,15 +345,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/tools/Makefile.in
+++ wireshark-0.99.4/tools/Makefile.in
@@ -132,6 +132,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -250,12 +251,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -275,9 +274,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -286,6 +288,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -293,15 +296,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/tools/lemon/Makefile.in
+++ wireshark-0.99.4/tools/lemon/Makefile.in
@@ -147,6 +147,7 @@
 GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GOBJECT_QUERY = @GOBJECT_QUERY@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
@@ -265,12 +266,10 @@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_cv_wireshark_have_rpm = @ac_cv_wireshark_have_rpm@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -290,9 +289,12 @@
 capinfos_bin = @capinfos_bin@
 capinfos_man = @capinfos_man@
 datadir = @datadir@
+datarootdir = @datarootdir@
 dftest_bin = @dftest_bin@
+docdir = @docdir@
 dumpcap_bin = @dumpcap_bin@
 dumpcap_man = @dumpcap_man@
+dvidir = @dvidir@
 editcap_bin = @editcap_bin@
 editcap_man = @editcap_man@
 exec_prefix = @exec_prefix@
@@ -301,6 +303,7 @@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 idl2wrs_bin = @idl2wrs_bin@
 idl2wrs_man = @idl2wrs_man@
 includedir = @includedir@
@@ -308,15 +311,18 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mergecap_bin = @mergecap_bin@
 mergecap_man = @mergecap_man@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 plugindir = @plugindir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 randpkt_bin = @randpkt_bin@
 rdps_bin = @rdps_bin@
 sbindir = @sbindir@
--- wireshark-0.99.4.orig/config.status.lineno
+++ wireshark-0.99.4/config.status.lineno
@@ -0,0 +1,1301 @@
+#! /bin/sh
+# Generated by configure.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+SHELL=${CONFIG_SHELL-/bin/sh}
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+as_nl='
+'
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
+do
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
+  else
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+  fi
+done
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# CDPATH.
+$as_unset CDPATH
+
+
+
+  as_lineno_1=153
+  as_lineno_2=154
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+  # Create $as_me.lineno as a copy of $as_myself, but with 158
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line after each line using 160; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing 162, and appends
+  # trailing '-' during substitution so that 163 is not a special
+  # case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+  case `echo 'x\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  *)   ECHO_C='\c';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir
+fi
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s='ln -s'
+  # ... but there are two gotchas:
+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+  # In both cases, we have to default to `cp -p'.
+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+    as_ln_s='cp -p'
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=:
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
+# systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  as_executable_p="test -x"
+else
+  as_executable_p=:
+fi
+rm -f conf$$.file
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+
+# Save the log message, to keep $[0] and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by $as_me, which was
+generated by GNU Autoconf 2.60a.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+# Files that config.status was made for.
+config_files=" Makefile doxygen.cfg asn1/Makefile doc/Makefile epan/Makefile epan/doxygen.cfg epan/dfilter/Makefile epan/dissectors/Makefile epan/ftypes/Makefile epan/wslua/Makefile codecs/Makefile gtk/Makefile gtk/doxygen.cfg help/Makefile packaging/Makefile packaging/nsis/Makefile packaging/rpm/Makefile packaging/rpm/SPECS/Makefile packaging/rpm/SPECS/wireshark.spec packaging/svr4/Makefile packaging/svr4/checkinstall packaging/svr4/pkginfo plugins/Makefile plugins/acn/Makefile plugins/agentx/Makefile plugins/artnet/Makefile plugins/asn1/Makefile plugins/ciscosm/Makefile plugins/docsis/Makefile plugins/enttec/Makefile plugins/giop/Makefile plugins/gryphon/Makefile plugins/h223/Makefile plugins/irda/Makefile plugins/lwres/Makefile plugins/mate/Makefile plugins/megaco/Makefile plugins/mgcp/Makefile plugins/opsi/Makefile plugins/pcli/Makefile plugins/profinet/Makefile plugins/rlm/Makefile plugins/rtnet/Makefile plugins/rudp/Makefile plugins/sbus/Makefile plugins/stats_tree/Makefile plugins/v5ua/Makefile tools/Makefile tools/lemon/Makefile"
+config_headers=" config.h"
+config_commands=" depfiles"
+
+ac_cs_usage="\
+\`$as_me' instantiates files from templates according to the
+current configuration.
+
+Usage: $0 [OPTIONS] [FILE]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+  -q, --quiet      do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+  --file=FILE[:TEMPLATE]
+		   instantiate the configuration file FILE
+  --header=FILE[:TEMPLATE]
+		   instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Configuration commands:
+$config_commands
+
+Report bugs to <bug-autoconf@gnu.org>."
+
+ac_cs_version="\
+config.status
+configured by ./configure, generated by GNU Autoconf 2.60a,
+  with options \"'--prefix=/usr' '--sysconfdir=/usr/share/wireshark' '--datadir=/usr/share/wireshark' '--disable-static' '--disable-ssl' '--without-ucdsnmp' '--enable-gtk2' '--libdir=/usr/lib/wireshark' 'CFLAGS='\"
+
+Copyright (C) 2006 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='/home/fred/src/debian/packages/wireshark/wireshark-0.99.4'
+srcdir='.'
+INSTALL='/usr/bin/install -c'
+# If no file are specified by the user, then we need to provide default
+# value.  By we need to know if files were specified by the user.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    echo "$ac_cs_version"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    { echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
+    echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) { echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; } ;;
+
+  *) ac_config_targets="$ac_config_targets $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+if $ac_cs_recheck; then
+  echo "running CONFIG_SHELL=/bin/sh /bin/sh ./configure " '--prefix=/usr' '--sysconfdir=/usr/share/wireshark' '--datadir=/usr/share/wireshark' '--disable-static' '--disable-ssl' '--without-ucdsnmp' '--enable-gtk2' '--libdir=/usr/lib/wireshark' 'CFLAGS=' $ac_configure_extra_args " --no-create --no-recursion" >&6
+  CONFIG_SHELL=/bin/sh
+  export CONFIG_SHELL
+  exec /bin/sh "./configure" '--prefix=/usr' '--sysconfdir=/usr/share/wireshark' '--datadir=/usr/share/wireshark' '--disable-static' '--disable-ssl' '--without-ucdsnmp' '--enable-gtk2' '--libdir=/usr/lib/wireshark' 'CFLAGS=' $ac_configure_extra_args --no-create --no-recursion
+fi
+
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  echo "$ac_log"
+} >&5
+
+#
+# INIT-COMMANDS
+#
+AMDEP_TRUE="" ac_aux_dir="."
+
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "doxygen.cfg") CONFIG_FILES="$CONFIG_FILES doxygen.cfg" ;;
+    "asn1/Makefile") CONFIG_FILES="$CONFIG_FILES asn1/Makefile" ;;
+    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+    "epan/Makefile") CONFIG_FILES="$CONFIG_FILES epan/Makefile" ;;
+    "epan/doxygen.cfg") CONFIG_FILES="$CONFIG_FILES epan/doxygen.cfg" ;;
+    "epan/dfilter/Makefile") CONFIG_FILES="$CONFIG_FILES epan/dfilter/Makefile" ;;
+    "epan/dissectors/Makefile") CONFIG_FILES="$CONFIG_FILES epan/dissectors/Makefile" ;;
+    "epan/ftypes/Makefile") CONFIG_FILES="$CONFIG_FILES epan/ftypes/Makefile" ;;
+    "epan/wslua/Makefile") CONFIG_FILES="$CONFIG_FILES epan/wslua/Makefile" ;;
+    "codecs/Makefile") CONFIG_FILES="$CONFIG_FILES codecs/Makefile" ;;
+    "gtk/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/Makefile" ;;
+    "gtk/doxygen.cfg") CONFIG_FILES="$CONFIG_FILES gtk/doxygen.cfg" ;;
+    "help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;;
+    "packaging/Makefile") CONFIG_FILES="$CONFIG_FILES packaging/Makefile" ;;
+    "packaging/nsis/Makefile") CONFIG_FILES="$CONFIG_FILES packaging/nsis/Makefile" ;;
+    "packaging/rpm/Makefile") CONFIG_FILES="$CONFIG_FILES packaging/rpm/Makefile" ;;
+    "packaging/rpm/SPECS/Makefile") CONFIG_FILES="$CONFIG_FILES packaging/rpm/SPECS/Makefile" ;;
+    "packaging/rpm/SPECS/wireshark.spec") CONFIG_FILES="$CONFIG_FILES packaging/rpm/SPECS/wireshark.spec" ;;
+    "packaging/svr4/Makefile") CONFIG_FILES="$CONFIG_FILES packaging/svr4/Makefile" ;;
+    "packaging/svr4/checkinstall") CONFIG_FILES="$CONFIG_FILES packaging/svr4/checkinstall" ;;
+    "packaging/svr4/pkginfo") CONFIG_FILES="$CONFIG_FILES packaging/svr4/pkginfo" ;;
+    "plugins/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/Makefile" ;;
+    "plugins/acn/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/acn/Makefile" ;;
+    "plugins/agentx/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/agentx/Makefile" ;;
+    "plugins/artnet/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/artnet/Makefile" ;;
+    "plugins/asn1/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/asn1/Makefile" ;;
+    "plugins/ciscosm/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/ciscosm/Makefile" ;;
+    "plugins/docsis/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/docsis/Makefile" ;;
+    "plugins/enttec/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/enttec/Makefile" ;;
+    "plugins/giop/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/giop/Makefile" ;;
+    "plugins/gryphon/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/gryphon/Makefile" ;;
+    "plugins/h223/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/h223/Makefile" ;;
+    "plugins/irda/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/irda/Makefile" ;;
+    "plugins/lwres/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/lwres/Makefile" ;;
+    "plugins/mate/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mate/Makefile" ;;
+    "plugins/megaco/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/megaco/Makefile" ;;
+    "plugins/mgcp/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mgcp/Makefile" ;;
+    "plugins/opsi/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/opsi/Makefile" ;;
+    "plugins/pcli/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/pcli/Makefile" ;;
+    "plugins/profinet/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/profinet/Makefile" ;;
+    "plugins/rlm/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/rlm/Makefile" ;;
+    "plugins/rtnet/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/rtnet/Makefile" ;;
+    "plugins/rudp/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/rudp/Makefile" ;;
+    "plugins/sbus/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/sbus/Makefile" ;;
+    "plugins/stats_tree/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/stats_tree/Makefile" ;;
+    "plugins/v5ua/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/v5ua/Makefile" ;;
+    "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
+    "tools/lemon/Makefile") CONFIG_FILES="$CONFIG_FILES tools/lemon/Makefile" ;;
+
+  *) { { echo "$as_me:476: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp=
+  trap 'exit_status=$?
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+' 0
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} ||
+{
+   echo "$me: cannot create a temporary directory in ." >&2
+   { (exit 1); exit 1; }
+}
+
+#
+# Set up the sed scripts for CONFIG_FILES section.
+#
+
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
+if test -n "$CONFIG_FILES"; then
+
+cat >"$tmp/subs-1.sed" <<\CEOF
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s,@SHELL@,|#_!!_#|/bin/sh,g
+s,@PATH_SEPARATOR@,|#_!!_#|:,g
+s,@PACKAGE_NAME@,|#_!!_#|,g
+s,@PACKAGE_TARNAME@,|#_!!_#|,g
+s,@PACKAGE_VERSION@,|#_!!_#|,g
+s,@PACKAGE_STRING@,|#_!!_#|,g
+s,@PACKAGE_BUGREPORT@,|#_!!_#|,g
+s,@exec_prefix@,|#_!!_#|${prefix},g
+s,@prefix@,|#_!!_#|/usr,g
+s,@program_transform_name@,|#_!!_#|s\,x\,x\,,g
+s,@bindir@,|#_!!_#|${exec_prefix}/bin,g
+s,@sbindir@,|#_!!_#|${exec_prefix}/sbin,g
+s,@libexecdir@,|#_!!_#|${exec_prefix}/libexec,g
+s,@datarootdir@,|#_!!_#|${prefix}/share,g
+s,@datadir@,|#_!!_#|/usr/share/wireshark,g
+s,@sysconfdir@,|#_!!_#|/usr/share/wireshark,g
+s,@sharedstatedir@,|#_!!_#|${prefix}/com,g
+s,@localstatedir@,|#_!!_#|${prefix}/var,g
+s,@includedir@,|#_!!_#|${prefix}/include,g
+s,@oldincludedir@,|#_!!_#|/usr/include,g
+s,@docdir@,|#_!!_#|${datarootdir}/doc/${PACKAGE},g
+s,@infodir@,|#_!!_#|${datarootdir}/info,g
+s,@htmldir@,|#_!!_#|${docdir},g
+s,@dvidir@,|#_!!_#|${docdir},g
+s,@pdfdir@,|#_!!_#|${docdir},g
+s,@psdir@,|#_!!_#|${docdir},g
+s,@libdir@,|#_!!_#|/usr/lib/wireshark,g
+s,@localedir@,|#_!!_#|${datarootdir}/locale,g
+s,@mandir@,|#_!!_#|${datarootdir}/man,g
+s,@DEFS@,|#_!!_#|-DHAVE_CONFIG_H,g
+s,@ECHO_C@,|#_!!_#|,g
+s,@ECHO_N@,|#_!!_#|-n,g
+s,@ECHO_T@,|#_!!_#|,g
+s,@LIBS@,|#_!!_#|-lz  -lcap,g
+s,@build_alias@,|#_!!_#|,g
+s,@host_alias@,|#_!!_#|,g
+s,@target_alias@,|#_!!_#|,g
+s,@build@,|#_!!_#|i686-pc-linux-gnu,g
+s,@build_cpu@,|#_!!_#|i686,g
+s,@build_vendor@,|#_!!_#|pc,g
+s,@build_os@,|#_!!_#|linux-gnu,g
+s,@host@,|#_!!_#|i686-pc-linux-gnu,g
+s,@host_cpu@,|#_!!_#|i686,g
+s,@host_vendor@,|#_!!_#|pc,g
+s,@host_os@,|#_!!_#|linux-gnu,g
+s,@target@,|#_!!_#|i686-pc-linux-gnu,g
+s,@target_cpu@,|#_!!_#|i686,g
+s,@target_vendor@,|#_!!_#|pc,g
+s,@target_os@,|#_!!_#|linux-gnu,g
+s,@INSTALL_PROGRAM@,|#_!!_#|${INSTALL},g
+s,@INSTALL_SCRIPT@,|#_!!_#|${INSTALL},g
+s,@INSTALL_DATA@,|#_!!_#|${INSTALL} -m 644,g
+s,@CYGPATH_W@,|#_!!_#|echo,g
+s,@PACKAGE@,|#_!!_#|wireshark,g
+s,@VERSION@,|#_!!_#|0.99.4,g
+s,@ACLOCAL@,|#_!!_#|${SHELL} /home/fred/src/debian/packages/wireshark/wireshark-0.99.4/missing --run aclocal-1.9,g
+s,@AUTOCONF@,|#_!!_#|${SHELL} /home/fred/src/debian/packages/wireshark/wireshark-0.99.4/missing --run autoconf,g
+s,@AUTOMAKE@,|#_!!_#|${SHELL} /home/fred/src/debian/packages/wireshark/wireshark-0.99.4/missing --run automake-1.9,g
+s,@AUTOHEADER@,|#_!!_#|${SHELL} /home/fred/src/debian/packages/wireshark/wireshark-0.99.4/missing --run autoheader,g
+s,@MAKEINFO@,|#_!!_#|${SHELL} /home/fred/src/debian/packages/wireshark/wireshark-0.99.4/missing --run makeinfo,g
+s,@install_sh@,|#_!!_#|/home/fred/src/debian/packages/wireshark/wireshark-0.99.4/install-sh,g
+s,@STRIP@,|#_!!_#|strip,g
+s,@INSTALL_STRIP_PROGRAM@,|#_!!_#|${SHELL} $(install_sh) -c -s,g
+s,@mkdir_p@,|#_!!_#|mkdir -p --,g
+s,@AWK@,|#_!!_#|mawk,g
+s,@SET_MAKE@,|#_!!_#|,g
+s,@am__leading_dot@,|#_!!_#|.,g
+s,@AMTAR@,|#_!!_#|${SHELL} /home/fred/src/debian/packages/wireshark/wireshark-0.99.4/missing --run tar,g
+s,@am__tar@,|#_!!_#|${AMTAR} chof - "$$tardir",g
+s,@am__untar@,|#_!!_#|${AMTAR} xf -,g
+s,@CC@,|#_!!_#|gcc,g
+s,@CFLAGS@,|#_!!_#|-DINET6 -D_U_="__attribute__((unused))" -Wall -Wpointer-arith -W   -I/usr/local/include -pthread -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12  ,g
+s,@LDFLAGS@,|#_!!_#| -L/usr/local/lib -L/usr/local/lib,g
+s,@CPPFLAGS@,|#_!!_#| -I/usr/local/include,g
+s,@ac_ct_CC@,|#_!!_#|gcc,g
+s,@EXEEXT@,|#_!!_#|,g
+s,@OBJEXT@,|#_!!_#|o,g
+s,@DEPDIR@,|#_!!_#|.deps,g
+s,@am__include@,|#_!!_#|include,g
+s,@am__quote@,|#_!!_#|,g
+s,@AMDEP_TRUE@,|#_!!_#|,g
+s,@AMDEP_FALSE@,|#_!!_#|#,g
+s,@AMDEPBACKSLASH@,|#_!!_#|\\,g
+s,@CCDEPMODE@,|#_!!_#|depmode=gcc3,g
+s,@am__fastdepCC_TRUE@,|#_!!_#|,g
+s,@am__fastdepCC_FALSE@,|#_!!_#|#,g
+s,@CPP@,|#_!!_#|gcc -E,g
+s,@GREP@,|#_!!_#|/bin/grep,g
+s,@EGREP@,|#_!!_#|/bin/grep -E,g
+s,@LN_S@,|#_!!_#|ln -s,g
+s,@ECHO@,|#_!!_#|echo,g
+s,@AR@,|#_!!_#|ar,g
+s,@RANLIB@,|#_!!_#|ranlib,g
+s,@CXX@,|#_!!_#|g++,g
+s,@CXXFLAGS@,|#_!!_#|-g -O2,g
+s,@ac_ct_CXX@,|#_!!_#|g++,g
+s,@CXXDEPMODE@,|#_!!_#|depmode=gcc3,g
+CEOF
+cat >"$tmp/subs-2.sed" <<\CEOF
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s,@am__fastdepCXX_TRUE@,|#_!!_#|,g
+s,@am__fastdepCXX_FALSE@,|#_!!_#|#,g
+s,@CXXCPP@,|#_!!_#|g++ -E,g
+s,@F77@,|#_!!_#|,g
+s,@FFLAGS@,|#_!!_#|,g
+s,@ac_ct_F77@,|#_!!_#|,g
+s,@LIBTOOL@,|#_!!_#|$(SHELL) $(top_builddir)/libtool,g
+s,@YACC@,|#_!!_#|bison -y,g
+s,@YFLAGS@,|#_!!_#|,g
+s,@LEX@,|#_!!_#|/usr/bin/flex,g
+s,@LEX_OUTPUT_ROOT@,|#_!!_#|lex.yy,g
+s,@LEXLIB@,|#_!!_#|-lfl,g
+s,@PERL@,|#_!!_#|/usr/bin/perl,g
+s,@POD2MAN@,|#_!!_#|/usr/bin/pod2man,g
+s,@POD2HTML@,|#_!!_#|/usr/bin/pod2html,g
+s,@HTML_VIEWER@,|#_!!_#|/usr/bin/sensible-browser,g
+s,@PYTHON@,|#_!!_#|/usr/bin/python,g
+s,@FLEX_PATH@,|#_!!_#|,g
+s,@XSLTPROC@,|#_!!_#|/usr/bin/xsltproc,g
+s,@XMLLINT@,|#_!!_#|,g
+s,@DOXYGEN@,|#_!!_#|,g
+s,@HAVE_DOXYGEN@,|#_!!_#|no,g
+s,@HAVE_DOXYGEN_TRUE@,|#_!!_#|#,g
+s,@HAVE_DOXYGEN_FALSE@,|#_!!_#|,g
+s,@LIBGNUTLS_CONFIG@,|#_!!_#|/usr/bin/libgnutls-config,g
+s,@LIBGNUTLS_CFLAGS@,|#_!!_#|-I/usr/include -I/usr/include,g
+s,@LIBGNUTLS_LIBS@,|#_!!_#|-lgnutls,g
+s,@LIBGCRYPT_CONFIG@,|#_!!_#|/usr/bin/libgcrypt-config,g
+s,@LIBGCRYPT_CFLAGS@,|#_!!_#|  ,g
+s,@LIBGCRYPT_LIBS@,|#_!!_#| -lgcrypt -lgpg-error,g
+s,@HAVE_XSLTPROC@,|#_!!_#|yes,g
+s,@HAVE_XSLTPROC_TRUE@,|#_!!_#|,g
+s,@HAVE_XSLTPROC_FALSE@,|#_!!_#|#,g
+s,@HAVE_XMLLINT@,|#_!!_#|no,g
+s,@HAVE_XMLLINT_TRUE@,|#_!!_#|#,g
+s,@HAVE_XMLLINT_FALSE@,|#_!!_#|,g
+s,@FOP@,|#_!!_#|,g
+s,@HAVE_FOP@,|#_!!_#|no,g
+s,@HAVE_FOP_TRUE@,|#_!!_#|#,g
+s,@HAVE_FOP_FALSE@,|#_!!_#|,g
+s,@HHC@,|#_!!_#|,g
+s,@HAVE_HHC@,|#_!!_#|no,g
+s,@HAVE_HHC_TRUE@,|#_!!_#|#,g
+s,@HAVE_HHC_FALSE@,|#_!!_#|,g
+s,@HAVE_PKGPROTO@,|#_!!_#|no,g
+s,@HAVE_PKGMK@,|#_!!_#|no,g
+s,@HAVE_PKGTRANS@,|#_!!_#|no,g
+s,@HAVE_SVR4_PACKAGING@,|#_!!_#|no,g
+s,@ac_cv_wireshark_have_rpm@,|#_!!_#|no,g
+s,@HAVE_RPM@,|#_!!_#|,g
+s,@FRAMEWORKS@,|#_!!_#|,g
+s,@USE_GTK2_TRUE@,|#_!!_#|,g
+s,@USE_GTK2_FALSE@,|#_!!_#|#,g
+s,@USE_THREADS_TRUE@,|#_!!_#|#,g
+s,@USE_THREADS_FALSE@,|#_!!_#|,g
+s,@USE_PROFILE_BUILD_TRUE@,|#_!!_#|#,g
+s,@USE_PROFILE_BUILD_FALSE@,|#_!!_#|,g
+s,@PKG_CONFIG@,|#_!!_#|/usr/bin/pkg-config,g
+s,@GTK_CFLAGS@,|#_!!_#|-pthread -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12  ,g
+s,@GTK_LIBS@,|#_!!_#|-pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXext -lXrender -lXinerama -lXi -lXrandr -lXcursor -lXfixes -lpango-1.0 -lcairo -lX11 -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0  ,g
+s,@GTK_CONFIG@,|#_!!_#|,g
+s,@GLIB_CFLAGS@,|#_!!_#|-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  ,g
+s,@GLIB_LIBS@,|#_!!_#|-Wl\,--export-dynamic -lgmodule-2.0 -ldl -lglib-2.0  ,g
+s,@GLIB_GENMARSHAL@,|#_!!_#|glib-genmarshal,g
+s,@GOBJECT_QUERY@,|#_!!_#|gobject-query,g
+s,@GLIB_MKENUMS@,|#_!!_#|glib-mkenums,g
+s,@GLIB_CONFIG@,|#_!!_#|,g
+s,@wireshark_bin@,|#_!!_#|wireshark$(EXEEXT),g
+s,@wireshark_man@,|#_!!_#|wireshark.1,g
+s,@rdps_bin@,|#_!!_#|rdps$(EXEEXT),g
+s,@tshark_bin@,|#_!!_#|tshark$(EXEEXT),g
+s,@tshark_man@,|#_!!_#|tshark.1,g
+s,@wiresharkfilter_man@,|#_!!_#|wireshark-filter.4,g
+s,@editcap_bin@,|#_!!_#|editcap$(EXEEXT),g
+s,@editcap_man@,|#_!!_#|editcap.1,g
+s,@dumpcap_bin@,|#_!!_#|dumpcap$(EXEEXT),g
+s,@dumpcap_man@,|#_!!_#|dumpcap.1,g
+s,@capinfos_bin@,|#_!!_#|capinfos$(EXEEXT),g
+s,@capinfos_man@,|#_!!_#|capinfos.1,g
+s,@mergecap_bin@,|#_!!_#|mergecap$(EXEEXT),g
+s,@mergecap_man@,|#_!!_#|mergecap.1,g
+s,@text2pcap_bin@,|#_!!_#|text2pcap$(EXEEXT),g
+s,@text2pcap_man@,|#_!!_#|text2pcap.1,g
+s,@idl2wrs_bin@,|#_!!_#|idl2wrs,g
+s,@idl2wrs_man@,|#_!!_#|idl2wrs.1,g
+s,@dftest_bin@,|#_!!_#|dftest$(EXEEXT),g
+s,@randpkt_bin@,|#_!!_#|randpkt$(EXEEXT),g
+s,@NSL_LIBS@,|#_!!_#|,g
+s,@SOCKET_LIBS@,|#_!!_#|,g
+s,@PCAP_LIBS@,|#_!!_#|-lpcap,g
+s,@PCRE_LIBS@,|#_!!_#|-lpcre,g
+s,@LUA_LIBS@,|#_!!_#|,g
+s,@LUA_INCLUDES@,|#_!!_#|,g
+s,@HAVE_LIBLUA_TRUE@,|#_!!_#|#,g
+s,@HAVE_LIBLUA_FALSE@,|#_!!_#|,g
+s,@PORTAUDIO_LIBS@,|#_!!_#|-lportaudio,g
+s,@PORTAUDIO_INCLUDES@,|#_!!_#|,g
+CEOF
+cat >"$tmp/subs-3.sed" <<\CEOF
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+s,@HAVE_LIBPORTAUDIO_TRUE@,|#_!!_#|,g
+s,@HAVE_LIBPORTAUDIO_FALSE@,|#_!!_#|#,g
+s,@SETUID_INSTALL_TRUE@,|#_!!_#|#,g
+s,@SETUID_INSTALL_FALSE@,|#_!!_#|,g
+s,@LIBICONV@,|#_!!_#|,g
+s,@SSL_LIBS@,|#_!!_#|,g
+s,@NETSNMPCONFIG@,|#_!!_#|,g
+s,@SNMP_LIBS@,|#_!!_#|,g
+s,@KRB5_CONFIG@,|#_!!_#|,g
+s,@KRB5_LIBS@,|#_!!_#|,g
+s,@ADNS_LIBS@,|#_!!_#|-ladns,g
+s,@GETOPT_C@,|#_!!_#|,g
+s,@GETOPT_O@,|#_!!_#|,g
+s,@STRERROR_C@,|#_!!_#|,g
+s,@STRERROR_O@,|#_!!_#|,g
+s,@STRCASECMP_C@,|#_!!_#|,g
+s,@STRCASECMP_O@,|#_!!_#|,g
+s,@STRNCASECMP_C@,|#_!!_#|,g
+s,@STRNCASECMP_O@,|#_!!_#|,g
+s,@MKSTEMP_C@,|#_!!_#|,g
+s,@MKSTEMP_O@,|#_!!_#|,g
+s,@G_ASCII_STRTOULL_C@,|#_!!_#|,g
+s,@G_ASCII_STRTOULL_O@,|#_!!_#|,g
+s,@G_ASCII_STRTOULL_LO@,|#_!!_#|,g
+s,@INET_ATON_C@,|#_!!_#|,g
+s,@INET_ATON_O@,|#_!!_#|,g
+s,@INET_ATON_LO@,|#_!!_#|,g
+s,@INET_PTON_C@,|#_!!_#|,g
+s,@INET_PTON_O@,|#_!!_#|,g
+s,@INET_PTON_LO@,|#_!!_#|,g
+s,@INET_NTOP_C@,|#_!!_#|,g
+s,@INET_NTOP_O@,|#_!!_#|,g
+s,@INET_NTOP_LO@,|#_!!_#|,g
+s,@STRPTIME_C@,|#_!!_#|,g
+s,@STRPTIME_O@,|#_!!_#|,g
+s,@wireshark_SUBDIRS@,|#_!!_#|codecs gtk,g
+s,@HAVE_PLUGINS_TRUE@,|#_!!_#|,g
+s,@HAVE_PLUGINS_FALSE@,|#_!!_#|#,g
+s,@plugindir@,|#_!!_#|/usr/lib/wireshark/plugins/0.99.4,g
+s,@PLUGIN_LIBS@,|#_!!_#|-L../../epan -Wl\,--export-dynamic -lgmodule-2.0 -ldl -lglib-2.0  ,g
+s,@LIBTOOL_DEPS@,|#_!!_#|./ltmain.sh,g
+s,@ENABLE_STATIC_TRUE@,|#_!!_#|#,g
+s,@ENABLE_STATIC_FALSE@,|#_!!_#|,g
+s,@ENABLE_STATIC@,|#_!!_#|,g
+s,@subdirs@,|#_!!_#| wiretap,g
+s,@LIBOBJS@,|#_!!_#|,g
+s,@LTLIBOBJS@,|#_!!_#|,g
+:end
+s/|#_!!_#|//g
+CEOF
+fi # test -n "$CONFIG_FILES"
+
+
+for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) { { echo "$as_me:792: error: Invalid tag $ac_tag." >&5
+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+   { (exit 1); exit 1; }; };;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   { { echo "$as_me:822: error: cannot find input file: $ac_f" >&5
+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+   { (exit 1); exit 1; }; };;
+      esac
+      ac_file_inputs="$ac_file_inputs $ac_f"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input="Generated from "`IFS=:
+	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { echo "$as_me:836: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    fi
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$tmp/stdin";;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  { as_dir="$ac_dir"
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { echo "$as_me:907: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+
+case `sed -n '/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p
+' $ac_file_inputs` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { echo "$as_me:971: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  ac_datarootdir_hack='
+  s&@datadir@&/usr/share/wireshark&g
+  s&@docdir@&${datarootdir}/doc/${PACKAGE}&g
+  s&@infodir@&${datarootdir}/info&g
+  s&@localedir@&${datarootdir}/locale&g
+  s&@mandir@&${datarootdir}/man&g
+    s&\${datarootdir}&${prefix}/share&g' ;;
+esac
+  sed "/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
+s/:*$//
+s/^[^=]*=[	 ]*$//
+}
+
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s&@configure_input@&$configure_input&;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+$ac_datarootdir_hack
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { echo "$as_me:1008: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&5
+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&2;}
+
+  rm -f "$tmp/stdin"
+  case $ac_file in
+  -) cat "$tmp/out"; rm -f "$tmp/out";;
+  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
+  esac
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+    # First, check the format of the line:
+    cat >"$tmp/defines.sed" <<\CEOF
+/^[	 ]*#[	 ]*undef[	 ][	 ]*[_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ][_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]*[	 ]*$/b def
+/^[	 ]*#[	 ]*define[	 ][	 ]*[_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ][_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]*[(	 ]/b def
+b
+:def
+s/$/ /
+s,^\([	 #]*\)[^	 ]*\([	 ]*PACKAGE_NAME\)[	 (].*,\1define\2 "" ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*PACKAGE_TARNAME\)[	 (].*,\1define\2 "" ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*PACKAGE_VERSION\)[	 (].*,\1define\2 "" ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*PACKAGE_STRING\)[	 (].*,\1define\2 "" ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*PACKAGE_BUGREPORT\)[	 (].*,\1define\2 "" ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*PACKAGE\)[	 (].*,\1define\2 "wireshark" ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*VERSION\)[	 (].*,\1define\2 "0.99.4" ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*STDC_HEADERS\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_SYS_TYPES_H\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_SYS_STAT_H\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_STDLIB_H\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_STRING_H\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_MEMORY_H\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_STRINGS_H\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_INTTYPES_H\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_STDINT_H\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_UNISTD_H\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_DLFCN_H\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*YYTEXT_POINTER\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HTML_VIEWER\)[	 (].*,\1define\2 "sensible-browser" ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_LIBGNUTLS\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_LIBGCRYPT\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*DATAFILE_DIR\)[	 (].*,\1define\2 "/usr/share/wireshark/wireshark" ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_INTTYPES_H\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*INTTYPES_H_DEFINES_FORMATS\)[	 (].*,\1define\2  ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_LIBPCAP\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_PCAP_VERSION\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_PCAP_OPEN_DEAD\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_PCAP_FREECODE\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_PCAP_BREAKLOOP\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_PCAP_FINDALLDEVS\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_PCAP_DATALINK_VAL_TO_NAME\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_PCAP_DATALINK_NAME_TO_VAL\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_PCAP_LIST_DATALINKS\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_PCAP_SET_DATALINK\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_PCAP_LIB_VERSION\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_PCAP_GET_SELECTABLE_FD\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_LIBZ\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_LIBPCRE\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_PORTAUDIO_H\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*PORTAUDIO_API_1\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_LIBPORTAUDIO\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_LIBCAP\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*STDC_HEADERS\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_DIRENT_H\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_FCNTL_H\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_NETDB_H\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_STDARG_H\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_STDDEF_H\)[	 (].*,\1define\2 1 ,
+CEOF
+    sed -f "$tmp/defines.sed" $ac_file_inputs >"$tmp/out1"
+    # First, check the format of the line:
+    cat >"$tmp/defines.sed" <<\CEOF
+/^[	 ]*#[	 ]*undef[	 ][	 ]*[_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ][_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]*[	 ]*$/b def
+/^[	 ]*#[	 ]*define[	 ][	 ]*[_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ][_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]*[(	 ]/b def
+b
+:def
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_UNISTD_H\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_SYS_IOCTL_H\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_SYS_PARAM_H\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_SYS_SOCKET_H\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_SYS_STAT_H\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_SYS_TIME_H\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_SYS_TYPES_H\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_SYS_UTSNAME_H\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_SYS_WAIT_H\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_NETINET_IN_H\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_ARPA_INET_H\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_ARPA_NAMESER_H\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_ICONV\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*ICONV_CONST\)[	 (].*,\1define\2  ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_GNU_ADNS\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*WS_VAR_IMPORT\)[	 (].*,\1define\2 extern ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_INET_NTOP_PROTO\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_GETPROTOBYNUMBER\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_GETHOSTBYNAME2\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_MMAP\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_MPROTECT\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_SYSCONF\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_PLUGINS\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*PLUGIN_DIR\)[	 (].*,\1define\2 "/usr/lib/wireshark/plugins/0.99.4" ,
+s/ $//
+s,^[	 #]*u.*,/* & */,
+CEOF
+    sed -f "$tmp/defines.sed" "$tmp/out1" >"$tmp/out2"
+ac_result="$tmp/out2"
+  if test x"$ac_file" != x-; then
+    echo "/* $configure_input  */" >"$tmp/config.h"
+    cat "$ac_result" >>"$tmp/config.h"
+    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
+      { echo "$as_me:1120: $ac_file is unchanged" >&5
+echo "$as_me: $ac_file is unchanged" >&6;}
+    else
+      rm -f $ac_file
+      mv "$tmp/config.h" $ac_file
+    fi
+  else
+    echo "/* $configure_input  */"
+    cat "$ac_result"
+  fi
+  rm -f "$tmp/out12"
+# Compute $ac_file's index in $config_headers.
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $ac_file | $ac_file:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
+$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X$ac_file : 'X\(//\)[^/]' \| \
+	 X$ac_file : 'X\(//\)$' \| \
+	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
+echo X$ac_file |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
+
+  :C)  { echo "$as_me:1166: executing $ac_file commands" >&5
+echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
+
+
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+  # Strip MF so we end up with the name of the file.
+  mf=`echo "$mf" | sed -e 's/:.*$//'`
+  # Check whether this is an Automake generated Makefile or not.
+  # We used to match only the files named `Makefile.in', but
+  # some people rename them; so instead we look at the file content.
+  # Grep'ing the first line is not enough: some people post-process
+  # each Makefile.in and add a new line on top of each file to say so.
+  # So let's grep whole file.
+  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+    dirpart=`$as_dirname -- "$mf" ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$mf" : 'X\(//\)[^/]' \| \
+	 X"$mf" : 'X\(//\)$' \| \
+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$mf" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  else
+    continue
+  fi
+  # Extract the definition of DEPDIR, am__include, and am__quote
+  # from the Makefile without running `make'.
+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+  test -z "$DEPDIR" && continue
+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
+  test -z "am__include" && continue
+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+  # When using ansi2knr, U may be empty or an underscore; expand it
+  U=`sed -n 's/^U = //p' < "$mf"`
+  # Find all dependency output files, they are included files with
+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
+  # simplest approach to changing $(DEPDIR) to its actual value in the
+  # expansion.
+  for file in `sed -n "
+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+    # Make sure the directory exists.
+    test -f "$dirpart/$file" && continue
+    fdir=`$as_dirname -- "$file" ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$file" : 'X\(//\)[^/]' \| \
+	 X"$file" : 'X\(//\)$' \| \
+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    { as_dir=$dirpart/$fdir
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { echo "$as_me:1288: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
+    # echo "creating $dirpart/$file"
+    echo '# dummy' > "$dirpart/$file"
+  done
+done
+ ;;
+
+  esac
+done # for ac_tag
+
+
+{ (exit 0); exit 0; }
