From nobody Fri Jan 17 15:46:20 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YZPGh56wwz5l7cj; Fri, 17 Jan 2025 15:46:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YZPGh4ScFz46P0; Fri, 17 Jan 2025 15:46:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737128780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HkKO3tof7y8fnCtCjDT2nzWhU4TXZjFhdkrg7Oc2yD4=; b=GGx92nB3qwX+cVCr4ZA8Dn+zWXRQFh9MDj6S64e+Dv0yHQBUtXvengjUuyBC+DKrhZN4Ff wEPEWFylA2+UCOJd+acUv4Wjuu8FyROu1i30FQPa5DQ572C748H6wGaRfEHPWsbEunaRoJ bRO6pNl0a6MqxYz0cclvQsLcMRXTHWY+AZ95Yqkqo6Z9b2QM8MAHqo9ujVPtyNCOyeC9Ny YYKmM1kNZLBkgQ9vbmHZ3QYTV5uNArr1x+GD8ps2HM6XGS2eTkYMpXC0qsseVcL2trZF5I 7lwT+rEIph5sa3PileZy7oA8thpMUSU1ZUDa9oxYWVHv0rzksOnZtBe9z8H9cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737128780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HkKO3tof7y8fnCtCjDT2nzWhU4TXZjFhdkrg7Oc2yD4=; b=i4FkIFIvxuueBO9ueg2M/UOlG2/Xtuu3NCixyB/KLVG+8ry5g6FUFw63qsc3B3Kti0kQTQ WRhDN6iB9Qjvk4eE+AikMBc1Ud3tQsw7Nv5HKgmt4bxHi5Dy/1lTqUg7ZbHNa/jOdMljRf 62GoItd+lh5spNoS/2B8NoGu8z0SL3G4YpOU2BxWLOwnXRdZfNdE1MCrQHnZKegsSS6K0r /KHU85f19J3Yi4kjmxRSbHJkO9IzkxRwG6HwDYiaSu7SsqCrAS22waVoEnZuxsKNDYFs0E fzbOiyG5Nln3vvMaOD9gVxVuw6IAW+qE/PYo8SCnBbjir0LVAMNX7g0wt+CBVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737128780; a=rsa-sha256; cv=none; b=TF6w3MiNewvj1fS6EuDmu3oIPYhDx8K7iu4dRHEcglN9fJa5SSJEA/7g8tmx/wy3vJnCqr eTwkLgVuTrVEEYpgxHGGcfvcG+jkfxUKzKNxTckBPN//QmApz4X0IGhbRx5jojwRug46z/ Z9i7EQvk6Dm6U2rOx5IEI68N/VA5qkJgztAoHF0itKnmIsk/ffFYp3+6tMqMkGAXoSzECQ ECDxTsCDJsrLLVn0U0okJs0qD7Bkyd32j1ffp30JWV368pSMvZXU+kECSlg32VilyCzG/t zcvdmeLJDc+nKqlJ4tRnAHdB1MmhlWsQWjtFNIwKockYmGwduQyrH+mj79ZA5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YZPGh3jYJz881; Fri, 17 Jan 2025 15:46:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50HFkKCN028927; Fri, 17 Jan 2025 15:46:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50HFkKbd028924; Fri, 17 Jan 2025 15:46:20 GMT (envelope-from git) Date: Fri, 17 Jan 2025 15:46:20 GMT Message-Id: <202501171546.50HFkKbd028924@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dan Langille Subject: git: 3d0d605defb3 - main - net-mgmt/librenms: Update to 25.1.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dvl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d0d605defb353e59a34026363bd0e87e8fe3d19 Auto-Submitted: auto-generated The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=3d0d605defb353e59a34026363bd0e87e8fe3d19 commit 3d0d605defb353e59a34026363bd0e87e8fe3d19 Author: Dan Langille AuthorDate: 2025-01-17 15:45:40 +0000 Commit: Dan Langille CommitDate: 2025-01-17 15:46:14 +0000 net-mgmt/librenms: Update to 25.1.0 re: https://github.com/librenms/librenms/releases/tag/25.1.0 --- net-mgmt/librenms/Makefile | 4 +-- net-mgmt/librenms/distinfo | 10 +++---- .../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')) {