diff --git a/common/shlibs b/common/shlibs index 30046b077a..88d986fc8f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1501,10 +1501,10 @@ libdovecot-lda.so.0 dovecot-2.2.11_2 libnetapi.so.0 samba-3.6.23_1 libsmbsharemodes.so.0 samba-3.6.23_1 libmysqld.so.18 libmariadbclient-5.5.36_1 -libwsutil.so.7 libwireshark-2.2.0_1 -libwiretap.so.6 libwireshark-2.2.0_1 -libwireshark.so.8 libwireshark-2.2.0_1 -libwscodecs.so.1 libwireshark-2.2.0_1 +libwsutil.so.8 libwireshark-2.4.0_1 +libwiretap.so.7 libwireshark-2.4.0_1 +libwireshark.so.10 libwireshark-2.4.0_1 +libwscodecs.so.0 libwireshark-2.4.0_1 libfreerdp-core.so.1.0 libfreerdp-1.0.2_2 libfreerdp-channels.so.1.0 libfreerdp-1.0.2_2 libfreerdp-rail.so.1.0 libfreerdp-1.0.2_2 diff --git a/srcpkgs/wireshark/patches/musl.patch b/srcpkgs/wireshark/patches/musl.patch index 737c2ffb49..05fb130fd0 100644 --- a/srcpkgs/wireshark/patches/musl.patch +++ b/srcpkgs/wireshark/patches/musl.patch @@ -1,10 +1,10 @@ ---- extcap/androiddump.c.orig 2016-11-17 08:07:21.000000000 +0000 -+++ extcap/androiddump.c 2016-11-17 08:07:36.590061623 +0000 -@@ -30,6 +30,7 @@ - #include - #include - #include +--- extcap/androiddump.c.orig 2017-07-24 08:03:06.774036710 +0200 ++++ extcap/androiddump.c 2017-07-24 08:03:14.366030335 +0200 +@@ -33,6 +33,7 @@ + #include + #include + #include +#include - #ifdef HAVE_NETINET_IN_H - # include + #include "ui/failure_message.h" + diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template index bda6e2e30e..d2dd6681d7 100644 --- a/srcpkgs/wireshark/template +++ b/srcpkgs/wireshark/template @@ -1,6 +1,6 @@ # Template file for 'wireshark' pkgname=wireshark -version=2.2.8 +version=2.4.0 revision=1 build_style=gnu-configure configure_args="--with-ssl --with-pcap --with-libcap --with-zlib --with-lua @@ -14,10 +14,8 @@ short_desc="A network protocol analyzer" maintainer="Enno Boland " homepage="https://www.wireshark.org" license="GPL-2" -# XXX ovh is blocked (repo4.voidlinux.eu can't download this). -distfiles="https://www.wireshark.org/download/src/${pkgname}-${version}.tar.bz2" -#distfiles="https://sources.voidlinux.eu/${pkgname}-${version}/${pkgname}-${version}.tar.bz2" -checksum=ecf02c148c9ab6e809026ad5743fe9be1739a9840ef6fece6837a7ddfbdf7edc +distfiles="https://www.wireshark.org/download/src/${pkgname}-${version}.tar.xz" +checksum=890bb41b826ff04e98fb089446ab37e5871e16205278bfeffc2a7c7364de3b04 system_groups="wireshark" CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2"