diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile index 4b2f5cdda735..863493510599 100644 --- a/net-mgmt/xymon-server/Makefile +++ b/net-mgmt/xymon-server/Makefile @@ -1,110 +1,110 @@ PORTNAME= xymon PORTVERSION= 4.3.30 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-mgmt www MASTER_SITES= SF/xymon/Xymon/${PORTVERSION} PKGNAMESUFFIX= -server${PKGNAMESUFFIX2} DIST_SUBDIR= repacked MAINTAINER= feld@FreeBSD.org COMMENT= System for monitoring servers and networks WWW= http://xymon.sourceforge.net/ LICENSE= GPLv2 BUILD_DEPENDS= rrdtool:databases/rrdtool LIB_DEPENDS= libpng.so:graphics/png \ libpcre.so:devel/pcre \ libcares.so:dns/c-ares RUN_DEPENDS= rrdtool:databases/rrdtool \ fping:net/fping \ mtr:net/mtr@nox11 USERS= xymon GROUPS= xymon # Options XYMONUSER?= xymon XYMONHOSTNAME?= xymon.example.com XYMONHOSTIP?= 127.0.0.1 USES= compiler:c11 cpe gmake shebangfix ssl SHEBANG_FILES= ${WRKSRC}/xymond/xymonreports.sh.DIST ${WRKSRC}/build/upgrade430.sh MAKE_JOBS_UNSAFE= yes CONFIGURE_ENV= MAKE=gmake MAKE_ENV+= XYMONUSER="${XYMONUSER}" MAKE_ENV+= XYMONHOSTNAME="${XYMONHOSTNAME}" MAKE_ENV+= XYMONHOSTIP="${XYMONHOSTIP}" MAKE_ENV+= INSTALLROOT="${STAGEDIR}" MAKE_ENV+= MANPREFIX="${STAGEDIR}${PREFIX}/share" MAKE_ARGS+= PKGBUILD="true" USE_RC_SUBR= xymon-server SUB_LIST+= XYMONUSER="${XYMONUSER}" PLIST_SUB+= XYMONUSER="${XYMONUSER}" CONFIG_FILES= cgioptions.cfg client-local.cfg \ columndoc.csv graphs.cfg protocols.cfg \ tasks.cfg xymonserver.cfg xymon-apache.conf FIXME1= alerts.cfg hosts.cfg xymon-apache-open xymon-apache-secure FIXME2= analysis.cfg combo.cfg holidays.cfg rrddefinitions.cfg \ snmpmibs.cfg xymonmenu.cfg xymonserver-migration.cfg OPTIONS_DEFINE=DEBUG LDAP NETSNMP NETSNMP_DESC=Enable Net-SNMP support LDAP_USES= ldap LDAP_MAKE_ENV= WITH_LDAP=1 NETSNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp NETSNMP_MAKE_ENV= WITH_NETSNMP=1 post-patch: ${REINPLACE_CMD} -e 's|web-build client|web-build|' ${WRKSRC}/build/Makefile.rules ${REINPLACE_CMD} -e 's|install-docs install-client|install-docs|' ${WRKSRC}/build/Makefile.rules ${REINPLACE_CMD} -e 's|$$(INSTALLETCDIR)/protocols.cfg|$$(INSTALLETCDIR)/protocols.cfg.DIST|' ${WRKSRC}/xymonnet/Makefile ${REINPLACE_CMD} -e 's|TRACEROUTE="traceroute"|TRACEROUTE="mtr"|' ${WRKSRC}/xymond/etcfiles/xymonserver.cfg.DIST ${REINPLACE_CMD} -e 's|TRACEROUTEOPTS="-n -q 2 -w 2 -m 15"|TRACEROUTEOPTS="-n -c 2 -w 2 -m 15 --report"|' ${WRKSRC}/xymond/etcfiles/xymonserver.cfg.DIST ${RM} ${WRKSRC}/docs/manpages/man1/xymonping.1.html ${RM} ${WRKSRC}/xymonnet/xymonping.1 ${REINPLACE_CMD} -e 's|@CGIDIR@|${WWWDIR}/server/cgi-bin|g' \ -e 's|@SECURECGIDIR@|${WWWDIR}/server/cgi-secure|g' \ -e 's|@INSTALLETCDIR@|${WWWDIR}/server/etc|g' \ -e 's|@INSTALLWWWDIR@|${WWWDIR}/server/www|g' \ -e 's|@SECUREXYMONCGIURL@|/cgi-secure|g' \ -e 's|@XYMONCGIURL@|/cgi-bin|g' \ -e 's|@XYMONHOSTURL@|/xymon|g' ${WRKSRC}/xymond/etcfiles/xymon-apache-*.DIST # Configure script is interactive do-configure: ${CP} ${FILESDIR}/Makefile ${WRKSRC}/ post-install: ${MKDIR} ${STAGEDIR}${WWWDIR}/data ${MKDIR} ${STAGEDIR}${WWWDIR}/data/acks ${MKDIR} ${STAGEDIR}${WWWDIR}/data/data ${MKDIR} ${STAGEDIR}${WWWDIR}/data/disabled ${MKDIR} ${STAGEDIR}${WWWDIR}/data/hist ${MKDIR} ${STAGEDIR}${WWWDIR}/data/histlogs ${MKDIR} ${STAGEDIR}${WWWDIR}/data/hostdata ${MKDIR} ${STAGEDIR}${WWWDIR}/data/logs ${MKDIR} ${STAGEDIR}${WWWDIR}/data/rrd ${MKDIR} ${STAGEDIR}${WWWDIR}/server/download ${MKDIR} ${STAGEDIR}${WWWDIR}/server/tmp ${MKDIR} ${STAGEDIR}${WWWDIR}/server/www/html ${MKDIR} ${STAGEDIR}${WWWDIR}/server/www/notes ${MKDIR} ${STAGEDIR}${WWWDIR}/server/www/rep ${MKDIR} ${STAGEDIR}${WWWDIR}/server/www/snap ${MKDIR} ${STAGEDIR}${WWWDIR}/server/www/wml ${LN} -s ${LOCALBASE}/sbin/fping ${STAGEDIR}${WWWDIR}/server/bin/xymonping ${INSTALL_SCRIPT} ${WRKSRC}/build/upgrade430.sh ${STAGEDIR}${WWWDIR}/server/bin/ ${INSTALL_PROGRAM} ${WRKSRC}/build/renamevars ${STAGEDIR}${WWWDIR}/server/bin/ .for i in ${FIXME1} ${INSTALL_DATA} ${WRKSRC}/xymond/etcfiles/${i}.DIST ${STAGEDIR}${WWWDIR}/server/etc/${i}.sample .endfor .for i in ${FIXME2} ${INSTALL_DATA} ${WRKSRC}/xymond/etcfiles/${i} ${STAGEDIR}${WWWDIR}/server/etc/${i}.sample .endfor .for i in ${CONFIG_FILES} ${MV} ${STAGEDIR}${WWWDIR}/server/etc/${i}.DIST ${STAGEDIR}${WWWDIR}/server/etc/${i}.sample .endfor .include diff --git a/net-mgmt/xymon-server/files/patch-xymond_rrd_do__vmstat.c b/net-mgmt/xymon-server/files/patch-xymond_rrd_do__vmstat.c new file mode 100644 index 000000000000..8a08a8ebfef1 --- /dev/null +++ b/net-mgmt/xymon-server/files/patch-xymond_rrd_do__vmstat.c @@ -0,0 +1,60 @@ +--- xymond/rrd/do_vmstat.c.orig 2025-12-10 23:19:34 UTC ++++ xymond/rrd/do_vmstat.c +@@ -116,30 +116,6 @@ static vmstat_layout_t vmstat_irix_layout[] = { + { -1, NULL } + }; + +-/* This one matches FreeBSD 4.10 */ +-/* LARRD 0.43c compatible */ +-static vmstat_layout_t vmstat_freebsd4_layout[] = { +- { 0, "cpu_r" }, +- { 1, "cpu_b" }, +- { 2, "cpu_w" }, +- { 3, "mem_avm" }, +- { 4, "mem_free" }, +- { 5, "mem_flt" }, +- { 6, "mem_re" }, +- { 7, "mem_pi" }, +- { 8, "mem_po" }, +- { 9, "mem_fr" }, +- { 10, "sr" }, +- { 11, "dsk_da0" }, +- { 12, "dsk_fd0" }, +- { 13, "cpu_int" }, +- { 15, "cpu_csw" }, +- { 16, "cpu_sys" }, +- { 17, "cpu_usr" }, +- { 18, "cpu_idl" }, +- { -1, NULL } +-}; +- + /* FreeBSD v6 and later, possibly v5 also */ + static vmstat_layout_t vmstat_freebsd_layout[] = { + { 0, "cpu_r" }, +@@ -418,25 +394,7 @@ int do_vmstat_rrd(char *hostname, char *testname, char + case OS_HPUX: + layout = vmstat_hpux_layout; break; + case OS_FREEBSD: +- /* +- * Special, because there are two layouts for FreeBSD +- * FreeBSD v4.x has 19 fields, later versions of FreeBSD +- * are the same as OpenBSD, with 18 fields. +- */ +- { +- char **dsnames = NULL; +- int dscount, i; +- +- dscount = rrddatasets(hostname, &dsnames); +- layout = ((dscount == 19) ? vmstat_freebsd4_layout : vmstat_freebsd_layout); +- +- if ((dscount > 0) && dsnames) { +- /* Free the dsnames list */ +- for (i=0; (i