From c16a8332f44a16505b7ba4c5eb84aec500264186 Mon Sep 17 00:00:00 2001 From: kth5 Date: Sun, 24 Nov 2024 20:00:06 +0100 Subject: [PATCH] * update wireshark to 4.4.1-1 --- wireshark/.SRCINFO | 146 ++++++++++++++++++++++----------------------- wireshark/PKGBUILD | 123 +++++++++++++++++++++++++++++++------- 2 files changed, 174 insertions(+), 95 deletions(-) diff --git a/wireshark/.SRCINFO b/wireshark/.SRCINFO index 92bf3b6c24..fdc62ec583 100644 --- a/wireshark/.SRCINFO +++ b/wireshark/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = wireshark pkgdesc = Network traffic and protocol analyzer/sniffer - pkgver = 4.2.6 - pkgrel = 1.1 + pkgver = 4.4.1 + pkgrel = 1 url = https://www.wireshark.org/ arch = x86_64 arch = powerpc64le @@ -9,85 +9,85 @@ pkgbase = wireshark arch = powerpc arch = riscv64 license = GPL-2.0-only - makedepends = glibc - makedepends = cmake - makedepends = ninja + makedepends = asciidoctor + makedepends = bcg729 + makedepends = brotli makedepends = c-ares - makedepends = libmaxminddb - makedepends = qt6-tools - makedepends = qt6-svg - makedepends = qt6-multimedia - makedepends = qt6-5compat + makedepends = cmake + makedepends = desktop-file-utils + makedepends = doxygen + makedepends = gcc-libs + makedepends = glib2 + makedepends = glibc + makedepends = gnutls + makedepends = hicolor-icon-theme makedepends = krb5 + makedepends = libcap + makedepends = libgcrypt + makedepends = libmaxminddb + makedepends = libnghttp2 + makedepends = libnl makedepends = libpcap makedepends = libssh makedepends = libxml2 - makedepends = libnghttp2 - makedepends = snappy - makedepends = lz4 - makedepends = spandsp - makedepends = gnutls - makedepends = lua52 - makedepends = python - makedepends = libcap - makedepends = libnl - makedepends = glib2 - makedepends = libgcrypt - makedepends = sbc - makedepends = bcg729 - makedepends = desktop-file-utils makedepends = libxslt - makedepends = hicolor-icon-theme - makedepends = zstd - makedepends = zlib - makedepends = gcc-libs - makedepends = brotli - makedepends = asciidoctor - makedepends = doxygen + makedepends = lua53 + makedepends = lz4 makedepends = minizip - makedepends = speexdsp + makedepends = ninja makedepends = opus + makedepends = python + makedepends = qt6-5compat + makedepends = qt6-multimedia + makedepends = qt6-svg + makedepends = qt6-tools + makedepends = sbc + makedepends = snappy + makedepends = spandsp + makedepends = speexdsp + makedepends = zlib + makedepends = zstd options = !emptydirs - source = https://www.wireshark.org/download/src/wireshark-4.2.6.tar.xz + source = https://www.wireshark.org/download/src/wireshark-4.4.1.tar.xz source = wireshark.sysusers - sha512sums = 265bbc50787ba15646a8a4602e2598bb58494aee496b14a2392293862725320674f7084c7c00de5f9db41dbfc2eb23d88fd8e6b72f3c4036067192b44da22516 + sha512sums = 66c5e035a5a0d2bbb82fba67b652e0e37c296ab470da59b8ed71ef4e6d6d061d6a2649b5af544b737cdf31d808a7f8f07a64a9e4d805674ce8965eff23081de4 sha512sums = 3956c1226e64f0ce4df463f80b55b15eed06ecd9b8703b3e8309d4236a6e1ca84e43007336f3987bc862d8a5e7cfcaaf6653125d2a34999a0f1357c52e7c4990 - b2sums = 880acf82c7e535b89ce8b41293c90197825ffe1132720337e77b3dcee0eaf476cb3faa6f9b42d3864e9f6892e624d0b286afdaf6bbe7e6b60483296d087a4bc3 + b2sums = 747ffe14a7b30c4d7bb435bff1fded11efcf03a8bfcacd48d36141fae7a9cfb7965076b1a807d7f095f66bb99148732c090493d2c3654b4a20355f8dbeac3972 b2sums = 3cebcc993f51eaf0e09673c77e0436598593ef5eff306d880415ccc8eecb32fee93c9a6986f1a7bb0835ab7f9732369d7c5a07e6c053d6293e73a1ea84c58a5c pkgname = wireshark-cli pkgdesc = Network traffic and protocol analyzer/sniffer - CLI tools and data files install = wireshark.install - depends = glibc + depends = bcg729 + depends = brotli depends = c-ares - depends = libmaxminddb - depends = krb5 - depends = libgcrypt - depends = libcap - depends = libpcap - depends = gnutls depends = glib2 - depends = lua52 + depends = glibc + depends = gnutls + depends = krb5 + depends = libbrotlidec.so + depends = libcap + depends = libcap.so + depends = libcares.so + depends = libgcrypt + depends = libk5crypto.so + depends = libkrb5.so + depends = libmaxminddb + depends = libnghttp2 + depends = libpcap + depends = libpcap.so depends = libssh depends = libxml2 - depends = libnghttp2 - depends = snappy + depends = lua53 depends = lz4 - depends = spandsp - depends = sbc - depends = bcg729 - depends = zstd - depends = zlib - depends = brotli - depends = speexdsp - depends = opus depends = opencore-amr - depends = libpcap.so - depends = libcap.so - depends = libbrotlidec.so - depends = libcares.so - depends = libkrb5.so - depends = libk5crypto.so + depends = opus + depends = sbc + depends = snappy + depends = spandsp + depends = speexdsp + depends = zlib + depends = zstd provides = libwireshark.so provides = libwiretap.so provides = libwsutil.so @@ -95,26 +95,26 @@ pkgname = wireshark-cli pkgname = wireshark-qt pkgdesc = Network traffic and protocol analyzer/sniffer - Qt GUI - depends = glibc depends = desktop-file-utils - depends = qt6-multimedia - depends = qt6-svg - depends = qt6-5compat - depends = wireshark-cli + depends = gcc-libs + depends = glibc + depends = hicolor-icon-theme + depends = libgcrypt + depends = libnl + depends = libpcap + depends = libpcap.so depends = libwireshark.so depends = libwiretap.so depends = libwsutil.so - depends = shared-mime-info - depends = hicolor-icon-theme - depends = xdg-utils - depends = gcc-libs - depends = zlib - depends = libpcap - depends = libgcrypt - depends = libnl depends = minizip + depends = qt6-5compat + depends = qt6-multimedia + depends = qt6-svg + depends = shared-mime-info depends = speexdsp - depends = libpcap.so + depends = wireshark-cli + depends = xdg-utils + depends = zlib conflicts = wireshark conflicts = wireshark-gtk conflicts = wireshark-common diff --git a/wireshark/PKGBUILD b/wireshark/PKGBUILD index d62cc75b8f..a55eb47cd1 100644 --- a/wireshark/PKGBUILD +++ b/wireshark/PKGBUILD @@ -8,24 +8,58 @@ pkgbase=wireshark pkgname=('wireshark-cli' 'wireshark-qt') -pkgver=4.2.6 -pkgrel=1.1 +pkgver=4.4.1 +pkgrel=1 pkgdesc='Network traffic and protocol analyzer/sniffer' url='https://www.wireshark.org/' arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) license=('GPL-2.0-only') -makedepends=('glibc' 'cmake' 'ninja' 'c-ares' 'libmaxminddb' 'qt6-tools' 'qt6-svg' - 'qt6-multimedia' 'qt6-5compat' 'krb5' 'libpcap' 'libssh' 'libxml2' 'libnghttp2' - 'snappy' 'lz4' 'spandsp' 'gnutls' 'lua52' 'python' 'libcap' 'libnl' - 'glib2' 'libgcrypt' 'sbc' 'bcg729' 'desktop-file-utils' 'libxslt' - 'hicolor-icon-theme' 'zstd' 'zlib' 'gcc-libs' 'brotli' 'asciidoctor' - 'doxygen' 'minizip' 'speexdsp' 'opus') +makedepends=( + 'asciidoctor' + 'bcg729' + 'brotli' + 'c-ares' + 'cmake' + 'desktop-file-utils' + 'doxygen' + 'gcc-libs' + 'glib2' + 'glibc' + 'gnutls' + 'hicolor-icon-theme' + 'krb5' + 'libcap' + 'libgcrypt' + 'libmaxminddb' + 'libnghttp2' + 'libnl' + 'libpcap' + 'libssh' + 'libxml2' + 'libxslt' + 'lua53' + 'lz4' + 'minizip' + 'ninja' + 'opus' + 'python' + 'qt6-5compat' + 'qt6-multimedia' + 'qt6-svg' + 'qt6-tools' + 'sbc' + 'snappy' + 'spandsp' + 'speexdsp' + 'zlib' + 'zstd' +) options=('!emptydirs') source=(https://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.xz wireshark.sysusers) -sha512sums=('265bbc50787ba15646a8a4602e2598bb58494aee496b14a2392293862725320674f7084c7c00de5f9db41dbfc2eb23d88fd8e6b72f3c4036067192b44da22516' +sha512sums=('66c5e035a5a0d2bbb82fba67b652e0e37c296ab470da59b8ed71ef4e6d6d061d6a2649b5af544b737cdf31d808a7f8f07a64a9e4d805674ce8965eff23081de4' '3956c1226e64f0ce4df463f80b55b15eed06ecd9b8703b3e8309d4236a6e1ca84e43007336f3987bc862d8a5e7cfcaaf6653125d2a34999a0f1357c52e7c4990') -b2sums=('880acf82c7e535b89ce8b41293c90197825ffe1132720337e77b3dcee0eaf476cb3faa6f9b42d3864e9f6892e624d0b286afdaf6bbe7e6b60483296d087a4bc3' +b2sums=('747ffe14a7b30c4d7bb435bff1fded11efcf03a8bfcacd48d36141fae7a9cfb7965076b1a807d7f095f66bb99148732c090493d2c3654b4a20355f8dbeac3972' '3cebcc993f51eaf0e09673c77e0436598593ef5eff306d880415ccc8eecb32fee93c9a6986f1a7bb0835ab7f9732369d7c5a07e6c053d6293e73a1ea84c58a5c') build() { @@ -39,17 +73,45 @@ build() { -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_INSTALL_RPATH= \ -DCMAKE_SKIP_RPATH=ON \ + -DENABLE_LUA=ON \ -Wno-dev ninja -C build -v } package_wireshark-cli() { pkgdesc+=' - CLI tools and data files' - depends=('glibc' 'c-ares' 'libmaxminddb' 'krb5' 'libgcrypt' 'libcap' 'libpcap' - 'gnutls' 'glib2' 'lua52' 'libssh' 'libxml2' 'libnghttp2' 'snappy' - 'lz4' 'spandsp' 'sbc' 'bcg729' 'zstd' 'zlib' 'brotli' 'speexdsp' - 'opus' 'opencore-amr' libpcap.so libcap.so libbrotlidec.so libcares.so - libkrb5.so libk5crypto.so) + depends=( + 'bcg729' + 'brotli' + 'c-ares' + 'glib2' + 'glibc' + 'gnutls' + 'krb5' + libbrotlidec.so + 'libcap' + libcap.so + libcares.so + 'libgcrypt' + libk5crypto.so + libkrb5.so + 'libmaxminddb' + 'libnghttp2' + 'libpcap' + libpcap.so + 'libssh' + 'libxml2' + 'lua53' + 'lz4' + 'opencore-amr' + 'opus' + 'sbc' + 'snappy' + 'spandsp' + 'speexdsp' + 'zlib' + 'zstd' + ) install=wireshark.install conflicts=(wireshark) provides=(libwireshark.so libwiretap.so libwsutil.so) @@ -75,11 +137,28 @@ package_wireshark-cli() { package_wireshark-qt() { pkgdesc+=' - Qt GUI' - depends=('glibc' 'desktop-file-utils' 'qt6-multimedia' 'qt6-svg' 'qt6-5compat' - 'wireshark-cli' 'libwireshark.so' 'libwiretap.so' 'libwsutil.so' - 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'gcc-libs' - 'zlib' 'libpcap' 'libgcrypt' 'libnl' 'minizip' 'speexdsp' - libpcap.so) + depends=( + 'desktop-file-utils' + 'gcc-libs' + 'glibc' + 'hicolor-icon-theme' + 'libgcrypt' + 'libnl' + 'libpcap' + libpcap.so + 'libwireshark.so' + 'libwiretap.so' + 'libwsutil.so' + 'minizip' + 'qt6-5compat' + 'qt6-multimedia' + 'qt6-svg' + 'shared-mime-info' + 'speexdsp' + 'wireshark-cli' + 'xdg-utils' + 'zlib' + ) replaces=(wireshark wireshark-gtk wireshark-common) conflicts=(wireshark wireshark-gtk wireshark-common) @@ -88,8 +167,8 @@ package_wireshark-qt() { DESTDIR="${srcdir}/staging" ninja -C build install install -Dm 755 build/run/wireshark -t "${pkgdir}"/usr/bin - install -Dm 644 build/doc/wireshark.1 -t "${pkgdir}"/usr/share/man/man1 - install -Dm 644 build/doc/wireshark.html -t "${pkgdir}"/usr/share/doc/wireshark + install -Dm 644 build/doc/man_pages/wireshark.1 -t "${pkgdir}"/usr/share/man/man1 + install -Dm 644 build/doc/man_pages/wireshark.html -t "${pkgdir}"/usr/share/doc/wireshark cd "${srcdir}"/staging/usr/share install -Dm 644 applications/org.wireshark.Wireshark.desktop -t "${pkgdir}"/usr/share/applications