[PR PATCH] Wireshark 4.4.2

[PR PATCH] Wireshark 4.4.2

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1246 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages wireshark-4.4.2
https://github.com/void-linux/void-packages/pull/53832

Wireshark 4.4.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/53832.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wireshark-4.4.2-53832.patch --]
[-- Type: text/x-diff, Size: 9547 bytes --]

From a33fdf7d988051f7fcf1f0d16c54cb3ab6f30894 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 3 Jan 2025 12:15:33 +0700
Subject: [PATCH 1/4] New package: nghttp3-1.7.0

---
 common/shlibs            |  1 +
 srcpkgs/nghttp3-devel    |  1 +
 srcpkgs/nghttp3/template | 28 ++++++++++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/nghttp3-devel
 create mode 100644 srcpkgs/nghttp3/template

diff --git a/common/shlibs b/common/shlibs
index 7bc69ffc0160f0..21bb15e6fe4f24 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2383,6 +2383,7 @@ libjreen-qt5.so.1 jreen-1.3.0_1
 libzen.so.0 libzen-0.4.31_1
 libmediainfo.so.0 libmediainfo-0.7.75_1
 libnghttp2.so.14 nghttp2-1.43.0_2
+libnghttp3.so.9 nghttp3-1.7.0_1
 librom1394.so.0 libavc1394-0.5.4_1
 libavc1394.so.0 libavc1394-0.5.4_1
 libiec61883.so.0 libiec61883-1.2.0_1
diff --git a/srcpkgs/nghttp3-devel b/srcpkgs/nghttp3-devel
new file mode 120000
index 00000000000000..0c67b62f5787fd
--- /dev/null
+++ b/srcpkgs/nghttp3-devel
@@ -0,0 +1 @@
+nghttp3
\ No newline at end of file
diff --git a/srcpkgs/nghttp3/template b/srcpkgs/nghttp3/template
new file mode 100644
index 00000000000000..3d03dc2044c4a6
--- /dev/null
+++ b/srcpkgs/nghttp3/template
@@ -0,0 +1,28 @@
+# Template file for 'nghttp3'
+pkgname=nghttp3
+version=1.7.0
+revision=1
+build_style=cmake
+configure_args="-DENABLE_STATIC_LIB=OFF -DBUILD_TESTING=ON"
+short_desc="HTTP/3 library written in C"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="MIT"
+homepage="https://nghttp2.org/nghttp3/"
+distfiles="https://github.com/ngtcp2/nghttp3/releases/download/v${version}/nghttp3-${version}.tar.xz"
+checksum=b4eb6bceb99293d9a9df2031c1aad166af3d57b3e33655aca0699397b6f0d751
+
+post_install() {
+	vlicense COPYING
+	rm -rf "${DESTDIR}/usr/share/doc"
+}
+
+nghttp3-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 4d6e423a9a48925becadf2750d5b55b24dd470cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 3 Jan 2025 12:50:47 +0700
Subject: [PATCH 2/4] New package: opencore-amr-0.1.6

---
 common/shlibs                 |  2 ++
 srcpkgs/opencore-amr-devel    |  1 +
 srcpkgs/opencore-amr/template | 23 +++++++++++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 120000 srcpkgs/opencore-amr-devel
 create mode 100644 srcpkgs/opencore-amr/template

diff --git a/common/shlibs b/common/shlibs
index 21bb15e6fe4f24..c78259b47beaf3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4543,3 +4543,5 @@ libflashrom.so.1 flashrom-1.4.0_1
 libpyside6.so.6.7 libpyside6-6.7.2_1
 libpyside6qml.so.6.7 libpyside6-6.7.2_1
 libshiboken6.so.6.7 libshiboken6-6.7.2_1
+libopencore-amrnb.so.0 opencore-amr-0.1.6_1
+libopencore-amrwb.so.0 opencore-amr-0.1.6_1
diff --git a/srcpkgs/opencore-amr-devel b/srcpkgs/opencore-amr-devel
new file mode 120000
index 00000000000000..ebd0ac162c7834
--- /dev/null
+++ b/srcpkgs/opencore-amr-devel
@@ -0,0 +1 @@
+opencore-amr
\ No newline at end of file
diff --git a/srcpkgs/opencore-amr/template b/srcpkgs/opencore-amr/template
new file mode 100644
index 00000000000000..3405a19d23c14e
--- /dev/null
+++ b/srcpkgs/opencore-amr/template
@@ -0,0 +1,23 @@
+# Template file for 'opencore-amr'
+pkgname=opencore-amr
+version=0.1.6
+revision=1
+build_style=gnu-configure
+configure_args="--disable-static"
+short_desc="AMRNB/AMRWB Encoder Decoder"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="Apache-2.0"
+homepage="https://sourceforge.net/projects/opencore-amr/"
+distfiles="${SOURCEFORGE_SITE}/opencore-amr/opencore-amr-${version}.tar.gz"
+checksum=483eb4061088e2b34b358e47540b5d495a96cd468e361050fae615b1809dc4a1
+
+opencore-amr-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.la"
+		vmove "usr/lib/*.so"
+	}
+}

From 43699b6c5cdd86cf492724f088438ae73d47bfb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 4 Jan 2025 10:40:24 +0700
Subject: [PATCH 3/4] New package: libilbc-3.0.4

---
 common/shlibs            |  1 +
 srcpkgs/libilbc-devel    |  1 +
 srcpkgs/libilbc/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/libilbc-devel
 create mode 100644 srcpkgs/libilbc/template

diff --git a/common/shlibs b/common/shlibs
index c78259b47beaf3..739da7523e3c5e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4545,3 +4545,4 @@ libpyside6qml.so.6.7 libpyside6-6.7.2_1
 libshiboken6.so.6.7 libshiboken6-6.7.2_1
 libopencore-amrnb.so.0 opencore-amr-0.1.6_1
 libopencore-amrwb.so.0 opencore-amr-0.1.6_1
+libilbc.so.3 libilbc-3.0.4_1
diff --git a/srcpkgs/libilbc-devel b/srcpkgs/libilbc-devel
new file mode 120000
index 00000000000000..8eccc909e0af4d
--- /dev/null
+++ b/srcpkgs/libilbc-devel
@@ -0,0 +1 @@
+libilbc
\ No newline at end of file
diff --git a/srcpkgs/libilbc/template b/srcpkgs/libilbc/template
new file mode 100644
index 00000000000000..b347c9e7f176af
--- /dev/null
+++ b/srcpkgs/libilbc/template
@@ -0,0 +1,27 @@
+# Template file for 'libilbc'
+pkgname=libilbc
+version=3.0.4
+revision=1
+build_style=cmake
+short_desc="Packaged version of iLBC codec from the WebRTC project"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/TimothyGu/libilbc"
+distfiles="https://github.com/TimothyGu/libilbc/releases/download/v${version}/libilbc-${version}.tar.zst"
+checksum=70a37660e59f999dbde8fd10fb0fb375baf8dd02093ab4b32f94bc4abaac4358
+
+post_install() {
+	vlicense COPYING
+	rm -rf ${DESTDIR}/usr/share/doc
+}
+
+libilbc-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 3bd8b28eb43d383e5f4ab01f038fc093088d7035 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 4 Jan 2025 10:40:48 +0700
Subject: [PATCH 4/4] wireshark: update to 4.4.2.

---
 srcpkgs/wireshark/patches/install-pkgconfig.patch | 12 ++++++------
 srcpkgs/wireshark/template                        | 13 +++++++------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/wireshark/patches/install-pkgconfig.patch b/srcpkgs/wireshark/patches/install-pkgconfig.patch
index 8816155aa520d9..da49323be19223 100644
--- a/srcpkgs/wireshark/patches/install-pkgconfig.patch
+++ b/srcpkgs/wireshark/patches/install-pkgconfig.patch
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -3981,7 +3981,6 @@ set(SHARK_PUBLIC_HEADERS
+@@ -4126,7 +4126,6 @@ set(SHARK_PUBLIC_HEADERS
  install(FILES ${SHARK_PUBLIC_HEADERS}
  	DESTINATION ${PROJECT_INSTALL_INCLUDEDIR}
  	COMPONENT "Development"
@@ -8,15 +8,15 @@
  )
  
  # Install icons and other desktop files for Freedesktop.org-compliant desktops.
-@@ -4039,7 +4038,6 @@ install(
- 		${CMAKE_INSTALL_LIBDIR}/pkgconfig
- 	COMPONENT
- 		"Development"
+@@ -4180,7 +4179,6 @@ endif()
+ install(FILES "${CMAKE_BINARY_DIR}/resources/wireshark.pc"
+ 	DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+ 	COMPONENT "Development"
 -	EXCLUDE_FROM_ALL
  )
  
  install(
-@@ -4093,13 +4091,11 @@ install(
+@@ -4254,13 +4252,11 @@ install(
  		${WIRESHARK_INSTALL_CMAKEDIR}
  	COMPONENT
  		"Development"
diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template
index 48f953b7e04add..d31559ad7eb417 100644
--- a/srcpkgs/wireshark/template
+++ b/srcpkgs/wireshark/template
@@ -1,15 +1,16 @@
 # Template file for 'wireshark'
 pkgname=wireshark
-version=4.2.6
+version=4.4.2
 revision=1
 build_style=cmake
 configure_args="-DHAVE_C99_VSNPRINTF=ON"
 hostmakedepends="pkg-config flex gettext perl python3-devel mit-krb5-devel
  qt6-base qt6-tools ruby-asciidoctor libxslt sqlite-lemon"
-makedepends="libpcap-devel zlib-devel lua52-devel mit-krb5-devel gnutls-devel
+makedepends="libpcap-devel zlib-devel lua54-devel mit-krb5-devel gnutls-devel
  libmaxminddb-devel libgcrypt-devel libcap-devel sbc-devel c-ares-devel
  libssh-devel libnl3-devel spandsp-devel tiff-devel libcap-progs liblz4-devel
- libxml2-devel nghttp2-devel
+ libxml2-devel nghttp2-devel nghttp3-devel snappy-devel opus-devel
+ bcg729-devel libilbc-devel opencore-amr-devel
  qt6-base-devel qt6-multimedia-devel qt6-svg-devel qt6-qt5compat-devel
  minizip-devel libzstd-devel brotli-devel speexdsp-devel pcre2-devel"
 depends="libcap-progs qt6-svg"
@@ -20,11 +21,11 @@ license="GPL-2.0-or-later"
 homepage="https://www.wireshark.org"
 changelog="https://www.wireshark.org/news/"
 distfiles="https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"
-checksum=5ec6028df29068d889c98489bf194a884b00831106fea1e921fea3c65f2003f5
+checksum=6053d97499c83feb87ce1d7f732d9c889c6c18bb334de67e65dca11483b0514e
 system_groups="wireshark"
 
-CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2"
-CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2"
+CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.4"
+CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.4"
 
 post_patch() {
 	# systemd-journal integration

Re: Wireshark 4.4.2

[sgn]

[-- Attachment #1: Type: text/plain, Size: 178 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/53832#issuecomment-2571312577

Comment:
Tests aren't designed to be run as root.

Re: [PR PATCH] [Closed]: Wireshark 4.4.2

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1095 bytes --]

There's a closed pull request on the void-packages repository

Wireshark 4.4.2
https://github.com/void-linux/void-packages/pull/53832

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Re: [PR PATCH] [Merged]: Wireshark 4.4.2

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1095 bytes --]

There's a merged pull request on the void-packages repository

Wireshark 4.4.2
https://github.com/void-linux/void-packages/pull/53832

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->