1.8.3 → 1.8.4.

svn path=/trunk-1.8/; revision=45262

9 files changed, 26 insertions, 297 deletions

diff --git a/config.nmake b/config.nmake
index 9fa2bf87e5..abac06b2ec 100644
--- a/config.nmake
+++ b/config.nmake
@@ -19,7 +19,7 @@ SVN_REVISION=0
 # Updated by make-version.pl
 VERSION_MAJOR=1
 VERSION_MINOR=8
-VERSION_MICRO=3
+VERSION_MICRO=4
 VERSION_BUILD=$(SVN_REVISION)
 
 # Local build information. Recommended: Unique string for your
diff --git a/configure.in b/configure.in
index 5b208f358d..c758319366 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@
 #
 AC_PREREQ(2.60)
 
-AC_INIT(wireshark, 1.8.3)
+AC_INIT(wireshark, 1.8.4)
 
 dnl Check for CPU / vendor / OS
 dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or
diff --git a/debian/changelog b/debian/changelog
index 7586c9d7d6..6fa08fde17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wireshark (1.8.3) unstable; urgency=low
+wireshark (1.8.4) unstable; urgency=low
 
   * Self-made package
 
diff --git a/debian/wireshark-common.files b/debian/wireshark-common.files
index f6dbbcbe03..ce6aa1967c 100644
--- a/debian/wireshark-common.files
+++ b/debian/wireshark-common.files
@@ -5,9 +5,9 @@
 /usr/bin/text2pcap
 /usr/bin/rawshark
 /usr/lib/wireshark/libwireshark.so.2
-/usr/lib/wireshark/libwireshark.so.2.0.3
+/usr/lib/wireshark/libwireshark.so.2.0.4
 /usr/lib/wireshark/libwiretap.so.2
-/usr/lib/wireshark/libwiretap.so.2.0.3
+/usr/lib/wireshark/libwiretap.so.2.0.4
 /usr/lib/wireshark/libwsutil.so.2
 /usr/lib/wireshark/libwsutil.so.2.0.0
 /usr/lib/wireshark/plugins/*
diff --git a/docbook/release-notes.xml b/docbook/release-notes.xml
index 017b91ce57..458073206f 100644
--- a/docbook/release-notes.xml
+++ b/docbook/release-notes.xml
@@ -12,7 +12,7 @@ DOCUMENT SECTION
 <!--
 Wireshark Info
 -->
-<!ENTITY WiresharkCurrentVersion "1.8.3">
+<!ENTITY WiresharkCurrentVersion "1.8.4">
 
 ]>
 
@@ -36,72 +36,19 @@ Wireshark Info
 
         <listitem>
           <para>
-            <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-26.html">wnpa-sec-2012-26</ulink>
+            <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-26.html">wnpa-sec-2012-30</ulink>
           </para>
           <para>
-	    The HSRP dissector could go into an infinite loop.
-            <!-- Fixed in trunk: r44454 -->
-            <!-- Fixed in trunk-1.8: r45125 -->
-            (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7581">Bug
-            7581</ulink>)
+	    .
+            <!-- Fixed in trunk: r? -->
+            <!-- Fixed in trunk-1.8: r? -->
+            <!-- Fixed in trunk-1.6: r? -->
+            (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=X">Bug
+            X</ulink>)
           </para>
-          <para>Versions affected: 1.8.0 to 1.8.2.</para>
+          <para>Versions affected: 1.8.0 to 1.8.3, 1.6.0 to 1.6.11.</para>
           <para>
-            <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-5237">CVE-2012-5237</ulink>
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-27.html">wnpa-sec-2012-27</ulink>
-          </para>
-          <para>
-	    The PPP dissector could abort.
-            <!-- Fixed in trunk: r44688, r44689 -->
-            <!-- Fixed in trunk-1.8: r45126 -->
-            (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7316">Bug
-            7316</ulink>,
-            <ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7668">bug
-            7668</ulink>)
-          </para>
-          <para>Versions affected: 1.8.0 to 1.8.2.</para>
-          <para>
-            <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-5238">CVE-2012-5238</ulink>
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-28.html">wnpa-sec-2012-28</ulink>
-          </para>
-          <para>
-	    Martin Wilck discovered an infinite loop in the DRDA dissector.
-            <!-- Fixed in trunk: r44749 -->
-            <!-- Fixed in trunk-1.8: r45129 -->
-            <!-- Fixed in trunk-1.6: r45234 -->
-            (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7666">Bug
-            7666</ulink>)
-          </para>
-          <para>Versions affected: 1.6.0 to 1.6.10, 1.8.0 to 1.8.2.</para>
-          <para>
-            <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-5239">CVE-2012-5239</ulink>
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-29.html">wnpa-sec-2012-29</ulink>
-          </para>
-          <para>
-	    Laurent Butti discovered a buffer overflow in the LDP dissector.
-            <!-- Fixed in trunk: r44801 -->
-            <!-- Fixed in trunk-1.8: r45130 -->
-            (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7567">Bug
-            7567</ulink>)
-          </para>
-          <para>Versions affected: 1.8.0 to 1.8.2.</para>
-          <para>
-            <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-5240">CVE-2012-5240</ulink>
+            <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-X">CVE-2012-X</ulink>
           </para>
         </listitem>
 
@@ -115,192 +62,6 @@ Wireshark Info
 
       <itemizedlist>
 
-        <listitem><para>
-	  The HTTP dissector does not reassemble headers when the first TCP segment does not contain a full header line.
-        </para></listitem>
-
-        <listitem><para>
-	  HDCP2 uses the wrong protocol id.
-        </para></listitem>
-
-        <listitem><para>
-	  Several I/O graph problems have been fixed.
-        </para></listitem>
-
-        <listitem><para>
-          No markers show up when maps are displayed.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5016">Bug
-          5016</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          Assertion when using tshark/wireshark on large captures.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5699">Bug
-          5699</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          Volume label field of &quot;SMB/TRANS2-QUERY_FS_INFO/InfoVolume level&quot; reply packet is not displayed correctly due alignment issue.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5778">Bug
-          5778</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          64-bit Wireshark appears to hit 2-Gbyte memory limit on 64-bit Windows.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5979">Bug
-          5979</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          Truncated/partial JPEG files are not dissected.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6230">Bug
-          6230</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          Support for MPLS Packet Loss and Delay Measurement, RFC 6374.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6881">Bug
-          6881</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          Memory leak in voip_calls.c.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7320">Bug
-          7320</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          When listing protocols available for &quot;Decode As&quot;, plugins are sorted after built-ins.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7348">Bug
-          7348</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          Hidden columns should not be printed when printing packet summary line.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7356">Bug
-          7356</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          Size wrong in &quot;File Set List&quot; for just-finished captures.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7370">Bug
-          7370</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          Error: no dependency information found for debian/wireshark-common/usr/lib/wireshark/libwsutil.so.2 (used by debian/wireshark/usr/bin/wireshark).
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7408">Bug
-          7408</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          Parse and properly display LTE RADIUS AVP 3GPP-User-Location-Info.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7474">Bug
-          7474</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          [PATCH] HomeplugAV dissector: decode device id.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7548">Bug
-          7548</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          BACnet GetEnrollmentSummary-ACK does not decode correctly.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7556">Bug
-          7556</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          epan/dissectors/packet-per.c dissect_per_constrained_integer_64b fails for 64 bits.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7624">Bug
-          7624</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          New SCTP PPID 48.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7635">Bug
-          7635</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          dissector of Qos attribute &quot;Reliability Class&quot; in GMM/SM message.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7670">Bug
-          7670</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          Performance regression in tshark -z io,stat.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7674">Bug
-          7674</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          Incorrect io-stat table format when unsupported &quot;-t&quot; operand is specified and when using AVG of relative_time fields.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7685">Bug
-          7685</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          IEEE 802.11 TKIP dissection : wrong IS_TKIP macro.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7691">Bug
-          7691</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          Homeplug AV dissectors does not properly dissect short frames.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7707">Bug
-          7707</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          mm_context_nas_dl_cnt and mm_context_nas_ul_cnt are not dissected properly in ContextResponse message in Gtpv2.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7718">Bug
-          7718</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          This trace causes Wireshark to crash when VoIP Calls selected.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7724">Bug
-          7724</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          Some diameter Gx enumerations are missing values or value is incorrect.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7727">Bug
-          7727</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          Wireshark 1.8.2 is only displaying 2 filters from the drop-down menu even when preferences are set to higher integer.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7731">Bug
-          7731</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          BGP bad decoding for Graceful Restart Capability with only helper support &amp; for Enhanced Route Refresh Capability.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7734">Bug
-          7734</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          Dissection error of D-RELEASE and D-CONNECT in TETRA dissector.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7736">Bug
-          7736</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          DND can cause Wireshark to crash.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7744">Bug
-          7744</ulink>)
-        </para></listitem>
-
-        <listitem><para>
-          SCSI: WRITE BUFFER fields always display as zero.
-          (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7753">Bug
-          7753</ulink>)
-        </para></listitem>
-
 <!-- Sort by bug # -->
 <!--
         <listitem><para>
@@ -337,39 +98,7 @@ There are no new protocols in this release.
 
 <!-- Sort alphabetically -->
 
-ASN.1 PER,
-BACnet,
-BGP,
-DIAMETER,
-DRDA,
-DVB CI,
-DVB,
-GSM Management,
-GTP,
-GTPv2,
-HDCP2,
-HomePlug AV,
-ICMP,
-ICMPv6,
-IEEE 802.11,
-IEEE 802a,
-Interlink,
-JPEG,
-LDP,
-LPP,
-MPEG,
-MPLS,
-PCAP,
-PPP,
-RANAP,
-RRC,
-RRLP,
-SCCP,
-SCSI,
-SCTP,
-SDP,
-SMB,
-TETRA
+.
 
     </para>
     </section>
@@ -377,7 +106,7 @@ TETRA
     <section id="NewCapture"><title>New and Updated Capture File Support</title>
     <para>
 
-There are no file format updates in this release.
+.
 
     </para>
     </section>
diff --git a/epan/Makefile.am b/epan/Makefile.am
index 72955726fd..001f5e8b43 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -56,7 +56,7 @@ ACLOCAL_AMFLAGS = `../aclocal-flags`
 noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la
 lib_LTLIBRARIES = libwireshark.la
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-libwireshark_la_LDFLAGS = -version-info 2:3:0 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@
+libwireshark_la_LDFLAGS = -version-info 2:4:0 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@
 
 include Makefile.common
 
diff --git a/make-version.pl b/make-version.pl
index 437e33968a..096c8c605a 100755
--- a/make-version.pl
+++ b/make-version.pl
@@ -75,7 +75,7 @@ my $set_release = 0;
 my %version_pref = (
 	"version_major" => 1,
 	"version_minor" => 8,
-	"version_micro" => 3,
+	"version_micro" => 4,
 	"version_build" => 0,
 
 	"enable"        => 1,
diff --git a/version.conf b/version.conf
index 4e358d2d42..37bef0baf7 100644
--- a/version.conf
+++ b/version.conf
@@ -1,9 +1,9 @@
 # Interim releases: Enable packaging, add a "pre" to the version.
-#enable: 1
-#pkg_format: pre1-%#
-#pkg_enable: 1
+enable: 1
+pkg_format: pre1-%#
+pkg_enable: 1
 
 # Final release: Disable package version stamps.
-enable: 1
-pkg_format:
-pkg_enable: 0
+#enable: 1
+#pkg_format:
+#pkg_enable: 0
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 4e02a34545..f9134953a7 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -30,7 +30,7 @@ include Makefile.common
 noinst_LTLIBRARIES = libwiretap_generated.la
 lib_LTLIBRARIES = libwiretap.la
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-libwiretap_la_LDFLAGS = -version-info 3:3:1 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@
+libwiretap_la_LDFLAGS = -version-info 3:4:1 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@
 
 if HAVE_WARNINGS_AS_ERRORS
 AM_NON_GENERATED_CFLAGS = -Werror