chore: remove fork of machineid

murphysecurity · Aug 20, 2024 · 9e85dd9 · 9e85dd9
1 parent 7976558
commit 9e85dd9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/go.mod b/go.mod
@@ -1,16 +1,16 @@
 module github.com/murphysecurity/murphysec
 
-go 1.22
+go 1.22.4
 
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.7
 	github.com/antchfx/xmlquery v1.4.1
 	github.com/antlr4-go/antlr/v4 v4.13.1
 	github.com/bahlo/generic-list-go v0.2.0
-	github.com/denisbrodbeck/machineid v1.0.1
 	github.com/dlclark/regexp2 v1.10.0
 	github.com/go-git/go-git/v5 v5.11.0
 	github.com/iseki0/go-yarnlock v0.1.1
+	github.com/iseki0/machineid v0.0.0-20240820072516-35aa9673a496
 	github.com/iseki0/osname v0.0.0-20220802070850-5def7ee59aab
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99
 	github.com/klauspost/pgzip v1.2.6
@@ -32,13 +32,11 @@ require (
 	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
 	golang.org/x/mod v0.18.0
 	golang.org/x/sync v0.7.0
-	golang.org/x/sys v0.21.0
+	golang.org/x/sys v0.24.0
 	golang.org/x/text v0.16.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
-replace github.com/denisbrodbeck/machineid v1.0.1 => github.com/iseki0/machineid v0.0.0-20221013085010-5552166865ef
-
 require (
 	dario.cat/mergo v1.0.0 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect

diff --git a/go.sum b/go.sum
@@ -86,8 +86,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/iseki0/go-yarnlock v0.1.1 h1:Jl22fhJYTAIGpgX4ckb8a4b4tEYaGWF2YeOKPO1+BE4=
 github.com/iseki0/go-yarnlock v0.1.1/go.mod h1:ZwBAhcxsRLUAs5Ers2/uB18L86QMql7TEvUPQihBaoI=
-github.com/iseki0/machineid v0.0.0-20221013085010-5552166865ef h1:hk1YflFybhZ7BobEHWxMnRkj0hWN8gXJaAkspLXVDNc=
-github.com/iseki0/machineid v0.0.0-20221013085010-5552166865ef/go.mod h1:iZSZgGYWCZHoX4ATqhJEUPMrQUjdNPqREJK/iMXa5EI=
+github.com/iseki0/machineid v0.0.0-20240820072516-35aa9673a496 h1:5MJH4MmzoB5dU746fZOZFeLqf+JPEt7DsmvsQSulnRM=
+github.com/iseki0/machineid v0.0.0-20240820072516-35aa9673a496/go.mod h1:OmR5ZSlAt2cUN30GFgSTyJYZjxWC59G2tFTn7AbXi/U=
 github.com/iseki0/osname v0.0.0-20220802070850-5def7ee59aab h1:i7De2YqOY/ndu9B01jVPO+EmBxEpaWSTSg7Rpvjg5Zc=
 github.com/iseki0/osname v0.0.0-20220802070850-5def7ee59aab/go.mod h1:dfJpXG/NgYezSQxiUPwOiDeTKm8YeJzMc7ROJ1mj9v4=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
@@ -257,8 +257,8 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
-golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
+golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=

diff --git a/version/machine_id.go b/version/machine_id.go
@@ -1,7 +1,7 @@
 package version
 
 import (
-	"github.com/denisbrodbeck/machineid"
+	"github.com/iseki0/machineid"
 )
 
 func MachineId() string {