OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 15-May-2005 19:52:01
Branch: HEAD Handle: 2005051518520100
Modified files:
openpkg-src/ethereal ethereal.patch ethereal.spec
Log:
upgrading package: ethereal 0.10.10 -> 0.10.11
Summary:
Revision Changes Path
1.14 +29 -0 openpkg-src/ethereal/ethereal.patch
1.55 +2 -2 openpkg-src/ethereal/ethereal.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ethereal/ethereal.patch
============================================================================
$ cvs diff -u -r1.13 -r1.14 ethereal.patch
--- openpkg-src/ethereal/ethereal.patch 16 Dec 2004 12:43:21 -0000
1.13
+++ openpkg-src/ethereal/ethereal.patch 15 May 2005 17:52:01 -0000
1.14
@@ -69,3 +69,32 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
+
+-----------------------------------------------------------------------------
+
+Work around a GCC bug that prevents Ethereal from
+linking when compiled with optimizations above -O. See
+http://www.ethereal.com/lists/ethereal-dev/200505/msg00069.html for more
+details.
+
+Index: epan/dissectors/packet-diameter.c
+--- epan/dissectors/packet-diameter.c.orig 2005-05-02 23:28:44 +0200
++++ epan/dissectors/packet-diameter.c 2005-05-15 19:35:12 +0200
+@@ -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,
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ethereal/ethereal.spec
============================================================================
$ cvs diff -u -r1.54 -r1.55 ethereal.spec
--- openpkg-src/ethereal/ethereal.spec 20 Apr 2005 17:57:17 -0000
1.54
+++ openpkg-src/ethereal/ethereal.spec 15 May 2005 17:52:01 -0000
1.55
@@ -32,8 +32,8 @@
Class: EVAL
Group: Network
License: GPL
-Version: 0.10.10
-Release: 20050420
+Version: 0.10.11
+Release: 20050515
# package options
%option with_zlib yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
