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

Merge staging-next-21.05 into staging-21.05

This commit is contained in:
github-actions[bot] 2021-09-08 12:03:14 +00:00 committed by GitHub
parent feaee24fe8 9bca1eee8d
commit ac9deb8dd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,19 @@
{ callPackage, ... } @ args: { callPackage, fetchpatch, ... } @ args:
callPackage ./generic.nix (args // { callPackage ./generic.nix (args // {
baseVersion = "2.18"; baseVersion = "2.18";
revision = "0"; revision = "1";
sha256 = "09z3fy31q1pvnvpy4fswrsl2aq8ksl94lbh5rl7b6nqc3qp8ar6c"; sha256 = "0adf53drhk1hlpfih0175c9081bqpclw6p2afn51cmx849ib9izq";
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/*" ];
})
];
}) })

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

@ -10,6 +10,7 @@ callPackage ./generic.nix (args // {
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 = [ knownVulnerabilities = [
"CVE-2021-40529"
# https://botan.randombit.net/security.html#id1 # https://botan.randombit.net/security.html#id1
"2020-03-24: Side channel during CBC padding" "2020-03-24: Side channel during CBC padding"
]; ];

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

@ -3,6 +3,7 @@
, baseVersion, revision, sha256 , baseVersion, revision, sha256
, sourceExtension ? "tar.xz" , sourceExtension ? "tar.xz"
, extraConfigureFlags ? "" , extraConfigureFlags ? ""
, extraPatches ? [ ]
, postPatch ? null , postPatch ? null
, knownVulnerabilities ? [ ] , knownVulnerabilities ? [ ]
, CoreServices , CoreServices
@ -22,6 +23,7 @@ stdenv.mkDerivation rec {
]; ];
inherit sha256; inherit sha256;
}; };
patches = extraPatches;
inherit postPatch; inherit postPatch;
buildInputs = [ python3 bzip2 zlib gmp openssl boost ] buildInputs = [ python3 bzip2 zlib gmp openssl boost ]

8
pkgs/tools/system/foreman/Gemfile.lock
View File

@ -1,15 +1,13 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
foreman (0.78.0) foreman (0.87.2)
thor (~> 0.19.1)
thor (0.19.1)
PLATFORMS PLATFORMS
ruby x86_64-linux
DEPENDENCIES DEPENDENCIES
foreman foreman
BUNDLED WITH BUNDLED WITH
2.1.4 2.2.20

16
pkgs/tools/system/foreman/gemset.nix
View File

@ -1,18 +1,12 @@
{ {
thor = {
version = "0.19.1";
source = {
type = "gem";
remotes = ["https://rubygems.org"];
sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
};
};
foreman = { foreman = {
version = "0.78.0"; groups = ["default"];
platforms = [];
source = { source = {
type = "gem";
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1caz8mi7gq1hs4l1flcyyw1iw1bdvdbhppsvy12akr01k3s17xaq"; sha256 = "0szgxvnzwkzrfbq5dkwa98mig78aqglfy6irdsvq1gq045pbq9r7";
type = "gem";
}; };
version = "0.87.2";
}; };
} }