diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff index be74dd9e..72909fc1 100644 --- a/debian/patches/23-strlcpy_strlcat_warning_removed.diff +++ b/debian/patches/23-strlcpy_strlcat_warning_removed.diff @@ -7,37 +7,11 @@ clang/test/Sema/warn-strlcpycat-size.c | 55 -------------- 6 files changed, 25 insertions(+), 78 deletions(-) -Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/include/clang/Basic/Builtins.def +Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/AST/Decl.cpp =================================================================== ---- llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f.orig/clang/include/clang/Basic/Builtins.def -+++ llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/include/clang/Basic/Builtins.def -@@ -645,8 +645,8 @@ BUILTIN(__builtin___memset_chk, "v*v*izz - BUILTIN(__builtin___stpcpy_chk, "c*c*cC*z", "nF") - BUILTIN(__builtin___strcat_chk, "c*c*cC*z", "nF") - BUILTIN(__builtin___strcpy_chk, "c*c*cC*z", "nF") --BUILTIN(__builtin___strlcat_chk, "zc*cC*zz", "nF") --BUILTIN(__builtin___strlcpy_chk, "zc*cC*zz", "nF") -+//BUILTIN(__builtin___strlcat_chk, "zc*cC*zz", "nF") -+//BUILTIN(__builtin___strlcpy_chk, "zc*cC*zz", "nF") - BUILTIN(__builtin___strncat_chk, "c*c*cC*zz", "nF") - BUILTIN(__builtin___strncpy_chk, "c*c*cC*zz", "nF") - BUILTIN(__builtin___stpncpy_chk, "c*c*cC*zz", "nF") -@@ -1182,8 +1182,8 @@ LIBBUILTIN(getcontext, "iK*", "fjT", - LIBBUILTIN(_longjmp, "vJi", "frT", SETJMP_H, ALL_GNU_LANGUAGES) - LIBBUILTIN(siglongjmp, "vSJi", "frT", SETJMP_H, ALL_GNU_LANGUAGES) - // non-standard but very common --LIBBUILTIN(strlcpy, "zc*cC*z", "f", STRING_H, ALL_GNU_LANGUAGES) --LIBBUILTIN(strlcat, "zc*cC*z", "f", STRING_H, ALL_GNU_LANGUAGES) -+//LIBBUILTIN(strlcpy, "zc*cC*z", "f", STRING_H, ALL_GNU_LANGUAGES) -+//LIBBUILTIN(strlcat, "zc*cC*z", "f", STRING_H, ALL_GNU_LANGUAGES) - // id objc_msgSend(id, SEL, ...) - LIBBUILTIN(objc_msgSend, "GGH.", "f", OBJC_MESSAGE_H, OBJC_LANG) - // long double objc_msgSend_fpret(id self, SEL op, ...) -Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/AST/Decl.cpp -=================================================================== ---- llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f.orig/clang/lib/AST/Decl.cpp -+++ llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/AST/Decl.cpp -@@ -4310,13 +4310,13 @@ unsigned FunctionDecl::getMemoryFunction +--- llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5.orig/clang/lib/AST/Decl.cpp ++++ llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/AST/Decl.cpp +@@ -4368,13 +4368,13 @@ unsigned FunctionDecl::getMemoryFunction case Builtin::BImemmove: return Builtin::BImemmove; @@ -57,11 +31,11 @@ Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/AST/De case Builtin::BI__builtin_memcmp: case Builtin::BImemcmp: -Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/Sema/SemaChecking.cpp +Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/Sema/SemaChecking.cpp =================================================================== ---- llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f.orig/clang/lib/Sema/SemaChecking.cpp -+++ llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/Sema/SemaChecking.cpp -@@ -1263,8 +1263,8 @@ void Sema::checkFortifiedBuiltinMemoryFu +--- llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5.orig/clang/lib/Sema/SemaChecking.cpp ++++ llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/Sema/SemaChecking.cpp +@@ -1319,8 +1319,8 @@ void Sema::checkFortifiedBuiltinMemoryFu case Builtin::BI__builtin___memcpy_chk: case Builtin::BI__builtin___memmove_chk: case Builtin::BI__builtin___memset_chk: @@ -72,7 +46,7 @@ Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/Sema/S case Builtin::BI__builtin___strncat_chk: case Builtin::BI__builtin___strncpy_chk: case Builtin::BI__builtin___stpncpy_chk: -@@ -6964,10 +6964,10 @@ bool Sema::CheckFunctionCall(FunctionDec +@@ -7699,10 +7699,10 @@ bool Sema::CheckFunctionCall(FunctionDec switch (CMId) { case 0: return false; @@ -85,11 +59,11 @@ Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/Sema/S case Builtin::BIstrncat: CheckStrncatArguments(TheCall, FnInfo); break; -Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp =================================================================== ---- llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -+++ llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -@@ -717,10 +717,10 @@ void GenericTaintChecker::initTaintRules +--- llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp ++++ llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +@@ -720,10 +720,10 @@ void GenericTaintChecker::initTaintRules {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrncat)}}, TR::Prop({{1, 2}}, {{0, ReturnValueIndex}})}, @@ -102,10 +76,10 @@ Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/Static {{CDF_MaybeBuiltin, {{"snprintf"}}}, TR::Prop({{1}, 3}, {{0, ReturnValueIndex}})}, {{CDF_MaybeBuiltin, {{"sprintf"}}}, -Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/test/Sema/builtins.c +Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/test/Sema/builtins.c =================================================================== ---- llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f.orig/clang/test/Sema/builtins.c -+++ llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/test/Sema/builtins.c +--- llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5.orig/clang/test/Sema/builtins.c ++++ llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/test/Sema/builtins.c @@ -195,12 +195,10 @@ void test18(void) { void *ptr; @@ -137,10 +111,10 @@ Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/test/Sema/ char * Test20(char *p, const char *in, unsigned n) { -Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/test/Sema/warn-strlcpycat-size.c +Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/test/Sema/warn-strlcpycat-size.c =================================================================== ---- llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f.orig/clang/test/Sema/warn-strlcpycat-size.c -+++ llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/test/Sema/warn-strlcpycat-size.c +--- llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5.orig/clang/test/Sema/warn-strlcpycat-size.c ++++ llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/test/Sema/warn-strlcpycat-size.c @@ -1,55 +0,0 @@ -// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s - @@ -197,3 +171,25 @@ Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/test/Sema/ - - strlcpy(z, str, sizeof(str)); // expected-warning {{size argument in 'strlcpy' call appears to be size of the source; expected the size of the destination}} expected-note {{change size argument to be the size of the destination}} -} +Index: llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/include/clang/Basic/Builtins.td +=================================================================== +--- llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5.orig/clang/include/clang/Basic/Builtins.td ++++ llvm-toolchain-snapshot_19~++20240125091825+41fe98a6e7e5/clang/include/clang/Basic/Builtins.td +@@ -3199,7 +3199,8 @@ def SigLongJmp : GNULibBuiltin<"setjmp.h + + // non-standard but very common + +-def StrlCpy : GNULibBuiltin<"string.h"> { ++/* ++ def StrlCpy : GNULibBuiltin<"string.h"> { + let Spellings = ["strlcpy"]; + let Prototype = "size_t(char*, char const*, size_t)"; + } +@@ -3208,6 +3209,7 @@ def StrlCat : GNULibBuiltin<"string.h"> + let Spellings = ["strlcat"]; + let Prototype = "size_t(char*, char const*, size_t)"; + } ++*/ + + def ObjcMsgSend : ObjCLibBuiltin<"objc_message.h"> { + let Spellings = ["objc_msgSend"];