Attachment 148020 Details for Bug 194096 – patch for netxms-1.2.16 and switch to libc API instead of nosing in kernel memory via kvm(3)

[patch] patch for netxms-1.2.16 and switch to libc API instead of nosing in kernel memory via kvm(3)

netxms-1.2.16.patch (text/plain), 19.90 KB, created by Muhammad Moinur Rahman on 2014-10-06 05:50:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Muhammad Moinur Rahman

Created: 2014-10-06 05:50:22 UTC

Size: 19.90 KB

patch

obsolete

>diff -ruN /usr/ports//net-mgmt/netxms/Makefile ./Makefile
>--- /usr/ports//net-mgmt/netxms/Makefile	2014-07-04 15:40:59.000000000 +0600
>+++ ./Makefile	2014-10-06 11:53:25.650209064 +0600
>@@ -1,9 +1,8 @@
> # Created by: Vladimir Ermakov <samflanker@gmail.com>
>-# $FreeBSD: head/net-mgmt/netxms/Makefile 360588 2014-07-04 09:40:59Z tijl $
>+# $FreeBSD: head/net-mgmt/netxms/Makefile 369833 2014-10-02 16:04:25Z bapt $
> 
> PORTNAME=	netxms
>-PORTVERSION=	1.2.14
>-PORTREVISION=	1
>+PORTVERSION=	1.2.16
> CATEGORIES=	net-mgmt
> MASTER_SITES=	http://www.netxms.org/download/ \
> 		http://www.netxms.org/download/archive/
>@@ -14,23 +13,38 @@
> 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=	MYSQL
>-SERVER_DISABLED_MODULES=	PGSQL SQLITE ODBC
>+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
>-
>-NO_PACKAGE=	yes
>+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
>+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
>@@ -40,88 +54,38 @@
> 
> .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}
>-PLIST_SUB+=	SERVER="@comment "
>+.if ${PORT_OPTIONS:MSERVER} || ${PORT_OPTIONS:MAGENT}
>+PLIST_SUB+=	NXCP=""
> .else
>-CONFIGURE_ARGS+=	--with-server
>-PLIST_SUB+=	SERVER=""
>+PLIST_SUB+=	NXCP="@comment "
>+.endif
>+
>+.if ${PORT_OPTIONS:MSERVER}
> USE_RC_SUBR+=	netxmsd
>-.if ${PORT_OPTIONS:MAGENT}
>-PLIST_SUB+=	AGENT="@comment "
>-.else
>+.if !${PORT_OPTIONS:MAGENT}
> 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-dist)
>-	${CP} ${WRKSRC}/contrib/netxmsd.conf-dist ${STAGEDIR}${PREFIX}/etc/
>+.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-dist)
>-	${CP} ${WRKSRC}/contrib/nxagentd.conf-dist ${STAGEDIR}${PREFIX}/etc/
>+.if !exists(${STAGEDIR}${PREFIX}/etc/nxagentd.conf.sample)
>+	${CP} ${WRKSRC}/contrib/nxagentd.conf-dist ${STAGEDIR}${PREFIX}/etc/nxagentd.conf.sample
> .endif
> .endif
> 
>diff -ruN /usr/ports//net-mgmt/netxms/distinfo ./distinfo
>--- /usr/ports//net-mgmt/netxms/distinfo	2014-05-26 22:15:40.000000000 +0600
>+++ ./distinfo	2014-10-06 11:53:25.651208066 +0600
>@@ -1,2 +1,2 @@
>-SHA256 (netxms-1.2.14.tar.gz) = 85839604a2efb4125cf4098800e99554aaf0338ea2a7f9eba16c0557bcb56310
>-SIZE (netxms-1.2.14.tar.gz) = 10184985
>+SHA256 (netxms-1.2.16.tar.gz) = 708e7adf47db2cfee2f88e7439575ed947c291d6c44b7a34f81cad0a17ffb940
>+SIZE (netxms-1.2.16.tar.gz) = 10275424
>diff -ruN /usr/ports//net-mgmt/netxms/files/patch-src-agent-subagents-freebsd-freebsd.cpp ./files/patch-src-agent-subagents-freebsd-freebsd.cpp
>--- /usr/ports//net-mgmt/netxms/files/patch-src-agent-subagents-freebsd-freebsd.cpp	1970-01-01 06:00:00.000000000 +0600
>+++ ./files/patch-src-agent-subagents-freebsd-freebsd.cpp	2014-10-06 11:56:40.657195016 +0600
>@@ -0,0 +1,23 @@
>+--- 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 },
>+ 
>diff -ruN /usr/ports//net-mgmt/netxms/files/patch-src-agent-subagents-freebsd-net.cpp ./files/patch-src-agent-subagents-freebsd-net.cpp
>--- /usr/ports//net-mgmt/netxms/files/patch-src-agent-subagents-freebsd-net.cpp	1970-01-01 06:00:00.000000000 +0600
>+++ ./files/patch-src-agent-subagents-freebsd-net.cpp	2014-10-06 11:56:40.659195198 +0600
>@@ -0,0 +1,181 @@
>+--- 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;
>+ }
>diff -ruN /usr/ports//net-mgmt/netxms/files/patch-src-agent-subagents-freebsd-net.h ./files/patch-src-agent-subagents-freebsd-net.h
>--- /usr/ports//net-mgmt/netxms/files/patch-src-agent-subagents-freebsd-net.h	1970-01-01 06:00:00.000000000 +0600
>+++ ./files/patch-src-agent-subagents-freebsd-net.h	2014-10-06 11:56:40.660196226 +0600
>@@ -0,0 +1,10 @@
>+--- src/agent/subagents/freebsd/net.h.orig	2014-10-02 16:59:04.000000000 +0400
>++++ src/agent/subagents/freebsd/net.h	2014-10-02 16:59:10.000000000 +0400
>+@@ -39,6 +39,6 @@
>+ 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 -ruN /usr/ports//net-mgmt/netxms/files/pkg-install.in ./files/pkg-install.in
>--- /usr/ports//net-mgmt/netxms/files/pkg-install.in	2014-05-24 12:22:20.000000000 +0600
>+++ ./files/pkg-install.in	1970-01-01 06:00:00.000000000 +0600
>@@ -1,18 +0,0 @@
>-#! /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
>diff -ruN /usr/ports//net-mgmt/netxms/pkg-plist ./pkg-plist
>--- /usr/ports//net-mgmt/netxms/pkg-plist	2014-05-26 22:15:40.000000000 +0600
>+++ ./pkg-plist	2014-10-06 11:53:25.653209123 +0600
>@@ -1,18 +1,14 @@
> %%SERVER%%bin/nxap
>-%%SERVER%%bin/nxappget
>-%%SERVER%%bin/nxapush
>-%%SERVER%%bin/nxencpasswd
>-%%AGENT%%bin/nxappget
>-%%AGENT%%bin/nxapush
>+%%NXCP%%bin/nxappget
>+%%NXCP%%bin/nxapush
> %%SERVER%%bin/nxaction
> %%SERVER%%bin/nxadm
> %%SERVER%%bin/netxmsd
>-%%AGENT%%bin/nxagentd
>-%%SERVER%%bin/nxagentd
>+%%NXCP%%bin/nxagentd
> %%CLIENT%%bin/nxalarm
> %%CLIENT%%bin/nxdevcfg
> %%SERVER%%bin/nxdbmgr
>-%%AGENT%%bin/nxencpasswd
>+%%NXCP%%bin/nxencpasswd
> %%CLIENT%%bin/nxevent
> %%SERVER%%bin/nxget
> %%SERVER%%bin/nxmibc
>@@ -23,67 +19,51 @@
> %%SERVER%%bin/nxsnmpset
> %%SERVER%%bin/nxsnmpwalk
> %%SERVER%%bin/nxupload
>-%%SERVER%%etc/netxmsd.conf-dist
>-%%SERVER%%etc/nxagentd.conf-dist
>-%%AGENT%%etc/nxagentd.conf-dist
>+%%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
> %%CLIENT%%lib/libnxtre.so
> %%CLIENT%%lib/libnxtre.so.5
>-%%AGENT%%lib/libnxsqlite.so
>-%%AGENT%%lib/libnxsqlite.so.1
>+%%NXCP%%lib/libnxsqlite.so
>+%%NXCP%%lib/libnxsqlite.so.1
> %%AGENT%%lib/libnxsqlite.so.1.0.0
>-%%AGENT%%lib/libnxdb.so
>-%%AGENT%%lib/libnxdb.so.1
>+%%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
>-%%AGENT%%lib/libappagent.so
>-%%AGENT%%lib/libappagent.so.1
>+%%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
>-%%AGENT%%lib/libnsm_dbquery.so
>-%%SERVER%%lib/libnsm_ecs.so
>-%%SERVER%%lib/libnsm_freebsd.so
>-%%SERVER%%lib/libnsm_logwatch.so
>-%%SERVER%%lib/libnsm_ping.so
>-%%AGENT%%lib/libnsm_portcheck.so
>+%%NXCP%%lib/libnsm_dbquery.so
>+%%SERVER%%lib/libnsm_filemgr.so
>+%%NXCP%%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
>-%%SERVER%%lib/libnsm_sms.so
>-%%SERVER%%lib/libnsm_ups.so
>-%%SERVER%%lib/libnxdb.so
>-%%SERVER%%lib/libnxdb.so.1
>-%%AGENT%%lib/libnxsd.so
>-%%AGENT%%lib/libnxsd.so.1
>+%%NXCP%%lib/libnxsd.so
>+%%NXCP%%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
>-%%AGENT%%lib/libnsm_ecs.so
>-%%AGENT%%lib/libnsm_freebsd.so
>-%%AGENT%%lib/libnsm_logwatch.so
>-%%AGENT%%lib/libnsm_ping.so
>-%%AGENT%%lib/libnsm_sms.so
>-%%AGENT%%lib/libnsm_ups.so
>+%%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
>@@ -94,10 +74,8 @@
> %%ODBC%%lib/libnxddr_odbc.so
> %%PGSQL%%lib/libnxddr_pgsql.so
> %%SQLITE%%lib/libnxddr_sqlite.so
>-%%SERVER%%lib/libnxlp.so
>-%%SERVER%%lib/libnxlp.so.1
>-%%AGENT%%lib/libnxlp.so
>-%%AGENT%%lib/libnxlp.so.1
>+%%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
>@@ -117,22 +95,15 @@
> %%SERVER%%lib/libnxsrv.so
> %%SERVER%%lib/libnxsrv.so.1
> %%SERVER%%lib/libnxsrv.so.1.0.0
>-%%AGENT%%lib/netxms/dbquery.nsm
>-%%AGENT%%lib/netxms/ecs.nsm
>-%%AGENT%%lib/netxms/freebsd.nsm
>-%%AGENT%%lib/netxms/logwatch.nsm
>-%%AGENT%%lib/netxms/ping.nsm
>-%%AGENT%%lib/netxms/portcheck.nsm
>-%%AGENT%%lib/netxms/sms.nsm
>-%%AGENT%%lib/netxms/ups.nsm
>-%%SERVER%%lib/netxms/dbquery.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
>+%%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/ndd/airespace.ndd
> %%SERVER%%lib/netxms/ndd/at.ndd
> %%SERVER%%lib/netxms/ndd/baystack.ndd
>@@ -154,6 +125,8 @@
> %%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
>@@ -395,6 +368,7 @@
> %%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
>@@ -581,12 +555,13 @@
> %%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

Flags:

bofh: maintainer-approval+

Actions: View | Diff

Attachments on bug 194096: 147917 | 148020