From nobody Sun Dec 08 08:21:20 2024 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 4Y5dHh61mxz5gKYp; Sun, 08 Dec 2024 08:21:20 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y5dHh5Znpz4MG6; Sun, 8 Dec 2024 08:21:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733646080; 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=X3weBrXzahmms0VjDzZWMZYU6N9bbpczAnzCu3I7+0o=; b=yEmx3aNhemDw2i4LsnRuSmrXfJiu+eEOtowCUKt0OrbjnG3cR8O+SoQJPLTrarTQnVHsbd aVf3Ib3C7aBAWhxMB5K/yIWtLx7cJo3Ztz1G4f5bLtpuV6TWy1PLPISXEdJxGu3LA+NvSH 2sA+/pph9pzLAeA8uxZwbfNzu12KS8GBoGMb3dr7NqmpqLYbbUONMd8pENEV9BLE3Iw1w8 vwvYFcQrMVE1xspsj+Z0aO7+7xYj/JDDQnK/Z3g2QsbsbeYRmknQEg7fWPUTWfuCo6wcto ht2vGywITdvoigkFHQqRK1hhohzijh+IS/LiLxU6wkuheQcROu0xkrd1h+mYvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733646080; 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=X3weBrXzahmms0VjDzZWMZYU6N9bbpczAnzCu3I7+0o=; b=JpPGEZ932mEV2Gul2i+bF1SnkOqV6npjg3tgJ5YyxyXrsgilRrbudKNrErnVTJNNrnQcyL UB2LE+rH0eDEPNmW1L1aF7OqwTQRbk0Lvq0WwPaUftSSqo03wYciJCFOmYQDJQLxx9mSBh TGXu2CLD1EzEai8zYVPxxxNsM9vZF6ZCd/3Vqz8y2PTIfgyE/0UII9vAlSFNJI7xmLbxZH aJtI6qZprEIY71sWGQzyTcMcH746T65RaksCDS7zs+X5jh2TXXHHmRPMHnzATIHZBkBlrZ eVdHWCPE5T4o7S/FJsaab4nu9FeGH825rnNWCtnkDE6ngFPoFUAZukGfgUzFtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733646080; a=rsa-sha256; cv=none; b=Bk8mxxBhbURIZ+veA/5DGxH465ew+0D+V/58RnDR4tH2lbZka8ZFIghwgwoJtKNt+H5XH9 XLjU41dWtxZ2aLH3x4SnUh2q9hKRap9eRPVt7c55Wqz9u/H6Q8nrtWDk43TFahIbdS1PfH e4bZCC2eqF65KqfQs6hSi8UIqXix6LYpSqNVNyZEtAmlRR+shG2IEiLp4Nb1P4FA7Xi4gF uQyH1J9u0dNIj470frDAGLG9ra14Re0HD8VCDmhc9m717Woo+ocWYFHwoajo8lE6p/3eMG 0h4L2GuWuAMngxg4Ur8mVlWt24NziBgx2LpTaYOr+Ki61Kj6K77wrr9h8Zxifg== 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 4Y5dHh51DNzl3Z; Sun, 8 Dec 2024 08:21:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B88LKnH058218; Sun, 8 Dec 2024 08:21:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B88LKR3058215; Sun, 8 Dec 2024 08:21:20 GMT (envelope-from git) Date: Sun, 8 Dec 2024 08:21:20 GMT Message-Id: <202412080821.4B88LKR3058215@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 0d559034cddc - main - sysutils/bsdfan: print better error message when failing to start 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d559034cddc4de88399baa6ac36e9e69b0d0309 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=0d559034cddc4de88399baa6ac36e9e69b0d0309 commit 0d559034cddc4de88399baa6ac36e9e69b0d0309 Author: Alexey Dokuchaev AuthorDate: 2024-12-08 08:18:18 +0000 Commit: Alexey Dokuchaev CommitDate: 2024-12-08 08:18:18 +0000 sysutils/bsdfan: print better error message when failing to start On non-ThinkPad laptops, or when acpi_ibm(4) module is not loaded, the program emits cryptic "bsdfan: Not enough permissions: No such file or directory" error message. Replace it with something more meaningful and helpful. --- sysutils/bsdfan/Makefile | 3 --- sysutils/bsdfan/files/patch-system.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/sysutils/bsdfan/Makefile b/sysutils/bsdfan/Makefile index 0a3ad6913b6f..caa9dfd6ebde 100644 --- a/sysutils/bsdfan/Makefile +++ b/sysutils/bsdfan/Makefile @@ -21,9 +21,6 @@ MAKE_ARGS= MANDIR=${PREFIX}/share/man/man PLIST_FILES= bin/bsdfan share/man/man1/bsdfan.1.gz \ @sample\ etc/bsdfan.conf.sample -post-patch: - @${REINPLACE_CMD} -e 's,getTemp(,&void,' ${WRKSRC}/system.c - post-install: ${INSTALL_DATA} ${WRKSRC}/bsdfan.conf \ ${STAGEDIR}${PREFIX}/etc/bsdfan.conf.sample diff --git a/sysutils/bsdfan/files/patch-system.c b/sysutils/bsdfan/files/patch-system.c new file mode 100644 index 000000000000..746330371302 --- /dev/null +++ b/sysutils/bsdfan/files/patch-system.c @@ -0,0 +1,31 @@ +--- system.c.orig 2018-01-12 16:11:08 UTC ++++ system.c +@@ -10,7 +10,7 @@ + #include "system.h" + + #define INVALID_MODE_ERROR "Invalid fan mode" +-#define PERMISSION_ERROR "Not enough permissions" ++#define FAN_SYSCTL_NODE "dev.acpi_ibm.0.fan" + #define KELVIN_TO_CELSIUS(t) ((t-2732+5)/10) + + static int idx_cur_level; +@@ -30,8 +30,8 @@ setFan(int mode, const struct Level *levels) + case MANUAL: + case AUTO: + /*set fan in manual mode*/ +- if (sysctlbyname("dev.acpi_ibm.0.fan",NULL,NULL,&mode,sizeof(int)) == -1) +- err(EX_NOPERM, PERMISSION_ERROR); ++ if (sysctlbyname(FAN_SYSCTL_NODE,NULL,NULL,&mode,sizeof(int)) == -1) ++ err(EX_NOPERM, FAN_SYSCTL_NODE); + + if (mode == AUTO) + break; +@@ -86,7 +86,7 @@ levelDown(const struct Level *levels) + } + + int +-getTemp() ++getTemp(void) + { + int temp[8]={0}; + size_t len = 8*sizeof(int);