diff --git a/debian/changelog b/debian/changelog
index a0e4d6ba..ca163282 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ llvm-toolchain-snapshot (1:19~++20240304085905+c7fdd8c11e54-1~exp2) UNRELEASED;
   * Make libclang-common-19-dev architecture dependent.
   * Add python3-pexpect in the build dep for lldb.
   * Fix sanitizer build on 32bit time_t64 architectures.
+  * Refresh the 23-strlcpy_strlcat_warning_removed patch.
 
  -- Matthias Klose <doko@debian.org>  Tue, 12 Mar 2024 12:54:07 +0100
 
diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff
index 5d54a768..30991dd9 100644
--- a/debian/patches/23-strlcpy_strlcat_warning_removed.diff
+++ b/debian/patches/23-strlcpy_strlcat_warning_removed.diff
@@ -7,10 +7,10 @@
  clang/test/Sema/warn-strlcpycat-size.c                    |   55 --------------
  6 files changed, 25 insertions(+), 78 deletions(-)
 
-Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/lib/AST/Decl.cpp
+Index: llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/lib/AST/Decl.cpp
 ===================================================================
---- llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69.orig/clang/lib/AST/Decl.cpp
-+++ llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/lib/AST/Decl.cpp
+--- llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54.orig/clang/lib/AST/Decl.cpp
++++ llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/lib/AST/Decl.cpp
 @@ -4381,13 +4381,13 @@ unsigned FunctionDecl::getMemoryFunction
    case Builtin::BImemmove:
      return Builtin::BImemmove;
@@ -31,10 +31,10 @@ Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/lib/AST/De
  
    case Builtin::BI__builtin_memcmp:
    case Builtin::BImemcmp:
-Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/lib/Sema/SemaChecking.cpp
+Index: llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/lib/Sema/SemaChecking.cpp
 ===================================================================
---- llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69.orig/clang/lib/Sema/SemaChecking.cpp
-+++ llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/lib/Sema/SemaChecking.cpp
+--- llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54.orig/clang/lib/Sema/SemaChecking.cpp
++++ llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/lib/Sema/SemaChecking.cpp
 @@ -1319,8 +1319,8 @@ void Sema::checkFortifiedBuiltinMemoryFu
    case Builtin::BI__builtin___memcpy_chk:
    case Builtin::BI__builtin___memmove_chk:
@@ -59,27 +59,27 @@ Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/lib/Sema/S
    case Builtin::BIstrncat:
      CheckStrncatArguments(TheCall, FnInfo);
      break;
-Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
+Index: llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
 ===================================================================
---- llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
-+++ llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
+--- llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
++++ llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
 @@ -720,10 +720,10 @@ void GenericTaintChecker::initTaintRules
  
-       {{CDM::CLibrary, {BI.getName(Builtin::BIstrncat)}},
+       {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrncat)}},
         TR::Prop({{1, 2}}, {{0, ReturnValueIndex}})},
--      {{CDM::CLibrary, {BI.getName(Builtin::BIstrlcpy)}},
-+/*      {{CDM::CLibrary, {BI.getName(Builtin::BIstrlcpy)}},
+-      {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrlcpy)}},
++/*      {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrlcpy)}},
         TR::Prop({{1, 2}}, {{0}})},
-       {{CDM::CLibrary, {BI.getName(Builtin::BIstrlcat)}},
+       {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrlcat)}},
 -       TR::Prop({{1, 2}}, {{0}})},
-+	  TR::Prop({{1, 2}}, {{0}})},*/
-       {{CDM::CLibrary, {{"snprintf"}}},
++      TR::Prop({{1, 2}}, {{0}})},*/
+       {{CDF_MaybeBuiltin, {{"snprintf"}}},
         TR::Prop({{1}, 3}, {{0, ReturnValueIndex}})},
-       {{CDM::CLibrary, {{"sprintf"}}},
-Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/test/Sema/builtins.c
+       {{CDF_MaybeBuiltin, {{"sprintf"}}},
+Index: llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/test/Sema/builtins.c
 ===================================================================
---- llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69.orig/clang/test/Sema/builtins.c
-+++ llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/test/Sema/builtins.c
+--- llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54.orig/clang/test/Sema/builtins.c
++++ llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/test/Sema/builtins.c
 @@ -195,12 +195,10 @@ void test18(void) {
    void *ptr;
  
@@ -111,10 +111,10 @@ Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/test/Sema/
  
  char * Test20(char *p, const char *in, unsigned n)
  {
-Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/test/Sema/warn-strlcpycat-size.c
+Index: llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/test/Sema/warn-strlcpycat-size.c
 ===================================================================
---- llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69.orig/clang/test/Sema/warn-strlcpycat-size.c
-+++ llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/test/Sema/warn-strlcpycat-size.c
+--- llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54.orig/clang/test/Sema/warn-strlcpycat-size.c
++++ llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/test/Sema/warn-strlcpycat-size.c
 @@ -1,55 +0,0 @@
 -// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s
 -
@@ -171,10 +171,10 @@ Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/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~++20240304092954+72cf95df2f69/clang/include/clang/Basic/Builtins.td
+Index: llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/include/clang/Basic/Builtins.td
 ===================================================================
---- llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69.orig/clang/include/clang/Basic/Builtins.td
-+++ llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/include/clang/Basic/Builtins.td
+--- llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54.orig/clang/include/clang/Basic/Builtins.td
++++ llvm-toolchain-snapshot-19~++20240304085905+c7fdd8c11e54/clang/include/clang/Basic/Builtins.td
 @@ -3231,7 +3231,8 @@ def SigLongJmp : GNULibBuiltin<"setjmp.h
  
  // non-standard but very common