diff mbox series

tshark: Update to 3.0.2

Message ID 20190528093859.6066-1-ummeegge@ipfire.org
State Accepted
Commit 3c8aa8d75bc63c5958c758756546f9413be47676
Headers
Series tshark: Update to 3.0.2 |

Commit Message

ummeegge May 28, 2019, 7:38 p.m. UTC 
  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 <ummeegge@ipfire.org>
---
 config/rootfiles/packages/tshark | 20 ++++++++++----------
 lfs/tshark                       | 10 ++++++----
 2 files changed, 16 insertions(+), 14 deletions(-)

Comments

Michael Tremer May 28, 2019, 10 p.m. UTC | #1 
Thanks. Merged.

I didn’t realise this takes soooo long to build. That is not really great for our build process, but hey...

> On 28 May 2019, at 10:38, Erik Kapfer <ummeegge@ipfire.org> wrote:
> 
> 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 <ummeegge@ipfire.org>
> ---
> 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
> -- 
> 2.12.2
>
ummeegge May 28, 2019, 10:23 p.m. UTC | #2 
On Di, 2019-05-28 at 13:00 +0100, Michael Tremer wrote:
> Thanks. Merged.
Thanks for merging.

> 
> I didn’t realise this takes soooo long to build. That is not really
> great for our build process, but hey...
Hummm --> 
https://www.openhub.net/p/wireshark/analyses/latest/languages_summary


> 
> > On 28 May 2019, at 10:38, Erik Kapfer <ummeegge@ipfire.org> wrote:
> > 
> > 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 <ummeegge@ipfire.org>
> > ---
> > 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
> > -- 
> > 2.12.2
> > 
> 
>
diff mbox series

Patch

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