openafs: remove 1.6; point to openafs_1_8

This commit is contained in:
Michael Raitza 2020-11-17 21:00:40 +01:00
parent 6cdf5b354a
commit 1f323ec2b4
8 changed files with 11 additions and 248 deletions

View file

@ -172,6 +172,12 @@
please note that your non-root pools will now be forcibly imported.
</para>
</listitem>
<listitem>
<para>
<package>openafs</package> now points to <package>openafs_1_8</package>,
which is the new stable release. OpenAFS 1.6 was removed.
</para>
</listitem>
</itemizedlist>
</section>

View file

@ -251,7 +251,6 @@ in {
wantedBy = [ "multi-user.target" ];
restartIfChanged = false;
unitConfig.ConditionPathExists = [
"|/etc/openafs/server/rxkad.keytab"
"|/etc/openafs/server/KeyFileExt"
];
preStart = ''

View file

@ -1,91 +0,0 @@
{ stdenv, fetchurl, which, autoconf, automake, flex, yacc
, glibc, perl, kerberos, libxslt, docbook_xsl, docbook_xml_dtd_43
, ncurses # Extra ncurses utilities. Only needed for debugging.
, tsmbac ? null # Tivoli Storage Manager Backup Client from IBM
}:
with (import ./srcs.nix { inherit fetchurl; });
stdenv.mkDerivation {
pname = "openafs";
inherit version srcs;
nativeBuildInputs = [ autoconf automake flex yacc perl which libxslt ];
buildInputs = [ ncurses ];
patches = stdenv.lib.optional (tsmbac != null) ./tsmbac.patch;
outputs = [ "out" "dev" "man" "doc" ];
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
${stdenv.lib.optionalString (kerberos != null)
"export KRB5_CONFIG=${kerberos.dev}/bin/krb5-config"}
export AFS_SYSKVERS=26
configureFlagsArray=(
${stdenv.lib.optionalString (kerberos != null) "--with-krb5"}
"--sysconfdir=/etc"
"--localstatedir=/var"
"--disable-kernel-module"
"--disable-fuse-client"
"--with-html-xsl=${docbook_xsl}/share/xml/docbook-xsl/html/chunk.xsl"
${stdenv.lib.optionalString (tsmbac != null) "--enable-tivoli-tsm"}
${stdenv.lib.optionalString (ncurses == null) "--disable-gtx"}
"--disable-linux-d_splice-alias-extra-iput"
)
'' + stdenv.lib.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}" html
done
'';
postInstall = ''
mkdir -p $doc/share/doc/openafs/{AdminGuide,QuickStartUnix,UserGuide}
cp -r doc/{arch,examples,pdf,protocol,txt} README NEWS $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,afs,*.a}
rm $out/bin/kpasswd
rm $out/sbin/{kas,kdb,ka-forwarder,kadb_check}
rm $out/libexec/openafs/kaserver
rm $man/share/man/man{1/kpasswd*,5/kaserver*,8/{ka*,kdb*}}
'';
meta = with stdenv.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 ];
# Package will be removed in 21.03
broken = true;
};
}

View file

@ -1,77 +0,0 @@
{ stdenv, fetchurl, fetchpatch, which, autoconf, automake, flex, bison
, kernel, glibc, perl }:
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 {
name = "openafs-${version}-${kernel.modDirVersion}";
inherit version src;
patches = [
# Linux 4.20
(fetchpatch {
name = "openafs_1_6-current_kernel_time.patch";
url = "http://git.openafs.org/?p=openafs.git;a=patch;h=b9936e944a2b4f5773d66864cbb297993b050e65";
sha256 = "16fl9kp0l95dqm166jx3x4ijbzhf2bc9ilnipn3k1j00mfy4lnia";
})
(fetchpatch {
name = "openafs_1_6-do_settimeofday.patch";
url = "http://git.openafs.org/?p=openafs.git;a=patch;h=fe6fb38b3d4095351955b9872d0fd6cba64f8784";
sha256 = "0k6kgk1ybhm9xx2l0wbcyv7jimkr9mfs2ywvxy8hpyhcm7rbwjkp";
})
# Linux 5.0
(fetchpatch {
name = "openafs_1_6-super_block.patch";
url = "http://git.openafs.org/?p=openafs.git;a=patch;h=61db15f1badabd83e289efd622e274c47f0aefda";
sha256 = "0cdd76s1h1bhxj0hl7r6mcha1jcy5vhlvc5dc8m2i83a6281yjsa";
})
];
nativeBuildInputs = [ autoconf automake flex perl bison which ] ++ kernel.moduleBuildDependencies;
hardeningDisable = [ "pic" ];
configureFlags = [
"--with-linux-kernel-build=${kernelBuildDir}"
"--sysconfdir=/etc"
"--localstatedir=/var"
"--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 stdenv.lib; {
description = "Open AFS client kernel module";
homepage = "https://www.openafs.org";
license = licenses.ipl10;
platforms = platforms.linux;
maintainers = [ maintainers.maggesi maintainers.spacefrogg ];
# Package will be removed in 21.03
broken = true;
};
}

View file

@ -1,14 +0,0 @@
{ fetchurl }:
rec {
version = "1.6.24";
src = fetchurl {
url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
sha256 = "1dxzc1y5mmx3ap0m94sx80vfs3qxkckid3wc1xm0wr5i6fh7zn1h";
};
srcs = [ src
(fetchurl {
url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2";
sha256 = "0aq9ipqpr2ksmk30h2dc4mlrkrqs16xnmspwfb6xj3rgr1pwszlx";
})];
}

View file

@ -1,62 +0,0 @@
diff -ru3 openafs-1.6.18.1/acinclude.m4 openafs-1.6.18.1.new/acinclude.m4
--- openafs-1.6.18.1/acinclude.m4 2016-06-21 17:13:39.000000000 +0200
+++ openafs-1.6.18.1.new/acinclude.m4 2016-11-02 18:44:30.423039662 +0100
@@ -1373,45 +1373,7 @@
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)
diff -ru3 openafs-1.6.18.1/src/butc/afsxbsa.c openafs-1.6.18.1.new/src/butc/afsxbsa.c
--- openafs-1.6.18.1/src/butc/afsxbsa.c 2016-06-21 17:13:39.000000000 +0200
+++ openafs-1.6.18.1.new/src/butc/afsxbsa.c 2016-11-02 18:45:10.734662987 +0100
@@ -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

View file

@ -75,7 +75,7 @@ in stdenv.mkDerivation {
license = licenses.ipl10;
platforms = platforms.linux;
maintainers = [ maintainers.maggesi maintainers.spacefrogg ];
broken = versionOlder kernel.version "3.18";
broken = versionOlder kernel.version "3.18" || kernel.isHardened;
};
}

View file

@ -17024,8 +17024,9 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
openbgpd = callPackage ../servers/openbgpd { };
openafs = callPackage ../servers/openafs/1.6 { tsmbac = null; ncurses = null; };
openafs_1_8 = callPackage ../servers/openafs/1.8 { tsmbac = null; ncurses = null; };
# Current stable release; don't backport release updates!
openafs = openafs_1_8;
openresty = callPackage ../servers/http/openresty {
withPerl = false;
@ -18278,8 +18279,9 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
rtlwifi_new = callPackage ../os-specific/linux/rtlwifi_new { };
openafs = callPackage ../servers/openafs/1.6/module.nix { };
openafs_1_8 = callPackage ../servers/openafs/1.8/module.nix { };
# Current stable release; don't backport release updates!
openafs = openafs_1_8;
facetimehd = callPackage ../os-specific/linux/facetimehd { };