diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2021-08-17 19:27:34 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-08-17 18:02:17 +0000 |
| commit | f037cc9ff4c4f096d207f77140312d09b3c22d9c (patch) | |
| tree | 2cfd2cb6a309902a4555a61e93de157e1604ddcd | |
| parent | Merge pull request #134406 from NixOS/backport-134340-to-release-21.05 (diff) | |
| download | nixpkgs-origin/backport-134493-to-release-21.05.tar.gz | |
monotone: fix key encryptionorigin/backport-134493-to-release-21.05
(cherry picked from commit 5dd7c7a079e0b0c9799c5275714de5699fb0ffc3)
| -rw-r--r-- | pkgs/applications/version-management/monotone/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/version-management/monotone/monotone-1.1-adapt-to-botan2.patch | 15 |
2 files changed, 19 insertions, 1 deletions
diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index 48af459260df..6ea66b296d74 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -30,7 +30,10 @@ stdenv.mkDerivation rec { hash = "sha256:1hfy8vaap3184cd7h3qhz0da7c992idkc6q2nz9frhma45c5vgmd"; }; - patches = [ ./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch ]; + patches = [ + ./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch + ./monotone-1.1-adapt-to-botan2.patch + ]; postPatch = '' sed -e 's@/usr/bin/less@${less}/bin/less@' -i src/unix/terminal.cc diff --git a/pkgs/applications/version-management/monotone/monotone-1.1-adapt-to-botan2.patch b/pkgs/applications/version-management/monotone/monotone-1.1-adapt-to-botan2.patch new file mode 100644 index 000000000000..1df6a4717d5a --- /dev/null +++ b/pkgs/applications/version-management/monotone/monotone-1.1-adapt-to-botan2.patch @@ -0,0 +1,15 @@ +Botan2 has switched the parameter order in encryption descriptions + +--- monotone-upstream/src/botan_glue.hh 2021-08-17 19:06:32.736753732 +0200 ++++ monotone-patched/src/botan_glue.hh 2021-08-17 19:07:44.437750535 +0200 +@@ -45,7 +45,9 @@ + // In Botan revision d8021f3e (back when it still used monotone) the name + // of SHA-1 changed to SHA-160. + const static char * PBE_PKCS5_KEY_FORMAT = +-#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,11,0) ++#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(2,0,0) ++ "PBE-PKCS5v20(TripleDES/CBC,SHA-160)"; ++#elif BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,11,0) + "PBE-PKCS5v20(SHA-160,TripleDES/CBC)"; + #else + "PBE-PKCS5v20(SHA-1,TripleDES/CBC)"; |