[PR PATCH] [WIP] ngircd: update to 27~rc1.

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] [WIP] ngircd: update to 27~rc1.
@ 2024-04-13 19:08 AnInternetTroll
  2024-04-13 19:08 ` [PR PATCH] [Updated] " AnInternetTroll
                   ` (10 more replies)
  0 siblings, 11 replies; 12+ messages in thread
From: AnInternetTroll @ 2024-04-13 19:08 UTC (permalink / raw)
  To: ml

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

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

https://github.com/AnInternetTroll/void-packages user/luca/ngircd
https://github.com/void-linux/void-packages/pull/49826

[WIP] ngircd: update to 27~rc1.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86\_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl

Crossbuilt on x86\_64-glibc for aarch64-musl and tested with a simple
unencrypted server. As far as features go, I only tested the default
with PAM disabled


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-user/luca/ngircd-49826.patch --]
[-- Type: text/x-diff, Size: 4139 bytes --]

From 3351dfdbb19b37e1177e22023e7e0b41ad8aa7c5 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Sat, 13 Apr 2024 15:33:50 +0200
Subject: [PATCH] ngircd: update to 27~rc1.

---
 srcpkgs/ngircd/patches/0001-getpid-fix.patch  | 30 +++++++++++++++++++
 .../ngircd/patches/0002-getpid-fix-2.patch    | 22 ++++++++++++++
 srcpkgs/ngircd/template                       | 11 +++----
 3 files changed, 58 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/ngircd/patches/0001-getpid-fix.patch
 create mode 100644 srcpkgs/ngircd/patches/0002-getpid-fix-2.patch

diff --git a/srcpkgs/ngircd/patches/0001-getpid-fix.patch b/srcpkgs/ngircd/patches/0001-getpid-fix.patch
new file mode 100644
index 00000000000000..4765604bea554f
--- /dev/null
+++ b/srcpkgs/ngircd/patches/0001-getpid-fix.patch
@@ -0,0 +1,30 @@
+From a33d15751b3e3910bd06125efbeae6569844f313 Mon Sep 17 00:00:00 2001
+From: Alexander Barton <alex@barton.de>
+Date: Sat, 13 Apr 2024 15:52:33 +0200
+Subject: [PATCH] Test suite: Don't use "pgrep -u" when LOGNAME and USER are
+ not set
+
+Thanks for reporting this on IRC, luca!
+---
+ src/testsuite/getpid.sh | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/testsuite/getpid.sh b/src/testsuite/getpid.sh
+index 85059142..3cc186e1 100755
+--- a/src/testsuite/getpid.sh
++++ b/src/testsuite/getpid.sh
+@@ -23,7 +23,13 @@ if [ -x /usr/bin/pgrep ]; then
+ 		*)
+ 			PGREP_FLAGS=""
+ 	esac
+-	exec /usr/bin/pgrep $PGREP_FLAGS -n -u "${LOGNAME:-$USER}" "$1"
++	if [ -n "$LOGNAME" ] || [ -n "$USER" ]; then
++		# Try to narrow the search down to the current user ...
++		exec /usr/bin/pgrep $PGREP_FLAGS -n -u "${LOGNAME:-$USER}" "$1"
++	else
++		# ... but neither LOGNAME nor USER were set!
++		exec /usr/bin/pgrep $PGREP_FLAGS -n "$1"
++	fi
+ fi
+ 
+ # pidof(1) could be a good alternative on elder Linux systems
diff --git a/srcpkgs/ngircd/patches/0002-getpid-fix-2.patch b/srcpkgs/ngircd/patches/0002-getpid-fix-2.patch
new file mode 100644
index 00000000000000..8bbd59a37e354b
--- /dev/null
+++ b/srcpkgs/ngircd/patches/0002-getpid-fix-2.patch
@@ -0,0 +1,22 @@
+From b77b9432c45d6f38c0ad6d9021afb4dd91f163e4 Mon Sep 17 00:00:00 2001
+From: Alexander Barton <alex@barton.de>
+Date: Sat, 13 Apr 2024 16:04:29 +0200
+Subject: [PATCH] Test suite: Correctly test for LOGNAME and USER
+
+---
+ src/testsuite/getpid.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/testsuite/getpid.sh b/src/testsuite/getpid.sh
+index 3cc186e1..7a3dbe37 100755
+--- a/src/testsuite/getpid.sh
++++ b/src/testsuite/getpid.sh
+@@ -23,7 +23,7 @@ if [ -x /usr/bin/pgrep ]; then
+ 		*)
+ 			PGREP_FLAGS=""
+ 	esac
+-	if [ -n "$LOGNAME" ] || [ -n "$USER" ]; then
++	if [ -n "${LOGNAME:-}" ] || [ -n "${USER:-}" ]; then
+ 		# Try to narrow the search down to the current user ...
+ 		exec /usr/bin/pgrep $PGREP_FLAGS -n -u "${LOGNAME:-$USER}" "$1"
+ 	else
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 66c09814f049ef..92027e9ff1b6e2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,18 +1,19 @@
 # Template file for 'ngircd'
 pkgname=ngircd
-version=26
-revision=4
+version=27~rc1
+revision=1
 build_style=gnu-configure
-configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
+configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes --with-pam --with-iconv"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel openssl-devel"
+makedepends="zlib-devel openssl-devel pam-devel libticonv-devel"
+checkdepends="procps-ng expect inetutils-telnet"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://ngircd.barton.de/"
 distfiles="https://ngircd.barton.de/pub/ngircd/ngircd-${version}.tar.xz"
-checksum=56dcc6483058699fcdd8e54f5010eecee09824b93bad7ed5f18818e550d855c6
+checksum=ef04b85e99ffda2bdf73a823848f04a1d5aa4f288beb631dae2dcc0d34e5c665
 
 post_configure() {
 	echo "#define HAVE_WORKING_GETADDRINFO 1" >>src/config.h

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] ngircd: update to 27~rc1.
  2024-04-13 19:08 [PR PATCH] [WIP] ngircd: update to 27~rc1 AnInternetTroll
@ 2024-04-13 19:08 ` AnInternetTroll
  2024-04-16 19:34 ` AnInternetTroll
                   ` (9 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: AnInternetTroll @ 2024-04-13 19:08 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by AnInternetTroll against master on the void-packages repository

https://github.com/AnInternetTroll/void-packages user/luca/ngircd
https://github.com/void-linux/void-packages/pull/49826

[WIP] ngircd: update to 27~rc1.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86\_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl

Crossbuilt on x86\_64-glibc for aarch64-musl and tested with a simple
unencrypted server. As far as features go, I only tested the default
with PAM disabled


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-user/luca/ngircd-49826.patch --]
[-- Type: text/x-diff, Size: 6228 bytes --]

From 354244830c87db46a652fd4ceaf98c8f50c10a51 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Sat, 13 Apr 2024 15:33:50 +0200
Subject: [PATCH] ngircd: update to 27~rc1.

---
 srcpkgs/ngircd/patches/0001-getpid-fix.patch  | 30 +++++++++++++
 .../ngircd/patches/0002-getpid-fix-2.patch    | 22 ++++++++++
 ...when-setgid-setuid-fails-with-EINVAL.patch | 43 +++++++++++++++++++
 srcpkgs/ngircd/template                       | 11 ++---
 4 files changed, 101 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/ngircd/patches/0001-getpid-fix.patch
 create mode 100644 srcpkgs/ngircd/patches/0002-getpid-fix-2.patch
 create mode 100644 srcpkgs/ngircd/patches/don-t-abort-startup-when-setgid-setuid-fails-with-EINVAL.patch

diff --git a/srcpkgs/ngircd/patches/0001-getpid-fix.patch b/srcpkgs/ngircd/patches/0001-getpid-fix.patch
new file mode 100644
index 00000000000000..4765604bea554f
--- /dev/null
+++ b/srcpkgs/ngircd/patches/0001-getpid-fix.patch
@@ -0,0 +1,30 @@
+From a33d15751b3e3910bd06125efbeae6569844f313 Mon Sep 17 00:00:00 2001
+From: Alexander Barton <alex@barton.de>
+Date: Sat, 13 Apr 2024 15:52:33 +0200
+Subject: [PATCH] Test suite: Don't use "pgrep -u" when LOGNAME and USER are
+ not set
+
+Thanks for reporting this on IRC, luca!
+---
+ src/testsuite/getpid.sh | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/testsuite/getpid.sh b/src/testsuite/getpid.sh
+index 85059142..3cc186e1 100755
+--- a/src/testsuite/getpid.sh
++++ b/src/testsuite/getpid.sh
+@@ -23,7 +23,13 @@ if [ -x /usr/bin/pgrep ]; then
+ 		*)
+ 			PGREP_FLAGS=""
+ 	esac
+-	exec /usr/bin/pgrep $PGREP_FLAGS -n -u "${LOGNAME:-$USER}" "$1"
++	if [ -n "$LOGNAME" ] || [ -n "$USER" ]; then
++		# Try to narrow the search down to the current user ...
++		exec /usr/bin/pgrep $PGREP_FLAGS -n -u "${LOGNAME:-$USER}" "$1"
++	else
++		# ... but neither LOGNAME nor USER were set!
++		exec /usr/bin/pgrep $PGREP_FLAGS -n "$1"
++	fi
+ fi
+ 
+ # pidof(1) could be a good alternative on elder Linux systems
diff --git a/srcpkgs/ngircd/patches/0002-getpid-fix-2.patch b/srcpkgs/ngircd/patches/0002-getpid-fix-2.patch
new file mode 100644
index 00000000000000..8bbd59a37e354b
--- /dev/null
+++ b/srcpkgs/ngircd/patches/0002-getpid-fix-2.patch
@@ -0,0 +1,22 @@
+From b77b9432c45d6f38c0ad6d9021afb4dd91f163e4 Mon Sep 17 00:00:00 2001
+From: Alexander Barton <alex@barton.de>
+Date: Sat, 13 Apr 2024 16:04:29 +0200
+Subject: [PATCH] Test suite: Correctly test for LOGNAME and USER
+
+---
+ src/testsuite/getpid.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/testsuite/getpid.sh b/src/testsuite/getpid.sh
+index 3cc186e1..7a3dbe37 100755
+--- a/src/testsuite/getpid.sh
++++ b/src/testsuite/getpid.sh
+@@ -23,7 +23,7 @@ if [ -x /usr/bin/pgrep ]; then
+ 		*)
+ 			PGREP_FLAGS=""
+ 	esac
+-	if [ -n "$LOGNAME" ] || [ -n "$USER" ]; then
++	if [ -n "${LOGNAME:-}" ] || [ -n "${USER:-}" ]; then
+ 		# Try to narrow the search down to the current user ...
+ 		exec /usr/bin/pgrep $PGREP_FLAGS -n -u "${LOGNAME:-$USER}" "$1"
+ 	else
diff --git a/srcpkgs/ngircd/patches/don-t-abort-startup-when-setgid-setuid-fails-with-EINVAL.patch b/srcpkgs/ngircd/patches/don-t-abort-startup-when-setgid-setuid-fails-with-EINVAL.patch
new file mode 100644
index 00000000000000..21100f74bc789c
--- /dev/null
+++ b/srcpkgs/ngircd/patches/don-t-abort-startup-when-setgid-setuid-fails-with-EINVAL.patch
@@ -0,0 +1,43 @@
+From 6ec213cd8cf1e65d3c912f8f8eba663a2bf93fb5 Mon Sep 17 00:00:00 2001
+From: Alexander Barton <alex@barton.de>
+Date: Sat, 13 Apr 2024 19:43:54 +0200
+Subject: [PATCH] Don't abort startup when setgid/setuid() fails with EINVAL
+
+Both setgid(2) as well as setuid(2) can fail with EINVAL in addition to
+EPERM, their manual pages state "EINVAL: The user/group ID specified in
+uid/gid is not valid in this user namespace ".
+
+So not only treat EPERM as an "acceptable error" and continue with
+logging the error, but do the same for EINVAL.
+
+This was triggered by the Void Linux xbps-uunshare(1) tool used for
+building "XBPS source packages" and reported by luca in #ngircd. Thanks!
+---
+ src/ngircd/ngircd.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
+index b0610392..c2169c43 100644
+--- a/src/ngircd/ngircd.c
++++ b/src/ngircd/ngircd.c
+@@ -722,7 +722,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
+ 			Log(LOG_ERR, "Can't change group ID to %s(%u): %s!",
+ 			    grp ? grp->gr_name : "?", Conf_GID,
+ 			    strerror(real_errno));
+-			if (real_errno != EPERM)
++			if (real_errno != EPERM && real_errno != EINVAL)
+ 				goto out;
+ 		}
+ #ifdef HAVE_SETGROUPS
+@@ -748,7 +748,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
+ 			Log(LOG_ERR, "Can't change user ID to %s(%u): %s!",
+ 			    pwd ? pwd->pw_name : "?", Conf_UID,
+ 			    strerror(real_errno));
+-			if (real_errno != EPERM)
++			if (real_errno != EPERM && real_errno != EINVAL)
+ 				goto out;
+ 		}
+ 	}
+-- 
+2.39.2
+
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 66c09814f049ef..92027e9ff1b6e2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,18 +1,19 @@
 # Template file for 'ngircd'
 pkgname=ngircd
-version=26
-revision=4
+version=27~rc1
+revision=1
 build_style=gnu-configure
-configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
+configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes --with-pam --with-iconv"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel openssl-devel"
+makedepends="zlib-devel openssl-devel pam-devel libticonv-devel"
+checkdepends="procps-ng expect inetutils-telnet"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://ngircd.barton.de/"
 distfiles="https://ngircd.barton.de/pub/ngircd/ngircd-${version}.tar.xz"
-checksum=56dcc6483058699fcdd8e54f5010eecee09824b93bad7ed5f18818e550d855c6
+checksum=ef04b85e99ffda2bdf73a823848f04a1d5aa4f288beb631dae2dcc0d34e5c665
 
 post_configure() {
 	echo "#define HAVE_WORKING_GETADDRINFO 1" >>src/config.h

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] ngircd: update to 27~rc1.
  2024-04-13 19:08 [PR PATCH] [WIP] ngircd: update to 27~rc1 AnInternetTroll
  2024-04-13 19:08 ` [PR PATCH] [Updated] " AnInternetTroll
@ 2024-04-16 19:34 ` AnInternetTroll
  2024-04-24 16:46 ` AnInternetTroll
                   ` (8 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: AnInternetTroll @ 2024-04-16 19:34 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by AnInternetTroll against master on the void-packages repository

https://github.com/AnInternetTroll/void-packages user/luca/ngircd
https://github.com/void-linux/void-packages/pull/49826

[WIP] ngircd: update to 27~rc1.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86\_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl

Crossbuilt on x86\_64-glibc for aarch64-musl and tested with a simple
unencrypted server. As far as features go, I only tested the default
with PAM disabled


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-user/luca/ngircd-49826.patch --]
[-- Type: text/x-diff, Size: 6228 bytes --]

From 994ac13764fe8486386752e2cb305d86699e24cd Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Sat, 13 Apr 2024 15:33:50 +0200
Subject: [PATCH] ngircd: update to 27~rc1.

---
 srcpkgs/ngircd/patches/0001-getpid-fix.patch  | 30 +++++++++++++
 .../ngircd/patches/0002-getpid-fix-2.patch    | 22 ++++++++++
 ...when-setgid-setuid-fails-with-EINVAL.patch | 43 +++++++++++++++++++
 srcpkgs/ngircd/template                       | 11 ++---
 4 files changed, 101 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/ngircd/patches/0001-getpid-fix.patch
 create mode 100644 srcpkgs/ngircd/patches/0002-getpid-fix-2.patch
 create mode 100644 srcpkgs/ngircd/patches/don-t-abort-startup-when-setgid-setuid-fails-with-EINVAL.patch

diff --git a/srcpkgs/ngircd/patches/0001-getpid-fix.patch b/srcpkgs/ngircd/patches/0001-getpid-fix.patch
new file mode 100644
index 00000000000000..4765604bea554f
--- /dev/null
+++ b/srcpkgs/ngircd/patches/0001-getpid-fix.patch
@@ -0,0 +1,30 @@
+From a33d15751b3e3910bd06125efbeae6569844f313 Mon Sep 17 00:00:00 2001
+From: Alexander Barton <alex@barton.de>
+Date: Sat, 13 Apr 2024 15:52:33 +0200
+Subject: [PATCH] Test suite: Don't use "pgrep -u" when LOGNAME and USER are
+ not set
+
+Thanks for reporting this on IRC, luca!
+---
+ src/testsuite/getpid.sh | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/testsuite/getpid.sh b/src/testsuite/getpid.sh
+index 85059142..3cc186e1 100755
+--- a/src/testsuite/getpid.sh
++++ b/src/testsuite/getpid.sh
+@@ -23,7 +23,13 @@ if [ -x /usr/bin/pgrep ]; then
+ 		*)
+ 			PGREP_FLAGS=""
+ 	esac
+-	exec /usr/bin/pgrep $PGREP_FLAGS -n -u "${LOGNAME:-$USER}" "$1"
++	if [ -n "$LOGNAME" ] || [ -n "$USER" ]; then
++		# Try to narrow the search down to the current user ...
++		exec /usr/bin/pgrep $PGREP_FLAGS -n -u "${LOGNAME:-$USER}" "$1"
++	else
++		# ... but neither LOGNAME nor USER were set!
++		exec /usr/bin/pgrep $PGREP_FLAGS -n "$1"
++	fi
+ fi
+ 
+ # pidof(1) could be a good alternative on elder Linux systems
diff --git a/srcpkgs/ngircd/patches/0002-getpid-fix-2.patch b/srcpkgs/ngircd/patches/0002-getpid-fix-2.patch
new file mode 100644
index 00000000000000..8bbd59a37e354b
--- /dev/null
+++ b/srcpkgs/ngircd/patches/0002-getpid-fix-2.patch
@@ -0,0 +1,22 @@
+From b77b9432c45d6f38c0ad6d9021afb4dd91f163e4 Mon Sep 17 00:00:00 2001
+From: Alexander Barton <alex@barton.de>
+Date: Sat, 13 Apr 2024 16:04:29 +0200
+Subject: [PATCH] Test suite: Correctly test for LOGNAME and USER
+
+---
+ src/testsuite/getpid.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/testsuite/getpid.sh b/src/testsuite/getpid.sh
+index 3cc186e1..7a3dbe37 100755
+--- a/src/testsuite/getpid.sh
++++ b/src/testsuite/getpid.sh
+@@ -23,7 +23,7 @@ if [ -x /usr/bin/pgrep ]; then
+ 		*)
+ 			PGREP_FLAGS=""
+ 	esac
+-	if [ -n "$LOGNAME" ] || [ -n "$USER" ]; then
++	if [ -n "${LOGNAME:-}" ] || [ -n "${USER:-}" ]; then
+ 		# Try to narrow the search down to the current user ...
+ 		exec /usr/bin/pgrep $PGREP_FLAGS -n -u "${LOGNAME:-$USER}" "$1"
+ 	else
diff --git a/srcpkgs/ngircd/patches/don-t-abort-startup-when-setgid-setuid-fails-with-EINVAL.patch b/srcpkgs/ngircd/patches/don-t-abort-startup-when-setgid-setuid-fails-with-EINVAL.patch
new file mode 100644
index 00000000000000..21100f74bc789c
--- /dev/null
+++ b/srcpkgs/ngircd/patches/don-t-abort-startup-when-setgid-setuid-fails-with-EINVAL.patch
@@ -0,0 +1,43 @@
+From 6ec213cd8cf1e65d3c912f8f8eba663a2bf93fb5 Mon Sep 17 00:00:00 2001
+From: Alexander Barton <alex@barton.de>
+Date: Sat, 13 Apr 2024 19:43:54 +0200
+Subject: [PATCH] Don't abort startup when setgid/setuid() fails with EINVAL
+
+Both setgid(2) as well as setuid(2) can fail with EINVAL in addition to
+EPERM, their manual pages state "EINVAL: The user/group ID specified in
+uid/gid is not valid in this user namespace ".
+
+So not only treat EPERM as an "acceptable error" and continue with
+logging the error, but do the same for EINVAL.
+
+This was triggered by the Void Linux xbps-uunshare(1) tool used for
+building "XBPS source packages" and reported by luca in #ngircd. Thanks!
+---
+ src/ngircd/ngircd.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
+index b0610392..c2169c43 100644
+--- a/src/ngircd/ngircd.c
++++ b/src/ngircd/ngircd.c
+@@ -722,7 +722,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
+ 			Log(LOG_ERR, "Can't change group ID to %s(%u): %s!",
+ 			    grp ? grp->gr_name : "?", Conf_GID,
+ 			    strerror(real_errno));
+-			if (real_errno != EPERM)
++			if (real_errno != EPERM && real_errno != EINVAL)
+ 				goto out;
+ 		}
+ #ifdef HAVE_SETGROUPS
+@@ -748,7 +748,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
+ 			Log(LOG_ERR, "Can't change user ID to %s(%u): %s!",
+ 			    pwd ? pwd->pw_name : "?", Conf_UID,
+ 			    strerror(real_errno));
+-			if (real_errno != EPERM)
++			if (real_errno != EPERM && real_errno != EINVAL)
+ 				goto out;
+ 		}
+ 	}
+-- 
+2.39.2
+
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 66c09814f049ef..92027e9ff1b6e2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,18 +1,19 @@
 # Template file for 'ngircd'
 pkgname=ngircd
-version=26
-revision=4
+version=27~rc1
+revision=1
 build_style=gnu-configure
-configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
+configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes --with-pam --with-iconv"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel openssl-devel"
+makedepends="zlib-devel openssl-devel pam-devel libticonv-devel"
+checkdepends="procps-ng expect inetutils-telnet"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://ngircd.barton.de/"
 distfiles="https://ngircd.barton.de/pub/ngircd/ngircd-${version}.tar.xz"
-checksum=56dcc6483058699fcdd8e54f5010eecee09824b93bad7ed5f18818e550d855c6
+checksum=ef04b85e99ffda2bdf73a823848f04a1d5aa4f288beb631dae2dcc0d34e5c665
 
 post_configure() {
 	echo "#define HAVE_WORKING_GETADDRINFO 1" >>src/config.h

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] ngircd: update to 27~rc1.
  2024-04-13 19:08 [PR PATCH] [WIP] ngircd: update to 27~rc1 AnInternetTroll
  2024-04-13 19:08 ` [PR PATCH] [Updated] " AnInternetTroll
  2024-04-16 19:34 ` AnInternetTroll
@ 2024-04-24 16:46 ` AnInternetTroll
  2024-04-26 15:31 ` AnInternetTroll
                   ` (7 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: AnInternetTroll @ 2024-04-24 16:46 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by AnInternetTroll against master on the void-packages repository

https://github.com/AnInternetTroll/void-packages user/luca/ngircd
https://github.com/void-linux/void-packages/pull/49826

[WIP] ngircd: update to 27~rc1.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86\_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl

Crossbuilt on x86\_64-glibc for aarch64-musl and tested with a simple
unencrypted server. As far as features go, I only tested the default
with PAM disabled


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-user/luca/ngircd-49826.patch --]
[-- Type: text/x-diff, Size: 6303 bytes --]

From 69180ed6bcc990de4f14da37feccc513b98a4934 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Wed, 24 Apr 2024 18:46:16 +0200
Subject: [PATCH] ngircd: update to 27~rc1.

---
 srcpkgs/ngircd/patches/0001-getpid-fix.patch  | 30 +++++++++++++
 .../ngircd/patches/0002-getpid-fix-2.patch    | 22 ++++++++++
 ...when-setgid-setuid-fails-with-EINVAL.patch | 43 +++++++++++++++++++
 srcpkgs/ngircd/template                       | 12 +++---
 4 files changed, 102 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/ngircd/patches/0001-getpid-fix.patch
 create mode 100644 srcpkgs/ngircd/patches/0002-getpid-fix-2.patch
 create mode 100644 srcpkgs/ngircd/patches/don-t-abort-startup-when-setgid-setuid-fails-with-EINVAL.patch

diff --git a/srcpkgs/ngircd/patches/0001-getpid-fix.patch b/srcpkgs/ngircd/patches/0001-getpid-fix.patch
new file mode 100644
index 00000000000000..4765604bea554f
--- /dev/null
+++ b/srcpkgs/ngircd/patches/0001-getpid-fix.patch
@@ -0,0 +1,30 @@
+From a33d15751b3e3910bd06125efbeae6569844f313 Mon Sep 17 00:00:00 2001
+From: Alexander Barton <alex@barton.de>
+Date: Sat, 13 Apr 2024 15:52:33 +0200
+Subject: [PATCH] Test suite: Don't use "pgrep -u" when LOGNAME and USER are
+ not set
+
+Thanks for reporting this on IRC, luca!
+---
+ src/testsuite/getpid.sh | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/testsuite/getpid.sh b/src/testsuite/getpid.sh
+index 85059142..3cc186e1 100755
+--- a/src/testsuite/getpid.sh
++++ b/src/testsuite/getpid.sh
+@@ -23,7 +23,13 @@ if [ -x /usr/bin/pgrep ]; then
+ 		*)
+ 			PGREP_FLAGS=""
+ 	esac
+-	exec /usr/bin/pgrep $PGREP_FLAGS -n -u "${LOGNAME:-$USER}" "$1"
++	if [ -n "$LOGNAME" ] || [ -n "$USER" ]; then
++		# Try to narrow the search down to the current user ...
++		exec /usr/bin/pgrep $PGREP_FLAGS -n -u "${LOGNAME:-$USER}" "$1"
++	else
++		# ... but neither LOGNAME nor USER were set!
++		exec /usr/bin/pgrep $PGREP_FLAGS -n "$1"
++	fi
+ fi
+ 
+ # pidof(1) could be a good alternative on elder Linux systems
diff --git a/srcpkgs/ngircd/patches/0002-getpid-fix-2.patch b/srcpkgs/ngircd/patches/0002-getpid-fix-2.patch
new file mode 100644
index 00000000000000..8bbd59a37e354b
--- /dev/null
+++ b/srcpkgs/ngircd/patches/0002-getpid-fix-2.patch
@@ -0,0 +1,22 @@
+From b77b9432c45d6f38c0ad6d9021afb4dd91f163e4 Mon Sep 17 00:00:00 2001
+From: Alexander Barton <alex@barton.de>
+Date: Sat, 13 Apr 2024 16:04:29 +0200
+Subject: [PATCH] Test suite: Correctly test for LOGNAME and USER
+
+---
+ src/testsuite/getpid.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/testsuite/getpid.sh b/src/testsuite/getpid.sh
+index 3cc186e1..7a3dbe37 100755
+--- a/src/testsuite/getpid.sh
++++ b/src/testsuite/getpid.sh
+@@ -23,7 +23,7 @@ if [ -x /usr/bin/pgrep ]; then
+ 		*)
+ 			PGREP_FLAGS=""
+ 	esac
+-	if [ -n "$LOGNAME" ] || [ -n "$USER" ]; then
++	if [ -n "${LOGNAME:-}" ] || [ -n "${USER:-}" ]; then
+ 		# Try to narrow the search down to the current user ...
+ 		exec /usr/bin/pgrep $PGREP_FLAGS -n -u "${LOGNAME:-$USER}" "$1"
+ 	else
diff --git a/srcpkgs/ngircd/patches/don-t-abort-startup-when-setgid-setuid-fails-with-EINVAL.patch b/srcpkgs/ngircd/patches/don-t-abort-startup-when-setgid-setuid-fails-with-EINVAL.patch
new file mode 100644
index 00000000000000..21100f74bc789c
--- /dev/null
+++ b/srcpkgs/ngircd/patches/don-t-abort-startup-when-setgid-setuid-fails-with-EINVAL.patch
@@ -0,0 +1,43 @@
+From 6ec213cd8cf1e65d3c912f8f8eba663a2bf93fb5 Mon Sep 17 00:00:00 2001
+From: Alexander Barton <alex@barton.de>
+Date: Sat, 13 Apr 2024 19:43:54 +0200
+Subject: [PATCH] Don't abort startup when setgid/setuid() fails with EINVAL
+
+Both setgid(2) as well as setuid(2) can fail with EINVAL in addition to
+EPERM, their manual pages state "EINVAL: The user/group ID specified in
+uid/gid is not valid in this user namespace ".
+
+So not only treat EPERM as an "acceptable error" and continue with
+logging the error, but do the same for EINVAL.
+
+This was triggered by the Void Linux xbps-uunshare(1) tool used for
+building "XBPS source packages" and reported by luca in #ngircd. Thanks!
+---
+ src/ngircd/ngircd.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
+index b0610392..c2169c43 100644
+--- a/src/ngircd/ngircd.c
++++ b/src/ngircd/ngircd.c
+@@ -722,7 +722,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
+ 			Log(LOG_ERR, "Can't change group ID to %s(%u): %s!",
+ 			    grp ? grp->gr_name : "?", Conf_GID,
+ 			    strerror(real_errno));
+-			if (real_errno != EPERM)
++			if (real_errno != EPERM && real_errno != EINVAL)
+ 				goto out;
+ 		}
+ #ifdef HAVE_SETGROUPS
+@@ -748,7 +748,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
+ 			Log(LOG_ERR, "Can't change user ID to %s(%u): %s!",
+ 			    pwd ? pwd->pw_name : "?", Conf_UID,
+ 			    strerror(real_errno));
+-			if (real_errno != EPERM)
++			if (real_errno != EPERM && real_errno != EINVAL)
+ 				goto out;
+ 		}
+ 	}
+-- 
+2.39.2
+
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 66c09814f049ef..4a32f9d807d360 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,18 +1,20 @@
 # Template file for 'ngircd'
 pkgname=ngircd
-version=26
-revision=4
+version=27~rc1
+revision=1
 build_style=gnu-configure
-configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
+configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes --with-pam --with-iconv"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel openssl-devel"
+makedepends="zlib-devel openssl-devel pam-devel libticonv-devel"
+checkdepends="procps-ng expect inetutils-telnet"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://ngircd.barton.de/"
 distfiles="https://ngircd.barton.de/pub/ngircd/ngircd-${version}.tar.xz"
-checksum=56dcc6483058699fcdd8e54f5010eecee09824b93bad7ed5f18818e550d855c6
+checksum=ef04b85e99ffda2bdf73a823848f04a1d5aa4f288beb631dae2dcc0d34e5c665
+make_check="ci-skip" # Stopping the integration test servers fails in CI
 
 post_configure() {
 	echo "#define HAVE_WORKING_GETADDRINFO 1" >>src/config.h

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] ngircd: update to 27~rc1.
  2024-04-13 19:08 [PR PATCH] [WIP] ngircd: update to 27~rc1 AnInternetTroll
                   ` (2 preceding siblings ...)
  2024-04-24 16:46 ` AnInternetTroll
@ 2024-04-26 15:31 ` AnInternetTroll
  2024-04-26 15:32 ` AnInternetTroll
                   ` (6 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: AnInternetTroll @ 2024-04-26 15:31 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by AnInternetTroll against master on the void-packages repository

https://github.com/AnInternetTroll/void-packages user/luca/ngircd
https://github.com/void-linux/void-packages/pull/49826

[WIP] ngircd: update to 27~rc1.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86\_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl

Crossbuilt on x86\_64-glibc for aarch64-musl and tested with a simple
unencrypted server. As far as features go, I only tested the default
with PAM disabled


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-user/luca/ngircd-49826.patch --]
[-- Type: text/x-diff, Size: 90169 bytes --]

From 69180ed6bcc990de4f14da37feccc513b98a4934 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Wed, 24 Apr 2024 18:46:16 +0200
Subject: [PATCH 01/43] ngircd: update to 27~rc1.

---
 srcpkgs/ngircd/patches/0001-getpid-fix.patch  | 30 +++++++++++++
 .../ngircd/patches/0002-getpid-fix-2.patch    | 22 ++++++++++
 ...when-setgid-setuid-fails-with-EINVAL.patch | 43 +++++++++++++++++++
 srcpkgs/ngircd/template                       | 12 +++---
 4 files changed, 102 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/ngircd/patches/0001-getpid-fix.patch
 create mode 100644 srcpkgs/ngircd/patches/0002-getpid-fix-2.patch
 create mode 100644 srcpkgs/ngircd/patches/don-t-abort-startup-when-setgid-setuid-fails-with-EINVAL.patch

diff --git a/srcpkgs/ngircd/patches/0001-getpid-fix.patch b/srcpkgs/ngircd/patches/0001-getpid-fix.patch
new file mode 100644
index 00000000000000..4765604bea554f
--- /dev/null
+++ b/srcpkgs/ngircd/patches/0001-getpid-fix.patch
@@ -0,0 +1,30 @@
+From a33d15751b3e3910bd06125efbeae6569844f313 Mon Sep 17 00:00:00 2001
+From: Alexander Barton <alex@barton.de>
+Date: Sat, 13 Apr 2024 15:52:33 +0200
+Subject: [PATCH] Test suite: Don't use "pgrep -u" when LOGNAME and USER are
+ not set
+
+Thanks for reporting this on IRC, luca!
+---
+ src/testsuite/getpid.sh | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/testsuite/getpid.sh b/src/testsuite/getpid.sh
+index 85059142..3cc186e1 100755
+--- a/src/testsuite/getpid.sh
++++ b/src/testsuite/getpid.sh
+@@ -23,7 +23,13 @@ if [ -x /usr/bin/pgrep ]; then
+ 		*)
+ 			PGREP_FLAGS=""
+ 	esac
+-	exec /usr/bin/pgrep $PGREP_FLAGS -n -u "${LOGNAME:-$USER}" "$1"
++	if [ -n "$LOGNAME" ] || [ -n "$USER" ]; then
++		# Try to narrow the search down to the current user ...
++		exec /usr/bin/pgrep $PGREP_FLAGS -n -u "${LOGNAME:-$USER}" "$1"
++	else
++		# ... but neither LOGNAME nor USER were set!
++		exec /usr/bin/pgrep $PGREP_FLAGS -n "$1"
++	fi
+ fi
+ 
+ # pidof(1) could be a good alternative on elder Linux systems
diff --git a/srcpkgs/ngircd/patches/0002-getpid-fix-2.patch b/srcpkgs/ngircd/patches/0002-getpid-fix-2.patch
new file mode 100644
index 00000000000000..8bbd59a37e354b
--- /dev/null
+++ b/srcpkgs/ngircd/patches/0002-getpid-fix-2.patch
@@ -0,0 +1,22 @@
+From b77b9432c45d6f38c0ad6d9021afb4dd91f163e4 Mon Sep 17 00:00:00 2001
+From: Alexander Barton <alex@barton.de>
+Date: Sat, 13 Apr 2024 16:04:29 +0200
+Subject: [PATCH] Test suite: Correctly test for LOGNAME and USER
+
+---
+ src/testsuite/getpid.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/testsuite/getpid.sh b/src/testsuite/getpid.sh
+index 3cc186e1..7a3dbe37 100755
+--- a/src/testsuite/getpid.sh
++++ b/src/testsuite/getpid.sh
+@@ -23,7 +23,7 @@ if [ -x /usr/bin/pgrep ]; then
+ 		*)
+ 			PGREP_FLAGS=""
+ 	esac
+-	if [ -n "$LOGNAME" ] || [ -n "$USER" ]; then
++	if [ -n "${LOGNAME:-}" ] || [ -n "${USER:-}" ]; then
+ 		# Try to narrow the search down to the current user ...
+ 		exec /usr/bin/pgrep $PGREP_FLAGS -n -u "${LOGNAME:-$USER}" "$1"
+ 	else
diff --git a/srcpkgs/ngircd/patches/don-t-abort-startup-when-setgid-setuid-fails-with-EINVAL.patch b/srcpkgs/ngircd/patches/don-t-abort-startup-when-setgid-setuid-fails-with-EINVAL.patch
new file mode 100644
index 00000000000000..21100f74bc789c
--- /dev/null
+++ b/srcpkgs/ngircd/patches/don-t-abort-startup-when-setgid-setuid-fails-with-EINVAL.patch
@@ -0,0 +1,43 @@
+From 6ec213cd8cf1e65d3c912f8f8eba663a2bf93fb5 Mon Sep 17 00:00:00 2001
+From: Alexander Barton <alex@barton.de>
+Date: Sat, 13 Apr 2024 19:43:54 +0200
+Subject: [PATCH] Don't abort startup when setgid/setuid() fails with EINVAL
+
+Both setgid(2) as well as setuid(2) can fail with EINVAL in addition to
+EPERM, their manual pages state "EINVAL: The user/group ID specified in
+uid/gid is not valid in this user namespace ".
+
+So not only treat EPERM as an "acceptable error" and continue with
+logging the error, but do the same for EINVAL.
+
+This was triggered by the Void Linux xbps-uunshare(1) tool used for
+building "XBPS source packages" and reported by luca in #ngircd. Thanks!
+---
+ src/ngircd/ngircd.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
+index b0610392..c2169c43 100644
+--- a/src/ngircd/ngircd.c
++++ b/src/ngircd/ngircd.c
+@@ -722,7 +722,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
+ 			Log(LOG_ERR, "Can't change group ID to %s(%u): %s!",
+ 			    grp ? grp->gr_name : "?", Conf_GID,
+ 			    strerror(real_errno));
+-			if (real_errno != EPERM)
++			if (real_errno != EPERM && real_errno != EINVAL)
+ 				goto out;
+ 		}
+ #ifdef HAVE_SETGROUPS
+@@ -748,7 +748,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
+ 			Log(LOG_ERR, "Can't change user ID to %s(%u): %s!",
+ 			    pwd ? pwd->pw_name : "?", Conf_UID,
+ 			    strerror(real_errno));
+-			if (real_errno != EPERM)
++			if (real_errno != EPERM && real_errno != EINVAL)
+ 				goto out;
+ 		}
+ 	}
+-- 
+2.39.2
+
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 66c09814f049ef..4a32f9d807d360 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,18 +1,20 @@
 # Template file for 'ngircd'
 pkgname=ngircd
-version=26
-revision=4
+version=27~rc1
+revision=1
 build_style=gnu-configure
-configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
+configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes --with-pam --with-iconv"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel openssl-devel"
+makedepends="zlib-devel openssl-devel pam-devel libticonv-devel"
+checkdepends="procps-ng expect inetutils-telnet"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://ngircd.barton.de/"
 distfiles="https://ngircd.barton.de/pub/ngircd/ngircd-${version}.tar.xz"
-checksum=56dcc6483058699fcdd8e54f5010eecee09824b93bad7ed5f18818e550d855c6
+checksum=ef04b85e99ffda2bdf73a823848f04a1d5aa4f288beb631dae2dcc0d34e5c665
+make_check="ci-skip" # Stopping the integration test servers fails in CI
 
 post_configure() {
 	echo "#define HAVE_WORKING_GETADDRINFO 1" >>src/config.h

From 417b834fc40f456602f1139b3d68bd39405098be Mon Sep 17 00:00:00 2001
From: Jason Elswick <jason@jasondavid.tv>
Date: Wed, 24 Apr 2024 14:36:53 -0500
Subject: [PATCH 02/43] google-earth-pro: update to 7.3.6.9796.

---
 srcpkgs/google-earth-pro/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 2dbad138b944af..70a98d87cacf7f 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,6 +1,6 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.6.9345
+version=7.3.6.9796
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
@@ -10,8 +10,8 @@ short_desc="Explore the far reaches of the world"
 maintainer="Jason Manley <jason@jasondavid.tv>"
 license="custom:Google"
 homepage="https://www.google.com/earth/index.html"
-distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/google-earth-pro-stable/google-earth-pro-stable_${version}-r0_amd64.deb"
-checksum=88e8b1a8e09f08c8daac8e21d803d19203a725e1ff8437a65dc8fba753a12c3e
+distfiles="https://dl.google.com/dl/earth/client/current/google-earth-pro-stable_current_amd64.deb"
+checksum=5afda33c637b2c2e53df659d5f75b505f198adc5d33564c8d56bfe3e60f480d3
 repository=nonfree
 restricted=yes
 nostrip=yes

From 3ab504ca04840f217acbef1bab3336fbedbbaf2d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 25 Apr 2024 08:03:38 -0500
Subject: [PATCH 03/43] pdfcpu: update to 0.8.0.

---
 srcpkgs/pdfcpu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pdfcpu/template b/srcpkgs/pdfcpu/template
index 8ae659f28f2df3..5825f403c5f232 100644
--- a/srcpkgs/pdfcpu/template
+++ b/srcpkgs/pdfcpu/template
@@ -1,6 +1,6 @@
 # Template file for 'pdfcpu'
 pkgname=pdfcpu
-version=0.7.0
+version=0.8.0
 revision=1
 build_style=go
 go_import_path="github.com/pdfcpu/pdfcpu"
@@ -11,4 +11,4 @@ license="Apache-2.0"
 homepage="http://pdfcpu.io/"
 changelog="https://github.com/pdfcpu/pdfcpu/releases"
 distfiles="https://github.com/pdfcpu/pdfcpu/archive/v${version}.tar.gz"
-checksum=e36b1b03ff77fc2b9aa7ab4becfd2e0db271da0d5c56f6eb9b9ac844a04a00c1
+checksum=38fa9db4e6d2ad1dfe533acd26c12a56b5940ae3ec4d57fee927b6bc9d223359

From a34a720e6c565b55bc25bd6f3d137ff5b9f85473 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 24 Apr 2024 17:45:19 +0200
Subject: [PATCH 04/43] parallel: update to 20240422.

---
 srcpkgs/parallel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template
index fd4f6a3cc51e47..9d49784e18e255 100644
--- a/srcpkgs/parallel/template
+++ b/srcpkgs/parallel/template
@@ -1,6 +1,6 @@
 # Template file for 'parallel'
 pkgname=parallel
-version=20240322
+version=20240422
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/parallel/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=0b17029a203dabf7ba6ca7e52c2d3910fff46b2979476e12a9110920b79e6a95
+checksum=783888203ede2b92ced31eb3e809ca3a9d89f4508fdcb11830bfb35754882467
 
 pre_configure() {
 	# no html and pdf doc

From 7a15708c949f2ebc826d5a9bed35ce3822077dff Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 25 Apr 2024 14:36:26 +0200
Subject: [PATCH 05/43] bmake: update to 20240414.

---
 srcpkgs/bmake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 13a6f00d5926d1..3d20a9ed84ae20 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,13 +1,13 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20240404
+version=20240414
 revision=1
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://www.crufty.net/help/sjg/bmake.html"
 distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=60dfb60090086f2d008d9c4ec8a224c992a3e62522cc06e43764d5d1e3d7d8bd
+checksum=e1ba6c230cb3acf8b4c0885efaf3ffba3905942784b29d0f7fe22201542a5d56
 python_version=3
 CFLAGS="-D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
 

From a8790133bfd2383d11ffc0007561188c4eec7cfa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 25 Apr 2024 14:38:00 +0200
Subject: [PATCH 06/43] chrony_exporter: update to 0.10.0.

---
 srcpkgs/chrony_exporter/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chrony_exporter/template b/srcpkgs/chrony_exporter/template
index 4e5f1c59b5ef31..5cedafa956ff07 100644
--- a/srcpkgs/chrony_exporter/template
+++ b/srcpkgs/chrony_exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'chrony_exporter'
 pkgname=chrony_exporter
-version=0.9.2
+version=0.10.0
 revision=1
 build_style=go
 go_import_path="github.com/superq/chrony_exporter"
@@ -9,8 +9,9 @@ short_desc="Prometheus exporter for Chrony NTP"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/SuperQ/chrony_exporter"
+changelog="https://raw.githubusercontent.com/SuperQ/chrony_exporter/main/CHANGELOG.md"
 distfiles="https://github.com/SuperQ/chrony_exporter/archive/refs/tags/v${version}.tar.gz"
-checksum=3c33ab6c3f73d2917c8ecf586c5296510209046c27ac16f64b3eba7f95ac8193
+checksum=d3c0b208706b458fc9cb113758403030138fc4642a478fc52435861a2739f75f
 
 post_install() {
 	vsv chrony_exporter

From 5885a495282da13ff83fbbe3d337d4f8222c198b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 25 Apr 2024 15:13:48 +0200
Subject: [PATCH 07/43] pspg: update to 5.8.5.

---
 srcpkgs/pspg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pspg/template b/srcpkgs/pspg/template
index 821c33cfa48aad..777ff8dcf8dddb 100644
--- a/srcpkgs/pspg/template
+++ b/srcpkgs/pspg/template
@@ -1,6 +1,6 @@
 # Template file for 'pspg'
 pkgname=pspg
-version=5.8.4
+version=5.8.5
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/okbob/pspg"
 distfiles="https://github.com/okbob/pspg/archive/refs/tags/${version}.tar.gz"
-checksum=64e25d5ae42a84d6e19985002b2006cc553e9d1a3a083edd8ab77be6c657a1ea
+checksum=c3ea7ed13bea1742b3619bce2e9bfd076e600c4db6b3d9bdb4e7469027766812
 
 post_install() {
 	vman pspg.1

From d5d1d909b5b355ff2b32504b7107610b07eb32ec Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 25 Apr 2024 15:13:50 +0200
Subject: [PATCH 08/43] minify: update to 2.20.20.

---
 srcpkgs/minify/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index d70530bab482a5..b63ab948d43936 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.20.19
+version=2.20.20
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=705356c3d7eb2e773557a280579c1dcbcda5c78378ea77dd346f7a367946f5e1
+checksum=15027db4d856e72482e0ff7b3cee8bcb9e3dcee44ef3e4462de9c11f4e6066b6
 
 post_install() {
 	vlicense LICENSE

From 16b9955ad4703ec76c67714bca48c51574d93b00 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 25 Apr 2024 15:15:51 +0200
Subject: [PATCH 09/43] pwru: update to 1.0.6.

---
 srcpkgs/pwru/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pwru/template b/srcpkgs/pwru/template
index f4e5a7072a6545..734bb0fa3e9463 100644
--- a/srcpkgs/pwru/template
+++ b/srcpkgs/pwru/template
@@ -1,6 +1,6 @@
 # Template file for 'pwru'
 pkgname=pwru
-version=1.0.5
+version=1.0.6
 revision=1
 build_style=go
 go_import_path="github.com/cilium/pwru"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/cilium/pwru"
 distfiles="https://github.com/cilium/pwru/archive/refs/tags/v${version}.tar.gz"
-checksum=e8054fd5cc8c9e1ba61a5912e40c069a12b499d7684e258b70745585a994232d
+checksum=b8f4e2ebcc7aa25162fe042e9126b286f042343daec5548ddf407ab8abccd707
 nocross="go generate runs on wrong architecture"
 
 pre_build() {

From a7d16634ee553214e6b99903e798329c5dbdfe95 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 25 Apr 2024 15:17:15 +0200
Subject: [PATCH 10/43] uftrace: update to 0.16.

---
 srcpkgs/uftrace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftrace/template b/srcpkgs/uftrace/template
index e81f6e927851b3..dc0c29e403b234 100644
--- a/srcpkgs/uftrace/template
+++ b/srcpkgs/uftrace/template
@@ -1,6 +1,6 @@
 # Template file for 'uftrace'
 pkgname=uftrace
-version=0.15.2
+version=0.16
 revision=1
 archs="x86_64* i686* aarch64* arm* riscv64*"
 build_style=configure
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/namhyung/uftrace"
 distfiles="https://github.com/namhyung/uftrace/archive/v${version}.tar.gz"
-checksum=f274437c59e845c7636be55267ea3e8f08b7ca11de2413b7045b403247d5f64d
+checksum=dd0549f610d186b6f25fa2334a5e82b6ddc232ec6ca088dbb41b3fe66961d6bb
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone"; export LDFLAGS=-largp;;

From 2e763c49654fef0b875cfd83da658fee5e49c87e Mon Sep 17 00:00:00 2001
From: Quincy Fleming <quincyf467@protonmail.com>
Date: Sat, 23 Mar 2024 13:02:38 -0500
Subject: [PATCH 11/43] v4l2loopback: update to 0.13.1

---
 .../patches/0001-Backport-PR-477-1.patch      | 37 ----------
 .../patches/0002-Backport-PR-485-1.patch      | 68 -------------------
 srcpkgs/v4l2loopback/patches/dkms-patch.patch | 33 ---------
 srcpkgs/v4l2loopback/template                 |  5 +-
 4 files changed, 3 insertions(+), 140 deletions(-)
 delete mode 100644 srcpkgs/v4l2loopback/patches/0001-Backport-PR-477-1.patch
 delete mode 100644 srcpkgs/v4l2loopback/patches/0002-Backport-PR-485-1.patch
 delete mode 100644 srcpkgs/v4l2loopback/patches/dkms-patch.patch

diff --git a/srcpkgs/v4l2loopback/patches/0001-Backport-PR-477-1.patch b/srcpkgs/v4l2loopback/patches/0001-Backport-PR-477-1.patch
deleted file mode 100644
index 9e81c7f34bc8b5..00000000000000
--- a/srcpkgs/v4l2loopback/patches/0001-Backport-PR-477-1.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3407c4262b1d72307a8106008874c112de1e3549 Mon Sep 17 00:00:00 2001
-From: Rodrigo Oliveira <mdkcore@qtrnn.io>
-Date: Thu, 20 Oct 2022 18:41:43 -0300
-Subject: [PATCH 1/2] Backport PR #477 [1]
-
-[1] https://github.com/umlaeute/v4l2loopback/pull/477/commits/3312a6d0461d6d2d82a411f26c34e380bd3cee27
----
- v4l2loopback.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/v4l2loopback.c b/v4l2loopback.c
-index 7e47a43..22e9795 100644
---- a/v4l2loopback.c
-+++ b/v4l2loopback.c
-@@ -2038,15 +2038,17 @@ static ssize_t v4l2_loopback_read(struct file *file, char __user *buf,
- static ssize_t v4l2_loopback_write(struct file *file, const char __user *buf,
- 				   size_t count, loff_t *ppos)
- {
-+    struct v4l2_loopback_opener *opener;
- 	struct v4l2_loopback_device *dev;
- 	int write_index;
- 	struct v4l2_buffer *b;
- 	MARK();
- 
- 	dev = v4l2loopback_getdevice(file);
-+    opener = fh_to_opener(file->private_data);
- 
--	/* there's at least one writer, so don'stop announcing output capabilities */
--	dev->ready_for_output = 0;
-+    if (WRITER != opener->type)
-+        return -EINVAL;
- 
- 	if (!dev->ready_for_capture) {
- 		int ret = allocate_buffers(dev);
--- 
-2.38.1
-
diff --git a/srcpkgs/v4l2loopback/patches/0002-Backport-PR-485-1.patch b/srcpkgs/v4l2loopback/patches/0002-Backport-PR-485-1.patch
deleted file mode 100644
index cc3375da44ec88..00000000000000
--- a/srcpkgs/v4l2loopback/patches/0002-Backport-PR-485-1.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 40a880b4640486262ca0b5171dec88d633278366 Mon Sep 17 00:00:00 2001
-From: Rodrigo Oliveira <mdkcore@qtrnn.io>
-Date: Thu, 20 Oct 2022 18:44:11 -0300
-Subject: [PATCH 2/2] Backport PR #485 [1]
-
-[1] https://github.com/umlaeute/v4l2loopback/pull/485
----
- v4l2loopback.c | 22 +++++++++++++++++++---
- 1 file changed, 19 insertions(+), 3 deletions(-)
-
-diff --git a/v4l2loopback.c b/v4l2loopback.c
-index 22e9795..1be694c 100644
---- a/v4l2loopback.c
-+++ b/v4l2loopback.c
-@@ -1730,19 +1730,19 @@ static int vidioc_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
- 
- 	switch (type) {
- 	case V4L2_BUF_TYPE_VIDEO_OUTPUT:
--		opener->type = WRITER;
--		dev->ready_for_output = 0;
- 		if (!dev->ready_for_capture) {
- 			int ret = allocate_buffers(dev);
- 			if (ret < 0)
- 				return ret;
-+            opener->type = WRITER;
-+            dev->ready_for_output = 0;
- 			dev->ready_for_capture = 1;
- 		}
- 		return 0;
- 	case V4L2_BUF_TYPE_VIDEO_CAPTURE:
--		opener->type = READER;
- 		if (!dev->ready_for_capture)
- 			return -EIO;
-+		opener->type = READER;
- 		return 0;
- 	default:
- 		return -EINVAL;
-@@ -2042,11 +2042,27 @@ static ssize_t v4l2_loopback_write(struct file *file, const char __user *buf,
- 	struct v4l2_loopback_device *dev;
- 	int write_index;
- 	struct v4l2_buffer *b;
-+    int err = 0;
-+
- 	MARK();
- 
- 	dev = v4l2loopback_getdevice(file);
-     opener = fh_to_opener(file->private_data);
- 
-+	if (UNNEGOTIATED == opener->type) {
-+		spin_lock(&dev->lock);
-+
-+		if (dev->ready_for_output) {
-+			err = vidioc_streamon(file, file->private_data, V4L2_BUF_TYPE_VIDEO_OUTPUT);
-+		}
-+
-+		spin_unlock(&dev->lock);
-+
-+		if (err < 0)
-+			return err;
-+	}
-+
-+
-     if (WRITER != opener->type)
-         return -EINVAL;
- 
--- 
-2.38.1
-
diff --git a/srcpkgs/v4l2loopback/patches/dkms-patch.patch b/srcpkgs/v4l2loopback/patches/dkms-patch.patch
deleted file mode 100644
index a951829dcaf012..00000000000000
--- a/srcpkgs/v4l2loopback/patches/dkms-patch.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From e7edf2f55b7eb71b69984110f3c8e31b8ac6285e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?=
- <zmoelnig@umlautS.umlaeute.mur.at>
-Date: Fri, 5 Aug 2022 18:42:22 +0200
-Subject: [PATCH] Backported dkms-patch from Ubuntu
-
-Closes: https://github.com/umlaeute/v4l2loopback/issues/498
----
- dkms.conf | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/dkms.conf b/dkms.conf
-index f697db2b..7d5ed75c 100644
---- a/dkms.conf
-+++ b/dkms.conf
-@@ -3,8 +3,15 @@ PACKAGE_VERSION="0.12.7"
- 
- if [ -f $kernel_source_dir/.config ]; then
-     . $kernel_source_dir/.config
--    if [ "${CONFIG_VIDEO_V4L2:-n}" = "n" ]; then
--        BUILD_EXCLUSIVE_KERNEL="REQUIRES CONFIG_VIDEO_V4L2"
-+    if ! { echo "$kernelver"; echo 5.18; } | sort -V -C; then
-+        # for linux>=5.18, CONFIG_VIDEO_V4L2 has been renamed to CONFIG_VIDEO_DEV
-+        if [ "${CONFIG_VIDEO_DEV:-n}" = "n" ]; then
-+            BUILD_EXCLUSIVE_KERNEL="REQUIRES CONFIG_VIDEO_DEV"
-+        fi
-+    else
-+        if [ "${CONFIG_VIDEO_V4L2:-n}" = "n" ]; then
-+            BUILD_EXCLUSIVE_KERNEL="REQUIRES CONFIG_VIDEO_V4L2"
-+        fi
-     fi
- fi
- 
diff --git a/srcpkgs/v4l2loopback/template b/srcpkgs/v4l2loopback/template
index 95a1b1a19556ee..c66658decfd575 100644
--- a/srcpkgs/v4l2loopback/template
+++ b/srcpkgs/v4l2loopback/template
@@ -1,6 +1,6 @@
 # Template file for 'v4l2loopback'
 pkgname=v4l2loopback
-version=0.12.7
+version=0.13.1
 revision=1
 hostmakedepends="help2man"
 depends="dkms"
@@ -9,13 +9,14 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/umlaeute/v4l2loopback"
 distfiles="https://github.com/umlaeute/v4l2loopback/archive/v${version}.tar.gz"
-checksum=e0782b8abe8f2235e2734f725dc1533a0729e674c4b7834921ade43b9f04939b
+checksum=39af7d134ec2d8602c6bb2d2977fde28fdb4db6497577ba36048152b02825fe3
 dkms_modules="v4l2loopback ${version}"
 
 do_install() {
 	make DESTDIR=${DESTDIR} PREFIX=/usr install-utils install-man
 	vmkdir usr/src/v4l2loopback-${version}
 	vcopy Makefile usr/src/v4l2loopback-${version}
+	vcopy Kbuild usr/src/v4l2loopback-${version}
 	vcopy dkms.conf usr/src/v4l2loopback-${version}
 	vcopy "*.c" usr/src/v4l2loopback-${version}
 	vcopy "*.h" usr/src/v4l2loopback-${version}

From 591638e848c716a5139e0ac4e90287f20c71a5e3 Mon Sep 17 00:00:00 2001
From: Jason Elswick <jason@jasondavid.tv>
Date: Sat, 20 Apr 2024 15:40:28 -0500
Subject: [PATCH 12/43] python3-peewee: update to 3.17.3.

---
 srcpkgs/python3-peewee/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-peewee/template b/srcpkgs/python3-peewee/template
index 6d0e6640f48cdd..2b5151535e79ec 100644
--- a/srcpkgs/python3-peewee/template
+++ b/srcpkgs/python3-peewee/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-peewee'
 pkgname=python3-peewee
-version=3.14.4
-revision=5
+version=3.17.3
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython0.29"
 makedepends="python3-devel sqlite-devel"
@@ -12,9 +12,9 @@ license="MIT"
 homepage="https://github.com/coleifer/peewee"
 changelog="https://raw.githubusercontent.com/coleifer/peewee/master/CHANGELOG.md"
 distfiles="https://github.com/coleifer/peewee/archive/${version}.tar.gz"
-checksum=cded912439699a63704fcad36ee15093bbf3cca502beb9ae648423f8722178c2
+checksum=fccaf0b61dc88fdfd95526f804fc0f55c09364f2fffaf6d6293c8bd9551227c9
 alternatives="peewee:pwiz:/usr/bin/pwiz.py3"
-make_check=no # tests  require postgres instance
+make_check=no # tests require postgres instance
 
 post_install() {
 	mv $DESTDIR/usr/bin/pwiz.py $DESTDIR/usr/bin/pwiz.py3

From ecefcd361e5af4b749a071e997a4a40eb320d8f6 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 24 Apr 2024 09:02:42 -0400
Subject: [PATCH 13/43] Waybar: update to 0.10.2

---
 srcpkgs/Waybar/patches/wireplumber-0.5.patch | 419 -------------------
 srcpkgs/Waybar/template                      |   6 +-
 2 files changed, 3 insertions(+), 422 deletions(-)
 delete mode 100644 srcpkgs/Waybar/patches/wireplumber-0.5.patch

diff --git a/srcpkgs/Waybar/patches/wireplumber-0.5.patch b/srcpkgs/Waybar/patches/wireplumber-0.5.patch
deleted file mode 100644
index d6399a62c3aa9c..00000000000000
--- a/srcpkgs/Waybar/patches/wireplumber-0.5.patch
+++ /dev/null
@@ -1,419 +0,0 @@
-From 2326727ccbf0456ccfd631e748955f7f67c44a4e Mon Sep 17 00:00:00 2001
-From: Ryan Walklin <ryan@testtoast.com>
-Date: Thu, 15 Feb 2024 09:37:36 +1300
-Subject: [PATCH] Update Wireplumber API to 0.5
-
-The WP component loader API has changed to be asynchronous, so implement a (GAsyncReadyCallback)-based loader to manage them. Logging integration change was required for 0.5.0 RCs but not for the 0.5.0 release.
-
-Fix clang-tidy and clang-format warnings. Note these are significantly wider than the changes for 0.5.0 so optional beyond the existing patchset.
----
- include/modules/wireplumber.hpp |   5 +-
- meson.build                     |   2 +-
- src/modules/wireplumber.cpp     | 190 ++++++++++++++++++--------------
- 3 files changed, 115 insertions(+), 82 deletions(-)
-
-diff --git a/include/modules/wireplumber.hpp b/include/modules/wireplumber.hpp
-index 9bbf4d464..6255b95fd 100644
---- a/include/modules/wireplumber.hpp
-+++ b/include/modules/wireplumber.hpp
-@@ -17,12 +17,15 @@ class Wireplumber : public ALabel {
-   auto update() -> void override;
- 
-  private:
--  void loadRequiredApiModules();
-+  void asyncLoadRequiredApiModules();
-   void prepare();
-   void activatePlugins();
-   static void updateVolume(waybar::modules::Wireplumber* self, uint32_t id);
-   static void updateNodeName(waybar::modules::Wireplumber* self, uint32_t id);
-   static void onPluginActivated(WpObject* p, GAsyncResult* res, waybar::modules::Wireplumber* self);
-+  static void onDefaultNodesApiLoaded(WpObject* p, GAsyncResult* res,
-+                                      waybar::modules::Wireplumber* self);
-+  static void onMixerApiLoaded(WpObject* p, GAsyncResult* res, waybar::modules::Wireplumber* self);
-   static void onObjectManagerInstalled(waybar::modules::Wireplumber* self);
-   static void onMixerChanged(waybar::modules::Wireplumber* self, uint32_t id);
-   static void onDefaultNodesApiChanged(waybar::modules::Wireplumber* self);
-diff --git a/meson.build b/meson.build
-index e21ff262c..120976083 100644
---- a/meson.build
-+++ b/meson.build
-@@ -92,7 +92,7 @@ libevdev = dependency('libevdev', required: get_option('libevdev'))
- libmpdclient = dependency('libmpdclient', required: get_option('mpd'))
- xkbregistry = dependency('xkbregistry')
- libjack = dependency('jack', required: get_option('jack'))
--libwireplumber = dependency('wireplumber-0.4', required: get_option('wireplumber'))
-+libwireplumber = dependency('wireplumber-0.5', required: get_option('wireplumber'))
- 
- libsndio = compiler.find_library('sndio', required: get_option('sndio'))
- if libsndio.found()
-diff --git a/src/modules/wireplumber.cpp b/src/modules/wireplumber.cpp
-index 51bb708d1..bd019b623 100644
---- a/src/modules/wireplumber.cpp
-+++ b/src/modules/wireplumber.cpp
-@@ -18,31 +18,24 @@ waybar::modules::Wireplumber::Wireplumber(const std::string& id, const Json::Val
-       min_step_(0.0),
-       node_id_(0) {
-   wp_init(WP_INIT_PIPEWIRE);
--  wp_core_ = wp_core_new(NULL, NULL);
-+  wp_core_ = wp_core_new(nullptr, nullptr, nullptr);
-   apis_ = g_ptr_array_new_with_free_func(g_object_unref);
-   om_ = wp_object_manager_new();
- 
-   prepare();
- 
--  loadRequiredApiModules();
-+  spdlog::debug("[{}]: connecting to pipewire...", name_);
- 
--  spdlog::debug("[{}]: connecting to pipewire...", this->name_);
--
--  if (!wp_core_connect(wp_core_)) {
--    spdlog::error("[{}]: Could not connect to PipeWire", this->name_);
-+  if (wp_core_connect(wp_core_) == 0) {
-+    spdlog::error("[{}]: Could not connect to PipeWire", name_);
-     throw std::runtime_error("Could not connect to PipeWire\n");
-   }
- 
--  spdlog::debug("[{}]: connected!", this->name_);
-+  spdlog::debug("[{}]: connected!", name_);
- 
-   g_signal_connect_swapped(om_, "installed", (GCallback)onObjectManagerInstalled, this);
- 
--  activatePlugins();
--
--  dp.emit();
--
--  event_box_.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
--  event_box_.signal_scroll_event().connect(sigc::mem_fun(*this, &Wireplumber::handleScroll));
-+  asyncLoadRequiredApiModules();
- }
- 
- waybar::modules::Wireplumber::~Wireplumber() {
-@@ -63,32 +56,36 @@ void waybar::modules::Wireplumber::updateNodeName(waybar::modules::Wireplumber*
-     return;
-   }
- 
--  auto proxy = static_cast<WpProxy*>(wp_object_manager_lookup(
--      self->om_, WP_TYPE_GLOBAL_PROXY, WP_CONSTRAINT_TYPE_G_PROPERTY, "bound-id", "=u", id, NULL));
-+  auto* proxy = static_cast<WpProxy*>(wp_object_manager_lookup(self->om_, WP_TYPE_GLOBAL_PROXY,
-+                                                               WP_CONSTRAINT_TYPE_G_PROPERTY,
-+                                                               "bound-id", "=u", id, nullptr));
- 
--  if (!proxy) {
-+  if (proxy == nullptr) {
-     auto err = fmt::format("Object '{}' not found\n", id);
-     spdlog::error("[{}]: {}", self->name_, err);
-     throw std::runtime_error(err);
-   }
- 
-   g_autoptr(WpProperties) properties =
--      WP_IS_PIPEWIRE_OBJECT(proxy) ? wp_pipewire_object_get_properties(WP_PIPEWIRE_OBJECT(proxy))
--                                   : wp_properties_new_empty();
--  g_autoptr(WpProperties) global_p = wp_global_proxy_get_global_properties(WP_GLOBAL_PROXY(proxy));
-+      WP_IS_PIPEWIRE_OBJECT(proxy) != 0
-+          ? wp_pipewire_object_get_properties(WP_PIPEWIRE_OBJECT(proxy))
-+          : wp_properties_new_empty();
-+  g_autoptr(WpProperties) globalP = wp_global_proxy_get_global_properties(WP_GLOBAL_PROXY(proxy));
-   properties = wp_properties_ensure_unique_owner(properties);
--  wp_properties_add(properties, global_p);
--  wp_properties_set(properties, "object.id", NULL);
--  auto nick = wp_properties_get(properties, "node.nick");
--  auto description = wp_properties_get(properties, "node.description");
--
--  self->node_name_ = nick ? nick : description ? description : "Unknown node name";
-+  wp_properties_add(properties, globalP);
-+  wp_properties_set(properties, "object.id", nullptr);
-+  const auto* nick = wp_properties_get(properties, "node.nick");
-+  const auto* description = wp_properties_get(properties, "node.description");
-+
-+  self->node_name_ = nick != nullptr          ? nick
-+                     : description != nullptr ? description
-+                                              : "Unknown node name";
-   spdlog::debug("[{}]: Updating node name to: {}", self->name_, self->node_name_);
- }
- 
- void waybar::modules::Wireplumber::updateVolume(waybar::modules::Wireplumber* self, uint32_t id) {
-   spdlog::debug("[{}]: updating volume", self->name_);
--  GVariant* variant = NULL;
-+  GVariant* variant = nullptr;
- 
-   if (!isValidNodeId(id)) {
-     spdlog::error("[{}]: '{}' is not a valid node ID. Ignoring volume update.", self->name_, id);
-@@ -97,7 +94,7 @@ void waybar::modules::Wireplumber::updateVolume(waybar::modules::Wireplumber* se
- 
-   g_signal_emit_by_name(self->mixer_api_, "get-volume", id, &variant);
- 
--  if (!variant) {
-+  if (variant == nullptr) {
-     auto err = fmt::format("Node {} does not support volume\n", id);
-     spdlog::error("[{}]: {}", self->name_, err);
-     throw std::runtime_error(err);
-@@ -115,9 +112,9 @@ void waybar::modules::Wireplumber::onMixerChanged(waybar::modules::Wireplumber*
-   spdlog::debug("[{}]: (onMixerChanged) - id: {}", self->name_, id);
- 
-   g_autoptr(WpNode) node = static_cast<WpNode*>(wp_object_manager_lookup(
--      self->om_, WP_TYPE_NODE, WP_CONSTRAINT_TYPE_G_PROPERTY, "bound-id", "=u", id, NULL));
-+      self->om_, WP_TYPE_NODE, WP_CONSTRAINT_TYPE_G_PROPERTY, "bound-id", "=u", id, nullptr));
- 
--  if (!node) {
-+  if (node == nullptr) {
-     spdlog::warn("[{}]: (onMixerChanged) - Object with id {} not found", self->name_, id);
-     return;
-   }
-@@ -140,49 +137,49 @@ void waybar::modules::Wireplumber::onMixerChanged(waybar::modules::Wireplumber*
- void waybar::modules::Wireplumber::onDefaultNodesApiChanged(waybar::modules::Wireplumber* self) {
-   spdlog::debug("[{}]: (onDefaultNodesApiChanged)", self->name_);
- 
--  uint32_t default_node_id;
--  g_signal_emit_by_name(self->def_nodes_api_, "get-default-node", "Audio/Sink", &default_node_id);
-+  uint32_t defaultNodeId;
-+  g_signal_emit_by_name(self->def_nodes_api_, "get-default-node", "Audio/Sink", &defaultNodeId);
- 
--  if (!isValidNodeId(default_node_id)) {
-+  if (!isValidNodeId(defaultNodeId)) {
-     spdlog::warn("[{}]: '{}' is not a valid node ID. Ignoring node change.", self->name_,
--                 default_node_id);
-+                 defaultNodeId);
-     return;
-   }
- 
-   g_autoptr(WpNode) node = static_cast<WpNode*>(
-       wp_object_manager_lookup(self->om_, WP_TYPE_NODE, WP_CONSTRAINT_TYPE_G_PROPERTY, "bound-id",
--                               "=u", default_node_id, NULL));
-+                               "=u", defaultNodeId, nullptr));
- 
--  if (!node) {
-+  if (node == nullptr) {
-     spdlog::warn("[{}]: (onDefaultNodesApiChanged) - Object with id {} not found", self->name_,
--                 default_node_id);
-+                 defaultNodeId);
-     return;
-   }
- 
--  const gchar* default_node_name =
-+  const gchar* defaultNodeName =
-       wp_pipewire_object_get_property(WP_PIPEWIRE_OBJECT(node), "node.name");
- 
-   spdlog::debug(
-       "[{}]: (onDefaultNodesApiChanged) - got the following default node: Node(name: {}, id: {})",
--      self->name_, default_node_name, default_node_id);
-+      self->name_, defaultNodeName, defaultNodeId);
- 
--  if (g_strcmp0(self->default_node_name_, default_node_name) == 0) {
-+  if (g_strcmp0(self->default_node_name_, defaultNodeName) == 0) {
-     spdlog::debug(
-         "[{}]: (onDefaultNodesApiChanged) - Default node has not changed. Node(name: {}, id: {}). "
-         "Ignoring.",
--        self->name_, self->default_node_name_, default_node_id);
-+        self->name_, self->default_node_name_, defaultNodeId);
-     return;
-   }
- 
-   spdlog::debug(
-       "[{}]: (onDefaultNodesApiChanged) - Default node changed to -> Node(name: {}, id: {})",
--      self->name_, default_node_name, default_node_id);
-+      self->name_, defaultNodeName, defaultNodeId);
- 
-   g_free(self->default_node_name_);
--  self->default_node_name_ = g_strdup(default_node_name);
--  self->node_id_ = default_node_id;
--  updateVolume(self, default_node_id);
--  updateNodeName(self, default_node_id);
-+  self->default_node_name_ = g_strdup(defaultNodeName);
-+  self->node_id_ = defaultNodeId;
-+  updateVolume(self, defaultNodeId);
-+  updateNodeName(self, defaultNodeId);
- }
- 
- void waybar::modules::Wireplumber::onObjectManagerInstalled(waybar::modules::Wireplumber* self) {
-@@ -190,14 +187,14 @@ void waybar::modules::Wireplumber::onObjectManagerInstalled(waybar::modules::Wir
- 
-   self->def_nodes_api_ = wp_plugin_find(self->wp_core_, "default-nodes-api");
- 
--  if (!self->def_nodes_api_) {
-+  if (self->def_nodes_api_ == nullptr) {
-     spdlog::error("[{}]: default nodes api is not loaded.", self->name_);
-     throw std::runtime_error("Default nodes API is not loaded\n");
-   }
- 
-   self->mixer_api_ = wp_plugin_find(self->wp_core_, "mixer-api");
- 
--  if (!self->mixer_api_) {
-+  if (self->mixer_api_ == nullptr) {
-     spdlog::error("[{}]: mixer api is not loaded.", self->name_);
-     throw std::runtime_error("Mixer api is not loaded\n");
-   }
-@@ -206,7 +203,7 @@ void waybar::modules::Wireplumber::onObjectManagerInstalled(waybar::modules::Wir
-                         &self->default_node_name_);
-   g_signal_emit_by_name(self->def_nodes_api_, "get-default-node", "Audio/Sink", &self->node_id_);
- 
--  if (self->default_node_name_) {
-+  if (self->default_node_name_ != nullptr) {
-     spdlog::debug("[{}]: (onObjectManagerInstalled) - default configured node name: {} and id: {}",
-                   self->name_, self->default_node_name_, self->node_id_);
-   }
-@@ -221,11 +218,11 @@ void waybar::modules::Wireplumber::onObjectManagerInstalled(waybar::modules::Wir
- 
- void waybar::modules::Wireplumber::onPluginActivated(WpObject* p, GAsyncResult* res,
-                                                      waybar::modules::Wireplumber* self) {
--  auto plugin_name = wp_plugin_get_name(WP_PLUGIN(p));
--  spdlog::debug("[{}]: onPluginActivated: {}", self->name_, plugin_name);
--  g_autoptr(GError) error = NULL;
-+  const auto* pluginName = wp_plugin_get_name(WP_PLUGIN(p));
-+  spdlog::debug("[{}]: onPluginActivated: {}", self->name_, pluginName);
-+  g_autoptr(GError) error = nullptr;
- 
--  if (!wp_object_activate_finish(p, res, &error)) {
-+  if (wp_object_activate_finish(p, res, &error) == 0) {
-     spdlog::error("[{}]: error activating plugin: {}", self->name_, error->message);
-     throw std::runtime_error(error->message);
-   }
-@@ -240,7 +237,7 @@ void waybar::modules::Wireplumber::activatePlugins() {
-   for (uint16_t i = 0; i < apis_->len; i++) {
-     WpPlugin* plugin = static_cast<WpPlugin*>(g_ptr_array_index(apis_, i));
-     pending_plugins_++;
--    wp_object_activate(WP_OBJECT(plugin), WP_PLUGIN_FEATURE_ENABLED, NULL,
-+    wp_object_activate(WP_OBJECT(plugin), WP_PLUGIN_FEATURE_ENABLED, nullptr,
-                        (GAsyncReadyCallback)onPluginActivated, this);
-   }
- }
-@@ -248,34 +245,67 @@ void waybar::modules::Wireplumber::activatePlugins() {
- void waybar::modules::Wireplumber::prepare() {
-   spdlog::debug("[{}]: preparing object manager", name_);
-   wp_object_manager_add_interest(om_, WP_TYPE_NODE, WP_CONSTRAINT_TYPE_PW_PROPERTY, "media.class",
--                                 "=s", "Audio/Sink", NULL);
-+                                 "=s", "Audio/Sink", nullptr);
- }
- 
--void waybar::modules::Wireplumber::loadRequiredApiModules() {
--  spdlog::debug("[{}]: loading required modules", name_);
--  g_autoptr(GError) error = NULL;
-+void waybar::modules::Wireplumber::onDefaultNodesApiLoaded(WpObject* p, GAsyncResult* res,
-+                                                           waybar::modules::Wireplumber* self) {
-+  gboolean success = FALSE;
-+  g_autoptr(GError) error = nullptr;
- 
--  if (!wp_core_load_component(wp_core_, "libwireplumber-module-default-nodes-api", "module", NULL,
--                              &error)) {
-+  spdlog::debug("[{}]: callback loading default node api module", self->name_);
-+
-+  success = wp_core_load_component_finish(self->wp_core_, res, &error);
-+
-+  if (success == FALSE) {
-+    spdlog::error("[{}]: default nodes API load failed", self->name_);
-     throw std::runtime_error(error->message);
-   }
-+  spdlog::debug("[{}]: loaded default nodes api", self->name_);
-+  g_ptr_array_add(self->apis_, wp_plugin_find(self->wp_core_, "default-nodes-api"));
-+
-+  spdlog::debug("[{}]: loading mixer api module", self->name_);
-+  wp_core_load_component(self->wp_core_, "libwireplumber-module-mixer-api", "module", nullptr,
-+                         "mixer-api", nullptr, (GAsyncReadyCallback)onMixerApiLoaded, self);
-+}
- 
--  if (!wp_core_load_component(wp_core_, "libwireplumber-module-mixer-api", "module", NULL,
--                              &error)) {
-+void waybar::modules::Wireplumber::onMixerApiLoaded(WpObject* p, GAsyncResult* res,
-+                                                    waybar::modules::Wireplumber* self) {
-+  gboolean success = FALSE;
-+  g_autoptr(GError) error = nullptr;
-+
-+  success = wp_core_load_component_finish(self->wp_core_, res, nullptr);
-+
-+  if (success == FALSE) {
-+    spdlog::error("[{}]: mixer API load failed", self->name_);
-     throw std::runtime_error(error->message);
-   }
- 
--  g_ptr_array_add(apis_, wp_plugin_find(wp_core_, "default-nodes-api"));
--  g_ptr_array_add(apis_, ({
--                    WpPlugin* p = wp_plugin_find(wp_core_, "mixer-api");
--                    g_object_set(G_OBJECT(p), "scale", 1 /* cubic */, NULL);
-+  spdlog::debug("[{}]: loaded mixer API", self->name_);
-+  g_ptr_array_add(self->apis_, ({
-+                    WpPlugin* p = wp_plugin_find(self->wp_core_, "mixer-api");
-+                    g_object_set(G_OBJECT(p), "scale", 1 /* cubic */, nullptr);
-                     p;
-                   }));
-+
-+  self->activatePlugins();
-+
-+  self->dp.emit();
-+
-+  self->event_box_.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
-+  self->event_box_.signal_scroll_event().connect(sigc::mem_fun(*self, &Wireplumber::handleScroll));
-+}
-+
-+void waybar::modules::Wireplumber::asyncLoadRequiredApiModules() {
-+  spdlog::debug("[{}]: loading default nodes api module", name_);
-+  wp_core_load_component(wp_core_, "libwireplumber-module-default-nodes-api", "module", nullptr,
-+                         "default-nodes-api", nullptr, (GAsyncReadyCallback)onDefaultNodesApiLoaded,
-+                         this);
- }
- 
- auto waybar::modules::Wireplumber::update() -> void {
-   auto format = format_;
--  std::string tooltip_format;
-+  std::string tooltipFormat;
- 
-   if (muted_) {
-     format = config_["format-muted"].isString() ? config_["format-muted"].asString() : format;
-@@ -292,12 +322,12 @@ auto waybar::modules::Wireplumber::update() -> void {
-   getState(vol);
- 
-   if (tooltipEnabled()) {
--    if (tooltip_format.empty() && config_["tooltip-format"].isString()) {
--      tooltip_format = config_["tooltip-format"].asString();
-+    if (tooltipFormat.empty() && config_["tooltip-format"].isString()) {
-+      tooltipFormat = config_["tooltip-format"].asString();
-     }
- 
--    if (!tooltip_format.empty()) {
--      label_.set_tooltip_text(fmt::format(fmt::runtime(tooltip_format),
-+    if (!tooltipFormat.empty()) {
-+      label_.set_tooltip_text(fmt::format(fmt::runtime(tooltipFormat),
-                                           fmt::arg("node_name", node_name_),
-                                           fmt::arg("volume", vol), fmt::arg("icon", getIcon(vol))));
-     } else {
-@@ -317,31 +347,31 @@ bool waybar::modules::Wireplumber::handleScroll(GdkEventScroll* e) {
-   if (dir == SCROLL_DIR::NONE) {
-     return true;
-   }
--  double max_volume = 1;
-+  double maxVolume = 1;
-   double step = 1.0 / 100.0;
-   if (config_["scroll-step"].isDouble()) {
-     step = config_["scroll-step"].asDouble() / 100.0;
-   }
-   if (config_["max-volume"].isDouble()) {
--    max_volume = config_["max-volume"].asDouble() / 100.0;
-+    maxVolume = config_["max-volume"].asDouble() / 100.0;
-   }
- 
-   if (step < min_step_) step = min_step_;
- 
--  double new_vol = volume_;
-+  double newVol = volume_;
-   if (dir == SCROLL_DIR::UP) {
--    if (volume_ < max_volume) {
--      new_vol = volume_ + step;
--      if (new_vol > max_volume) new_vol = max_volume;
-+    if (volume_ < maxVolume) {
-+      newVol = volume_ + step;
-+      if (newVol > maxVolume) newVol = maxVolume;
-     }
-   } else if (dir == SCROLL_DIR::DOWN) {
-     if (volume_ > 0) {
--      new_vol = volume_ - step;
--      if (new_vol < 0) new_vol = 0;
-+      newVol = volume_ - step;
-+      if (newVol < 0) newVol = 0;
-     }
-   }
--  if (new_vol != volume_) {
--    GVariant* variant = g_variant_new_double(new_vol);
-+  if (newVol != volume_) {
-+    GVariant* variant = g_variant_new_double(newVol);
-     gboolean ret;
-     g_signal_emit_by_name(mixer_api_, "set-volume", node_id_, variant, &ret);
-   }
-
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 14ca6e18282e76..898bdf6e49926a 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
-version=0.10.0
-revision=2
+version=0.10.2
+revision=1
 build_style=meson
 configure_args="-Dlibudev=enabled -Dman-pages=enabled
  -Dsystemd=disabled -Drfkill=enabled
@@ -30,7 +30,7 @@ license="MIT"
 homepage="https://github.com/Alexays/Waybar"
 changelog="https://github.com/Alexays/Waybar/releases"
 distfiles="https://github.com/Alexays/Waybar/archive/refs/tags/${version}.tar.gz"
-checksum=3af6665889868f2334ba1793c8b0f3104c4c3b176a8c759f0d08f07266ad2620
+checksum=7ecccfe5d326d66987a32e77e02b825019d191670ab8e87412df01dd0913f9c0
 conf_files="/etc/xdg/waybar/config.jsonc /etc/xdg/waybar/style.css"
 
 build_options="libnl pulseaudio dbusmenugtk mpd sndio jack pipewire"

From 9b12c2fff6bf34194f93bab47815976be3a56f61 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 19 Apr 2024 12:04:36 +0530
Subject: [PATCH 14/43] osv-scanner: update to 1.7.2.

---
 srcpkgs/osv-scanner/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osv-scanner/template b/srcpkgs/osv-scanner/template
index 13f889d206a9a6..52c3d500b53f17 100644
--- a/srcpkgs/osv-scanner/template
+++ b/srcpkgs/osv-scanner/template
@@ -1,6 +1,6 @@
 # Template file for 'osv-scanner'
 pkgname=osv-scanner
-version=1.7.1
+version=1.7.2
 revision=1
 build_style=go
 go_import_path="github.com/google/osv-scanner"
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://google.github.io/osv-scanner/"
 changelog="https://raw.githubusercontent.com/google/osv-scanner/main/CHANGELOG.md"
 distfiles="https://github.com/google/osv-scanner/archive/refs/tags/v${version}.tar.gz"
-checksum=9aa9ebd72bcf62a377231f6b821d328ab7163d1a7eb39d7e9271bb6c7c01a3b0
+checksum=b6ff65f82e833e2d8102e3308e620ef30af5f93b3a215f899098be9a3e21ad03

From 09c719cb224ab8b4635a5af7ed920434df18f97e Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 19 Apr 2024 01:28:30 +0530
Subject: [PATCH 15/43] glab: update to 1.40.0.

---
 srcpkgs/glab/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glab/template b/srcpkgs/glab/template
index dd975932a8d588..cddea62cab090b 100644
--- a/srcpkgs/glab/template
+++ b/srcpkgs/glab/template
@@ -1,6 +1,6 @@
 # Template file for 'glab'
 pkgname=glab
-version=1.38.0
+version=1.40.0
 revision=1
 build_style=go
 build_helper=qemu
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://gitlab.com/gitlab-org/cli"
 distfiles="https://gitlab.com/gitlab-org/cli/-/archive/v$version/cli-v$version.tar.gz"
-checksum=e41f7c04d782936562f7eee6866ae973aa4f2807ade643372a918d5271f279c7
+checksum=0e426a4b0b1945fa16b504c2245a9a525e0b4a858565e482d934b481163d87b5
 
 post_install() {
 	for shell in bash fish zsh; do

From 6290982931997a20621f698e9ef27d2556ce77c9 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 24 Apr 2024 18:46:48 +0200
Subject: [PATCH 16/43] fuzzel: update to 1.10.2

---
 srcpkgs/fuzzel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index b3344d37d604b0..06f2030e93a2dc 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.9.2
+version=1.10.2
 revision=1
 build_style=meson
 configure_args="-Dsvg-backend=librsvg"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 changelog="https://codeberg.org/dnkl/fuzzel/raw/branch/master/CHANGELOG.md"
 distfiles="https://codeberg.org/dnkl/fuzzel/archive/${version}.tar.gz"
-checksum=7adfaad63f148a0ed24f90781de30f4632b7a4fe147f9c4b9770babca02f6c97
+checksum=5362175f301af3f27c23138ac339294ce33dff61720ffc7eb13e78ec56f60a8b
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/fuzzel/CHANGELOG.md"

From fb3b2f927dbff0d4b8a6d05b9b1eb31ec2e967ae Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Tue, 23 Apr 2024 16:22:46 -0400
Subject: [PATCH 17/43] weston: update to 13.0.1.

---
 srcpkgs/weston/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template
index ba9eda8f8c0d06..a3647efb1202e4 100644
--- a/srcpkgs/weston/template
+++ b/srcpkgs/weston/template
@@ -1,6 +1,6 @@
 # Template file for 'weston'
 pkgname=weston
-version=13.0.0
+version=13.0.1
 revision=1
 build_style=meson
 configure_args=" $(vopt_bool vaapi backend-drm-screencast-vaapi) "
@@ -17,7 +17,7 @@ maintainer="Daniel Martinez <danielmartinez@cock.li>"
 license="MIT"
 homepage="https://wayland.freedesktop.org/"
 distfiles="https://wayland.freedesktop.org/releases/${pkgname}-${version}.tar.xz"
-checksum=52ff1d4aa2394a2e416c85a338b627ce97fa71d43eb762fd4aaf145d36fc795a
+checksum=ea1566ab4f5ffce7e9fd4f7a1fca5b30caae4d50023bf459213994094e02b29a
 lib32disabled=yes
 replaces="weston-colord>=0"
 

From be604caa17ea719e7b5b41daba2e33d7b616d6d2 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 23 Apr 2024 21:29:10 -0400
Subject: [PATCH 18/43] synapse: update to 1.105.1.

---
 srcpkgs/synapse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index fc520dc31f92d3..cef1ad1f0afd0f 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.105.0
+version=1.105.1
 revision=1
 build_style=python3-pep517
 build_helper=rust
@@ -25,7 +25,7 @@ license="AGPL-3.0-or-later"
 homepage="https://element-hq.github.io/synapse"
 changelog="https://raw.githubusercontent.com/element-hq/synapse/develop/CHANGES.md"
 distfiles="https://github.com/element-hq/synapse/archive/refs/tags/v${version}.tar.gz"
-checksum=d11842c5bac3def7acab519547dc0dbd326e744719b878d2c639b66dcea632ba
+checksum=ae07b13ddf843f560b62317245dcfbc5e40517421136874c0455098f0f07e545
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From 41c74106b3b2fc7f979cb127baf83a2d88bda0bd Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Mon, 22 Apr 2024 10:49:40 +0200
Subject: [PATCH 19/43] python3-peewee: switch to PEP517

---
 srcpkgs/python3-peewee/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-peewee/template b/srcpkgs/python3-peewee/template
index 2b5151535e79ec..0c0833b549b253 100644
--- a/srcpkgs/python3-peewee/template
+++ b/srcpkgs/python3-peewee/template
@@ -2,8 +2,8 @@
 pkgname=python3-peewee
 version=3.17.3
 revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools python3-Cython0.29"
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel python3-Cython0.29"
 makedepends="python3-devel sqlite-devel"
 depends="python3"
 short_desc="Small and simple ORM for Python3"

From 8c451ef0714ca29f5665eebb00c3b78063c510c1 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Wed, 24 Apr 2024 19:10:02 +0200
Subject: [PATCH 20/43] hcloud: update to 1.43.1.

---
 srcpkgs/hcloud/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index e28a01bdd00511..3e67f351d5f4f0 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.42.0
+version=1.43.1
 revision=1
 build_style=go
 build_helper=qemu
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 changelog="https://raw.githubusercontent.com/hetznercloud/cli/main/CHANGELOG.md"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=b99ec2b89d1485c3b14d6db2966cc355c9173ca98fe29754216b70f72317d8ad
+checksum=5bd9e55b7c0877ec51cd1f3d873d5c1f7447cad8cb76dcaba1f3c5186e7f02bc
 
 post_install() {
 	vlicense LICENSE

From 490317ec8811320984407e31d8490d9df3b49c8d Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Wed, 24 Apr 2024 19:13:26 +0200
Subject: [PATCH 21/43] cpuid: update to 20240409.

---
 srcpkgs/cpuid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cpuid/template b/srcpkgs/cpuid/template
index 9686b47b3cce04..cf2af0d1fdd86e 100644
--- a/srcpkgs/cpuid/template
+++ b/srcpkgs/cpuid/template
@@ -1,6 +1,6 @@
 # Template file for 'cpuid'
 pkgname=cpuid
-version=20230614
+version=20240409
 revision=1
 archs="i686* x86_64*"
 build_style=gnu-makefile
@@ -10,6 +10,6 @@ maintainer="Gerardo Di Iorio  <arete74@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.etallen.com/cpuid.html"
 distfiles="https://www.etallen.com/cpuid/cpuid-${version}.src.tar.gz"
-checksum=b1c83045efc26076307751e0662d580277f5f9bf89cf027231a7812003c3a4e8
+checksum=5812909464e9ed13f58da2b2b8d158129e833e6696edd47012b6b361c8ccbd5d
 
 conflicts="msr-tools"

From c035445bccfbd8f430779eee8986d0623bde7601 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Wed, 24 Apr 2024 19:15:47 +0200
Subject: [PATCH 22/43] pgweb: update to 0.15.0.

---
 srcpkgs/pgweb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgweb/template b/srcpkgs/pgweb/template
index edf668d9bc0482..7a57e228ccd109 100644
--- a/srcpkgs/pgweb/template
+++ b/srcpkgs/pgweb/template
@@ -1,6 +1,6 @@
 # Template file for 'pgweb'
 pkgname=pgweb
-version=0.14.3
+version=0.15.0
 revision=1
 build_style=go
 go_import_path="github.com/sosedoff/pgweb"
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://sosedoff.github.io/pgweb"
 changelog="https://github.com/sosedoff/pgweb/raw/master/CHANGELOG.md"
 distfiles="https://github.com/sosedoff/pgweb/archive/v${version}.tar.gz"
-checksum=1feb51c8734e0368795172cbd5bcc92ee4e55075c17439b242e4d982bd8debd7
+checksum=fb8c324d8c7c6efd144cdb977b30eb0ec2b2051b23c97ab6a7a2be578e1247b9
 
 post_install() {
 	vdoc README.md

From 4e930cac0473d8ace40307e5fda9691c17c60399 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 21 Apr 2024 14:50:37 -0300
Subject: [PATCH 23/43] singular: update to 4.4.0.

---
 common/shlibs             | 8 ++++----
 srcpkgs/singular/template | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 62f7661d75fd07..794290d3a2f77d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4038,10 +4038,10 @@ libecl.so.23.9 ecl-23.9.9_1
 libecm.so.1 ecm-7.0.4_3
 libcliquer.so.1 cliquer-1.22_1
 libomalloc-0.9.6.so singular-4.2.1_1
-libSingular-4.3.2.so singular-4.3.2_1
-libfactory-4.3.2.so singular-4.3.2_1
-libpolys-4.3.2.so singular-4.3.2_1
-libsingular_resources-4.3.2.so singular-4.3.2_1
+libSingular-4.4.0.so singular-4.4.0_1
+libfactory-4.4.0.so singular-4.4.0_1
+libpolys-4.4.0.so singular-4.4.0_1
+libsingular_resources-4.4.0.so singular-4.4.0_1
 libbrial.so.3 brial-1.2.10_1
 libbrial_groebner.so.3 brial-1.2.10_1
 libm4ri-0.0.20200125.so m4ri-20200125_1
diff --git a/srcpkgs/singular/template b/srcpkgs/singular/template
index 819ee81cb82801..aa4899c7bdaab9 100644
--- a/srcpkgs/singular/template
+++ b/srcpkgs/singular/template
@@ -1,6 +1,6 @@
 # Template file for 'singular'
 pkgname=singular
-version=4.3.2p16
+version=4.4.0
 revision=1
 _majver=${version%p*}
 build_style=gnu-configure
@@ -20,7 +20,7 @@ maintainer="dkwo <npiazza@disroot.org>, Gonzalo Tornaría <tornaria@cmat.edu.uy>
 license="GPL-2.0-or-later"
 homepage="https://www.singular.uni-kl.de"
 distfiles="https://www.singular.uni-kl.de/ftp/pub/Math/Singular/SOURCES/${_majver//./-}/singular-${version}.tar.gz"
-checksum=675733ba13a6ec67c564e753139f7c0c4b0d3e29bdb995de5341b616f1472a16
+checksum=c269abbd24c84fe33edc0af1e78b8fec53d8e94338410ac06c2666cfd40d43f2
 
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" ntl-devel"

From 55aea8c00ec1fd4cd18da25eaf4773c6d9d2faa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 21 Apr 2024 14:51:04 -0300
Subject: [PATCH 24/43] sagemath: revbump for singular

---
 srcpkgs/sagemath/patches/37763-scipy_1.13.patch | 13 +++++++++++++
 srcpkgs/sagemath/patches/get_patches            |  1 +
 srcpkgs/sagemath/template                       |  2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/sagemath/patches/37763-scipy_1.13.patch

diff --git a/srcpkgs/sagemath/patches/37763-scipy_1.13.patch b/srcpkgs/sagemath/patches/37763-scipy_1.13.patch
new file mode 100644
index 00000000000000..219c6bdc323f7e
--- /dev/null
+++ b/srcpkgs/sagemath/patches/37763-scipy_1.13.patch
@@ -0,0 +1,13 @@
+diff --git a/src/sage/matrix/matrix_double_dense.pyx b/src/sage/matrix/matrix_double_dense.pyx
+index 6877a924de2..a01defad999 100644
+--- a/src/sage/matrix/matrix_double_dense.pyx
++++ b/src/sage/matrix/matrix_double_dense.pyx
+@@ -3683,7 +3683,7 @@ cdef class Matrix_double_dense(Matrix_numpy_dense):
+             sage: A = matrix(CDF, 2, [1,2+I,3*I,4]); A                                  # needs sage.symbolic
+             [        1.0 2.0 + 1.0*I]
+             [      3.0*I         4.0]
+-            sage: A.exp()  # tol 1.1e-14                                                # needs sage.symbolic
++            sage: A.exp()  # tol 3e-14                                                  # needs sage.symbolic
+             [-19.614602953804912 + 12.517743846762578*I   3.7949636449582176 + 28.88379930658099*I]
+             [ -32.383580980922254 + 21.88423595789845*I   2.269633004093535 + 44.901324827684824*I]
+ 
diff --git a/srcpkgs/sagemath/patches/get_patches b/srcpkgs/sagemath/patches/get_patches
index 77afead3fc913d..56057bbd4a397b 100755
--- a/srcpkgs/sagemath/patches/get_patches
+++ b/srcpkgs/sagemath/patches/get_patches
@@ -22,3 +22,4 @@ cd $(dirname "$0")
 
 # needs review
 get_pr 37492 "singular 4.3.2p16"
+get_pr 37763 "scipy 1.13"
diff --git a/srcpkgs/sagemath/template b/srcpkgs/sagemath/template
index 22faf78921c5f4..8b4bf7dfa441bb 100644
--- a/srcpkgs/sagemath/template
+++ b/srcpkgs/sagemath/template
@@ -1,7 +1,7 @@
 # Template file for 'sagemath'
 pkgname=sagemath
 version=10.3
-revision=1
+revision=2
 build_wrksrc=pkgs/sagemath-standard
 build_style=python3-pep517
 make_build_args="--skip-dependency-check"

From b2969e70e2d04b418389d2057ee6e9bf4e1edd3e Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Thu, 25 Apr 2024 14:11:16 -0500
Subject: [PATCH 25/43] boundary: Update to 0.15.4.

---
 srcpkgs/boundary/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/boundary/template b/srcpkgs/boundary/template
index 1769a2842ca6b5..fefca618dbe655 100644
--- a/srcpkgs/boundary/template
+++ b/srcpkgs/boundary/template
@@ -1,6 +1,6 @@
 # Template file for 'boundary'
 pkgname=boundary
-version=0.15.2
+version=0.15.4
 revision=1
 build_style=go
 go_import_path=github.com/hashicorp/boundary
@@ -10,5 +10,5 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BUSL-1.1"
 homepage="https://boundaryproject.io"
 distfiles="https://github.com/hashicorp/boundary/archive/refs/tags/v$version.tar.gz"
-checksum=d09ab13b36b7eb64b8c5a593148d91ccdcaa9cd93bbe29a68d1fd7eb4f16f630
+checksum=69bc987fe4854541491280a5a53ee1cbeb0d24ebdc41e6763bcd50efba2f0921
 repository=nonfree

From d0af919b50fe317e2d9405bb322bca692281dddf Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@tuta.io>
Date: Thu, 25 Apr 2024 17:33:41 +0000
Subject: [PATCH 26/43] tabbed: update to 0.8.

---
 srcpkgs/tabbed/template | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/tabbed/template b/srcpkgs/tabbed/template
index b8a7343aa9b19c..89c08a5e571bad 100644
--- a/srcpkgs/tabbed/template
+++ b/srcpkgs/tabbed/template
@@ -1,24 +1,19 @@
 # Template file for 'tabbed'
 pkgname=tabbed
-version=0.6
-revision=4
+version=0.8
+revision=1
 build_style=gnu-makefile
-make_build_args="INCS=-I. LIBS=-lX11"
-makedepends="libX11-devel"
+hostmakedepends="freetype-devel"
+makedepends="libX11-devel libXft-devel"
 short_desc="Tab interface for application supporting Xembed"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://tools.suckless.org/tabbed/"
 distfiles="http://dl.suckless.org/tools/tabbed-${version}.tar.gz"
-checksum=7651ea3acbec5d6a25469e8665da7fc70aba2b4fa61a2a6a5449eafdfd641c42
+checksum=95bdffccb071083068d2b555c2524e9c7c57c9b64494d46c697e678d49a0a3d7
 
 pre_build() {
-	sed -i 's|-O0 ||g' config.mk
-	sed -i 's|^CPPFLAGS =|override CPPFLAGS +=|g' config.mk
-	sed -i 's|^CFLAGS =|override CFLAGS +=|g' config.mk
-	sed -i 's|^LDFLAGS =|override LDFLAGS +=|g' config.mk
-	# Remove BSD_SOURCE warning
-	sed -i 's/-D_BSD_SOURCE/-D_DEFAULT_SOURCE/g' config.mk
+	vsed -i 's|X11R6/||g' Makefile
 }
 
 post_install() {

From e3da00b6e79c6c3e84ab1a3f6202e88bd6956942 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 25 Apr 2024 19:41:32 +0200
Subject: [PATCH 27/43] eza: update to 0.18.13

---
 srcpkgs/eza/template | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/eza/template b/srcpkgs/eza/template
index b1bcfef3fba8af..3c8d7ce3a2f3d2 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,25 +1,32 @@
 # Template file for 'eza'
 pkgname=eza
-version=0.18.10
+version=0.18.13
 revision=1
 build_style=cargo
-hostmakedepends="pandoc pkg-config"
+hostmakedepends="pkg-config"
 makedepends="libgit2-devel"
 short_desc="Modern, maintained replacement for ls"
 maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
 license="MIT"
 homepage="https://eza.rocks"
 changelog="https://raw.githubusercontent.com/eza-community/eza/main/CHANGELOG.md"
-distfiles="https://github.com/eza-community/eza/archive/refs/tags/v${version}.tar.gz"
-checksum=b0b59a7bdd7536941fac210ca25d30f904657f906aa2c01411fb390d4bdcd139
+distfiles="https://github.com/eza-community/eza/archive/refs/tags/v${version}.tar.gz
+https://github.com/eza-community/eza/releases/download/v${version}/man-${version}.tar.gz"
+checksum="679fd3b5b389553aa77a2bce496e8658848ef0f4624968fd1a330dbe92032438
+ 73ef1ae9df7dd59d9cd470d94d874486c059a3dd332f565e9556cb5df869fc23"
+
+skip_extraction="man-${version}.tar.gz"
+
+post_extract() {
+	vsrcextract -C manpages --strip-components=3 man-${version}.tar.gz
+}
 
 post_install() {
 	vcompletion completions/bash/eza bash
 	vcompletion completions/fish/eza.fish fish
 	vcompletion completions/zsh/_eza zsh
 
-	for manpage in eza.1 eza_colors.5 eza_colors-explanation.5; do
-		pandoc --standalone -f markdown -t man man/${manpage}.md > ${manpage}
+	for manpage in manpages/*; do
 		vman ${manpage}
 	done
 

From cf99a2a7251a289d84d50ef9ea73d713472f0268 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 23 Apr 2024 10:59:41 +0530
Subject: [PATCH 28/43] lua-language-server: update to 3.8.3.

---
 srcpkgs/lua-language-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua-language-server/template b/srcpkgs/lua-language-server/template
index 8013b5b5fcc2e6..81754accfbf536 100644
--- a/srcpkgs/lua-language-server/template
+++ b/srcpkgs/lua-language-server/template
@@ -1,6 +1,6 @@
 # Template file for 'lua-language-server'
 pkgname=lua-language-server
-version=3.7.4
+version=3.8.3
 revision=1
 hostmakedepends="ninja"
 short_desc="Lua LSP implementation written in Lua"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/LuaLS/lua-language-server"
 changelog="https://raw.githubusercontent.com/LuaLS/lua-language-server/master/changelog.md"
 distfiles="https://github.com/LuaLS/lua-language-server/releases/download/${version}/lua-language-server-${version}-submodules.zip"
-checksum=4993365d2fd34ea460d5614927c752f27294181a6304901c3198a9defced673b
+checksum=37e4b5c409b26e18870914e0ee728f21f88684b6d30a60290dd8c97febde9747
 
 do_build() {
 	ninja -C 3rd/luamake -f compile/ninja/linux.ninja

From ce2db9403fa2c49c6091ca2a0399f976edcfcf37 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emru@emru.xyz>
Date: Sun, 14 Apr 2024 19:52:06 +0200
Subject: [PATCH 29/43] openttd: update to 14.0.

---
 srcpkgs/openttd/patches/regression_tests.patch | 12 ------------
 srcpkgs/openttd/template                       |  6 +++---
 srcpkgs/openttd/update                         |  2 --
 3 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/openttd/patches/regression_tests.patch
 delete mode 100644 srcpkgs/openttd/update

diff --git a/srcpkgs/openttd/patches/regression_tests.patch b/srcpkgs/openttd/patches/regression_tests.patch
deleted file mode 100644
index 59b87e5faa2f52..00000000000000
--- a/srcpkgs/openttd/patches/regression_tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Fix regression tests on musl libc
-index 19fece83f5..641e1e6de2 100644
---- a/openttd-13.4/cmake/scripts/Regression.cmake
-+++ b/openttd-13.4/cmake/scripts/Regression.cmake
-@@ -53,6 +53,7 @@ endif()
- string(REPLACE "0x(nil)" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
- string(REPLACE "0x0000000000000000" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
- string(REPLACE "0x0x0" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
-+string(REPLACE "(null : 0x0)" "(null : 0x00000000)" REGRESSION_RESULT "${REGRESSION_RESULT}")
- 
- # Remove timestamps if any
- string(REGEX REPLACE "\[[0-9-]+ [0-9:]+\] " "" REGRESSION_RESULT "${REGRESSION_RESULT}")
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index cffbb80b270268..080dd789124ead 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,6 +1,6 @@
 # Template file for 'openttd'
 pkgname=openttd
-version=13.4
+version=14.0
 revision=1
 _gfxver=7.1
 _sfxver=1.0.3
@@ -22,14 +22,14 @@ makedepends="SDL2-devel libcurl-devel freetype-devel fontconfig-devel
  harfbuzz-devel icu-devel libpng-devel liblzma-devel fluidsynth-devel"
 depends="hicolor-icon-theme fluidsynth soundfont-fluid"
 short_desc="Open Source version of Transport Tycoon Deluxe"
-maintainer="Emil Tomczyk <emil.tomczyk@skni.umcs.pl>"
+maintainer="Emil Tomczyk <emru@emru.xyz>"
 license="GPL-2.0-only, Zlib"
 homepage="https://www.openttd.org/"
 distfiles="https://cdn.openttd.org/openttd-releases/${version}/openttd-${version}-source.tar.xz
  https://cdn.openttd.org/opengfx-releases/${_gfxver}/opengfx-${_gfxver}-all.zip
  https://cdn.openttd.org/opensfx-releases/${_sfxver}/opensfx-${_sfxver}-all.zip
  https://cdn.openttd.org/openmsx-releases/${_msxver}/openmsx-${_msxver}-all.zip"
-checksum="2a1deba01bfe58e2188879f450c3fa4f3819271ab49bf348dd66545f040d146f
+checksum="96f76ab858816a5e30038ade0692e6ebf350b9f70bf19c7b48dda845c88418b1
  928fcf34efd0719a3560cbab6821d71ce686b6315e8825360fba87a7a94d7846
  e0a218b7dd9438e701503b0f84c25a97c1c11b7c2f025323fb19d6db16ef3759
  5a4277a2e62d87f2952ea5020dc20fb2f6ffafdccf9913fbf35ad45ee30ec762"
diff --git a/srcpkgs/openttd/update b/srcpkgs/openttd/update
deleted file mode 100644
index 4303c0c21d179b..00000000000000
--- a/srcpkgs/openttd/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=http://binaries.openttd.org/releases/
-pattern='href="\K[\d]+\.[\d]+\.[\d]+(?=[^-])'

From 9fa616d39fbde327a996f2f0a25cfcb869e1bc1d Mon Sep 17 00:00:00 2001
From: Lolzen <funer@gmx.at>
Date: Sun, 14 Apr 2024 13:57:30 +0200
Subject: [PATCH 30/43] lutris: update to 0.5.17

---
 srcpkgs/lutris/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lutris/template b/srcpkgs/lutris/template
index 430d4c72ad2999..2938f7f75a933e 100644
--- a/srcpkgs/lutris/template
+++ b/srcpkgs/lutris/template
@@ -1,7 +1,7 @@
 # Template file for 'lutris'
 pkgname=lutris
-version=0.5.16
-revision=2
+version=0.5.17
+revision=1
 build_style=meson
 hostmakedepends="gettext python3-setuptools python3-gobject gtk+3-devel"
 depends="python3-dbus python3-gobject python3-yaml python3-evdev python3-Pillow
@@ -13,4 +13,4 @@ license="GPL-3.0-or-later"
 homepage="https://lutris.net"
 changelog="https://raw.githubusercontent.com/lutris/lutris/master/debian/changelog"
 distfiles="https://github.com/lutris/lutris/archive/v${version}.tar.gz"
-checksum=e6f39bba5a2c1eb942cb3d6583b6b25c304c130076a3bb803879e13561361a72
+checksum=e913d0c70bcb8c29839fcc2368f0b672bc1e70d1bc2bc18e6fd50ac785261aa8

From b47b1489ebcae2aaded87271d52ab9b8e5a31a78 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Mon, 22 Apr 2024 22:10:58 +0200
Subject: [PATCH 31/43] podman-compose: update to 1.1.0.

---
 srcpkgs/podman-compose/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/podman-compose/template b/srcpkgs/podman-compose/template
index eb6e7ffcc0f6d2..b3e7c6c70b6c5b 100644
--- a/srcpkgs/podman-compose/template
+++ b/srcpkgs/podman-compose/template
@@ -1,7 +1,7 @@
 # Template file for 'podman-compose'
 pkgname=podman-compose
-version=1.0.6
-revision=2
+version=1.1.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="podman python3-yaml python3-dotenv"
@@ -10,6 +10,6 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/containers/podman-compose"
 distfiles="https://github.com/containers/podman-compose/archive/v${version}.tar.gz"
-checksum=0b9ee7cc000ef5d0ce7f81ce2e306be56d1edb0f494a883ca25c4d163469b12b
+checksum=5e4af453d80b7389b3d80433de0df1c8da548d08a7f05062c699db3e26f3d2db
 # Source distribution does not script unit tests
 make_check=no

From cfa63c594f43d1dc01cac924139edf4f782cdbf6 Mon Sep 17 00:00:00 2001
From: anelki <akierig@fastmail.de>
Date: Sat, 20 Apr 2024 20:31:14 -0500
Subject: [PATCH 32/43] n: update to 9.2.3

---
 srcpkgs/n/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/n/template b/srcpkgs/n/template
index 4897850676cf99..3935ca10970a88 100644
--- a/srcpkgs/n/template
+++ b/srcpkgs/n/template
@@ -1,16 +1,16 @@
 # Template file for 'n'
 pkgname=n
-version=9.2.1
+version=9.2.3
 revision=1
 build_style=gnu-makefile
-depends="curl tar xz"
+depends="curl tar"
 short_desc="Simple command line NodeJS version management"
 maintainer="anelki <akierig@fastmail.de>"
 license="MIT"
 homepage="https://github.com/tj/n"
 changelog="https://raw.githubusercontent.com/tj/n/master/CHANGELOG.md"
 distfiles="https://github.com/tj/n/archive/refs/tags/v${version}.tar.gz"
-checksum=f112c291a1f441a14971ce5ee5dfb5f0a5d4251bd5f3ec556ef1c5a0687e3ee6
+checksum=c160fd30281d2aeb07d0101758f2f592dd3c6a23370417d9c6bf1efb5368a7dd
 
 do_install() {
 	vbin bin/n

From f344d066c326af00d9bd4c82c7e241d4f01d3c16 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Tue, 16 Apr 2024 17:31:05 +0200
Subject: [PATCH 33/43] neomutt: update to 20240416.

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 2980286404a251..eef2bf449b3a11 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,6 +1,6 @@
 # Template file for 'neomutt'
 pkgname=neomutt
-version=20240329
+version=20240416
 revision=1
 create_wrksrc=true
 build_wrksrc="${pkgname}-${version}"
@@ -22,7 +22,7 @@ homepage="https://neomutt.org/"
 _test_files_hash=00efc8388110208e77e6ed9d8294dfc333753d54
 distfiles="https://github.com/neomutt/neomutt/archive/${version}.tar.gz
  https://github.com/neomutt/neomutt-test-files/archive/${_test_files_hash}.tar.gz"
-checksum="241e354b4b5af846f00926f30c0a04e959997556d4cb409c4ff297f398cfc104
+checksum="d1b90308bf1fa4771f4ceb2c11e738620f6b18186149a24e006b5680ef3c64b6
  2865e258034a72e498fdd1810071d9ab7559297a5f67203ea163cfdc4192dea4"
 python_version=3
 

From 234de451d117d6637e03ed07e972630c84dbd3d8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 26 Apr 2024 14:49:52 +0200
Subject: [PATCH 34/43] libreadline8: update to 8.2.010.

---
 srcpkgs/libreadline8/template | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libreadline8/template b/srcpkgs/libreadline8/template
index 8517bf9854b2b1..015582f4fc3d3d 100644
--- a/srcpkgs/libreadline8/template
+++ b/srcpkgs/libreadline8/template
@@ -1,6 +1,6 @@
 # Template file for 'libreadline8'
 pkgname=libreadline8
-version=8.2.001
+version=8.2.010
 revision=1
 _dist_ver="${version%.*}"
 _patch_ver="${version##*.}"
@@ -15,10 +15,37 @@ license="GPL-3.0-or-later"
 homepage="https://tiswww.cwru.edu/php/chet/readline/rltop.html"
 changelog="https://tiswww.cwru.edu/php/chet/readline/NEWS"
 distfiles="${GNU_SITE}/readline/readline-${_dist_ver}.tar.gz
- ${GNU_SITE}/readline/readline-${_dist_ver}-patches/readline${_dist_ver/./}-001"
+ ${GNU_SITE}/readline/readline-${_dist_ver}-patches/readline${_dist_ver/./}-001
+ ${GNU_SITE}/readline/readline-${_dist_ver}-patches/readline${_dist_ver/./}-002
+ ${GNU_SITE}/readline/readline-${_dist_ver}-patches/readline${_dist_ver/./}-003
+ ${GNU_SITE}/readline/readline-${_dist_ver}-patches/readline${_dist_ver/./}-004
+ ${GNU_SITE}/readline/readline-${_dist_ver}-patches/readline${_dist_ver/./}-005
+ ${GNU_SITE}/readline/readline-${_dist_ver}-patches/readline${_dist_ver/./}-006
+ ${GNU_SITE}/readline/readline-${_dist_ver}-patches/readline${_dist_ver/./}-007
+ ${GNU_SITE}/readline/readline-${_dist_ver}-patches/readline${_dist_ver/./}-008
+ ${GNU_SITE}/readline/readline-${_dist_ver}-patches/readline${_dist_ver/./}-009
+ ${GNU_SITE}/readline/readline-${_dist_ver}-patches/readline${_dist_ver/./}-010"
 checksum="3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35
- bbf97f1ec40a929edab5aa81998c1e2ef435436c597754916e6a5868f273aff7"
-skip_extraction="readline${_dist_ver/./}-001"
+ bbf97f1ec40a929edab5aa81998c1e2ef435436c597754916e6a5868f273aff7
+ e06503822c62f7bc0d9f387d4c78c09e0ce56e53872011363c74786c7cd4c053
+ 24f587ba46b46ed2b1868ccaf9947504feba154bb8faabd4adaea63ef7e6acb0
+ 79572eeaeb82afdc6869d7ad4cba9d4f519b1218070e17fa90bbecd49bd525ac
+ 622ba387dae5c185afb4b9b20634804e5f6c1c6e5e87ebee7c35a8f065114c99
+ c7b45ff8c0d24d81482e6e0677e81563d13c74241f7b86c4de00d239bc81f5a1
+ 5911a5b980d7900aabdbee483f86dab7056851e6400efb002776a0a4a1bab6f6
+ a177edc9d8c9f82e8c19d0630ab351f3fd1b201d655a1ddb5d51c4cee197b26a
+ 3d9885e692e1998523fd5c61f558cecd2aafd67a07bd3bfe1d7ad5a31777a116
+ 758e2ec65a0c214cfe6161f5cde3c5af4377c67d820ea01d13de3ca165f67b4c"
+skip_extraction="readline${_dist_ver/./}-001
+ readline${_dist_ver/./}-002
+ readline${_dist_ver/./}-003
+ readline${_dist_ver/./}-004
+ readline${_dist_ver/./}-005
+ readline${_dist_ver/./}-006
+ readline${_dist_ver/./}-007
+ readline${_dist_ver/./}-008
+ readline${_dist_ver/./}-009
+ readline${_dist_ver/./}-010"
 
 post_patch() {
 	cd ${wrksrc}

From eba49f69158c0261acfd7fb0b4dc11ac65bfc19a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 26 Apr 2024 14:52:08 +0200
Subject: [PATCH 35/43] lnav: update to 0.12.2.

---
 srcpkgs/lnav/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index c207c8922692f2..19a596f8be7364 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,19 +1,19 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.12.1
+version=0.12.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake openssh zlib-devel"
 makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
  pcre2-devel readline-devel sqlite-devel zlib-devel"
-checkdepends="tar"
+checkdepends="python3 tar"
 short_desc="Log file navigator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/lnav/archive/v${version}.tar.gz"
-checksum=2a784df1a9d852b346348eddc94f8a91dd919665c81159e777bfb2ad3ab51f97
+checksum=9f12e17f9f2b2f1ddf00ef3f35f61ab3c9709ddf2beaa0eeaf441462e812ca7f
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"

From 10d53685c316faa3d01f2e033a08cf4b4aa2d2fc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 26 Apr 2024 09:20:14 -0400
Subject: [PATCH 36/43] python3-imageio: update to 2.34.1.

---
 srcpkgs/python3-imageio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template
index a63cc41a5c37ae..54945d856e949c 100644
--- a/srcpkgs/python3-imageio/template
+++ b/srcpkgs/python3-imageio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-imageio'
 pkgname=python3-imageio
-version=2.34.0
+version=2.34.1
 revision=1
 build_style=python3-module
 # tests have unpackaged dependencies, require network or missing data files
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/imageio/imageio"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=cbbdf00817f4e9244bdf72a9b5868ee0ef1985c305fa3f06ed917d15cc22927f
+checksum=02f42528d5322f676326a84264afe86110bbd13abe8593efaf91e3dbbb7c397a
 
 post_install() {
 	vlicense LICENSE

From bd4e0fef3e0e31856d5eb4dd35c216400c1d74f1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 26 Apr 2024 09:22:01 -0400
Subject: [PATCH 37/43] python3-ipython: update to 8.24.0.

---
 srcpkgs/python3-ipython/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index b10c3b1dba12c4..8e0136f454d699 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=8.23.0
+version=8.24.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools python3-wheel"
@@ -16,7 +16,7 @@ license="BSD-3-Clause"
 homepage="https://ipython.org/"
 changelog="https://github.com/ipython/ipython/raw/main/docs/source/whatsnew/version8.rst"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=7468edaf4f6de3e1b912e57f66c241e6fd3c7099f2ec2136e239e142e800274d
+checksum=010db3f8a728a578bb641fdd06c063b9fb8e96a9464c63aec6310fbcb5e80501
 conflicts="python-ipython<=5.8.0_2"
 make_check_pre="env PYTHONPATH=."
 

From dd5c0e55d1d4aec30385f335ef3aa3a85be9aed0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 26 Apr 2024 09:23:08 -0400
Subject: [PATCH 38/43] python3-pyproject-metadata: update to 0.8.0.

---
 srcpkgs/python3-pyproject-metadata/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-pyproject-metadata/template b/srcpkgs/python3-pyproject-metadata/template
index 6bea853aff87b7..15d8afa4ace18b 100644
--- a/srcpkgs/python3-pyproject-metadata/template
+++ b/srcpkgs/python3-pyproject-metadata/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyproject-metadata'
 pkgname=python3-pyproject-metadata
-version=0.7.1
-revision=2
+version=0.8.0
+revision=1
 build_style=python3-pep517
 hostmakedepends="python3-flit_core python3-wheel"
 depends="python3-packaging"
@@ -10,8 +10,8 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://pep621.readthedocs.io/"
 changelog="https://raw.githubusercontent.com/FFY00/python-pyproject-metadata/main/CHANGELOG.rst"
-distfiles="${PYPI_SITE}/p/pyproject-metadata/pyproject-metadata-${version}.tar.gz"
-checksum=0a94f18b108b9b21f3a26a3d541f056c34edcb17dc872a144a15618fed7aef67
+distfiles="${PYPI_SITE}/p/pyproject_metadata/pyproject_metadata-${version}.tar.gz"
+checksum=376d5a00764ac29440a54579f88e66b7d9cb7e629d35c35a1c7248bfebc9b455
 make_check=no # tarball includes no tests
 
 post_install() {

From c2e3414e403aeb720893d0f1e562b460517dacee Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 26 Apr 2024 09:23:49 -0400
Subject: [PATCH 39/43] python3-pytools: update to 2024.1.2.

---
 srcpkgs/python3-pytools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index 7c613529d2e536..bf004726f0043e 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2024.1.1
+version=2024.1.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=2c88edfa990c8e325167c37659fb1e10a3c1133dfaf752bbd7d8456402b8dcff
+checksum=081871e451505c4b986ebafa68aeeabfdc7beb3faa1baa50f726aebe21e1d057
 
 post_install() {
 	vlicense LICENSE

From f05693bebdbf45d1c5bb70630cb2618d8257d925 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 26 Apr 2024 09:24:03 -0400
Subject: [PATCH 40/43] python3-redis: update to 5.0.4.

---
 srcpkgs/python3-redis/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-redis/template b/srcpkgs/python3-redis/template
index b2e09cf4affa0a..2f565ecb8bc64e 100644
--- a/srcpkgs/python3-redis/template
+++ b/srcpkgs/python3-redis/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-redis'
 pkgname=python3-redis
-version=5.0.3
+version=5.0.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/redis/redis-py"
 changelog="https://raw.githubusercontent.com/redis/redis-py/master/CHANGES"
 distfiles="${PYPI_SITE}/r/redis/redis-${version}.tar.gz"
-checksum=4973bae7444c0fbed64a06b87446f79361cb7e4ec1538c022d696ed7a5015580
+checksum=ec31f2ed9675cc54c21ba854cfe0462e6faf1d83c8ce5944709db8a4700b9c61
 replaces="python3-aioredis<=2.0.1_1"
 make_check=no # tests require a running redis server
 

From 3b1f7c20022e404a4e9614e513e6227913896a63 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 26 Apr 2024 09:24:16 -0400
Subject: [PATCH 41/43] python3-tifffile: update to 2024.4.24.

---
 srcpkgs/python3-tifffile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index 478455cff29755..b2870eb2695ad1 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2024.4.18
+version=2024.4.24
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=8b8f954f8dd090c3446cb50c3f118b8542fe1d073bc72654d42236f36091d90c
+checksum=edad538d54e93f9650a66f318260d6273bcd4826aa6f1a5a33c50e8eb0010b35
 # Tests require unpackaged fsspec
 make_check=no
 

From 7588aaaace3ad2435a1c907a95227e7b3ac93aa8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 26 Apr 2024 09:24:36 -0400
Subject: [PATCH 42/43] wayland-protocols: update to 1.36.

---
 srcpkgs/wayland-protocols/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wayland-protocols/template b/srcpkgs/wayland-protocols/template
index f8387d20915848..5b52761bb30105 100644
--- a/srcpkgs/wayland-protocols/template
+++ b/srcpkgs/wayland-protocols/template
@@ -1,6 +1,6 @@
 # Template file for 'wayland-protocols'
 pkgname=wayland-protocols
-version=1.35
+version=1.36
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://wayland.freedesktop.org"
 distfiles="https://gitlab.freedesktop.org/wayland/wayland-protocols/-/archive/${version}/wayland-protocols-${version}.tar.gz"
-checksum=6e62dfa92ce82487d107b76064cfe2d7ca107c87c239ea9036a763d79c09105a
+checksum=c839dd4325565fd59a93d6cde17335357328f66983c2e1fb03c33e92d6918b17
 
 post_install() {
 	vlicense COPYING

From 64b96b5ed33bb572d4c48cb6138cca1321eaef48 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Sat, 13 Apr 2024 15:33:50 +0200
Subject: [PATCH 43/43] ngircd: update to 27.

---
 srcpkgs/ngircd/patches/0001-getpid-fix.patch  | 30 -------------
 .../ngircd/patches/0002-getpid-fix-2.patch    | 22 ----------
 ...when-setgid-setuid-fails-with-EINVAL.patch | 43 -------------------
 srcpkgs/ngircd/template                       |  2 +-
 4 files changed, 1 insertion(+), 96 deletions(-)
 delete mode 100644 srcpkgs/ngircd/patches/0001-getpid-fix.patch
 delete mode 100644 srcpkgs/ngircd/patches/0002-getpid-fix-2.patch
 delete mode 100644 srcpkgs/ngircd/patches/don-t-abort-startup-when-setgid-setuid-fails-with-EINVAL.patch

diff --git a/srcpkgs/ngircd/patches/0001-getpid-fix.patch b/srcpkgs/ngircd/patches/0001-getpid-fix.patch
deleted file mode 100644
index 4765604bea554f..00000000000000
--- a/srcpkgs/ngircd/patches/0001-getpid-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a33d15751b3e3910bd06125efbeae6569844f313 Mon Sep 17 00:00:00 2001
-From: Alexander Barton <alex@barton.de>
-Date: Sat, 13 Apr 2024 15:52:33 +0200
-Subject: [PATCH] Test suite: Don't use "pgrep -u" when LOGNAME and USER are
- not set
-
-Thanks for reporting this on IRC, luca!
----
- src/testsuite/getpid.sh | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/testsuite/getpid.sh b/src/testsuite/getpid.sh
-index 85059142..3cc186e1 100755
---- a/src/testsuite/getpid.sh
-+++ b/src/testsuite/getpid.sh
-@@ -23,7 +23,13 @@ if [ -x /usr/bin/pgrep ]; then
- 		*)
- 			PGREP_FLAGS=""
- 	esac
--	exec /usr/bin/pgrep $PGREP_FLAGS -n -u "${LOGNAME:-$USER}" "$1"
-+	if [ -n "$LOGNAME" ] || [ -n "$USER" ]; then
-+		# Try to narrow the search down to the current user ...
-+		exec /usr/bin/pgrep $PGREP_FLAGS -n -u "${LOGNAME:-$USER}" "$1"
-+	else
-+		# ... but neither LOGNAME nor USER were set!
-+		exec /usr/bin/pgrep $PGREP_FLAGS -n "$1"
-+	fi
- fi
- 
- # pidof(1) could be a good alternative on elder Linux systems
diff --git a/srcpkgs/ngircd/patches/0002-getpid-fix-2.patch b/srcpkgs/ngircd/patches/0002-getpid-fix-2.patch
deleted file mode 100644
index 8bbd59a37e354b..00000000000000
--- a/srcpkgs/ngircd/patches/0002-getpid-fix-2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From b77b9432c45d6f38c0ad6d9021afb4dd91f163e4 Mon Sep 17 00:00:00 2001
-From: Alexander Barton <alex@barton.de>
-Date: Sat, 13 Apr 2024 16:04:29 +0200
-Subject: [PATCH] Test suite: Correctly test for LOGNAME and USER
-
----
- src/testsuite/getpid.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/testsuite/getpid.sh b/src/testsuite/getpid.sh
-index 3cc186e1..7a3dbe37 100755
---- a/src/testsuite/getpid.sh
-+++ b/src/testsuite/getpid.sh
-@@ -23,7 +23,7 @@ if [ -x /usr/bin/pgrep ]; then
- 		*)
- 			PGREP_FLAGS=""
- 	esac
--	if [ -n "$LOGNAME" ] || [ -n "$USER" ]; then
-+	if [ -n "${LOGNAME:-}" ] || [ -n "${USER:-}" ]; then
- 		# Try to narrow the search down to the current user ...
- 		exec /usr/bin/pgrep $PGREP_FLAGS -n -u "${LOGNAME:-$USER}" "$1"
- 	else
diff --git a/srcpkgs/ngircd/patches/don-t-abort-startup-when-setgid-setuid-fails-with-EINVAL.patch b/srcpkgs/ngircd/patches/don-t-abort-startup-when-setgid-setuid-fails-with-EINVAL.patch
deleted file mode 100644
index 21100f74bc789c..00000000000000
--- a/srcpkgs/ngircd/patches/don-t-abort-startup-when-setgid-setuid-fails-with-EINVAL.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 6ec213cd8cf1e65d3c912f8f8eba663a2bf93fb5 Mon Sep 17 00:00:00 2001
-From: Alexander Barton <alex@barton.de>
-Date: Sat, 13 Apr 2024 19:43:54 +0200
-Subject: [PATCH] Don't abort startup when setgid/setuid() fails with EINVAL
-
-Both setgid(2) as well as setuid(2) can fail with EINVAL in addition to
-EPERM, their manual pages state "EINVAL: The user/group ID specified in
-uid/gid is not valid in this user namespace ".
-
-So not only treat EPERM as an "acceptable error" and continue with
-logging the error, but do the same for EINVAL.
-
-This was triggered by the Void Linux xbps-uunshare(1) tool used for
-building "XBPS source packages" and reported by luca in #ngircd. Thanks!
----
- src/ngircd/ngircd.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
-index b0610392..c2169c43 100644
---- a/src/ngircd/ngircd.c
-+++ b/src/ngircd/ngircd.c
-@@ -722,7 +722,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
- 			Log(LOG_ERR, "Can't change group ID to %s(%u): %s!",
- 			    grp ? grp->gr_name : "?", Conf_GID,
- 			    strerror(real_errno));
--			if (real_errno != EPERM)
-+			if (real_errno != EPERM && real_errno != EINVAL)
- 				goto out;
- 		}
- #ifdef HAVE_SETGROUPS
-@@ -748,7 +748,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
- 			Log(LOG_ERR, "Can't change user ID to %s(%u): %s!",
- 			    pwd ? pwd->pw_name : "?", Conf_UID,
- 			    strerror(real_errno));
--			if (real_errno != EPERM)
-+			if (real_errno != EPERM && real_errno != EINVAL)
- 				goto out;
- 		}
- 	}
--- 
-2.39.2
-
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 4a32f9d807d360..2a54af118a8442 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,6 +1,6 @@
 # Template file for 'ngircd'
 pkgname=ngircd
-version=27~rc1
+version=27
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes --with-pam --with-iconv"

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] ngircd: update to 27~rc1.
  2024-04-13 19:08 [PR PATCH] [WIP] ngircd: update to 27~rc1 AnInternetTroll
                   ` (3 preceding siblings ...)
  2024-04-26 15:31 ` AnInternetTroll
@ 2024-04-26 15:32 ` AnInternetTroll
  2024-04-26 15:33 ` AnInternetTroll
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: AnInternetTroll @ 2024-04-26 15:32 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by AnInternetTroll against master on the void-packages repository

https://github.com/AnInternetTroll/void-packages user/luca/ngircd
https://github.com/void-linux/void-packages/pull/49826

[WIP] ngircd: update to 27~rc1.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86\_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl

Crossbuilt on x86\_64-glibc for aarch64-musl and tested with a simple
unencrypted server. As far as features go, I only tested the default
with PAM disabled


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-user/luca/ngircd-49826.patch --]
[-- Type: text/x-diff, Size: 11734 bytes --]

From 4894fa3dc62c4df0b3dc2b1ad6bb9625cb5752a2 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Wed, 24 Apr 2024 18:46:16 +0200
Subject: [PATCH 1/2] ngircd: update to 27~rc1.

---
 srcpkgs/ngircd/patches/0001-getpid-fix.patch  | 30 +++++++++++++
 .../ngircd/patches/0002-getpid-fix-2.patch    | 22 ++++++++++
 ...when-setgid-setuid-fails-with-EINVAL.patch | 43 +++++++++++++++++++
 srcpkgs/ngircd/template                       | 12 +++---
 4 files changed, 102 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/ngircd/patches/0001-getpid-fix.patch
 create mode 100644 srcpkgs/ngircd/patches/0002-getpid-fix-2.patch
 create mode 100644 srcpkgs/ngircd/patches/don-t-abort-startup-when-setgid-setuid-fails-with-EINVAL.patch

diff --git a/srcpkgs/ngircd/patches/0001-getpid-fix.patch b/srcpkgs/ngircd/patches/0001-getpid-fix.patch
new file mode 100644
index 00000000000000..4765604bea554f
--- /dev/null
+++ b/srcpkgs/ngircd/patches/0001-getpid-fix.patch
@@ -0,0 +1,30 @@
+From a33d15751b3e3910bd06125efbeae6569844f313 Mon Sep 17 00:00:00 2001
+From: Alexander Barton <alex@barton.de>
+Date: Sat, 13 Apr 2024 15:52:33 +0200
+Subject: [PATCH] Test suite: Don't use "pgrep -u" when LOGNAME and USER are
+ not set
+
+Thanks for reporting this on IRC, luca!
+---
+ src/testsuite/getpid.sh | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/testsuite/getpid.sh b/src/testsuite/getpid.sh
+index 85059142..3cc186e1 100755
+--- a/src/testsuite/getpid.sh
++++ b/src/testsuite/getpid.sh
+@@ -23,7 +23,13 @@ if [ -x /usr/bin/pgrep ]; then
+ 		*)
+ 			PGREP_FLAGS=""
+ 	esac
+-	exec /usr/bin/pgrep $PGREP_FLAGS -n -u "${LOGNAME:-$USER}" "$1"
++	if [ -n "$LOGNAME" ] || [ -n "$USER" ]; then
++		# Try to narrow the search down to the current user ...
++		exec /usr/bin/pgrep $PGREP_FLAGS -n -u "${LOGNAME:-$USER}" "$1"
++	else
++		# ... but neither LOGNAME nor USER were set!
++		exec /usr/bin/pgrep $PGREP_FLAGS -n "$1"
++	fi
+ fi
+ 
+ # pidof(1) could be a good alternative on elder Linux systems
diff --git a/srcpkgs/ngircd/patches/0002-getpid-fix-2.patch b/srcpkgs/ngircd/patches/0002-getpid-fix-2.patch
new file mode 100644
index 00000000000000..8bbd59a37e354b
--- /dev/null
+++ b/srcpkgs/ngircd/patches/0002-getpid-fix-2.patch
@@ -0,0 +1,22 @@
+From b77b9432c45d6f38c0ad6d9021afb4dd91f163e4 Mon Sep 17 00:00:00 2001
+From: Alexander Barton <alex@barton.de>
+Date: Sat, 13 Apr 2024 16:04:29 +0200
+Subject: [PATCH] Test suite: Correctly test for LOGNAME and USER
+
+---
+ src/testsuite/getpid.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/testsuite/getpid.sh b/src/testsuite/getpid.sh
+index 3cc186e1..7a3dbe37 100755
+--- a/src/testsuite/getpid.sh
++++ b/src/testsuite/getpid.sh
+@@ -23,7 +23,7 @@ if [ -x /usr/bin/pgrep ]; then
+ 		*)
+ 			PGREP_FLAGS=""
+ 	esac
+-	if [ -n "$LOGNAME" ] || [ -n "$USER" ]; then
++	if [ -n "${LOGNAME:-}" ] || [ -n "${USER:-}" ]; then
+ 		# Try to narrow the search down to the current user ...
+ 		exec /usr/bin/pgrep $PGREP_FLAGS -n -u "${LOGNAME:-$USER}" "$1"
+ 	else
diff --git a/srcpkgs/ngircd/patches/don-t-abort-startup-when-setgid-setuid-fails-with-EINVAL.patch b/srcpkgs/ngircd/patches/don-t-abort-startup-when-setgid-setuid-fails-with-EINVAL.patch
new file mode 100644
index 00000000000000..21100f74bc789c
--- /dev/null
+++ b/srcpkgs/ngircd/patches/don-t-abort-startup-when-setgid-setuid-fails-with-EINVAL.patch
@@ -0,0 +1,43 @@
+From 6ec213cd8cf1e65d3c912f8f8eba663a2bf93fb5 Mon Sep 17 00:00:00 2001
+From: Alexander Barton <alex@barton.de>
+Date: Sat, 13 Apr 2024 19:43:54 +0200
+Subject: [PATCH] Don't abort startup when setgid/setuid() fails with EINVAL
+
+Both setgid(2) as well as setuid(2) can fail with EINVAL in addition to
+EPERM, their manual pages state "EINVAL: The user/group ID specified in
+uid/gid is not valid in this user namespace ".
+
+So not only treat EPERM as an "acceptable error" and continue with
+logging the error, but do the same for EINVAL.
+
+This was triggered by the Void Linux xbps-uunshare(1) tool used for
+building "XBPS source packages" and reported by luca in #ngircd. Thanks!
+---
+ src/ngircd/ngircd.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
+index b0610392..c2169c43 100644
+--- a/src/ngircd/ngircd.c
++++ b/src/ngircd/ngircd.c
+@@ -722,7 +722,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
+ 			Log(LOG_ERR, "Can't change group ID to %s(%u): %s!",
+ 			    grp ? grp->gr_name : "?", Conf_GID,
+ 			    strerror(real_errno));
+-			if (real_errno != EPERM)
++			if (real_errno != EPERM && real_errno != EINVAL)
+ 				goto out;
+ 		}
+ #ifdef HAVE_SETGROUPS
+@@ -748,7 +748,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
+ 			Log(LOG_ERR, "Can't change user ID to %s(%u): %s!",
+ 			    pwd ? pwd->pw_name : "?", Conf_UID,
+ 			    strerror(real_errno));
+-			if (real_errno != EPERM)
++			if (real_errno != EPERM && real_errno != EINVAL)
+ 				goto out;
+ 		}
+ 	}
+-- 
+2.39.2
+
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 66c09814f049ef..4a32f9d807d360 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,18 +1,20 @@
 # Template file for 'ngircd'
 pkgname=ngircd
-version=26
-revision=4
+version=27~rc1
+revision=1
 build_style=gnu-configure
-configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
+configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes --with-pam --with-iconv"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel openssl-devel"
+makedepends="zlib-devel openssl-devel pam-devel libticonv-devel"
+checkdepends="procps-ng expect inetutils-telnet"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://ngircd.barton.de/"
 distfiles="https://ngircd.barton.de/pub/ngircd/ngircd-${version}.tar.xz"
-checksum=56dcc6483058699fcdd8e54f5010eecee09824b93bad7ed5f18818e550d855c6
+checksum=ef04b85e99ffda2bdf73a823848f04a1d5aa4f288beb631dae2dcc0d34e5c665
+make_check="ci-skip" # Stopping the integration test servers fails in CI
 
 post_configure() {
 	echo "#define HAVE_WORKING_GETADDRINFO 1" >>src/config.h

From a9a9fcd9d51bb2a56f4f16408fe633ead1e1c3e9 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Sat, 13 Apr 2024 15:33:50 +0200
Subject: [PATCH 2/2] ngircd: update to 27.

---
 srcpkgs/ngircd/patches/0001-getpid-fix.patch  | 30 -------------
 .../ngircd/patches/0002-getpid-fix-2.patch    | 22 ----------
 ...when-setgid-setuid-fails-with-EINVAL.patch | 43 -------------------
 srcpkgs/ngircd/template                       |  2 +-
 4 files changed, 1 insertion(+), 96 deletions(-)
 delete mode 100644 srcpkgs/ngircd/patches/0001-getpid-fix.patch
 delete mode 100644 srcpkgs/ngircd/patches/0002-getpid-fix-2.patch
 delete mode 100644 srcpkgs/ngircd/patches/don-t-abort-startup-when-setgid-setuid-fails-with-EINVAL.patch

diff --git a/srcpkgs/ngircd/patches/0001-getpid-fix.patch b/srcpkgs/ngircd/patches/0001-getpid-fix.patch
deleted file mode 100644
index 4765604bea554f..00000000000000
--- a/srcpkgs/ngircd/patches/0001-getpid-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a33d15751b3e3910bd06125efbeae6569844f313 Mon Sep 17 00:00:00 2001
-From: Alexander Barton <alex@barton.de>
-Date: Sat, 13 Apr 2024 15:52:33 +0200
-Subject: [PATCH] Test suite: Don't use "pgrep -u" when LOGNAME and USER are
- not set
-
-Thanks for reporting this on IRC, luca!
----
- src/testsuite/getpid.sh | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/testsuite/getpid.sh b/src/testsuite/getpid.sh
-index 85059142..3cc186e1 100755
---- a/src/testsuite/getpid.sh
-+++ b/src/testsuite/getpid.sh
-@@ -23,7 +23,13 @@ if [ -x /usr/bin/pgrep ]; then
- 		*)
- 			PGREP_FLAGS=""
- 	esac
--	exec /usr/bin/pgrep $PGREP_FLAGS -n -u "${LOGNAME:-$USER}" "$1"
-+	if [ -n "$LOGNAME" ] || [ -n "$USER" ]; then
-+		# Try to narrow the search down to the current user ...
-+		exec /usr/bin/pgrep $PGREP_FLAGS -n -u "${LOGNAME:-$USER}" "$1"
-+	else
-+		# ... but neither LOGNAME nor USER were set!
-+		exec /usr/bin/pgrep $PGREP_FLAGS -n "$1"
-+	fi
- fi
- 
- # pidof(1) could be a good alternative on elder Linux systems
diff --git a/srcpkgs/ngircd/patches/0002-getpid-fix-2.patch b/srcpkgs/ngircd/patches/0002-getpid-fix-2.patch
deleted file mode 100644
index 8bbd59a37e354b..00000000000000
--- a/srcpkgs/ngircd/patches/0002-getpid-fix-2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From b77b9432c45d6f38c0ad6d9021afb4dd91f163e4 Mon Sep 17 00:00:00 2001
-From: Alexander Barton <alex@barton.de>
-Date: Sat, 13 Apr 2024 16:04:29 +0200
-Subject: [PATCH] Test suite: Correctly test for LOGNAME and USER
-
----
- src/testsuite/getpid.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/testsuite/getpid.sh b/src/testsuite/getpid.sh
-index 3cc186e1..7a3dbe37 100755
---- a/src/testsuite/getpid.sh
-+++ b/src/testsuite/getpid.sh
-@@ -23,7 +23,7 @@ if [ -x /usr/bin/pgrep ]; then
- 		*)
- 			PGREP_FLAGS=""
- 	esac
--	if [ -n "$LOGNAME" ] || [ -n "$USER" ]; then
-+	if [ -n "${LOGNAME:-}" ] || [ -n "${USER:-}" ]; then
- 		# Try to narrow the search down to the current user ...
- 		exec /usr/bin/pgrep $PGREP_FLAGS -n -u "${LOGNAME:-$USER}" "$1"
- 	else
diff --git a/srcpkgs/ngircd/patches/don-t-abort-startup-when-setgid-setuid-fails-with-EINVAL.patch b/srcpkgs/ngircd/patches/don-t-abort-startup-when-setgid-setuid-fails-with-EINVAL.patch
deleted file mode 100644
index 21100f74bc789c..00000000000000
--- a/srcpkgs/ngircd/patches/don-t-abort-startup-when-setgid-setuid-fails-with-EINVAL.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 6ec213cd8cf1e65d3c912f8f8eba663a2bf93fb5 Mon Sep 17 00:00:00 2001
-From: Alexander Barton <alex@barton.de>
-Date: Sat, 13 Apr 2024 19:43:54 +0200
-Subject: [PATCH] Don't abort startup when setgid/setuid() fails with EINVAL
-
-Both setgid(2) as well as setuid(2) can fail with EINVAL in addition to
-EPERM, their manual pages state "EINVAL: The user/group ID specified in
-uid/gid is not valid in this user namespace ".
-
-So not only treat EPERM as an "acceptable error" and continue with
-logging the error, but do the same for EINVAL.
-
-This was triggered by the Void Linux xbps-uunshare(1) tool used for
-building "XBPS source packages" and reported by luca in #ngircd. Thanks!
----
- src/ngircd/ngircd.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
-index b0610392..c2169c43 100644
---- a/src/ngircd/ngircd.c
-+++ b/src/ngircd/ngircd.c
-@@ -722,7 +722,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
- 			Log(LOG_ERR, "Can't change group ID to %s(%u): %s!",
- 			    grp ? grp->gr_name : "?", Conf_GID,
- 			    strerror(real_errno));
--			if (real_errno != EPERM)
-+			if (real_errno != EPERM && real_errno != EINVAL)
- 				goto out;
- 		}
- #ifdef HAVE_SETGROUPS
-@@ -748,7 +748,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
- 			Log(LOG_ERR, "Can't change user ID to %s(%u): %s!",
- 			    pwd ? pwd->pw_name : "?", Conf_UID,
- 			    strerror(real_errno));
--			if (real_errno != EPERM)
-+			if (real_errno != EPERM && real_errno != EINVAL)
- 				goto out;
- 		}
- 	}
--- 
-2.39.2
-
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 4a32f9d807d360..2a54af118a8442 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,6 +1,6 @@
 # Template file for 'ngircd'
 pkgname=ngircd
-version=27~rc1
+version=27
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes --with-pam --with-iconv"

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] ngircd: update to 27~rc1.
  2024-04-13 19:08 [PR PATCH] [WIP] ngircd: update to 27~rc1 AnInternetTroll
                   ` (4 preceding siblings ...)
  2024-04-26 15:32 ` AnInternetTroll
@ 2024-04-26 15:33 ` AnInternetTroll
  2024-04-26 16:32 ` [PR PATCH] [Updated] ngircd: update to 27 AnInternetTroll
                   ` (4 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: AnInternetTroll @ 2024-04-26 15:33 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by AnInternetTroll against master on the void-packages repository

https://github.com/AnInternetTroll/void-packages user/luca/ngircd
https://github.com/void-linux/void-packages/pull/49826

[WIP] ngircd: update to 27~rc1.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86\_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl

Crossbuilt on x86\_64-glibc for aarch64-musl and tested with a simple
unencrypted server. As far as features go, I only tested the default
with PAM disabled


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-user/luca/ngircd-49826.patch --]
[-- Type: text/x-diff, Size: 1582 bytes --]

From 5a9396ed9ffa282524d873a820bb8f212234cea4 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Wed, 24 Apr 2024 18:46:16 +0200
Subject: [PATCH] ngircd: update to 27.

---
 srcpkgs/ngircd/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 66c09814f049ef..2a54af118a8442 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,18 +1,20 @@
 # Template file for 'ngircd'
 pkgname=ngircd
-version=26
-revision=4
+version=27
+revision=1
 build_style=gnu-configure
-configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
+configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes --with-pam --with-iconv"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel openssl-devel"
+makedepends="zlib-devel openssl-devel pam-devel libticonv-devel"
+checkdepends="procps-ng expect inetutils-telnet"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://ngircd.barton.de/"
 distfiles="https://ngircd.barton.de/pub/ngircd/ngircd-${version}.tar.xz"
-checksum=56dcc6483058699fcdd8e54f5010eecee09824b93bad7ed5f18818e550d855c6
+checksum=ef04b85e99ffda2bdf73a823848f04a1d5aa4f288beb631dae2dcc0d34e5c665
+make_check="ci-skip" # Stopping the integration test servers fails in CI
 
 post_configure() {
 	echo "#define HAVE_WORKING_GETADDRINFO 1" >>src/config.h

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] ngircd: update to 27.
  2024-04-13 19:08 [PR PATCH] [WIP] ngircd: update to 27~rc1 AnInternetTroll
                   ` (5 preceding siblings ...)
  2024-04-26 15:33 ` AnInternetTroll
@ 2024-04-26 16:32 ` AnInternetTroll
  2024-04-26 18:15 ` AnInternetTroll
                   ` (3 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: AnInternetTroll @ 2024-04-26 16:32 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by AnInternetTroll against master on the void-packages repository

https://github.com/AnInternetTroll/void-packages user/luca/ngircd
https://github.com/void-linux/void-packages/pull/49826

ngircd: update to 27.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86\_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl

Crossbuilt on x86\_64-glibc for aarch64-musl and tested with a simple
unencrypted server. As far as features go, I only tested the default
with PAM disabled


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-user/luca/ngircd-49826.patch --]
[-- Type: text/x-diff, Size: 1582 bytes --]

From 317e0e8902c91e2535f0d625788e779d4aea20fd Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Wed, 24 Apr 2024 18:46:16 +0200
Subject: [PATCH] ngircd: update to 27.

---
 srcpkgs/ngircd/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 66c09814f049ef..d5c6143b0f4337 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,18 +1,20 @@
 # Template file for 'ngircd'
 pkgname=ngircd
-version=26
-revision=4
+version=27
+revision=1
 build_style=gnu-configure
-configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
+configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes --with-pam --with-iconv"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel openssl-devel"
+makedepends="zlib-devel openssl-devel pam-devel libticonv-devel"
+checkdepends="procps-ng expect inetutils-telnet"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://ngircd.barton.de/"
 distfiles="https://ngircd.barton.de/pub/ngircd/ngircd-${version}.tar.xz"
-checksum=56dcc6483058699fcdd8e54f5010eecee09824b93bad7ed5f18818e550d855c6
+checksum=6897880319dd5e2e73c1c9019613509f88eb5b8daa5821a36fbca3d785c247b8
+make_check="ci-skip" # Stopping the integration test servers fails in CI
 
 post_configure() {
 	echo "#define HAVE_WORKING_GETADDRINFO 1" >>src/config.h

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] ngircd: update to 27.
  2024-04-13 19:08 [PR PATCH] [WIP] ngircd: update to 27~rc1 AnInternetTroll
                   ` (6 preceding siblings ...)
  2024-04-26 16:32 ` [PR PATCH] [Updated] ngircd: update to 27 AnInternetTroll
@ 2024-04-26 18:15 ` AnInternetTroll
  2024-04-26 18:25 ` AnInternetTroll
                   ` (2 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: AnInternetTroll @ 2024-04-26 18:15 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by AnInternetTroll against master on the void-packages repository

https://github.com/AnInternetTroll/void-packages user/luca/ngircd
https://github.com/void-linux/void-packages/pull/49826

ngircd: update to 27.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86\_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl

Crossbuilt on x86\_64-glibc for aarch64-musl and tested with a simple
unencrypted server. As far as features go, I only tested the default
with PAM disabled


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-user/luca/ngircd-49826.patch --]
[-- Type: text/x-diff, Size: 1584 bytes --]

From c9e761917272c3768b05d320f707cb835aceeb0d Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Wed, 24 Apr 2024 18:46:16 +0200
Subject: [PATCH] ngircd: update to 27.

---
 srcpkgs/ngircd/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 66c09814f049ef..f0126824844f35 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,18 +1,20 @@
 # Template file for 'ngircd'
 pkgname=ngircd
-version=26
-revision=4
+version=27
+revision=1
 build_style=gnu-configure
-configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
+configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes --with-pam --with-iconv"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel openssl-devel"
+makedepends="zlib-devel openssl-devel pam-devel libticonv-devel"
+checkdepends="procps-ng expect inetutils-telnet"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://ngircd.barton.de/"
 distfiles="https://ngircd.barton.de/pub/ngircd/ngircd-${version}.tar.xz"
-checksum=56dcc6483058699fcdd8e54f5010eecee09824b93bad7ed5f18818e550d855c6
+checksum=6897880319dd5e2e73c1c9019613509f88eb5b8daa5821a36fbca3d785c247b8
+# make_check="ci-skip" # Stopping the integration test servers fails in CI
 
 post_configure() {
 	echo "#define HAVE_WORKING_GETADDRINFO 1" >>src/config.h

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] ngircd: update to 27.
  2024-04-13 19:08 [PR PATCH] [WIP] ngircd: update to 27~rc1 AnInternetTroll
                   ` (7 preceding siblings ...)
  2024-04-26 18:15 ` AnInternetTroll
@ 2024-04-26 18:25 ` AnInternetTroll
  2024-05-01 14:33 ` AnInternetTroll
  2024-05-01 19:50 ` AnInternetTroll
  10 siblings, 0 replies; 12+ messages in thread
From: AnInternetTroll @ 2024-04-26 18:25 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by AnInternetTroll against master on the void-packages repository

https://github.com/AnInternetTroll/void-packages user/luca/ngircd
https://github.com/void-linux/void-packages/pull/49826

ngircd: update to 27.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86\_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl

Crossbuilt on x86\_64-glibc for aarch64-musl and tested with a simple
unencrypted server. As far as features go, I only tested the default
with PAM disabled


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-user/luca/ngircd-49826.patch --]
[-- Type: text/x-diff, Size: 2212 bytes --]

From ba80b2aa55c1ae8875d3e66b8ce188d500e33133 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Wed, 24 Apr 2024 18:46:16 +0200
Subject: [PATCH] ngircd: update to 27.

---
 srcpkgs/ngircd/patches/debug.diff | 12 ++++++++++++
 srcpkgs/ngircd/template           | 12 +++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/ngircd/patches/debug.diff

diff --git a/srcpkgs/ngircd/patches/debug.diff b/srcpkgs/ngircd/patches/debug.diff
new file mode 100644
index 00000000000000..67cd6e36dea37d
--- /dev/null
+++ b/srcpkgs/ngircd/patches/debug.diff
@@ -0,0 +1,12 @@
+diff --git a/src/testsuite/stop-server.sh b/src/testsuite/stop-server.sh
+index c5a9486c..5a996079 100755
+--- a/src/testsuite/stop-server.sh
++++ b/src/testsuite/stop-server.sh
+@@ -1,5 +1,6 @@
+ #!/bin/sh
+ # ngIRCd Test Suite
++set -x
+ 
+ [ -z "$srcdir" ] && srcdir=`dirname "$0"`
+ set -u
+
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 66c09814f049ef..f0126824844f35 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,18 +1,20 @@
 # Template file for 'ngircd'
 pkgname=ngircd
-version=26
-revision=4
+version=27
+revision=1
 build_style=gnu-configure
-configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
+configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes --with-pam --with-iconv"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel openssl-devel"
+makedepends="zlib-devel openssl-devel pam-devel libticonv-devel"
+checkdepends="procps-ng expect inetutils-telnet"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://ngircd.barton.de/"
 distfiles="https://ngircd.barton.de/pub/ngircd/ngircd-${version}.tar.xz"
-checksum=56dcc6483058699fcdd8e54f5010eecee09824b93bad7ed5f18818e550d855c6
+checksum=6897880319dd5e2e73c1c9019613509f88eb5b8daa5821a36fbca3d785c247b8
+# make_check="ci-skip" # Stopping the integration test servers fails in CI
 
 post_configure() {
 	echo "#define HAVE_WORKING_GETADDRINFO 1" >>src/config.h

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] ngircd: update to 27.
  2024-04-13 19:08 [PR PATCH] [WIP] ngircd: update to 27~rc1 AnInternetTroll
                   ` (8 preceding siblings ...)
  2024-04-26 18:25 ` AnInternetTroll
@ 2024-05-01 14:33 ` AnInternetTroll
  2024-05-01 19:50 ` AnInternetTroll
  10 siblings, 0 replies; 12+ messages in thread
From: AnInternetTroll @ 2024-05-01 14:33 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by AnInternetTroll against master on the void-packages repository

https://github.com/AnInternetTroll/void-packages user/luca/ngircd
https://github.com/void-linux/void-packages/pull/49826

ngircd: update to 27.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86\_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl

Crossbuilt on x86\_64-glibc for aarch64-musl and tested with a simple
unencrypted server. As far as features go, I only tested the default
with PAM disabled


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-user/luca/ngircd-49826.patch --]
[-- Type: text/x-diff, Size: 2455 bytes --]

From 317e0e8902c91e2535f0d625788e779d4aea20fd Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Wed, 24 Apr 2024 18:46:16 +0200
Subject: [PATCH 1/2] ngircd: update to 27.

---
 srcpkgs/ngircd/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 66c09814f049ef..d5c6143b0f4337 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,18 +1,20 @@
 # Template file for 'ngircd'
 pkgname=ngircd
-version=26
-revision=4
+version=27
+revision=1
 build_style=gnu-configure
-configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
+configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes --with-pam --with-iconv"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel openssl-devel"
+makedepends="zlib-devel openssl-devel pam-devel libticonv-devel"
+checkdepends="procps-ng expect inetutils-telnet"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://ngircd.barton.de/"
 distfiles="https://ngircd.barton.de/pub/ngircd/ngircd-${version}.tar.xz"
-checksum=56dcc6483058699fcdd8e54f5010eecee09824b93bad7ed5f18818e550d855c6
+checksum=6897880319dd5e2e73c1c9019613509f88eb5b8daa5821a36fbca3d785c247b8
+make_check="ci-skip" # Stopping the integration test servers fails in CI
 
 post_configure() {
 	echo "#define HAVE_WORKING_GETADDRINFO 1" >>src/config.h

From 36313f7474006eb2cb22b29539e1b789ebc36b57 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Wed, 24 Apr 2024 18:46:16 +0200
Subject: [PATCH 2/2] ngircd: update to 27.

---
 srcpkgs/ngircd/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index d5c6143b0f4337..55195cb0774dfd 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -15,6 +15,7 @@ homepage="http://ngircd.barton.de/"
 distfiles="https://ngircd.barton.de/pub/ngircd/ngircd-${version}.tar.xz"
 checksum=6897880319dd5e2e73c1c9019613509f88eb5b8daa5821a36fbca3d785c247b8
 make_check="ci-skip" # Stopping the integration test servers fails in CI
+checksum=6897880319dd5e2e73c1c9019613509f88eb5b8daa5821a36fbca3d785c247b8
 
 post_configure() {
 	echo "#define HAVE_WORKING_GETADDRINFO 1" >>src/config.h

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] ngircd: update to 27.
  2024-04-13 19:08 [PR PATCH] [WIP] ngircd: update to 27~rc1 AnInternetTroll
                   ` (9 preceding siblings ...)
  2024-05-01 14:33 ` AnInternetTroll
@ 2024-05-01 19:50 ` AnInternetTroll
  10 siblings, 0 replies; 12+ messages in thread
From: AnInternetTroll @ 2024-05-01 19:50 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by AnInternetTroll against master on the void-packages repository

https://github.com/AnInternetTroll/void-packages user/luca/ngircd
https://github.com/void-linux/void-packages/pull/49826

ngircd: update to 27.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86\_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl

Crossbuilt on x86\_64-glibc for aarch64-musl and tested with a simple
unencrypted server. As far as features go, I only tested the default
with PAM disabled


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-user/luca/ngircd-49826.patch --]
[-- Type: text/x-diff, Size: 2424 bytes --]

From 317e0e8902c91e2535f0d625788e779d4aea20fd Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Wed, 24 Apr 2024 18:46:16 +0200
Subject: [PATCH 1/2] ngircd: update to 27.

---
 srcpkgs/ngircd/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 66c09814f049ef..d5c6143b0f4337 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,18 +1,20 @@
 # Template file for 'ngircd'
 pkgname=ngircd
-version=26
-revision=4
+version=27
+revision=1
 build_style=gnu-configure
-configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
+configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes --with-pam --with-iconv"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel openssl-devel"
+makedepends="zlib-devel openssl-devel pam-devel libticonv-devel"
+checkdepends="procps-ng expect inetutils-telnet"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://ngircd.barton.de/"
 distfiles="https://ngircd.barton.de/pub/ngircd/ngircd-${version}.tar.xz"
-checksum=56dcc6483058699fcdd8e54f5010eecee09824b93bad7ed5f18818e550d855c6
+checksum=6897880319dd5e2e73c1c9019613509f88eb5b8daa5821a36fbca3d785c247b8
+make_check="ci-skip" # Stopping the integration test servers fails in CI
 
 post_configure() {
 	echo "#define HAVE_WORKING_GETADDRINFO 1" >>src/config.h

From 385ad81d9d77abd9e0e2a7edf10d57b9e1d16dd8 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Wed, 24 Apr 2024 18:46:16 +0200
Subject: [PATCH 2/2] ngircd: update to 27.

---
 srcpkgs/ngircd/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index d5c6143b0f4337..9adf71b532cfd9 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -14,6 +14,7 @@ license="GPL-2.0-or-later"
 homepage="http://ngircd.barton.de/"
 distfiles="https://ngircd.barton.de/pub/ngircd/ngircd-${version}.tar.xz"
 checksum=6897880319dd5e2e73c1c9019613509f88eb5b8daa5821a36fbca3d785c247b8
+checksum=6897880319dd5e2e73c1c9019613509f88eb5b8daa5821a36fbca3d785c247b8
 make_check="ci-skip" # Stopping the integration test servers fails in CI
 
 post_configure() {

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2024-05-01 19:50 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-13 19:08 [PR PATCH] [WIP] ngircd: update to 27~rc1 AnInternetTroll
2024-04-13 19:08 ` [PR PATCH] [Updated] " AnInternetTroll
2024-04-16 19:34 ` AnInternetTroll
2024-04-24 16:46 ` AnInternetTroll
2024-04-26 15:31 ` AnInternetTroll
2024-04-26 15:32 ` AnInternetTroll
2024-04-26 15:33 ` AnInternetTroll
2024-04-26 16:32 ` [PR PATCH] [Updated] ngircd: update to 27 AnInternetTroll
2024-04-26 18:15 ` AnInternetTroll
2024-04-26 18:25 ` AnInternetTroll
2024-05-01 14:33 ` AnInternetTroll
2024-05-01 19:50 ` AnInternetTroll

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).