Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

zgrab2: 20210327-17a5257 -> 20230323-911c86f

+58 -5
+12 -5
pkgs/tools/security/zgrab2/default.nix
··· 5 5 6 6 buildGoModule rec { 7 7 pname = "zgrab2"; 8 - version = "20210327-${lib.strings.substring 0 7 rev}"; 9 - rev = "17a5257565c758e2b817511d15476d330be0a17a"; 8 + version = "20230323-${lib.strings.substring 0 7 rev}"; 9 + rev = "911c86f13080ceae98f8d63d1ae0e85c4a8f7f61"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "zmap"; 13 13 repo = pname; 14 14 inherit rev; 15 - sha256 = "1hxk2jggj8lww97lwmks46i001p5ycnxnck8yya6d0fd3ayxvw2w"; 15 + hash = "sha256-VOWkBM/SziY3jiIaYYWq+LRzG4vKitiscqdIDfRUkYY="; 16 16 }; 17 17 18 - vendorSha256 = "1s0azy5b5hi5h24vs6a9f1n70l980vkid28ihqh10zq6ajmds2z3"; 18 + vendorHash = "sha256-Q3FCqvh4vn64QXqcePhVWTyIHJarI6I4YonH3X/7RhI="; 19 + 20 + patches = [ 21 + # Without this, we get error messages like: 22 + # vendor/golang.org/x/sys/unix/syscall.go:83:16: unsafe.Slice requires go1.17 or later (-lang was set to go1.16; check go.mod) 23 + # The patch was generated by changing "go 1.12" to "go 1.17" and executing `go mod tidy -compat=1.17`. 24 + ./fix-go-version-error.patch 25 + ]; 19 26 20 27 subPackages = [ "cmd/zgrab2" ]; 21 28 ··· 23 30 description = "Web application scanner"; 24 31 homepage = "https://github.com/zmap/zgrab2"; 25 32 license = with licenses; [ asl20 isc ]; 26 - maintainers = with maintainers; [ fab ]; 33 + maintainers = with maintainers; [ fab juliusrickert ]; 27 34 }; 28 35 }
+46
pkgs/tools/security/zgrab2/fix-go-version-error.patch
··· 1 + diff --git a/go.mod b/go.mod 2 + index 888f10e..5463ef5 100644 3 + --- a/go.mod 4 + +++ b/go.mod 5 + @@ -1,25 +1,33 @@ 6 + module github.com/zmap/zgrab2 7 + 8 + -go 1.12 9 + +go 1.17 10 + 11 + require ( 12 + - github.com/cespare/xxhash/v2 v2.2.0 // indirect 13 + - github.com/go-kit/kit v0.10.0 // indirect 14 + - github.com/golang/protobuf v1.5.3 // indirect 15 + github.com/hdm/jarm-go v0.0.7 16 + github.com/prometheus/client_golang v1.14.0 17 + - github.com/prometheus/common v0.42.0 // indirect 18 + - github.com/prometheus/procfs v0.9.0 // indirect 19 + github.com/sirupsen/logrus v1.9.0 20 + - github.com/zmap/rc2 v0.0.0-20190804163417-abaa70531248 // indirect 21 + github.com/zmap/zcrypto v0.0.0-20230310154051-c8b263fd8300 22 + github.com/zmap/zflags v1.4.0-beta.1.0.20200204220219-9d95409821b6 23 + golang.org/x/crypto v0.7.0 24 + golang.org/x/net v0.8.0 25 + golang.org/x/sys v0.6.0 26 + golang.org/x/text v0.8.0 27 + - google.golang.org/protobuf v1.30.0 // indirect 28 + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c 29 + gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 30 + gopkg.in/yaml.v2 v2.4.0 31 + ) 32 + + 33 + +require ( 34 + + github.com/beorn7/perks v1.0.1 // indirect 35 + + github.com/cespare/xxhash/v2 v2.2.0 // indirect 36 + + github.com/golang/protobuf v1.5.3 // indirect 37 + + github.com/kr/pretty v0.2.1 // indirect 38 + + github.com/kr/text v0.1.0 // indirect 39 + + github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect 40 + + github.com/prometheus/client_model v0.3.0 // indirect 41 + + github.com/prometheus/common v0.42.0 // indirect 42 + + github.com/prometheus/procfs v0.9.0 // indirect 43 + + github.com/weppos/publicsuffix-go v0.30.0 // indirect 44 + + github.com/zmap/rc2 v0.0.0-20190804163417-abaa70531248 // indirect 45 + + google.golang.org/protobuf v1.30.0 // indirect 46 + +)