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

Merge pull request #134504 from NixOS/backport-134493-to-release-21.05

Browse Source 
[Backport release-21.05] monotone: fix key encryption
This commit is contained in:
Michael Raskin 2021-08-17 18:44:23 +00:00 committed by GitHub
commit 97c5d0cbe7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/version-management/monotone/default.nix
View File

@ -30,7 +30,10 @@ stdenv.mkDerivation rec {
hash = "sha256:1hfy8vaap3184cd7h3qhz0da7c992idkc6q2nz9frhma45c5vgmd"; 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 = '' postPatch = ''
sed -e 's@/usr/bin/less@${less}/bin/less@' -i src/unix/terminal.cc sed -e 's@/usr/bin/less@${less}/bin/less@' -i src/unix/terminal.cc

15
pkgs/applications/version-management/monotone/monotone-1.1-adapt-to-botan2.patch Normal file
View File

@ -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)";