openafs: 1.8.12 → 1.8.13

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg 2024-11-12 14:02:04 -08:00
parent 76612b17c0
commit 0eb18249a5
2 changed files with 4 additions and 30 deletions

View File

@ -30,33 +30,7 @@ stdenv.mkDerivation {
version = "${version}-${kernel.modDirVersion}"; version = "${version}-${kernel.modDirVersion}";
inherit src; inherit src;
patches = [ patches = [ ];
# Linux-6.10: Use filemap_alloc_folio when avail
(fetchpatch {
url = "https://github.com/openafs/openafs/commit/0f6a3a402f4a66114da9231032bd68cdc4dee7bc.patch";
hash = "sha256-1D0mijyF4hbd+xCONT50cd6T9eCpeM8Li3nCI7HgLPA=";
})
# Linux-6.10: define a wrapper for vmalloc
(fetchpatch {
url = "https://github.com/openafs/openafs/commit/658942f2791fad5e33ec7542158c16dfc66eed39.patch";
hash = "sha256-MhfAUX/eNOEkjO0cGVbnIdObMlGtLdCnnGfJECDwO+A=";
})
# Linux-6.10: remove includes for asm/ia32_unistd.h
(fetchpatch {
url = "https://github.com/openafs/openafs/commit/03b280649f5e22ed74c217d7c98c3416a2fa9052.patch";
hash = "sha256-ZdXz2ziuflqz7zNzjepuGvwDAPM31FIzsoEa4iNdLmo=";
})
# afs: avoid empty-body warning
(fetchpatch {
url = "https://github.com/openafs/openafs/commit/d8b56f21994ce66d8daebb7d69e792f34c1a19ed.patch";
hash = "sha256-10VUfZdZiOC8xSPM0nq8onqiv7X/Vv4/WwGlkqWkNkQ=";
})
# Linux 6.10: Move 'inline' before func return type
(fetchpatch {
url = "https://github.com/openafs/openafs/commit/7097eec17bc01bcfc12c4d299136b2d3b94ec3d7.patch";
hash = "sha256-PZmqeXWJL3EQFD9250YfDwCY1rvSGVCbAhzyHP1pE0Q=";
})
];
nativeBuildInputs = [ autoconf automake flex libtool_2 perl which bison ] nativeBuildInputs = [ autoconf automake flex libtool_2 perl which bison ]
++ kernel.moduleBuildDependencies; ++ kernel.moduleBuildDependencies;

View File

@ -1,16 +1,16 @@
{ fetchurl }: { fetchurl }:
rec { rec {
version = "1.8.12"; version = "1.8.13";
src = fetchurl { src = fetchurl {
url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
hash = "sha256-EP6mgQxsCwD/ss0/OO1zLBfP15VcoJVNwkoqYXKibnU="; hash = "sha256-eRABcMokkLEpXZuLEwWPMOI9eruJe/GgcXVddnB4vdE=";
}; };
srcs = [ srcs = [
src src
(fetchurl { (fetchurl {
url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2";
hash = "sha256-ZMbDE8c9S7fHclRQo+bcSiXuHBtxt3IoSABOvOWWJWc="; hash = "sha256-1PPUL05XZkfbIV2rc8Nl0gQ9MmrT0hqA+MRzGdPkP+U=";
}) })
]; ];
} }