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

Merge pull request #121082 from tazjin/patch-1

Browse Source 
openldap: Enable argon2 hash support by default
This commit is contained in:
Florian Klink 2021-04-29 14:57:41 +02:00 committed by GitHub
commit a7535cb61c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/openldap/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, openssl, db, groff, libtool { lib, stdenv, fetchurl, openssl, db, groff, libtool, libsodium
, withCyrusSasl ? true , withCyrusSasl ? true
, cyrus_sasl , cyrus_sasl
}: }:
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ groff ]; nativeBuildInputs = [ groff ];
buildInputs = [ openssl cyrus_sasl db libtool ]; buildInputs = [ openssl cyrus_sasl db libsodium libtool ];
# Disable install stripping as it breaks cross-compiling. # Disable install stripping as it breaks cross-compiling.
# We strip binaries anyway in fixupPhase. # We strip binaries anyway in fixupPhase.
@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
postBuild = '' postBuild = ''
make $makeFlags CC=$CC -C contrib/slapd-modules/passwd/sha2 make $makeFlags CC=$CC -C contrib/slapd-modules/passwd/sha2
make $makeFlags CC=$CC -C contrib/slapd-modules/passwd/pbkdf2 make $makeFlags CC=$CC -C contrib/slapd-modules/passwd/pbkdf2
make $makeFlags CC=$CC -C contrib/slapd-modules/passwd/argon2
''; '';
doCheck = false; # needs a running LDAP server doCheck = false; # needs a running LDAP server
@ -54,6 +55,9 @@ stdenv.mkDerivation rec {
"sysconfdir=$(out)/etc" "sysconfdir=$(out)/etc"
"localstatedir=$(out)/var" "localstatedir=$(out)/var"
"moduledir=$(out)/lib/modules" "moduledir=$(out)/lib/modules"
# The argon2 module hardcodes /usr/bin/install as the path for the
# `install` binary, which is overridden here.
"INSTALL=install"
]; ];
# 1. Libraries left in the build location confuse `patchelf --shrink-rpath` # 1. Libraries left in the build location confuse `patchelf --shrink-rpath`
@ -76,6 +80,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
make $installFlags install -C contrib/slapd-modules/passwd/sha2 make $installFlags install -C contrib/slapd-modules/passwd/sha2
make $installFlags install -C contrib/slapd-modules/passwd/pbkdf2 make $installFlags install -C contrib/slapd-modules/passwd/pbkdf2
make $installFlags install-lib -C contrib/slapd-modules/passwd/argon2
chmod +x "$out"/lib/*.{so,dylib} chmod +x "$out"/lib/*.{so,dylib}
''; '';