Skip to content

Commit

Permalink
wireshark: update to 4.0.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
Gottox authored and sgn committed Oct 7, 2022
1 parent 3dd7df0 commit fcdaf10
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 29 deletions.
6 changes: 3 additions & 3 deletions common/shlibs
Expand Up @@ -1577,9 +1577,9 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
libdovecot-sql.so.0 dovecot-2.3.13_3
libdovecot-storage.so.0 dovecot-2.3.13_3
libdovecot-lda.so.0 dovecot-2.3.13_3
libwiretap.so.12 libwireshark-3.6.3_1
libwireshark.so.15 libwireshark-3.6.3_1
libwsutil.so.13 libwireshark-3.6.3_1
libwiretap.so.13 libwireshark-4.0.0_1
libwireshark.so.16 libwireshark-4.0.0_1
libwsutil.so.14 libwireshark-4.0.0_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
Expand Down
17 changes: 0 additions & 17 deletions srcpkgs/wireshark/patches/rcc-zstd.patch

This file was deleted.

14 changes: 5 additions & 9 deletions srcpkgs/wireshark/template
@@ -1,6 +1,6 @@
# Template file for 'wireshark'
pkgname=wireshark
version=3.6.6
version=4.0.0
revision=1
build_style=cmake
hostmakedepends="pkg-config flex gettext perl python3-devel mit-krb5-devel
Expand All @@ -9,18 +9,18 @@ makedepends="libpcap-devel zlib-devel lua52-devel mit-krb5-devel gnutls-devel
libmaxminddb-devel libgcrypt-devel libcap-devel sbc-devel c-ares-devel libxml2-devel
libssh-devel libnl3-devel spandsp-devel tiff-devel libcap-progs liblz4-devel
nghttp2-devel qt5-devel qt5-tools-devel qt5-multimedia-devel qt5-svg-devel
minizip-devel libzstd-devel brotli-devel speexdsp-devel"
minizip-devel libzstd-devel brotli-devel speexdsp-devel pcre2-devel"
depends="libcap-progs"
short_desc="Network protocol analyzer"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.wireshark.org"
distfiles="https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"
checksum=beba27aeb4d3bb78df6202e88dda69e1dba9b0561044957bcac47e68b6ac28ba
checksum=3dc125ef85e85c2a756a74cc739b3eb11ce38e30a08e085e77d378ee7fdcaded
system_groups="wireshark"

CFLAGS="-DNDEBUG -I${XBPS_CROSS_BASE}/usr/include/lua5.2"
CXXFLAGS="-DNDEBUG -I${XBPS_CROSS_BASE}/usr/include/lua5.2"
CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2"
CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2"

post_patch() {
# systemd-journal integration
Expand Down Expand Up @@ -58,10 +58,6 @@ post_install() {

local _includeDir=usr/include/wireshark

# Headers
vmkdir $_includeDir
vcopy ws_symbol_export.h $_includeDir

for i in wiretap wsutil; do
vmkdir $_includeDir/$i
vcopy "$i/*.h" $_includeDir/$i
Expand Down

0 comments on commit fcdaf10

Please sign in to comment.