commit 3ab5984d38897665af49c57d4b3a0ea27e620051
Author: Jan Rękorajski <[email protected]>
Date: Thu Aug 16 23:56:49 2018 +0200
- up to 2.6.2
dftest.patch | 14 ++++++++++++++
wireshark-ac.patch | 31 ++++++++++++++++---------------
wireshark.spec | 34 +++++++++++++++++++++-------------
3 files changed, 51 insertions(+), 28 deletions(-)
---
diff --git a/wireshark.spec b/wireshark.spec
index fc20ab1..d023f4c 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -22,15 +22,16 @@ Summary(pt_BR.UTF-8): Analisador de tráfego de rede
Summary(ru.UTF-8): Анализатор сетевого траффика
Summary(uk.UTF-8): Аналізатор мережевого трафіку
Name: wireshark
-Version: 2.4.5
-Release: 2
+Version: 2.6.2
+Release: 1
License: GPL v2+
Group: Networking/Utilities
Source0: https://www.wireshark.org/download/src/%{name}-%{version}.tar.xz
-# Source0-md5: 2b6f1f37c72fa15a0a1863016a0abcc0
+# Source0-md5: 086d235509717190d06554b2ab870209
Patch0: %{name}-Werror.patch
Patch1: %{name}-ac.patch
Patch2: %{name}-desktop.patch
+Patch3: dftest.patch
URL: https://www.wireshark.org/
BuildRequires: GeoIP-devel
BuildRequires: asciidoc
@@ -299,6 +300,7 @@ Pliki nagłówkowe bibliotek Wiresharka.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
find -name Makefile.am | xargs sed -i -e 's/-Werror//g'
%build
@@ -339,7 +341,7 @@ install -d
$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_includedir}/wireshar
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-cp -p image/hi48-app-wireshark.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+cp -p image/wsicon48.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
%{__rm} $RPM_BUILD_ROOT%{_desktopdir}/wireshark*.desktop
%{?with_gtk:cp -p wireshark-gtk.desktop
$RPM_BUILD_ROOT%{_desktopdir}/wireshark.desktop}
@@ -347,7 +349,7 @@ cp -p image/hi48-app-wireshark.png
$RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
# headers (from Fedora, inspired by debian/wireshark-dev.header-files)
install -d
$RPM_BUILD_ROOT%{_includedir}/wireshark/{epan/{crypt,ftypes,dfilter,dissectors,wmem},wiretap,wsutil}
-install config.h register.h $RPM_BUILD_ROOT%{_includedir}/wireshark
+install config.h $RPM_BUILD_ROOT%{_includedir}/wireshark
install cfile.h file.h $RPM_BUILD_ROOT%{_includedir}/wireshark
install ws_diag_control.h $RPM_BUILD_ROOT%{_includedir}/wireshark
install ws_symbol_export.h $RPM_BUILD_ROOT%{_includedir}/wireshark
@@ -361,7 +363,7 @@ install wiretap/*.h
$RPM_BUILD_ROOT%{_includedir}/wireshark/wiretap
install wsutil/*.h $RPM_BUILD_ROOT%{_includedir}/wireshark/wsutil
# plugins *.la are useless - *.so are loaded through gmodule
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/%{version}*/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*/*/*.la
%{?with_qt:%{__mv} $RPM_BUILD_ROOT%{_bindir}/wireshark{,-qt}}
%{?with_gtk:%{__mv} $RPM_BUILD_ROOT%{_bindir}/wireshark{-gtk,}}
@@ -431,17 +433,22 @@ fi
%files common
%defattr(644,root,root,755)
-%doc AUTHORS* ChangeLog NEWS README README.linux README.vmware doc/README.*
+%doc AUTHORS* ChangeLog NEWS README.md README.linux doc/README.*
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/extcap
%dir %{_libdir}/%{name}/plugins
-%dir %{_libdir}/%{name}/plugins/%{version}*
+%dir %{_libdir}/%{name}/plugins/2.6
+%dir %{_libdir}/%{name}/plugins/2.6/codecs
+%dir %{_libdir}/%{name}/plugins/2.6/epan
+%dir %{_libdir}/%{name}/plugins/2.6/wiretap
%attr(755,root,root) %{_libdir}/%{name}/extcap/ciscodump
%attr(755,root,root) %{_libdir}/%{name}/extcap/androiddump
%attr(755,root,root) %{_libdir}/%{name}/extcap/randpktdump
%attr(755,root,root) %{_libdir}/%{name}/extcap/sshdump
%attr(755,root,root) %{_libdir}/%{name}/extcap/udpdump
-%attr(755,root,root) %{_libdir}/%{name}/plugins/%{version}*/*.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/2.6/codecs/*.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/2.6/epan/*.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/2.6/wiretap/*.so
%attr(755,root,root) %{_bindir}/capinfos
%attr(755,root,root) %{_bindir}/captype
%attr(755,root,root) %{_bindir}/dftest
@@ -457,6 +464,7 @@ fi
%attr(755,root,root) %{_bindir}/tfshark
%{_mandir}/man1/androiddump.1*
%{_mandir}/man1/capinfos.1*
+%{_mandir}/man1/captype.1*
%{_mandir}/man1/dftest.1*
%{_mandir}/man1/dumpcap.1*
%{_mandir}/man1/editcap.1*
@@ -480,13 +488,13 @@ fi
%defattr(644,root,root,755)
%doc wiretap/README*
%attr(755,root,root) %{_libdir}/libwireshark.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwireshark.so.9
+%attr(755,root,root) %ghost %{_libdir}/libwireshark.so.10
%attr(755,root,root) %{_libdir}/libwiretap.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwiretap.so.7
+%attr(755,root,root) %ghost %{_libdir}/libwiretap.so.8
%attr(755,root,root) %{_libdir}/libwscodecs.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwscodecs.so.1
+%attr(755,root,root) %ghost %{_libdir}/libwscodecs.so.2
%attr(755,root,root) %{_libdir}/libwsutil.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwsutil.so.8
+%attr(755,root,root) %ghost %{_libdir}/libwsutil.so.9
%files devel
%defattr(644,root,root,755)
diff --git a/dftest.patch b/dftest.patch
new file mode 100644
index 0000000..d2f9212
--- /dev/null
+++ b/dftest.patch
@@ -0,0 +1,14 @@
+--- wireshark-2.6.2/Makefile.am~ 2018-08-16 23:23:54.000000000 +0200
++++ wireshark-2.6.2/Makefile.am 2018-08-16 23:51:34.936542791 +0200
+@@ -45,10 +45,10 @@
+ @text2pcap_bin@ \
+ @tfshark_bin@ \
+ @tshark_bin@ \
++ @dftest_bin@ \
+ @wireshark_bin@
+
+ noinst_PROGRAMS = \
+- @dftest_bin@ \
+ @fuzzshark_bin@
+
+ EXTRA_PROGRAMS = wireshark-gtk wireshark tshark tfshark capinfos captype \
diff --git a/wireshark-ac.patch b/wireshark-ac.patch
index fbb2329..d9a5516 100644
--- a/wireshark-ac.patch
+++ b/wireshark-ac.patch
@@ -10,23 +10,24 @@ diff -ruN wireshark-2.0.1.orig/acinclude.m4
wireshark-2.0.1/acinclude.m4
"-L "*)
#
-@@ -413,6 +413,7 @@
+@@ -413,7 +413,7 @@
+ # Found it, and it's usable; use it to get the include flags
# for libpcap.
#
- CPPFLAGS="$CPPFLAGS `\"$PCAP_CONFIG\" --cflags`"
-+ CPPFLAGS="$CPPFLAGS `$PCAP_CONFIG --cflags`"
- else
+- PCAP_CFLAGS="`\"$PCAP_CONFIG\" --cflags`"
++ PCAP_CFLAGS="`$PCAP_CONFIG --cflags`"
#
- # Didn't find it; we have to look for libpcap ourselves.
+ # We have pcap-config; we assume that means we have libpcap
+ # installed and that pcap-config will tell us whatever
@@ -481,9 +482,9 @@
- # libraries libpcap needs.
- #
- if test x$enable_static = xyes; then
-- PCAP_LIBS="`\"$PCAP_CONFIG\" --libs --static`"
-+ PCAP_LIBS="`$PCAP_CONFIG --libs --static`"
+ # libraries libpcap needs.
+ #
+ if test x$enable_static = xyes; then
+- PCAP_LIBS="`\"$PCAP_CONFIG\" --libs --static`"
++ PCAP_LIBS="`$PCAP_CONFIG --libs --static`"
+ else
+- PCAP_LIBS="`\"$PCAP_CONFIG\" --libs`"
++ PCAP_LIBS="`$PCAP_CONFIG --libs`"
+ fi
+ AC_DEFINE(HAVE_LIBPCAP, 1, [Define to use libpcap library])
else
-- PCAP_LIBS="`\"$PCAP_CONFIG\" --libs`"
-+ PCAP_LIBS="`$PCAP_CONFIG --libs`"
- fi
- AC_DEFINE(HAVE_LIBPCAP, 1, [Define to use libpcap library])
- else
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wireshark.git/commitdiff/3ab5984d38897665af49c57d4b3a0ea27e620051
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
