aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config.nmake2
-rw-r--r--configure.in2
-rw-r--r--debian/changelog2
-rw-r--r--debian/wireshark-common.files4
-rw-r--r--docbook/release-notes.xml108
-rw-r--r--epan/Makefile.am2
-rwxr-xr-xmake-version.pl2
-rw-r--r--version.conf12
-rw-r--r--wiretap/Makefile.am2
9 files changed, 24 insertions, 112 deletions
diff --git a/config.nmake b/config.nmake
index fb02671d41..506bc18e19 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=1
+VERSION_MICRO=2
VERSION_BUILD=$(SVN_REVISION)
# Local build information. Recommended: Unique string for your
diff --git a/configure.in b/configure.in
index 90719b6502..4a4748aa2e 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@
#
AC_PREREQ(2.60)
-AC_INIT(wireshark, 1.8.1)
+AC_INIT(wireshark, 1.8.2)
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 30eae16244..bfc73caed7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wireshark (1.8.1) unstable; urgency=low
+wireshark (1.8.2) unstable; urgency=low
* Self-made package
diff --git a/debian/wireshark-common.files b/debian/wireshark-common.files
index 55b1b51b10..6f92ee8f38 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.1
+/usr/lib/wireshark/libwireshark.so.2.0.2
/usr/lib/wireshark/libwiretap.so.2
-/usr/lib/wireshark/libwiretap.so.2.0.1
+/usr/lib/wireshark/libwiretap.so.2.0.2
/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 1c1d37c82f..c4c1b1e869 100644
--- a/docbook/release-notes.xml
+++ b/docbook/release-notes.xml
@@ -12,7 +12,7 @@ DOCUMENT SECTION
<!--
Wireshark Info
-->
-<!ENTITY WiresharkCurrentVersion "1.8.1">
+<!ENTITY WiresharkCurrentVersion "1.8.2">
]>
@@ -36,39 +36,18 @@ Wireshark Info
<listitem>
<para>
- <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-11.html">wnpa-sec-2012-11</ulink>
+ <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-13.html">wnpa-sec-2012-13</ulink>
</para>
<para>
- The PPP dissector could crash.
- <!-- Fixed in trunk: r43784 -->
- <!-- Fixed in trunk-1.8: r43839 -->
- <!-- Fixed in trunk-1.6: r43843 -->
- <!-- Fixed in trunk-1.4: r43870 -->
- <!-- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=????">Bug
- ????</ulink>) -->
- (<ulink url="http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=680056">Debian bug
- 680056</ulink>) -->
- </para>
- <para>Versions affected: 1.4.0 to 1.4.13, 1.6.0 to 1.6.8, 1.8.0.</para>
- <!-- <para>
- <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-????">CVE-2012-????</ulink>
- </para> -->
- </listitem>
-
- <listitem>
- <para>
- <ulink url="http://www.wireshark.org/security/wnpa-sec-2012-12.html">wnpa-sec-2012-12</ulink>
- </para>
- <para>
- The NFS dissector could use excessive amounts of CPU.
- <!-- Fixed in trunk: r43576 -->
- <!-- Fixed in trunk-1.8: r43840 -->
- <!-- Fixed in trunk-1.6: r43869 -->
- <!-- Fixed in trunk-1.4: r43872 -->
+ .
+ <!-- Fixed in trunk: r????? -->
+ <!-- Fixed in trunk-1.8: r????? -->
+ <!-- Fixed in trunk-1.6: r????? -->
+ <!-- Fixed in trunk-1.4: r????? -->
(<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7436">Bug
7436</ulink>)
</para>
- <para>Versions affected: 1.4.0 to 1.4.13, 1.6.0 to 1.6.8, 1.8.0.</para>
+ <para>Versions affected: 1.4.0 to 1.4.14, 1.6.0 to 1.6.9, 1.8.0 to 1.8.1.</para>
<!-- <para>
<ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-????">CVE-2012-????</ulink>
</para> -->
@@ -94,60 +73,6 @@ Wireshark Info
</para></listitem>
-->
- <listitem><para>
- Wireshark crashes on bootp filter.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7391">Bug
- 7391</ulink>)
- </para></listitem>
-
- <listitem><para>
- Wireshark &gt; 1.4 does not correctly read Association ID for PS Poll packets.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7429">Bug
- 7429</ulink>)
- </para></listitem>
-
- <listitem><para>
- Radius-EAP broken since 1.8.0 release.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7430">Bug
- 7430</ulink>)
- </para></listitem>
-
- <listitem><para>
- SNMP incorrectly marks SNMPv3 &quot;discovery&quot; packet as malformed.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7438">Bug
- 7438</ulink>)
- </para></listitem>
-
- <listitem><para>
- Widgets are not properly expanded in GTK3.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7377">Bug
- 7377</ulink>)
- </para></listitem>
-
- <listitem><para>
- Find Next Mark duplicated on Edit Menu.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7445">Bug
- 7445</ulink>)
- </para></listitem>
-
- <listitem><para>
- DVB-CI/CI+: fix offset error in operator_info apdu.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7468">Bug
- 7468</ulink>)
- </para></listitem>
-
- <listitem><para>
- Unable to correctly identify IEC 61850 MMS packets.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7488">Bug
- 7488</ulink>)
- </para></listitem>
-
- <listitem><para>
- WinPcap doesn't install if vcredist_x64 requires reboot.
- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7507">Bug
- 7507</ulink>)
- </para></listitem>
-
</itemizedlist>
</para>
@@ -174,20 +99,7 @@ There are no new protocols in this release.
<!-- Sort alphabetically -->
-BACapp,
-BOOTP,
-DCERPC SPOOLSS,
-DVB-CI,
-H.248,
-IEEE 802.11,
-Jmirror,
-NAS EPS,
-NFS,
-PPP,
-RELOAD Framing,
-SES,
-SNMP,
-XMPP
+.
</para>
</section>
@@ -195,7 +107,7 @@ XMPP
<section id="NewCapture"><title>New and Updated Capture File Support</title>
<para>
-Microsoft Network Monitor
+.
</para>
</section>
diff --git a/epan/Makefile.am b/epan/Makefile.am
index 639603323b..a44953218d 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:1:0 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@
+libwireshark_la_LDFLAGS = -version-info 2:2:0 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@
include Makefile.common
diff --git a/make-version.pl b/make-version.pl
index 9e146f02f0..05102608b0 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" => 1,
+ "version_micro" => 2,
"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 4de92a4878..5d70bae295 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:0:1 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@
+libwiretap_la_LDFLAGS = -version-info 3:2:1 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@
if HAVE_WARNINGS_AS_ERRORS
AM_NON_GENERATED_CFLAGS = -Werror
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-30 13:58:17 +0000