From mboxrd@z Thu Jan 1 00:00:00 1970 From: ummeegge To: development@lists.ipfire.org Subject: Re: [PATCH v2] tshark: Update to version 3.0.7 Date: Mon, 30 Dec 2019 08:55:10 +0100 Message-ID: <931c7839d511e92a1f4780b23c992e6b26d6a17c.camel@ipfire.org> In-Reply-To: <0d25eb3b2023f804bbedf1ce03dc0e69@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3608086618429123626==" List-Id: --===============3608086618429123626== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi Arne, Am Sonntag, den 29.12.2019, 18:55 +0100 schrieb Arne Fitzenreiter: > Have you done a clean build in next branch? Yes i did. Moreover after a clean build of the updated version, the ROOTFILE did not include 'ciscodump' and 'sshdump' in extcap. Have added them manually since i knew that you included them, after a clean build then i got a 'no such file or directory' for both. Best, Erik > At my system patch-v1 works and build all files in the rootfile. >=20 > Arne >=20 >=20 > Am 2019-12-19 17:44, schrieb Erik Kapfer: > > Several bugfixes are included in this version, some protocol > > support > > has been added. > > For a complete overview of the changelog, take a look in here --> > > https://www.wireshark.org/docs/relnotes/wireshark-3.0.6.html > > https://www.wireshark.org/docs/relnotes/wireshark-3.0.7.html . > >=20 > > v2: Needed to revert > >=20 https://git.ipfire.org/?p=3Dipfire-2.x.git;a=3Dcommit;h=3D3791a79239ca2fba15e= 202f2a724e99cc6c0ba02 > > since it delivers an error "No such file or directory" > >=20 > > Signed-off-by: Erik Kapfer > > --- > > config/rootfiles/packages/tshark | 6 ++---- > > lfs/tshark | 6 +++--- > > 2 files changed, 5 insertions(+), 7 deletions(-) > >=20 > > diff --git a/config/rootfiles/packages/tshark=20 > > b/config/rootfiles/packages/tshark > > index 1e72493e9..848f460df 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.5 > > +usr/lib/libwireshark.so.12.0.7 > > #usr/lib/libwiretap.so > > usr/lib/libwiretap.so.9 > > -usr/lib/libwiretap.so.9.0.5 > > +usr/lib/libwiretap.so.9.0.7 > > #usr/lib/libwscodecs.so > > usr/lib/libwscodecs.so.2 > > usr/lib/libwscodecs.so.2.0.0 > > @@ -632,10 +632,8 @@ usr/lib/libwsutil.so.10.0.0 > > #usr/lib/wireshark/cmake/WiresharkTargets.cmake > > #usr/lib/wireshark/extcap > > usr/lib/wireshark/extcap/androiddump > > -usr/lib/wireshark/extcap/ciscodump > > usr/lib/wireshark/extcap/dpauxmon > > usr/lib/wireshark/extcap/randpktdump > > -usr/lib/wireshark/extcap/sshdump > > usr/lib/wireshark/extcap/udpdump > > #usr/lib/wireshark/plugins > > #usr/lib/wireshark/plugins/3.0 > > diff --git a/lfs/tshark b/lfs/tshark > > index 7c9cd6613..e8c63f3d8 100644 > > --- a/lfs/tshark > > +++ b/lfs/tshark > > @@ -24,7 +24,7 @@ > >=20 > > include Config > >=20 > > -VER =3D 3.0.5 > > +VER =3D 3.0.7 > >=20 > > THISAPP =3D wireshark-$(VER) > > DL_FILE =3D $(THISAPP).tar.xz > > @@ -33,7 +33,7 @@ DIR_APP =3D $(DIR_SRC)/$(THISAPP) > > TARGET =3D $(DIR_INFO)/$(THISAPP) > > PROG =3D tshark > > DEPS =3D "krb5" > > -PAK_VER =3D 3 > > +PAK_VER =3D 4 > >=20 > > =20 > > ################################################################### > > ############ > > # Top-level Rules > > @@ -43,7 +43,7 @@ objects =3D $(DL_FILE) > >=20 > > $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) > >=20 > > -$(DL_FILE)_MD5 =3D d01fdc4e78ef8ea70f20616c91419bd9 > > +$(DL_FILE)_MD5 =3D 5b486f20239545c5af1db614c0d98876 > >=20 > > install : $(TARGET) --===============3608086618429123626==--