From patchwork Tue May 28 19:38:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ummeegge X-Patchwork-Id: 2273 Return-Path: Received: from mail01.ipfire.org (mail01.i.ipfire.org [172.28.1.200]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail01.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web07.i.ipfire.org (Postfix) with ESMTPS id 815E584E69D for ; Tue, 28 May 2019 10:39:11 +0100 (BST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 45CphG3GjCz5CRZX; Tue, 28 May 2019 10:39:10 +0100 (BST) Received: from ipfire-server.local (i59F4BCEE.versanet.de [89.244.188.238]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 45CphC1XNhz51tbX; Tue, 28 May 2019 10:39:07 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201904rsa; t=1559036347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=OGH3ysROJt3lPCou2jeMyFvEtCRMw5hT1rovH0ElGvs=; b=jyDVDctK7X5TTiz5kwesT0i4hZT9Wg0kOW3QwQoCJKc5grHyPykwFLDjI3Wl81TlDuhKmf KXo0SlNRxJaUCsOTv9P6LHAdpN4soibWpbEP/kFXfv/lvhF5hC67aWZCgMnfTgKbxcy/2U +eyxUqpXFffg0z/JMelzK9k/N5Z90rpv3R1rXM69S9i8YQZbVVHPu8mKBWQ6tAr7o2dWmC xIW90kwA/XRj6v8TCO98kAggJYxgq9RedQQaJzmXmxlIJfXYWRc9uEyi2NYQwvYMoJamI1 PBPBz4b4touhUhBvDBZoldfa1ZuR5oXl8Z3UPiE5ERSbxP4a2mdhZjsmIk/Cig== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201904ed25519; t=1559036347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=OGH3ysROJt3lPCou2jeMyFvEtCRMw5hT1rovH0ElGvs=; b=1PjiS1YaeKHl1Cv/tbJNgsm+jz4F+NWbuJj1dzyNP3FrxBNvpRRtodmwE9HkMAKFi26oAd jPVGZ69BWFL9nKAQ== From: Erik Kapfer To: development@lists.ipfire.org Subject: [PATCH] tshark: Update to 3.0.2 Date: Tue, 28 May 2019 11:38:59 +0200 Message-Id: <20190528093859.6066-1-ummeegge@ipfire.org> X-Mailer: git-send-email 2.12.2 Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=ummeegge smtp.mailfrom=ummeegge@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Incl. one vulnerability and several bug fixes. For full overview --> https://www.wireshark.org/docs/relnotes/wireshark-3.0.2.html . - Disabled geoip support since libmaxminddb is not presant. - Added dictionary in ROOTFILE to prevent "radius: Could not open file: '/usr/share/wireshark/radius/dictionary' " . - Added CMAKE build type - Removed profile examples and htmls completly from ROOTFILE. Signed-off-by: Erik Kapfer --- config/rootfiles/packages/tshark | 20 ++++++++++---------- lfs/tshark | 10 ++++++---- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/config/rootfiles/packages/tshark b/config/rootfiles/packages/tshark index fde4030a4..816ab920b 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.1 +usr/lib/libwireshark.so.12.0.2 #usr/lib/libwiretap.so usr/lib/libwiretap.so.9 -usr/lib/libwiretap.so.9.0.1 +usr/lib/libwiretap.so.9.0.2 #usr/lib/libwscodecs.so usr/lib/libwscodecs.so.2 usr/lib/libwscodecs.so.2.0.0 @@ -628,7 +628,7 @@ usr/lib/libwsutil.so.10.0.0 #usr/lib/wireshark/cmake/UseMakePluginReg.cmake #usr/lib/wireshark/cmake/WiresharkConfig.cmake #usr/lib/wireshark/cmake/WiresharkConfigVersion.cmake -#usr/lib/wireshark/cmake/WiresharkTargets-relwithdebinfo.cmake +#usr/lib/wireshark/cmake/WiresharkTargets-release.cmake #usr/lib/wireshark/cmake/WiresharkTargets.cmake #usr/lib/wireshark/extcap usr/lib/wireshark/extcap/androiddump @@ -652,7 +652,7 @@ usr/lib/wireshark/plugins/3.0/epan/unistim.so usr/lib/wireshark/plugins/3.0/epan/wimax.so usr/lib/wireshark/plugins/3.0/epan/wimaxasncp.so usr/lib/wireshark/plugins/3.0/epan/wimaxmacphy.so -usr/lib/wireshark/plugins/3.0/wiretap +#usr/lib/wireshark/plugins/3.0/wiretap usr/lib/wireshark/plugins/3.0/wiretap/usbdump.so #usr/share/doc/wireshark #usr/share/doc/wireshark/androiddump.html @@ -765,10 +765,10 @@ usr/share/wireshark/dtds/xcap-error.dtd #usr/share/wireshark/pdml2html.xsl #usr/share/wireshark/profiles #usr/share/wireshark/profiles/Bluetooth -usr/share/wireshark/profiles/Bluetooth/colorfilters -usr/share/wireshark/profiles/Bluetooth/preferences +#usr/share/wireshark/profiles/Bluetooth/colorfilters +#usr/share/wireshark/profiles/Bluetooth/preferences #usr/share/wireshark/profiles/Classic -usr/share/wireshark/profiles/Classic/colorfilters +#usr/share/wireshark/profiles/Classic/colorfilters #usr/share/wireshark/profiles/No #Reassembly #usr/share/wireshark/profiles/No @@ -776,7 +776,7 @@ usr/share/wireshark/profiles/Classic/colorfilters #usr/share/wireshark/radius #usr/share/wireshark/radius/README.radius_dictionary usr/share/wireshark/radius/custom.includes -#usr/share/wireshark/radius/dictionary +usr/share/wireshark/radius/dictionary usr/share/wireshark/radius/dictionary.3com usr/share/wireshark/radius/dictionary.3gpp usr/share/wireshark/radius/dictionary.3gpp2 @@ -994,7 +994,7 @@ usr/share/wireshark/tpncp/tpncp.dat #usr/share/wireshark/wimaxasncp usr/share/wireshark/wimaxasncp/dictionary.dtd usr/share/wireshark/wimaxasncp/dictionary.xml -usr/share/wireshark/wireshark-filter.html -usr/share/wireshark/wireshark.html +#usr/share/wireshark/wireshark-filter.html +#usr/share/wireshark/wireshark.html usr/share/wireshark/wka usr/share/wireshark/ws.css diff --git a/lfs/tshark b/lfs/tshark index a978cf73c..58c276e25 100644 --- a/lfs/tshark +++ b/lfs/tshark @@ -24,7 +24,7 @@ include Config -VER = 3.0.1 +VER = 3.0.2 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 = 1 +PAK_VER = 2 ############################################################################### # Top-level Rules @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 370a113e1c8ec240c4621cfb5abb0c52 +$(DL_FILE)_MD5 = e344675283d6329a4bc213b621d7f46a install : $(TARGET) @@ -80,7 +80,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && mkdir build cd $(DIR_APP)/build && cmake .. \ -DBUILD_wireshark=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_mmdbresolve=OFF cd $(DIR_APP)/build && make $(PARALELLISMFLAGS) cd $(DIR_APP)/build && make install