diff options
| -rw-r--r-- | net-mgmt/librenms/Makefile | 4 | ||||
| -rw-r--r-- | net-mgmt/librenms/distinfo | 10 | ||||
| -rw-r--r-- | net-mgmt/librenms/files/patch-LibreNMS_Validations_WebServer.php | 34 |
3 files changed, 7 insertions, 41 deletions
diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile index ec492e0d931a..508eb4e3875b 100644 --- a/net-mgmt/librenms/Makefile +++ b/net-mgmt/librenms/Makefile @@ -1,5 +1,5 @@ PORTNAME= librenms -PORTVERSION= 24.12.0 +PORTVERSION= 25.1.0 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= LOCAL/dvl:vendor @@ -128,7 +128,7 @@ _SCRIPT_FILES= daily.sh lnms # _RELEASE_TIMESTAMP is used for a patch inside the vendor code # it represents the release date via: git show --pretty='%H|%ct' -s 1.42.01 # It sits here so you remember to update it with each release -_RELEASE_TIMESTAMP= 1734479713 +_RELEASE_TIMESTAMP= 1737091720 _ROOT_DIRS= LibreNMS app bootstrap config database doc html \ includes lang licenses mibs misc resources routes \ scripts tests diff --git a/net-mgmt/librenms/distinfo b/net-mgmt/librenms/distinfo index d9c0d41f1cf0..bbe92412e194 100644 --- a/net-mgmt/librenms/distinfo +++ b/net-mgmt/librenms/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1734480371 -SHA256 (librenms-vendor-24.12.0.tar.gz) = e7211b4b09793eaa46c08951c5b1c4535112144a5ad548e5b2ebafbbafb1712e -SIZE (librenms-vendor-24.12.0.tar.gz) = 28817646 -SHA256 (librenms-librenms-24.12.0_GH0.tar.gz) = 16510909a7a5d8df82fb0c90d48efc93dff8065704d02230cdcb61744d2e64d4 -SIZE (librenms-librenms-24.12.0_GH0.tar.gz) = 65974321 +TIMESTAMP = 1737121596 +SHA256 (librenms-vendor-25.1.0.tar.gz) = 1765b73f91dac22f9c6d12f729f862095d34939ee5621c0d14c925b8f62b3a6f +SIZE (librenms-vendor-25.1.0.tar.gz) = 28839313 +SHA256 (librenms-librenms-25.1.0_GH0.tar.gz) = a18e0f3b79841f6a89e57ba0172be462fdc0055eaeea0d653b9f57c68c27ac04 +SIZE (librenms-librenms-25.1.0_GH0.tar.gz) = 66970102 diff --git a/net-mgmt/librenms/files/patch-LibreNMS_Validations_WebServer.php b/net-mgmt/librenms/files/patch-LibreNMS_Validations_WebServer.php deleted file mode 100644 index 3a7e1c053e74..000000000000 --- a/net-mgmt/librenms/files/patch-LibreNMS_Validations_WebServer.php +++ /dev/null @@ -1,34 +0,0 @@ ---- LibreNMS/Validations/WebServer.php.orig 2024-12-17 23:55:13 UTC -+++ LibreNMS/Validations/WebServer.php -@@ -45,22 +45,28 @@ class WebServer extends BaseValidation - { - if (! app()->runningInConsole()) { - $url = $this->removeStandardPorts(request()->url()); -- $expected = $this->removeStandardPorts(Str::finish(Config::get('base_url'), '/') . 'validate/results'); -+ $base_url = Config::get('base_url'); -+ $expected = $this->removeStandardPorts(Str::finish($base_url, '/') . 'validate/results'); -+ $correct_base = str_replace('/validate/results', '', $url); - - if ($url !== $expected) { - preg_match($this->host_regex, $url, $actual_host_match); - preg_match($this->host_regex, $expected, $expected_host_match); - $actual_host = $actual_host_match[1] ?? ''; - $expected_host = $expected_host_match[1] ?? "parse failure ($expected)"; -- if ($actual_host != $expected_host) { -+ -+ if ($base_url == '/' && ! str_contains($actual_host, '/')) { -+ $validator->warn('base_url could be more specific', "lnms config:set base_url $correct_base"); -+ } elseif ($actual_host != $expected_host) { - $nginx = Str::startsWith(request()->server->get('SERVER_SOFTWARE'), 'nginx'); - $server_name = $nginx ? 'server_name' : 'ServerName'; - $fix = $nginx ? "server_name $actual_host;" : "ServerName $actual_host"; - $validator->fail("$server_name is set incorrectly for your webserver, update your webserver config. $actual_host $expected_host", $fix); - } else { -- $correct_base = str_replace('validate/results', '', $url); - $validator->fail('base_url is not set correctly', "lnms config:set base_url $correct_base"); - } -+ } elseif (preg_replace('#/$#', '', \config('app.url')) !== $correct_base) { -+ $validator->fail("APP_URL is not set correctly. It should be set to $correct_base"); - } - - if (request()->secure() && ! \config('session.secure')) { |