From nobody Sun Jul 16 22:32:25 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4R40MY6fWvz4nvmm; Sun, 16 Jul 2023 22:32:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R40MY6F1zz4N8t; Sun, 16 Jul 2023 22:32:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689546745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p11oV2BVkPOgcopLQyQKKVD/ivD5LdX1LZvYWtYEA58=; b=mjulsIQQeps9bhikzIJ7ArXcMc/3t0gBo6oYLOsnywgMddPTO/X4ZDgrhpHxJYay77aL34 46Xc51X51/AjrTgx/hP6NbWO/fBI86qzFn+qOuLwnDWGGsYWdbPHP7LGDo0CoyLonPn8dg 95pONSsRigsTqwesvCjwYwdlNCFfiamksEa04BYCML6ifomBP+R1jgISX4iS/1iu+mRnKR QYEVNmZ66fwv0BxCLW4fDCfByv+PtAvlImCDhYJ0CPcyQye/tSid57sLSUMFqAU2IZvHYo KTbNZH+Xtu36WAu78g4MGffgkN44htWupYVdAzkEoknOGvpUXG8KUiMXjoGuYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689546745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p11oV2BVkPOgcopLQyQKKVD/ivD5LdX1LZvYWtYEA58=; b=Z3e/HKk4AlBWr8z1kEpe9/ubgmw7HSAsQB/n8Evc0OFDIOn4jtQMQjbBGubm9auRIMzsjz 7B3HP4ZoBKE2BjaR/eZpFVHFQDyVtIVqCSuCU0Fpw3o6LwMYx/Q1gDCsjiYUPQgwTau17F O/Qott+cIh7fg2+zCk06JRwww/2zFcdxDDY+txQdys5RqjJSbPah9OVJZZbQkkrWvKq98P q5A52BLqVuOJ5h2e+2xlIhTgxX0vo/xsuGMxAofMFFRmY2ocgsjvJut4ZOoAe0Pq9oktM1 R4OxQmuQRcRRUBLKSpQDPJd8YuJEuyduhw8WMSRppr9roU7Q2fcXqT6nQmstoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689546745; a=rsa-sha256; cv=none; b=dHvF/bXOnx833fk1OYFYRd+dgmLJG6a2Xqfj+tpHy5em+eCrbX7m0oCGZsafVKTKS2Yj8D dg2Ic0WO1W8x8y7yytcbsjj++Fa2pgXEhPYyx6INp9omjvVu1rbUjs6Xz1gVuppZp+wOud 7i+A7ThjvcPX5Wu3FLyuoA1Y0OSG5X6LyDq1G85MH51S8h1WlTqkVvQT6tghbzOupl0JRB kuoyP2WPAFVdi6kWBcaT4fHeLY5u+xfdl+uwwNLfSL3RavXOVa1VIXTK5eN6jYeztmpexN Ua9Hrt/n9IjX4u6g1Xui/2Q51cORZClGRpfgYy3e8rD+0oEJCWP3SP1dEoxSCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R40MY5HTsz10RP; Sun, 16 Jul 2023 22:32:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36GMWPjO074466; Sun, 16 Jul 2023 22:32:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36GMWP26074465; Sun, 16 Jul 2023 22:32:25 GMT (envelope-from git) Date: Sun, 16 Jul 2023 22:32:25 GMT Message-Id: <202307162232.36GMWP26074465@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Oleksii Samorukov Subject: git: fc96e77b56c6 - main - sysutils/busybox: fix reboot/halt/poweroff commands List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: samm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc96e77b56c65223193406b3dedb0d0642f123c8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by samm: URL: https://cgit.FreeBSD.org/ports/commit/?id=fc96e77b56c65223193406b3dedb0d0642f123c8 commit fc96e77b56c65223193406b3dedb0d0642f123c8 Author: Oleksii Samorukov AuthorDate: 2023-07-16 22:31:13 +0000 Commit: Oleksii Samorukov CommitDate: 2023-07-16 22:31:13 +0000 sysutils/busybox: fix reboot/halt/poweroff commands --- sysutils/busybox/Makefile | 1 + sysutils/busybox/files/patch-init_halt.c | 15 +++++++++++++++ sysutils/busybox/files/patch-init_reboot.h | 12 ++++++++++++ 3 files changed, 28 insertions(+) diff --git a/sysutils/busybox/Makefile b/sysutils/busybox/Makefile index dcfc467e9127..bf66348b2dab 100644 --- a/sysutils/busybox/Makefile +++ b/sysutils/busybox/Makefile @@ -1,5 +1,6 @@ PORTNAME= busybox PORTVERSION= 1.36.1 +PORTREVISION= 1 CATEGORIES= sysutils misc shells MASTER_SITES= https://busybox.net/downloads/ diff --git a/sysutils/busybox/files/patch-init_halt.c b/sysutils/busybox/files/patch-init_halt.c new file mode 100644 index 000000000000..351f4a9dde57 --- /dev/null +++ b/sysutils/busybox/files/patch-init_halt.c @@ -0,0 +1,15 @@ +--- init/halt.c.orig 2021-01-01 10:52:27 UTC ++++ init/halt.c +@@ -169,8 +169,11 @@ int halt_main(int argc UNUSED_PARAM, char **argv) + RB_POWER_OFF, + RB_AUTOBOOT + }; ++#if defined(__FreeBSD__) ++ static const smallint signals[] = { SIGUSR1, SIGUSR2, SIGINT }; ++#else + static const smallint signals[] = { SIGUSR1, SIGUSR2, SIGTERM }; +- ++#endif + int delay = 0; + int which, flags, rc; + diff --git a/sysutils/busybox/files/patch-init_reboot.h b/sysutils/busybox/files/patch-init_reboot.h new file mode 100644 index 000000000000..5ba00d98b155 --- /dev/null +++ b/sysutils/busybox/files/patch-init_reboot.h @@ -0,0 +1,12 @@ +--- init/reboot.h.orig 2023-07-16 21:31:29 UTC ++++ init/reboot.h +@@ -12,6 +12,9 @@ + # define RB_DISABLE_CAD 0 + # define RB_POWER_OFF 0x4321fedc + # define RB_AUTOBOOT 0x01234567 ++# elif defined(__FreeBSD__) ++# define RB_HALT_SYSTEM RB_HALT ++# define RB_POWER_OFF RB_POWEROFF + # elif defined(RB_HALT) + # define RB_HALT_SYSTEM RB_HALT + # endif