Attachment #201140 for bug #234952

View | Details | Raw Unified | Return to bug 234952
Collapse All | Expand All

Lines 2-8 Link Here

(-)net-mgmt/cacti/Makefile (-1 / +6 lines)
2		2
3	PORTNAME= cacti	3	PORTNAME= cacti
4	PORTVERSION= 1.2.0	4	PORTVERSION= 1.2.0
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= net-mgmt www	6	CATEGORIES= net-mgmt www
7	MASTER_SITES= http://www.cacti.net/downloads/ \	7	MASTER_SITES= http://www.cacti.net/downloads/ \
8	ftp://ftpmirror.uk/freebsd-ports/cacti/	8	ftp://ftpmirror.uk/freebsd-ports/cacti/
Lines 46-51 Link Here
46	CACTIGROUP=${CACTIGROUP}	46	CACTIGROUP=${CACTIGROUP}
47		47
48	CONFLICTS_INSTALL= cacti88	48	CONFLICTS_INSTALL= cacti88
		49
		50	OPTIONS_DEFINE= SNMPBIN
		51	OPTIONS_DEFAULT= SNMPBIN
		52	SNMPBIN_DESC= Force use of SNMP binary instead of phpXX-snmp functions
		53	SNMPBIN_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-lib_snmp.php
49		54
50	post-patch:	55	post-patch:
51	@${FIND} ${WRKSRC} -name \*.orig -delete; \	56	@${FIND} ${WRKSRC} -name \*.orig -delete; \




--- 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 != '') {

Return to bug 234952

Line 0 Link Here

(-)net-mgmt/cacti/files/extra-patch-lib_snmp.php (+12 lines)
	1	--- lib/snmp.php.orig 2019-01-14 19:28:50 UTC
	2	+++ lib/snmp.php
	3	@@ -870,6 +870,9 @@ function snmp_escape_string($string) {
	4	function snmp_get_method($type = 'walk', $version = 1, $context = '', $engineid = '',
	5	$value_output_format = SNMP_STRING_OUTPUT_GUESS) {
	6
	7	+ /* override PHP SNMP calls and use the binary instead, fixes some broken graph issues */
	8	+ return SNMP_METHOD_BINARY;
	9	+
	10	if ($value_output_format == SNMP_STRING_OUTPUT_HEX) {
	11	return SNMP_METHOD_BINARY;
	12	} elseif ($version == 3 && $context != '') {