From owner-svn-ports-all@freebsd.org Mon Mar 29 14:41:31 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4FC28579624; Mon, 29 Mar 2021 14:41:31 +0000 (UTC) (envelope-from dvl@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F8FdR1XjVz3k9t; Mon, 29 Mar 2021 14:41:31 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 27A8615221; Mon, 29 Mar 2021 14:41:31 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12TEfUmE047618; Mon, 29 Mar 2021 14:41:30 GMT (envelope-from dvl@FreeBSD.org) Received: (from dvl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12TEfUtt047613; Mon, 29 Mar 2021 14:41:30 GMT (envelope-from dvl@FreeBSD.org) Message-Id: <202103291441.12TEfUtt047613@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dvl set sender to dvl@FreeBSD.org using -f From: Dan Langille Date: Mon, 29 Mar 2021 14:41:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r569472 - in head/net-mgmt/librenms: . files X-SVN-Group: ports-head X-SVN-Commit-Author: dvl X-SVN-Commit-Paths: in head/net-mgmt/librenms: . files X-SVN-Commit-Revision: 569472 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Mar 2021 14:41:31 -0000 Author: dvl Date: Mon Mar 29 14:41:29 2021 New Revision: 569472 URL: https://svnweb.freebsd.org/changeset/ports/569472 Log: Update to 21.3.0 Upstream has changed their release number, but I don't think that will affect us at all. It appears to follow year.month I have sent some newly added patches upstream (https://github.com/librenms/librenms/pull/12647) and they will be removed from here on the next release. This update jumps over 21.20, 21.1.0, & 17.0.1 for no reason. While here, include a patch from an outstanding PR PR: 252640 Submitted by: geoffroy desvernay Added: head/net-mgmt/librenms/files/patch-LibreNMS_Validations_System.php (contents, props changed) Modified: head/net-mgmt/librenms/Makefile head/net-mgmt/librenms/distinfo head/net-mgmt/librenms/files/patch-poller-wrapper.py Modified: head/net-mgmt/librenms/Makefile ============================================================================== --- head/net-mgmt/librenms/Makefile Mon Mar 29 14:28:59 2021 (r569471) +++ head/net-mgmt/librenms/Makefile Mon Mar 29 14:41:29 2021 (r569472) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= librenms -PORTVERSION= 1.70.1 -PORTREVISION= 2 +PORTVERSION= 21.3.0 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= LOCAL/dvl:vendor @@ -14,12 +13,12 @@ COMMENT= Autodiscovering PHP/MySQL/SNMP based network LICENSE= GPLv3 -USES= shebangfix python +USES= shebangfix python php # 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= 1606919946 +RELEASE_TIMESTAMP= 1616284710 # perhaps we also need python-memcache python-mysqldb RUN_DEPENDS+= rrdtool:databases/rrdtool \ @@ -69,7 +68,6 @@ MYSQLD_USES_OFF= mysql:client SHEBANG_FILES= scripts/auth_test.php \ scripts/check_requirements.py \ - scripts/deploy-docs.sh \ scripts/github-remove \ scripts/Migration/Standard_Conversion/convert_no_xml.sh \ scripts/Migration/Standard_Conversion/destwork_no_xml.sh \ Modified: head/net-mgmt/librenms/distinfo ============================================================================== --- head/net-mgmt/librenms/distinfo Mon Mar 29 14:28:59 2021 (r569471) +++ head/net-mgmt/librenms/distinfo Mon Mar 29 14:41:29 2021 (r569472) @@ -1,5 +1,5 @@ -TIMESTAMP = 1608472644 -SHA256 (librenms-vendor-1.70.1.tar.gz) = d8f5c8e3af145f65f56bc4bbbd5881bf819f05807aba9a043524d76e2134ef71 -SIZE (librenms-vendor-1.70.1.tar.gz) = 28043632 -SHA256 (librenms-librenms-1.70.1_GH0.tar.gz) = db731e24ecf703ba566363c09103aedde08a3f6daa6ff1e6627f644bd284c1f6 -SIZE (librenms-librenms-1.70.1_GH0.tar.gz) = 47603341 +TIMESTAMP = 1616683224 +SHA256 (librenms-vendor-21.3.0.tar.gz) = e06532500ac6aba46745de24dbb263fa481345cd0884f6b667ade69a20ce39ee +SIZE (librenms-vendor-21.3.0.tar.gz) = 28253811 +SHA256 (librenms-librenms-21.3.0_GH0.tar.gz) = cf3cc5bd4fb7ebeb68ad731fea9601a009b87ef738f7063c6a33690a47483dc0 +SIZE (librenms-librenms-21.3.0_GH0.tar.gz) = 49218982 Added: head/net-mgmt/librenms/files/patch-LibreNMS_Validations_System.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/librenms/files/patch-LibreNMS_Validations_System.php Mon Mar 29 14:41:29 2021 (r569472) @@ -0,0 +1,20 @@ +--- LibreNMS/Validations/System.php.orig 2021-03-25 16:28:19 UTC ++++ LibreNMS/Validations/System.php +@@ -39,7 +39,7 @@ class System extends BaseValidation + $install_dir = $validator->getBaseDir(); + + $lnms = `which lnms 2>/dev/null`; +- if (empty($lnms)) { ++ if (empty($lnms) && !Config::get('installed_from_package')) { + $validator->warn('Global lnms shortcut not installed. lnms command must be run with full path', "sudo ln -s $install_dir/lnms /usr/bin/lnms"); + } + +@@ -50,7 +50,7 @@ class System extends BaseValidation + } + + $rotation_file = '/etc/logrotate.d/librenms'; +- if (! file_exists($rotation_file)) { ++ if (! file_exists($rotation_file) && !Config::get('installed_from_package')) { + $validator->warn('Log rotation not enabled, could cause disk space issues', "sudo cp $install_dir/misc/librenms.logrotate $rotation_file"); + } + } Modified: head/net-mgmt/librenms/files/patch-poller-wrapper.py ============================================================================== --- head/net-mgmt/librenms/files/patch-poller-wrapper.py Mon Mar 29 14:28:59 2021 (r569471) +++ head/net-mgmt/librenms/files/patch-poller-wrapper.py Mon Mar 29 14:41:29 2021 (r569472) @@ -1,11 +1,11 @@ ---- poller-wrapper.py.orig 2020-07-20 20:50:23 UTC +--- poller-wrapper.py.orig 2021-01-14 02:21:36 UTC +++ poller-wrapper.py -@@ -27,6 +27,8 @@ +@@ -44,6 +44,8 @@ except ImportError as exc: + print('ERROR: %s' % exc) + sys.exit(2) - import LibreNMS.library as LNMS - +os.environ['PATH'] += ':/usr/local/sbin:/usr/local/bin' + - try: - import json + APP_NAME = "poller_wrapper" + LOG_FILE = "logs/" + APP_NAME + ".log"