diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 26b1ec013a..71c3c2ec57 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -44,6 +44,14 @@ March 10th, 2019 + + [bdubbs] - Update to xprop-1.2.4. Fixes + #11782. + + + [bdubbs] - Update to wireshark-3.0.0. Fixes + #11777. + [bdubbs] - Add lua-5.2.4. Supports wireshark. diff --git a/networking/netutils/wireshark.xml b/networking/netutils/wireshark.xml index 8e23701cab..071bff80d6 100644 --- a/networking/netutils/wireshark.xml +++ b/networking/netutils/wireshark.xml @@ -6,10 +6,10 @@ - - - - + + + + ]> @@ -69,16 +69,6 @@ Additional Downloads - - - Optional patch: - - (allows building the LUA bindings if is - installed and LUA is not disabled by passing to configure) - - Additional Documentation: @@ -92,44 +82,39 @@ Required - and - + , + , and + Recommended (required to capture data), and - (for the Qt5 GUI) Optional , + , + , , - or (for the legacy GTK GUI), , - , + , + , + , , , , + Asciidoctor, + BCG729, libsmi, lz4, - GeoIP, libssh, - PortAudio - (for GTK+ RTP player), + MaxMindDB, Snappy, and Spandsp - - - The Qt GUI front-end is built by default, if is - found. If you want to build the GTK+ GUI front-end, some configure - switches have to be set (see Command Explanations). - - - User Notes: @@ -178,10 +163,15 @@ the following commands: -patch -Np1 -i ../wireshark-&wireshark-version;-lua_5_3-1.patch && +mkdir build && +cd build && -./configure --prefix=/usr --sysconfdir=/etc && -make +cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/PROGRAM=wireshark-&wireshark-version; \ + -G Ninja \ + .. && +ninja This package does not come with a test suite. @@ -191,10 +181,10 @@ make Now, as the root user: -make install && +ninja install && install -v -m755 -d /usr/share/doc/wireshark-&wireshark-version; && -install -v -m644 README.linux doc/README.* doc/*.{pod,txt} \ +install -v -m644 README.linux doc/README.* doc/{*.pod,randpkt.txt} \ /usr/share/doc/wireshark-&wireshark-version; && pushd /usr/share/doc/wireshark-&wireshark-version; && @@ -237,29 +227,17 @@ chmod -v 6550 /usr/bin/{tshark,dumpcap} - + Configuring Wireshark @@ -314,16 +292,16 @@ chmod -v 6550 /usr/bin/{tshark,dumpcap} - capinfos, captype, dftest, dumpcap, editcap, idl2wrs, + capinfos, captype, dumpcap, editcap, idl2wrs, mergecap, randpkt, rawshark, reordercap, sharkd, - text2pcap, tshark, wireshark, and wireshark-gtk (optional) + text2pcap, tshark, and wireshark - libwireshark.so, libwiretap.so, libwscodecs.so (optional), + libwireshark.so, libwiretap.so, libwscodecs.so, libwsutil.so, and numerous modules under /usr/lib/wireshark/plugins - /usr/{lib,share}/wireshark and + /usr/{include,lib,share}/wireshark and /usr/share/doc/wireshark-&wireshark-version; @@ -356,16 +334,6 @@ chmod -v 6550 /usr/bin/{tshark,dumpcap} - - dftest - - is a display-filter-compiler test program. - - dftest - - - - dumpcap diff --git a/packages.ent b/packages.ent index 3ee51930ae..1493dc5ceb 100644 --- a/packages.ent +++ b/packages.ent @@ -570,7 +570,7 @@ to avoid building libxml2 twice, which is slow with all deps --> - + diff --git a/x/installing/x7app.xml b/x/installing/x7app.xml index cce36dc1e0..4d4b1d6bf9 100644 --- a/x/installing/x7app.xml +++ b/x/installing/x7app.xml @@ -94,8 +94,8 @@ - - + +