public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openafs_1_8: 1.8.3 -> 1.8.5 (#75104)

Browse Source 
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg 2019-12-07 08:58:19 -08:00 committed by Dmitry Kalinkin
parent 6bd93d58d5
commit b661db12e8
4 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/servers/openafs/1.8/cross-build.patch
View File

@ -2,9 +2,9 @@ diff -Nur --unidirectional-new-file openafs-1.8.2/configure.ac openafs-1.8.2.new
--- openafs-1.8.2/configure.ac 2018-09-11 17:52:48.000000000 +0200 --- openafs-1.8.2/configure.ac 2018-09-11 17:52:48.000000000 +0200
+++ openafs-1.8.2.new/configure.ac 2018-10-16 15:56:36.512277860 +0200 +++ openafs-1.8.2.new/configure.ac 2018-10-16 15:56:36.512277860 +0200
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
AFS_LT_INIT
AC_PROG_CC AC_PROG_CC
AC_PROG_LIBTOOL
+AX_PROG_CC_FOR_BUILD +AX_PROG_CC_FOR_BUILD
AC_PATH_PROGS([PATH_CPP], [cpp], [${CC-cc} -E], [$PATH:/lib:/usr/ccs/lib]) AC_PATH_PROGS([PATH_CPP], [cpp], [${CC-cc} -E], [$PATH:/lib:/usr/ccs/lib])

3
pkgs/servers/openafs/1.8/default.nix
View File

@ -28,9 +28,6 @@ stdenv.mkDerivation {
# Makefiles don't include install targets for all new shared libs, yet. # Makefiles don't include install targets for all new shared libs, yet.
dontDisableStatic = true; dontDisableStatic = true;
# Fixes broken format string in 1.8.2
hardeningDisable=[ "format" ];
preConfigure = '' preConfigure = ''
patchShebangs . patchShebangs .
for i in `grep -l -R '/usr/\(include\|src\)' .`; do for i in `grep -l -R '/usr/\(include\|src\)' .`; do

14
pkgs/servers/openafs/1.8/module.nix
View File

@ -11,20 +11,6 @@ in stdenv.mkDerivation {
name = "openafs-${version}-${kernel.modDirVersion}"; name = "openafs-${version}-${kernel.modDirVersion}";
inherit version src; inherit version src;
patches = [
# Linux 5.3
(fetchpatch {
name = "openafs_1_8-recurse-keyring_search.patch";
url = "http://git.openafs.org/?p=openafs.git;a=patch;h=02d82275c17284d04629282aa374bb39f511c989";
sha256 = "03pkldwf6i67yf6i1705qp18rx5b0b342ryda8vfjw9lnvpinygs";
})
(fetchpatch {
name = "openafs_1_8-send-sig.patch";
url = "http://git.openafs.org/?p=openafs.git;a=patch;h=2b7af1243f46496c0b5973b3fa2a6396243f7613";
sha256 = "13gyh5ncpp15dl7056gdzl5xhp2bmafc557bd2a4bwx9nyj53bag";
})
];
nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ] nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ]
++ kernel.moduleBuildDependencies; ++ kernel.moduleBuildDependencies;

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

@ -1,14 +1,14 @@
{ fetchurl }: { fetchurl }:
rec { rec {
version = "1.8.3"; version = "1.8.5";
src = fetchurl { src = fetchurl {
url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
sha256 = "19ffchxwgqg4wl98l456jdpgq2w8b5izn8hxdsq9hjs0a1nc3nga"; sha256 = "08w5n803xm75j7daa3mr2ncfmcg0wpm7yasj6zyddqlb4f7xdppf";
}; };
srcs = [ src srcs = [ src
(fetchurl { (fetchurl {
url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2";
sha256 = "14smdhn1f6f3cbvvwxgjjld0m4b17vqh3rzkxf5apmjsdda21njq"; sha256 = "08mg3n0q2igfas1khj18r9apyrkpbp1jick0ix5nfaal90jbifis";
})]; })];
} }