rpms/wireshark
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix build error caused by symbols clash

Browse Source
This commit is contained in:
Peter Hatina 2013-09-24 13:15:23 +02:00
parent 1fba24b8c0
commit 13974b6b7c
2 changed files with 64 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
wireshark-0013-dirent-symbols-clash.patch Normal file
View File

@ -0,0 +1,58 @@
diff --git a/epan/dissectors/packet-gluster.h b/epan/dissectors/packet-gluster.h
index f023f62..d0d4651 100644
--- a/epan/dissectors/packet-gluster.h
+++ b/epan/dissectors/packet-gluster.h
@@ -356,15 +356,15 @@ enum gf_fop_procnum {
/* dir-entry types from libglusterfs/src/compat.h */
enum gluster_entry_types {
- DT_UNKNOWN = 0,
- DT_FIFO = 1,
- DT_CHR = 2,
- DT_DIR = 4,
- DT_BLK = 6,
- DT_REG = 8,
- DT_LNK = 10,
- DT_SOCK = 12,
- DT_WHT = 14
+ GLUSTER_DT_UNKNOWN = 0,
+ GLUSTER_DT_FIFO = 1,
+ GLUSTER_DT_CHR = 2,
+ GLUSTER_DT_DIR = 4,
+ GLUSTER_DT_BLK = 6,
+ GLUSTER_DT_REG = 8,
+ GLUSTER_DT_LNK = 10,
+ GLUSTER_DT_SOCK = 12,
+ GLUSTER_DT_WHT = 14
};
diff --git a/epan/dissectors/packet-glusterfs.c b/epan/dissectors/packet-glusterfs.c
index 5f18258..299e783 100644
--- a/epan/dissectors/packet-glusterfs.c
+++ b/epan/dissectors/packet-glusterfs.c
@@ -2002,15 +2002,15 @@ static value_string_ext glusterfs3_1_fop_proc_vals_ext = VALUE_STRING_EXT_INIT(g
/* dir-entry types */
static const value_string glusterfs_entry_type_names[] = {
- { DT_UNKNOWN, "DT_UNKNOWN" },
- { DT_FIFO, "DT_FIFO" },
- { DT_CHR, "DT_CHR" },
- { DT_DIR, "DT_DIR" },
- { DT_BLK, "DT_BLK" },
- { DT_REG, "DT_REG" },
- { DT_LNK, "DT_LNK" },
- { DT_SOCK, "DT_SOCK" },
- { DT_WHT, "DT_WHT" },
+ { GLUSTER_DT_UNKNOWN, "DT_UNKNOWN" },
+ { GLUSTER_DT_FIFO, "DT_FIFO" },
+ { GLUSTER_DT_CHR, "DT_CHR" },
+ { GLUSTER_DT_DIR, "DT_DIR" },
+ { GLUSTER_DT_BLK, "DT_BLK" },
+ { GLUSTER_DT_REG, "DT_REG" },
+ { GLUSTER_DT_LNK, "DT_LNK" },
+ { GLUSTER_DT_SOCK, "DT_SOCK" },
+ { GLUSTER_DT_WHT, "DT_WHT" },
{ 0, NULL }
};
static value_string_ext glusterfs_entry_type_names_ext = VALUE_STRING_EXT_INIT(glusterfs_entry_type_names);

7
wireshark.spec
View File

@ -21,7 +21,7 @@
Summary: Network traffic analyzer Summary: Network traffic analyzer
Name: wireshark Name: wireshark
Version: 1.10.2 Version: 1.10.2
Release: 6%{?dist} Release: 7%{?dist}
License: GPL+ License: GPL+
Group: Applications/Internet Group: Applications/Internet
Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2 Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
@ -47,6 +47,7 @@ Patch10: wireshark-0010-Add-pkgconfig-entry.patch
Patch11: wireshark-0011-Install-autoconf-related-file.patch Patch11: wireshark-0011-Install-autoconf-related-file.patch
# Fedora-specific # Fedora-specific
Patch12: wireshark-0012-tmp-dir.patch Patch12: wireshark-0012-tmp-dir.patch
Patch13: wireshark-0013-dirent-symbols-clash.patch
Url: http://www.wireshark.org/ Url: http://www.wireshark.org/
BuildRequires: libpcap-devel >= 0.9 BuildRequires: libpcap-devel >= 0.9
@ -153,6 +154,7 @@ and plugins.
%patch10 -p1 -b .add_pkgconfig %patch10 -p1 -b .add_pkgconfig
%patch11 -p1 -b .install_autoconf %patch11 -p1 -b .install_autoconf
%patch12 -p1 -b .tmp_dir %patch12 -p1 -b .tmp_dir
%patch13 -p1 -b .dirent_clash
%build %build
%ifarch s390 s390x sparcv9 sparc64 %ifarch s390 s390x sparcv9 sparc64
@ -347,6 +349,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/aclocal/* %{_datadir}/aclocal/*
%changelog %changelog
* Tue Sep 24 2013 Peter Hatina <phatina@redhat.com> - 1.10.2-7
- fix build error caused by symbols clash
* Tue Sep 17 2013 Peter Hatina <phatina@redhat.com> - 1.10.2-6 * Tue Sep 17 2013 Peter Hatina <phatina@redhat.com> - 1.10.2-6
- move default temporary directory to /var/tmp - move default temporary directory to /var/tmp