Date: Wed, 2 Oct 2024 14:29:27 GMT From: Olivier Cochard <olivier@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e60df8753fdc - main - sysutils/ipmitool: Fix path run and argument parsing with ipmievd Message-ID: <202410021429.492ETRFh099202@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/ports/commit/?id=e60df8753fdc7ae21a19ff5999e1d6e55965175e commit e60df8753fdc7ae21a19ff5999e1d6e55965175e Author: Olivier Cochard <olivier@FreeBSD.org> AuthorDate: 2024-10-02 14:25:59 +0000 Commit: Olivier Cochard <olivier@FreeBSD.org> CommitDate: 2024-10-02 14:28:55 +0000 sysutils/ipmitool: Fix path run and argument parsing with ipmievd PR: 281805 Approved by: zi (maintainer) Sponsored by: Netflix --- sysutils/ipmitool/Makefile | 2 +- sysutils/ipmitool/files/patch-lib_helper.c | 11 +++++++++++ sysutils/ipmitool/files/patch-src_ipmievd.c | 20 ++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/sysutils/ipmitool/Makefile b/sysutils/ipmitool/Makefile index 633bd120e754..259401ffafee 100644 --- a/sysutils/ipmitool/Makefile +++ b/sysutils/ipmitool/Makefile @@ -1,6 +1,6 @@ PORTNAME= ipmitool PORTVERSION= 1.8.19 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= https://codeberg.org/IPMITool/${PORTNAME}/archive/:ipmi \ LOCAL/zi/:iana diff --git a/sysutils/ipmitool/files/patch-lib_helper.c b/sysutils/ipmitool/files/patch-lib_helper.c new file mode 100644 index 000000000000..4accc69a3da1 --- /dev/null +++ b/sysutils/ipmitool/files/patch-lib_helper.c @@ -0,0 +1,11 @@ +--- lib/helper.c.orig 2022-09-01 18:42:31 UTC ++++ lib/helper.c +@@ -54,7 +54,7 @@ + #ifdef HAVE_PATHS_H + # include <paths.h> + #else +-# define _PATH_RUN "/run/" ++# define _PATH_RUN "/var/run/" + #endif + + #include <ipmitool/ipmi.h> diff --git a/sysutils/ipmitool/files/patch-src_ipmievd.c b/sysutils/ipmitool/files/patch-src_ipmievd.c new file mode 100644 index 000000000000..e59859fe2728 --- /dev/null +++ b/sysutils/ipmitool/files/patch-src_ipmievd.c @@ -0,0 +1,20 @@ +--- src/ipmievd.c.orig 2022-09-01 18:42:31 UTC ++++ src/ipmievd.c +@@ -55,7 +55,7 @@ + #endif + + #ifndef _PATH_RUN +-# define _PATH_RUN "/run/" ++# define _PATH_RUN "/var/run/" + #endif + + #ifdef IPMI_INTF_OPEN +@@ -730,7 +730,7 @@ ipmievd_main(struct ipmi_event_intf * eintf, int argc, + return (-1); + } + } +- else if (strcasecmp(argv[i], "pidfile=") == 0) { ++ else if (strncasecmp(argv[i], "pidfile=",8) == 0) { + memset(pidfile, 0, 64); + strncpy(pidfile, argv[i]+8, + __min(strlen((const char *)(argv[i]+8)), 63));home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410021429.492ETRFh099202>