diff --git a/common/shlibs b/common/shlibs index 012ec449af3..399af1b8979 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1568,10 +1568,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 -libwscodecs.so.1 libwireshark-2.4.1_1 -libwiretap.so.7 libwireshark-2.4.1_1 -libwireshark.so.9 libwireshark-2.4.5_1 -libwsutil.so.8 libwireshark-2.4.1_1 +libwscodecs.so.2 libwireshark-2.6.2_1 +libwiretap.so.8 libwireshark-2.6.2_1 +libwireshark.so.10 libwireshark-2.6.2_1 +libwsutil.so.9 libwireshark-2.6.2_1 libKF5ContactEditor.so.5 akonadi-contacts-17.12.1_1 libKF5AkonadiContact.so.5 akonadi-contacts-17.12.1_1 libKF5Prison.so.5 prison-5.43.0_1 diff --git a/srcpkgs/wireshark/patches/musl.patch b/srcpkgs/wireshark/patches/musl.patch deleted file mode 100644 index bf8ef1cafda..00000000000 --- a/srcpkgs/wireshark/patches/musl.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 - - #include "ui/failure_message.h" - ---- extcap/udpdump.c.orig 2017-07-19 18:55:06.000000000 +0200 -+++ extcap/udpdump.c 2017-07-24 10:37:17.432127817 +0200 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - #ifdef HAVE_SYS_SOCKET_H - #include diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template index 877770e457a..24da5eaa1cd 100644 --- a/srcpkgs/wireshark/template +++ b/srcpkgs/wireshark/template @@ -1,6 +1,6 @@ # Template file for 'wireshark' pkgname=wireshark -version=2.4.8 +version=2.6.2 revision=1 build_style=gnu-configure configure_args="--with-ssl --with-pcap --with-libcap --with-zlib --with-lua @@ -15,7 +15,7 @@ maintainer="Enno Boland " homepage="https://www.wireshark.org" license="GPL-2.0-or-later" distfiles="https://www.wireshark.org/download/src/${pkgname}-${version}.tar.xz" -checksum=db8ed7828c157e4ffb91fb8c41fa5a2f37fd44259175951a5c37848bf641f5e8 +checksum=49b2895ee3ba17ef9ef0aebfdc4d32a778e0f36ccadde184516557d5f3357094 system_groups="wireshark" CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2" @@ -30,7 +30,7 @@ post_install() { # Headers vmkdir $_includeDir - vcopy "config.h register.h ws_symbol_export.h" $_includeDir + vcopy "config.h ws_symbol_export.h" $_includeDir for i in wiretap wsutil; do vmkdir $_includeDir/$i