diff options
author | Anders Kaseorg <andersk@mit.edu> | 2021-11-02 18:06:09 -0700 |
---|---|---|
committer | Anders Kaseorg <andersk@mit.edu> | 2021-11-07 13:22:58 -0800 |
commit | d4f4b721bcdb394749f072a2679ac06d580bc003 (patch) | |
tree | 1ac33b2a7559819f2611e2d78e0917f9f04333a5 /pkgs/servers/openafs | |
parent | c935f5e0add2cf0ae650d072c8357533e21b0c35 (diff) |
openafs: Add upstream patches for Linux kernel 5.15
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Diffstat (limited to 'pkgs/servers/openafs')
-rw-r--r-- | pkgs/servers/openafs/1.8/module.nix | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 9b113a4a0d1ea..2543aef376903 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, which, autoconf, automake, flex, bison -, kernel, glibc, perl, libtool_2, libkrb5 }: +, kernel, glibc, perl, libtool_2, libkrb5, fetchpatch }: with (import ./srcs.nix { inherit fetchurl; @@ -18,6 +18,23 @@ in stdenv.mkDerivation { buildInputs = [ libkrb5 ]; + patches = [ + # LINUX 5.14: explicitly set set_page_dirty to default + ((fetchpatch { + url = "https://gerrit.openafs.org/changes/14830/revisions/20b8a37950b3718b85a4a3d21b23469a5176eb6a/patch"; + sha256 = "1mkfwq0pbwvfjspsy2lxhi0f09hljgc6xyn3y97sai0dyivn05jp"; + }).overrideAttrs (o: { + postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch; + })) + # Linux 5.15: Convert osi_Msg macro to a function + ((fetchpatch { + url = "https://gerrit.openafs.org/changes/14831/revisions/6cfa9046229d90c0625687e3fddb7877f21fbcff/patch"; + sha256 = "18rip9a1krxf47fizf3f12ddq55apzb2w3wjj5qs7n3sh2nwks7g"; + }).overrideAttrs (o: { + postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch; + })) + ]; + hardeningDisable = [ "pic" ]; configureFlags = [ @@ -56,6 +73,6 @@ in stdenv.mkDerivation { license = licenses.ipl10; platforms = platforms.linux; maintainers = with maintainers; [ maggesi spacefrogg ]; - broken = versionOlder kernel.version "3.18" || kernel.kernelAtLeast "5.15" || kernel.isHardened; + broken = versionOlder kernel.version "3.18" || kernel.isHardened; }; } |