Move to version 0.8.12

svn path=/trunk/; revision=2432

diff --git a/NEWS b/NEWS
index 4b7b4119a44e9ea8955e45122b13cd9b7bb7d31a..c507184b4ad1787f28072c3f5a59e0d50cd3973a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -107,6 +107,10 @@ Overview of changes in Ethereal 0.8.12:
 * redraw_hex_dump fixes (Guy)
 * Negative relative and delta timestamp fixes (Guy)
 * Move some string functions out of packet.c and into strutil.c (Gilbert)
+* OSPF fixes (Craig Metz)
+* Avoid assert in tvbuff when creating packet of bogus reported_length (Gilbert)
+* Don't allow hf_text_only to be in the display filter language (Gilbert)
+* Win32 .cvsignore additions (Graham)
 
 Overview of changes in Ethereal 0.8.11:
 * Set locale in tethereal (Guy)

diff --git a/README.win32 b/README.win32
index 03e29e242711029f8faaa27a6e8ca8dd411b3b32..1d40720d1f89b87385b20950857c529786663858 100644 (file)
--- a/README.win32
+++ b/README.win32
@@ -1,4 +1,4 @@
-$Id: README.win32,v 1.12 2000/08/25 19:21:24 gram Exp $
+$Id: README.win32,v 1.13 2000/09/14 10:02:59 gram Exp $
 
 Running Ethereal, Tethereal, and Editcap on Win32
 =================================================
@@ -31,7 +31,7 @@ in time:
 
 Ethereal Version               GTK+/GLIB version
 ----------------               -----------------
-0.8.11                         20000805
+0.8.11 and after               20000805
 0.8.9 - 0.8.10                 20000416
 0.8.8 and before               19990828
 

diff --git a/config.h.win32 b/config.h.win32
index 9a68351f3aa540d9b843ead3085b987ad52cdafd..677bc1ed6c3da3aff9ac4a3f05357f02794716c1 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -1,4 +1,4 @@
-/* $Id: config.h.win32,v 1.16 2000/08/03 01:54:43 gram Exp $ */
+/* $Id: config.h.win32,v 1.17 2000/09/14 10:02:59 gram Exp $ */
 /* config.h.win32 Generated manually. :-) */
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
@@ -13,10 +13,10 @@
 /* #undef HAVE_SA_LEN */
 
 #define DATAFILE_DIR "/usr/local/etc"
-#define PLUGIN_DIR "/usr/local/lib/ethereal/plugins/0.8.11"
+#define PLUGIN_DIR "/usr/local/lib/ethereal/plugins/0.8.12"
 
 /* Version number of package */
-#define VERSION "0.8.11"
+#define VERSION "0.8.12"
 
 /* #undef NEED_SNPRINTF_H */
 

diff --git a/configure.in b/configure.in
index dcd933ce26068167922faee20d9d188764a3184b..88f1219c86091415024e780613c7694914f8cec4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.100 2000/08/03 01:54:44 gram Exp $
+# $Id: configure.in,v 1.101 2000/09/14 10:03:00 gram Exp $
 dnl
 dnl Process this file with autoconf 2.13 or later to produce a
 dnl configure script; 2.12 doesn't generate a "configure" script that
@@ -13,7 +13,7 @@ AC_INIT(etypes.h)
 
 AC_PREREQ(2.13)
 
-AM_INIT_AUTOMAKE(ethereal, 0.8.11)
+AM_INIT_AUTOMAKE(ethereal, 0.8.12)
 
 AM_CONDITIONAL(SETUID_INSTALL, test x$enable_setuid_install = xyes)
 
@@ -426,7 +426,7 @@ AC_ARG_WITH(plugindir,
   *) PLUGIN_DIR="$withval"
   esac
   ],
-  : ${PLUGIN_DIR=$libdir/ethereal/plugins/0.8.11}
+  : ${PLUGIN_DIR=$libdir/ethereal/plugins/0.8.12}
 )
 
 PLUGIN_DIR=`(

diff --git a/image/editcap.rc b/image/editcap.rc
index 1ea3745789e4946e01175e6e4725da87b63233c7..e2090f09ed10feff4b6e6c50ac84630cc1a9b6d4 100644 (file)
--- a/image/editcap.rc
+++ b/image/editcap.rc
@@ -3,8 +3,8 @@
 ETHEREAL_ICON          ICON                    "ethereal.ico"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,8,11,0
- PRODUCTVERSION 0,8,11,0
+ FILEVERSION 0,8,12,0
+ PRODUCTVERSION 0,8,12,0
  FILEFLAGSMASK 0x0L
 #ifdef _DEBUG
  FILEFLAGS 0x3L
@@ -21,12 +21,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "The Ethereal developer community\0"
             VALUE "FileDescription", "Editcap\0"
-            VALUE "FileVersion", "0.8.11\0"
-            VALUE "InternalName", "Editcap 0.8.11\0"
+            VALUE "FileVersion", "0.8.12\0"
+            VALUE "InternalName", "Editcap 0.8.12\0"
             VALUE "LegalCopyright", "Copyright © 2000 Gerald Combs <gerald@zing.org>, Gilbert Ramirez <gram@xiexie.org> and others\0"
             VALUE "OriginalFilename", "Editcap.exe\0"
             VALUE "ProductName", "Editcap\0"
-            VALUE "ProductVersion", "0.8.11\0"
+            VALUE "ProductVersion", "0.8.12\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/image/ethereal.rc b/image/ethereal.rc
index 2a14a49f35fbb248cbf0bc2c5457f1b3152dbac7..bd8c830a71a46ece982fbe28d4a81b75bed6dc57 100644 (file)
--- a/image/ethereal.rc
+++ b/image/ethereal.rc
@@ -3,8 +3,8 @@
 ETHEREAL_ICON          ICON                    "ethereal.ico"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,8,11,0
- PRODUCTVERSION 0,8,11,0
+ FILEVERSION 0,8,12,0
+ PRODUCTVERSION 0,8,12,0
  FILEFLAGSMASK 0x0L
 #ifdef _DEBUG
  FILEFLAGS 0x3L
@@ -21,12 +21,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "The Ethereal developer community, http://ethereal.zing.org\0"
             VALUE "FileDescription", "Ethereal\0"
-            VALUE "FileVersion", "0.8.11\0"
-            VALUE "InternalName", "Ethereal 0.8.11\0"
+            VALUE "FileVersion", "0.8.12\0"
+            VALUE "InternalName", "Ethereal 0.8.12\0"
             VALUE "LegalCopyright", "Copyright © 2000 Gerald Combs <gerald@zing.org>, Gilbert Ramirez <gram@xiexie.org> and others\0"
             VALUE "OriginalFilename", "Ethereal.exe\0"
             VALUE "ProductName", "Ethereal\0"
-            VALUE "ProductVersion", "0.8.11\0"
+            VALUE "ProductVersion", "0.8.12\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/image/tethereal.rc b/image/tethereal.rc
index d33b73cbbe03f73beb966a0007e546f790892b0f..0aea5c048eede36fa339b60ca16b74e4b41debb1 100644 (file)
--- a/image/tethereal.rc
+++ b/image/tethereal.rc
@@ -3,8 +3,8 @@
 ETHEREAL_ICON          ICON                    "ethereal.ico"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,8,11,0
- PRODUCTVERSION 0,8,11,0
+ FILEVERSION 0,8,12,0
+ PRODUCTVERSION 0,8,12,0
  FILEFLAGSMASK 0x0L
 #ifdef _DEBUG
  FILEFLAGS 0x3L
@@ -21,12 +21,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "The Ethereal developer community\0"
             VALUE "FileDescription", "Tethereal\0"
-            VALUE "FileVersion", "0.8.11\0"
-            VALUE "InternalName", "Tethereal 0.8.11\0"
+            VALUE "FileVersion", "0.8.12\0"
+            VALUE "InternalName", "Tethereal 0.8.12\0"
             VALUE "LegalCopyright", "Copyright © 2000 Gerald Combs <gerald@zing.org>, Gilbert Ramirez <gram@xiexie.org> and others\0"
             VALUE "OriginalFilename", "Tethereal.exe\0"
             VALUE "ProductName", "Tethereal\0"
-            VALUE "ProductVersion", "0.8.11\0"
+            VALUE "ProductVersion", "0.8.12\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/plugins.c b/plugins.c
index 770fe41021784071e9cdcc229797007c51ff74ad..4ca2085a395f20f81a6f83e89c1acea0be7fa742 100644 (file)
--- a/plugins.c
+++ b/plugins.c
@@ -1,7 +1,7 @@
 /* plugins.c
  * plugin routines
  *
- * $Id: plugins.c,v 1.23 2000/08/19 17:53:02 deniel Exp $
+ * $Id: plugins.c,v 1.24 2000/09/14 10:03:02 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -73,11 +73,11 @@ plugin *plugin_list;
 guint32 enabled_plugins_number;
 
 #ifdef WIN32
-static gchar std_plug_dir[] = "c:/program files/ethereal/plugins/0.8.11";
-static gchar local_plug_dir[] = "c:/ethereal/plugins/0.8.11";
+static gchar std_plug_dir[] = "c:/program files/ethereal/plugins/0.8.12";
+static gchar local_plug_dir[] = "c:/ethereal/plugins/0.8.12";
 #else
-static gchar std_plug_dir[] = "/usr/lib/ethereal/plugins/0.8.11";
-static gchar local_plug_dir[] = "/usr/local/lib/ethereal/plugins/0.8.11";
+static gchar std_plug_dir[] = "/usr/lib/ethereal/plugins/0.8.12";
+static gchar local_plug_dir[] = "/usr/local/lib/ethereal/plugins/0.8.12";
 #endif
 static gchar *user_plug_dir = NULL;
 static gchar *plugin_status_file = NULL;