From owner-svn-ports-head@freebsd.org Mon Jan 16 03:14:55 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E00DCCB1A2E; Mon, 16 Jan 2017 03:14:55 +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 mx1.freebsd.org (Postfix) with ESMTPS id 9B3AC1D12; Mon, 16 Jan 2017 03:14:55 +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 v0G3Esd3011165; Mon, 16 Jan 2017 03:14:54 GMT (envelope-from dvl@FreeBSD.org) Received: (from dvl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0G3Es7I011160; Mon, 16 Jan 2017 03:14:54 GMT (envelope-from dvl@FreeBSD.org) Message-Id: <201701160314.v0G3Es7I011160@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dvl set sender to dvl@FreeBSD.org using -f From: Dan Langille Date: Mon, 16 Jan 2017 03:14:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431614 - in head: . net-mgmt/librenms net-mgmt/librenms/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jan 2017 03:14:56 -0000 Author: dvl Date: Mon Jan 16 03:14:54 2017 New Revision: 431614 URL: https://svnweb.freebsd.org/changeset/ports/431614 Log: Add patches missing from previous commit. Add note to pkg-message about my.cnf Add not to UPGRADING about my.cnf Bump PORTREVISION Submitted by: Larry Rosenman Added: head/net-mgmt/librenms/files/patch-includes-common.php (contents, props changed) head/net-mgmt/librenms/files/patch-validate.php (contents, props changed) Modified: head/UPDATING head/net-mgmt/librenms/Makefile head/net-mgmt/librenms/files/pkg-message.in Modified: head/UPDATING ============================================================================== --- head/UPDATING Mon Jan 16 02:55:27 2017 (r431613) +++ head/UPDATING Mon Jan 16 03:14:54 2017 (r431614) @@ -5,6 +5,16 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20170115: + AFFECTS: users of net-mgmt/librenms + AUTHOR: dvl@FreeBSD.org + + The following is recommended for /var/db/mysql/my.cnf + + [mysqld] + innodb_file_per_table=1 + sql-mode="" + 20170109: AFFECTS: users of lang/ruby22 AUTHOR: swills@FreeBSD.org Modified: head/net-mgmt/librenms/Makefile ============================================================================== --- head/net-mgmt/librenms/Makefile Mon Jan 16 02:55:27 2017 (r431613) +++ head/net-mgmt/librenms/Makefile Mon Jan 16 03:14:54 2017 (r431614) @@ -4,7 +4,7 @@ PORTNAME= librenms PORTVERSION= 1.23 PORTEPOCH= 1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt USE_GITHUB= yes Added: head/net-mgmt/librenms/files/patch-includes-common.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/librenms/files/patch-includes-common.php Mon Jan 16 03:14:54 2017 (r431614) @@ -0,0 +1,16 @@ +--- includes/common.php.orig 2017-01-15 20:50:30.075142000 +0000 ++++ includes/common.php 2017-01-15 20:42:35.634055000 +0000 +@@ -1110,10 +1110,10 @@ + curl_setopt($api, CURLOPT_RETURNTRANSFER, 1); + $output['github'] = json_decode(curl_exec($api), true); + } +- list($local_sha, $local_date) = explode('|', rtrim(`git show --pretty='%H|%ct' -s HEAD`)); +- $output['local_sha'] = $local_sha; ++# list($local_sha, $local_date) = explode('|', rtrim(`git show --pretty='%H|%ct' -s HEAD`)); ++ $output['local_sha'] = '%%PORTVERSION%%'; + $output['local_date'] = $local_date; +- $output['local_branch'] = rtrim(`git rev-parse --abbrev-ref HEAD`); ++# $output['local_branch'] = rtrim(`git rev-parse --abbrev-ref HEAD`); + + $output['db_schema'] = dbFetchCell('SELECT version FROM dbSchema'); + $output['php_ver'] = phpversion(); Added: head/net-mgmt/librenms/files/patch-validate.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/librenms/files/patch-validate.php Mon Jan 16 03:14:54 2017 (r431614) @@ -0,0 +1,52 @@ +--- validate.php.orig 2017-01-15 20:10:36.344602000 +0000 ++++ validate.php 2017-01-15 20:04:36.094612000 +0000 +@@ -103,10 +103,10 @@ + print_fail('You need to run this script as root' . (isset($config['user']) ? ' or '.$config['user'] : '')); + } + +-if ($config['update_channel'] == 'master' && $cur_sha != $versions['github']['sha']) { +- $commit_date = new DateTime('@'.$versions['local_date'], new DateTimeZone(date_default_timezone_get())); +- print_warn("Your install is out of date, last update: " . $commit_date->format('r')); +-} ++#if ($config['update_channel'] == 'master' && $cur_sha != $versions['github']['sha']) { ++# $commit_date = new DateTime('@'.$versions['local_date'], new DateTimeZone(date_default_timezone_get())); ++# print_warn("Your install is out of date, last update: " . $commit_date->format('r')); ++#} + + // Check php modules we use to make sure they are loaded + $extensions = array('pcre','curl','session','snmp','mcrypt'); +@@ -250,20 +250,20 @@ + print_list($devices, "\t %s\n"); + } + +-if ($versions['local_branch'] != 'master') { +- print_warn("Your local git branch is not master, this will prevent automatic updates."); +-} +- +-// check for modified files +-$modifiedcmd = 'git diff --name-only --exit-code'; +-if ($username === 'root') { +- $modifiedcmd = 'su '.$config['user'].' -c "'.$modifiedcmd.'"'; +-} +-exec($modifiedcmd, $cmdoutput, $code); +-if ($code !== 0 && !empty($cmdoutput)) { +- print_warn("Your local git contains modified files, this could prevent automatic updates.\nModified files:"); +- print_list($cmdoutput, "\t %s\n"); +-} ++#if ($versions['local_branch'] != 'master') { ++# print_warn("Your local git branch is not master, this will prevent automatic updates."); ++#} ++# ++#// check for modified files ++#$modifiedcmd = 'git diff --name-only --exit-code'; ++#if ($username === 'root') { ++# $modifiedcmd = 'su '.$config['user'].' -c "'.$modifiedcmd.'"'; ++#} ++#exec($modifiedcmd, $cmdoutput, $code); ++#if ($code !== 0 && !empty($cmdoutput)) { ++# print_warn("Your local git contains modified files, this could prevent automatic updates.\nModified files:"); ++# print_list($cmdoutput, "\t %s\n"); ++#} + + // Modules test + $modules = explode(',', $options['m']); Modified: head/net-mgmt/librenms/files/pkg-message.in ============================================================================== --- head/net-mgmt/librenms/files/pkg-message.in Mon Jan 16 02:55:27 2017 (r431613) +++ head/net-mgmt/librenms/files/pkg-message.in Mon Jan 16 03:14:54 2017 (r431614) @@ -1,4 +1,10 @@ === Configuration details === +The following is recommended for /var/db/mysql/my.cnf + +[mysqld] +innodb_file_per_table=1 +sql-mode="" + You can mostly follow the guide at: http://docs.librenms.org/