From 625572bb73f415e33ab9152b2e9da494713a008d Mon Sep 17 00:00:00 2001
From: Jan Safranek <jsafrane@redhat.com>
Date: May 23 2012 09:01:26 +0000
Subject: Rediff patches.


---

diff --git a/wireshark-1.6.2-nfsv41-addstatus.patch b/wireshark-1.6.2-nfsv41-addstatus.patch
index 9eb9405..683894a 100644
--- a/wireshark-1.6.2-nfsv41-addstatus.patch
+++ b/wireshark-1.6.2-nfsv41-addstatus.patch
@@ -1,6 +1,6 @@
-diff -up wireshark-1.6.2/epan/dissectors/packet-nfs.c.orig wireshark-1.6.2/epan/dissectors/packet-nfs.c
---- wireshark-1.6.2/epan/dissectors/packet-nfs.c.orig	2011-09-07 21:54:18.000000000 -0400
-+++ wireshark-1.6.2/epan/dissectors/packet-nfs.c	2011-10-17 12:43:30.116761420 -0400
+diff -up wireshark-1.6.8/epan/dissectors/packet-nfs.c.v4staus wireshark-1.6.8/epan/dissectors/packet-nfs.c
+--- wireshark-1.6.8/epan/dissectors/packet-nfs.c.v4staus	2012-04-29 05:46:46.000000000 +0200
++++ wireshark-1.6.8/epan/dissectors/packet-nfs.c	2012-05-23 09:31:45.540759218 +0200
 @@ -768,7 +768,7 @@ static int nfsv4_operation_tiers[] = {
  		 1 /* 50, NFS4_OP_LAYOUTGET */,
  		 1 /* 51, NFS4_OP_LAYOUTRETURN */,
@@ -10,15 +10,7 @@ diff -up wireshark-1.6.2/epan/dissectors/packet-nfs.c.orig wireshark-1.6.2/epan/
  		 1 /* 54, NFS4_OP_SET_SSV */,
  		 1 /* 55, NFS4_OP_TEST_STATEID */,
  		 1 /* 56, NFS4_OP_WANT_DELEGATION  */,
-@@ -8077,7 +8077,6 @@ static value_string_ext names_nfsv4_oper
- static gint *nfsv4_operation_ett[] =
- {
- 	 &ett_nfs_access4 ,
--	 &ett_nfs_access_supp4,
- 	 &ett_nfs_close4 ,
- 	 &ett_nfs_commit4 ,
- 	 &ett_nfs_create4 ,
-@@ -8970,6 +8969,8 @@ dissect_nfs_argop4(tvbuff_t *tvb, int of
+@@ -8977,6 +8977,8 @@ dissect_nfs_argop4(tvbuff_t *tvb, int of
  		ftree = proto_item_add_subtree(fitem, ett_nfs_argop4);
  	}
  
@@ -27,7 +19,7 @@ diff -up wireshark-1.6.2/epan/dissectors/packet-nfs.c.orig wireshark-1.6.2/epan/
  	for (ops_counter=0; ops_counter<ops; ops_counter++)
  	{
  		op_summary[ops_counter].optext = g_string_new("");
-@@ -9003,6 +9004,7 @@ dissect_nfs_argop4(tvbuff_t *tvb, int of
+@@ -9010,6 +9012,7 @@ dissect_nfs_argop4(tvbuff_t *tvb, int of
  		g_string_printf (op_summary[ops_counter].optext, "%s",
                                   val_to_str_ext_const(opcode, &names_nfsv4_operation_ext, "Unknown"));
  
@@ -35,7 +27,7 @@ diff -up wireshark-1.6.2/epan/dissectors/packet-nfs.c.orig wireshark-1.6.2/epan/
  
  		switch(opcode)
  		{
-@@ -9621,6 +9623,8 @@ dissect_nfs_resop4(tvbuff_t *tvb, int of
+@@ -9629,6 +9632,8 @@ dissect_nfs_resop4(tvbuff_t *tvb, int of
  		ftree = proto_item_add_subtree(fitem, ett_nfs_resop4);
  	}
  
@@ -44,7 +36,7 @@ diff -up wireshark-1.6.2/epan/dissectors/packet-nfs.c.orig wireshark-1.6.2/epan/
  	for (ops_counter = 0; ops_counter < ops; ops_counter++)
  	{
  		op_summary[ops_counter].optext = g_string_new("");
-@@ -9654,6 +9658,12 @@ dissect_nfs_resop4(tvbuff_t *tvb, int of
+@@ -9662,6 +9667,12 @@ dissect_nfs_resop4(tvbuff_t *tvb, int of
  		g_string_append_printf (op_summary[ops_counter].optext, "%s", opname);
  
  		offset = dissect_nfs_nfsstat4(tvb, offset, newftree, &status);
diff --git a/wireshark-libtool-pie.patch b/wireshark-libtool-pie.patch
index 01b7f41..95cc088 100644
--- a/wireshark-libtool-pie.patch
+++ b/wireshark-libtool-pie.patch
@@ -1,11 +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() 
+diff -up wireshark-1.6.8/ltmain.sh.pie wireshark-1.6.8/ltmain.sh
+--- wireshark-1.6.8/ltmain.sh.pie	2012-05-23 10:05:07.900326513 +0200
++++ wireshark-1.6.8/ltmain.sh	2012-05-23 10:05:11.786312666 +0200
+@@ -3488,7 +3488,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" ;;
+ 	  *) func_append symtab_cflags " $arg" ;;
  	  esac
  	done