net-mgnt/snmp: follow firmware-product changes in core

net-mgmt/snmp/Makefile

@@ -1,6 +1,6 @@
 PLUGIN_NAME=		snmp
 PLUGIN_VERSION=		1.3
-PLUGIN_REVISION=	1
+PLUGIN_REVISION=	2
 PLUGIN_DEPENDS=		bsnmp-regex bsnmp-ucd
 PLUGIN_COMMENT=		End of life, superseded by Net-SNMP plugin
 PLUGIN_MAINTAINER=	franco@opnsense.org

net-mgmt/snmp/src/etc/inc/plugins.inc.d/bsnmpd.inc

@@ -96,11 +96,14 @@ trap := "{$config['snmpd']['trapstring']}"
 EOD;
     }
 
-    $version = trim(file_get_contents('/usr/local/opnsense/version/opnsense'));
-    $platform = $g['product_name'];
-    $sysDescr = "{$g['product_name']} " . php_uname("n") .
-                " {$version} {$platform} " . php_uname("s") .
-                " " . php_uname("r") . " " . trim(shell_exec('uname -p'));
+    $sysDescr = join(' ', array(
+        $g['product_name'],
+        $g['product_version'],
+        php_uname('n'),
+        php_uname('s'),
+        php_uname('r'),
+        $g['product_arch']
+    ));
 
     $snmpdconf .= <<<EOD
 system := 1