openafs: Patch for Linux kernel 5.18

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

+39 -9
+39 -9
pkgs/servers/openafs/1.8/module.nix
··· 38 38 buildInputs = [ libkrb5 ]; 39 39 40 40 patches = [ 41 - # Add autoconf-archive to src/external 42 - (fetchBase64Patch { 43 - url = "https://gerrit.openafs.org/changes/14942/revisions/006616bd8e88b2d386a5ddc23973cf3e625cb80d/patch"; 44 - hash = "sha256-55sc2sKy5XkQHAv6ysVxi69+0xVsHnN2TS144UTeLHU="; 45 - }) 46 41 # Import of code from autoconf-archive 47 - (fetchBase64Patch { 48 - url = "https://gerrit.openafs.org/changes/14943/revisions/d3782b1d4e6fd81c5432e95112eb44305f07f272/patch"; 42 + (fetchpatch { 43 + url = "https://git.openafs.org/?p=openafs.git;a=patch;h=d8205bbb482554812fbe66afa3c337d991a247b6"; 49 44 hash = "sha256-ohkjSux+S3+6slh6uZIw5UJXlvhy9UUDpDlP0YFRwmw="; 50 45 }) 51 46 # Use autoconf-archive m4 from src/external ··· 53 48 url = "https://gerrit.openafs.org/changes/14944/revisions/ea2a0e128d71802f61b8da2e44de3c6325c5f328/patch"; 54 49 hash = "sha256-PAUk/MXL5p8xwhn40/UGmo3UIhvl1PB2FwgqhmqsjJ4="; 55 50 }) 51 + # cf: Use common macro to test compiler flags 52 + (fetchpatch { 53 + url = "https://git.openafs.org/?p=openafs.git;a=patch;h=790824ff749b6ee01c4d7101493cbe8773ef41c6"; 54 + hash = "sha256-Zc7AjCsH7eTmZJWCrx7ci1tBjEAgcFXS9lY1YBeboLA="; 55 + }) 56 56 # Linux-5.17: kernel func complete_and_exit renamed 57 57 (fetchBase64Patch { 58 58 url = "https://gerrit.openafs.org/changes/14945/revisions/a714e865efe41aa1112f6f9c8479112660dacd6f/patch"; ··· 63 63 url = "https://gerrit.openafs.org/changes/14946/revisions/449d1faf87e2841e80be38cf2b4a5cf5ff4df2d8/patch"; 64 64 hash = "sha256-3bRTHYeMRIleLhob56m2Xt0dWzIMDo3QrytY0K1/q7c="; 65 65 }) 66 + # afs: Introduce afs_IsDCacheFresh 67 + (fetchpatch { 68 + url = "https://git.openafs.org/?p=openafs.git;a=patch;h=0d8ce846ab2e6c45166a61f04eb3af271cbd27db"; 69 + hash = "sha256-+xgRYVXz8XpT5c4Essc4VEn9Fj53vasAYhcFkK0oCBc="; 70 + }) 71 + # LINUX: Don't panic on some file open errors 72 + (fetchpatch { 73 + url = "https://git.openafs.org/?p=openafs.git;a=patch;h=af73b9a3b1fc625694807287c0897391feaad52d"; 74 + hash = "sha256-k0d+Gav1LApU24SaMI0pmR3gGfWyicqdCpTpVJLcx7U="; 75 + }) 76 + # Linux-5.18 replace set_page_dirty with dirty_folio 77 + (fetchpatch { 78 + url = "https://git.openafs.org/?p=openafs.git;a=patch;h=6aa129e743e882cf30c35afd67eabf82274c5fca"; 79 + hash = "sha256-8R0rdKYs7+Zl1sdizOZzpBjy6e9J+42R9HzsNUa/PQ4="; 80 + }) 81 + # afs: introduce afs_alloc_ncr/afs_free_ncr 82 + (fetchpatch { 83 + url = "https://git.openafs.org/?p=openafs.git;a=patch;h=209eb92448001e59525413610356070d8e4f10a0"; 84 + hash = "sha256-t455gTaK5U+m0qcyKjTqnWTOb4qz6VN/JYZzRAAV8kM="; 85 + }) 86 + # afs: introduce get_dcache_readahead 87 + (fetchpatch { 88 + url = "https://git.openafs.org/?p=openafs.git;a=patch;h=44e24ae5d7dc41e54d23638d5f64ab2e81e43ad0"; 89 + hash = "sha256-gtUNDSHAq+RY1Rm17YcxcUALy7FEBQf9k8/ELQlPORU="; 90 + }) 91 + # Linux-5.18: replace readpages with readahead 92 + (fetchBase64Patch { 93 + url = "https://gerrit.openafs.org/changes/14953/revisions/0497b0cd7bffb6335ab9bcbf5a1310b8c6a4b299/patch"; 94 + hash = "sha256-a5pd+CHHPr1mGxsF7tSlaBqoiKw2IGr1mJ7EaDHDJSw="; 95 + }) 66 96 ]; 67 97 68 98 hardeningDisable = [ "pic" ]; ··· 102 132 homepage = "https://www.openafs.org"; 103 133 license = licenses.ipl10; 104 134 platforms = platforms.linux; 105 - maintainers = with maintainers; [ maggesi spacefrogg ]; 106 - broken = kernel.isHardened || kernel.kernelAtLeast "5.18"; 135 + maintainers = with maintainers; [ andersk maggesi spacefrogg ]; 136 + broken = kernel.isHardened || kernel.kernelAtLeast "5.19"; 107 137 }; 108 138 }