From owner-dev-commits-ports-all@freebsd.org Sat Jul 17 19:15:43 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 46FA465A2B1; Sat, 17 Jul 2021 19:15:43 +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 4GRyW30n0Lz4lSx; Sat, 17 Jul 2021 19:15:43 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 EBECF15EC7; Sat, 17 Jul 2021 19:15:42 +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 16HJFgOZ022968; Sat, 17 Jul 2021 19:15:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16HJFgA2022967; Sat, 17 Jul 2021 19:15:42 GMT (envelope-from git) Date: Sat, 17 Jul 2021 19:15:42 GMT Message-Id: <202107171915.16HJFgA2022967@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: ac0196bd100f - main - sysutils/monitord: Remove erroneous patch hunk. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac0196bd100f10bdd5dac59e36eac44482838d36 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Jul 2021 19:15:43 -0000 The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=ac0196bd100f10bdd5dac59e36eac44482838d36 commit ac0196bd100f10bdd5dac59e36eac44482838d36 Author: Gleb Popov AuthorDate: 2021-07-17 19:13:24 +0000 Commit: Gleb Popov CommitDate: 2021-07-17 19:15:39 +0000 sysutils/monitord: Remove erroneous patch hunk. It is sizeof(array) that was intended here. Reported by: Peter TKATCHENKO --- sysutils/monitord/Makefile | 2 +- sysutils/monitord/files/patch-monitord.c | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/sysutils/monitord/Makefile b/sysutils/monitord/Makefile index 7f4a45d21ebc..c3e1d8a579b2 100644 --- a/sysutils/monitord/Makefile +++ b/sysutils/monitord/Makefile @@ -2,7 +2,7 @@ PORTNAME= monitord PORTVERSION= 0.4.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= sysutils MASTER_SITES= http://lissyara.su/distfiles/ diff --git a/sysutils/monitord/files/patch-monitord.c b/sysutils/monitord/files/patch-monitord.c index e89f516c7ad9..0aa43953a66e 100644 --- a/sysutils/monitord/files/patch-monitord.c +++ b/sysutils/monitord/files/patch-monitord.c @@ -73,17 +73,6 @@ // Main loop while(1) { -@@ -290,8 +294,8 @@ int loop ( char **file, char *filename, int max_proc, - - bzero (param, sizeof(param)); - while ((token = strtok(NULL, " \t"))) { -- strncat (param, " ", sizeof(param)); -- strncat (param, token, sizeof(param)); -+ strncat (param, " ", sizeof(*param)); -+ strncat (param, token, sizeof(*param)); - } - - /* Each line has a \n at the end which must be removed @@ -355,18 +359,18 @@ int loop ( char **file, char *filename, int max_proc, // printf("Couldn't open %s\n", buf); }