From 8cc3bb4fc0a4415278e3a1f5f647893a1a08697e Mon Sep 17 00:00:00 2001
From: bofh <bofh@FreeBSD.org>
Date: Mon, 15 May 2017 21:47:56 +0000
Subject: net-mgmt/netxms: Update version 1.2.17=>2.0.7

Submitted by:	pi
---
 net-mgmt/netxms/Makefile                           |   7 +-
 net-mgmt/netxms/distinfo                           |   5 +-
 .../patch-src-agent-subagents-freebsd-freebsd.cpp  |  23 --
 .../patch-src-agent-subagents-freebsd-net.cpp      | 181 ------------
 .../files/patch-src-agent-subagents-freebsd-net.h  |  10 -
 net-mgmt/netxms/pkg-plist                          | 321 +++++++++++++++++----
 6 files changed, 274 insertions(+), 273 deletions(-)
 delete mode 100644 net-mgmt/netxms/files/patch-src-agent-subagents-freebsd-freebsd.cpp
 delete mode 100644 net-mgmt/netxms/files/patch-src-agent-subagents-freebsd-net.cpp
 delete mode 100644 net-mgmt/netxms/files/patch-src-agent-subagents-freebsd-net.h

(limited to 'net-mgmt')

diff --git a/net-mgmt/netxms/Makefile b/net-mgmt/netxms/Makefile
index 55a1b79d7c94..7f118551a6e9 100644
--- a/net-mgmt/netxms/Makefile
+++ b/net-mgmt/netxms/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	netxms
-PORTVERSION=	1.2.17
-PORTREVISION=	3
+PORTVERSION=	2.0.7
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.netxms.org/download/ \
 		http://www.netxms.org/download/archive/
@@ -19,8 +18,6 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libjansson.so:devel/jansson \
 		libtre.so:textproc/libtre
 
-PORTSCOUT=	limit:^1\.
-
 OPTIONS_DEFINE=	SERVER CLIENT AGENT
 OPTIONS_DEFAULT=	CLIENT AGENT
 OPTIONS_SINGLE=	SERVER
@@ -35,7 +32,7 @@ CLIENT_CONFIGURE_ON=	--with-client
 AGENT_CONFIGURE_ON=	--with-agent
 SERVER_CONFIGURE_ON=	--with-server
 MYSQL_CONFIGURE_ON=	--with-mysql
-MYSQL_USE=		MYSQL=yes
+MYSQL_USES=		mysql
 PGSQL_CONFIGURE_ON=	--with-pgsql
 PGSQL_USES=		pgsql
 SQLITE_CONFIGURE_ON=	--with-sqlite
diff --git a/net-mgmt/netxms/distinfo b/net-mgmt/netxms/distinfo
index bbbc47fb124e..cc23b64c61b8 100644
--- a/net-mgmt/netxms/distinfo
+++ b/net-mgmt/netxms/distinfo
@@ -1,2 +1,3 @@
-SHA256 (netxms-1.2.17.tar.gz) = 76e325c6889f1fe9d76fed4ab026203764acf45224a6bcb9fcdd6d939a89d9e4
-SIZE (netxms-1.2.17.tar.gz) = 10592536
+TIMESTAMP = 1493479900
+SHA256 (netxms-2.0.7.tar.gz) = ac62fc591b47f3a1ec8adc936bd7bdd8537d34073d4aa0e0b4392bcddacd2c3c
+SIZE (netxms-2.0.7.tar.gz) = 17821575
diff --git a/net-mgmt/netxms/files/patch-src-agent-subagents-freebsd-freebsd.cpp b/net-mgmt/netxms/files/patch-src-agent-subagents-freebsd-freebsd.cpp
deleted file mode 100644
index 1b995320d9a2..000000000000
--- a/net-mgmt/netxms/files/patch-src-agent-subagents-freebsd-freebsd.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/agent/subagents/freebsd/freebsd.cpp.orig	2013-12-25 15:01:05 UTC
-+++ src/agent/subagents/freebsd/freebsd.cpp
-@@ -48,14 +48,14 @@ static NETXMS_SUBAGENT_PARAM m_parameter
- 	{ _T("FileSystem.UsedPerc(*)"),       H_DiskInfo,        (const TCHAR *)DISK_USED_PERC,    DCI_DT_FLOAT,	DCIDESC_FS_USEDPERC },
- 
- 	{ _T("Net.Interface.AdminStatus(*)"), H_NetIfAdmStatus,  NULL,				DCI_DT_INT,	DCIDESC_NET_INTERFACE_ADMINSTATUS },
--	{ _T("Net.Interface.BytesIn(*)"),     H_NetIfInfoFromKVM, (const TCHAR *)IF_INFO_BYTES_IN,    DCI_DT_UINT64, DCIDESC_NET_INTERFACE_BYTESIN },
--	{ _T("Net.Interface.BytesOut(*)"),    H_NetIfInfoFromKVM, (const TCHAR *)IF_INFO_BYTES_OUT,   DCI_DT_UINT64, DCIDESC_NET_INTERFACE_BYTESOUT },
--	{ _T("Net.Interface.InErrors(*)"),    H_NetIfInfoFromKVM, (const TCHAR *)IF_INFO_IN_ERRORS,   DCI_DT_UINT64, DCIDESC_NET_INTERFACE_INERRORS },
-+	{ _T("Net.Interface.BytesIn(*)"),     H_NetIfInfo, (const TCHAR *)IF_INFO_BYTES_IN,    DCI_DT_UINT64, DCIDESC_NET_INTERFACE_BYTESIN },
-+	{ _T("Net.Interface.BytesOut(*)"),    H_NetIfInfo, (const TCHAR *)IF_INFO_BYTES_OUT,   DCI_DT_UINT64, DCIDESC_NET_INTERFACE_BYTESOUT },
-+	{ _T("Net.Interface.InErrors(*)"),    H_NetIfInfo, (const TCHAR *)IF_INFO_IN_ERRORS,   DCI_DT_UINT64, DCIDESC_NET_INTERFACE_INERRORS },
- 	{ _T("Net.Interface.Link(*)"),        H_NetIfLink,       NULL,				DCI_DT_DEPRECATED,	DCIDESC_DEPRECATED },
- 	{ _T("Net.Interface.OperStatus(*)"),  H_NetIfLink,       NULL,				DCI_DT_INT,	DCIDESC_NET_INTERFACE_OPERSTATUS },
--	{ _T("Net.Interface.OutErrors(*)"),   H_NetIfInfoFromKVM, (const TCHAR *)IF_INFO_OUT_ERRORS,  DCI_DT_UINT64, DCIDESC_NET_INTERFACE_OUTERRORS },
--	{ _T("Net.Interface.PacketsIn(*)"),   H_NetIfInfoFromKVM, (const TCHAR *)IF_INFO_PACKETS_IN,  DCI_DT_UINT64, DCIDESC_NET_INTERFACE_PACKETSIN },
--	{ _T("Net.Interface.PacketsOut(*)"),  H_NetIfInfoFromKVM, (const TCHAR *)IF_INFO_PACKETS_OUT, DCI_DT_UINT64, DCIDESC_NET_INTERFACE_PACKETSOUT },
-+	{ _T("Net.Interface.OutErrors(*)"),   H_NetIfInfo, (const TCHAR *)IF_INFO_OUT_ERRORS,  DCI_DT_UINT64, DCIDESC_NET_INTERFACE_OUTERRORS },
-+	{ _T("Net.Interface.PacketsIn(*)"),   H_NetIfInfo, (const TCHAR *)IF_INFO_PACKETS_IN,  DCI_DT_UINT64, DCIDESC_NET_INTERFACE_PACKETSIN },
-+	{ _T("Net.Interface.PacketsOut(*)"),  H_NetIfInfo, (const TCHAR *)IF_INFO_PACKETS_OUT, DCI_DT_UINT64, DCIDESC_NET_INTERFACE_PACKETSOUT },
- 	{ _T("Net.IP.Forwarding"),            H_NetIpForwarding, (const TCHAR *)4,			DCI_DT_INT,	DCIDESC_NET_IP_FORWARDING },
- 	{ _T("Net.IP6.Forwarding"),           H_NetIpForwarding, (const TCHAR *)6,			DCI_DT_INT,	DCIDESC_NET_IP6_FORWARDING },
- 
diff --git a/net-mgmt/netxms/files/patch-src-agent-subagents-freebsd-net.cpp b/net-mgmt/netxms/files/patch-src-agent-subagents-freebsd-net.cpp
deleted file mode 100644
index 4c964c56cd73..000000000000
--- a/net-mgmt/netxms/files/patch-src-agent-subagents-freebsd-net.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
---- src/agent/subagents/freebsd/net.cpp.orig	2013-12-25 15:01:05 UTC
-+++ src/agent/subagents/freebsd/net.cpp
-@@ -32,7 +32,6 @@
- #include <net/if_media.h>
- #include <net/if_dl.h>
- #include <net/if_types.h>
--#include <net/if_var.h>
- #include <net/route.h>
- #include <net/iso88025.h>
- #include <netinet/if_ether.h>
-@@ -40,8 +39,7 @@
- #include <ifaddrs.h>
- #include <arpa/inet.h>
- #include <net/ethernet.h>
--#include <kvm.h>
--#include <nlist.h>
-+#include <ifaddrs.h>
- 
- #include "net.h"
- 
-@@ -60,14 +58,6 @@ typedef struct t_IfList
- 	int index;
- } IFLIST;
- 
--struct nlist nl[] = {
--#define N_IFNET 0
--	{ (char *)"_ifnet" },
--	{ NULL },
--};
--
--kvm_t *kvmd = NULL;
--
- LONG H_NetIpForwarding(const TCHAR *pszParam, const TCHAR *pArg, TCHAR *pValue)
- {
- 	int nVer = CAST_FROM_POINTER(pArg, int);
-@@ -568,94 +558,66 @@ LONG H_NetIfList(const TCHAR *pszParam, 
- 	return nRet;
- }
- 
--LONG H_NetIfInfoFromKVM(const TCHAR *pszParam, const TCHAR *pArg, TCHAR *pValue)
-+LONG H_NetIfInfo(const TCHAR *pszParam, const TCHAR *pArg, TCHAR *pValue)
- {
--	int nRet = SYSINFO_RC_SUCCESS;
- 	char szArg[512];
--	u_long ifnetaddr;
--	struct ifnet ifnet;
--	struct ifnethead ifnethead;
--#if __FreeBSD__ < 5
--	char szTName[IFNAMSIZ];
--#endif
--	char szName[IFNAMSIZ];
-+	struct ifaddrs *ifap, *ifa;
-+	u_int index;
- 
- 	AgentGetParameterArgA(pszParam, 1, szArg, sizeof(szArg));
- 
--	if (szArg[0] != 0)
-+	if (szArg[0] == 0)
-+		return SYSINFO_RC_SUCCESS;
-+
-+	if (szArg[0] >= '0' && szArg[0] <= '9')
-+		index = atoi(szArg);
-+	else
-+		index = 0;
-+
-+	if (getifaddrs(&ifap) != 0)
- 	{
--		if (szArg[0] >= '0' && szArg[0] <= '9')
--		{
--			// index
--			if (if_indextoname(atoi(szArg), szArg) != szArg)
--			{
--				// not found
--				nRet = SYSINFO_RC_ERROR;
--			}
--		}
-+		return SYSINFO_RC_ERROR;
-+	}
- 
--		if (nRet == SYSINFO_RC_SUCCESS)
--		{
--			nRet = SYSINFO_RC_ERROR;
-+	for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
-+		if (ifa->ifa_addr->sa_family != AF_LINK)
-+			continue;
-+		if (index) {
-+			if (index != if_nametoindex(ifa->ifa_name))
-+				continue;
-+		} else if (strcmp(ifa->ifa_name, szArg) != 0)
-+			continue;
- 
--			if (kvmd == NULL) {
--				kvmd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, NULL);
--				if (kvmd == NULL)
--					return SYSINFO_RC_ERROR;
--				if (kvm_nlist(kvmd, nl) < 0)
--					return SYSINFO_RC_ERROR;
--				if (nl[0].n_type == 0)
--					return SYSINFO_RC_ERROR;
--			}
--			ifnetaddr = nl[N_IFNET].n_value;
--			if (kvm_read(kvmd, ifnetaddr, &ifnethead, sizeof(ifnethead)) != sizeof(ifnethead))
--				return SYSINFO_RC_ERROR;
--			ifnetaddr = (u_long)TAILQ_FIRST(&ifnethead);
--			while (ifnetaddr) {
--				if (kvm_read(kvmd, ifnetaddr, &ifnet, sizeof(ifnet)) != sizeof(ifnet))
--					return SYSINFO_RC_ERROR;
--				ifnetaddr = (u_long)TAILQ_NEXT(&ifnet, if_link);
--#if __FreeBSD__ >= 5
--				strlcpy(szName, ifnet.if_xname, sizeof(szName));
--#else
--				if (kvm_read(kvmd, ifnet.if_name, szTName, sizeof(szTName)) != sizeof(szTName))
--					return SYSINFO_RC_ERROR;
--				szTName[sizeof(szTName) - 1] = '\0';
--				snprintf(szName, sizeof(szName), "%s%d", szTName, ifnet.if_unit);
--#endif
--				if (strcmp(szName, szArg) == 0) {
--					nRet = SYSINFO_RC_SUCCESS;
--					switch((long)pArg)
--					{
--						case IF_INFO_BYTES_IN:
--							ret_uint(pValue, ifnet.if_ibytes);
--							break;
--						case IF_INFO_BYTES_OUT:
--							ret_uint(pValue, ifnet.if_obytes);
--							break;
--						case IF_INFO_IN_ERRORS:
--							ret_uint(pValue, ifnet.if_ierrors);
--							break;
--						case IF_INFO_OUT_ERRORS:
--							ret_uint(pValue, ifnet.if_oerrors);
--							break;
--						case IF_INFO_PACKETS_IN:
--							ret_uint(pValue, ifnet.if_ipackets);
--							break;
--						case IF_INFO_PACKETS_OUT:
--							ret_uint(pValue, ifnet.if_opackets);
--							break;
--						default:
--							nRet = SYSINFO_RC_UNSUPPORTED;
--							break;
--					}
--					break;
--				}
--				else
--					continue;
--			}
-+#define	IFA_STAT(s)	(((struct if_data *)ifa->ifa_data)->ifi_ ## s)
-+
-+		switch((long)pArg)
-+		{
-+			case IF_INFO_BYTES_IN:
-+				ret_uint(pValue, IFA_STAT(ibytes));
-+				break;
-+			case IF_INFO_BYTES_OUT:
-+				ret_uint(pValue, IFA_STAT(obytes));
-+				break;
-+			case IF_INFO_IN_ERRORS:
-+				ret_uint(pValue, IFA_STAT(ierrors));
-+				break;
-+			case IF_INFO_OUT_ERRORS:
-+				ret_uint(pValue, IFA_STAT(oerrors));
-+				break;
-+			case IF_INFO_PACKETS_IN:
-+				ret_uint(pValue, IFA_STAT(ipackets));
-+				break;
-+			case IF_INFO_PACKETS_OUT:
-+				ret_uint(pValue, IFA_STAT(opackets));
-+				break;
-+			default:
-+				freeifaddrs(ifap);
-+				return SYSINFO_RC_UNSUPPORTED;
- 		}
-+		freeifaddrs(ifap);
-+		return SYSINFO_RC_SUCCESS;
- 	}
- 
--	return nRet;
-+	freeifaddrs(ifap);
-+	return SYSINFO_RC_ERROR;
- }
diff --git a/net-mgmt/netxms/files/patch-src-agent-subagents-freebsd-net.h b/net-mgmt/netxms/files/patch-src-agent-subagents-freebsd-net.h
deleted file mode 100644
index ea34de4957ae..000000000000
--- a/net-mgmt/netxms/files/patch-src-agent-subagents-freebsd-net.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/agent/subagents/freebsd/net.h.orig	2013-12-25 15:01:05 UTC
-+++ src/agent/subagents/freebsd/net.h
-@@ -39,6 +39,6 @@ LONG H_NetIfLink(const TCHAR *, const TC
- LONG H_NetArpCache(const TCHAR *, const TCHAR *, StringList *);
- LONG H_NetIfList(const TCHAR *, const TCHAR *, StringList *);
- LONG H_NetRoutingTable(const TCHAR *, const TCHAR *, StringList *);
--LONG H_NetIfInfoFromKVM(const TCHAR *, const TCHAR *, TCHAR *);
-+LONG H_NetIfInfo(const TCHAR *, const TCHAR *, TCHAR *);
- 
- #endif // __NET_H__
diff --git a/net-mgmt/netxms/pkg-plist b/net-mgmt/netxms/pkg-plist
index f7ed76070c7e..c24d0c1f9abe 100644
--- a/net-mgmt/netxms/pkg-plist
+++ b/net-mgmt/netxms/pkg-plist
@@ -10,6 +10,7 @@
 %%SERVER%%bin/nxdbmgr
 %%NXCP%%bin/nxencpasswd
 %%CLIENT%%bin/nxevent
+%%CLIENT%%bin/nxgenguid
 %%SERVER%%bin/nxget
 %%SERVER%%bin/nxmibc
 %%CLIENT%%bin/nxpush
@@ -22,82 +23,90 @@
 %%SERVER%%@sample etc/netxmsd.conf.sample
 %%NXCP%%@sample etc/nxagentd.conf.sample
 lib/libnetxms.so
-lib/libnetxms.so.1
-lib/libnetxms.so.1.0.0
+lib/libnetxms.so.2
+lib/libnetxms.so.2.0.0
+%%SERVER%%lib/libnxcc.so
+%%SERVER%%lib/libnxcc.so.2
+%%SERVER%%lib/libnxcc.so.2.0.0
+%%SERVER%%lib/libnxmap.so
+%%SERVER%%lib/libnxmap.so.2
+%%SERVER%%lib/libnxmap.so.2.0.0
+%%SERVER%%lib/libnxsms_kannel.so
+%%SERVER%%lib/libnxsms_mymobile.so
+%%SERVER%%lib/libnxsms_nexmo.so
+%%SERVER%%lib/libnxsms_slack.so
+%%SERVER%%lib/libnxsms_smseagle.so
+%%SERVER%%lib/libnxsms_text2reach.so
 %%NXCP%%lib/libnxsqlite.so
-%%NXCP%%lib/libnxsqlite.so.1
-%%AGENT%%lib/libnxsqlite.so.1.0.0
+%%NXCP%%lib/libnxsqlite.so.2
+%%AGENT%%lib/libnxsqlite.so.2.0.0
 %%NXCP%%lib/libnxdb.so
-%%NXCP%%lib/libnxdb.so.1
-%%AGENT%%lib/libnxdb.so.1.0.0
+%%NXCP%%lib/libnxdb.so.2
+%%AGENT%%lib/libnxdb.so.2.0.0
 %%AGENT%%lib/netxms/devemu.nsm
 %%NXCP%%lib/libappagent.so
-%%NXCP%%lib/libappagent.so.1
-%%AGENT%%lib/libappagent.so.1.0.0
+%%NXCP%%lib/libappagent.so.2
+%%AGENT%%lib/libappagent.so.2.0.0
 %%SERVER%%lib/libavaya-ers.so
 %%SERVER%%lib/libcisco.so
 %%NXCP%%lib/libnsm_dbquery.so
+%%AGENT%%lib/libnsm_gps.so
+%%AGENT%%lib/libnxagent.so
+%%AGENT%%lib/libnxagent.so.2
+%%AGENT%%lib/libnxagent.so.2.0.0
+%%AGENT%%lib/libnxappc.a
+%%AGENT%%lib/netxms/gps.nsm
 %%SERVER%%lib/libnsm_filemgr.so
 %%NXCP%%lib/libnsm_portcheck.so
 %%AGENT%%lib/libnsm_devemu.so
 %%NXCP%%lib/libnsm_netsvc.so
 %%NXCP%%lib/libnxsd.so
-%%NXCP%%lib/libnxsd.so.1
-%%AGENT%%lib/libnxsd.so.1.0.0
+%%NXCP%%lib/libnxsd.so.2
+%%AGENT%%lib/libnxsd.so.2.0.0
 %%SERVER%%lib/libnxsms_dummy.so
-%%SERVER%%lib/libnxsms_dummy.so.1
-%%SERVER%%lib/libnxsms_dummy.so.1.0.0
 %%SERVER%%lib/libnxsms_portech.so
-%%SERVER%%lib/libnxsms_portech.so.1
-%%SERVER%%lib/libnxsms_portech.so.1.0.0
 %%SERVER%%lib/libstrophe.so
-%%SERVER%%lib/libstrophe.so.1
-%%SERVER%%lib/libstrophe.so.1.0.0
+%%SERVER%%lib/libstrophe.so.2
+%%SERVER%%lib/libstrophe.so.2.0.0
 %%NXCP%%lib/libnsm_ecs.so
 %%NXCP%%lib/libnsm_freebsd.so
 %%NXCP%%lib/libnsm_logwatch.so
 %%NXCP%%lib/libnsm_ping.so
 %%NXCP%%lib/libnsm_sms.so
 %%NXCP%%lib/libnsm_ups.so
-%%CLIENT%%lib/libnxcl.so
-%%CLIENT%%lib/libnxcl.so.1
-%%CLIENT%%lib/libnxcl.so.1.0.0
+%%CLIENT%%lib/libnxclient.so
+%%CLIENT%%lib/libnxclient.so.2
+%%CLIENT%%lib/libnxclient.so.2.0.0
 %%SERVER%%lib/libnxcore.so
-%%SERVER%%lib/libnxcore.so.1
-%%SERVER%%lib/libnxcore.so.1.0.0
+%%SERVER%%lib/libnxcore.so.2
+%%SERVER%%lib/libnxcore.so.2.0.0
 %%MYSQL%%lib/libnxddr_mysql.so
 %%ODBC%%lib/libnxddr_odbc.so
 %%PGSQL%%lib/libnxddr_pgsql.so
 %%SQLITE%%lib/libnxddr_sqlite.so
 %%NXCP%%lib/libnxlp.so
-%%NXCP%%lib/libnxlp.so.1
-%%AGENT%%lib/libnxlp.so.1.0.0
-%%NXMAP%%lib/libnxmap.so
-%%NXMAP%%lib/libnxmap.so.1
-%%NXMAP%%lib/libnxmap.so.1.0.0
+%%NXCP%%lib/libnxlp.so.2
+%%AGENT%%lib/libnxlp.so.2.0.0
 %%SERVER%%lib/libnxsl.so
-%%SERVER%%lib/libnxsl.so.1
-%%SERVER%%lib/libnxsl.so.1.0.0
+%%SERVER%%lib/libnxsl.so.2
+%%SERVER%%lib/libnxsl.so.2.0.0
 %%SERVER%%lib/libnxsms_generic.so
-%%SERVER%%lib/libnxsms_generic.so.1
-%%SERVER%%lib/libnxsms_generic.so.1.0.0
 %%SERVER%%lib/libnxsms_nxagent.so
-%%SERVER%%lib/libnxsms_nxagent.so.1
-%%SERVER%%lib/libnxsms_nxagent.so.1.0.0
 %%SERVER%%lib/libnxsms_websms.so
-%%SERVER%%lib/libnxsms_websms.so.1
-%%SERVER%%lib/libnxsms_websms.so.1.0.0
 %%SERVER%%lib/libnxsnmp.so
-%%SERVER%%lib/libnxsnmp.so.1
-%%SERVER%%lib/libnxsnmp.so.1.0.0
+%%SERVER%%lib/libnxsnmp.so.2
+%%SERVER%%lib/libnxsnmp.so.2.0.0
 %%SERVER%%lib/libnxsrv.so
-%%SERVER%%lib/libnxsrv.so.1
-%%SERVER%%lib/libnxsrv.so.1.0.0
+%%SERVER%%lib/libnxsrv.so.2
+%%SERVER%%lib/libnxsrv.so.2.0.0
 %%NXCP%%lib/netxms/dbquery.nsm
 %%NXCP%%lib/netxms/ecs.nsm
 %%NXCP%%lib/netxms/freebsd.nsm
 %%SERVER%%lib/netxms/jira.hdlink
 %%NXCP%%lib/netxms/logwatch.nsm
+%%SERVER%%lib/netxms/ndd/hpsw.ndd
+%%SERVER%%lib/netxms/ndd/qtech-olt.ndd
+%%SERVER%%lib/netxms/ndd/tb.ndd
 %%NXCP%%lib/netxms/netsvc.nsm
 %%NXCP%%lib/netxms/ping.nsm
 %%NXCP%%lib/netxms/portcheck.nsm
@@ -126,18 +135,19 @@ lib/libnetxms.so.1.0.0
 %%PGSQL%%lib/netxms/dbdrv/pgsql.ddr
 %%SQLITE%%lib/netxms/dbdrv/sqlite.ddr
 %%ODBC%%lib/netxms/dbdrv/odbc.ddr
+%%SERVER%%lib/netxms/smsdrv/dummy.sms
+%%SERVER%%lib/netxms/smsdrv/generic.sms
+%%SERVER%%lib/netxms/smsdrv/kannel.sms
+%%SERVER%%lib/netxms/smsdrv/mymobile.sms
+%%SERVER%%lib/netxms/smsdrv/nexmo.sms
+%%SERVER%%lib/netxms/smsdrv/nxagent.sms
+%%SERVER%%lib/netxms/smsdrv/portech.sms
+%%SERVER%%lib/netxms/smsdrv/slack.sms
+%%SERVER%%lib/netxms/smsdrv/smseagle.sms
+%%SERVER%%lib/netxms/smsdrv/text2reach.sms
+%%SERVER%%lib/netxms/smsdrv/websms.sms
 @owner netxms
 @group netxms
-%%SERVER%%%%DATADIR%%/backgrounds/.keep
-%%SERVER%%%%DATADIR%%/images/092e4b35-4e7c-42df-b9b7-d5805bfac64e
-%%SERVER%%%%DATADIR%%/images/1ddb76a3-a05f-4a42-acda-22021768feaf
-%%SERVER%%%%DATADIR%%/images/7cd999e9-fbe0-45c3-a695-f84523b3a50c
-%%SERVER%%%%DATADIR%%/images/904e7291-ee3f-41b7-8132-2bd29288ecc8
-%%SERVER%%%%DATADIR%%/images/b314cf44-b2aa-478e-b23a-73bc5bb9a624
-%%SERVER%%%%DATADIR%%/images/ba6ab507-f62d-4b8f-824c-ca9d46f22375
-%%SERVER%%%%DATADIR%%/images/bacde727-b183-4e6c-8dca-ab024c88b999
-%%SERVER%%%%DATADIR%%/images/f5214d16-1ab1-4577-bb21-063cfd45d7af
-%%SERVER%%%%DATADIR%%/images/f9105c54-8dcf-483a-b387-b4587dfd3cba
 %%SERVER%%%%DATADIR%%/mibs/A3COM-HUAWEI-COMMON-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/A3COM-HUAWEI-CONFIG-MAN-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/A3COM-HUAWEI-DEVICE-MIB.txt
@@ -170,6 +180,7 @@ lib/libnetxms.so.1.0.0
 %%SERVER%%%%DATADIR%%/mibs/ATM-TC-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/AUTH-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/AtiL2-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/BASP-Config-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/BAY-STACK-ADAC-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/BAY-STACK-ARP-INSPECTION-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/BAY-STACK-DHCP-SNOOPING-MIB.txt
@@ -190,8 +201,11 @@ lib/libnetxms.so.1.0.0
 %%SERVER%%%%DATADIR%%/mibs/BPDU-PROTECTION-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/BPDU-TUNNELING-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/BRIDGE-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/Brcm-BSAPTrap-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/Brcm-adapterInfo-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/CABLE-DIAG-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/CDX-6500-COMMON-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/CFMEXTENSION-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/CHECKPOINT-NG-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/CISCO-BRIDGE-EXT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/CISCO-C2900-MIB.txt
@@ -201,6 +215,7 @@ lib/libnetxms.so.1.0.0
 %%SERVER%%%%DATADIR%%/mibs/CISCO-ENVMON-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/CISCO-HSRP-EXT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/CISCO-HSRP-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/CISCO-IETF-IP-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/CISCO-IF-EXTENSION-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/CISCO-L2L3-INTERFACE-CONFIG-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/CISCO-MAC-NOTIFICATION-MIB.txt
@@ -213,6 +228,7 @@ lib/libnetxms.so.1.0.0
 %%SERVER%%%%DATADIR%%/mibs/CISCO-SMI.txt
 %%SERVER%%%%DATADIR%%/mibs/CISCO-STACK-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/CISCO-STACKMAKER-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/CISCO-STACKWISE-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/CISCO-STP-EXTENSIONS-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/CISCO-SWITCH-CGMP-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/CISCO-SYSLOG-MIB.txt
@@ -227,14 +243,27 @@ lib/libnetxms.so.1.0.0
 %%SERVER%%%%DATADIR%%/mibs/COSINE-ORION-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/CPQHOST-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/CPQPOWER-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/CPU-PROTECT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/CYBEROAM-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/Console-Monitoring-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/DDM-MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DELIBERANT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DES3028-L2MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DES3028G-L2MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DES3028P-L2MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DES3052-L2MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DES3052P-L2MGMT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/DES3200-10-L2MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DES3200-10DC-L2MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DES3200-10DC-L3MGMT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/DES3200-10-L3MGMT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/DES3200-18-L2MGMT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/DES3200-18-L3MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DES3200-18DC-L2MGMT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/DES3200-18DC-L3MGMT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/DES3200-26-L2MGMT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/DES3200-26-L3MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DES3200-26DC-L2MGMT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/DES3200-26DC-L3MGMT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/DES3200-28-L2MGMT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/DES3200-28-L3MGMT-MIB.txt
@@ -250,23 +279,64 @@ lib/libnetxms.so.1.0.0
 %%SERVER%%%%DATADIR%%/mibs/DES3200-52DC-L3MGMT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/DES3200-52P-L2MGMT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/DES3200-52P-L3MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DES3528-L2MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DES3528-SWL3MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DES3528DC-L2MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DES3528DC-SWL3MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DES3528P-L2MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DES3528P-SWL3MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DES3552-L2MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DES3552-SWL3MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DES3552P-L2MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DES3552P-SWL3MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DESKSNMP-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DESKTRAP-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DGS-3120-24PC-L3MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DGS-3120-24SC-DC-L3MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DGS-3120-24SC-L3MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DGS-3120-24TC-L3MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DGS-3120-48PC-L3MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DGS-3120-48TC-L2MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DGS-3120-48TC-L3MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DGS3120-24PC-L2MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DGS3120-24PC-LED-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DGS3120-24SC-DC-L2MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DGS3120-24SC-DC-LED-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DGS3120-24SC-L2MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DGS3120-24SC-LED-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DGS3120-24TC-L2MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DGS3120-24TC-LED-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DGS3120-48PC-L2MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DGS3120-48PC-LED-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DGS3120-48TC-LED-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/DHCP-RELAY-MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DHCP-Server-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DHCPv6-RELAY-MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DHCPv6-Server-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/DIFFSERV-DSCP-TC.txt
 %%SERVER%%%%DATADIR%%/mibs/DIFFSERV-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/DIGIUM-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/DISMAN-PING-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/DISMAN-TRACEROUTE-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DLB-802DOT11-EXT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DLB-ATHDRV-STATS-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DLB-GENERIC-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DLB-RADIO3-DRV-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DLMS-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/DLINK-ID-REC-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DNSResolver-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/DOS-PREV-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/DOT12-IF-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/DOT12-RPTR-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/DOT3-OAM-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/DS1-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/DS3-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DULD-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/DVMRP-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/Dell-Vendor-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/Dot1xMGMT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/EF-6000-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/EGRESSACL-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/EMBEDDED-NGX-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/ENTITY-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/ENTITY-SENSOR-MIB.txt
@@ -277,8 +347,10 @@ lib/libnetxms.so.1.0.0
 %%SERVER%%%%DATADIR%%/mibs/ES-1000-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/EtherLike-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/FAN-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/FC-MGMT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/FDDI-SMT73-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/FIBRE-CHANNEL-FE-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/FILE-SYSTEM-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/FILTER-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/FOUNDRY-CAR-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/FOUNDRY-SN-AGENT-MIB.txt
@@ -290,6 +362,7 @@ lib/libnetxms.so.1.0.0
 %%SERVER%%%%DATADIR%%/mibs/FOUNDRY-SN-TRAP-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/FOUNDRY-SN-VSRP-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/FROGFOOT-RESOURCES-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/FSC-RAID-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/H3C-COMMON-SYSTEM-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/H3C-CONFIG-MAN-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/H3C-ENTITY-EXT-MIB.txt
@@ -303,7 +376,54 @@ lib/libnetxms.so.1.0.0
 %%SERVER%%%%DATADIR%%/mibs/H3C-SYS-MAN-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/H3C-SYSLOG-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/H3C-TRAP-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HC-RMON-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/HCNUM-TC.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-CFCARD-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-COMMON-SYSTEM-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-DISK-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-ENTITY-EXT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-ENTITY-VENDORTYPE-OID-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-FCOE-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-FCOE-MODE-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-GRE-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-IF-EXT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-IP-ADDRESS-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-IP-BROADCAST-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-IPV6-ADDRESS-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-IPX-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-L2TP-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-LAG-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-LICENSE-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-LLDP-EXT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-LSW-DEV-ADM-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-MAC-INFORMATION-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-NET-MAN-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-NS-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-NTP-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-OBJECT-INFO-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-OID-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-POWER-ETH-EXT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-PRODUCT-ID-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-RAID-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-REDUNDANCY-POWER-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-SESSION-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-SNMP-EXT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-SSH-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-STACK-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-STORAGE-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-STORAGE-REF-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-SYS-MAN-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-SYSLOG-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-TRANSCEIVER-INFO-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-TRAP-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-TUNNEL-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-UNICAST-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-UPS-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-USER-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-USERLOG-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-VMAP-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HH3C-VRRP-EXT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/HISTORICAL-COUNTER-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/HOST-RESOURCES-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/HOST-RESOURCES-TYPES.txt
 %%SERVER%%%%DATADIR%%/mibs/HP-AUTH-MIB.txt
@@ -336,6 +456,7 @@ lib/libnetxms.so.1.0.0
 %%SERVER%%%%DATADIR%%/mibs/HP-ICF-USBPORT.txt
 %%SERVER%%%%DATADIR%%/mibs/HP-ICF-VRRP-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/HP-ICF-XRRP.txt
+%%SERVER%%%%DATADIR%%/mibs/HP-LASERJET-COMMON-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/HP-SNTPclientConfiguration-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/HP-SwitchStack-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/HP-VLAN.txt
@@ -347,19 +468,24 @@ lib/libnetxms.so.1.0.0
 %%SERVER%%%%DATADIR%%/mibs/IANA-RTPROTO-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IANAifType-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IBM-6611-APPN-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/IBM-CPS-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IBM-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IBMCPU-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/ICF-ETWIST.txt
+%%SERVER%%%%DATADIR%%/mibs/IEEE8021-CFM-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IEEE8021-PAE-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IEEE8023-LAG-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IEEE802dot11-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IF-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IGMP-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/IGMPV3-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/INET-ADDRESS-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/INTEGRATED-SERVICES-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/IOMEGANAS-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IP-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IP-FORWARD-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IP-MAC-BIND-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/IP-MCST-VLAN-REP-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IPMROUTE-STD-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IPV6-FLOW-LABEL-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/IPV6-MLD-MIB.txt
@@ -369,24 +495,32 @@ lib/libnetxms.so.1.0.0
 %%SERVER%%%%DATADIR%%/mibs/JUNIPER-IVE-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/JVM-MANAGEMENT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/JWAC-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/L2PROTOCOL-TUNNEL-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/LAG-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/LANNET-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/LINKSYS-MODEL-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/LLDP-EXT-DOT1-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/LLDP-EXT-DOT3-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/LLDP-EXT-MED-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/LLDP-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/LLDP-V2-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/LLDP-V2-TC-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/LOCAL-LOOPBACK-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/LOOPBACK-DETECT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/LSI-AdapterSAS.txt
 %%SERVER%%%%DATADIR%%/mibs/LSI-AdapterSASIR.txt
 %%SERVER%%%%DATADIR%%/mibs/MAU-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/MCAST-FILTER-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/MCAST-PROXY-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/MCAST-SNOOPING-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/MCAST-VLAN-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/MIKROTIK-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/MLD-SNOOPING-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/MSSQLSERVER-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/MSTP-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/MTA-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/Mac-Based-Authentication-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/NAS-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/NET-SNMP-AGENT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/NET-SNMP-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/NET-SNMP-MONITOR-MIB.txt
@@ -409,6 +543,7 @@ lib/libnetxms.so.1.0.0
 %%SERVER%%%%DATADIR%%/mibs/NetWare-Server-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/NETWORK-APPLIANCE-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/NETWORK-SERVICES-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/NLB-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/NOKIA-IPSO-REGISTRATION-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/NOKIA-IPSO-SYSTEM-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/NTWS-AP-CONFIG-MIB.txt
@@ -431,22 +566,32 @@ lib/libnetxms.so.1.0.0
 %%SERVER%%%%DATADIR%%/mibs/NTWS-SYSTEM-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/NTWS-TRAP-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/NTWS-TRAPLOG-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/OKIDATA-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/OPTIMUX-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/OSPF-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/OSPF-TRAP-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/P-BRIDGE-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/PIM-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/PIM-SM-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/PKT-STORM-CTRL-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/POLICY-ROUTE-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/POLYCOM-RMX-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/PORT-SECURITY-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/PORTGROUP-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/PoE-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/POWER-ETHERNET-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/POWERSUPPLY-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/PPPOE-MGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/PRIVATE-VLAN-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/PerfHist-TC-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/PowerNet-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/Printer-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/Q-BRIDGE-MIB.txt
-%%SERVER%%%%DATADIR%%/mibs/RADIUS-ACCT-CLIENT-MIB.txt
-%%SERVER%%%%DATADIR%%/mibs/RADIUS-ACCT-SERVER-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/Q-IN-Q-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/QoS-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/RADIUS-ACC-CLIENT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/RADIUS-ACC-SERVER-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/RADIUS-ACCOUNTING-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/RADIUS-AUTH-CLIENT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/RADIUS-AUTH-SERVER-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/RADIUS-DYNAUTH-CLIENT-MIB.txt
@@ -467,6 +612,7 @@ lib/libnetxms.so.1.0.0
 %%SERVER%%%%DATADIR%%/mibs/RAPID-CITY-BAY-STACK.txt
 %%SERVER%%%%DATADIR%%/mibs/RAPID-CITY.txt
 %%SERVER%%%%DATADIR%%/mibs/RC-MLT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/RCP-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/RDBMS-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/RFC-1212.txt
 %%SERVER%%%%DATADIR%%/mibs/RFC-1215.txt
@@ -474,10 +620,12 @@ lib/libnetxms.so.1.0.0
 %%SERVER%%%%DATADIR%%/mibs/RFC1213-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/RFC1271-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/RFC1354-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/RIPNG-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/RIPv2-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/RMON-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/RMON2-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/RS-232-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/RSPAN-MGMT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/S5-AGENT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/S5-CHASSIS-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/S5-CHASSIS-TRAP-MIB.txt
@@ -492,10 +640,13 @@ lib/libnetxms.so.1.0.0
 %%SERVER%%%%DATADIR%%/mibs/S5-TCS-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/SAFEGUARD-ENGINE-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/SAVEPOWER-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/SDCARDMGMT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/SEMI-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/SFLOW-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/SFTPServer-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/SINGLE-IP-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/SMON-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/SMTP-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/SNMP-COMMUNITY-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/SNMP-FRAMEWORK-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/SNMP-MPD-MIB.txt
@@ -510,6 +661,10 @@ lib/libnetxms.so.1.0.0
 %%SERVER%%%%DATADIR%%/mibs/SNMPv2-SMI.txt
 %%SERVER%%%%DATADIR%%/mibs/SNMPv2-TC.txt
 %%SERVER%%%%DATADIR%%/mibs/SNMPv2-TM.txt
+%%SERVER%%%%DATADIR%%/mibs/SRC-IPIF-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/SRED-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/SSH-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/SSL-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/STATICFDB-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/STATIC-MAC-BASED-VLAN-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/STATISTICS-MIB.txt
@@ -518,29 +673,60 @@ lib/libnetxms.so.1.0.0
 %%SERVER%%%%DATADIR%%/mibs/SUN-HW-TRAP-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/SUN-PLATFORM-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/SUPERVLAN-MIB.txt
-%%SERVER%%%%DATADIR%%/mibs/SWPRIMGMT-DES3200-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/SURVEILLANCE-VLAN-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/SW-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/SWDES3528-52PRIMGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/SWDGS3120PRIMGMT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/SWPRIMGMT-DES30XXP-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/SWPRIMGMT-DES3200-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/SWPROTOCOLVLAN-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/SYMBOL-CC-WS2000-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/SYMBOL-WS5000-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/SYNOLOGY-DISK-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/SYNOLOGY-RAID-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/SYNOLOGY-SYSTEM-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/SYNOLOGY-UPS-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/SYNOPTICS-COMMON-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/SYNOPTICS-ROOT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/SYSAPPL-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/SYSLOG-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/T11-FC-FABRIC-ADDR-MGR-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/T11-FC-NAME-SERVER-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/T11-TC-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/TCP-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/TIMERANGE-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/TIME-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/TOKENRING-STATION-SR-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/TOKEN-RING-RMON-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/TUNNEL-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/UBNT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/UCD-DISKIO-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/UCD-DLMOD-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/UCD-IPFILTER-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/UCD-IPFWACC-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/UCD-SNMP-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/UDP-Helper-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/UDP-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/UPS-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/USEC-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/V2ADMIN-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/VLAN-COUNTER-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/VMWARE-AGENTCAP-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/VMWARE-CIMOM-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/VMWARE-ENV-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/VMWARE-OBSOLETE-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/VMWARE-PRODUCTS-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/VMWARE-RESOURCES-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/VMWARE-ROOT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/VMWARE-SRM-EVENT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/VMWARE-SYSTEM-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/VMWARE-TC-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/VMWARE-VC-EVENT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/VMWARE-VCOPS-EVENT-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/VMWARE-VMINFO-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/VOICE-VLAN-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/VRRP-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/WRED-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/WF-COM.txt
 %%SERVER%%%%DATADIR%%/mibs/WS-CC-RF-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/WS-CC-SMI.txt
@@ -579,7 +765,8 @@ lib/libnetxms.so.1.0.0
 %%SERVER%%%%DATADIR%%/mibs/WebBase-Access-Control-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/XPPC-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/ZONE-DEFENSE-MGMT-MIB.txt
-%%SERVER%%%%DATADIR%%/mibs/netxms.mib
+%%SERVER%%%%DATADIR%%/mibs/ZYXEL-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/ZYXEL-ZYWALL-ZLD-COMMON-MIB.txt
 %%SERVER%%%%DATADIR%%/sql/dbinit_db2.sql
 %%SERVER%%%%DATADIR%%/sql/dbinit_mssql.sql
 %%SERVER%%%%DATADIR%%/sql/dbinit_mysql.sql
@@ -592,5 +779,35 @@ lib/libnetxms.so.1.0.0
 %%SERVER%%%%DATADIR%%/sql/dbschema_oracle.sql
 %%SERVER%%%%DATADIR%%/sql/dbschema_pgsql.sql
 %%SERVER%%%%DATADIR%%/sql/dbschema_sqlite.sql
+%%SERVER%%%%DATADIR%%/templates/aix.xml
+%%SERVER%%%%DATADIR%%/templates/generic_unix.xml
+%%SERVER%%%%DATADIR%%/templates/netxms_server.xml
 @owner
 @group
+%%SERVER%%/var/lib/netxms/backgrounds/.keep
+%%SERVER%%/var/lib/netxms/files/Warning-A.wav
+%%SERVER%%/var/lib/netxms/files/Warning-B.wav
+%%SERVER%%/var/lib/netxms/files/Warning-C.wav
+%%SERVER%%/var/lib/netxms/files/Warning-D.wav
+%%SERVER%%/var/lib/netxms/files/Warning-E.wav
+%%SERVER%%/var/lib/netxms/files/Warning-F.wav
+%%SERVER%%/var/lib/netxms/files/Warning-Notification-A.wav
+%%SERVER%%/var/lib/netxms/files/Warning-Notification-B.wav
+%%SERVER%%/var/lib/netxms/files/Warning-Notification-C.wav
+%%SERVER%%/var/lib/netxms/files/Warning-Notification-D.wav
+%%SERVER%%/var/lib/netxms/files/Warning-Notification-F.wav
+%%SERVER%%/var/lib/netxms/images/092e4b35-4e7c-42df-b9b7-d5805bfac64e
+%%SERVER%%/var/lib/netxms/images/1ddb76a3-a05f-4a42-acda-22021768feaf
+%%SERVER%%/var/lib/netxms/images/7cd999e9-fbe0-45c3-a695-f84523b3a50c
+%%SERVER%%/var/lib/netxms/images/904e7291-ee3f-41b7-8132-2bd29288ecc8
+%%SERVER%%/var/lib/netxms/images/b314cf44-b2aa-478e-b23a-73bc5bb9a624
+%%SERVER%%/var/lib/netxms/images/ba6ab507-f62d-4b8f-824c-ca9d46f22375
+%%SERVER%%/var/lib/netxms/images/bacde727-b183-4e6c-8dca-ab024c88b999
+%%SERVER%%/var/lib/netxms/images/f5214d16-1ab1-4577-bb21-063cfd45d7af
+%%SERVER%%/var/lib/netxms/images/f9105c54-8dcf-483a-b387-b4587dfd3cba
+%%SERVER%%/var/lib/netxms/netxms.mib
+%%SERVER%%@dir /var/lib/netxms/backgrounds
+%%SERVER%%@dir /var/lib/netxms/files
+%%SERVER%%@dir /var/lib/netxms/images
+%%SERVER%%@dir /var/lib/netxms
+%%SERVER%%@dir /var/lib
-- 
cgit