forked from osmocom/wireshark
More ethereal -> wireshark.
svn path=/trunk/; revision=18292
This commit is contained in:
Gerald Combs
parent
e10e4fb85c
commit
8d6c73e567
8
INSTALL
8
INSTALL
|
|
@ -75,13 +75,13 @@ README.win32 for those instructions.
|
|||
additional header files and libraries. Using this switch keeps
|
||||
'configure' from looking there
|
||||
|
||||
--disable-ethereal
|
||||
--disable-wireshark
|
||||
By default, if 'configure' finds the GTK+ libraries, the Makefile
|
||||
build Ethereal, the GUI packet analyzer. You can disable the
|
||||
build of the GUI version of Ethereal with this switch.
|
||||
|
||||
--disable-gtk2
|
||||
Build Glib/Gtk+ 1.2[.x]-based ethereal.
|
||||
Build Glib/Gtk+ 1.2[.x]-based wireshark.
|
||||
|
||||
--disable-tshark
|
||||
By default the line-mode packet analyzer, TShark, is built.
|
||||
|
|
@ -180,7 +180,7 @@ README.win32 for those instructions.
|
|||
|
||||
--with-plugins=DIR
|
||||
By default, plugins are installed in
|
||||
${LIBDIR}/ethereal/plugins/${VERSION}
|
||||
${LIBDIR}/wireshark/plugins/${VERSION}
|
||||
|
||||
${LIBDIR} can be set with --libdir, or defaults to ${EPREFIX/lib}
|
||||
${EPREFIX} can be set with --exec-prefix, or defaults to ${PREFIX}
|
||||
|
|
@ -195,7 +195,7 @@ README.win32 for those instructions.
|
|||
|
||||
6. Run 'make'. Hopefully, you won't run into any problems.
|
||||
|
||||
7. Run './ethereal' or './tshark', and make sure things are working.
|
||||
7. Run './wireshark' or './tshark', and make sure things are working.
|
||||
You must have root privileges in order to capture live data.
|
||||
|
||||
8. Run 'make install'. If you wish to install the man page, run
|
||||
|
|
|
|||
|
|
@ -585,8 +585,8 @@ EXTRA_DIST = \
|
|||
image/eiconcap32.xpm \
|
||||
image/eiconcap48.xpm \
|
||||
image/elogo3d48x48.png \
|
||||
image/ethereal.exe.manifest.in \
|
||||
image/ethereal.ico \
|
||||
image/wireshark.exe.manifest.in \
|
||||
image/wireshark.ico \
|
||||
image/wireshark.rc.in \
|
||||
image/ethereal48x48-trans.png \
|
||||
image/ethereal48x48.png \
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ GENERATED_C_FILES = \
|
|||
# All the generated files.
|
||||
GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES)
|
||||
|
||||
# sources common for ethereal and tshark
|
||||
# sources common for wireshark and tshark
|
||||
WIRESHARK_COMMON_SRC = \
|
||||
$(PLATFORM_SRC) \
|
||||
capture_errs.c \
|
||||
|
|
@ -136,7 +136,7 @@ EXTRA_wireshark_INCLUDES = \
|
|||
strerror.h \
|
||||
strptime.h
|
||||
|
||||
# ethereal specifics
|
||||
# wireshark specifics
|
||||
wireshark_SOURCES = \
|
||||
$(WIRESHARK_COMMON_SRC) \
|
||||
alert_box.c \
|
||||
|
|
|
|||
|
|
@ -335,7 +335,7 @@ files will be reconstructed from the "config.h.win32" files. (If, for
|
|||
example, you have "config.h" files left over from a Unix build, a
|
||||
Windows build will fail.)
|
||||
|
||||
In the ethereal directory, type "nmake -f makefile.nmake". It will
|
||||
In the wireshark directory, type "nmake -f makefile.nmake". It will
|
||||
recurse into the subdirectories as appropriate.
|
||||
|
||||
Some generated source is created by traditionally "Unix-ish" tools.
|
||||
|
|
@ -431,7 +431,7 @@ file to specify where the NSIS binaries are installed and wether to use the mode
|
|||
You will need NSIS version 2 or higher, to build an installer with the modern user interface,
|
||||
and for a much smaller installer (using the lzma compression).
|
||||
|
||||
In the ethereal directory, type "nmake -f makefile.nmake packaging" to build the installer.
|
||||
In the wireshark directory, type "nmake -f makefile.nmake packaging" to build the installer.
|
||||
Please be patient while the compression is done, it will take some time even on fast machines.
|
||||
|
||||
You will hopefully now see something like wireshark-setup-0.10.12.exe in the dir packaging/nsis.
|
||||
|
|
@ -567,7 +567,7 @@ To get it running, execute the following steps:
|
|||
|
||||
8. Run wireshark (add /opt/gnome/bin to $PATH if this is not yet done)
|
||||
|
||||
$ <wireshark-src>/ethereal
|
||||
$ <wireshark-src>/wireshark
|
||||
|
||||
And voila! Behold the mighty sniffer in all its glory!
|
||||
|
||||
|
|
|
|||
|
|
@ -227,7 +227,7 @@
|
|||
#define _WINDOWS 1*/
|
||||
|
||||
/* Name of package */
|
||||
#define PACKAGE "ethereal"
|
||||
#define PACKAGE "wireshark"
|
||||
|
||||
/* Version number of package */
|
||||
#define VERSION "@VERSION@"
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ WINPCAP_VERSION=3.1
|
|||
# Base directory, where your libraries reside, which needs to be
|
||||
# compiling the sources. This is only inside this file.
|
||||
#
|
||||
WIRESHARK_LIBS=C:\ethereal-win32-libs
|
||||
WIRESHARK_LIBS=C:\wireshark-win32-libs
|
||||
|
||||
#
|
||||
# Current versions of GTK+ 1.3 require GLib 2.0. Earlier versions of
|
||||
|
|
@ -267,7 +267,7 @@ MAKENSIS_MODERN_UI=USE
|
|||
#
|
||||
#HHC_DIR="C:/Program Files/HTML Help Workshop/"
|
||||
|
||||
# According to http://bugs.ethereal.com/bugzilla/show_bug.cgi?id=403
|
||||
# According to http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=403
|
||||
# XCOPY under Windows NT doesn't support the "/Y" flag. This works
|
||||
# around that bug.
|
||||
# XXX - This apparently doesn't work for some versions of nmake:
|
||||
|
|
@ -287,7 +287,7 @@ LINK_PLUGINS_WITH_LIBWIRESHARK=USE
|
|||
#
|
||||
# You should not have to change anything below this comment.
|
||||
# If you do, it's a deficiency in the Makefile.nmake files;
|
||||
# either tell ethereal-dev@ethereal.com about it, including
|
||||
# either tell wireshark-dev@wireshark.org about it, including
|
||||
# details of why you had to change it, or fix config.nmake
|
||||
# and any Makefile.nmake files that need to be changed, and
|
||||
# send us the patches, along with details of why the change
|
||||
|
|
|
|||
56
configure.in
56
configure.in
|
|
@ -8,7 +8,7 @@ dnl Check for CPU / vendor / OS
|
|||
AC_CANONICAL_HOST
|
||||
AC_CANONICAL_TARGET
|
||||
|
||||
AM_INIT_AUTOMAKE(ethereal, 1.1.0)
|
||||
AM_INIT_AUTOMAKE(wireshark, 1.1.0)
|
||||
|
||||
AM_DISABLE_STATIC
|
||||
|
||||
|
|
@ -339,15 +339,15 @@ fi
|
|||
|
||||
# Enable/disable tshark
|
||||
|
||||
AC_ARG_ENABLE(ethereal,
|
||||
[ --enable-ethereal build GTK+-based ethereal. [default=yes]],enable_ethereal=$enableval,enable_ethereal=yes)
|
||||
AC_ARG_ENABLE(wireshark,
|
||||
[ --enable-wireshark build GTK+-based wireshark. [default=yes]],enable_wireshark=$enableval,enable_wireshark=yes)
|
||||
|
||||
AC_ARG_ENABLE(gtk2,
|
||||
[ --disable-gtk2 build Glib1/Gtk1+-based (t)ethereal. [default=no]],enable_gtk2=$enableval,enable_gtk2=yes)
|
||||
[ --disable-gtk2 build Glib1/Gtk1+-based wireshark. [default=no]],enable_gtk2=$enableval,enable_gtk2=yes)
|
||||
AM_CONDITIONAL(USE_GTK2, test x$enable_gtk2 = xyes)
|
||||
|
||||
AC_ARG_ENABLE(threads,
|
||||
[ --enable-threads use threads in ethereal. [default=no]],enable_threads=$enableval,enable_threads=no)
|
||||
[ --enable-threads use threads in wireshark. [default=no]],enable_threads=$enableval,enable_threads=no)
|
||||
AM_CONDITIONAL(USE_THREADS, test x$enable_threads = xyes)
|
||||
|
||||
AC_ARG_ENABLE(profile-build,
|
||||
|
|
@ -367,7 +367,7 @@ else
|
|||
fi
|
||||
|
||||
# Create DATAFILE_DIR #define for config.h
|
||||
datafiledir=$datadir/ethereal
|
||||
datafiledir=$datadir/wireshark
|
||||
datafiledir=`(
|
||||
test "x$prefix" = xNONE && prefix=$ac_default_prefix
|
||||
test "x$exec_prefix" = xNONE && exec_prefix=${prefix}
|
||||
|
|
@ -379,10 +379,10 @@ AC_DEFINE_UNQUOTED(DATAFILE_DIR,"$datafiledir", [Directory for data])
|
|||
# We don't add $GLIB_LIBS to LIBS, because we don't want to force all
|
||||
# programs to be built with GTK+.
|
||||
#
|
||||
if test "x$enable_gtk2" = "xyes" -a "x$enable_ethereal" = "xyes" ; then
|
||||
if test "x$enable_gtk2" = "xyes" -a "x$enable_wireshark" = "xyes" ; then
|
||||
GTK_OK=two
|
||||
AM_PATH_GTK_2_0(2.0.0, CFLAGS="$CFLAGS $GTK_CFLAGS", GTK_OK=no, gthread)
|
||||
elif test "x$enable_gtk2" != "xyes" -a "x$enable_ethereal" = "xyes" ; then
|
||||
elif test "x$enable_gtk2" != "xyes" -a "x$enable_wireshark" = "xyes" ; then
|
||||
GTK_OK=one
|
||||
AM_PATH_GTK(1.2.0, CFLAGS="$CFLAGS $GTK_CFLAGS", GTK_OK=no )
|
||||
else
|
||||
|
|
@ -400,7 +400,7 @@ fi
|
|||
# programs to be built with GLib.
|
||||
#
|
||||
if test "$GTK_OK" = "no" ; then
|
||||
enable_ethereal="no"
|
||||
enable_wireshark="no"
|
||||
wireshark_bin=""
|
||||
wireshark_man=""
|
||||
# Honor GLIB_CFLAGS
|
||||
|
|
@ -410,8 +410,8 @@ if test "$GTK_OK" = "no" ; then
|
|||
AM_PATH_GLIB(1.2.0, CFLAGS="$CFLAGS $GLIB_CFLAGS", AC_MSG_ERROR(GLib distribution not found.), gmodule)
|
||||
fi
|
||||
else
|
||||
wireshark_bin="ethereal\$(EXEEXT)"
|
||||
wireshark_man="ethereal.1"
|
||||
wireshark_bin="wireshark\$(EXEEXT)"
|
||||
wireshark_man="wireshark.1"
|
||||
wireshark_SUBDIRS="gtk"
|
||||
# Honor GLIB_CFLAGS
|
||||
if test "$GTK_OK" = "two" ; then
|
||||
|
|
@ -817,9 +817,9 @@ fi
|
|||
|
||||
dnl Check if wireshark should be installed setuid
|
||||
AC_ARG_ENABLE(setuid-install,
|
||||
[ --enable-setuid-install install ethereal as setuid. DANGEROUS!!! [default=no]],enable_setuid_install=$enableval,enable_setuid_install=no)
|
||||
[ --enable-setuid-install install wireshark as setuid. DANGEROUS!!! [default=no]],enable_setuid_install=$enableval,enable_setuid_install=no)
|
||||
|
||||
AC_MSG_CHECKING(whether to install ethereal setuid)
|
||||
AC_MSG_CHECKING(whether to install wireshark setuid)
|
||||
if test "x$enable_setuid_install" = "xno" ; then
|
||||
AC_MSG_RESULT(no)
|
||||
else
|
||||
|
|
@ -1227,7 +1227,7 @@ dnl
|
|||
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/ethereal/plugins/$VERSION"
|
||||
plugindir="$libdir/wireshark/plugins/$VERSION"
|
||||
AC_ARG_WITH(plugins,
|
||||
[ --with-plugins[[=DIR]] support plugins (installed in DIR, if supplied).],
|
||||
[
|
||||
|
|
@ -1401,21 +1401,21 @@ fi
|
|||
|
||||
echo ""
|
||||
echo "The Ethereal package has been configured with the following options."
|
||||
echo " Build ethereal : $enable_ethereal"
|
||||
echo " Build tshark : $enable_tshark"
|
||||
echo " Build capinfos : $enable_capinfos"
|
||||
echo " Build editcap : $enable_editcap"
|
||||
echo " Build dumpcap : $enable_dumpcap"
|
||||
echo " Build mergecap : $enable_mergecap"
|
||||
echo " Build text2pcap : $enable_text2pcap"
|
||||
echo " Build idl2wrs : $enable_idl2wrs"
|
||||
echo " Build randpkt : $enable_randpkt"
|
||||
echo " Build dftest : $enable_dftest"
|
||||
echo " Build wireshark : $enable_wireshark"
|
||||
echo " Build tshark : $enable_tshark"
|
||||
echo " Build capinfos : $enable_capinfos"
|
||||
echo " Build editcap : $enable_editcap"
|
||||
echo " Build dumpcap : $enable_dumpcap"
|
||||
echo " Build mergecap : $enable_mergecap"
|
||||
echo " Build text2pcap : $enable_text2pcap"
|
||||
echo " Build idl2wrs : $enable_idl2wrs"
|
||||
echo " Build randpkt : $enable_randpkt"
|
||||
echo " Build dftest : $enable_dftest"
|
||||
echo ""
|
||||
echo " Install setuid : $setuid_message"
|
||||
echo " Use plugins : $have_plugins"
|
||||
echo " Build lua plugin : $lua_message"
|
||||
echo " Use GTK+ v2 library : $enable_gtk2"
|
||||
echo " Install setuid : $setuid_message"
|
||||
echo " Use plugins : $have_plugins"
|
||||
echo " Build lua plugin : $lua_message"
|
||||
echo " Use GTK+ v2 library : $enable_gtk2"
|
||||
if test "x$enable_gtk2" = "xyes" ; then
|
||||
echo " Use threads : $enable_threads"
|
||||
echo " Build profile binaries : $enable_profile_build"
|
||||
|
|
|
|||
|
|
@ -126,8 +126,8 @@ sub update_configure_in
|
|||
|
||||
open(CFGIN, "< configure.in") || die "Can't read configure.in!";
|
||||
while ($line = <CFGIN>) {
|
||||
if ($line =~ /^AM_INIT_AUTOMAKE\(ethereal, (\d+)\.(\d+).(\d+)/) {
|
||||
$line = "AM_INIT_AUTOMAKE\(ethereal, $1.$2.$3$package_string)\n";
|
||||
if ($line =~ /^AM_INIT_AUTOMAKE\(wireshark, (\d+)\.(\d+).(\d+)/) {
|
||||
$line = "AM_INIT_AUTOMAKE\(wireshark, $1.$2.$3$package_string)\n";
|
||||
}
|
||||
$contents .= $line
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,9 +72,9 @@ Comment=Network traffic analyzer
|
|||
Comment[fi]=Verkkoliikenne analysaattori
|
||||
Comment[fr]=Analyseur de trafic réseau
|
||||
Comment[sv]=Nätverkstrafikanalysator
|
||||
Icon=ethereal.png
|
||||
TryExec=ethereal
|
||||
Exec=ethereal
|
||||
Icon=wireshark.png
|
||||
TryExec=wireshark
|
||||
Exec=wireshark
|
||||
Path=
|
||||
Terminal=false
|
||||
MimeType=
|
||||
|
|
@ -83,6 +83,6 @@ Categories=Application;GTK;Network;X-Red-Hat-Extra;
|
|||
X-KDE-SubstituteUID=true
|
||||
# Deprecated:
|
||||
# TerminalOptions=
|
||||
# BinaryPattern=ethereal
|
||||
# BinaryPattern=wireshark
|
||||
# MapNotify=true
|
||||
# Protocols=
|
||||
|
|
|
|||
Loading…
Reference in New Issue