diff --git a/app-network/wireshark/autobuild/beyond b/app-network/wireshark/autobuild/beyond index 14a4f3523d6c..ed9017795924 100644 --- a/app-network/wireshark/autobuild/beyond +++ b/app-network/wireshark/autobuild/beyond @@ -1,8 +1,2 @@ -abinfo "Post-build hack: Fixing permissions and stripping unneeded file ..." -chgrp -v 86 "$PKGDIR"/usr/bin/dumpcap -chmod -v 754 "$PKGDIR"/usr/bin/dumpcap - -rm -vf "$PKGDIR"/usr/share/applications/wireshark-gtk.desktop - abinfo "Installing development headers ..." DESTDIR="$PKGDIR" ninja -C "$SRCDIR"/abbuild install-headers diff --git a/app-network/wireshark/autobuild/config b/app-network/wireshark/autobuild/config new file mode 100644 index 000000000000..df6e34df5e25 --- /dev/null +++ b/app-network/wireshark/autobuild/config @@ -0,0 +1,4 @@ +. /usr/share/debconf/confmodule + +db_input high wireshark/add_user_to_group || true +db_go diff --git a/app-network/wireshark/autobuild/defines b/app-network/wireshark/autobuild/defines index 15fee60bb905..8f2e93706189 100644 --- a/app-network/wireshark/autobuild/defines +++ b/app-network/wireshark/autobuild/defines @@ -1,11 +1,15 @@ PKGNAME=wireshark PKGDES="Network traffic and protocol analyzer" PKGSEC=net -PKGDEP="brotli c-ares desktop-file-utils glib gnutls krb5 libcap libgcrypt libnl \ - libpcap libssh lua minizip qt-6 sbc shared-mime-info xdg-utils portaudio geoip-api-c \ - speex snappy systemd libilbc bcg729" -BUILDDEP="docbook-xsl doxygen lynx w3m asciidoctor" +PKGDEP="bcg729 brotli c-ares desktop-file-utils gcc-runtime glib \ + glibc gnutls krb5 libcap libgcrypt libilbc libmaxminddb \ + libnl libpcap libssh libxml2 lua-5.4 lz4 minizip nghttp2 \ + nghttp3 opencore-amr opus pcre2 qt-6 sbc shared-mime-info \ + snappy spandsp speex systemd xxhash zlib zstd" +PKGPRDEP="debconf" +BUILDDEP="asciidoctor doxygen" +ABTYPE=cmakeninja CMAKE_AFTER=( "-DDISABLE_WERROR=ON" "-DUSE_qt6=ON" diff --git a/app-network/wireshark/autobuild/overrides/usr/lib/sysusers.d/wireshark.conf b/app-network/wireshark/autobuild/overrides/usr/lib/sysusers.d/wireshark.conf index 2039a4f9f453..bba1edc0ec00 100644 --- a/app-network/wireshark/autobuild/overrides/usr/lib/sysusers.d/wireshark.conf +++ b/app-network/wireshark/autobuild/overrides/usr/lib/sysusers.d/wireshark.conf @@ -1 +1 @@ -g netdev 86 +g wireshark - - diff --git a/app-network/wireshark/autobuild/postinst b/app-network/wireshark/autobuild/postinst index c1e2458efe34..bdf3e4c086d8 100644 --- a/app-network/wireshark/autobuild/postinst +++ b/app-network/wireshark/autobuild/postinst @@ -1,5 +1,4 @@ -echo "Setting up netdev group ..." systemd-sysusers wireshark.conf +setcap cap_net_raw,cap_net_admin+eip /usr/bin/dumpcap -echo "Configuring capability of /usr/bin/dumpcap ..." -setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' /usr/bin/dumpcap +. /usr/share/debconf/confmodule diff --git a/app-network/wireshark/autobuild/postrm b/app-network/wireshark/autobuild/postrm new file mode 100644 index 000000000000..813427eaff21 --- /dev/null +++ b/app-network/wireshark/autobuild/postrm @@ -0,0 +1,4 @@ +if [ "$1" = "purge" -a -e /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule + db_purge +fi diff --git a/app-network/wireshark/autobuild/prepare b/app-network/wireshark/autobuild/prepare deleted file mode 100644 index 764e35305d22..000000000000 --- a/app-network/wireshark/autobuild/prepare +++ /dev/null @@ -1 +0,0 @@ -export PATH="$PATH:/usr/lib/qt5/bin" diff --git a/app-network/wireshark/autobuild/templates b/app-network/wireshark/autobuild/templates new file mode 100644 index 000000000000..486d894e3cc8 --- /dev/null +++ b/app-network/wireshark/autobuild/templates @@ -0,0 +1,14 @@ +Template: wireshark/add_user_to_group +Type: note +Description: Wireshark Configuration + To use Wireshark as a normal user, add your user to the `wireshark' group with the following command: + . + sudo usermod -aG wireshark $(whoami) + . + After adding your user to the group, please re-login for the changes to take effect. +Description-zh_CN.UTF-8: Wireshark 配置贴士 + 在普通用户下正常运行 Wireshark,请使用如下命令将您的用户添加到 `wireshark' 用户组: + . + sudo usermod -aG wireshark $(whoami) + . + 完成后,请重新登录以使更改生效。 diff --git a/app-network/wireshark/spec b/app-network/wireshark/spec index 639c48545a50..ccd50b8c1f5d 100644 --- a/app-network/wireshark/spec +++ b/app-network/wireshark/spec @@ -1,4 +1,4 @@ -VER=4.6.2 +VER=4.6.4 SRCS="tbl::https://www.wireshark.org/download/src/all-versions/wireshark-$VER.tar.xz" -CHKSUMS="sha256::e218e3b3899e5d6e35a5fe95eeeabead587ed084cbf5fc330ac827f9a3137de8" +CHKSUMS="sha256::fbeab3d85c6c8a5763c8d9b7fe20b5c69ca9f9e7f2b824bedc73135bdca332e2" CHKUPDATE="anitya::id=5137" diff --git a/topics/wireshark-4.6.4.toml b/topics/wireshark-4.6.4.toml new file mode 100644 index 000000000000..d3e0009cd47d --- /dev/null +++ b/topics/wireshark-4.6.4.toml @@ -0,0 +1,11 @@ +security = true + +[name] +default = "Wireshark 4.6.4" + +[caution] +default = "7 security vulnerabilities of medium severity" +zh_CN = "修复 7 个中危安全漏洞" + +[packages-v2] +"wireshark" = "< 4.6.4"