From e584e1cf653d0a1728d2a5a2a63b8b397d7b26d0 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Fri, 10 Aug 2018 09:05:41 +0300 Subject: [PATCH] Wireshark: bump version --- net-analyzer/wireshark/wireshark-2.2.7.recipe | 114 ------------------ ...rk-2.4.2.recipe => wireshark-2.6.2.recipe} | 24 ++-- 2 files changed, 12 insertions(+), 126 deletions(-) delete mode 100644 net-analyzer/wireshark/wireshark-2.2.7.recipe rename net-analyzer/wireshark/{wireshark-2.4.2.recipe => wireshark-2.6.2.recipe} (83%) diff --git a/net-analyzer/wireshark/wireshark-2.2.7.recipe b/net-analyzer/wireshark/wireshark-2.2.7.recipe deleted file mode 100644 index f48b75e20..000000000 --- a/net-analyzer/wireshark/wireshark-2.2.7.recipe +++ /dev/null @@ -1,114 +0,0 @@ -SUMMARY="A network protocol analyzer formerly known as ethereal" -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. - -The Wireshark distribution also comes with TShark, which is a \ -line-oriented sniffer (similar to Sun's snoop, or tcpdump) that uses the \ -same dissection, capture-file reading and writing, and packet filtering \ -code as Wireshark, and with editcap, which is a program to read capture \ -files and write the packets from that capture file, possibly in a \ -different capture file format, and with some packets possibly removed \ -from the capture." -HOMEPAGE="http://www.wireshark.org" -COPYRIGHT="1998-2015 Gerald Combs" -LICENSE="GNU GPL v2" -REVISION="1" -SOURCE_URI="https://github.com/wireshark/wireshark/archive/wireshark-$portVersion.tar.gz" -CHECKSUM_SHA256="f25b52104235c5293ba4e451ee98a429f531954976f85e46af501c4e0ae06ad8" -SOURCE_DIR="wireshark-wireshark-$portVersion" -ADDITIONAL_FILES="wireshark.rdef" - -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - wireshark$secondaryArchSuffix = $portVersion - cmd:capinfos$secondaryArchSuffix - cmd:captype$secondaryArchSuffix - cmd:dftest$secondaryArchSuffix - cmd:dumpcap$secondaryArchSuffix - cmd:editcap$secondaryArchSuffix - cmd:idl2wrs$secondaryArchSuffix - cmd:mergecap$secondaryArchSuffix - cmd:randpkt$secondaryArchSuffix - cmd:rawshark$secondaryArchSuffix - cmd:reordercap$secondaryArchSuffix - cmd:text2pcap$secondaryArchSuffix - cmd:tshark$secondaryArchSuffix - cmd:wireshark$secondaryArchSuffix - devel:libwireshark$secondaryArchSuffix =8.1.7 compat >= 8 - devel:libwiretap$secondaryArchSuffix = 6.0.7 compat >= 6 - devel:libwscodecs$secondaryArchSuffix = 1.0.0 compat >= 1 - devel:libwsutil$secondaryArchSuffix = 7.0.0 compat >= 7 - lib:libwireshark$secondaryArchSuffix =8.1.7 compat >= 8 - lib:libwiretap$secondaryArchSuffix = 6.0.7 compat >= 6 - lib:libwscodecs$secondaryArchSuffix = 1.0.0 compat >= 1 - lib:libwsutil$secondaryArchSuffix = 7.0.0 compat >= 7 - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libgcrypt$secondaryArchSuffix - lib:libglib_2.0$secondaryArchSuffix - lib:libgmodule_2.0$secondaryArchSuffix - lib:libgpg_error$secondaryArchSuffix - lib:libgthread_2.0$secondaryArchSuffix - lib:libintl$secondaryArchSuffix - lib:libpcap$secondaryArchSuffix - lib:libQt5Core$secondaryArchSuffix - lib:libQt5Gui$secondaryArchSuffix - lib:libQt5Multimedia$secondaryArchSuffix - lib:libQt5PrintSupport$secondaryArchSuffix - lib:libQt5Widgets$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libgcrypt$secondaryArchSuffix - devel:libgl$secondaryArchSuffix - devel:libglib_2.0$secondaryArchSuffix - devel:libgpg_error$secondaryArchSuffix - devel:libpcap$secondaryArchSuffix - devel:libQt5Core$secondaryArchSuffix - devel:libQt5Gui$secondaryArchSuffix - devel:libQt5Multimedia$secondaryArchSuffix - devel:libQt5PrintSupport$secondaryArchSuffix - devel:libQt5Widgets$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:automake - cmd:bison - cmd:flex - cmd:gcc$secondaryArchSuffix - cmd:libtoolize - cmd:make - cmd:pkg_config$secondaryArchSuffix - cmd:python - cmd:strip$secondaryArchSuffix - " - -BUILD() -{ - autoreconf -fi - LIBS=-lnetwork CPPFLAGS="-D_BSD_SOURCE -fPIC" runConfigure ./configure \ - --without-gtk3 - make $jobArgs -} - -INSTALL() -{ - # disable install-data-local rule as it breaks the build - sed -i 's/install-data-am: install-data-local/install-data-am: /g' Makefile - - make install-strip - find $libDir -name '*.la' -delete - - prepareInstalledDevelLibs libwireshark libwiretap libwscodecs libwsutil - fixPkgconfig - - addResourcesToBinaries $portDir/additional-files/wireshark.rdef \ - $binDir/wireshark -} diff --git a/net-analyzer/wireshark/wireshark-2.4.2.recipe b/net-analyzer/wireshark/wireshark-2.6.2.recipe similarity index 83% rename from net-analyzer/wireshark/wireshark-2.4.2.recipe rename to net-analyzer/wireshark/wireshark-2.6.2.recipe index ed5ee1cca..6db8f76b5 100644 --- a/net-analyzer/wireshark/wireshark-2.4.2.recipe +++ b/net-analyzer/wireshark/wireshark-2.6.2.recipe @@ -11,16 +11,16 @@ files and write the packets from that capture file, possibly in a \ different capture file format, and with some packets possibly removed \ from the capture." HOMEPAGE="https://www.wireshark.org" -COPYRIGHT="1998-2017 Gerald Combs" +COPYRIGHT="1998-2018 Gerald Combs" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/wireshark/wireshark/archive/wireshark-$portVersion.tar.gz" -CHECKSUM_SHA256="b9b60b3a23e2f24f0f9a75d67364b8eef649960c9d1926697739825a3a7a9861" +CHECKSUM_SHA256="86573fdf1b36357c4d3be5f85a1ecfe4dfc7d4ed57a14b32a13ba2667e7318fe" SOURCE_DIR="wireshark-wireshark-$portVersion" ADDITIONAL_FILES="wireshark.rdef" ARCHITECTURES="!x86_gcc2 ?x86 x86_64" -SECONDARY_ARCHITECTURES="?x86" +SECONDARY_ARCHITECTURES="x86" PROVIDES=" wireshark$secondaryArchSuffix = $portVersion @@ -38,14 +38,14 @@ PROVIDES=" cmd:text2pcap$secondaryArchSuffix cmd:tshark$secondaryArchSuffix cmd:wireshark$secondaryArchSuffix - devel:libwireshark$secondaryArchSuffix =10.0.2 compat >= 10 - devel:libwiretap$secondaryArchSuffix = 7.0.2 compat >= 7 - devel:libwscodecs$secondaryArchSuffix = 1.1.0 compat >= 1 - devel:libwsutil$secondaryArchSuffix = 8.0.0 compat >= 8 - lib:libwireshark$secondaryArchSuffix =10.0.2 compat >= 10 - lib:libwiretap$secondaryArchSuffix = 7.0.2 compat >= 7 - lib:libwscodecs$secondaryArchSuffix = 1.1.0 compat >= 1 - lib:libwsutil$secondaryArchSuffix = 8.0.0 compat >= 8 + devel:libwireshark$secondaryArchSuffix = 10.1.2 compat >= 10 + devel:libwiretap$secondaryArchSuffix = 8.0.2 compat >= 8 + devel:libwscodecs$secondaryArchSuffix = 2.1.0 compat >= 2 + devel:libwsutil$secondaryArchSuffix = 9.0.0 compat >= 9 + lib:libwireshark$secondaryArchSuffix = 10.1.2 compat >= 10 + lib:libwiretap$secondaryArchSuffix = 8.0.2 compat >= 8 + lib:libwscodecs$secondaryArchSuffix = 2.1.0 compat >= 2 + lib:libwsutil$secondaryArchSuffix = 9.0.0 compat >= 9 " REQUIRES=" haiku$secondaryArchSuffix