CVS commit: pkgsrc/sysutils/dinit

["Emile iMil Heitor" <imil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   imil
Date:           Wed Jan 29 05:13:03 UTC 2025

Modified Files:
        pkgsrc/sysutils/dinit: Makefile PLIST distinfo
Added Files:
        pkgsrc/sysutils/dinit/patches: patch-src_shutdown.cc

Log Message:
Enable and implement shutdown capability


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/dinit/Makefile \
    pkgsrc/sysutils/dinit/PLIST pkgsrc/sysutils/dinit/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/dinit/patches/patch-src_shutdown.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/dinit/Makefile
diff -u pkgsrc/sysutils/dinit/Makefile:1.1 pkgsrc/sysutils/dinit/Makefile:1.2
--- pkgsrc/sysutils/dinit/Makefile:1.1  Tue Jan 28 06:26:33 2025
+++ pkgsrc/sysutils/dinit/Makefile      Wed Jan 29 05:13:03 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2025/01/28 06:26:33 imil Exp $
+# $NetBSD: Makefile,v 1.2 2025/01/29 05:13:03 imil Exp $
 
 DISTNAME=      dinit-0.19.3
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=davmac314/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -15,5 +16,6 @@ USE_TOOLS+=           gmake
 HAS_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --exec-prefix=${PREFIX}
 CONFIGURE_ARGS+=       --mandir=${PREFIX}/${PKGMANDIR}
+CONFIGURE_ARGS+=       --enable-shutdown
 
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/dinit/PLIST
diff -u pkgsrc/sysutils/dinit/PLIST:1.1 pkgsrc/sysutils/dinit/PLIST:1.2
--- pkgsrc/sysutils/dinit/PLIST:1.1     Tue Jan 28 06:26:33 2025
+++ pkgsrc/sysutils/dinit/PLIST Wed Jan 29 05:13:03 2025
@@ -1,10 +1,20 @@
-@comment $NetBSD: PLIST,v 1.1 2025/01/28 06:26:33 imil Exp $
+@comment $NetBSD: PLIST,v 1.2 2025/01/29 05:13:03 imil Exp $
 man/man5/dinit-service.5
 man/man8/dinit-monitor.8
 man/man8/dinit.8
 man/man8/dinitcheck.8
 man/man8/dinitctl.8
+man/man8/halt.8
+man/man8/poweroff.8
+man/man8/reboot.8
+man/man8/shutdown.8
+man/man8/soft-reboot.8
 sbin/dinit
 sbin/dinit-monitor
 sbin/dinitcheck
 sbin/dinitctl
+sbin/halt
+sbin/poweroff
+sbin/reboot
+sbin/shutdown
+sbin/soft-reboot
Index: pkgsrc/sysutils/dinit/distinfo
diff -u pkgsrc/sysutils/dinit/distinfo:1.1 pkgsrc/sysutils/dinit/distinfo:1.2
--- pkgsrc/sysutils/dinit/distinfo:1.1  Tue Jan 28 06:26:33 2025
+++ pkgsrc/sysutils/dinit/distinfo      Wed Jan 29 05:13:03 2025
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2025/01/28 06:26:33 imil Exp $
+$NetBSD: distinfo,v 1.2 2025/01/29 05:13:03 imil Exp $
 
 BLAKE2s (dinit-0.19.3.tar.gz) = 0ba4864cfbcce075c09469b97827bc84be1a3f51459d8cb8bab0a3b4c3efd434
 SHA512 (dinit-0.19.3.tar.gz) = 541ade391ed6fd43da394e19152ba63267614742a60b8e219e03db1ef91dd1c884e157aaad020c2e08b0e3b580a0dd7deb1b17392fdae5691d4062e5a17d02b6
 Size (dinit-0.19.3.tar.gz) = 372252 bytes
 SHA1 (patch-configure) = 68c5f9ecac565cb5cd03620508385aa2cc861e9c
+SHA1 (patch-src_shutdown.cc) = ac8228380442a68c024f7c67a2c141c4321e16d5

Added files:

Index: pkgsrc/sysutils/dinit/patches/patch-src_shutdown.cc
diff -u /dev/null pkgsrc/sysutils/dinit/patches/patch-src_shutdown.cc:1.1
--- /dev/null   Wed Jan 29 05:13:04 2025
+++ pkgsrc/sysutils/dinit/patches/patch-src_shutdown.cc Wed Jan 29 05:13:03 2025
@@ -0,0 +1,42 @@
+$NetBSD: patch-src_shutdown.cc,v 1.1 2025/01/29 05:13:03 imil Exp $
+
+Implement shutdown for NetBSD
+
+--- src/shutdown.cc.orig       2025-01-07 12:31:49.000000000 +0000
++++ src/shutdown.cc
+@@ -496,7 +496,11 @@ void do_system_shutdown(shutdown_type_t 
+     
+     sub_buf.append("Issuing shutdown via kernel...\n");
+     loop.poll();  // give message a chance to get to console
++#ifdef __NetBSD__
++    reboot(reboot_type, NULL);
++#else
+     reboot(reboot_type);
++#endif
+ }
+ 
+ // Watcher for subprocess output.
+@@ -637,7 +641,11 @@ static loop_t::child_proc_watcher::proc_
+ static void unmount_disks(loop_t &loop, subproc_buffer &sub_buf)
+ {
+     try {
++#ifdef __NetBSD__
++        const char * unmount_args[] = { "/sbin/umount", "-a", nullptr };
++#else
+         const char * unmount_args[] = { "/bin/umount", "-a", "-r", nullptr };
++#endif
+         run_process(unmount_args, loop, sub_buf);
+     }
+     catch (std::exception &e) {
+@@ -650,7 +658,11 @@ static void unmount_disks(loop_t &loop, 
+ static void swap_off(loop_t &loop, subproc_buffer &sub_buf)
+ {
+     try {
++#ifdef __NetBSD__
++        const char * swapoff_args[] = { "/sbin/swapctl", "-U", nullptr };
++#else
+         const char * swapoff_args[] = { "/sbin/swapoff", "-a", nullptr };
++#endif
+         run_process(swapoff_args, loop, sub_buf);
+     }
+     catch (std::exception &e) {