From d02d86b89b7f8a0005114245d8e29bab5aa012f2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 10 Aug 2022 23:42:50 +0200
Subject: [PATCH] botan2: 2.18.1 -> 2.19.2
https://botan.randombit.net/news.html\#version-2-19-2-not-yet-released
---
pkgs/development/libraries/botan/2.0.nix | 15 +++------------
pkgs/development/libraries/botan/generic.nix | 6 +++---
2 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/pkgs/development/libraries/botan/2.0.nix b/pkgs/development/libraries/botan/2.0.nix
index 113c4a27b919..6987b6c35f0a 100644
--- a/pkgs/development/libraries/botan/2.0.nix
+++ b/pkgs/development/libraries/botan/2.0.nix
@@ -1,19 +1,10 @@
{ callPackage, fetchpatch, ... } @ args:
callPackage ./generic.nix (args // {
- baseVersion = "2.18";
- revision = "1";
- sha256 = "0adf53drhk1hlpfih0175c9081bqpclw6p2afn51cmx849ib9izq";
+ baseVersion = "2.19";
+ revision = "2";
+ sha256 = "sha256-OvXxdhXGtc2Lgy0mn7bLTVTsZPnrCd2/Gt1Qk5QbTXU=";
postPatch = ''
sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt
'';
- extraPatches = [
- (fetchpatch {
- name = "CVE-2021-40529.patch";
- url = "https://github.com/randombit/botan/commit/9a23e4e3bc3966340531f2ff608fa9d33b5185a2.patch";
- sha256 = "1ax1n2l9zh0hk35vkkywgkhzpdk76xb9apz2wm3h9kjvjs9acr3y";
- # our source tarball doesn't include the tests
- excludes = [ "src/tests/*" ];
- })
- ];
})
diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix
index 1384bdee9add..3e5884c6c99a 100644
--- a/pkgs/development/libraries/botan/generic.nix
+++ b/pkgs/development/libraries/botan/generic.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python3, bzip2, zlib, gmp, openssl, boost
+{ lib, stdenv, fetchurl, python3, bzip2, zlib, gmp, boost
# Passed by version specific builders
, baseVersion, revision, sha256
, sourceExtension ? "tar.xz"
@@ -26,11 +26,11 @@ stdenv.mkDerivation rec {
patches = extraPatches;
inherit postPatch;
- buildInputs = [ python3 bzip2 zlib gmp openssl boost ]
+ buildInputs = [ python3 bzip2 zlib gmp boost ]
++ lib.optionals stdenv.isDarwin [ CoreServices Security ];
configurePhase = ''
- python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags}${if stdenv.cc.isClang then " --cc=clang" else "" }
+ python configure.py --prefix=$out --with-bzip2 --with-zlib ${extraConfigureFlags}${if stdenv.cc.isClang then " --cc=clang" else "" }
'';
enableParallelBuilding = true;