From owner-svn-ports-all@freebsd.org Wed Aug 21 07:47:45 2019 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 C9DABBE100; Wed, 21 Aug 2019 07:47:45 +0000 (UTC) (envelope-from kai@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46D0BT5gwLz4cg0; Wed, 21 Aug 2019 07:47:45 +0000 (UTC) (envelope-from kai@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 A60F718785; Wed, 21 Aug 2019 07:47:45 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7L7ljgW086761; Wed, 21 Aug 2019 07:47:45 GMT (envelope-from kai@FreeBSD.org) Received: (from kai@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7L7liqr086752; Wed, 21 Aug 2019 07:47:44 GMT (envelope-from kai@FreeBSD.org) Message-Id: <201908210747.x7L7liqr086752@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kai set sender to kai@FreeBSD.org using -f From: Kai Knoblich Date: Wed, 21 Aug 2019 07:47:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r509495 - in branches/2019Q3/net-mgmt/cacti: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: kai X-SVN-Commit-Paths: in branches/2019Q3/net-mgmt/cacti: . files X-SVN-Commit-Revision: 509495 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.29 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: Wed, 21 Aug 2019 07:47:45 -0000 Author: kai Date: Wed Aug 21 07:47:44 2019 New Revision: 509495 URL: https://svnweb.freebsd.org/changeset/ports/509495 Log: MFH: r509310 net-mgmt/cacti: Update to 1.2.5 * Remove the SNMPBIN option that was introduced with r490477 and which is no longer required since the 1.2.4 release. It was used as a workaround to override the internal PHP SNMP calls which led to graphs that didn't update within cacti. The PHP SNMP extension can now be enabled/disabled by a re-purposed variable in the configuration file. While I'm here: * Remove superfluous "+=" from PLIST_SUB and SUB_LIST because there are no previous definitions of those variables. * Remove CONFLICTS_INSTALL as net-mgmt/cacti88 is no longer present in the Ports tree since the end of 2018. Changes since 1.2.3: https://github.com/Cacti/cacti/blob/release/1.2.5/CHANGELOG * Merge the UCL convertions from r508903 while I'm here. PR: 238434 Submitted by: Michael Muenz Reported by: Matthew Horan Approved by: maintainer timeout (2+ months) Approved by: ports-secteam (joneum) Deleted: branches/2019Q3/net-mgmt/cacti/files/extra-patch-lib_snmp.php Modified: branches/2019Q3/net-mgmt/cacti/Makefile branches/2019Q3/net-mgmt/cacti/distinfo branches/2019Q3/net-mgmt/cacti/files/patch-install__functions.php branches/2019Q3/net-mgmt/cacti/files/patch-lib_installer.php branches/2019Q3/net-mgmt/cacti/files/pkg-message.in branches/2019Q3/net-mgmt/cacti/pkg-plist Directory Properties: branches/2019Q3/ (props changed) Modified: branches/2019Q3/net-mgmt/cacti/Makefile ============================================================================== --- branches/2019Q3/net-mgmt/cacti/Makefile Wed Aug 21 07:31:41 2019 (r509494) +++ branches/2019Q3/net-mgmt/cacti/Makefile Wed Aug 21 07:47:44 2019 (r509495) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cacti -PORTVERSION= 1.2.3 +PORTVERSION= 1.2.5 CATEGORIES= net-mgmt www MASTER_SITES= http://www.cacti.net/downloads/ \ ftp://ftpmirror.uk/freebsd-ports/cacti/ @@ -40,17 +40,10 @@ CACTIGROUP?= cacti USERS?= ${CACTIUSER} GROUPS?= ${CACTIGROUP} -PLIST_SUB+= CACTIDIR=${CACTIDIR} CACTIUSER=${CACTIUSER} \ +PLIST_SUB= CACTIDIR=${CACTIDIR} CACTIUSER=${CACTIUSER} \ CACTIGROUP=${CACTIGROUP} -SUB_LIST+= CACTIDIR=${CACTIDIR} CACTIUSER=${CACTIUSER} \ +SUB_LIST= CACTIDIR=${CACTIDIR} CACTIUSER=${CACTIUSER} \ CACTIGROUP=${CACTIGROUP} - -CONFLICTS_INSTALL= cacti88 - -OPTIONS_DEFINE= SNMPBIN -OPTIONS_DEFAULT= SNMPBIN -SNMPBIN_DESC= Force use of SNMP binary instead of phpXX-snmp functions -SNMPBIN_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-lib_snmp.php post-patch: @${FIND} ${WRKSRC} -name \*.orig -delete; \ Modified: branches/2019Q3/net-mgmt/cacti/distinfo ============================================================================== --- branches/2019Q3/net-mgmt/cacti/distinfo Wed Aug 21 07:31:41 2019 (r509494) +++ branches/2019Q3/net-mgmt/cacti/distinfo Wed Aug 21 07:47:44 2019 (r509495) @@ -1,3 +1,3 @@ -TIMESTAMP = 1554040180 -SHA256 (cacti-1.2.3.tar.gz) = 3bd711cb425d51defbcc6d7f5761f886822fd3d004977bb74eca202431cdf51c -SIZE (cacti-1.2.3.tar.gz) = 23977004 +TIMESTAMP = 1563799623 +SHA256 (cacti-1.2.5.tar.gz) = bba3342f9bf285340eaded3545bbfaecd435f60cc5eacd74300fc90113cc9dc9 +SIZE (cacti-1.2.5.tar.gz) = 24677665 Modified: branches/2019Q3/net-mgmt/cacti/files/patch-install__functions.php ============================================================================== --- branches/2019Q3/net-mgmt/cacti/files/patch-install__functions.php Wed Aug 21 07:31:41 2019 (r509494) +++ branches/2019Q3/net-mgmt/cacti/files/patch-install__functions.php Wed Aug 21 07:47:44 2019 (r509495) @@ -1,11 +1,11 @@ ---- install/functions.php.orig 2019-03-30 23:40:23 UTC +--- install/functions.php.orig 2019-07-15 19:23:30 UTC +++ install/functions.php -@@ -533,7 +533,7 @@ function install_file_paths() { - if (!config_value_exists('path_cactilog')) { - $input['path_cactilog'] = $settings['path']['path_cactilog']; - if (empty($input['path_cactilog']['default'])) { -- $input['path_cactilog']['default'] = $config['base_path'] . '/log/cacti.log'; -+ $input['path_cactilog']['default'] = '/var/log/cacti/log'; - } - } else { - $input['path_cactilog'] = $settings['path']['path_cactilog']; +@@ -538,7 +538,7 @@ function install_file_paths() { + } + + if (empty($input['path_cactilog']['default'])) { +- $input['path_cactilog']['default'] = $config['base_path'] . '/log/cacti.log'; ++ $input['path_cactilog']['default'] = '/var/log/cacti/log'; + } + + /* stderr log file path */ Modified: branches/2019Q3/net-mgmt/cacti/files/patch-lib_installer.php ============================================================================== --- branches/2019Q3/net-mgmt/cacti/files/patch-lib_installer.php Wed Aug 21 07:31:41 2019 (r509494) +++ branches/2019Q3/net-mgmt/cacti/files/patch-lib_installer.php Wed Aug 21 07:47:44 2019 (r509495) @@ -1,11 +1,11 @@ ---- lib/installer.php.orig 2019-01-06 07:22:22 UTC +--- lib/installer.php.orig 2019-07-26 03:05:22 UTC +++ lib/installer.php -@@ -3222,7 +3222,7 @@ class Installer implements JsonSerializable { - - public static function getInstallLog() { +@@ -3216,7 +3216,7 @@ class Installer implements JsonSerializable { global $config; -- $logcontents = tail_file($config['base_path'] . '/log/cacti.log', 100, -1, ' INSTALL:' , 1, $total_rows); -+ $logcontents = tail_file('/var/log/cacti/log', 100, -1, ' INSTALL:' , 1, $total_rows); + + $page_nr = 1; +- $logcontents = tail_file($config['base_path'] . '/log/cacti.log', 100, -1, ' INSTALL:' , $page_no, $total_rows); ++ $logcontents = tail_file('/var/log/cacti/log', 100, -1, ' INSTALL:' , $page_no, $total_rows); $output_log = ''; foreach ($logcontents as $logline) { Modified: branches/2019Q3/net-mgmt/cacti/files/pkg-message.in ============================================================================== --- branches/2019Q3/net-mgmt/cacti/files/pkg-message.in Wed Aug 21 07:31:41 2019 (r509494) +++ branches/2019Q3/net-mgmt/cacti/files/pkg-message.in Wed Aug 21 07:47:44 2019 (r509495) @@ -1,4 +1,6 @@ -======================================================================= +[ +{ type: install + message: <