Ver. 1.10.5

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
This commit is contained in:
Peter Lemenkov 2013-12-23 23:58:14 +04:00
parent b23552849b
commit e786aaccf2
3 changed files with 14 additions and 9 deletions

1
.gitignore vendored
View File

@ -29,3 +29,4 @@ wireshark-1.2.10.tar.bz2
/wireshark-1.10.2.tar.bz2 /wireshark-1.10.2.tar.bz2
/wireshark-1.10.3.tar.bz2 /wireshark-1.10.3.tar.bz2
/wireshark-1.10.4.tar.bz2 /wireshark-1.10.4.tar.bz2
/wireshark-1.10.5.tar.bz2

View File

@ -1 +1 @@
48b59af6c560adacd86078e9d4b109e5 wireshark-1.10.4.tar.bz2 a66894a62f05e1e7a3156a807f3296ea wireshark-1.10.5.tar.bz2

View File

@ -20,8 +20,8 @@
Summary: Network traffic analyzer Summary: Network traffic analyzer
Name: wireshark Name: wireshark
Version: 1.10.4 Version: 1.10.5
Release: 2%{?dist} Release: 1%{?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
@ -60,11 +60,11 @@ Patch15: wireshark-0015-From-Dirk-Jagdmann-Make-sure-err_str-is-initialized.patc
Patch16: wireshark-0016-Crash-when-selecting-Decode-As-based-on-SCTP-PPID.-B.patch Patch16: wireshark-0016-Crash-when-selecting-Decode-As-based-on-SCTP-PPID.-B.patch
# No longer necessary - will be removed in the next release (1.12.x) # No longer necessary - will be removed in the next release (1.12.x)
Patch17: wireshark-0017-Fix-https-bugs.wireshark.org-bugzilla-show_bug.cgi-i.patch Patch17: wireshark-0017-Fix-https-bugs.wireshark.org-bugzilla-show_bug.cgi-i.patch
# Backported from upstream. # No longer necessary - will be removed in the next release (1.12.x)
Patch18: wireshark-0018-Copy-over-from-Trunk.patch Patch18: wireshark-0018-Copy-over-from-Trunk.patch
# Backported from upstream. # No longer necessary - will be removed in the next release (1.12.x)
Patch19: wireshark-0019-Bugfix-port-number-endianness.-Bug-9530-https-bugs.w.patch Patch19: wireshark-0019-Bugfix-port-number-endianness.-Bug-9530-https-bugs.w.patch
# Backported from upstream. # No longer necessary - will be removed in the next release (1.12.x)
Patch20: wireshark-0020-Something-went-wrong-with-the-backport-of-r53608-r53.patch Patch20: wireshark-0020-Something-went-wrong-with-the-backport-of-r53608-r53.patch
# Sent upstream: # Sent upstream:
# https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9576 # https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9576
@ -180,9 +180,9 @@ and plugins.
#%patch15 -p1 -b .fix_main_window #%patch15 -p1 -b .fix_main_window
#%patch16 -p1 -b .fix_sctp #%patch16 -p1 -b .fix_sctp
#%patch17 -p1 -b .fix_global_pinfo #%patch17 -p1 -b .fix_global_pinfo
%patch18 -p1 -b .fix_overflow #%patch18 -p1 -b .fix_overflow
%patch19 -p1 -b .fix_endianness #%patch19 -p1 -b .fix_endianness
%patch20 -p1 -b .fix_previous_backport #%patch20 -p1 -b .fix_previous_backport
%patch21 -p1 -b .remove_g_memmove %patch21 -p1 -b .remove_g_memmove
%build %build
@ -382,6 +382,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/aclocal/* %{_datadir}/aclocal/*
%changelog %changelog
* Mon Dec 23 2013 Peter Lemenkov <lemenkov@gmail.com> - 1.10.5-1
- Ver. 1.10.5
- Don't apply upstreamed patches no. 18, 19, 20.
* Thu Dec 19 2013 Peter Lemenkov <lemenkov@gmail.com> - 1.10.4-2 * Thu Dec 19 2013 Peter Lemenkov <lemenkov@gmail.com> - 1.10.4-2
- Fix endianness in the Bitcoin protocol dissector (patch no. 19) - Fix endianness in the Bitcoin protocol dissector (patch no. 19)
- Last-minute fix for wrongly backported change (patch no. 20) - Last-minute fix for wrongly backported change (patch no. 20)