Unverified Commit 54fb36fc authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #242971 from andersk/openafs 

openafs: 1.8.9 → 1.8.10
parents 528270ee 96b23c36

pkgs/servers/openafs/1.8/cross-build.patch

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ diff -Nur --unidirectional-new-file openafs-1.8.2/src/comerr/Makefile.in openafs 
@@ -38,11 +38,14 @@

 compile_et:	compile_et.o error_table.o

 	$(Q)case $(SYS_NAME) in \

 	*_linux* | *_umlinux* | *_darwin* ) \

 	*_linux* | *_umlinux* | *_darwin* | rs_aix72 | rs_aix73 ) \

-	$(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr $(buildtool_roken) $(MT_LIBS);; \

+	$(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr_build $(buildtool_roken) $(MT_LIBS);; \

 	* ) \

pkgs/servers/openafs/1.8/module.nix

+0 −48
Original line number Diff line number Diff line
@@ -37,54 +37,6 @@ stdenv.mkDerivation { 


  buildInputs = [ libkrb5 ];



  patches = [

    # LINUX: Run the 'sparse' checker if available

    (fetchpatch {

      url = "https://git.openafs.org/?p=openafs.git;a=patch;h=2cf76b31ce4c912b1151c141818f6e8c5cddcab2";

      hash = "sha256-//7HSlotx70vWDEMB8P8or4ZmmXZthgioUOkvOcJpgk=";

    })

    # cf: Detect how to pass CFLAGS to linux kbuild

    (fetchpatch {

      url = "https://git.openafs.org/?p=openafs.git;a=patch;h=57df4dff496ca9bea04510759b8fdd9cd2cc0009";

      hash = "sha256-pJnW9bVz2ZQZUvZ+PcZ5gEgCL5kcbTGxsyMNvM2IseU=";

    })

    # cf: Handle autoconf linux checks with -Werror

    (fetchpatch {

      url = "https://git.openafs.org/?p=openafs.git;a=patch;h=b17625959386459059f6f43875d8817383554481";

      hash = "sha256-Kqx5QEX1p4UoIsWxqvJVX4IyCQFiWxtAOgvAtk+ULuQ=";

    })

    # Linux: Fix functions without prototypes

    (fetchpatch {

      url = "https://git.openafs.org/?p=openafs.git;a=patch;h=3084117f10bd62acb1182cb54fc85b1d96738f70";

      hash = "sha256-nNyqDQfS9zzlS2i3dbfud2tQOaTQ1x/rZcQEsaLu3qc=";

    })

    # Linux: Check for block_dirty_folio

    (fetchpatch {

      url = "https://git.openafs.org/?p=openafs.git;a=patch;h=f0fee2c7752d18ff183d60bcfba4c98c3348cd5f";

      hash = "sha256-tnNlVjZ5exC+jo78HC/y8yp0L8KQroFvVRzTC+O6vlY=";

    })

    # Linux: Replace lru_cache_add with folio_add_lru

    (fetchpatch {

      url = "https://git.openafs.org/?p=openafs.git;a=patch;h=b885159cc2bc6c746aec1d54cdd8a515d1115d14";

      hash = "sha256-ptPALSbZPSGu8PMmZiOkHUd5x0UItqIM7U7wJlxtSL8=";

    })

    # LINUX 5.13: set .proc_lseek in proc_ops

    (fetchpatch {

      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" ];



  configureFlags = [

pkgs/servers/openafs/1.8/srcs.nix

+3 −3
Original line number Diff line number Diff line 
{ fetchurl }:

rec {

  version = "1.8.9";

  version = "1.8.10";

  src = fetchurl {

    url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";

    hash = "sha256-0SYXi+H0LMoYy3wMJpGsNUUY43kBcBUKdrvSX00VHwY=";

    hash = "sha256-n+wRNkYjVJ6NtzdAcvXI8BuEH2v+foVnPLzjX/Q/+wc=";

  };



  srcs = [

    src

    (fetchurl {

      url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2";

      hash = "sha256-75HoVOq0qnQmhSWVSkHCoq0KLq9TDqoiu55L9FOxWTk=";

      hash = "sha256-nDgJ6K/qAX2K8lKPYM8OD5+oRU+shlM6PmciHy61+10=";

    })

  ];

}