diff --git a/debian/patches/clang-format-version.diff b/debian/patches/clang-format-version.diff
index 4e05787c..5ea4a162 100644
--- a/debian/patches/clang-format-version.diff
+++ b/debian/patches/clang-format-version.diff
@@ -4,23 +4,23 @@
  clang/tools/clang-format/clang-format.py      |    2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
-Index: llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f/clang/tools/clang-format/clang-format-diff.py
+Index: llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/tools/clang-format/clang-format-diff.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f.orig/clang/tools/clang-format/clang-format-diff.py
-+++ llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f/clang/tools/clang-format/clang-format-diff.py
-@@ -78,7 +78,7 @@ def main():
+--- llvm-toolchain-snapshot_17~++20230309125305+68367141dd91.orig/clang/tools/clang-format/clang-format-diff.py
++++ llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/tools/clang-format/clang-format-diff.py
+@@ -63,7 +63,7 @@ def main():
                        'fallback in case clang-format is invoked with'
                        '-style=file, but can not find the .clang-format'
                        'file to use.')
 -  parser.add_argument('-binary', default='clang-format',
 +  parser.add_argument('-binary', default='clang-format-17',
                        help='location of binary to use for clang-format')
-   parser.add_argument('-j', default=1, type=int, metavar='N',
-                       help='number of concurrent clang-format processes to spawn in '
-Index: llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f/clang/tools/clang-format/clang-format.el
+   args = parser.parse_args()
+ 
+Index: llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/tools/clang-format/clang-format.el
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f.orig/clang/tools/clang-format/clang-format.el
-+++ llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f/clang/tools/clang-format/clang-format.el
+--- llvm-toolchain-snapshot_17~++20230309125305+68367141dd91.orig/clang/tools/clang-format/clang-format.el
++++ llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/tools/clang-format/clang-format.el
 @@ -37,7 +37,7 @@
    :group 'tools)
  
@@ -30,10 +30,10 @@ Index: llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f/clang/tools/clan
        "clang-format")
    "Location of the clang-format executable.
  
-Index: llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f/clang/tools/clang-format/clang-format.py
+Index: llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/tools/clang-format/clang-format.py
 ===================================================================
---- llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f.orig/clang/tools/clang-format/clang-format.py
-+++ llvm-toolchain-snapshot_17~++20230303101551+a14e3c2aa79f/clang/tools/clang-format/clang-format.py
+--- llvm-toolchain-snapshot_17~++20230309125305+68367141dd91.orig/clang/tools/clang-format/clang-format.py
++++ llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/tools/clang-format/clang-format.py
 @@ -49,7 +49,7 @@ import vim
  
  # set g:clang_format_path to the path to clang-format if it is not on the path
diff --git a/debian/patches/hurd/hurd-pathmax.diff b/debian/patches/hurd/hurd-pathmax.diff
index 421aebd8..c8939dd8 100644
--- a/debian/patches/hurd/hurd-pathmax.diff
+++ b/debian/patches/hurd/hurd-pathmax.diff
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/lib/Basic/FileManager.cpp
+Index: llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/lib/Basic/FileManager.cpp
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang/lib/Basic/FileManager.cpp
-+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/lib/Basic/FileManager.cpp
+--- llvm-toolchain-snapshot_17~++20230309125305+68367141dd91.orig/clang/lib/Basic/FileManager.cpp
++++ llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/lib/Basic/FileManager.cpp
 @@ -610,6 +610,12 @@ FileManager::getNoncachedStatValue(Strin
    return std::error_code();
  }
@@ -15,10 +15,10 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/lib/Basic/
  void FileManager::GetUniqueIDMapping(
      SmallVectorImpl<const FileEntry *> &UIDToFiles) const {
    UIDToFiles.clear();
-Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/lldb/include/lldb/lldb-defines.h
+Index: llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/lldb/include/lldb/lldb-defines.h
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/lldb/include/lldb/lldb-defines.h
-+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/lldb/include/lldb/lldb-defines.h
+--- llvm-toolchain-snapshot_17~++20230309125305+68367141dd91.orig/lldb/include/lldb/lldb-defines.h
++++ llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/lldb/include/lldb/lldb-defines.h
 @@ -15,6 +15,11 @@
  #define INT32_MAX 2147483647
  #endif
@@ -31,19 +31,3 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/lldb/include/lld
  #if !defined(UINT32_MAX)
  #define UINT32_MAX 4294967295U
  #endif
-Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/polly/lib/External/ppcg/cuda_common.c
-===================================================================
---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/polly/lib/External/ppcg/cuda_common.c
-+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/polly/lib/External/ppcg/cuda_common.c
-@@ -15,6 +15,11 @@
- #include "cuda_common.h"
- #include "ppcg.h"
- 
-+// For GNU Hurd
-+#if defined(__GNU__) && !defined(PATH_MAX)
-+# define PATH_MAX 4096
-+#endif
-+
- /* Open the host .cu file and the kernel .hu and .cu files for writing.
-  * Add the necessary includes.
-  */