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

Merge pull request #121164 from dotlambda/botan-2.18.0

Browse Source
This commit is contained in:
Martin Weinelt 2021-04-29 17:19:19 +02:00 committed by GitHub
commit 5ef56ad9f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,9 @@
{ callPackage, ... } @ args: { callPackage, ... } @ args:
callPackage ./generic.nix (args // { callPackage ./generic.nix (args // {
baseVersion = "2.17"; baseVersion = "2.18";
revision = "3"; revision = "0";
sha256 = "121vn1aryk36cpks70kk4c4cfic5g0qs82bf92xap9258ijkn4kr"; sha256 = "09z3fy31q1pvnvpy4fswrsl2aq8ksl94lbh5rl7b6nqc3qp8ar6c";
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
''; '';

4
pkgs/development/libraries/botan/default.nix
View File

@ -9,4 +9,8 @@ callPackage ./generic.nix (args // {
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
''; '';
knownVulnerabilities = [
# https://botan.randombit.net/security.html#id1
"2020-03-24: Side channel during CBC padding"
];
}) })

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

@ -4,6 +4,7 @@
, sourceExtension ? "tar.xz" , sourceExtension ? "tar.xz"
, extraConfigureFlags ? "" , extraConfigureFlags ? ""
, postPatch ? null , postPatch ? null
, knownVulnerabilities ? [ ]
, CoreServices , CoreServices
, Security , Security
, ... , ...
@ -49,6 +50,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ raskin ]; maintainers = with maintainers; [ raskin ];
platforms = platforms.unix; platforms = platforms.unix;
license = licenses.bsd2; license = licenses.bsd2;
inherit knownVulnerabilities;
}; };
passthru.updateInfo.downloadPage = "http://files.randombit.net/botan/"; passthru.updateInfo.downloadPage = "http://files.randombit.net/botan/";
} }