Re: [PATCH v2] tshark: Update to version 3.0.7

[Arne Fitzenreiter <arne_f@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 2723 bytes --]

Have you done a clean build in next branch?
At my system patch-v1 works and build all files in the rootfile.

Arne


Am 2019-12-19 17:44, schrieb Erik Kapfer:
> Several bugfixes are included in this version, some protocol support
> has been added.
> For a complete overview of the changelog, take a look in here -->
> https://www.wireshark.org/docs/relnotes/wireshark-3.0.6.html
> https://www.wireshark.org/docs/relnotes/wireshark-3.0.7.html .
> 
> v2: Needed to revert
> https://git.ipfire.org/?p=ipfire-2.x.git;a=commit;h=3791a79239ca2fba15e202f2a724e99cc6c0ba02
> since it delivers an error "No such file or directory"
> 
> Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
> ---
>  config/rootfiles/packages/tshark | 6 ++----
>  lfs/tshark                       | 6 +++---
>  2 files changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/config/rootfiles/packages/tshark 
> b/config/rootfiles/packages/tshark
> index 1e72493e9..848f460df 100644
> --- a/config/rootfiles/packages/tshark
> +++ b/config/rootfiles/packages/tshark
> @@ -608,10 +608,10 @@ usr/bin/tshark
>  #usr/include/wireshark/wsutil/xtea.h
>  #usr/lib/libwireshark.so
>  usr/lib/libwireshark.so.12
> -usr/lib/libwireshark.so.12.0.5
> +usr/lib/libwireshark.so.12.0.7
>  #usr/lib/libwiretap.so
>  usr/lib/libwiretap.so.9
> -usr/lib/libwiretap.so.9.0.5
> +usr/lib/libwiretap.so.9.0.7
>  #usr/lib/libwscodecs.so
>  usr/lib/libwscodecs.so.2
>  usr/lib/libwscodecs.so.2.0.0
> @@ -632,10 +632,8 @@ usr/lib/libwsutil.so.10.0.0
>  #usr/lib/wireshark/cmake/WiresharkTargets.cmake
>  #usr/lib/wireshark/extcap
>  usr/lib/wireshark/extcap/androiddump
> -usr/lib/wireshark/extcap/ciscodump
>  usr/lib/wireshark/extcap/dpauxmon
>  usr/lib/wireshark/extcap/randpktdump
> -usr/lib/wireshark/extcap/sshdump
>  usr/lib/wireshark/extcap/udpdump
>  #usr/lib/wireshark/plugins
>  #usr/lib/wireshark/plugins/3.0
> diff --git a/lfs/tshark b/lfs/tshark
> index 7c9cd6613..e8c63f3d8 100644
> --- a/lfs/tshark
> +++ b/lfs/tshark
> @@ -24,7 +24,7 @@
> 
>  include Config
> 
> -VER        = 3.0.5
> +VER        = 3.0.7
> 
>  THISAPP    = wireshark-$(VER)
>  DL_FILE    = $(THISAPP).tar.xz
> @@ -33,7 +33,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
>  TARGET     = $(DIR_INFO)/$(THISAPP)
>  PROG       = tshark
>  DEPS       = "krb5"
> -PAK_VER    = 3
> +PAK_VER    = 4
> 
>  
> ###############################################################################
>  # Top-level Rules
> @@ -43,7 +43,7 @@ objects = $(DL_FILE)
> 
>  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> 
> -$(DL_FILE)_MD5 = d01fdc4e78ef8ea70f20616c91419bd9
> +$(DL_FILE)_MD5 = 5b486f20239545c5af1db614c0d98876
> 
>  install : $(TARGET)