From nobody Mon May 09 18:11:27 2022 X-Original-To: dev-commits-ports-all@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 7A2671ADD36B; Mon, 9 May 2022 18:11:28 +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 4Kxq4H36Kcz3FQK; Mon, 9 May 2022 18:11:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652119887; 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=W24Ct+HNzp4DSa10ONpLpoRnriJXT0iiJzpVmiSgQ4g=; b=dJkvHRgc/8plMPPijQvdMUcezjlYdM+0K6CYxjosS2Qv0MAkBfvzlrWuV7s5MZACkNdFMw jXpv53Bcjz9ILp9g+amv486YOl31mgE8dZ/30Cl7vmKw+Ke/J/AeSZBw9EZWobpn/QK4N3 ajWMRdhTPmpNcj55Bm4xECKVKg2PoBuMigjkawS+x7zzlkONwl7u34TB4IeBmhtgKevfFa 535HFX/Ya6ppVGEy0aHS9fMjBNE7MNh1qAoBCXQgamafpoX1K043F9DKwNkycdTNIRxP3C E5EU5n44vUld9gqq86PMfua7hxt2+HDvQwrd5iM6XsO03JhKBq92LNUjEaYcug== 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 2C5A615D6C; Mon, 9 May 2022 18:11:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 249IBRG7086340; Mon, 9 May 2022 18:11:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 249IBR8J086339; Mon, 9 May 2022 18:11:27 GMT (envelope-from git) Date: Mon, 9 May 2022 18:11:27 GMT Message-Id: <202205091811.249IBR8J086339@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 3b7f73015c06 - main - sysutils/nut*: Use poweroff instead of shutdown -h List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b7f73015c06f08c2b64d7def022151872bf1cfc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652119887; 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=W24Ct+HNzp4DSa10ONpLpoRnriJXT0iiJzpVmiSgQ4g=; b=B+PYt5XRUQQcZ1qnSU14PjeWLfNEuCYF3dmz/bq1PjGINaTt3vyYgR+77ASvo7FX6w26o5 1FVlUXGwkZETiPnBwxV/d1a+rka+psdzETSyKRoU6YOi4T9QLUeXy4ls6hdmU8tU/aAWHv dRGyht4mLw04xxxHgT4xdMb1sjGxO90tt4HEP7xAnb5lbNuBPscqLIRpepQjbkhq+IIwLc uTxGA4Hjuw22aXBN/8xx9SyBqKHOqG41LWU3/zvEwgAahPXi688plGEIUfcsGAssFWUSz/ gKMGacRtHAtXa/EYezjx6wlpwLKFoIBGh6kfeDKg1YyuUU4TcIFejH2XvYRHhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652119887; a=rsa-sha256; cv=none; b=dgxbYw0Y8Nwv4q8CuH3WX9W9XyE/vofvGBtSKi+zPwwF91AzanB2C64dcH5YJONa/onRUn 5hYcmBr+W5d3ZERielVjdGx2WRMVjotFbPseCGC/FX6y/x/q+Rw3dXzek+0GmuaAFGgDrm vwumzxGXMAE96/KdIpYVemIS6++dTAc0CFFYVSgMM4et404LzPkb+/RY+1kz8yFCuKl7m5 OQBKAsxa+OaJRqMDIHX3ccnycUynIeaCwKL3V5ATTM4O+KKUkhBKg+uvgZjX7sSiwKgCqR lzLCdtxe5sImqoetI2AJ5HhWUlWcWwa+h7pDKK0HRQc1M10S9GWG7IOjNQpfGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=3b7f73015c06f08c2b64d7def022151872bf1cfc commit 3b7f73015c06f08c2b64d7def022151872bf1cfc Author: Cy Schubert AuthorDate: 2022-05-08 13:20:06 +0000 Commit: Cy Schubert CommitDate: 2022-05-09 17:49:29 +0000 sysutils/nut*: Use poweroff instead of shutdown -h Poweroff instead of halt when signaling shutdown. PR: 263855 Reported by: clear.screen@orange.fr --- sysutils/nut-devel/Makefile | 2 +- sysutils/nut-devel/files/patch-conf_upsmon.conf.sample.in | 11 +++++++++++ sysutils/nut/Makefile | 2 +- sysutils/nut/files/patch-conf_upsmon.conf.sample.in | 11 +++++++++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/sysutils/nut-devel/Makefile b/sysutils/nut-devel/Makefile index 9bafcd1fd295..f40a1a065584 100644 --- a/sysutils/nut-devel/Makefile +++ b/sysutils/nut-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME= nut PORTVERSION= ${NUT_COMMIT_DATE} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils PKGNAMESUFFIX= -devel # MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/ diff --git a/sysutils/nut-devel/files/patch-conf_upsmon.conf.sample.in b/sysutils/nut-devel/files/patch-conf_upsmon.conf.sample.in new file mode 100644 index 000000000000..1e8edaeeab0d --- /dev/null +++ b/sysutils/nut-devel/files/patch-conf_upsmon.conf.sample.in @@ -0,0 +1,11 @@ +--- conf/upsmon.conf.sample.in.orig 2022-05-08 06:15:14.873131000 -0700 ++++ conf/upsmon.conf.sample.in 2022-05-08 06:18:53.643631000 -0700 +@@ -149,7 +149,7 @@ + # such as posting a message with 'logger' or 'wall' or 'mailx'. Do be careful + # to plug the UPS back into the wall in a timely fashion. + +-SHUTDOWNCMD "/sbin/shutdown -h +0" ++SHUTDOWNCMD "/sbin/poweroff" + + # -------------------------------------------------------------------------- + # NOTIFYCMD diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile index 4bec09e14685..e1569eebacea 100644 --- a/sysutils/nut/Makefile +++ b/sysutils/nut/Makefile @@ -2,7 +2,7 @@ PORTNAME= nut PORTVERSION= 2.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/ diff --git a/sysutils/nut/files/patch-conf_upsmon.conf.sample.in b/sysutils/nut/files/patch-conf_upsmon.conf.sample.in new file mode 100644 index 000000000000..17fb6d4d4882 --- /dev/null +++ b/sysutils/nut/files/patch-conf_upsmon.conf.sample.in @@ -0,0 +1,11 @@ +--- conf/upsmon.conf.sample.in.orig 2022-05-08 06:14:17.220611000 -0700 ++++ conf/upsmon.conf.sample.in 2022-05-08 06:16:45.805777000 -0700 +@@ -149,7 +149,7 @@ + # such as posting a message with 'logger' or 'wall' or 'mailx'. Do be careful + # to plug the UPS back into the wall in a timely fashion. + +-SHUTDOWNCMD "/sbin/shutdown -h +0" ++SHUTDOWNCMD "/sbin/poweroff" + + # -------------------------------------------------------------------------- + # NOTIFYCMD