From 76422fc6f301f60deb5846ef844f037b80950a4e Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Wed, 26 Dec 2018 17:09:46 +0300 Subject: [PATCH] WireShark: bump version --- ...hark-2.6.2.recipe => wireshark-2.6.5.recipe} | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) rename net-analyzer/wireshark/{wireshark-2.6.2.recipe => wireshark-2.6.5.recipe} (89%) diff --git a/net-analyzer/wireshark/wireshark-2.6.2.recipe b/net-analyzer/wireshark/wireshark-2.6.5.recipe similarity index 89% rename from net-analyzer/wireshark/wireshark-2.6.2.recipe rename to net-analyzer/wireshark/wireshark-2.6.5.recipe index 6db8f76b5..12745c9b1 100644 --- a/net-analyzer/wireshark/wireshark-2.6.2.recipe +++ b/net-analyzer/wireshark/wireshark-2.6.5.recipe @@ -1,5 +1,5 @@ SUMMARY="A network protocol analyzer formerly known as ethereal" -DESCRIPTION="Wireshark is a network traffic analyzer, or "sniffer", for Unix \ +DESCRIPTION="Wireshark is a network traffic analyzer, or \"sniffer\", for Unix \ and Unix-like operating systems. It uses Qt, a graphical user interface \ library, and libpcap, a packet capture and filtering library. @@ -15,7 +15,7 @@ COPYRIGHT="1998-2018 Gerald Combs" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://github.com/wireshark/wireshark/archive/wireshark-$portVersion.tar.gz" -CHECKSUM_SHA256="86573fdf1b36357c4d3be5f85a1ecfe4dfc7d4ed57a14b32a13ba2667e7318fe" +CHECKSUM_SHA256="47e15281b767f6fd09b72d8ddb9c392c1a56ca601b1b3483d9c9b6e479c7b997" SOURCE_DIR="wireshark-wireshark-$portVersion" ADDITIONAL_FILES="wireshark.rdef" @@ -24,6 +24,7 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" wireshark$secondaryArchSuffix = $portVersion + app:WireShark$secondaryArchSuffix cmd:capinfos$secondaryArchSuffix cmd:captype$secondaryArchSuffix cmd:dftest$secondaryArchSuffix @@ -37,7 +38,6 @@ PROVIDES=" cmd:sharkd$secondaryArchSuffix cmd:text2pcap$secondaryArchSuffix cmd:tshark$secondaryArchSuffix - cmd:wireshark$secondaryArchSuffix devel:libwireshark$secondaryArchSuffix = 10.1.2 compat >= 10 devel:libwiretap$secondaryArchSuffix = 8.0.2 compat >= 8 devel:libwscodecs$secondaryArchSuffix = 2.1.0 compat >= 2 @@ -85,6 +85,7 @@ BUILD_PREREQUIRES=" cmd:flex cmd:gcc$secondaryArchSuffix cmd:libtoolize + cmd:lrelease cmd:make cmd:pkg_config$secondaryArchSuffix cmd:python @@ -94,8 +95,8 @@ BUILD_PREREQUIRES=" BUILD() { autoreconf -fi - LIBS=-lnetwork CPPFLAGS="-D_BSD_SOURCE -fPIC" runConfigure ./configure \ - --without-gtk3 + LIBS=-lnetwork CPPFLAGS="-D_BSD_SOURCE -fPIC" \ + runConfigure ./configure --without-gtk3 --bindir=$appsDir\WireShark make $jobArgs } @@ -110,6 +111,10 @@ INSTALL() prepareInstalledDevelLibs libwireshark libwiretap libwscodecs libwsutil fixPkgconfig + mv $appsDir/wireshark $appsDir/WireShark + addResourcesToBinaries $portDir/additional-files/wireshark.rdef \ - $binDir/wireshark + $appsDir/WireShark + + addAppDeskbarSymlink $appsDir/WireShark }