From 8e3b64db39f2aaa14b35ee5376bd6a2e707cadc2 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Wed, 26 Apr 2023 20:26:58 -0700 Subject: openafs: Patch for Linux kernel 6.3 (#228217) Signed-off-by: Anders Kaseorg --- pkgs/servers/openafs/1.8/module.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index cd1f71b77ec..4485f86c7f7 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -73,6 +73,16 @@ stdenv.mkDerivation { url = "https://git.openafs.org/?p=openafs.git;a=patch;h=cba2b88851c3ae0ab1b18ea3ce77f7f5e8200b2f"; hash = "sha256-suj7n0U0odHXZHLPqeB/k96gyBh52uoS3AuHvOzPyd8="; }) + # Linux 6.3: Include linux/filelock.h if available + (fetchBase64Patch { + url = "https://gerrit.openafs.org/changes/15388/revisions/ddb99d32012c43c76ae37f6a7563f1ca32f0e964/patch"; + hash = "sha256-0Cql4+0ISfW4J4D7PhlSYNfIKAeDVWEz57PHOu5TRXg="; + }) + # Linux 6.3: Use mnt_idmap for inode op functions + (fetchBase64Patch { + url = "https://gerrit.openafs.org/changes/15389/revisions/ff0d53d2fb38fc3b262f02fb1c5f49b286ff13dd/patch"; + hash = "sha256-KyVAI/A+/lNrLyKY6O8DgMKzgnF6P5sOfSq3qcs6Qq0="; + }) ]; hardeningDisable = [ "pic" ]; -- cgit 1.4.1