openafs_1_9: Remove
Odd-numbered branches like 1.9 are development releases. Upstream doesn’t consider them ready for production use, and doesn’t provide prompt updates for security or kernel support. Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg
parent
0ea7a8f1b9
commit
038f3485e7
8 changed files with 0 additions and 500 deletions
|
|
@ -1,30 +0,0 @@
|
||||||
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 @@
|
|
||||||
static int
|
|
||||||
CreateDirs(const char *coredir)
|
|
||||||
{
|
|
||||||
- if ((!strncmp
|
|
||||||
- (AFSDIR_USR_DIRPATH, AFSDIR_CLIENT_ETC_DIRPATH,
|
|
||||||
- strlen(AFSDIR_USR_DIRPATH)))
|
|
||||||
- ||
|
|
||||||
- (!strncmp
|
|
||||||
- (AFSDIR_USR_DIRPATH, AFSDIR_SERVER_BIN_DIRPATH,
|
|
||||||
- strlen(AFSDIR_USR_DIRPATH)))) {
|
|
||||||
- if (MakeDir(AFSDIR_USR_DIRPATH))
|
|
||||||
- return errno;
|
|
||||||
- }
|
|
||||||
- if (!strncmp
|
|
||||||
- (AFSDIR_SERVER_AFS_DIRPATH, AFSDIR_SERVER_BIN_DIRPATH,
|
|
||||||
- strlen(AFSDIR_SERVER_AFS_DIRPATH))) {
|
|
||||||
- if (MakeDir(AFSDIR_SERVER_AFS_DIRPATH))
|
|
||||||
- return errno;
|
|
||||||
- }
|
|
||||||
- if (MakeDir(AFSDIR_SERVER_BIN_DIRPATH))
|
|
||||||
- return errno;
|
|
||||||
if (MakeDir(AFSDIR_SERVER_ETC_DIRPATH))
|
|
||||||
return errno;
|
|
||||||
if (MakeDir(AFSDIR_SERVER_LOCAL_DIRPATH))
|
|
||||||
|
|
||||||
Diff finished. Fri Jun 29 15:45:46 2018
|
|
||||||
|
|
@ -1,223 +0,0 @@
|
||||||
diff -Nur --unidirectional-new-file openafs-1.8.2/configure.ac openafs-1.8.2.new/configure.ac
|
|
||||||
--- 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
|
|
||||||
@@ -23,6 +23,7 @@
|
|
||||||
AFS_LT_INIT
|
|
||||||
|
|
||||||
AC_PROG_CC
|
|
||||||
+AX_PROG_CC_FOR_BUILD
|
|
||||||
|
|
||||||
AC_PATH_PROGS([PATH_CPP], [cpp], [${CC-cc} -E], [$PATH:/lib:/usr/ccs/lib])
|
|
||||||
AC_SUBST([PATH_CPP])
|
|
||||||
diff -Nur --unidirectional-new-file openafs-1.8.2/src/cf/ax_prog_cc_for_build.m4 openafs-1.8.2.new/src/cf/ax_prog_cc_for_build.m4
|
|
||||||
--- openafs-1.8.2/src/cf/ax_prog_cc_for_build.m4 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
+++ openafs-1.8.2.new/src/cf/ax_prog_cc_for_build.m4 2018-10-16 16:20:40.278641658 +0200
|
|
||||||
@@ -0,0 +1,125 @@
|
|
||||||
+# ===========================================================================
|
|
||||||
+# https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html
|
|
||||||
+# ===========================================================================
|
|
||||||
+#
|
|
||||||
+# SYNOPSIS
|
|
||||||
+#
|
|
||||||
+# AX_PROG_CC_FOR_BUILD
|
|
||||||
+#
|
|
||||||
+# DESCRIPTION
|
|
||||||
+#
|
|
||||||
+# This macro searches for a C compiler that generates native executables,
|
|
||||||
+# that is a C compiler that surely is not a cross-compiler. This can be
|
|
||||||
+# useful if you have to generate source code at compile-time like for
|
|
||||||
+# example GCC does.
|
|
||||||
+#
|
|
||||||
+# The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything
|
|
||||||
+# needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD).
|
|
||||||
+# The value of these variables can be overridden by the user by specifying
|
|
||||||
+# a compiler with an environment variable (like you do for standard CC).
|
|
||||||
+#
|
|
||||||
+# It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object
|
|
||||||
+# file extensions for the build platform, and GCC_FOR_BUILD to `yes' if
|
|
||||||
+# the compiler we found is GCC. All these variables but GCC_FOR_BUILD are
|
|
||||||
+# substituted in the Makefile.
|
|
||||||
+#
|
|
||||||
+# LICENSE
|
|
||||||
+#
|
|
||||||
+# Copyright (c) 2008 Paolo Bonzini <bonzini@gnu.org>
|
|
||||||
+#
|
|
||||||
+# Copying and distribution of this file, with or without modification, are
|
|
||||||
+# permitted in any medium without royalty provided the copyright notice
|
|
||||||
+# and this notice are preserved. This file is offered as-is, without any
|
|
||||||
+# warranty.
|
|
||||||
+
|
|
||||||
+#serial 9
|
|
||||||
+
|
|
||||||
+AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD])
|
|
||||||
+AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl
|
|
||||||
+AC_REQUIRE([AC_PROG_CC])dnl
|
|
||||||
+AC_REQUIRE([AC_PROG_CPP])dnl
|
|
||||||
+AC_REQUIRE([AC_EXEEXT])dnl
|
|
||||||
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
|
||||||
+
|
|
||||||
+dnl Use the standard macros, but make them use other variable names
|
|
||||||
+dnl
|
|
||||||
+pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl
|
|
||||||
+pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl
|
|
||||||
+pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl
|
|
||||||
+pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl
|
|
||||||
+pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl
|
|
||||||
+pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl
|
|
||||||
+pushdef([ac_cv_objext], ac_cv_build_objext)dnl
|
|
||||||
+pushdef([ac_exeext], ac_build_exeext)dnl
|
|
||||||
+pushdef([ac_objext], ac_build_objext)dnl
|
|
||||||
+pushdef([CC], CC_FOR_BUILD)dnl
|
|
||||||
+pushdef([CPP], CPP_FOR_BUILD)dnl
|
|
||||||
+pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl
|
|
||||||
+pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl
|
|
||||||
+pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl
|
|
||||||
+pushdef([host], build)dnl
|
|
||||||
+pushdef([host_alias], build_alias)dnl
|
|
||||||
+pushdef([host_cpu], build_cpu)dnl
|
|
||||||
+pushdef([host_vendor], build_vendor)dnl
|
|
||||||
+pushdef([host_os], build_os)dnl
|
|
||||||
+pushdef([ac_cv_host], ac_cv_build)dnl
|
|
||||||
+pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl
|
|
||||||
+pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl
|
|
||||||
+pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl
|
|
||||||
+pushdef([ac_cv_host_os], ac_cv_build_os)dnl
|
|
||||||
+pushdef([ac_cpp], ac_build_cpp)dnl
|
|
||||||
+pushdef([ac_compile], ac_build_compile)dnl
|
|
||||||
+pushdef([ac_link], ac_build_link)dnl
|
|
||||||
+
|
|
||||||
+save_cross_compiling=$cross_compiling
|
|
||||||
+save_ac_tool_prefix=$ac_tool_prefix
|
|
||||||
+cross_compiling=no
|
|
||||||
+ac_tool_prefix=
|
|
||||||
+
|
|
||||||
+AC_PROG_CC
|
|
||||||
+AC_PROG_CPP
|
|
||||||
+AC_EXEEXT
|
|
||||||
+
|
|
||||||
+ac_tool_prefix=$save_ac_tool_prefix
|
|
||||||
+cross_compiling=$save_cross_compiling
|
|
||||||
+
|
|
||||||
+dnl Restore the old definitions
|
|
||||||
+dnl
|
|
||||||
+popdef([ac_link])dnl
|
|
||||||
+popdef([ac_compile])dnl
|
|
||||||
+popdef([ac_cpp])dnl
|
|
||||||
+popdef([ac_cv_host_os])dnl
|
|
||||||
+popdef([ac_cv_host_vendor])dnl
|
|
||||||
+popdef([ac_cv_host_cpu])dnl
|
|
||||||
+popdef([ac_cv_host_alias])dnl
|
|
||||||
+popdef([ac_cv_host])dnl
|
|
||||||
+popdef([host_os])dnl
|
|
||||||
+popdef([host_vendor])dnl
|
|
||||||
+popdef([host_cpu])dnl
|
|
||||||
+popdef([host_alias])dnl
|
|
||||||
+popdef([host])dnl
|
|
||||||
+popdef([LDFLAGS])dnl
|
|
||||||
+popdef([CPPFLAGS])dnl
|
|
||||||
+popdef([CFLAGS])dnl
|
|
||||||
+popdef([CPP])dnl
|
|
||||||
+popdef([CC])dnl
|
|
||||||
+popdef([ac_objext])dnl
|
|
||||||
+popdef([ac_exeext])dnl
|
|
||||||
+popdef([ac_cv_objext])dnl
|
|
||||||
+popdef([ac_cv_exeext])dnl
|
|
||||||
+popdef([ac_cv_prog_cc_g])dnl
|
|
||||||
+popdef([ac_cv_prog_cc_cross])dnl
|
|
||||||
+popdef([ac_cv_prog_cc_works])dnl
|
|
||||||
+popdef([ac_cv_prog_gcc])dnl
|
|
||||||
+popdef([ac_cv_prog_CPP])dnl
|
|
||||||
+
|
|
||||||
+dnl Finally, set Makefile variables
|
|
||||||
+dnl
|
|
||||||
+BUILD_EXEEXT=$ac_build_exeext
|
|
||||||
+BUILD_OBJEXT=$ac_build_objext
|
|
||||||
+AC_SUBST(BUILD_EXEEXT)dnl
|
|
||||||
+AC_SUBST(BUILD_OBJEXT)dnl
|
|
||||||
+AC_SUBST([CFLAGS_FOR_BUILD])dnl
|
|
||||||
+AC_SUBST([CPPFLAGS_FOR_BUILD])dnl
|
|
||||||
+AC_SUBST([LDFLAGS_FOR_BUILD])dnl
|
|
||||||
+])
|
|
||||||
diff -Nur --unidirectional-new-file openafs-1.8.2/src/comerr/Makefile.in openafs-1.8.2.new/src/comerr/Makefile.in
|
|
||||||
--- openafs-1.8.2/src/comerr/Makefile.in 2018-09-11 17:52:48.000000000 +0200
|
|
||||||
+++ openafs-1.8.2.new/src/comerr/Makefile.in 2018-10-16 15:48:19.678898925 +0200
|
|
||||||
@@ -38,11 +38,14 @@
|
|
||||||
compile_et: compile_et.o error_table.o
|
|
||||||
$(Q)case $(SYS_NAME) in \
|
|
||||||
*_linux* | *_umlinux* | *_darwin* ) \
|
|
||||||
- $(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);; \
|
|
||||||
* ) \
|
|
||||||
- $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr -ll $(buildtool_roken) $(MT_LIBS);; \
|
|
||||||
+ $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr_build -ll $(buildtool_roken) $(MT_LIBS);; \
|
|
||||||
esac
|
|
||||||
|
|
||||||
+compile_et compile_et.o error_table.o: CC=$(CC_FOR_BUILD)
|
|
||||||
+compile_et compile_et.o error_table.o: LD=$(CC_FOR_BUILD)
|
|
||||||
+
|
|
||||||
libafscom_err.a: $(LT_objs)
|
|
||||||
$(LT_LDLIB_lwp) $(LT_objs)
|
|
||||||
|
|
||||||
diff -Nur --unidirectional-new-file openafs-1.8.2/src/config/Makefile.in openafs-1.8.2.new/src/config/Makefile.in
|
|
||||||
--- openafs-1.8.2/src/config/Makefile.in 2018-09-11 17:52:48.000000000 +0200
|
|
||||||
+++ openafs-1.8.2.new/src/config/Makefile.in 2018-10-16 15:48:19.677898926 +0200
|
|
||||||
@@ -54,6 +54,8 @@
|
|
||||||
|
|
||||||
config.o: config.c AFS_component_version_number.c
|
|
||||||
|
|
||||||
+config mkvers config.o mc.o: CC=$(CC_FOR_BUILD)
|
|
||||||
+
|
|
||||||
#
|
|
||||||
# Include installation targets
|
|
||||||
#
|
|
||||||
diff -Nur --unidirectional-new-file openafs-1.8.2/src/opr/Makefile.in openafs-1.8.2.new/src/opr/Makefile.in
|
|
||||||
--- openafs-1.8.2/src/opr/Makefile.in 2018-09-11 17:52:48.000000000 +0200
|
|
||||||
+++ openafs-1.8.2.new/src/opr/Makefile.in 2018-10-16 15:48:19.678898925 +0200
|
|
||||||
@@ -21,7 +21,7 @@
|
|
||||||
$(TOP_INCDIR)/opr/time.h \
|
|
||||||
$(TOP_INCDIR)/opr/uuid.h
|
|
||||||
|
|
||||||
-all: $(HEADERS) liboafs_opr.la $(TOP_LIBDIR)/libopr_pic.a $(TOP_LIBDIR)/libopr.a
|
|
||||||
+all: $(HEADERS) liboafs_opr.la $(TOP_LIBDIR)/libopr_pic.a $(TOP_LIBDIR)/libopr.a $(TOP_LIBDIR)/libopr_build.a
|
|
||||||
|
|
||||||
liboafs_opr.la: liboafs_opr.la.sym $(LT_objs) $(LT_deps)
|
|
||||||
$(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs)
|
|
||||||
@@ -29,12 +29,26 @@
|
|
||||||
libopr.a: $(LT_objs)
|
|
||||||
$(LT_LDLIB_static) $(LT_objs)
|
|
||||||
|
|
||||||
+LT_objs_build = $(patsubst %.lo, %_build.lo, $(LT_objs))
|
|
||||||
+
|
|
||||||
+%_build.lo: %.c
|
|
||||||
+ $(LT_CCRULE) $<
|
|
||||||
+
|
|
||||||
+libopr_build.a: $(LT_objs_build)
|
|
||||||
+ $(LT_LDLIB_static) $(LT_objs_build)
|
|
||||||
+
|
|
||||||
+libopr_build.a $(LT_objs_build): CC=$(CC_FOR_BUILD)
|
|
||||||
+libopr_build.a $(LT_objs_build): LD=$(CC_FOR_BUILD)
|
|
||||||
+
|
|
||||||
libopr_pic.la: $(LT_objs)
|
|
||||||
$(LT_LDLIB_pic) $(LT_objs)
|
|
||||||
|
|
||||||
$(TOP_LIBDIR)/libopr.a: libopr.a
|
|
||||||
$(INSTALL_DATA) libopr.a $@
|
|
||||||
|
|
||||||
+$(TOP_LIBDIR)/libopr_build.a: libopr_build.a
|
|
||||||
+ $(INSTALL_DATA) libopr_build.a $@
|
|
||||||
+
|
|
||||||
$(TOP_LIBDIR)/libopr_pic.a: libopr_pic.la
|
|
||||||
$(INSTALL_DATA) .libs/libopr_pic.a $@
|
|
||||||
|
|
||||||
diff -Nur --unidirectional-new-file openafs-1.8.2/src/rxgen/Makefile.in openafs-1.8.2.new/src/rxgen/Makefile.in
|
|
||||||
--- openafs-1.8.2/src/rxgen/Makefile.in 2018-09-11 17:52:48.000000000 +0200
|
|
||||||
+++ openafs-1.8.2.new/src/rxgen/Makefile.in 2018-10-16 15:48:19.677898926 +0200
|
|
||||||
@@ -25,6 +25,8 @@
|
|
||||||
|
|
||||||
CFLAGS_rpc_main.o= -DPATH_CPP="\"$(PATH_CPP)\""
|
|
||||||
|
|
||||||
+rxgen $(OBJS): CC=$(CC_FOR_BUILD)
|
|
||||||
+
|
|
||||||
#
|
|
||||||
# Install targets
|
|
||||||
#
|
|
||||||
|
|
@ -1,105 +0,0 @@
|
||||||
{ lib, stdenv, buildPackages, fetchurl, which, autoconf, automake, flex
|
|
||||||
, bison , glibc, perl, libkrb5, libxslt, docbook_xsl, file
|
|
||||||
, docbook_xml_dtd_43, libtool_2
|
|
||||||
, withDevdoc ? false, doxygen, dblatex # Extra developer documentation
|
|
||||||
, ncurses # Extra ncurses utilities. Needed for debugging and monitoring.
|
|
||||||
, tsmbac ? null # Tivoli Storage Manager Backup Client from IBM
|
|
||||||
}:
|
|
||||||
|
|
||||||
with (import ./srcs.nix { inherit fetchurl; });
|
|
||||||
let
|
|
||||||
inherit (lib) optional optionalString optionals;
|
|
||||||
|
|
||||||
in stdenv.mkDerivation {
|
|
||||||
pname = "openafs";
|
|
||||||
inherit version srcs;
|
|
||||||
|
|
||||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
|
||||||
nativeBuildInputs = [ autoconf automake flex libxslt libtool_2 perl
|
|
||||||
which bison ] ++ optionals withDevdoc [ doxygen dblatex ];
|
|
||||||
|
|
||||||
buildInputs = [ libkrb5 ncurses ];
|
|
||||||
|
|
||||||
patches = [ ./bosserver.patch ./cross-build.patch ] ++ optional (tsmbac != null) ./tsmbac.patch;
|
|
||||||
|
|
||||||
outputs = [ "out" "dev" "man" "doc" ] ++ optional withDevdoc "devdoc";
|
|
||||||
|
|
||||||
enableParallelBuilding = false;
|
|
||||||
|
|
||||||
setOutputFlags = false;
|
|
||||||
|
|
||||||
# Makefiles don't include install targets for all new shared libs, yet.
|
|
||||||
dontDisableStatic = true;
|
|
||||||
|
|
||||||
preConfigure = ''
|
|
||||||
patchShebangs .
|
|
||||||
for i in `grep -l -R '/usr/\(include\|src\)' .`; do
|
|
||||||
echo "Patch /usr/include and /usr/src in $i"
|
|
||||||
substituteInPlace $i \
|
|
||||||
--replace "/usr/include" "${glibc.dev}/include" \
|
|
||||||
--replace "/usr/src" "$TMP"
|
|
||||||
done
|
|
||||||
|
|
||||||
for i in ./doc/xml/{AdminGuide,QuickStartUnix,UserGuide}/*.xml; do
|
|
||||||
substituteInPlace "''${i}" --replace "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \
|
|
||||||
"${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd"
|
|
||||||
done
|
|
||||||
|
|
||||||
./regen.sh
|
|
||||||
|
|
||||||
|
|
||||||
configureFlagsArray=(
|
|
||||||
"--with-gssapi"
|
|
||||||
"--sysconfdir=/etc"
|
|
||||||
"--localstatedir=/var"
|
|
||||||
"--disable-kernel-module"
|
|
||||||
"--disable-fuse-client"
|
|
||||||
"--with-docbook-stylesheets=${docbook_xsl}/share/xml/docbook-xsl"
|
|
||||||
${optionalString (tsmbac != null) "--enable-tivoli-tsm"}
|
|
||||||
${optionalString (ncurses == null) "--disable-gtx"}
|
|
||||||
"--disable-linux-d_splice-alias-extra-iput"
|
|
||||||
)
|
|
||||||
'' + optionalString (tsmbac != null) ''
|
|
||||||
export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsmbac}/lib64/sample -DXBSA_TSMLIB=\\\"${tsmbac}/lib64/libApiTSM64.so\\\""
|
|
||||||
export XBSA_XLIBS="-ldl"
|
|
||||||
'';
|
|
||||||
|
|
||||||
buildFlags = [ "all_nolibafs" ];
|
|
||||||
|
|
||||||
postBuild = ''
|
|
||||||
for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
|
|
||||||
make -C "''${d}" index.html
|
|
||||||
done
|
|
||||||
'' + optionalString withDevdoc ''
|
|
||||||
make dox
|
|
||||||
'';
|
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
mkdir -p $doc/share/doc/openafs/{AdminGuide,QuickStartUnix,UserGuide}
|
|
||||||
cp -r doc/txt README LICENSE $doc/share/doc/openafs
|
|
||||||
for d in AdminGuide QuickStartUnix UserGuide ; do
|
|
||||||
cp "doc/xml/''${d}"/*.html "$doc/share/doc/openafs/''${d}"
|
|
||||||
done
|
|
||||||
|
|
||||||
rm -r $out/lib/openafs
|
|
||||||
'' + optionalString withDevdoc ''
|
|
||||||
mkdir -p $devdoc/share/devhelp/openafs/doxygen
|
|
||||||
cp -r doc/{pdf,protocol} $devdoc/share/devhelp/openafs
|
|
||||||
cp -r doc/doxygen/output/html $devdoc/share/devhelp/openafs/doxygen
|
|
||||||
'';
|
|
||||||
|
|
||||||
# Avoid references to $TMPDIR by removing it and let patchelf cleanup the
|
|
||||||
# binaries.
|
|
||||||
preFixup = ''
|
|
||||||
rm -rf "$(pwd)" && mkdir "$(pwd)"
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
outputsToInstall = [ "out" "doc" "man" ];
|
|
||||||
description = "Open AFS client";
|
|
||||||
homepage = "https://www.openafs.org";
|
|
||||||
license = licenses.ipl10;
|
|
||||||
platforms = platforms.linux;
|
|
||||||
maintainers = [ maintainers.maggesi maintainers.spacefrogg ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,64 +0,0 @@
|
||||||
{ lib, stdenv, fetchurl, which, autoconf, automake, flex, bison
|
|
||||||
, kernel, glibc, perl, libtool_2, libkrb5, fetchpatch }:
|
|
||||||
|
|
||||||
with (import ./srcs.nix {
|
|
||||||
inherit fetchurl;
|
|
||||||
});
|
|
||||||
|
|
||||||
let
|
|
||||||
modDestDir = "$out/lib/modules/${kernel.modDirVersion}/extra/openafs";
|
|
||||||
kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
|
|
||||||
|
|
||||||
in stdenv.mkDerivation {
|
|
||||||
pname = "openafs";
|
|
||||||
version = "${version}-${kernel.modDirVersion}";
|
|
||||||
inherit src;
|
|
||||||
|
|
||||||
nativeBuildInputs = [ autoconf automake flex libtool_2 perl which bison ]
|
|
||||||
++ kernel.moduleBuildDependencies;
|
|
||||||
|
|
||||||
buildInputs = [ libkrb5 ];
|
|
||||||
|
|
||||||
patches = [];
|
|
||||||
|
|
||||||
hardeningDisable = [ "pic" ];
|
|
||||||
|
|
||||||
configureFlags = [
|
|
||||||
"--with-linux-kernel-build=${kernelBuildDir}"
|
|
||||||
"--sysconfdir=/etc"
|
|
||||||
"--localstatedir=/var"
|
|
||||||
"--with-gssapi"
|
|
||||||
"--disable-linux-d_splice-alias-extra-iput"
|
|
||||||
];
|
|
||||||
|
|
||||||
preConfigure = ''
|
|
||||||
patchShebangs .
|
|
||||||
for i in `grep -l -R '/usr/\(include\|src\)' .`; do
|
|
||||||
echo "Patch /usr/include and /usr/src in $i"
|
|
||||||
substituteInPlace $i \
|
|
||||||
--replace "/usr/include" "${glibc.dev}/include" \
|
|
||||||
--replace "/usr/src" "${kernelBuildDir}"
|
|
||||||
done
|
|
||||||
|
|
||||||
./regen.sh -q
|
|
||||||
'';
|
|
||||||
|
|
||||||
buildPhase = ''
|
|
||||||
make V=1 only_libafs
|
|
||||||
'';
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
mkdir -p ${modDestDir}
|
|
||||||
cp src/libafs/MODLOAD-*/libafs-${kernel.modDirVersion}.* ${modDestDir}/libafs.ko
|
|
||||||
xz -f ${modDestDir}/libafs.ko
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Open AFS client kernel module";
|
|
||||||
homepage = "https://www.openafs.org";
|
|
||||||
license = licenses.ipl10;
|
|
||||||
platforms = platforms.linux;
|
|
||||||
maintainers = [ maintainers.maggesi maintainers.spacefrogg ];
|
|
||||||
broken = kernel.kernelAtLeast "5.15" || kernel.isHardened;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
{ fetchurl }:
|
|
||||||
rec {
|
|
||||||
version = "1.9.1";
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
|
|
||||||
sha256 = "sha256-7rHihVR4VobHAzt0ZALFOLJnlfd1Qwsa5ohpRFWBPbw=";
|
|
||||||
};
|
|
||||||
|
|
||||||
srcs = [ src
|
|
||||||
(fetchurl {
|
|
||||||
url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2";
|
|
||||||
sha256 = "sha256-pvF8CdTl+5DNuymNvhb3UrGW05LcXRv8cZp2QQlXF+E=";
|
|
||||||
})];
|
|
||||||
}
|
|
||||||
|
|
@ -1,62 +0,0 @@
|
||||||
diff -ru openafs-1.8.0/src/butc/afsxbsa.c openafs-1.8.0.new/src/butc/afsxbsa.c
|
|
||||||
--- openafs-1.8.0/src/butc/afsxbsa.c 2018-04-06 03:21:12.000000000 +0200
|
|
||||||
+++ openafs-1.8.0.new/src/butc/afsxbsa.c 2018-06-12 16:26:26.272522305 +0200
|
|
||||||
@@ -651,7 +651,7 @@
|
|
||||||
#if defined(AFS_AIX_ENV)
|
|
||||||
dynlib = dlopen("/usr/lib/libApiDS.a(dsmapish.o)", RTLD_NOW | RTLD_LOCAL | RTLD_MEMBER);
|
|
||||||
#elif defined (AFS_AMD64_LINUX26_ENV)
|
|
||||||
- dynlib = dlopen("/usr/lib64/libApiTSM64.so", RTLD_NOW | RTLD_LOCAL);
|
|
||||||
+ dynlib = dlopen(XBSA_TSMLIB, RTLD_NOW | RTLD_LOCAL);
|
|
||||||
#elif defined(AFS_SUN5_ENV) || defined(AFS_LINUX26_ENV)
|
|
||||||
dynlib = dlopen("/usr/lib/libApiDS.so", RTLD_NOW | RTLD_LOCAL);
|
|
||||||
#else
|
|
||||||
diff -ru openafs-1.8.0/src/cf/tivoli.m4 openafs-1.8.0.new/src/cf/tivoli.m4
|
|
||||||
--- openafs-1.8.0/src/cf/tivoli.m4 2018-04-06 03:21:12.000000000 +0200
|
|
||||||
+++ openafs-1.8.0.new/src/cf/tivoli.m4 2018-06-12 16:26:26.072522485 +0200
|
|
||||||
@@ -1,45 +1,7 @@
|
|
||||||
AC_DEFUN([OPENAFS_TIVOLI_TESTS],[
|
|
||||||
dnl check for tivoli
|
|
||||||
AC_MSG_CHECKING(for tivoli tsm butc support)
|
|
||||||
-XBSA_CFLAGS=""
|
|
||||||
-if test "$enable_tivoli_tsm" = "yes"; then
|
|
||||||
- XBSADIR1=/usr/tivoli/tsm/client/api/bin/xopen
|
|
||||||
- XBSADIR2=/opt/tivoli/tsm/client/api/bin/xopen
|
|
||||||
- XBSADIR3=/usr/tivoli/tsm/client/api/bin/sample
|
|
||||||
- XBSADIR4=/opt/tivoli/tsm/client/api/bin/sample
|
|
||||||
- XBSADIR5=/usr/tivoli/tsm/client/api/bin64/sample
|
|
||||||
- XBSADIR6=/opt/tivoli/tsm/client/api/bin64/sample
|
|
||||||
-
|
|
||||||
- if test -r "$XBSADIR3/dsmapifp.h"; then
|
|
||||||
- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR3"
|
|
||||||
- XBSA_XLIBS="-ldl"
|
|
||||||
- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
|
|
||||||
- elif test -r "$XBSADIR4/dsmapifp.h"; then
|
|
||||||
- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR4"
|
|
||||||
- XBSA_XLIBS="-ldl"
|
|
||||||
- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
|
|
||||||
- elif test -r "$XBSADIR5/dsmapifp.h"; then
|
|
||||||
- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR5"
|
|
||||||
- XBSA_XLIBS="-ldl"
|
|
||||||
- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
|
|
||||||
- elif test -r "$XBSADIR6/dsmapifp.h"; then
|
|
||||||
- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR6"
|
|
||||||
- XBSA_XLIBS="-ldl"
|
|
||||||
- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
|
|
||||||
- elif test -r "$XBSADIR1/xbsa.h"; then
|
|
||||||
- XBSA_CFLAGS="-Dxbsa -I$XBSADIR1"
|
|
||||||
- XBSA_XLIBS=""
|
|
||||||
- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
|
|
||||||
- elif test -r "$XBSADIR2/xbsa.h"; then
|
|
||||||
- XBSA_CFLAGS="-Dxbsa -I$XBSADIR2"
|
|
||||||
- XBSA_XLIBS=""
|
|
||||||
- AC_MSG_RESULT([yes, $XBSA_CFLAGS])
|
|
||||||
- else
|
|
||||||
- AC_MSG_RESULT([no, missing xbsa.h and dsmapifp.h header files])
|
|
||||||
- fi
|
|
||||||
-else
|
|
||||||
- AC_MSG_RESULT([no])
|
|
||||||
-fi
|
|
||||||
+AC_MSG_RESULT([yes])
|
|
||||||
AC_SUBST(XBSA_CFLAGS)
|
|
||||||
AC_SUBST(XBSA_XLIBS)
|
|
||||||
XLIBS="$XBSA_XLIBS $XLIBS"
|
|
||||||
|
|
@ -22433,7 +22433,6 @@ with pkgs;
|
||||||
openbgpd = callPackage ../servers/openbgpd { };
|
openbgpd = callPackage ../servers/openbgpd { };
|
||||||
|
|
||||||
openafs_1_8 = callPackage ../servers/openafs/1.8 { tsmbac = null; ncurses = null; };
|
openafs_1_8 = callPackage ../servers/openafs/1.8 { tsmbac = null; ncurses = null; };
|
||||||
openafs_1_9 = callPackage ../servers/openafs/1.9 { tsmbac = null; ncurses = null; };
|
|
||||||
# Current stable release; don't backport release updates!
|
# Current stable release; don't backport release updates!
|
||||||
openafs = openafs_1_8;
|
openafs = openafs_1_8;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -401,7 +401,6 @@ in {
|
||||||
rtw89 = if lib.versionOlder kernel.version "5.16" then callPackage ../os-specific/linux/rtw89 { } else null;
|
rtw89 = if lib.versionOlder kernel.version "5.16" then callPackage ../os-specific/linux/rtw89 { } else null;
|
||||||
|
|
||||||
openafs_1_8 = callPackage ../servers/openafs/1.8/module.nix { };
|
openafs_1_8 = callPackage ../servers/openafs/1.8/module.nix { };
|
||||||
openafs_1_9 = callPackage ../servers/openafs/1.9/module.nix { };
|
|
||||||
# Current stable release; don't backport release updates!
|
# Current stable release; don't backport release updates!
|
||||||
openafs = openafs_1_8;
|
openafs = openafs_1_8;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue