Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2021-05-05 00:46:07 +00:00
committed by GitHub
30 changed files with 464 additions and 202 deletions
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gobgp";
version = "2.26.0";
version = "2.27.0";
src = fetchFromGitHub {
owner = "osrg";
repo = "gobgp";
rev = "v${version}";
sha256 = "sha256-sQmTIjBvCzd8ZXAayhPdRSRwBovH8BFRwazusSE52IE=";
sha256 = "sha256-Ofg+z8wUttqM1THatPFi0cuyLSEryhTmg3JC1o+16eA=";
};
vendorSha256 = "sha256-PWm7XnO6LPaU8g8ymmqRkQv2KSX9kLv9RVaa000mrTY=";
+4 -8
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "tcpreplay";
version = "4.3.3";
version = "4.3.4";
src = fetchurl {
url = "https://github.com/appneta/tcpreplay/releases/download/v${version}/tcpreplay-${version}.tar.gz";
sha256 = "1plgjm3dr9rr5q71s7paqk2wgrvkihbk2yrf9g3zaks3m750497d";
sha256 = "sha256-7gZTEIBsIuL9NvAU4euzMbmKfsTblY6Rw9nL2gZA2Sw=";
};
buildInputs = [ libpcap ]
@@ -27,13 +27,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A suite of utilities for editing and replaying network traffic";
homepage = "http://tcpreplay.appneta.com/";
license = with licenses; [ bsd3 gpl3 ];
homepage = "https://tcpreplay.appneta.com/";
license = with licenses; [ bsdOriginalUC gpl3Only ];
maintainers = with maintainers; [ eleanor ];
platforms = platforms.unix;
knownVulnerabilities = [
"CVE-2020-24265" # https://github.com/appneta/tcpreplay/issues/616
"CVE-2020-24266" # https://github.com/appneta/tcpreplay/issues/617
];
};
}