|
|
@@ -3,7 +3,7 @@
|
|
|
Summary: Network traffic analyzer
|
|
|
Summary(ja): ネットワークトラフィック解析プログラム
|
|
|
Name: wireshark
|
|
|
-Version: 1.2.10
|
|
|
+Version: 1.4.0
|
|
|
Release: 1%{_dist_release}
|
|
|
License: GPLv2
|
|
|
Group: Applications/System
|
|
|
@@ -14,6 +14,7 @@ Source3: wireshark.desktop
|
|
|
Patch1: wireshark-0.99.7-pie.patch
|
|
|
Patch3: wireshark-nfsv4-opts.patch
|
|
|
Patch4: wireshark-0.99.7-path.patch
|
|
|
+Patch5: wireshark-1.4.0-lua-vine.patch
|
|
|
URL: http://www.wireshark.org/
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
@@ -68,6 +69,7 @@ libpcap を使ったコマンドラインツールと，プラグイン，ドキ
|
|
|
#patch1 -p1 -b .pie
|
|
|
%patch3 -p1
|
|
|
%patch4 -p1
|
|
|
+%patch5 -p1 -b .lua-vine
|
|
|
|
|
|
%build
|
|
|
%ifarch s390 s390x
|
|
|
@@ -77,7 +79,8 @@ export PIECFLAGS="-fpie"
|
|
|
%endif
|
|
|
# FC5+ automatic -fstack-protector-all switch
|
|
|
export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
|
|
|
-export CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS -I%{_includedir}/pcap -I%{_includedir}/pcre"
|
|
|
+## export CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS -I%{_includedir}/pcap -I%{_includedir}/pcre"
|
|
|
+export CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS -I%{_includedir}/pcre"
|
|
|
export CXXFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"
|
|
|
export LDFLAGS="$LDFLAGS -lm -lcrypto"
|
|
|
export PATH="$PATH:/usr/kerberos/bin"
|
|
|
@@ -126,8 +129,8 @@ mkdir -p $RPM_BUILD_ROOT/%{_bindir}
|
|
|
ln -s consolehelper $RPM_BUILD_ROOT/%{_bindir}/wireshark
|
|
|
|
|
|
# install man
|
|
|
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
|
|
|
-install -m 644 *.1 $RPM_BUILD_ROOT/%{_mandir}/man1
|
|
|
+## mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
|
|
|
+## install -m 644 *.1 $RPM_BUILD_ROOT/%{_mandir}/man1
|
|
|
|
|
|
# Install python stuff.
|
|
|
mkdir -p $RPM_BUILD_ROOT%{python_sitelib}
|
|
|
@@ -193,9 +196,15 @@ update-desktop-database -q
|
|
|
%{_sbindir}/wireshark
|
|
|
%{_mandir}/man1/wireshark.*
|
|
|
%{_mandir}/man1/rawshark.*
|
|
|
+%{_mandir}/man1/dftest.*
|
|
|
+%{_mandir}/man1/randpkt.*
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Sep 19 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.0-1
|
|
|
+- new upstream release
|
|
|
+- add Patch5 (wireshark-1.4.0-lua-vine.patch)
|
|
|
+
|
|
|
* Mon Aug 02 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.10-1
|
|
|
- new upstream release
|
|
|
(including security fix for CVE-2010-2287 and CVE-2010-2284)
|
Takemikaduchi