apteryx pushed a commit to branch master
in repository guix.
commit 35ad8f7a9243fc8b5f4d93e5f35ed7b385fd56f5
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Fri Mar 28 20:56:54 2025 +0900
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
---
gnu/local.mk | 1 -
gnu/packages/messaging.scm | 5 ++--
gnu/packages/patches/ngircd-handle-zombies.patch | 36 ------------------------
3 files changed, 2 insertions(+), 40 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 49081073e3..f03fcb14fc 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -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 \
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 57f4894ca7..6e6223d1b9 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -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))
diff --git a/gnu/packages/patches/ngircd-handle-zombies.patch
b/gnu/packages/patches/ngircd-handle-zombies.patch
deleted file mode 100644
index 99475ba096..0000000000
--- a/gnu/packages/patches/ngircd-handle-zombies.patch
+++ /dev/null
@@ -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
