From nobody Wed Feb 15 16:55:59 2023 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 4PH4334lhZz3qYGX; Wed, 15 Feb 2023 16:55:59 +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 4PH4333nssz3syl; Wed, 15 Feb 2023 16:55:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676480159; 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=nlAvJN9OXuzIUsJhbsVQmqVPeZA+kWOoBmx1ZLHzf0Y=; b=dkI/H/J28h44KQYfPtCRrFUhVQBSKQgCIsPIyYW5RI7q87BHASa9c70BmURBZKB8Ec1ZQb qBM9MYZG4DNu3Y21cv7FdyoQ0MkxlIYb9pYgRXOSPJWzGaMGwpyHZ7ExON79oqudOOPn2v 6CHVH9ODLgW6DK8kdxSY6Y+zF2IlJn5rQMmUEEdEaJYJO3ACNt5tvIN9IB5fmtU6sIUrbi DPQFro7cmpZiNyh/JF37Saw0nKDcIV+IOB3GH8cG3fMSXZ82SgBKs2m03U12B+tJJ6uSZZ uncmsO6oVOGbWSZQMgZL1wbXHCG48m3IPKoamQuaSjk2ZIsOh5UJsUQn1mYTRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676480159; 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=nlAvJN9OXuzIUsJhbsVQmqVPeZA+kWOoBmx1ZLHzf0Y=; b=cgWIi4oQHTcLYCYc/GbEam5/xIWWqO1p2ppu3E+DxJT1+IZ1irhKorCos2F6TvYr1lU39E axYtkMwBP1sCo96+mmxeMLhSSb+iryY5wOJXsdDUjoV8M6rMwm7nmQzNg43AtPczLsqxZW kO+7rh3KBFhavlUEbFRsYWgpfikZgzVGTc1Id6foTlGjN+YBxGfZB2ZMQES5ILjxwhHHHZ MuiqpKYm1QtYGpR1XOELYT8obaLRbXjau5B772TEAF+IEbyQLtevwxADyhZQMH7cxhKPk+ IAhPCbC2z3o8ObB1je6qjKIOZeYfU8/CFwnIQM+zutQqbAR2BHYTKKyFHpXImQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676480159; a=rsa-sha256; cv=none; b=bh6oliMdSai6dt7kw7F5Xmx2T0sySeGHt5Ry07hxhna9qB9CHOq1Qi8CvU63oEEbF4u8SP HV9YRerkvFgPnNA7TudT27Ia7J34oqzD6CBavbDa3NZAIsloxpQgwrtXRj6G/lgYq9yV9j 9OM8LyNFLzfDURFvNVKObzjEQ1pkpB6K/3nETU1fFSGF11sxrQwFlC99ePJL8/Y+1CdmCq k00xUHRKk/hnObcArDOmrrJVXiRLtegLBePso4/R/Eys/g11BMAXxVk/p7UBgrbmrBFNO8 OenpEdJdLPcPRv/M7MY8eVugYXXq+YgAApww5LU5BLo3um5l9FdqgXUshZirZA== 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 4PH4332tWSzWvF; Wed, 15 Feb 2023 16:55:59 +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 31FGtxAn017114; Wed, 15 Feb 2023 16:55:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31FGtxs3017113; Wed, 15 Feb 2023 16:55:59 GMT (envelope-from git) Date: Wed, 15 Feb 2023 16:55:59 GMT Message-Id: <202302151655.31FGtxs3017113@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: d74ee97ef91d - main - security/cops: Permanently fix LLVM15 errors 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: d74ee97ef91d49d94749cc595ddc7ee9f37571ad Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=d74ee97ef91d49d94749cc595ddc7ee9f37571ad commit d74ee97ef91d49d94749cc595ddc7ee9f37571ad Author: Cy Schubert AuthorDate: 2023-02-15 05:37:12 +0000 Commit: Cy Schubert CommitDate: 2023-02-15 16:55:03 +0000 security/cops: Permanently fix LLVM15 errors Fix: src/addto.c:48:17: error: incompatible pointer to integer conversion assigning to 'char' from 'void *' [-Wint-conversion] keypending[0] = NULL; ^ ~~~~ --- security/cops/Makefile | 1 - security/cops/files/patch-src_addto.c | 54 +++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/security/cops/Makefile b/security/cops/Makefile index 6671a944a655..1b661dd334fd 100644 --- a/security/cops/Makefile +++ b/security/cops/Makefile @@ -14,7 +14,6 @@ USE_PERL5= run WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION:S/.//g}+ HAS_CONFIGURE= yes CONFIGURE_SCRIPT= reconfig -CFLAGS= -Wno-format-security -Wno-int-conversion MAKEFILE= makefile MAKE_ARGS= EXECUTABLE="${EXECUTABLE}" C_SRC="${C_SRC}" MAKE_JOBS_UNSAFE= yes diff --git a/security/cops/files/patch-src_addto.c b/security/cops/files/patch-src_addto.c new file mode 100644 index 000000000000..bfc47966a323 --- /dev/null +++ b/security/cops/files/patch-src_addto.c @@ -0,0 +1,54 @@ +--- src/addto.c.orig 1992-03-26 16:14:28.000000000 -0800 ++++ src/addto.c 2023-02-14 21:35:27.391968000 -0800 +@@ -26,6 +26,8 @@ + #define LINELEN 600 /* Max chars in a line. */ + #define SUCCESS "Success" /* Filename to put success messages. */ + ++#define NUL '\0' ++ + main(argc, argv) + int argc; + char *argv[]; +@@ -45,13 +47,13 @@ + + tmpfile = NULL; + +- keypending[0] = NULL; ++ keypending[0] = NUL; + strcat(keypending, key); + strcat(keypending, " "); + /* + * If the uid is known, print out the comments and exit. + */ +- filename[0] = NULL; ++ filename[0] = NUL; + strcat(filename, type); + strcat(filename, ".k"); + if ((tmpfile = fopen(filename, "r")) == NULL) { +@@ -82,7 +84,7 @@ + /* + * If a duplicate, don't add it. + */ +- filename[0] = NULL; ++ filename[0] = NUL; + strcat(filename, type); + strcat(filename, ".p"); + if (freopen(filename, "r", tmpfile) == NULL) { +@@ -97,7 +99,7 @@ + /* + * Add the goal to the pending file. + */ +- filename[0] = NULL; ++ filename[0] = NUL; + strcat(filename, type); + strcat(filename, ".p"); + if (freopen(filename, "a", tmpfile) == NULL) { +@@ -109,7 +111,7 @@ + /* + * Add the goal to the next goal (type) file. + */ +- filename[0] = NULL; ++ filename[0] = NUL; + strcat(filename, type); + strcat(filename, ".n"); + if (freopen(filename, "a", tmpfile) == NULL) {