gnu: ngircd: Update to 27.

* gnu/packages/messaging.scm (ngircd): Update to 27.
[source]: Delete patches field.
* gnu/packages/patches/ngircd-handle-zombies.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.

Change-Id: I3360ddd0e737a0b57323967f0572ab367d94d559
This commit is contained in:
Maxim Cournoyer 2025-03-28 20:56:54 +09:00
parent 0a57acf4d5
commit 35ad8f7a92
No known key found for this signature in database
GPG key ID: 1260E46482E63562
3 changed files with 2 additions and 40 deletions

View file

@ -1906,7 +1906,6 @@ dist_patch_DATA = \
%D%/packages/patches/nhc98-c-update.patch \
%D%/packages/patches/nix-dont-build-html-doc.diff \
%D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch \
%D%/packages/patches/ngircd-handle-zombies.patch \
%D%/packages/patches/network-manager-plugin-path.patch \
%D%/packages/patches/newlib-getentropy.patch \
%D%/packages/patches/nginx-socket-cloexec.patch \

View file

@ -892,15 +892,14 @@ dictionaries. HexChat can be extended with multiple addons.")
(define-public ngircd
(package
(name "ngircd")
(version "26.1")
(version "27")
(source (origin
(method url-fetch)
(uri (string-append "https://arthur.barton.de/pub/ngircd/ngircd-"
version ".tar.xz"))
(sha256
(base32
"0m32v0c7mq96rshws4h6d0pi4bm0hynfzx3x01mgrxh9c396zham"))
(patches (search-patches "ngircd-handle-zombies.patch"))))
"1f27qa2xg8xwdyij2n5aimdyp24za09rc0f9q5rjwpnx341qi5v8"))))
(build-system gnu-build-system)
;; Needed for the test suite.
(native-inputs (list procps expect inetutils openssl))

View file

@ -1,36 +0,0 @@
The Guile process taking the role of PID 1 during Guix builds does not reap
zombie processes, which makes them continue responding to "kill -0".
--- a/src/testsuite/stop-server.sh 2015-02-05 11:24:00.535908842 +0100
+++ b/src/testsuite/stop-server.sh 2015-02-05 11:25:00.264351349 +0100
@@ -1,6 +1,21 @@
#!/bin/sh
# ngIRCd Test Suite
+process_is_alive(){
+ ! process_is_dead "$1" && ! process_is_undead "$1"
+}
+
+process_is_dead(){
+ ! kill -0 "$1"
+}
+
+process_is_undead(){
+ case $(ps -p "$1" -o state=) in
+ (Z*) true ;;
+ (*) false ;;
+ esac
+}
+
[ -z "$srcdir" ] && srcdir=`dirname $0`
# read in functions
@@ -24,7 +40,7 @@
# waiting ...
for i in 1 2 3 4 5; do
- kill -0 $pid > /dev/null 2>&1; r=$?
+ process_is_alive $pid > /dev/null 2>&1; r=$?
if [ $r -ne 0 ]; then
echo " ok".
exit 0