oathToolkit: 2.6.2 -> 2.6.6 (#120610)

This commit is contained in:
schnusch 2021-04-27 20:49:18 +02:00 committed by GitHub
parent e340874c85
commit cf9bf19bf3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 32 deletions

View File

@ -1,48 +1,25 @@
{ lib, stdenv, fetchFromGitLab, fetchpatch, pam, xmlsec, autoreconfHook, pkg-config, libxml2, gtk-doc, perl, gengetopt, bison, help2man }: { lib, stdenv, fetchurl, pam, xmlsec }:
let let
securityDependency = securityDependency =
if stdenv.isDarwin then xmlsec if stdenv.isDarwin then xmlsec
else pam; else pam;
in stdenv.mkDerivation { in stdenv.mkDerivation rec {
name = "oath-toolkit-2.6.2"; pname = "oath-toolkit";
version = "2.6.6";
src = fetchFromGitLab { src = fetchurl {
owner = "oath-toolkit"; url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
repo = "oath-toolkit"; sha256 = "0v4lrgip08b8xlivsfn3mwql3nv8hmcpzrn6pi3xp88vqwav6s7x";
rev = "0dffdec9c5af5c89a5af43add29d8275eefe7414";
sha256 = "0n2sl444723f1k0sjmc0mzdwslx51yxac39c2cx2bl3ykacgfv74";
}; };
patches = [ buildInputs = [ securityDependency ];
# fix for glibc>=2.28
(fetchpatch {
name = "new_glibc_check.patch";
url = "https://sources.debian.org/data/main/o/oath-toolkit/2.6.1-1.3/debian/patches/new-glibc-check.patch";
sha256 = "0h75xyy3xsl485v7w27yqkks6z9sgsjmrv6wiswy15fdj5wyciv3";
})
];
buildInputs = [ securityDependency libxml2 perl gengetopt bison ];
nativeBuildInputs = [ autoreconfHook gtk-doc help2man pkg-config ];
# man file generation fails when true
enableParallelBuilding = false;
configureFlags = [ "--disable-pskc" ];
# Replicate the steps from cfg.mk
preAutoreconf = ''
printf "gdoc_MANS =\ngdoc_TEXINFOS =\n" > liboath/man/Makefile.gdoc
printf "gdoc_MANS =\ngdoc_TEXINFOS =\n" > libpskc/man/Makefile.gdoc
touch ChangeLog
'';
meta = with lib; { meta = with lib; {
description = "Components for building one-time password authentication systems"; description = "Components for building one-time password authentication systems";
homepage = "https://www.nongnu.org/oath-toolkit/"; homepage = "https://www.nongnu.org/oath-toolkit/";
maintainers = with maintainers; [ schnusch ];
platforms = with platforms; linux ++ darwin; platforms = with platforms; linux ++ darwin;
}; };
} }