Merge staging-next into staging

2021-05-03 06:22:31 +00:00
parent afe3fd192f 2acd458115
commit b7e3cd0993
11 changed files with 217 additions and 46 deletions
@@ -70,6 +70,7 @@ mapAliases ({
  bazaarTools = throw "bazaar has been deprecated by breezy."; # added 2020-04-19
  beegfs = throw "beegfs has been removed."; # added 2019-11-24
  bluezFull = bluez; # Added 2019-12-03
+  bpftool = bpftools; # Added 2021-05-03
  brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # added 2021-01-24
  bridge_utils = bridge-utils;  # added 2015-02-20
  bro = zeek; # added 2019-09-29