From nobody Mon Nov 17 21:04:03 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 4d9Kx0266Xz6Gxmc; Mon, 17 Nov 2025 21:04:04 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Kwz744Fz3NVV; Mon, 17 Nov 2025 21:04:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763413444; 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=jsyI18x619KkZa3Mnkz8CBjCBZyGhfcO2ZBCBp0CBcc=; b=hzWH4VjkH8HKYrXsBb0c5Wi7FAJvfLeSfEoMax2GhW+x8dt1DwGeXd1SE7rz20W9xVM4ga ZJasNsEtw5Dxl+ID2YZf9DglMRram44LcJ78IBxmIv/dy/fJ6r+OlaejqOskxqI2XZ2QB3 bo7KNJfn75C6CZnrfelbzRLiMvmj2AZtkTBG2MC8YGr+8SBpGwmuIVGEoOU638YCxUgQ6K CP8vyMbfRZ50vzhQnB669sIi7E3Vhex9lXTjXHn/tWo7qNOtS18dxb0BpWmCxpkxCRTD+u S9fkS6czymRIKzz/93wLXjQda8NI7EsbFV0bKgHYMV8BNcF9zEgAdgyR3BLiuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763413444; 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=jsyI18x619KkZa3Mnkz8CBjCBZyGhfcO2ZBCBp0CBcc=; b=uged7fHeRS4P2+FgFee/9g8MymIBmZZxhnFml34pvoK5xGU3VOdFCeqJXZ/xhB8kAO0q6E 7RdKs2cq/FqILxp+11AC59uBYn27B24LVRM/Dr6ukmj2Lk6zynN+eOpc3aI9uyAXsgsOL1 XPPIWIn7v07c1yhPmGzCbgWgzIl1IIxMnevz357NUnEtaMA83r6U3QT3E4RN9R0juKRiiF zwyIsBc6XlQ0PDgRYYhBPqYYtK+wBWF7NaQzZnilNV3zfDyvCVFhk1rN47UOTepJrSAm/z BqDIgFLeH8jjvbgxzFEl+AB4z2AQXqAbQFNi5dYQepdiURWVAtwwnHCWuPU76Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763413444; a=rsa-sha256; cv=none; b=UcI7xZfReLUtNwMpTY6XLphuyEpLxlXYeYnWftg0oOOMGlrywKA8NWb4488THUMNhOuZEf kTvyiKvO9Etb9ZWJ8wnIMt3NBAdZ7JClm9VOtmMAzNEaWDF69qYAdNO+vEL3KbI7nG1z0y GVTd5eS1oLdexL7qwXBx0oHjGmAHWXiTWPPMqGn5pQqu5rP2TYHV0V/jbvJUrGEucIWQZS xcpee2yPuw9h9a7ZCGwBZZSWBwtI4ho7siU3bBaofOQjP8uRW/s4RthIXv85lAvnt+aSiK HGh6f1ulwatWbpj9lw6hNR8z+aTqZ0BeNWyhdx4SQL6skwm6DtLsHZaGTfF0sw== 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 4d9Kwz6WZHz8jJ; Mon, 17 Nov 2025 21:04:03 +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 5AHL432o016044; Mon, 17 Nov 2025 21:04:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHL43Vv016041; Mon, 17 Nov 2025 21:04:03 GMT (envelope-from git) Date: Mon, 17 Nov 2025 21:04:03 GMT Message-Id: <202511172104.5AHL43Vv016041@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: 439957430961 - main - net-mgmt/librenms: Update to 25.11.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: 43995743096180491c1bd0f257f52e958091b2b7 Auto-Submitted: auto-generated The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=43995743096180491c1bd0f257f52e958091b2b7 commit 43995743096180491c1bd0f257f52e958091b2b7 Author: Dan Langille AuthorDate: 2025-11-17 21:03:14 +0000 Commit: Dan Langille CommitDate: 2025-11-17 21:04:00 +0000 net-mgmt/librenms: Update to 25.11.0 re: https://github.com/librenms/librenms/releases/tag/25.11.0 A database migration is required with this update. --- net-mgmt/librenms/Makefile | 5 +- net-mgmt/librenms/distinfo | 10 +- net-mgmt/librenms/files/patch-18372 | 128 --------------------- ...dations_Database_CheckDatabaseSchemaVersion.php | 6 +- .../files/patch-LibreNMS_Validations_System.php | 8 +- 5 files changed, 14 insertions(+), 143 deletions(-) diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile index b41acf59fdf7..e7cc68df35cf 100644 --- a/net-mgmt/librenms/Makefile +++ b/net-mgmt/librenms/Makefile @@ -1,6 +1,5 @@ PORTNAME= librenms -PORTVERSION= 25.10.0 -PORTREVSISION= 1 +PORTVERSION= 25.11.0 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= LOCAL/dvl:vendor @@ -126,7 +125,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= 1760517127 +_RELEASE_TIMESTAMP= 1763386152 _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 5e6c6879a7e8..f2dde64552ed 100644 --- a/net-mgmt/librenms/distinfo +++ b/net-mgmt/librenms/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1760530638 -SHA256 (librenms-vendor-25.10.0.tar.gz) = 71ac45d3f718616b592e435d95858e3b31f226a812d0db8574009c2b09850026 -SIZE (librenms-vendor-25.10.0.tar.gz) = 27583825 -SHA256 (librenms-librenms-25.10.0_GH0.tar.gz) = 90c4d516a8b376bf0c41558a24941200c73a887ea2aeff4369f73e9e5f24184e -SIZE (librenms-librenms-25.10.0_GH0.tar.gz) = 72309944 +TIMESTAMP = 1763404572 +SHA256 (librenms-vendor-25.11.0.tar.gz) = cc5883b8dad1c479b019e37ecb8e695d3009fd26671a0f4e4a58bef29a4f121f +SIZE (librenms-vendor-25.11.0.tar.gz) = 27759793 +SHA256 (librenms-librenms-25.11.0_GH0.tar.gz) = 0bfad0c850308e69d42ec09f7f9cb45400fdb8a0ee96742651d33402e16860c6 +SIZE (librenms-librenms-25.11.0_GH0.tar.gz) = 72339168 diff --git a/net-mgmt/librenms/files/patch-18372 b/net-mgmt/librenms/files/patch-18372 deleted file mode 100644 index 4062191d420c..000000000000 --- a/net-mgmt/librenms/files/patch-18372 +++ /dev/null @@ -1,128 +0,0 @@ -From 4f5320469a927e9dcf7c46948026824a91b4838c Mon Sep 17 00:00:00 2001 -From: Tony Murray -Date: Wed, 15 Oct 2025 12:31:34 -0500 -Subject: [PATCH] More accurate running user check Previously we did not have - access to config, so we had to infer the librenms user from the owner of the - executable. Because we are running later in the boot now, we can just use - config. Improve feedback text a bit. - ---- - app/Checks.php | 44 ------------------- - .../RunningAsIncorrectUserException.php | 10 +++++ - app/Listeners/CommandStartingListener.php | 20 ++++++++- - 3 files changed, 29 insertions(+), 45 deletions(-) - create mode 100644 app/Exceptions/RunningAsIncorrectUserException.php - -diff --git a/app/Checks.php b/app/Checks.php -index 5aa22f67cdbd..6f5caba39404 100644 ---- app/Checks.php -+++ app/Checks.php -@@ -84,48 +84,4 @@ public static function postAuth() - } - } - } -- -- /** -- * Check the script is running as the right user (works before config is available) -- */ -- public static function runningUser() -- { -- if (function_exists('posix_getpwuid') && posix_getpwuid(posix_geteuid())['name'] !== get_current_user()) { -- if (get_current_user() == 'root') { -- self::printMessage( -- 'Error: lnms file is owned by root, it should be owned and ran by a non-privileged user.', -- null, -- true -- ); -- } -- -- self::printMessage( -- 'Error: You must run lnms as the user ' . get_current_user(), -- null, -- true -- ); -- } -- } -- -- private static function printMessage($title, $content, $exit = false) -- { -- $content = (array) $content; -- -- if (PHP_SAPI == 'cli') { -- $format = "%s\n\n%s\n\n"; -- $message = implode(PHP_EOL, $content); -- } else { -- $format = "

%s

%s

"; -- $message = ''; -- foreach ($content as $line) { -- $message .= "

$line

\n"; -- } -- } -- -- printf($format, $title, $message); -- -- if ($exit) { -- exit(1); -- } -- } - } -diff --git a/app/Exceptions/RunningAsIncorrectUserException.php b/app/Exceptions/RunningAsIncorrectUserException.php -new file mode 100644 -index 000000000000..6d1aca825d72 ---- /dev/null -+++ app/Exceptions/RunningAsIncorrectUserException.php -@@ -0,0 +1,10 @@ -+setFixer(__CLASS__); + ->setFixer(self::class); } diff --git a/net-mgmt/librenms/files/patch-LibreNMS_Validations_System.php b/net-mgmt/librenms/files/patch-LibreNMS_Validations_System.php index 961ebfbeaaac..3609e63926ca 100644 --- a/net-mgmt/librenms/files/patch-LibreNMS_Validations_System.php +++ b/net-mgmt/librenms/files/patch-LibreNMS_Validations_System.php @@ -1,12 +1,12 @@ ---- LibreNMS/Validations/System.php.orig 2023-08-21 20:59:01 UTC +--- LibreNMS/Validations/System.php.orig 2025-11-17 19:04:56 UTC +++ LibreNMS/Validations/System.php -@@ -40,19 +40,12 @@ class System extends BaseValidation +@@ -41,19 +41,12 @@ class System extends BaseValidation { $install_dir = $validator->getBaseDir(); -- $lnms = str_replace('lnms:', '', rtrim(`whereis -b lnms 2>/dev/null`)); +- $lnms = str_replace('lnms:', '', rtrim((string) `whereis -b lnms 2>/dev/null`)); + $lnms = rtrim(`/usr/bin/find %%LOCALBASE%%/bin -name lnms`); - $path = rtrim(`echo "\$PATH"`); + $path = rtrim((string) `echo "\$PATH"`); // if couldn't find lnms and we have PATH if (empty($lnms) && ! empty($path)) {