Attachment #148020 for bug #194096




# Created by: Vladimir Ermakov <samflanker@gmail.com>
# $FreeBSD: head/net-mgmt/netxms/Makefile 369833 2014-10-02 16:04:25Z bapt $

PORTNAME=	netxms
PORTVERSION=	1.2.16
PORTREVISION=	1
CATEGORIES=	net-mgmt
MASTER_SITES=	http://www.netxms.org/download/ \
		http://www.netxms.org/download/archive/

LICENSE=	GPLv2 LGPL21
LICENSE_COMB=	multi

LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2

OPTIONS_DEFINE=	SERVER CLIENT AGENT
OPTIONS_DEFAULT=	CLIENT AGENT
SERVER_ENABLED_MODULES=	PGSQL
SERVER_DISABLED_MODULES=	MYSQL SQLITE ODBC
OPTIONS_SINGLE=	SERVER
OPTIONS_SINGLE_SERVER=	${SERVER_ENABLED_MODULES} ${SERVER_DISABLED_MODULES}
SERVER_DESC=	Install NetXMS server & agent
CLIENT_DESC=	Install NetXMS client
AGENT_DESC=	Install NetXMS agent
OPTIONS_SUB=	yes
SERVER_CONFIGURE_ON=	--with-server
MYSQL_CONFIGURE_WITH=	mysql
MYSQL_USE=	MYSQL=client
AGENT_CONFIGURE_WITH=	agent
PGSQL_CONFIGURE_WITH=	pgsql
PGSQL_USE=	PGSQL=yes
SQLITE_CONFIGURE_WITH=	sqlite
SQLITE_USE=	SQLITE=yes
ODBC_CONFIGURE_WITH=	odbc
ODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
CLIENT_CONFIGURE_WITH=	client

USE_OPENSSL=	yes
USES=		gmake iconv libtool perl5
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-silent-rules \
		--with-internal-libjansson \
		--with-internal-libtre
USE_LDCONFIG=	yes
INSTALL_TARGET=	install-strip

CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib


.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MSERVER} || ${PORT_OPTIONS:MAGENT} || ${PORT_OPTIONS:MCLIENT}
PLIST_SUB+=	NXCPTEST=""
LIB_DEPENDS+=	libexpat.so:${PORTSDIR}/textproc/expat2
.else
PLIST_SUB+=	NXCPTEST="@comment "
.endif

.if ${PORT_OPTIONS:MSERVER} || ${PORT_OPTIONS:MCLIENT}
PLIST_SUB+=	NXMAP=""
.else
PLIST_SUB+=	NXMAP="@comment "
.endif

.if ${PORT_OPTIONS:MSERVER} || ${PORT_OPTIONS:MAGENT}
PLIST_SUB+=	NXCP=""
.else
PLIST_SUB+=	NXCP="@comment "
.endif

.if ${PORT_OPTIONS:MSERVER}
USE_RC_SUBR+=	netxmsd
.if !${PORT_OPTIONS:MAGENT}
PLIST_SUB+=	AGENT="@comment "
.else
USE_RC_SUBR+=	nxagentd
.endif
.endif

.if ${PORT_OPTIONS:MCLIENT}
CONFIGURE_ARGS+=	--with-client
PLIST_SUB+=	CLIENT=""
.else
PLIST_SUB+=	CLIENT="@comment "
.endif

.if ${PORT_OPTIONS:MAGENT}
USE_RC_SUBR+=	nxagentd
CONFIGURE_ARGS+=	--with-agent
PLIST_SUB+=	AGENT=""
.else
PLIST_SUB+=	AGENT="@comment "
.endif

.if ${PORT_OPTIONS:MMYSQL}
CONFIGURE_ARGS+=	--with-mysql
PLIST_SUB+=	MYSQL=""
USE_MYSQL=	yes
.else
PLIST_SUB+=	MYSQL="@comment "
.endif

.if ${PORT_OPTIONS:MPGSQL}
CONFIGURE_ARGS+=	--with-pgsql
PLIST_SUB+=	PGSQL=""
USE_PGSQL=	yes
.else
PLIST_SUB+=	PGSQL="@comment "
.endif

.if ${PORT_OPTIONS:MSQLITE}
CONFIGURE_ARGS+=	--with-sqlite
PLIST_SUB+=	SQLITE=""
USE_SQLITE=	yes
.else
PLIST_SUB+=	SQLITE="@comment "
.endif

.if ${PORT_OPTIONS:MODBC}
CONFIGURE_ARGS+=	--with-odbc
PLIST_SUB+=	ODBC=""
LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
.else
PLIST_SUB+=	ODBC="@comment "
.endif

post-install:
.if ${PORT_OPTIONS:MSERVER}
.if !exists(${STAGEDIR}${PREFIX}/etc/netxmsd.conf.sample)
	${CP} ${WRKSRC}/contrib/netxmsd.conf-dist ${STAGEDIR}${PREFIX}/etc/netxmsd.conf.sample
.endif
.endif
.if ${PORT_OPTIONS:MSERVER} || ${PORT_OPTIONS:MAGENT}
.if !exists(${STAGEDIR}${PREFIX}/etc/nxagentd.conf.sample)
	${CP} ${WRKSRC}/contrib/nxagentd.conf-dist ${STAGEDIR}${PREFIX}/etc/nxagentd.conf.sample
.endif
.endif


Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (netxms-1.2.14.tar.gz) = 85839604a2efb4125cf4098800e99554aaf0338ea2a7f9eba16c0557bcb56310	1	SHA256 (netxms-1.2.16.tar.gz) = 708e7adf47db2cfee2f88e7439575ed947c291d6c44b7a34f81cad0a17ffb940
2	SIZE (netxms-1.2.14.tar.gz) = 10184985	2	SIZE (netxms-1.2.16.tar.gz) = 10275424




--- src/agent/subagents/freebsd/freebsd.cpp.orig	2014-10-02 16:57:50.000000000 +0400
+++ src/agent/subagents/freebsd/freebsd.cpp	2014-10-02 16:58:48.000000000 +0400
@@ -48,14 +48,14 @@
 	{ _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 },
 




--- src/agent/subagents/freebsd/net.cpp.orig	2014-10-02 16:54:48.000000000 +0400
+++ src/agent/subagents/freebsd/net.cpp	2014-10-02 17:19:53.000000000 +0400
@@ -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 @@
 	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 @@
 	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;
 }

Line 0 Link Here

(-)./files/patch-src-agent-subagents-freebsd-net.h (+10 lines)
	1	--- src/agent/subagents/freebsd/net.h.orig 2014-10-02 16:59:04.000000000 +0400
	2	+++ src/agent/subagents/freebsd/net.h 2014-10-02 16:59:10.000000000 +0400
	3	@@ -39,6 +39,6 @@
	4	LONG H_NetArpCache(const TCHAR , const TCHAR , StringList *);
	5	LONG H_NetIfList(const TCHAR , const TCHAR , StringList *);
	6	LONG H_NetRoutingTable(const TCHAR , const TCHAR , StringList *);
	7	-LONG H_NetIfInfoFromKVM(const TCHAR , const TCHAR , TCHAR *);
	8	+LONG H_NetIfInfo(const TCHAR , const TCHAR , TCHAR *);
	9
	10	#endif // __NET_H__




#! /bin/sh

# $FreeBSD: head/net-mgmt/netxms/files/pkg-install.in 354981 2014-05-24 06:22:20Z sunpoet $

PATH=/bin:/usr/sbin
TSHOME=${PKG_PREFIX}/share/netxms

USER=netxms
GROUP=${USER}

case "$2" in
PRE-INSTALL)
	;;
POST-INSTALL)
	chown -R ${USER}:${GROUP} ${TSHOME}
	chmod -R u+w,o-rx ${TSHOME}
	;;
esac




%%SERVER%%bin/nxap
%%NXCP%%bin/nxappget
%%NXCP%%bin/nxapush
%%SERVER%%bin/nxencpasswd
%%AGENT%%bin/nxappget
%%AGENT%%bin/nxapush
%%SERVER%%bin/nxaction
%%SERVER%%bin/nxadm
%%SERVER%%bin/netxmsd
%%NXCP%%bin/nxagentd
%%SERVER%%bin/nxagentd
%%CLIENT%%bin/nxalarm
%%CLIENT%%bin/nxdevcfg
%%SERVER%%bin/nxdbmgr
%%NXCP%%bin/nxencpasswd
%%CLIENT%%bin/nxevent
%%SERVER%%bin/nxget
%%SERVER%%bin/nxmibc

%%SERVER%%bin/nxsnmpset
%%SERVER%%bin/nxsnmpwalk
%%SERVER%%bin/nxupload
%%SERVER%%@sample etc/netxmsd.conf.sample
%%NXCP%%@sample etc/nxagentd.conf.sample
%%AGENT%%etc/nxagentd.conf-dist
lib/libnetxms.so
lib/libnetxms.so.1
lib/libnetxms.so.1.0.0
%%CLIENT%%lib/libnxtre.so
%%CLIENT%%lib/libnxtre.so.5
%%NXCP%%lib/libnxsqlite.so
%%NXCP%%lib/libnxsqlite.so.1
%%AGENT%%lib/libnxsqlite.so.1.0.0
%%NXCP%%lib/libnxdb.so
%%NXCP%%lib/libnxdb.so.1
%%AGENT%%lib/libnxdb.so.1.0.0
%%AGENT%%lib/libnxtre.so.5.0.0
%%AGENT%%lib/netxms/devemu.nsm
%%NXCP%%lib/libappagent.so
%%NXCP%%lib/libappagent.so.1
%%AGENT%%lib/libappagent.so.1.0.0
%%SERVER%%lib/libavaya-ers.so
%%SERVER%%lib/libcisco.so
%%NXCP%%lib/libnsm_dbquery.so
%%SERVER%%lib/libnsm_filemgr.so
%%NXCP%%lib/libnsm_portcheck.so
%%SERVER%%lib/libnsm_logwatch.so
%%SERVER%%lib/libnsm_ping.so
%%AGENT%%lib/libnsm_portcheck.so
%%AGENT%%lib/libnsm_devemu.so
%%AGENT%%lib/libnxjansson.so
%%AGENT%%lib/libnxjansson.so.4
%%AGENT%%lib/libnxjansson.so.4.6.0
%%NXCP%%lib/libnxsd.so
%%NXCP%%lib/libnxsd.so.1
%%SERVER%%lib/libnxdb.so
%%SERVER%%lib/libnxdb.so.1
%%AGENT%%lib/libnxsd.so
%%AGENT%%lib/libnxsd.so.1
%%AGENT%%lib/libnxsd.so.1.0.0
%%SERVER%%lib/libappagent.so
%%SERVER%%lib/libappagent.so.1
%%SERVER%%lib/libnsm_dbquery.so
%%SERVER%%lib/libnsm_portcheck.so
%%SERVER%%lib/libnxsd.so
%%SERVER%%lib/libnxsd.so.1
%%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/libnxsqlite.so
%%SERVER%%lib/libnxsqlite.so.1
%%SERVER%%lib/libstrophe.so
%%SERVER%%lib/libstrophe.so.1
%%SERVER%%lib/libstrophe.so.1.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

%%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
%%AGENT%%lib/libnxlp.so.1
%%AGENT%%lib/libnxlp.so.1.0.0
%%NXMAP%%lib/libnxmap.so
%%NXMAP%%lib/libnxmap.so.1

%%SERVER%%lib/libnxsrv.so
%%SERVER%%lib/libnxsrv.so.1
%%SERVER%%lib/libnxsrv.so.1.0.0
%%NXCP%%lib/netxms/dbquery.nsm
%%NXCP%%lib/netxms/ecs.nsm
%%NXCP%%lib/netxms/freebsd.nsm
%%NXCP%%lib/netxms/logwatch.nsm
%%NXCP%%lib/netxms/ping.nsm
%%NXCP%%lib/netxms/portcheck.nsm
%%NXCP%%lib/netxms/sms.nsm
%%NXCP%%lib/netxms/ups.nsm
%%SERVER%%lib/netxms/filemgr.nsm
%%SERVER%%lib/netxms/ecs.nsm
%%SERVER%%lib/netxms/freebsd.nsm
%%SERVER%%lib/netxms/logwatch.nsm
%%SERVER%%lib/netxms/ping.nsm
%%SERVER%%lib/netxms/portcheck.nsm
%%SERVER%%lib/netxms/sms.nsm
%%SERVER%%lib/netxms/ups.nsm
%%SERVER%%lib/netxms/ndd/airespace.ndd
%%SERVER%%lib/netxms/ndd/at.ndd
%%SERVER%%lib/netxms/ndd/baystack.ndd

%%PGSQL%%lib/netxms/dbdrv/pgsql.ddr
%%SQLITE%%lib/netxms/dbdrv/sqlite.ddr
%%ODBC%%lib/netxms/dbdrv/odbc.ddr
@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%%/mibs/NETSCREEN-VR-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/NETSCREEN-VSYS-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/NETSWITCH-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/NETUP-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/NetWare-Server-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/NETWORK-APPLIANCE-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/NETWORK-SERVICES-MIB.txt

%%SERVER%%%%DATADIR%%/sql/dbschema_oracle.sql
%%SERVER%%%%DATADIR%%/sql/dbschema_pgsql.sql
%%SERVER%%%%DATADIR%%/sql/dbschema_sqlite.sql
%%AGENT%%@dirrm lib/netxms
%%SERVER%%@dirrm lib/netxms/ndd
%%SERVER%%@dirrm lib/netxms/dbdrv
%%SERVER%%@dirrm lib/netxms
%%SERVER%%@dirrmtry %%DATADIR%%/sql
%%SERVER%%@dirrmtry %%DATADIR%%/mibs
%%SERVER%%@dirrmtry %%DATADIR%%/images
%%SERVER%%@dirrmtry %%DATADIR%%/backgrounds
%%SERVER%%@dirrmtry %%DATADIR%%
@owner root
@group wheel
%%SERVER%%@dirrm lib/netxms/ndd
%%SERVER%%@dirrm lib/netxms/dbdrv
%%NXCP%%@dirrm lib/netxms

Return to bug 194096

Lines 1-9 Link Here

(-)./Makefile (-69 / +33 lines)
1	# Created by: Vladimir Ermakov <samflanker@gmail.com>	1	# Created by: Vladimir Ermakov <samflanker@gmail.com>
2	# $FreeBSD: head/net-mgmt/netxms/Makefile 360588 2014-07-04 09:40:59Z tijl $	2	# $FreeBSD: head/net-mgmt/netxms/Makefile 369833 2014-10-02 16:04:25Z bapt $
3		3
4	PORTNAME= netxms	4	PORTNAME= netxms
5	PORTVERSION= 1.2.14	5	PORTVERSION= 1.2.16
6	PORTREVISION= 1
7	CATEGORIES= net-mgmt	6	CATEGORIES= net-mgmt
8	MASTER_SITES= http://www.netxms.org/download/ \	7	MASTER_SITES= http://www.netxms.org/download/ \
9	http://www.netxms.org/download/archive/	8	http://www.netxms.org/download/archive/
Lines 14-36 Link Here
14	LICENSE= GPLv2 LGPL21	13	LICENSE= GPLv2 LGPL21
15	LICENSE_COMB= multi	14	LICENSE_COMB= multi
16		15
		16	LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2
		17
17	OPTIONS_DEFINE= SERVER CLIENT AGENT	18	OPTIONS_DEFINE= SERVER CLIENT AGENT
18	OPTIONS_DEFAULT= CLIENT AGENT	19	OPTIONS_DEFAULT= CLIENT AGENT
19	SERVER_ENABLED_MODULES= MYSQL	20	SERVER_ENABLED_MODULES= PGSQL
20	SERVER_DISABLED_MODULES= PGSQL SQLITE ODBC	21	SERVER_DISABLED_MODULES= MYSQL SQLITE ODBC
21	OPTIONS_SINGLE= SERVER	22	OPTIONS_SINGLE= SERVER
22	OPTIONS_SINGLE_SERVER= ${SERVER_ENABLED_MODULES} ${SERVER_DISABLED_MODULES}	23	OPTIONS_SINGLE_SERVER= ${SERVER_ENABLED_MODULES} ${SERVER_DISABLED_MODULES}
23	SERVER_DESC= Install NetXMS server & agent	24	SERVER_DESC= Install NetXMS server & agent
24	CLIENT_DESC= Install NetXMS client	25	CLIENT_DESC= Install NetXMS client
25	AGENT_DESC= Install NetXMS agent	26	AGENT_DESC= Install NetXMS agent
26		27	OPTIONS_SUB= yes
27	NO_PACKAGE= yes	28	SERVER_CONFIGURE_ON= --with-server
		29	MYSQL_CONFIGURE_WITH= mysql
		30	MYSQL_USE= MYSQL=client
		31	AGENT_CONFIGURE_WITH= agent
		32	PGSQL_CONFIGURE_WITH= pgsql
		33	PGSQL_USE= PGSQL=yes
		34	SQLITE_CONFIGURE_WITH= sqlite
		35	SQLITE_USE= SQLITE=yes
		36	ODBC_CONFIGURE_WITH= odbc
		37	ODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC
		38	CLIENT_CONFIGURE_WITH= client
28		39
29	USE_OPENSSL= yes	40	USE_OPENSSL= yes
30	USES= gmake iconv libtool perl5	41	USES= gmake iconv libtool perl5
31	GNU_CONFIGURE= yes	42	GNU_CONFIGURE= yes
32	CONFIGURE_ARGS= --disable-silent-rules	43	CONFIGURE_ARGS= --disable-silent-rules \
		44	--with-internal-libjansson \
		45	--with-internal-libtre
33	USE_LDCONFIG= yes	46	USE_LDCONFIG= yes
		47	INSTALL_TARGET= install-strip
34		48
35	CPPFLAGS+= -I${LOCALBASE}/include	49	CPPFLAGS+= -I${LOCALBASE}/include
36	LDFLAGS+= -L${LOCALBASE}/lib	50	LDFLAGS+= -L${LOCALBASE}/lib
Lines 40-127 Link Here
40		54
41	.include <bsd.port.options.mk>	55	.include <bsd.port.options.mk>
42		56
43	.if ${PORT_OPTIONS:MSERVER} \|\| ${PORT_OPTIONS:MAGENT} \|\| ${PORT_OPTIONS:MCLIENT}
44	PLIST_SUB+= NXCPTEST=""
45	LIB_DEPENDS+= libexpat.so:${PORTSDIR}/textproc/expat2
46	.else
47	PLIST_SUB+= NXCPTEST="@comment "
48	.endif
49
50	.if ${PORT_OPTIONS:MSERVER} \|\| ${PORT_OPTIONS:MCLIENT}	57	.if ${PORT_OPTIONS:MSERVER} \|\| ${PORT_OPTIONS:MCLIENT}
51	PLIST_SUB+= NXMAP=""	58	PLIST_SUB+= NXMAP=""
52	.else	59	.else
53	PLIST_SUB+= NXMAP="@comment "	60	PLIST_SUB+= NXMAP="@comment "
54	.endif	61	.endif
55		62
56	.if ! ${PORT_OPTIONS:MSERVER}	63	.if ${PORT_OPTIONS:MSERVER} \|\| ${PORT_OPTIONS:MAGENT}
57	PLIST_SUB+= SERVER="@comment "	64	PLIST_SUB+= NXCP=""
58	.else	65	.else
59	CONFIGURE_ARGS+= --with-server	66	PLIST_SUB+= NXCP="@comment "
60	PLIST_SUB+= SERVER=""	67	.endif
		68
		69	.if ${PORT_OPTIONS:MSERVER}
61	USE_RC_SUBR+= netxmsd	70	USE_RC_SUBR+= netxmsd
62	.if ${PORT_OPTIONS:MAGENT}	71	.if !${PORT_OPTIONS:MAGENT}
63	PLIST_SUB+= AGENT="@comment "
64	.else
65	USE_RC_SUBR+= nxagentd	72	USE_RC_SUBR+= nxagentd
66	.endif	73	.endif
67	.endif	74	.endif
68		75
69	.if ${PORT_OPTIONS:MCLIENT}
70	CONFIGURE_ARGS+= --with-client
71	PLIST_SUB+= CLIENT=""
72	.else
73	PLIST_SUB+= CLIENT="@comment "
74	.endif
75
76	.if ${PORT_OPTIONS:MAGENT}	76	.if ${PORT_OPTIONS:MAGENT}
77	USE_RC_SUBR+= nxagentd	77	USE_RC_SUBR+= nxagentd
78	CONFIGURE_ARGS+= --with-agent
79	PLIST_SUB+= AGENT=""
80	.else
81	PLIST_SUB+= AGENT="@comment "
82	.endif
83
84	.if ${PORT_OPTIONS:MMYSQL}
85	CONFIGURE_ARGS+= --with-mysql
86	PLIST_SUB+= MYSQL=""
87	USE_MYSQL= yes
88	.else
89	PLIST_SUB+= MYSQL="@comment "
90	.endif
91
92	.if ${PORT_OPTIONS:MPGSQL}
93	CONFIGURE_ARGS+= --with-pgsql
94	PLIST_SUB+= PGSQL=""
95	USE_PGSQL= yes
96	.else
97	PLIST_SUB+= PGSQL="@comment "
98	.endif
99
100	.if ${PORT_OPTIONS:MSQLITE}
101	CONFIGURE_ARGS+= --with-sqlite
102	PLIST_SUB+= SQLITE=""
103	USE_SQLITE= yes
104	.else
105	PLIST_SUB+= SQLITE="@comment "
106	.endif
107
108	.if ${PORT_OPTIONS:MODBC}
109	CONFIGURE_ARGS+= --with-odbc
110	PLIST_SUB+= ODBC=""
111	LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC
112	.else
113	PLIST_SUB+= ODBC="@comment "
114	.endif	78	.endif
115		79
116	post-install:	80	post-install:
117	.if ${PORT_OPTIONS:MSERVER}	81	.if ${PORT_OPTIONS:MSERVER}
118	.if !exists(${STAGEDIR}${PREFIX}/etc/netxmsd.conf-dist)	82	.if !exists(${STAGEDIR}${PREFIX}/etc/netxmsd.conf.sample)
119	${CP} ${WRKSRC}/contrib/netxmsd.conf-dist ${STAGEDIR}${PREFIX}/etc/	83	${CP} ${WRKSRC}/contrib/netxmsd.conf-dist ${STAGEDIR}${PREFIX}/etc/netxmsd.conf.sample
120	.endif	84	.endif
121	.endif	85	.endif
122	.if ${PORT_OPTIONS:MSERVER} \|\| ${PORT_OPTIONS:MAGENT}	86	.if ${PORT_OPTIONS:MSERVER} \|\| ${PORT_OPTIONS:MAGENT}
123	.if !exists(${STAGEDIR}${PREFIX}/etc/nxagentd.conf-dist)	87	.if !exists(${STAGEDIR}${PREFIX}/etc/nxagentd.conf.sample)
124	${CP} ${WRKSRC}/contrib/nxagentd.conf-dist ${STAGEDIR}${PREFIX}/etc/	88	${CP} ${WRKSRC}/contrib/nxagentd.conf-dist ${STAGEDIR}${PREFIX}/etc/nxagentd.conf.sample
125	.endif	89	.endif
126	.endif	90	.endif
127		91

Line 0 Link Here

(-)./files/patch-src-agent-subagents-freebsd-freebsd.cpp (+23 lines)
	1	--- src/agent/subagents/freebsd/freebsd.cpp.orig 2014-10-02 16:57:50.000000000 +0400
	2	+++ src/agent/subagents/freebsd/freebsd.cpp 2014-10-02 16:58:48.000000000 +0400
	3	@@ -48,14 +48,14 @@
	4	{ _T("FileSystem.UsedPerc()"), H_DiskInfo, (const TCHAR )DISK_USED_PERC, DCI_DT_FLOAT, DCIDESC_FS_USEDPERC },
	5
	6	{ _T("Net.Interface.AdminStatus(*)"), H_NetIfAdmStatus, NULL, DCI_DT_INT, DCIDESC_NET_INTERFACE_ADMINSTATUS },
	7	- { _T("Net.Interface.BytesIn()"), H_NetIfInfoFromKVM, (const TCHAR )IF_INFO_BYTES_IN, DCI_DT_UINT64, DCIDESC_NET_INTERFACE_BYTESIN },
	8	- { _T("Net.Interface.BytesOut()"), H_NetIfInfoFromKVM, (const TCHAR )IF_INFO_BYTES_OUT, DCI_DT_UINT64, DCIDESC_NET_INTERFACE_BYTESOUT },
	9	- { _T("Net.Interface.InErrors()"), H_NetIfInfoFromKVM, (const TCHAR )IF_INFO_IN_ERRORS, DCI_DT_UINT64, DCIDESC_NET_INTERFACE_INERRORS },
	10	+ { _T("Net.Interface.BytesIn()"), H_NetIfInfo, (const TCHAR )IF_INFO_BYTES_IN, DCI_DT_UINT64, DCIDESC_NET_INTERFACE_BYTESIN },
	11	+ { _T("Net.Interface.BytesOut()"), H_NetIfInfo, (const TCHAR )IF_INFO_BYTES_OUT, DCI_DT_UINT64, DCIDESC_NET_INTERFACE_BYTESOUT },
	12	+ { _T("Net.Interface.InErrors()"), H_NetIfInfo, (const TCHAR )IF_INFO_IN_ERRORS, DCI_DT_UINT64, DCIDESC_NET_INTERFACE_INERRORS },
	13	{ _T("Net.Interface.Link(*)"), H_NetIfLink, NULL, DCI_DT_DEPRECATED, DCIDESC_DEPRECATED },
	14	{ _T("Net.Interface.OperStatus(*)"), H_NetIfLink, NULL, DCI_DT_INT, DCIDESC_NET_INTERFACE_OPERSTATUS },
	15	- { _T("Net.Interface.OutErrors()"), H_NetIfInfoFromKVM, (const TCHAR )IF_INFO_OUT_ERRORS, DCI_DT_UINT64, DCIDESC_NET_INTERFACE_OUTERRORS },
	16	- { _T("Net.Interface.PacketsIn()"), H_NetIfInfoFromKVM, (const TCHAR )IF_INFO_PACKETS_IN, DCI_DT_UINT64, DCIDESC_NET_INTERFACE_PACKETSIN },
	17	- { _T("Net.Interface.PacketsOut()"), H_NetIfInfoFromKVM, (const TCHAR )IF_INFO_PACKETS_OUT, DCI_DT_UINT64, DCIDESC_NET_INTERFACE_PACKETSOUT },
	18	+ { _T("Net.Interface.OutErrors()"), H_NetIfInfo, (const TCHAR )IF_INFO_OUT_ERRORS, DCI_DT_UINT64, DCIDESC_NET_INTERFACE_OUTERRORS },
	19	+ { _T("Net.Interface.PacketsIn()"), H_NetIfInfo, (const TCHAR )IF_INFO_PACKETS_IN, DCI_DT_UINT64, DCIDESC_NET_INTERFACE_PACKETSIN },
	20	+ { _T("Net.Interface.PacketsOut()"), H_NetIfInfo, (const TCHAR )IF_INFO_PACKETS_OUT, DCI_DT_UINT64, DCIDESC_NET_INTERFACE_PACKETSOUT },
	21	{ _T("Net.IP.Forwarding"), H_NetIpForwarding, (const TCHAR *)4, DCI_DT_INT, DCIDESC_NET_IP_FORWARDING },
	22	{ _T("Net.IP6.Forwarding"), H_NetIpForwarding, (const TCHAR *)6, DCI_DT_INT, DCIDESC_NET_IP6_FORWARDING },
	23

Line 0 Link Here

(-)./files/patch-src-agent-subagents-freebsd-net.cpp (+181 lines)
		1	--- src/agent/subagents/freebsd/net.cpp.orig 2014-10-02 16:54:48.000000000 +0400
		2	+++ src/agent/subagents/freebsd/net.cpp 2014-10-02 17:19:53.000000000 +0400
		3	@@ -32,7 +32,6 @@
		4	#include <net/if_media.h>
		5	#include <net/if_dl.h>
		6	#include <net/if_types.h>
		7	-#include <net/if_var.h>
		8	#include <net/route.h>
		9	#include <net/iso88025.h>
		10	#include <netinet/if_ether.h>
		11	@@ -40,8 +39,7 @@
		12	#include <ifaddrs.h>
		13	#include <arpa/inet.h>
		14	#include <net/ethernet.h>
		15	-#include <kvm.h>
		16	-#include <nlist.h>
		17	+#include <ifaddrs.h>
		18
		19	#include "net.h"
		20
		21	@@ -60,14 +58,6 @@
		22	int index;
		23	} IFLIST;
		24
		25	-struct nlist nl[] = {
		26	-#define N_IFNET 0
		27	- { (char *)"_ifnet" },
		28	- { NULL },
		29	-};
		30	-
		31	-kvm_t *kvmd = NULL;
		32	-
		33	LONG H_NetIpForwarding(const TCHAR pszParam, const TCHAR pArg, TCHAR *pValue)
		34	{
		35	int nVer = CAST_FROM_POINTER(pArg, int);
		36	@@ -568,94 +558,66 @@
		37	return nRet;
		38	}
		39
		40	-LONG H_NetIfInfoFromKVM(const TCHAR pszParam, const TCHAR pArg, TCHAR *pValue)
		41	+LONG H_NetIfInfo(const TCHAR pszParam, const TCHAR pArg, TCHAR *pValue)
		42	{
		43	- int nRet = SYSINFO_RC_SUCCESS;
		44	char szArg[512];
		45	- u_long ifnetaddr;
		46	- struct ifnet ifnet;
		47	- struct ifnethead ifnethead;
		48	-#if __FreeBSD__ < 5
		49	- char szTName[IFNAMSIZ];
		50	-#endif
		51	- char szName[IFNAMSIZ];
		52	+ struct ifaddrs ifap, ifa;
		53	+ u_int index;
		54
		55	AgentGetParameterArgA(pszParam, 1, szArg, sizeof(szArg));
		56
		57	- if (szArg[0] != 0)
		58	+ if (szArg[0] == 0)
		59	+ return SYSINFO_RC_SUCCESS;
		60	+
		61	+ if (szArg[0] >= '0' && szArg[0] <= '9')
		62	+ index = atoi(szArg);
		63	+ else
		64	+ index = 0;
65	+
66	+ if (getifaddrs(&ifap) != 0)
67	{
68	- if (szArg[0] >= '0' && szArg[0] <= '9')
69	- {
70	- // index
71	- if (if_indextoname(atoi(szArg), szArg) != szArg)
72	- {
73	- // not found
74	- nRet = SYSINFO_RC_ERROR;
75	- }
76	- }
77	+ return SYSINFO_RC_ERROR;
78	+ }
79
80	- if (nRet == SYSINFO_RC_SUCCESS)
81	- {
82	- nRet = SYSINFO_RC_ERROR;
83	+ for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
84	+ if (ifa->ifa_addr->sa_family != AF_LINK)
85	+ continue;
86	+ if (index) {
87	+ if (index != if_nametoindex(ifa->ifa_name))
88	+ continue;
89	+ } else if (strcmp(ifa->ifa_name, szArg) != 0)
90	+ continue;
91
92	- if (kvmd == NULL) {
93	- kvmd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, NULL);
94	- if (kvmd == NULL)
95	- return SYSINFO_RC_ERROR;
96	- if (kvm_nlist(kvmd, nl) < 0)
97	- return SYSINFO_RC_ERROR;
98	- if (nl[0].n_type == 0)
99	- return SYSINFO_RC_ERROR;
100	- }
101	- ifnetaddr = nl[N_IFNET].n_value;
102	- if (kvm_read(kvmd, ifnetaddr, &ifnethead, sizeof(ifnethead)) != sizeof(ifnethead))
103	- return SYSINFO_RC_ERROR;
104	- ifnetaddr = (u_long)TAILQ_FIRST(&ifnethead);
105	- while (ifnetaddr) {
106	- if (kvm_read(kvmd, ifnetaddr, &ifnet, sizeof(ifnet)) != sizeof(ifnet))
107	- return SYSINFO_RC_ERROR;
108	- ifnetaddr = (u_long)TAILQ_NEXT(&ifnet, if_link);
109	-#if __FreeBSD__ >= 5
110	- strlcpy(szName, ifnet.if_xname, sizeof(szName));
111	-#else
112	- if (kvm_read(kvmd, ifnet.if_name, szTName, sizeof(szTName)) != sizeof(szTName))
113	- return SYSINFO_RC_ERROR;
114	- szTName[sizeof(szTName) - 1] = '\0';
115	- snprintf(szName, sizeof(szName), "%s%d", szTName, ifnet.if_unit);
116	-#endif
117	- if (strcmp(szName, szArg) == 0) {
118	- nRet = SYSINFO_RC_SUCCESS;
119	- switch((long)pArg)
120	- {
121	- case IF_INFO_BYTES_IN:
122	- ret_uint(pValue, ifnet.if_ibytes);
123	- break;
124	- case IF_INFO_BYTES_OUT:
125	- ret_uint(pValue, ifnet.if_obytes);
126	- break;
127	- case IF_INFO_IN_ERRORS:
128	- ret_uint(pValue, ifnet.if_ierrors);
129	- break;
130	- case IF_INFO_OUT_ERRORS:
131	- ret_uint(pValue, ifnet.if_oerrors);
132	- break;
133	- case IF_INFO_PACKETS_IN:
134	- ret_uint(pValue, ifnet.if_ipackets);
135	- break;
136	- case IF_INFO_PACKETS_OUT:
137	- ret_uint(pValue, ifnet.if_opackets);
138	- break;
139	- default:
140	- nRet = SYSINFO_RC_UNSUPPORTED;
141	- break;
142	- }
143	- break;
144	- }
145	- else
146	- continue;
147	- }
148	+#define IFA_STAT(s) (((struct if_data *)ifa->ifa_data)->ifi_ ## s)
149	+
150	+ switch((long)pArg)
151	+ {
152	+ case IF_INFO_BYTES_IN:
153	+ ret_uint(pValue, IFA_STAT(ibytes));
154	+ break;
155	+ case IF_INFO_BYTES_OUT:
156	+ ret_uint(pValue, IFA_STAT(obytes));
157	+ break;
158	+ case IF_INFO_IN_ERRORS:
159	+ ret_uint(pValue, IFA_STAT(ierrors));
160	+ break;
161	+ case IF_INFO_OUT_ERRORS:
162	+ ret_uint(pValue, IFA_STAT(oerrors));
163	+ break;
164	+ case IF_INFO_PACKETS_IN:
165	+ ret_uint(pValue, IFA_STAT(ipackets));
166	+ break;
167	+ case IF_INFO_PACKETS_OUT:
168	+ ret_uint(pValue, IFA_STAT(opackets));
169	+ break;
170	+ default:
171	+ freeifaddrs(ifap);
172	+ return SYSINFO_RC_UNSUPPORTED;
173	}
174	+ freeifaddrs(ifap);
175	+ return SYSINFO_RC_SUCCESS;
176	}
177
178	- return nRet;
179	+ freeifaddrs(ifap);
180	+ return SYSINFO_RC_ERROR;
181	}

Lines 1-18 Link Here

(-)./files/pkg-install.in (-18 lines)
1	#! /bin/sh
2
3	# $FreeBSD: head/net-mgmt/netxms/files/pkg-install.in 354981 2014-05-24 06:22:20Z sunpoet $
4
5	PATH=/bin:/usr/sbin
6	TSHOME=${PKG_PREFIX}/share/netxms
7
8	USER=netxms
9	GROUP=${USER}
10
11	case "$2" in
12	PRE-INSTALL)
13	;;
14	POST-INSTALL)
15	chown -R ${USER}:${GROUP} ${TSHOME}
16	chmod -R u+w,o-rx ${TSHOME}
17	;;
18	esac

Lines 1-18 Link Here

(-)./pkg-plist (-67 / +42 lines)
1	%%SERVER%%bin/nxap	1	%%SERVER%%bin/nxap
2	%%SERVER%%bin/nxappget	2	%%NXCP%%bin/nxappget
3	%%SERVER%%bin/nxapush	3	%%NXCP%%bin/nxapush
4	%%SERVER%%bin/nxencpasswd
5	%%AGENT%%bin/nxappget
6	%%AGENT%%bin/nxapush
7	%%SERVER%%bin/nxaction	4	%%SERVER%%bin/nxaction
8	%%SERVER%%bin/nxadm	5	%%SERVER%%bin/nxadm
9	%%SERVER%%bin/netxmsd	6	%%SERVER%%bin/netxmsd
10	%%AGENT%%bin/nxagentd	7	%%NXCP%%bin/nxagentd
11	%%SERVER%%bin/nxagentd
12	%%CLIENT%%bin/nxalarm	8	%%CLIENT%%bin/nxalarm
13	%%CLIENT%%bin/nxdevcfg	9	%%CLIENT%%bin/nxdevcfg
14	%%SERVER%%bin/nxdbmgr	10	%%SERVER%%bin/nxdbmgr
15	%%AGENT%%bin/nxencpasswd	11	%%NXCP%%bin/nxencpasswd
16	%%CLIENT%%bin/nxevent	12	%%CLIENT%%bin/nxevent
17	%%SERVER%%bin/nxget	13	%%SERVER%%bin/nxget
18	%%SERVER%%bin/nxmibc	14	%%SERVER%%bin/nxmibc
Lines 23-89 Link Here
23	%%SERVER%%bin/nxsnmpset	19	%%SERVER%%bin/nxsnmpset
24	%%SERVER%%bin/nxsnmpwalk	20	%%SERVER%%bin/nxsnmpwalk
25	%%SERVER%%bin/nxupload	21	%%SERVER%%bin/nxupload
26	%%SERVER%%etc/netxmsd.conf-dist	22	%%SERVER%%@sample etc/netxmsd.conf.sample
27	%%SERVER%%etc/nxagentd.conf-dist	23	%%NXCP%%@sample etc/nxagentd.conf.sample
28	%%AGENT%%etc/nxagentd.conf-dist
29	lib/libnetxms.so	24	lib/libnetxms.so
30	lib/libnetxms.so.1	25	lib/libnetxms.so.1
31	lib/libnetxms.so.1.0.0	26	lib/libnetxms.so.1.0.0
32	%%CLIENT%%lib/libnxtre.so	27	%%CLIENT%%lib/libnxtre.so
33	%%CLIENT%%lib/libnxtre.so.5	28	%%CLIENT%%lib/libnxtre.so.5
34	%%AGENT%%lib/libnxsqlite.so	29	%%NXCP%%lib/libnxsqlite.so
35	%%AGENT%%lib/libnxsqlite.so.1	30	%%NXCP%%lib/libnxsqlite.so.1
36	%%AGENT%%lib/libnxsqlite.so.1.0.0	31	%%AGENT%%lib/libnxsqlite.so.1.0.0
37	%%AGENT%%lib/libnxdb.so	32	%%NXCP%%lib/libnxdb.so
38	%%AGENT%%lib/libnxdb.so.1	33	%%NXCP%%lib/libnxdb.so.1
39	%%AGENT%%lib/libnxdb.so.1.0.0	34	%%AGENT%%lib/libnxdb.so.1.0.0
40	%%AGENT%%lib/libnxtre.so.5.0.0	35	%%AGENT%%lib/libnxtre.so.5.0.0
41	%%AGENT%%lib/netxms/devemu.nsm	36	%%AGENT%%lib/netxms/devemu.nsm
42	%%AGENT%%lib/libappagent.so	37	%%NXCP%%lib/libappagent.so
43	%%AGENT%%lib/libappagent.so.1	38	%%NXCP%%lib/libappagent.so.1
44	%%AGENT%%lib/libappagent.so.1.0.0	39	%%AGENT%%lib/libappagent.so.1.0.0
45	%%SERVER%%lib/libavaya-ers.so	40	%%SERVER%%lib/libavaya-ers.so
46	%%SERVER%%lib/libcisco.so	41	%%SERVER%%lib/libcisco.so
47	%%AGENT%%lib/libnsm_dbquery.so	42	%%NXCP%%lib/libnsm_dbquery.so
48	%%SERVER%%lib/libnsm_ecs.so	43	%%SERVER%%lib/libnsm_filemgr.so
49	%%SERVER%%lib/libnsm_freebsd.so	44	%%NXCP%%lib/libnsm_portcheck.so
50	%%SERVER%%lib/libnsm_logwatch.so
51	%%SERVER%%lib/libnsm_ping.so
52	%%AGENT%%lib/libnsm_portcheck.so
53	%%AGENT%%lib/libnsm_devemu.so	45	%%AGENT%%lib/libnsm_devemu.so
54	%%AGENT%%lib/libnxjansson.so	46	%%AGENT%%lib/libnxjansson.so
55	%%AGENT%%lib/libnxjansson.so.4	47	%%AGENT%%lib/libnxjansson.so.4
56	%%AGENT%%lib/libnxjansson.so.4.6.0	48	%%AGENT%%lib/libnxjansson.so.4.6.0
57	%%SERVER%%lib/libnsm_sms.so	49	%%NXCP%%lib/libnxsd.so
58	%%SERVER%%lib/libnsm_ups.so	50	%%NXCP%%lib/libnxsd.so.1
59	%%SERVER%%lib/libnxdb.so
60	%%SERVER%%lib/libnxdb.so.1
61	%%AGENT%%lib/libnxsd.so
62	%%AGENT%%lib/libnxsd.so.1
63	%%AGENT%%lib/libnxsd.so.1.0.0	51	%%AGENT%%lib/libnxsd.so.1.0.0
64	%%SERVER%%lib/libappagent.so
65	%%SERVER%%lib/libappagent.so.1
66	%%SERVER%%lib/libnsm_dbquery.so
67	%%SERVER%%lib/libnsm_portcheck.so
68	%%SERVER%%lib/libnxsd.so
69	%%SERVER%%lib/libnxsd.so.1
70	%%SERVER%%lib/libnxsms_dummy.so	52	%%SERVER%%lib/libnxsms_dummy.so
71	%%SERVER%%lib/libnxsms_dummy.so.1	53	%%SERVER%%lib/libnxsms_dummy.so.1
72	%%SERVER%%lib/libnxsms_dummy.so.1.0.0	54	%%SERVER%%lib/libnxsms_dummy.so.1.0.0
73	%%SERVER%%lib/libnxsms_portech.so	55	%%SERVER%%lib/libnxsms_portech.so
74	%%SERVER%%lib/libnxsms_portech.so.1	56	%%SERVER%%lib/libnxsms_portech.so.1
75	%%SERVER%%lib/libnxsms_portech.so.1.0.0	57	%%SERVER%%lib/libnxsms_portech.so.1.0.0
76	%%SERVER%%lib/libnxsqlite.so
77	%%SERVER%%lib/libnxsqlite.so.1
78	%%SERVER%%lib/libstrophe.so	58	%%SERVER%%lib/libstrophe.so
79	%%SERVER%%lib/libstrophe.so.1	59	%%SERVER%%lib/libstrophe.so.1
80	%%SERVER%%lib/libstrophe.so.1.0.0	60	%%SERVER%%lib/libstrophe.so.1.0.0
81	%%AGENT%%lib/libnsm_ecs.so	61	%%NXCP%%lib/libnsm_ecs.so
82	%%AGENT%%lib/libnsm_freebsd.so	62	%%NXCP%%lib/libnsm_freebsd.so
83	%%AGENT%%lib/libnsm_logwatch.so	63	%%NXCP%%lib/libnsm_logwatch.so
84	%%AGENT%%lib/libnsm_ping.so	64	%%NXCP%%lib/libnsm_ping.so
85	%%AGENT%%lib/libnsm_sms.so	65	%%NXCP%%lib/libnsm_sms.so
86	%%AGENT%%lib/libnsm_ups.so	66	%%NXCP%%lib/libnsm_ups.so
87	%%CLIENT%%lib/libnxcl.so	67	%%CLIENT%%lib/libnxcl.so
88	%%CLIENT%%lib/libnxcl.so.1	68	%%CLIENT%%lib/libnxcl.so.1
89	%%CLIENT%%lib/libnxcl.so.1.0.0	69	%%CLIENT%%lib/libnxcl.so.1.0.0
Lines 94-103 Link Here
94	%%ODBC%%lib/libnxddr_odbc.so	74	%%ODBC%%lib/libnxddr_odbc.so
95	%%PGSQL%%lib/libnxddr_pgsql.so	75	%%PGSQL%%lib/libnxddr_pgsql.so
96	%%SQLITE%%lib/libnxddr_sqlite.so	76	%%SQLITE%%lib/libnxddr_sqlite.so
97	%%SERVER%%lib/libnxlp.so	77	%%NXCP%%lib/libnxlp.so
98	%%SERVER%%lib/libnxlp.so.1	78	%%NXCP%%lib/libnxlp.so.1
99	%%AGENT%%lib/libnxlp.so
100	%%AGENT%%lib/libnxlp.so.1
101	%%AGENT%%lib/libnxlp.so.1.0.0	79	%%AGENT%%lib/libnxlp.so.1.0.0
102	%%NXMAP%%lib/libnxmap.so	80	%%NXMAP%%lib/libnxmap.so
103	%%NXMAP%%lib/libnxmap.so.1	81	%%NXMAP%%lib/libnxmap.so.1
Lines 117-138 Link Here
117	%%SERVER%%lib/libnxsrv.so	95	%%SERVER%%lib/libnxsrv.so
118	%%SERVER%%lib/libnxsrv.so.1	96	%%SERVER%%lib/libnxsrv.so.1
119	%%SERVER%%lib/libnxsrv.so.1.0.0	97	%%SERVER%%lib/libnxsrv.so.1.0.0
120	%%AGENT%%lib/netxms/dbquery.nsm	98	%%NXCP%%lib/netxms/dbquery.nsm
121	%%AGENT%%lib/netxms/ecs.nsm	99	%%NXCP%%lib/netxms/ecs.nsm
122	%%AGENT%%lib/netxms/freebsd.nsm	100	%%NXCP%%lib/netxms/freebsd.nsm
123	%%AGENT%%lib/netxms/logwatch.nsm	101	%%NXCP%%lib/netxms/logwatch.nsm
124	%%AGENT%%lib/netxms/ping.nsm	102	%%NXCP%%lib/netxms/ping.nsm
125	%%AGENT%%lib/netxms/portcheck.nsm	103	%%NXCP%%lib/netxms/portcheck.nsm
126	%%AGENT%%lib/netxms/sms.nsm	104	%%NXCP%%lib/netxms/sms.nsm
127	%%AGENT%%lib/netxms/ups.nsm	105	%%NXCP%%lib/netxms/ups.nsm
128	%%SERVER%%lib/netxms/dbquery.nsm	106	%%SERVER%%lib/netxms/filemgr.nsm
129	%%SERVER%%lib/netxms/ecs.nsm
130	%%SERVER%%lib/netxms/freebsd.nsm
131	%%SERVER%%lib/netxms/logwatch.nsm
132	%%SERVER%%lib/netxms/ping.nsm
133	%%SERVER%%lib/netxms/portcheck.nsm
134	%%SERVER%%lib/netxms/sms.nsm
135	%%SERVER%%lib/netxms/ups.nsm
136	%%SERVER%%lib/netxms/ndd/airespace.ndd	107	%%SERVER%%lib/netxms/ndd/airespace.ndd
137	%%SERVER%%lib/netxms/ndd/at.ndd	108	%%SERVER%%lib/netxms/ndd/at.ndd
138	%%SERVER%%lib/netxms/ndd/baystack.ndd	109	%%SERVER%%lib/netxms/ndd/baystack.ndd
Lines 154-159 Link Here
154	%%PGSQL%%lib/netxms/dbdrv/pgsql.ddr	125	%%PGSQL%%lib/netxms/dbdrv/pgsql.ddr
155	%%SQLITE%%lib/netxms/dbdrv/sqlite.ddr	126	%%SQLITE%%lib/netxms/dbdrv/sqlite.ddr
156	%%ODBC%%lib/netxms/dbdrv/odbc.ddr	127	%%ODBC%%lib/netxms/dbdrv/odbc.ddr
		128	@owner netxms
		129	@group netxms
157	%%SERVER%%%%DATADIR%%/backgrounds/.keep	130	%%SERVER%%%%DATADIR%%/backgrounds/.keep
158	%%SERVER%%%%DATADIR%%/images/092e4b35-4e7c-42df-b9b7-d5805bfac64e	131	%%SERVER%%%%DATADIR%%/images/092e4b35-4e7c-42df-b9b7-d5805bfac64e
159	%%SERVER%%%%DATADIR%%/images/1ddb76a3-a05f-4a42-acda-22021768feaf	132	%%SERVER%%%%DATADIR%%/images/1ddb76a3-a05f-4a42-acda-22021768feaf
Lines 395-400 Link Here
395	%%SERVER%%%%DATADIR%%/mibs/NETSCREEN-VR-MIB.txt	368	%%SERVER%%%%DATADIR%%/mibs/NETSCREEN-VR-MIB.txt
396	%%SERVER%%%%DATADIR%%/mibs/NETSCREEN-VSYS-MIB.txt	369	%%SERVER%%%%DATADIR%%/mibs/NETSCREEN-VSYS-MIB.txt
397	%%SERVER%%%%DATADIR%%/mibs/NETSWITCH-MIB.txt	370	%%SERVER%%%%DATADIR%%/mibs/NETSWITCH-MIB.txt
		371	%%SERVER%%%%DATADIR%%/mibs/NETUP-MIB.txt
398	%%SERVER%%%%DATADIR%%/mibs/NetWare-Server-MIB.txt	372	%%SERVER%%%%DATADIR%%/mibs/NetWare-Server-MIB.txt
399	%%SERVER%%%%DATADIR%%/mibs/NETWORK-APPLIANCE-MIB.txt	373	%%SERVER%%%%DATADIR%%/mibs/NETWORK-APPLIANCE-MIB.txt
400	%%SERVER%%%%DATADIR%%/mibs/NETWORK-SERVICES-MIB.txt	374	%%SERVER%%%%DATADIR%%/mibs/NETWORK-SERVICES-MIB.txt
Lines 581-592 Link Here
581	%%SERVER%%%%DATADIR%%/sql/dbschema_oracle.sql	555	%%SERVER%%%%DATADIR%%/sql/dbschema_oracle.sql
582	%%SERVER%%%%DATADIR%%/sql/dbschema_pgsql.sql	556	%%SERVER%%%%DATADIR%%/sql/dbschema_pgsql.sql
583	%%SERVER%%%%DATADIR%%/sql/dbschema_sqlite.sql	557	%%SERVER%%%%DATADIR%%/sql/dbschema_sqlite.sql
584	%%AGENT%%@dirrm lib/netxms
585	%%SERVER%%@dirrm lib/netxms/ndd
586	%%SERVER%%@dirrm lib/netxms/dbdrv
587	%%SERVER%%@dirrm lib/netxms
588	%%SERVER%%@dirrmtry %%DATADIR%%/sql	558	%%SERVER%%@dirrmtry %%DATADIR%%/sql
589	%%SERVER%%@dirrmtry %%DATADIR%%/mibs	559	%%SERVER%%@dirrmtry %%DATADIR%%/mibs
590	%%SERVER%%@dirrmtry %%DATADIR%%/images	560	%%SERVER%%@dirrmtry %%DATADIR%%/images
591	%%SERVER%%@dirrmtry %%DATADIR%%/backgrounds	561	%%SERVER%%@dirrmtry %%DATADIR%%/backgrounds
592	%%SERVER%%@dirrmtry %%DATADIR%%	562	%%SERVER%%@dirrmtry %%DATADIR%%
		563	@owner root
		564	@group wheel
		565	%%SERVER%%@dirrm lib/netxms/ndd
		566	%%SERVER%%@dirrm lib/netxms/dbdrv
		567	%%NXCP%%@dirrm lib/netxms