diff options
Diffstat (limited to 'net/wireshark/files')
| -rw-r--r-- | net/wireshark/files/patch-Makefile.in | 77 | ||||
| -rw-r--r-- | net/wireshark/files/patch-configure | 68 | ||||
| -rw-r--r-- | net/wireshark/files/patch-epan_Makefile.in | 13 | ||||
| -rw-r--r-- | net/wireshark/files/patch-epan_dissectors_packet-diameter.c | 19 |
4 files changed, 41 insertions, 136 deletions
diff --git a/net/wireshark/files/patch-Makefile.in b/net/wireshark/files/patch-Makefile.in deleted file mode 100644 index b0f5d6bff4a9..000000000000 --- a/net/wireshark/files/patch-Makefile.in +++ /dev/null @@ -1,77 +0,0 @@ ---- Makefile.in.orig 2007-08-01 00:02:21.000000000 -0400 -+++ Makefile.in 2007-08-01 03:26:05.000000000 -0400 -@@ -163,7 +163,7 @@ am_dumpcap_OBJECTS = $(am__objects_2) ca - ringbuffer.$(OBJEXT) sync_pipe_write.$(OBJEXT) \ - tempfile.$(OBJEXT) version_info.$(OBJEXT) \ - unicode-utils.$(OBJEXT) --dumpcap_OBJECTS = $(am_dumpcap_OBJECTS) -+dumpcap_OBJECTS = $(am_dumpcap_OBJECTS) @INET_NTOP_O@ - dumpcap_DEPENDENCIES = wiretap/libwiretap.la - am__editcap_SOURCES_DIST = editcap.c epan/crypt/crypt-md5.c \ - epan/plugins.c epan/report_err.c epan/privileges.c \ -@@ -206,7 +206,7 @@ am_tshark_OBJECTS = $(am__objects_3) $(a - capture_opts.$(OBJEXT) capture_loop.$(OBJEXT) \ - tempfile.$(OBJEXT) tshark-tap-register.$(OBJEXT) \ - tshark.$(OBJEXT) --tshark_OBJECTS = $(am_tshark_OBJECTS) -+tshark_OBJECTS = $(am_tshark_OBJECTS) @INET_PTON_O@ - tshark_DEPENDENCIES = $(am__DEPENDENCIES_1) wiretap/libwiretap.la \ - epan/libwireshark.la $(am__DEPENDENCIES_2) - am_wireshark_OBJECTS = $(am__objects_3) airpcap_loader.$(OBJEXT) \ -@@ -216,7 +216,7 @@ am_wireshark_OBJECTS = $(am__objects_3) - filters.$(OBJEXT) g711.$(OBJEXT) merge.$(OBJEXT) \ - proto_hier_stats.$(OBJEXT) sync_pipe_write.$(OBJEXT) \ - summary.$(OBJEXT) tempfile.$(OBJEXT) --wireshark_OBJECTS = $(am_wireshark_OBJECTS) -+wireshark_OBJECTS = $(am_wireshark_OBJECTS) @INET_PTON_O@ - wireshark_DEPENDENCIES = $(am__DEPENDENCIES_1) gtk/libui.a \ - codecs/libcodec.a wiretap/libwiretap.la epan/libwireshark.la \ - $(am__DEPENDENCIES_2) -@@ -829,6 +829,7 @@ wireshark_SOURCES = \ - fileset.c \ - filters.c \ - g711.c \ -+ @INET_PTON_C@ \ - merge.c \ - proto_hier_stats.c \ - sync_pipe_write.c \ -@@ -871,6 +872,7 @@ tshark_SOURCES = \ - $(TSHARK_TAP_SRC) \ - capture_opts.c \ - capture_loop.c \ -+ @INET_PTON_C@ \ - tempfile.c \ - tshark-tap-register.c \ - tshark.c -@@ -921,6 +923,7 @@ dumpcap_SOURCES = \ - clopts_common.c \ - conditions.c \ - dumpcap.c \ -+ @INET_NTOP_C@ \ - pcapio.c \ - ringbuffer.c \ - sync_pipe_write.c \ -@@ -963,7 +966,6 @@ wireshark_LDADD = \ - codecs/libcodec.a \ - wiretap/libwiretap.la \ - epan/libwireshark.la \ -- @INET_PTON_LO@ \ - @SNMP_LIBS@ @SSL_LIBS@ \ - $(plugin_ldadd) \ - @PCRE_LIBS@ \ -@@ -981,7 +983,6 @@ tshark_LDADD = \ - $(wireshark_optional_objects) \ - wiretap/libwiretap.la \ - epan/libwireshark.la \ -- @INET_PTON_LO@ \ - @SNMP_LIBS@ @SSL_LIBS@ \ - $(plugin_ldadd) \ - @PCRE_LIBS@ \ -@@ -1045,7 +1046,6 @@ dftest_LDADD = \ - # Libraries with which to link dumpcap. - dumpcap_LDADD = \ - wiretap/libwiretap.la \ -- @INET_NTOP_LO@ \ - @GLIB_LIBS@ \ - @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ \ - @LIBGCRYPT_LIBS@ diff --git a/net/wireshark/files/patch-configure b/net/wireshark/files/patch-configure index a4fc34d88a95..f597c87f551a 100644 --- a/net/wireshark/files/patch-configure +++ b/net/wireshark/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Thu Jul 5 15:26:25 2007 -+++ configure Sat Jul 7 14:38:55 2007 -@@ -21771,7 +21771,7 @@ echo $ECHO_N "checking whether we should +--- configure.orig 2007-12-20 02:18:48.000000000 -0500 ++++ configure 2007-12-20 02:23:34.000000000 -0500 +@@ -22284,7 +22284,7 @@ echo $ECHO_N "checking whether we should # Check whether --enable-warnings-as-errors was given. if test "${enable_warnings_as_errors+set}" = set; then enableval=$enable_warnings_as_errors; @@ -9,7 +9,24 @@ with_warnings_as_errors="yes" { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } -@@ -23308,6 +23308,7 @@ echo $ECHO_N "checking for GLIB - versio +@@ -23494,6 +23494,7 @@ echo $ECHO_N "checking for GLIB - versio + + GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` + GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` ++ GLIB_LIBS="-liconv $GLIB_LIBS" + glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` + glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ +@@ -23504,7 +23505,7 @@ echo $ECHO_N "checking for GLIB - versio + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" +- LIBS="$GLIB_LIBS $LIBS" ++ LIBS="$GLIB_LIBS -liconv $LIBS" + rm -f conf.glibtest + if test "$cross_compiling" = yes; then + echo $ac_n "cross compiling; assumed OK... $ac_c" +@@ -23819,6 +23820,7 @@ echo $ECHO_N "checking for GLIB - versio else GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` @@ -17,17 +34,32 @@ glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ -@@ -23318,7 +23319,8 @@ echo $ECHO_N "checking for GLIB - versio +@@ -24158,6 +24160,7 @@ echo $ECHO_N "checking for GLIB - versio + + GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` + GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` ++ GLIB_LIBS="-liconv $GLIB_LIBS" + glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` + glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ +@@ -24483,6 +24486,7 @@ echo $ECHO_N "checking for GLIB - versio + else + GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` + GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` ++ GLIB_LIBS="-liconv $GLIB_LIBS" + glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` + glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ +@@ -24493,7 +24497,7 @@ echo $ECHO_N "checking for GLIB - versio ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$GLIB_LIBS $LIBS" + LIBS="$GLIB_LIBS -liconv $LIBS" -+ LIBS="$GLIB_LIBS -liconv $LIBS" rm -f conf.glibtest if test "$cross_compiling" = yes; then echo $ac_n "cross compiling; assumed OK... $ac_c" -@@ -24211,7 +24213,7 @@ echo $ECHO_N "checking whether GLib supp +@@ -24722,7 +24726,7 @@ echo $ECHO_N "checking whether GLib supp ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $GLIB_CFLAGS" @@ -36,7 +68,7 @@ if test "$cross_compiling" = yes; then echo $ac_n "cross compiling; assumed OK... $ac_c" ac_cv_glib_supports_modules=yes -@@ -30140,7 +30142,7 @@ echo "${ECHO_T}yes" >&6; } +@@ -30482,7 +30486,7 @@ echo "${ECHO_T}yes" >&6; } # CFLAGS="$CFLAGS -I$krb5_dir/include" CPPFLAGS="$CPPFLAGS -I$krb5_dir/include" @@ -45,7 +77,7 @@ ac_mit_version=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'` ac_krb5_version="$ac_heimdal_version$ac_mit_version" if test "x$ac_krb5_version" = "xHEIMDAL" -@@ -30199,7 +30201,7 @@ fi +@@ -30541,7 +30545,7 @@ fi if test -x "$KRB5_CONFIG" then @@ -54,21 +86,3 @@ KRB5_LIBS=`"$KRB5_CONFIG" --libs` CFLAGS="$CFLAGS $KRB5_FLAGS" CPPFLAGS="$CPPFLAGS $KRB5_FLAGS" -@@ -31974,7 +31976,7 @@ fi - - - ac_save_LIBS="$LIBS" --LIBS="$GLIB_LIBS $LIBS" -+LIBS="$GLIB_LIBS -liconv $LIBS" - G_ASCII_STRTOULL_C="" - G_ASCII_STRTOULL_O="" - G_ASCII_STRTOULL_LO="" -@@ -33019,7 +33021,7 @@ fi - # - # The plugin dissectors reside in ./plugins/PROTO/ - # --PLUGIN_LIBS="-L../../epan -lwireshark $GLIB_LIBS" -+PLUGIN_LIBS="-L../../epan -lwireshark -liconv $GLIB_LIBS" - - - # diff --git a/net/wireshark/files/patch-epan_Makefile.in b/net/wireshark/files/patch-epan_Makefile.in deleted file mode 100644 index bf8037828b54..000000000000 --- a/net/wireshark/files/patch-epan_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ ---- epan/Makefile.in.orig 2007-07-29 17:56:38.000000000 -0400 -+++ epan/Makefile.in 2007-07-29 17:58:47.000000000 -0400 -@@ -708,8 +708,8 @@ MAINTAINERCLEANFILES = \ - # - # Add the object files for missing routines, if any. - # --libwireshark_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib) @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SNMP_LIBS@ @SSL_LIBS@ -lm --libwireshark_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib) -+libwireshark_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib) @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SNMP_LIBS@ @SSL_LIBS@ -lm -+libwireshark_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib) - LEMON = ../tools/lemon - @ENABLE_STATIC_FALSE@@HAVE_PLUGINS_TRUE@plugin_src = - @ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@plugin_src = \ diff --git a/net/wireshark/files/patch-epan_dissectors_packet-diameter.c b/net/wireshark/files/patch-epan_dissectors_packet-diameter.c deleted file mode 100644 index 4fc63bb0d227..000000000000 --- a/net/wireshark/files/patch-epan_dissectors_packet-diameter.c +++ /dev/null @@ -1,19 +0,0 @@ ---- epan/dissectors/packet-diameter.c.orig Thu May 12 03:07:06 2005 -+++ epan/dissectors/packet-diameter.c Thu May 12 02:54:14 2005 -@@ -2022,13 +2022,13 @@ - { "Flags", "diameter.flags", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL }}, - { &hf_diameter_flags_request, -- { "Request", "diameter.flags.request", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_R, -+ { "Request ", "diameter.flags.request", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_R, - "", HFILL }}, - { &hf_diameter_flags_proxyable, -- { "Proxyable", "diameter.flags.proxyable", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_P, -+ { "Proxyable ", "diameter.flags.proxyable", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_P, - "", HFILL }}, - { &hf_diameter_flags_error, -- { "Error","diameter.flags.error", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_E, -+ { "Error ","diameter.flags.error", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_E, - "", HFILL }}, - { &hf_diameter_flags_T, - { "T(Potentially re-transmitted message)","diameter.flags.T", FT_BOOLEAN, 8, TFS(&flags_set_truth),DIAM_FLAGS_T, |