From nobody Wed Oct 02 14:29:27 2024 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 4XJcdM51Bbz5Xc4p; Wed, 02 Oct 2024 14:29:27 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJcdM4SfTz4m80; Wed, 2 Oct 2024 14:29:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727879367; 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=xB70zm0rlFdrBUJw/PZxRRmX9m47T2DJP1b1wCjm5E4=; b=A08xQnejxB4HHmuDUwGkO+j/XTCTRRLDzhbZLJsthA9grwt0rdYz8gPbji7bADunOwRoBL J7OQYcIHcOUGA9sG3Wk+SVWpk5inYWknrP6VXgqSlLSFPHDT95vXySIndgs6pb2yfvvmD+ bRi4dAulHEzRBS6pjANp2oTnNHdLP5Q8gdEnymwClT/UDrBtDwidyB1LoToUIqkbnvFIMr +io+HvrzAxwjStkDjfCzHxnKbgCz0Sv9ZBacSUY+N9NvoznitTgCH71KJCbqYeQwM/YiWa mRtni7lOev70B4SYhTnh+DDYVf565+gHD8PKAQVNteg9fNO7WZJfUCJYazct4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727879367; 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=xB70zm0rlFdrBUJw/PZxRRmX9m47T2DJP1b1wCjm5E4=; b=QYCWlGJszp739pSQ0/wFC2wtM/cartuz58IRUs1N1lGGKfrIamkfN6FDSGYt4lbB/R6nGr Qggey4jdTNvrl8iy9e7jDAhz3G2ytjIjMF9oRtIgMWNWcqAvDS4St4mzzRSf7MkZYuNyhP Nz24YR5Clzt/mr0DkkzbtEHEwcL287HsANPgcxAVeLPHHN57DvDtJo1eDFMeAFPgBgHBoi ftAyn1aLtdJW7YB5Bgcy+jOqcefRR/OmaCkOMSjSvpWmEJOtvg7UqKsEc5ZuYAx6A6prhJ BO4zgiPnvdztVKYcM6X8//1fPqlMZxD2yjKHy7IFt3IjlfhcgoSilyT54nvaHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727879367; a=rsa-sha256; cv=none; b=f9ST618+rh/sATKmFBhHzdxKoJtQW6DrQtg0O9wES1r1RAakaC/W/X9bsDKCJN3D7VbhUA oUjebDPn30dCDwwSK9OEoPHcTzZe0lF74Nb7bHlkGklP5wi5xnLO5dlZxwkQJRsrG35lth dGISGAsvVYl+25zdsIVWHEyTvKkS2O/rWlGPK2Sbt3+yo9cLexS6Un8qmpIVjXXBhvpyo0 VPa+cqvejGtFscQemggpvsbauObCoa6SIUbvskH/0BwHfvwNylQNYauqOyYVbXGuP9MRNH xBaiVnbrenwWS2izs0m6VCdlGWLuhK/89fE0vckwCSdqOVyS4QGSL8C8Dtwb+w== 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 4XJcdM2YVFz1PHg; Wed, 2 Oct 2024 14:29:27 +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 492ETRlu099205; Wed, 2 Oct 2024 14:29:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492ETRFh099202; Wed, 2 Oct 2024 14:29:27 GMT (envelope-from git) Date: Wed, 2 Oct 2024 14:29:27 GMT Message-Id: <202410021429.492ETRFh099202@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Olivier Cochard Subject: git: e60df8753fdc - main - sysutils/ipmitool: Fix path run and argument parsing with ipmievd 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olivier X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e60df8753fdc7ae21a19ff5999e1d6e55965175e Auto-Submitted: auto-generated The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/ports/commit/?id=e60df8753fdc7ae21a19ff5999e1d6e55965175e commit e60df8753fdc7ae21a19ff5999e1d6e55965175e Author: Olivier Cochard AuthorDate: 2024-10-02 14:25:59 +0000 Commit: Olivier Cochard 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 + #else +-# define _PATH_RUN "/run/" ++# define _PATH_RUN "/var/run/" + #endif + + #include 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));