fixed libwireshark.so.1: cannot open shared object file error message on startup
+ also fixed python linking, see http://www.mail-archive.com/wireshark-dev@wireshark.org/msg25938.html.
This commit is contained in:
parent
2209c3a99b
commit
2accc86fda
@ -11,7 +11,7 @@ diff -up wireshark-1.6.0/epan/wspython/wspy_libws.py.soname wireshark-1.6.0/epan
|
|||||||
return 'libwireshark.dll'
|
return 'libwireshark.dll'
|
||||||
else:
|
else:
|
||||||
- return 'libwireshark.so'
|
- return 'libwireshark.so'
|
||||||
+ return 'libwireshark.so.1'
|
+ return 'libwireshark.so.2'
|
||||||
|
|
||||||
def get_libws_handle():
|
def get_libws_handle():
|
||||||
global __libwireshark
|
global __libwireshark
|
||||||
|
29
wireshark-1.8.2-python-symbols.patch
Normal file
29
wireshark-1.8.2-python-symbols.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
tshark / wireshark shows
|
||||||
|
"/lib64/libwireshark.so.2: undefined symbol: py_create_dissector_handle"
|
||||||
|
on startup. This patch ensures that the python symbols are compiled in.
|
||||||
|
|
||||||
|
diff -up wireshark-1.8.2/epan/Makefile.am.orig wireshark-1.8.2/epan/Makefile.am
|
||||||
|
--- wireshark-1.8.2/epan/Makefile.am.orig 2012-08-29 09:39:06.860107175 +0200
|
||||||
|
+++ wireshark-1.8.2/epan/Makefile.am 2012-08-29 09:39:11.311137553 +0200
|
||||||
|
@@ -195,7 +195,7 @@ if !HAVE_PLUGINS
|
||||||
|
def_sym_filter_symbols += /^register_all_wiretap_modules/ || /^register_all_plugin_tap_listeners/ || /^plugin_list/ {next;};
|
||||||
|
endif
|
||||||
|
|
||||||
|
-if HAVE_LIBPY
|
||||||
|
+if !HAVE_LIBPY
|
||||||
|
# If we're not building python, these symbols don't get built.
|
||||||
|
# Keep them out of the symbol list.
|
||||||
|
def_sym_filter_symbols += /^py_create_dissector_handle/ || /^py_dissector_args/ {next;};
|
||||||
|
diff -up wireshark-1.8.2/epan/libwireshark.def.old wireshark-1.8.2/epan/libwireshark.def
|
||||||
|
--- wireshark-1.8.2/epan/libwireshark.def.old 2012-08-29 10:15:28.136123323 +0200
|
||||||
|
+++ wireshark-1.8.2/epan/libwireshark.def 2012-08-29 10:18:28.905483905 +0200
|
||||||
|
@@ -1248,3 +1248,9 @@ xml_escape
|
||||||
|
xml_get_attrib
|
||||||
|
xml_get_cdata
|
||||||
|
xml_get_tag
|
||||||
|
+py_create_dissector_handle
|
||||||
|
+py_dissector_args
|
||||||
|
+hf_register_info_add
|
||||||
|
+hf_register_info_create
|
||||||
|
+hf_register_info_destroy
|
||||||
|
+
|
@ -13,7 +13,7 @@
|
|||||||
Summary: Network traffic analyzer
|
Summary: Network traffic analyzer
|
||||||
Name: wireshark
|
Name: wireshark
|
||||||
Version: 1.8.2
|
Version: 1.8.2
|
||||||
Release: 1%{?dist}
|
Release: 2%{?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
|
||||||
@ -31,6 +31,7 @@ Patch2: wireshark-1.2.4-enable_lua.patch
|
|||||||
Patch3: wireshark-libtool-pie.patch
|
Patch3: wireshark-libtool-pie.patch
|
||||||
Patch4: wireshark-1.6.1-group-msg.patch
|
Patch4: wireshark-1.6.1-group-msg.patch
|
||||||
Patch5: wireshark-1.6.0-soname.patch
|
Patch5: wireshark-1.6.0-soname.patch
|
||||||
|
Patch6: wireshark-1.8.2-python-symbols.patch
|
||||||
|
|
||||||
Url: http://www.wireshark.org/
|
Url: http://www.wireshark.org/
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
@ -118,6 +119,7 @@ and plugins.
|
|||||||
%patch3 -p1 -b .v4cleanup
|
%patch3 -p1 -b .v4cleanup
|
||||||
%patch4 -p1 -b .group-msg
|
%patch4 -p1 -b .group-msg
|
||||||
%patch5 -p1 -b .soname
|
%patch5 -p1 -b .soname
|
||||||
|
%patch6 -p1 -b .python-symbols
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%ifarch s390 s390x sparcv9 sparc64
|
%ifarch s390 s390x sparcv9 sparc64
|
||||||
@ -347,6 +349,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
|||||||
%{_datadir}/aclocal/*
|
%{_datadir}/aclocal/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Aug 29 2012 Jan Safranek <jsafrane@redhat.com> - 1.8.2-2
|
||||||
|
- fixed "libwireshark.so.1: cannot open shared object file" error
|
||||||
|
message on startup
|
||||||
|
|
||||||
* Thu Aug 16 2012 Jan Safranek <jsafrane@redhat.com> - 1.8.2-1
|
* Thu Aug 16 2012 Jan Safranek <jsafrane@redhat.com> - 1.8.2-1
|
||||||
- upgrade to 1.8.2
|
- upgrade to 1.8.2
|
||||||
- see http://www.wireshark.org/docs/relnotes/wireshark-1.8.2.html
|
- see http://www.wireshark.org/docs/relnotes/wireshark-1.8.2.html
|
||||||
|
Loading…
Reference in New Issue
Block a user