From owner-svn-ports-all@freebsd.org Wed Jan 16 12:59:38 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A96A11487A6A; Wed, 16 Jan 2019 12:59:38 +0000 (UTC) (envelope-from swills@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 4BB5E6CB03; Wed, 16 Jan 2019 12:59:38 +0000 (UTC) (envelope-from swills@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 361ED2722; Wed, 16 Jan 2019 12:59:38 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0GCxcln045342; Wed, 16 Jan 2019 12:59:38 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0GCxbHv045341; Wed, 16 Jan 2019 12:59:37 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201901161259.x0GCxbHv045341@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Wed, 16 Jan 2019 12:59:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490477 - in head/net-mgmt/cacti: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/net-mgmt/cacti: . files X-SVN-Commit-Revision: 490477 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4BB5E6CB03 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.94)[-0.942,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] 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, 16 Jan 2019 12:59:38 -0000 Author: swills Date: Wed Jan 16 12:59:37 2019 New Revision: 490477 URL: https://svnweb.freebsd.org/changeset/ports/490477 Log: net-mgmt/cacti: fix issues with graphs PR: 234952 Submitted by: Daniel Austin (maintainer) Added: head/net-mgmt/cacti/files/extra-patch-lib_snmp.php (contents, props changed) Modified: head/net-mgmt/cacti/Makefile (contents, props changed) Modified: head/net-mgmt/cacti/Makefile ============================================================================== --- head/net-mgmt/cacti/Makefile Wed Jan 16 12:06:25 2019 (r490476) +++ head/net-mgmt/cacti/Makefile Wed Jan 16 12:59:37 2019 (r490477) @@ -2,7 +2,7 @@ PORTNAME= cacti PORTVERSION= 1.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt www MASTER_SITES= http://www.cacti.net/downloads/ \ ftp://ftpmirror.uk/freebsd-ports/cacti/ @@ -46,6 +46,11 @@ 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; \ Added: head/net-mgmt/cacti/files/extra-patch-lib_snmp.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/cacti/files/extra-patch-lib_snmp.php Wed Jan 16 12:59:37 2019 (r490477) @@ -0,0 +1,12 @@ +--- lib/snmp.php.orig 2019-01-14 19:28:50 UTC ++++ lib/snmp.php +@@ -870,6 +870,9 @@ function snmp_escape_string($string) { + function snmp_get_method($type = 'walk', $version = 1, $context = '', $engineid = '', + $value_output_format = SNMP_STRING_OUTPUT_GUESS) { + ++ /* override PHP SNMP calls and use the binary instead, fixes some broken graph issues */ ++ return SNMP_METHOD_BINARY; ++ + if ($value_output_format == SNMP_STRING_OUTPUT_HEX) { + return SNMP_METHOD_BINARY; + } elseif ($version == 3 && $context != '') {