[gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark/files: wireshark-1.8.2-python3.patch

[gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark/files: wireshark-1.8.2-python3.patch

[Jeroen Roovers (jer)]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=utf8, Size: 3433 bytes --]

jer         12/09/24 11:57:15

  Added:                wireshark-1.8.2-python3.patch
  Log:
  Fix building with python3 (bug #435460 by Lars Wendler).
  
  (Portage version: 2.2.0_alpha131/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-analyzer/wireshark/files/wireshark-1.8.2-python3.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.8.2-python3.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.8.2-python3.patch?rev=1.1&content-type=text/plain

Index: wireshark-1.8.2-python3.patch
===================================================================
------------------------------------------------------------------------
r43940 | morriss | 2012-07-23 13:04:37 -0400 (Mon, 23 Jul 2012) | 1 line

Get rid of non-ASCII chars.  Also replace tabs with spaces and remove trailing white space.

Index: epan/dissectors/packet-gtpv2.c
===================================================================
--- epan/dissectors/packet-gtpv2.c	(revision 43939)
+++ epan/dissectors/packet-gtpv2.c	(revision 43940)
@@ -2233,7 +2233,7 @@
 static void
 dissect_gtpv2_bearer_ctx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, proto_item *item, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_)
 {
-    int         offset = 0; 
+    int         offset = 0;
     tvbuff_t   *new_tvb;
     proto_tree *grouped_tree;
 
@@ -5884,13 +5884,13 @@
            FT_BYTES, BASE_NONE, NULL, 0x0,
            NULL, HFILL}
         },
-		/* Bit 1 – PVI (Pre-emption Vulnerability): See 3GPP TS 29.212[29], 
-		 * clause 5.3.47 Pre-emption-Vulnerability AVP.
-		 * 5.3.47 Pre-emption-Vulnerability AVP
-		 * The following values are defined:
-		 * PRE-EMPTION_VULNERABILITY_ENABLED (0)
-		 * PRE-EMPTION_VULNERABILITY_DISABLED (1)
-		 */
+        /* Bit 1 - PVI (Pre-emption Vulnerability): See 3GPP TS 29.212[29],
+         * clause 5.3.47 Pre-emption-Vulnerability AVP.
+         * 5.3.47 Pre-emption-Vulnerability AVP
+         * The following values are defined:
+         * PRE-EMPTION_VULNERABILITY_ENABLED (0)
+         * PRE-EMPTION_VULNERABILITY_DISABLED (1)
+         */
         {&hf_gtpv2_bearer_qos_pvi,
          {"PVI (Pre-emption Vulnerability)", "gtpv2.bearer_qos_pvi",
           FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), 0x01,
@@ -5901,13 +5901,13 @@
           FT_UINT8, BASE_DEC, NULL, 0x3c,
           NULL, HFILL}
         },
-		/* Bit 7 – PCI (Pre-emption Capability): See 3GPP TS 29.212[29], clause 5.3.46 Pre-emption-Capability AVP. 
-		 * clause 5.3.46 Pre-emption-Capability AVP.
-		 * 5.3.46 Pre-emption-Capability AVP
-		 * The following values are defined:
-		 * PRE-EMPTION_CAPABILITY_ENABLED (0)
-		 * PRE-EMPTION_CAPABILITY_DISABLED (1)
-		 */
+        /* Bit 7 - PCI (Pre-emption Capability): See 3GPP TS 29.212[29], clause 5.3.46 Pre-emption-Capability AVP.
+         * clause 5.3.46 Pre-emption-Capability AVP.
+         * 5.3.46 Pre-emption-Capability AVP
+         * The following values are defined:
+         * PRE-EMPTION_CAPABILITY_ENABLED (0)
+         * PRE-EMPTION_CAPABILITY_DISABLED (1)
+         */
         {&hf_gtpv2_bearer_qos_pci,
          {"PCI (Pre-emption Capability)", "gtpv2.bearer_qos_pci",
           FT_BOOLEAN, 8, TFS(&tfs_disabled_enabled), 0x40,

------------------------------------------------------------------------