mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 19:21:04 +00:00
Code Issues Wiki Activity

openafs: 1.8.10 → 1.8.11

Browse source 
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg 2024-03-24 19:27:17 -07:00
parent 44d0940ea5
commit ebb1bd4541
3 changed files with 11 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/servers/openafs/1.8/bosserver.patch
View file

@ -1,17 +1,14 @@
diff -u openafs-1.8.0/src/bozo/bosserver.c /tmp/buffer-content-13110-gd
--- openafs-1.8.0/src/bozo/bosserver.c
+++ #<buffer bosserver.c>
@@ -244,24 +244,6 @@
diff --git a/src/bozo/bosserver.c b/src/bozo/bosserver.c
index 371cb638e4..e4d58c3562 100644
--- a/src/bozo/bosserver.c
+++ b/src/bozo/bosserver.c
@@ -246,20 +246,6 @@ MakeDir(const char *adir)
static int
CreateDirs(const char *coredir)
{
- if ((!strncmp
- (AFSDIR_USR_DIRPATH, AFSDIR_CLIENT_ETC_DIRPATH,
- strlen(AFSDIR_USR_DIRPATH)))
- ||
- (!strncmp
- if (!strncmp
- (AFSDIR_USR_DIRPATH, AFSDIR_SERVER_BIN_DIRPATH,
- strlen(AFSDIR_USR_DIRPATH)))) {
- strlen(AFSDIR_USR_DIRPATH))) {
- if (MakeDir(AFSDIR_USR_DIRPATH))
- return errno;
- }
@ -26,5 +23,3 @@ diff -u openafs-1.8.0/src/bozo/bosserver.c /tmp/buffer-content-13110-gd
if (MakeDir(AFSDIR_SERVER_ETC_DIRPATH))
return errno;
if (MakeDir(AFSDIR_SERVER_LOCAL_DIRPATH))
Diff finished. Fri Jun 29 15:45:46 2018

78
pkgs/servers/openafs/1.8/module.nix
View file

@ -32,83 +32,7 @@ stdenv.mkDerivation {
version = "${version}-${kernel.modDirVersion}";
inherit src;
patches = [
# cf: Fix cast-function-type err w/disable-checking
(fetchpatch {
url = "https://git.openafs.org?p=openafs.git;a=patch;h=6867a3e8429f37fb748575df52256227ae9e5b53";
hash = "sha256-FDvOFDzl2eFN7ZKUqQBQSWGo0ntayc8NCYh/haVi8Ng=";
})
# LINUX: Make 'fs flush*' invalidate dentry
(fetchpatch {
url = "https://git.openafs.org?p=openafs.git;a=patch;h=898098e01e19970f80f60a0551252b2027246038";
hash = "sha256-ehwRrzpqB8iJKuZ/18oJsrHVlKQs6EzCNaPtSG1m0sw=";
})
# Linux 6.5: Replace generic_file_splice_read
(fetchpatch {
url = "https://git.openafs.org?p=openafs.git;a=patch;h=fef245769366efe8694ddadd1e1f2ed5ef8608f4";
hash = "sha256-TD1xYvlc9aJyravNZLPhceeOwBawvn0Ndxd50rszTJU=";
})
# LINUX: Make sysctl definitions more concise
(fetchpatch {
url = "https://git.openafs.org?p=openafs.git;a=patch;h=d15c7ab50c92671052cbe9a93b0440c81156d8aa";
hash = "sha256-6K593AJvgC34RfnIqW8+0A/v9cF6tsbVMeKpCv+QrK4=";
})
# Linux 6.5: Use register_sysctl()
(fetchpatch {
url = "https://git.openafs.org?p=openafs.git;a=patch;h=63801cfd1fc06ec3259fcfd67229f3a3c70447ed";
hash = "sha256-eoQxaZ28OanSoaHRJcfvXQORbe21YLhwPLoJUILjMkU=";
})
# hcrypto: rename abort to _afscrypto_abort
(fetchpatch {
url = "https://git.openafs.org?p=openafs.git;a=patch;h=538f450033a67e251b473ff92238b3124b85fc72";
hash = "sha256-ztfJQKvGHGdWQe/0+BGkgRFxOi3n4YY+EFxgbD3DO1E=";
})
# cf: Avoid nested C functions built by autoconf
(fetchpatch {
url = "https://git.openafs.org?p=openafs.git;a=patch;h=d50ced2a17e05884ea18bb3dfcde6378b2531dc7";
hash = "sha256-dK2/9bGhlXCPCB9t9T/K2dKdRBShVKXtYXWPttsOhAM=";
})
# cf: Use static allocated structs for cf tests
(fetchpatch {
url = "https://git.openafs.org?p=openafs.git;a=patch;h=00f13c45d637249a0d698458e08c1b8e2da8e219";
hash = "sha256-YNszJIxBDIsl3RgBcHEpNtYIrNLC0tnSbIOQvX0oZ+s=";
})
# LINUX: Pass an array of structs to register_sysctl
(fetchpatch {
url = "https://git.openafs.org?p=openafs.git;a=patch;h=5b647bf17a878271e1ce9882e41663770ee73528";
hash = "sha256-9o4cr/KORtanTfuKMAMAOvePB+vK579rR85rY+m8VNM=";
})
# linux: Replace fop iterate with fop iterate_shared
(fetchpatch {
url = "https://git.openafs.org?p=openafs.git;a=patch;h=6de0a646036283266e1d4aeb583e426005ca5ad4";
hash = "sha256-cL3ByjUS3QU8fSbuN7ZEEKyjb+6TbbZL10UKbSgNl6c=";
})
# Linux 6.6: convert to ctime accessor functions
(fetchpatch {
url = "https://git.openafs.org?p=openafs.git;a=patch;h=6413fdbc913834f2884989e5811841f4ccea2b5f";
hash = "sha256-vdK25vfS5Yr0xQufzUk431FXHwMIWlP2UpLjqnobJWI=";
})
# Linux 6.6: Pass request_mask to generic_fillattr
(fetchpatch {
url = "https://git.openafs.org?p=openafs.git;a=patch;h=4f1d8104d17d2b4e95c7abaf5498db6b80aefa8f";
hash = "sha256-XJpqbDB/LOuqZj3gPHlcLeGzAQCGvPH8ArgWf+sbBJU=";
})
# Linux: Fix to use time_t instead of time64_t
(fetchpatch {
url = "https://git.openafs.org?p=openafs.git;a=patch;h=56763a199f92101c35d6b9b733302cb08fe0cdbe";
hash = "sha256-A2z+smBLQg6k+cHPpNr2s/SgoYuCOMNLcvm5LFRiqeM=";
})
# dir: Introduce struct DirEntryFlex
(fetchpatch {
url = "https://git.openafs.org?p=openafs.git;a=patch;h=fd527549c2d2b29a955f8c0427ac67c5d49ef38c";
hash = "sha256-jblsaJuTt3BsW5MG69ETcao/ZzSuh9aKRZyTIxZ7Ty4=";
})
# Linux 6.7: convert to inode a/mtime accessor funcs
(fetchpatch {
url = "https://git.openafs.org?p=openafs.git;a=patch;h=6edf9d350c6ffd9d5e51fb8106701c1bc2f6a4d9";
hash = "sha256-oQVyKzIcqzYDZHSut9Mw1t3kcEC5HGUX6eGlGJ9fZYo=";
})
];
patches = [ ];
nativeBuildInputs = [ autoconf automake flex libtool_2 perl which bison ]
++ kernel.moduleBuildDependencies;

6
pkgs/servers/openafs/1.8/srcs.nix
View file

@ -1,16 +1,16 @@
{ fetchurl }:
rec {
version = "1.8.10";
version = "1.8.11";
src = fetchurl {
url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
hash = "sha256-n+wRNkYjVJ6NtzdAcvXI8BuEH2v+foVnPLzjX/Q/+wc=";
hash = "sha256-4u+0cQmWt9IxmLU8Vilaj54k6KVVMXxfxjuBJaNxTs0=";
};
srcs = [
src
(fetchurl {
url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2";
hash = "sha256-nDgJ6K/qAX2K8lKPYM8OD5+oRU+shlM6PmciHy61+10=";
hash = "sha256-OsarP52T1V3hd1eQOwST/JAg8eBALqMZ5hIIs5ALYHw=";
})
];
}