From c68aff5a9bfcc87f3b38fc97afccc81f6abe334f Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 10 Apr 2024 14:08:48 +0200 Subject: [PATCH] Update portbase for improved version info, fix license strings --- cmds/hub/main.go | 2 +- cmds/notifier/main.go | 2 +- cmds/observation-hub/main.go | 2 +- cmds/portmaster-core/main.go | 2 +- cmds/portmaster-start/main.go | 2 +- go.mod | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmds/hub/main.go b/cmds/hub/main.go index 831e3abc..870d3417 100644 --- a/cmds/hub/main.go +++ b/cmds/hub/main.go @@ -23,7 +23,7 @@ func init() { } func main() { - info.Set("SPN Hub", "0.7.6", "AGPLv3", true) + info.Set("SPN Hub", "0.7.6", "GPLv3") // Configure metrics. _ = metrics.SetNamespace("hub") diff --git a/cmds/notifier/main.go b/cmds/notifier/main.go index 4cc9f84c..a109d01a 100644 --- a/cmds/notifier/main.go +++ b/cmds/notifier/main.go @@ -67,7 +67,7 @@ func main() { flag.Parse() // set meta info - info.Set("Portmaster Notifier", "0.3.6", "GPLv3", false) + info.Set("Portmaster Notifier", "0.3.6", "GPLv3") // check if meta info is ok err := info.CheckVersion() diff --git a/cmds/observation-hub/main.go b/cmds/observation-hub/main.go index c82f3a17..c69786c9 100644 --- a/cmds/observation-hub/main.go +++ b/cmds/observation-hub/main.go @@ -18,7 +18,7 @@ import ( ) func main() { - info.Set("SPN Observation Hub", "0.7.1", "AGPLv3", true) + info.Set("SPN Observation Hub", "0.7.1", "GPLv3") // Configure metrics. _ = metrics.SetNamespace("observer") diff --git a/cmds/portmaster-core/main.go b/cmds/portmaster-core/main.go index 62d05e5d..687dcf4e 100644 --- a/cmds/portmaster-core/main.go +++ b/cmds/portmaster-core/main.go @@ -24,7 +24,7 @@ import ( func main() { // set information - info.Set("Portmaster", "1.6.5", "AGPLv3", true) + info.Set("Portmaster", "", "GPLv3") // Set default log level. log.SetLogLevel(log.WarningLevel) diff --git a/cmds/portmaster-start/main.go b/cmds/portmaster-start/main.go index 1e0c66aa..fd2e5a32 100644 --- a/cmds/portmaster-start/main.go +++ b/cmds/portmaster-start/main.go @@ -83,7 +83,7 @@ func main() { cobra.OnInitialize(initCobra) // set meta info - info.Set("Portmaster Start", "1.6.0", "AGPLv3", false) + info.Set("Portmaster Start", "", "GPLv3") // catch interrupt for clean shutdown signalCh := make(chan os.Signal, 2) diff --git a/go.mod b/go.mod index be141f45..274cf6c9 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( github.com/r3labs/diff/v3 v3.0.1 github.com/rot256/pblind v0.0.0-20231024115251-cd3f239f28c1 github.com/safing/jess v0.3.3 - github.com/safing/portbase v0.19.0 + github.com/safing/portbase v0.19.1 github.com/safing/portmaster-android/go v0.0.0-20230830120134-3226ceac3bec github.com/shirou/gopsutil v3.21.11+incompatible github.com/spf13/cobra v1.8.0