aboutsummaryrefslogtreecommitdiff
path: root/net/wireshark/files
diff options
context:
space:
mode:
Diffstat (limited to 'net/wireshark/files')
-rw-r--r--net/wireshark/files/patch-capture_loop.c11
-rw-r--r--net/wireshark/files/patch-configure81
-rw-r--r--net/wireshark/files/patch-epan_dissectors_packet-diameter.c19
-rw-r--r--net/wireshark/files/patch-epan_radius_dict.l36
-rw-r--r--net/wireshark/files/patch-wiretap_configure20
5 files changed, 0 insertions, 167 deletions
diff --git a/net/wireshark/files/patch-capture_loop.c b/net/wireshark/files/patch-capture_loop.c
deleted file mode 100644
index 55b53f795033..000000000000
--- a/net/wireshark/files/patch-capture_loop.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- capture_loop.c.orig Thu Jul 22 00:23:01 2004
-+++ capture_loop.c Thu Jul 22 00:23:15 2004
-@@ -126,7 +126,7 @@
- * XXX - the various BSDs appear to define BSD in <sys/param.h>; we don't
- * want to include it if it's not present on this platform, however.
- */
--#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && \
-+#if !defined(__NetBSD__) && !defined(__OpenBSD__) && \
- !defined(__bsdi__) && !defined(__APPLE__) && !defined(_WIN32) && \
- !defined(__CYGWIN__)
- # define MUST_DO_SELECT
diff --git a/net/wireshark/files/patch-configure b/net/wireshark/files/patch-configure
deleted file mode 100644
index 87b2baa4bdda..000000000000
--- a/net/wireshark/files/patch-configure
+++ /dev/null
@@ -1,81 +0,0 @@
---- configure.orig Wed May 4 17:32:34 2005
-+++ configure Sat May 7 21:07:38 2005
-@@ -21806,6 +21806,7 @@
- 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 | \
-@@ -21816,7 +21817,7 @@
- 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"
-@@ -22452,6 +22453,7 @@
- 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 | \
-@@ -22462,7 +22464,7 @@
- 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"
-@@ -22683,7 +22685,7 @@
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GLIB_CFLAGS"
--LIBS="$GLIB_LIBS $LIBS"
-+LIBS="$GLIB_LIBS -liconv $LIBS"
- if test "$cross_compiling" = yes; then
- echo $ac_n "cross compiling; assumed OK... $ac_c"
- ac_cv_glib_supports_modules=yes
-@@ -27560,7 +27562,7 @@
- #
- CFLAGS="$CFLAGS -I$krb5_dir/include"
- CPPFLAGS="$CPPFLAGS -I$krb5_dir/include"
-- ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/'`
-+ ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | tr "[:lower:]" "[:upper:]" sed 's/^.*heimdal.*$/HEIMDAL/'`
- 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"
-@@ -27618,7 +27620,7 @@
-
- if test -x "$KRB5_CONFIG"
- then
-- KRB5_FLAGS=`"$KRB5_CONFIG" --cflags`
-+ KRB5_FLAGS=`"$KRB5_CONFIG" --cflags | sed -e 's/@INCLUDE_des@//g'`
- KRB5_LIBS=`"$KRB5_CONFIG" --libs`
- CFLAGS="$CFLAGS $KRB5_FLAGS"
- CPPFLAGS="$CPPFLAGS $KRB5_FLAGS"
-@@ -29121,7 +29123,7 @@
-
-
- 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=""
-@@ -30094,7 +30096,7 @@
- #
- # The plugin dissectors reside in ./plugins/PROTO/
- #
--PLUGIN_LIBS="-L../../epan -lethereal $GLIB_LIBS"
-+PLUGIN_LIBS="-L../../epan -lethereal -liconv $GLIB_LIBS"
-
-
- #
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,
diff --git a/net/wireshark/files/patch-epan_radius_dict.l b/net/wireshark/files/patch-epan_radius_dict.l
deleted file mode 100644
index 73a6919f632b..000000000000
--- a/net/wireshark/files/patch-epan_radius_dict.l
+++ /dev/null
@@ -1,36 +0,0 @@
---- epan/radius_dict.l.orig Wed Jul 27 14:45:25 2005
-+++ epan/radius_dict.l Wed Jul 27 14:46:35 2005
-@@ -65,7 +65,7 @@
- static gchar* attr_vendor = NULL;
- static gchar* vendor_name = NULL;
- static gchar* value_repr = NULL;
-- static gboolean encrypt = FALSE;
-+ static gboolean rad_encrypt = FALSE;
- static gboolean has_tag = FALSE;
- static gchar* current_vendor = NULL;
-
-@@ -97,7 +97,7 @@
- <VENDOR_W_NAME>[0-9]+ { add_vendor(vendor_name,strtol(yytext,NULL,10)); BEGIN OUT; }
- <VENDOR_W_NAME>0x[0-9a-f]+ { add_vendor(vendor_name,strtol(yytext,NULL,16)); BEGIN OUT; }
-
--<ATTR>[0-9a-z_-]+ { attr_name = g_strdup(yytext); encrypt = FALSE; has_tag = FALSE; BEGIN ATTR_W_NAME; }
-+<ATTR>[0-9a-z_-]+ { attr_name = g_strdup(yytext); rad_encrypt = FALSE; has_tag = FALSE; BEGIN ATTR_W_NAME; }
- <ATTR_W_NAME>[0-9]+ { attr_id = g_strdup(yytext); BEGIN ATTR_W_ID;}
- <ATTR_W_NAME>0x[0-9a-f]+ { attr_id = g_strdup_printf("%u",(int)strtoul(yytext,NULL,16)); BEGIN ATTR_W_ID;}
- <ATTR_W_ID>integer { attr_type = radius_integer; BEGIN ATTR_W_TYPE; }
-@@ -109,11 +109,11 @@
- <ATTR_W_ID>ifid { attr_type = radius_ifid; BEGIN ATTR_W_TYPE; }
- <ATTR_W_ID>[0-9a-z_-]+ { attr_type = radius_octets; BEGIN ATTR_W_TYPE; }
- <ATTR_W_TYPE>has_tag[,]? { has_tag = TRUE; attr_vendor = NULL; BEGIN ATTR_W_VENDOR; }
--<ATTR_W_TYPE>encrypt=1[,]? { encrypt=TRUE; attr_vendor = NULL; BEGIN ATTR_W_VENDOR; }
-+<ATTR_W_TYPE>rad_encrypt=1[,]? { rad_encrypt=TRUE; attr_vendor = NULL; BEGIN ATTR_W_VENDOR; }
- <ATTR_W_TYPE>[,0-9a-z_-]+=([^\n]+) { /* ignore other parameters */ attr_vendor = NULL; BEGIN ATTR_W_VENDOR; }
--<ATTR_W_TYPE>[0-9a-z_-]+ { attr_vendor = g_strdup(yytext); add_attribute(attr_name,attr_id,attr_type,attr_vendor,encrypt,has_tag); attr_vendor = NULL; BEGIN OUT; }
--<ATTR_W_TYPE>\n { add_attribute(attr_name,attr_id,attr_type,current_vendor ? g_strdup(current_vendor) : NULL ,encrypt,has_tag); linenums[include_stack_ptr]++; BEGIN OUT; }
--<ATTR_W_VENDOR>\n { add_attribute(attr_name,attr_id,attr_type,attr_vendor,encrypt,has_tag); linenums[include_stack_ptr]++; BEGIN OUT; };
-+<ATTR_W_TYPE>[0-9a-z_-]+ { attr_vendor = g_strdup(yytext); add_attribute(attr_name,attr_id,attr_type,attr_vendor,rad_encrypt,has_tag); attr_vendor = NULL; BEGIN OUT; }
-+<ATTR_W_TYPE>\n { add_attribute(attr_name,attr_id,attr_type,current_vendor ? g_strdup(current_vendor) : NULL ,rad_encrypt,has_tag); linenums[include_stack_ptr]++; BEGIN OUT; }
-+<ATTR_W_VENDOR>\n { add_attribute(attr_name,attr_id,attr_type,attr_vendor,rad_encrypt,has_tag); linenums[include_stack_ptr]++; BEGIN OUT; };
-
- <VALUE>[0-9a-z-]+ { attr_name = g_strdup(yytext); BEGIN VALUE_W_ATTR; }
- <VALUE_W_ATTR>[^[:blank:]]+ { value_repr = g_strdup(yytext); BEGIN VALUE_W_NAME; }
diff --git a/net/wireshark/files/patch-wiretap_configure b/net/wireshark/files/patch-wiretap_configure
deleted file mode 100644
index 420db3bf111d..000000000000
--- a/net/wireshark/files/patch-wiretap_configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- wiretap/configure.orig Sat May 7 21:04:37 2005
-+++ wiretap/configure Sat May 7 21:05:31 2005
-@@ -20092,7 +20092,7 @@
- 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"
-@@ -20206,7 +20206,7 @@
- if test "x$no_glib" = x ; then
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-- CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS"
-+ CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS -liconv $GLIB_LIBS"
- else
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-24 09:18:48 +0000