summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2023-03-19 15:05:33 +0100
committerVladimír Čunát <v@cunat.cz>2023-03-20 10:56:30 +0100
commit9666d43d40b7688718df4303ca338a84ea900d6f (patch)
tree9614ffe2eb50172776fd440b340fbce293bad024
parent7c9f4934b87ddf468593e3622cea0259aa5bd40e (diff)
downloadnixpkgs-9666d43d40b7688718df4303ca338a84ea900d6f.tar
nixpkgs-9666d43d40b7688718df4303ca338a84ea900d6f.tar.gz
nixpkgs-9666d43d40b7688718df4303ca338a84ea900d6f.tar.bz2
nixpkgs-9666d43d40b7688718df4303ca338a84ea900d6f.tar.lz
nixpkgs-9666d43d40b7688718df4303ca338a84ea900d6f.tar.xz
nixpkgs-9666d43d40b7688718df4303ca338a84ea900d6f.tar.zst
nixpkgs-9666d43d40b7688718df4303ca338a84ea900d6f.zip
dovecot: avoid testing DES-encrypted passwords
-rw-r--r--nixos/doc/manual/release-notes/rl-2305.section.md2
-rw-r--r--pkgs/servers/mail/dovecot/default.nix3
2 files changed, 4 insertions, 1 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md
index e6a5a14a777..2b5963e2340 100644
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@@ -22,7 +22,7 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - `nixos-rebuild` now supports an extra `--specialisation` option that can be used to change specialisation for `switch` and `test` commands.
 
-- `libxcrypt`, the library providing the `crypt(3)` password hashing function, is now built without support for algorithms not flagged [`strong`](https://github.com/besser82/libxcrypt/blob/v4.4.33/lib/hashes.conf#L48). This affects the availability of password hashing algorithms used for system login (`login(1)`, `passwd(1)`), but also Apache2 Basic-Auth, Samba, OpenLDAP, and [many other packages](https://github.com/search?q=repo%3ANixOS%2Fnixpkgs%20libxcrypt&type=code).
+- `libxcrypt`, the library providing the `crypt(3)` password hashing function, is now built without support for algorithms not flagged [`strong`](https://github.com/besser82/libxcrypt/blob/v4.4.33/lib/hashes.conf#L48). This affects the availability of password hashing algorithms used for system login (`login(1)`, `passwd(1)`), but also Apache2 Basic-Auth, Samba, OpenLDAP, Dovecot, and [many other packages](https://github.com/search?q=repo%3ANixOS%2Fnixpkgs%20libxcrypt&type=code).
 
 ## New Services {#sec-release-23.05-new-services}
 
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index 9eb9eff298e..47b6e857191 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -41,6 +41,9 @@ stdenv.mkDerivation rec {
     sed -i -s -E 's!\bcat\b!${coreutils}/bin/cat!g' src/lib-smtp/test-bin/*.sh
 
     patchShebangs src/config/settings-get.pl
+
+    # DES-encrypted passwords are not supported by NixPkgs anymore
+    sed '/test_password_scheme("CRYPT"/d' -i src/auth/test-libpassword.c
   '' + lib.optionalString stdenv.isLinux ''
     export systemdsystemunitdir=$out/etc/systemd/system
   '';