git: d74ee97ef91d - main - security/cops: Permanently fix LLVM15 errors
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 15 Feb 2023 16:55:59 UTC
The branch main has been updated by cy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=d74ee97ef91d49d94749cc595ddc7ee9f37571ad
commit d74ee97ef91d49d94749cc595ddc7ee9f37571ad
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2023-02-15 05:37:12 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
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) {