[wireshark/f12/master] Add missing patches

[Jan Šafránek]

commit 387d24bbe7cb8e6f5a3cd6b909bf04dacf572af6
Author: Jan Safranek <jsafrane at redhat.com>
Date:   Tue Aug 24 16:20:08 2010 +0200

    Add missing patches

 wireshark-1.2.8-disable_warning_dialog.patch |   34 ++++++++++++++++++++++++++
 wireshark-libtool-pie.patch                  |   11 ++++++++
 2 files changed, 45 insertions(+), 0 deletions(-)
---
diff --git a/wireshark-1.2.8-disable_warning_dialog.patch b/wireshark-1.2.8-disable_warning_dialog.patch
new file mode 100644
index 0000000..34d64c9
--- /dev/null
+++ b/wireshark-1.2.8-disable_warning_dialog.patch
@@ -0,0 +1,34 @@
+diff -up wireshark-1.2.8/gtk/main.c.dialog wireshark-1.2.8/gtk/main.c
+--- wireshark-1.2.8/gtk/main.c.dialog	2010-05-05 19:11:51.000000000 +0200
++++ wireshark-1.2.8/gtk/main.c	2010-05-07 11:08:23.995327341 +0200
+@@ -1247,11 +1247,12 @@ set_display_filename(capture_file *cf)
+ 
+ GtkWidget           *close_dlg = NULL;
+ 
+-static void
++/*static void
+ priv_warning_dialog_cb(gpointer dialog, gint btn _U_, gpointer data _U_)
+ {
+     recent.privs_warn_if_elevated = !simple_dialog_check_get(dialog);
+ }
++*/
+ 
+ #ifdef _WIN32
+ static void
+@@ -1795,7 +1796,7 @@ check_and_warn_user_startup(gchar *cf_na
+   gpointer             priv_warning_dialog;
+ 
+   /* Tell the user not to run as root. */
+-  if (running_with_special_privs() && recent.privs_warn_if_elevated) {
++/*  if (running_with_special_privs() && recent.privs_warn_if_elevated) {
+     cur_user = get_cur_username();
+     cur_group = get_cur_groupname();
+     priv_warning_dialog = simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK,
+@@ -1806,6 +1807,7 @@ check_and_warn_user_startup(gchar *cf_na
+     simple_dialog_check_set(priv_warning_dialog, "Don't show this message again.");
+     simple_dialog_set_cb(priv_warning_dialog, priv_warning_dialog_cb, NULL);
+   }
++*/
+ 
+ #ifdef _WIN32
+   /* Warn the user if npf.sys isn't loaded. */
diff --git a/wireshark-libtool-pie.patch b/wireshark-libtool-pie.patch
new file mode 100644
index 0000000..01b7f41
--- /dev/null
+++ b/wireshark-libtool-pie.patch
@@ -0,0 +1,11 @@
+diff -up wireshark-1.2.6/ltmain.sh.libpie wireshark-1.2.6/ltmain.sh
+--- wireshark-1.2.6/ltmain.sh.libpie	2010-01-27 17:13:14.000000000 +0100
++++ wireshark-1.2.6/ltmain.sh	2010-03-23 17:39:43.000000000 +0100
+@@ -2499,7 +2499,6 @@ static const void *lt_preloaded_setup() 
+ 	symtab_cflags=
+ 	for arg in $LTCFLAGS; do
+ 	  case $arg in
+-	  -pie | -fpie | -fPIE) ;;
+ 	  *) symtab_cflags="$symtab_cflags $arg" ;;
+ 	  esac
+ 	done