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

Merge pull request from mweinelt/botan-2.19.2

Browse Source 
botan2: 2.18.1 -> 2.19.2
This commit is contained in:
Martin Weinelt 2022-08-11 13:12:46 +02:00 committed by GitHub
commit ac322e2f8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 15 deletions
pkgs/development/libraries/botan
2.0.nixgeneric.nix

15
pkgs/development/libraries/botan/2.0.nix
View File

@ -1,19 +1,10 @@
{ callPackage, fetchpatch, ... } @ args: { callPackage, fetchpatch, ... } @ args:
callPackage ./generic.nix (args // { callPackage ./generic.nix (args // {
baseVersion = "2.18"; baseVersion = "2.19";
revision = "1"; revision = "2";
sha256 = "0adf53drhk1hlpfih0175c9081bqpclw6p2afn51cmx849ib9izq"; sha256 = "sha256-OvXxdhXGtc2Lgy0mn7bLTVTsZPnrCd2/Gt1Qk5QbTXU=";
postPatch = '' postPatch = ''
sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt 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/*" ];
})
];
}) })

6
pkgs/development/libraries/botan/generic.nix
View File

@ -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 # Passed by version specific builders
, baseVersion, revision, sha256 , baseVersion, revision, sha256
, sourceExtension ? "tar.xz" , sourceExtension ? "tar.xz"
@ -26,11 +26,11 @@ stdenv.mkDerivation rec {
patches = extraPatches; patches = extraPatches;
inherit postPatch; inherit postPatch;
buildInputs = [ python3 bzip2 zlib gmp openssl boost ] buildInputs = [ python3 bzip2 zlib gmp boost ]
++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; ++ lib.optionals stdenv.isDarwin [ CoreServices Security ];
configurePhase = '' 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; enableParallelBuilding = true;