diff options
Diffstat (limited to 'net-mgmt')
103 files changed, 47 insertions, 4984 deletions
diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile deleted file mode 100644 index 43ce9fe4024b..000000000000 --- a/net-mgmt/collectd5/Makefile +++ /dev/null @@ -1,191 +0,0 @@ -# New ports collection makefile for: collectd -# Date created: Sat Sep 29 05:19:31 PDT 2007 -# Whom: Matt Peterson <matt@peterson.org> -# -# $FreeBSD$ -# - -PORTNAME= collectd -PORTVERSION= 4.1.2 -PORTREVISION= 3 -CATEGORIES= net-mgmt -MASTER_SITES= http://collectd.org/files/ \ - http://mirror.roe.ch/dist/${PORTNAME}/ - -MAINTAINER= daniel@roe.ch -COMMENT= Systems & network statistics collection daemon - -USE_GMAKE= yes -GNU_CONFIGURE= yes -WANT_GNOME= yes - -OPTIONS= CGI "Install collection.cgi (requires RRDTOOL)" Off \ - DEBUG "Enable debugging" Off \ - APACHE "Input: Apache mod_status (libcurl)" Off \ - APCUPS "Input: APC UPS (apcupsd)" Off \ - INTERFACE "Input: Network interfaces (libstatgrab)" On \ - MBMON "Input: MBMon" Off \ - MYSQL "Input: MySQL" Off \ - PING "Input: Network latency (liboping)" On \ - SNMP "Input: SNMP" On \ - XMMS "Input: XMMS" Off \ - RRDTOOL "Output: RRDTool" On - -MAN1= collectd.1 collectd-nagios.1 -MAN5= collectd.conf.5 collectd-email.5 collectd-exec.5 \ - collectd-snmp.5 collectd-unixsock.5 collectd-perl.5 -USE_RC_SUBR= collectd - -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -.include <bsd.port.pre.mk> - -.if ( ${OSVERSION} < 601103 ) -BROKEN= Need bind9 import post 6.1 -.endif - -CONFIGURE_ARGS= --localstatedir=/var \ - --disable-apple_sensors \ - --disable-battery \ - --disable-hddtemp \ - --disable-multimeter \ - --disable-iptables \ - --disable-perl \ - --disable-sensors \ - --disable-serial \ - --disable-vserver \ - --disable-wireless - -.if defined(WITH_DEBUG) -CONFIGURE_ARGS+=--enable-debug -.endif - -.if defined(WITH_CGI) -RUN_DEPENDS+= ${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \ - ${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \ - ${SITE_PERL}/${PERL_ARCH}/Data/Dumper.pm:${PORTSDIR}/devel/p5-Data-Dumper -PLIST_SUB+= CGI="" -.else -PLIST_SUB+= CGI="@comment " -.endif - -.if defined(WITH_APACHE) -CONFIGURE_ARGS+=--enable-apache -LIB_DEPENDS+= curl.4:${PORTSDIR}/ftp/curl -PLIST_SUB+= APACHE="" -.else -CONFIGURE_ARGS+=--disable-apache -PLIST_SUB+= APACHE="@comment " -.endif - -.if defined(WITH_APCUPS) -CONFIGURE_ARGS+=--enable-apcups -BUILD_DEPENDS+= ${LOCALBASE}/sbin/apcupsd:${PORTSDIR}/sysutils/apcupsd -PLIST_SUB+= APCUPS="" -.else -CONFIGURE_ARGS+=--disable-apcups -PLIST_SUB+= APCUPS="@comment " -.endif - -.if defined(WITH_INTERFACE) -BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config -CONFIGURE_ARGS+=--enable-interface -LIB_DEPENDS+= statgrab.8:${PORTSDIR}/devel/libstatgrab -PLIST_SUB+= INTERFACE="" -CONFIGURE_ENV+= LIBS="`pkg-config --libs libstatgrab`" -.else -CONFIGURE_ARGS+=--disable-interface -PLIST_SUB+= INTERFACE="@comment " -.endif - -.if defined(WITH_MBMON) -CONFIGURE_ARGS+=--enable-mbmon -RUN_DEPENDS+= ${LOCALBASE}/sbin/mbmond:${PORTSDIR}/sysutils/mbmon -PLIST_SUB+= MBMON="" -.else -CONFIGURE_ARGS+=--disable-mbmon -PLIST_SUB+= MBMON="@comment " -.endif - -.if defined(WITH_MYSQL) -USE_MYSQL= yes -CONFIGURE_ARGS+=--enable-mysql -PLIST_SUB+= MYSQL="" -.else -CONFIGURE_ARGS+=--disable-mysql -PLIST_SUB+= MYSQL="@comment " -.endif - -.if defined(WITH_PING) -LIB_DEPENDS+= oping:${PORTSDIR}/net/liboping -CONFIGURE_ARGS+=--enable-ping -PLIST_SUB+= PING="" -.else -CONFIGURE_ARGS+=--disable-ping -PLIST_SUB+= PING="@comment " -.endif - -.if defined(WITH_RRDTOOL) -LIB_DEPENDS+= rrd:${PORTSDIR}/databases/rrdtool -CONFIGURE_ARGS+=--enable-rrdtool -PLIST_SUB+= RRD="" -.else -CONFIGURE_ARGS+=--disable-rrdtool -PLIST_SUB+= RRD="@comment " -.endif - -.if defined(WITH_SNMP) -LIB_DEPENDS+= netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp -CONFIGURE_ARGS+=--enable-snmp -PLIST_SUB+= SNMP="" -.else -CONFIGURE_ARGS+=--disable-snmp -PLIST_SUB+= SNMP="@comment " -.endif - -.if defined(WITH_XMMS) -LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms -CONFIGURE_ARGS+=--enable-xmms -CFLAGS+= `xmms-config --cflags` -PLIST_SUB+= XMMS="" -.else -CONFIGURE_ARGS+=--disable-xmms -PLIST_SUB+= XMMS="@comment " -.endif - -post-patch: - @${REINPLACE_CMD} \ - -e 's;@prefix@/var/;/var/;' \ - -e 's;/var/lib/;/var/db/;' \ - ${WRKSRC}/src/collectd.conf.in - @${REINPLACE_CMD} \ - -e 's;$$[(]DESTDIR)$$[(]sysconfdir)/collectd\.conf;&.sample;' \ - ${WRKSRC}/src/Makefile.in - @${REINPLACE_CMD} -e '/$$[(]mkinstalldirs)/d' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} \ - -e 's;/etc/collection\.conf;${WWWDIR}/collection.conf;' \ - ${WRKSRC}/contrib/collection.cgi - @${REINPLACE_CMD} \ - -e 's;/opt/collectd/var/lib;/var/db;' \ - -e 's;/opt/collectd/lib;${PREFIX}/lib;' \ - ${WRKSRC}/contrib/collection.conf - -post-install: - ${MKDIR} /var/db/collectd - if [ ! -f ${PREFIX}/etc/collectd.conf ]; then \ - ${CP} -p ${PREFIX}/etc/collectd.conf.sample \ - ${PREFIX}/etc/collectd.conf ; \ - fi -.if defined(WITH_CGI) - ${MKDIR} ${WWWDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/contrib/collection.cgi ${WWWDIR}/ - ${INSTALL_DATA} ${WRKSRC}/contrib/collection.conf \ - ${WWWDIR}/collection.conf.sample - if [ ! -f ${WWWDIR}/collection.conf ]; then \ - ${CP} -p ${WWWDIR}/collection.conf.sample \ - ${WWWDIR}/collection.conf ; \ - fi -.endif - -.include <bsd.port.post.mk> diff --git a/net-mgmt/collectd5/distinfo b/net-mgmt/collectd5/distinfo deleted file mode 100644 index 7fce046fb9d7..000000000000 --- a/net-mgmt/collectd5/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (collectd-4.1.2.tar.gz) = 40458dabe8ec5df87323c1862a03cb94 -SHA256 (collectd-4.1.2.tar.gz) = fba4423378a8a270de8b48f98dc2f102f4f3c630381672267344776885a6e690 -SIZE (collectd-4.1.2.tar.gz) = 999229 diff --git a/net-mgmt/collectd5/files/collectd.in b/net-mgmt/collectd5/files/collectd.in deleted file mode 100644 index 5ec218f3b27e..000000000000 --- a/net-mgmt/collectd5/files/collectd.in +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -# PROVIDE: collectd -# REQUIRE: LOGIN -# -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf -# to enable this service: -# -# collectd_enable (bool): Set to NO by default. -# Set it to YES to enable collectd. -# collectd_flags (string): Set to "" by default. -# Additional flags to collecd, see manual page. -# - -. %%RC_SUBR%% - -name="collectd" -rcvar=${name}_enable - -command=%%PREFIX%%/sbin/${name} - -load_rc_config $name - -: ${collectd_enable="NO"} -: ${collectd_flags=""} - -run_rc_command "$1" diff --git a/net-mgmt/collectd5/files/patch-src__collectd.h b/net-mgmt/collectd5/files/patch-src__collectd.h deleted file mode 100644 index 8058189613b1..000000000000 --- a/net-mgmt/collectd5/files/patch-src__collectd.h +++ /dev/null @@ -1,20 +0,0 @@ ---- ./src/collectd.h.orig 2007-09-28 17:55:34.000000000 +0300 -+++ ./src/collectd.h 2008-05-06 10:32:08.000000000 +0300 -@@ -183,7 +183,7 @@ - #endif - - #ifndef LOCALSTATEDIR --#define LOCALSTATEDIR PREFIX "/var" -+#define LOCALSTATEDIR "/var" - #endif - - #ifndef PKGLOCALSTATEDIR -@@ -191,7 +191,7 @@ - #endif - - #ifndef PIDFILE --#define PIDFILE PREFIX "/var/run/" PACKAGE_NAME ".pid" -+#define PIDFILE "/var/run/" PACKAGE_NAME ".pid" - #endif - - #ifndef PLUGINDIR diff --git a/net-mgmt/collectd5/files/patch-src__dns.c b/net-mgmt/collectd5/files/patch-src__dns.c deleted file mode 100644 index fb045049b25a..000000000000 --- a/net-mgmt/collectd5/files/patch-src__dns.c +++ /dev/null @@ -1,18 +0,0 @@ ---- src/dns.c.orig 2008-09-05 15:26:02.000000000 +0000 -+++ src/dns.c 2008-09-05 15:25:55.000000000 +0000 -@@ -210,6 +210,15 @@ - pthread_sigmask (SIG_SETMASK, &sigmask, NULL); - } - -+ /* Check for pcap_device, if needed */ -+#ifdef __sparc64__ -+ if (pcap_device == NULL) -+ { -+ ERROR ("dns plugin: Interface required"); -+ return (NULL); -+ } -+#endif -+ - /* Passing `pcap_device == NULL' is okay and the same as passign "any" */ - DEBUG ("Creating PCAP object.."); - pcap_obj = pcap_open_live (pcap_device, diff --git a/net-mgmt/collectd5/pkg-descr b/net-mgmt/collectd5/pkg-descr deleted file mode 100644 index a591a0195caa..000000000000 --- a/net-mgmt/collectd5/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -collectd is a small daemon written in C for performance. It reads various -system & network statistics along with updating output RRD or CSV files. -The daemon is very fast and allows for frequent polling of values, with -support for polling as frequent as every 10 seconds. - -WWW: http://www.collectd.org/ diff --git a/net-mgmt/collectd5/pkg-plist b/net-mgmt/collectd5/pkg-plist deleted file mode 100644 index 2da1f6995781..000000000000 --- a/net-mgmt/collectd5/pkg-plist +++ /dev/null @@ -1,61 +0,0 @@ -@stopdaemon collectd -sbin/collectd -@unexec if cmp -s %D/etc/collectd.conf.sample %D/etc/collectd.conf; then rm -f %D/etc/collectd.conf; fi -etc/collectd.conf.sample -@exec if [ ! -f %B/collectd.conf ] ; then cp -p %B/%f %B/collectd.conf; fi -%%CGI%%%%WWWDIR%%/collection.cgi -%%CGI%%@unexec if cmp -s %B/collection.conf.sample %B/collection.conf; then rm -f %B/collection.conf; fi -%%CGI%%%%WWWDIR%%/collection.conf.sample -%%CGI%%@exec if [ ! -f %B/collection.conf ] ; then cp -p %B/%f %B/collection.conf; fi -%%CGI%%@dirrmtry %%WWWDIR%% -bin/collectd-nagios -lib/collectd/types.db -%%APACHE%%lib/collectd/apache.la -%%APACHE%%lib/collectd/apache.so -%%APCUPS%%lib/collectd/apcups.la -%%APCUPS%%lib/collectd/apcups.so -lib/collectd/cpu.la -lib/collectd/cpu.so -lib/collectd/csv.la -lib/collectd/csv.so -lib/collectd/df.la -lib/collectd/df.so -lib/collectd/dns.la -lib/collectd/dns.so -lib/collectd/email.la -lib/collectd/email.so -lib/collectd/exec.la -lib/collectd/exec.so -%%INTERFACE%%lib/collectd/interface.la -%%INTERFACE%%lib/collectd/interface.so -lib/collectd/load.la -lib/collectd/load.so -lib/collectd/logfile.la -lib/collectd/logfile.so -%%MBMON%%lib/collectd/mbmon.la -%%MBMON%%lib/collectd/mbmon.so -lib/collectd/memory.la -lib/collectd/memory.so -%%MYSQL%%lib/collectd/mysql.la -%%MYSQL%%lib/collectd/mysql.so -lib/collectd/network.la -lib/collectd/network.so -lib/collectd/ntpd.la -lib/collectd/ntpd.so -%%PING%%lib/collectd/ping.la -%%PING%%lib/collectd/ping.so -%%RRD%%lib/collectd/rrdtool.la -%%RRD%%lib/collectd/rrdtool.so -%%SNMP%%lib/collectd/snmp.la -%%SNMP%%lib/collectd/snmp.so -lib/collectd/swap.la -lib/collectd/swap.so -lib/collectd/syslog.la -lib/collectd/syslog.so -lib/collectd/unixsock.la -lib/collectd/unixsock.so -%%XMMS%%lib/collectd/xmms.la -%%XMMS%%lib/collectd/xmms.so -@dirrm lib/collectd -@exec mkdir -p /var/db/collectd -@unexec rmdir /var/db/collectd 2>/dev/null || true diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile deleted file mode 100644 index fee0ee8b61d5..000000000000 --- a/net-mgmt/net-snmp-devel/Makefile +++ /dev/null @@ -1,294 +0,0 @@ -# New ports collection makefile for: ucd-snmp -# Date created: 26 June 1996 -# Whom: gpalmer -# -# $FreeBSD$ -# - -PORTNAME= snmp -PORTVERSION= 5.4.1.2 -PORTREVISION= 2 -CATEGORIES= net-mgmt ipv6 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= net-snmp -PKGNAMEPREFIX= net- -DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION} - -MAINTAINER= kuriyama@FreeBSD.org -COMMENT= An extendable SNMP implementation - -.if !defined(WITH_TKMIB) -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-local:Makefile.in -.endif - -.if defined(WITH_TKMIB) -RUN_DEPEND= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk -.endif - -GNU_CONFIGURE= yes -USE_RC_SUBR= snmpd.sh snmptrapd.sh -USE_OPENSSL= yes -USE_LDCONFIG= yes -.if defined(WITHOUT_PERL) -USE_PERL5_BUILD=yes -.else -USE_PERL5= yes -.endif - -CONFIGURE_ENV+= PERLPROG="${PERL}" PSPROG="${PS_CMD}" SED="${SED}" -CONFIGURE_ARGS+=--enable-shared --enable-internal-md5 \ - --with-mib-modules="${_NET_SNMP_MIB_MODULES}" \ - --with-default-snmp-version="${DEFAULT_SNMP_VERSION}" \ - --with-sys-contact="${NET_SNMP_SYS_CONTACT}" \ - --with-sys-location="${NET_SNMP_SYS_LOCATION}" \ - --with-logfile="${NET_SNMP_LOGFILE}" \ - --with-persistent-directory="${NET_SNMP_PERSISTENTDIR}" \ - --with-gnu-ld --with-libwrap --with-libs="-lm -lkvm -ldevstat" - -.if defined(BATCH) -CONFIGURE_ARGS+=--with-defaults -.endif - -.if !defined(WITHOUT_DUMMY_VALUES) -CONFIGURE_ARGS+=--with-dummy-values -.endif - -.include <bsd.port.pre.mk> - -.if defined(WITHOUT_PERL) -PLIST_SUB+= WITH_PERL="@comment " -CONFIGURE_ARGS+=--disable-embedded-perl --without-perl-modules -.else -CONFIGURE_ARGS+=--enable-embedded-perl --with-perl-modules -PLIST_SUB+= WITH_PERL="" -.endif - -.if defined(WITH_TKMIB) -PLIST_SUB+= WITH_TKMIB="" -.else -PLIST_SUB+= WITH_TKMIB="@comment " -.endif - -.if defined(WITH_DMALLOC) -LIB_DEPEND+= dmalloc:${PORTSDIR}/devel/dmalloc -CONFIGURE_ARGS+=--with-dmalloc=${LOCALBASE} -.endif - -.if !defined(WITHOUT_IPV6) -CONFIGURE_ARGS+=--enable-ipv6 -# --with-transport="UDPIPv6 TCPIPv6" --with-modules=mibII/ipv6" -PLIST_SUB+= WITH_IPV6="" -.else -PLIST_SUB+= WITH_IPV6="@comment " -.endif - -SHLIB_VERSION= 16 -PLIST_SUB+= SHLIB_VERSION=${SHLIB_VERSION} -SCRIPTS_SUB= PREFIX=${PREFIX} PERL=${PERL} - -DEFAULT_SNMP_VERSION?= 3 -NET_SNMP_SYS_CONTACT?= nobody@nowhere.invalid -NET_SNMP_SYS_LOCATION?= somewhere -NET_SNMP_LOGFILE?= /var/log/snmpd.log -NET_SNMP_PERSISTENTDIR?=/var/net-snmp -NET_SNMP_MIB_MODULES?= ${NET_SNMP_MIB_MODULE_LIST} - -NET_SNMP_MIB_MODULE_LIST=host disman/event-mib smux mibII/mta_sendmail mibII/tcpTable ucd-snmp/diskio - -.if defined(WITH_MFD_REWRITES) -CONFIGURE_ARGS+=--enable-mfd-rewrites -NET_SNMP_MIB_MODULE_LIST+= if-mib -.endif - -_NET_SNMP_MIB_MODULES= -.for module1 in ${NET_SNMP_MIB_MODULE_LIST} -_module1=${module1} -_define=false -. for module2 in ${NET_SNMP_MIB_MODULES} -_module2=${module2} -. if ${_module1} == ${_module2} -_define=true -. endif -. endfor -. if ${_define} == true -_NET_SNMP_MIB_MODULES+=${module1} -PLIST_SUB+= WITH_${module1:C|.*/||:U}="" -. else -PLIST_SUB+= WITH_${module1:C|.*/||:U}="@comment " -. endif -.endfor - -MAN1= encode_keychange.1 fixproc.1 mib2c.1 mib2c-update.1 \ - net-snmp-config.1 \ - snmpbulkget.1 snmpbulkwalk.1 snmpcmd.1 snmpconf.1 \ - snmpdelta.1 snmpdf.1 snmpget.1 snmpgetnext.1 snmpinform.1 \ - snmpnetstat.1 snmpset.1 snmpstatus.1 snmptable.1 snmptest.1 \ - snmptranslate.1 snmptrap.1 snmpusm.1 snmpvacm.1 snmpwalk.1 \ - tkmib.1 traptoemail.1 -MAN3= add_mibdir.3 add_module_replacement.3 \ - config_perror.3 config_pwarn.3 \ - default_store.3 fprint_description.3 \ - fprint_objid.3 fprint_value.3 fprint_variable.3 \ - get_module_node.3 init_mib.3 init_mib_internals.3 mib_api.3 \ - netsnmp_Container_iterator.3 \ - netsnmp_agent.3 \ - netsnmp_baby_steps.3 \ - netsnmp_bulk_to_next.3 \ - netsnmp_cache_handler.3 netsnmp_container.3 \ - netsnmp_debug.3 \ - netsnmp_ds_get_boolean.3 netsnmp_ds_get_int.3 \ - netsnmp_ds_get_string.3 \ - netsnmp_ds_register_config.3 netsnmp_ds_register_premib.3 \ - netsnmp_ds_set_boolean.3 netsnmp_ds_set_int.3 \ - netsnmp_ds_set_string.3 netsnmp_ds_shutdown.3 \ - netsnmp_example_scalar_int.3 netsnmp_handler.3 \ - netsnmp_instance.3 \ - netsnmp_iterator_info_s.3 \ - netsnmp_leaf.3 netsnmp_library.3 \ - netsnmp_mib_handler_methods.3 netsnmp_mib_utilities.3 \ - netsnmp_mode_end_call.3 netsnmp_multiplexer.3 \ - netsnmp_old_api.3 netsnmp_read_only.3 \ - netsnmp_row_merge.3 \ - netsnmp_scalar.3 \ - netsnmp_scalar_group_group.3 \ - netsnmp_serialize.3 \ - netsnmp_stash_cache.3 \ - netsnmp_table.3 netsnmp_table_array.3 \ - netsnmp_table_data.3 netsnmp_table_dataset.3 \ - netsnmp_table_iterator.3 \ - netsnmp_utilities.3 \ - netsnmp_watcher.3 \ - print_description.3 print_mib.3 print_objid.3 print_value.3 \ - print_variable.3 read_all_mibs.3 \ - read_config.3 read_configs.3 read_config_print_usage.3 \ - read_mib.3 read_module.3 read_module_node.3 read_objid.3 \ - read_premib_configs.3 \ - register_app_config_handler.3 register_app_premib_handler.3 \ - register_config_handler.3 register_mib_handlers.3 \ - register_premib_handler.3 \ - send_easy_trap.3 send_trap_vars.3 send_v2trap.3 \ - shutdown_mib.3 \ - snmp_agent_api.3 \ - snmp_alarm.3 snmp_alarm_register.3 \ - snmp_alarm_register_hr.3 snmp_alarm_unregister.3 \ - snmp_api.3 snmp_api_errstring.3 snmp_close.3 \ - snmp_error.3 snmp_free_pdu.3 snmp_open.3 snmp_perror.3 \ - snmp_read.3 snmp_select_info.3 \ - snmp_send.3 snmp_sess_api.3 snmp_sess_async_send.3 \ - snmp_sess_close.3 snmp_sess_error.3 snmp_sess_init.3 \ - snmp_sess_open.3 snmp_sess_perror.3 \ - snmp_sess_read.3 snmp_sess_select_info.3 \ - snmp_sess_send.3 snmp_sess_session.3 snmp_sess_timeout.3 \ - snmp_set_mib_warnings.3 snmp_set_save_descriptions.3 \ - snmp_timeout.3 snmp_trap_api.3 \ - snprint_objid.3 snprint_value.3 snprint_variable.3 \ - sprint_realloc_objid.3 sprint_realloc_value.3 \ - sprint_realloc_variable.3 \ - unregister_app_config_handler.3 \unregister_config_handler.3 - -.if !defined(WITHOUT_PERL) -MAN3PERL= NetSNMP::ASN.3 NetSNMP::OID.3 NetSNMP::agent.3 \ - NetSNMP::TrapReceiver.3 \ - NetSNMP::agent::default_store.3 \ - NetSNMP::default_store.3 \ - NetSNMP::netsnmp_request_infoPtr.3 SNMP.3 -MAN3PERLPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} -_MANPAGES+= ${MAN3PERL:S%^%${MAN3PERLPREFIX}/man/man3/%} -.endif - -MAN5= mib2c.conf.5 snmp.conf.5 snmp_config.5 snmpd.conf.5 \ - snmpd.examples.5 snmpd.internal.5 \ - snmptrapd.conf.5 variables.5 -MAN8= snmpd.8 snmptrapd.8 - -BIN_FILES= snmpbulkwalk snmpget snmpgetnext snmpset \ - snmpstatus snmptest snmptranslate snmptrap snmpwalk -SBIN_FILES= snmpd snmptrapd -STARTUP_DIR= ${PREFIX}/etc/rc.d -SCRIPT_FILES= snmpcheck.def mib2c fixproc ipf-mod.pl snmpconf \ - traptoemail -.if defined(WITH_TKMIB) -SCRIPT_FILES+= tkmib -.endif -DOC_FILES= AGENT.txt COPYING FAQ NEWS README \ - README.agentx README.krb5 README.snmpv3 README.thread \ - agent/mibgroup/README.smux - -PS_CMD?= /bin/ps -CONFLICTS= ucd-snmp-4.* net-snmp-5.3.* - -pre-everything:: - @${ECHO_MSG} - @${ECHO_MSG} "You may use the following build options:" - @${ECHO_MSG} - @${ECHO_MSG} "WITH_TKMIB=yes Install a graphical Perl/Tk/SNMP based mib browser" - @${ECHO_MSG} "WITHOUT_DUMMY_VALUES=yes Provide 'placeholder' dummy values where" - @${ECHO_MSG} " the necessary information is not available." - @${ECHO_MSG} "WITHOUT_PERL=yes Do not install the perl modules along with the rest" - @${ECHO_MSG} " of the net-snmp toolkit." - @${ECHO_MSG} "WITHOUT_IPV6=yes Disable IPv6." - @${ECHO_MSG} - @${ECHO_MSG} "DEFAULT_SNMP_VERSION=\"3\" Default version of SNMP to use." - @${ECHO_MSG} "NET_SNMP_SYS_CONTACT=\"${NET_SNMP_SYS_CONTACT}\"" - @${ECHO_MSG} " Default system contact." - @${ECHO_MSG} "NET_SNMP_SYS_LOCATION=\"${NET_SNMP_SYS_LOCATION}\"" - @${ECHO_MSG} " Default system location." - @${ECHO_MSG} "NET_SNMP_LOGFILE=\"${NET_SNMP_LOGFILE}\"" - @${ECHO_MSG} " Default log file location for snmpd." - @${ECHO_MSG} "NET_SNMP_PERSISTENTDIR=\"${NET_SNMP_PERSISTENTDIR}\"" - @${ECHO_MSG} " Default directory for persistent data storage." - @${ECHO_MSG} "NET_SNMP_MIB_MODULES=\"${NET_SNMP_MIB_MODULE_LIST}\"" - @${ECHO_MSG} " Optional mib modules that can be built into the" - @${ECHO_MSG} " agent" - @${ECHO_MSG} - -post-patch: -.for filename in ${SCRIPT_FILES} - @${REINPLACE_CMD} ${SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${WRKSRC}/local/${filename} -.endfor - -post-configure: - @${FIND} ${WRKSRC} -name Makefile | \ - ${XARGS} ${REINPLACE_CMD} -E -e '/^INSTALL[ ]+=/s|$$| -m 755|' - -post-build: -.if !defined(WITHOUT_PERL) - ${FIND} ${WRKSRC}/perl -name Makefile | \ - ${XARGS} ${REINPLACE_CMD} -E -e '\ - s!^(PREFIX) = .*!\1 = ${PREFIX}!; \ - s!^(INSTALLMAN3DIR|INSTALLSITEMAN3DIR) = .*!\1 = ${MAN3PERLPREFIX}/man/man3!; \ - s!^(INSTALLSITELIB|INSTALLSITEARCH) = /usr/local/(.*)!\1 = ${PREFIX}/\2!; \ - s! doc_(perl|site|\$$\(INSTALLDIRS\))_install$$!!; \ - ' -.else - ${REINPLACE_CMD} -e 's| perlinstall||' ${WRKSRC}/Makefile -.endif - -post-install: strip-files install-config-files install-doc-files display-message - ${MKDIR} /var/agentx - -strip-files: - @cd ${PREFIX}/bin; ${STRIP_CMD} ${BIN_FILES} - @cd ${PREFIX}/sbin; ${STRIP_CMD} ${SBIN_FILES} - -install-config-files: - @${INSTALL_DATA} ${WRKSRC}/EXAMPLE.conf ${DATADIR}/snmpd.conf.example - -install-doc-files: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -. for filename in ${DOC_FILES} - @${INSTALL_DATA} ${WRKSRC}/${filename} ${DOCSDIR} -. endfor -.endif - -display-message: - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - -# Maintainer's note: -# Don't forget to bump library version in these ports. -# french/plgrenouille,graphics/hpoj,lang/php4,lang/php5,mail/cyrus-imapd22,mail/cyrus-imapd23,misc/kdeutils3,net-mgmt/braa,net-mgmt/docsis,net-mgmt/mbrowse,net-mgmt/nagios-snmp-plugins,net-mgmt/p5-SNMP-Info,net-mgmt/py-yapsnmp,net-mgmt/sdig,net-mgmt/zabbix,net/cactid,net/wireshark,net/ifstat,net/quagga,net/rtg,print/hplip,security/libfwbuilder,sysutils/apcupsd,sysutils/jailadmin,sysutils/nut - -.include <bsd.port.post.mk> diff --git a/net-mgmt/net-snmp-devel/distinfo b/net-mgmt/net-snmp-devel/distinfo deleted file mode 100644 index e02915a0ce75..000000000000 --- a/net-mgmt/net-snmp-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (net-snmp-5.4.1.2.tar.gz) = 2dfcf97d65f3b7d34b78c8d4be11fc83 -SHA256 (net-snmp-5.4.1.2.tar.gz) = 17d67076ab5c5fb6dfaffe70a2757526f99b0638bca102dec27af08ec01a9068 -SIZE (net-snmp-5.4.1.2.tar.gz) = 5123346 diff --git a/net-mgmt/net-snmp-devel/files/extra-patch-local:Makefile.in b/net-mgmt/net-snmp-devel/files/extra-patch-local:Makefile.in deleted file mode 100644 index 50a941bffa3a..000000000000 --- a/net-mgmt/net-snmp-devel/files/extra-patch-local:Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- local/Makefile.in.orig Tue Oct 11 03:47:48 2005 -+++ local/Makefile.in Wed Nov 30 11:32:52 2005 -@@ -16,7 +16,7 @@ - # - SNMPCONFPATH=@SNMPCONFPATH@ - PERSISTENT_DIRECTORY=@PERSISTENT_DIRECTORY@ --PERLSCRIPTS=snmpcheck tkmib mib2c fixproc ipf-mod.pl snmpconf traptoemail -+PERLSCRIPTS=snmpcheck mib2c fixproc ipf-mod.pl snmpconf traptoemail - SHELLSCRIPTS=mib2c-update - SCRIPTSMADEFORPERL=snmpcheck.made tkmib.made mib2c.made fixproc.made \ - ipf-mod.pl.made snmpconf.made traptoemail.made diff --git a/net-mgmt/net-snmp-devel/files/patch-Makefile.in b/net-mgmt/net-snmp-devel/files/patch-Makefile.in deleted file mode 100644 index fece19085317..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2007-06-09 05:32:56.000000000 +0900 -+++ Makefile.in 2008-03-25 21:10:08.842515763 +0900 -@@ -16,7 +16,7 @@ - INSTALLHEADERS=version.h - INCLUDESUBDIR=system - INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.h bsdi4.h bsdi.h cygwin.h \ -- darwin.h darwin7.h darwin8.h darwin9.h freebsd5.h freebsd6.h \ -+ darwin.h darwin7.h darwin8.h darwin9.h freebsd5.h freebsd6.h freebsd7.h freebsd8.h \ - dynix.h freebsd2.h freebsd3.h freebsd4.h freebsd.h generic.h hpux.h \ - irix.h linux.h mingw32.h mips.h netbsd.h openbsd.h osf5.h \ - solaris2.3.h solaris2.4.h solaris2.5.h solaris2.6.h \ diff --git a/net-mgmt/net-snmp-devel/files/patch-agent_mibgroup_hardware_cpu.h b/net-mgmt/net-snmp-devel/files/patch-agent_mibgroup_hardware_cpu.h deleted file mode 100644 index 143133291f9e..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-agent_mibgroup_hardware_cpu.h +++ /dev/null @@ -1,18 +0,0 @@ - -$FreeBSD$ - ---- agent/mibgroup/hardware/cpu.h -+++ agent/mibgroup/hardware/cpu.h -@@ -12,10 +12,10 @@ - #elif defined(irix6) - config_require(hardware/cpu/cpu_sysinfo) - --#elif (defined(netbsd) || defined(netbsd1) || defined(netbsdelf) || defined(netbsdelf2)|| defined(netbsdelf3) || defined(openbsd2)|| defined(openbsd3) || defined(openbsd4)) -+#elif (defined(netbsd) || defined(netbsd1) || defined(netbsdelf) || defined(netbsdelf2)|| defined(netbsdelf3) || defined(openbsd2)|| defined(openbsd3) || defined(openbsd4) || defined(freebsd4) || defined(freebsd5)|| defined(freebsd6)) - config_require(hardware/cpu/cpu_sysctl) - --#elif (defined(freebsd2) || defined(freebsd3) || defined(freebsd4) || defined(freebsd5)|| defined(freebsd6)) -+#elif (defined(freebsd2) || defined(freebsd3)) - config_require(hardware/cpu/cpu_nlist) - - #elif (defined(aix4) || defined(aix5)) diff --git a/net-mgmt/net-snmp-devel/files/patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c b/net-mgmt/net-snmp-devel/files/patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c deleted file mode 100644 index 68d058961161..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c +++ /dev/null @@ -1,94 +0,0 @@ - -$FreeBSD$ - ---- agent/mibgroup/hardware/cpu/cpu_sysctl.c.orig -+++ agent/mibgroup/hardware/cpu/cpu_sysctl.c -@@ -11,7 +11,14 @@ - #include <unistd.h> - #include <sys/types.h> - -+#if defined(__FreeBSD__) -+#include <sys/resource.h> -+#if !defined(CPUSTATES) -+#include <sys/dkstat.h> -+#endif -+#else - #include <sys/sched.h> -+#endif - #include <sys/param.h> - #include <sys/sysctl.h> - #include <sys/vmmeter.h> -@@ -37,11 +44,11 @@ - strcpy(cpu->name, "Overall CPU statistics"); - - i = sizeof(n); -- sysctl(ncpu_mib, 2, &n, &i, NULL, 0); -+ sysctl(ncpu_mib, 2, &n, (void *)&i, NULL, 0); - if ( n <= 0 ) - n = 1; /* Single CPU system */ - i = sizeof(descr); -- sysctl(model_mib, 2, descr, &i, NULL, 0); -+ sysctl(model_mib, 2, descr, (void *)&i, NULL, 0); - for ( i = 0; i < n; i++ ) { - cpu = netsnmp_cpu_get_byIdx( i, 1 ); - cpu->status = 2; /* running */ -@@ -64,6 +71,8 @@ - #undef NETSNMP_CPU_STATS - #define NETSNMP_CPU_STATS uint64_t - #endif -+#elif defined(__FreeBSD__) -+#define NETSNMP_KERN_CPU 0 /* FreeBSD - dummy value, sysctlnametomib(2) should be used */ - #else - #error "No CPU statistics sysctl token" - #endif -@@ -95,7 +104,7 @@ - #define NETSNMP_VM_STATS_TYPE struct uvmexp - #endif /* VM_UVMEXP2 || VM_UVMEXP */ - --#elif defined(VM_METER) /* OpenBSD, NetBSD, FreeBSD */ -+#elif defined(VM_METER) && !defined(__FreeBSD__) /* OpenBSD, NetBSD */ - #define NETSNMP_VM_STATS VM_METER - #define NETSNMP_VM_STATS_TYPE struct vmtotal - -@@ -108,6 +117,15 @@ - #undef NS_VM_PAGEOUT - #define NS_VM_SWAPIN v_swpin - #define NS_VM_SWAPOUT v_swpout -+#elif defined(__FreeBSD__) /* FreeBSD */ -+#define NETSNMP_VM_STATS VM_METER -+#define NETSNMP_VM_STATS_TYPE struct vmmeter -+ #define NS_VM_INTR v_intr -+ #define NS_VM_SWTCH v_swtch -+ #define NS_VM_PAGEIN v_swappgsin -+ #define NS_VM_PAGEOUT v_swappgsout -+ #define NS_VM_SWAPIN v_swapin -+ #define NS_VM_SWAPOUT v_swapout - #endif - - -@@ -126,7 +144,7 @@ - */ - NETSNMP_CPU_STATS cpu_stats[CPUSTATES]; - int cpu_mib[] = { CTL_KERN, NETSNMP_KERN_CPU }; -- int cpu_size = sizeof(cpu_stats); -+ size_t cpu_size = sizeof(cpu_stats); - #ifdef NETSNMP_KERN_MCPU - NETSNMP_KERN_MCPU_TYPE *mcpu_stats; - int mcpu_mib[] = { CTL_KERN, NETSNMP_KERN_MCPU }; -@@ -134,10 +152,13 @@ - #endif - NETSNMP_VM_STATS_TYPE mem_stats; - int mem_mib[] = { CTL_VM, NETSNMP_VM_STATS }; -- int mem_size = sizeof(NETSNMP_VM_STATS_TYPE); -+ size_t mem_size = sizeof(NETSNMP_VM_STATS_TYPE); - netsnmp_cpu_info *cpu = netsnmp_cpu_get_byIdx( -1, 0 ); -- -- sysctl(cpu_mib, 2, cpu_stats, &cpu_size, NULL, 0); -+#if defined(__FreeBSD__) -+ sysctlbyname("kern.cp_time", cpu_stats, &cpu_size, NULL, 0); -+#else -+ sysctl(cpu_time, 2, cpu_stats, &cpu_size, NULL, 0); -+#endif - cpu->user_ticks = (unsigned long)cpu_stats[CP_USER]; - cpu->nice_ticks = (unsigned long)cpu_stats[CP_NICE]; - cpu->sys2_ticks = (unsigned long)cpu_stats[CP_SYS]+cpu_stats[CP_INTR]; diff --git a/net-mgmt/net-snmp-devel/files/patch-agent_registry.c b/net-mgmt/net-snmp-devel/files/patch-agent_registry.c deleted file mode 100644 index 8c81bdf5ab52..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-agent_registry.c +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/agent_registry.c.orig 2008-08-24 23:24:04.944441100 +0900 -+++ agent/agent_registry.c 2008-08-24 23:25:37.996227686 +0900 -@@ -532,7 +532,8 @@ - - if (next && (next->namelen == new_sub->namelen) && - (next->priority == new_sub->priority)) { -- netsnmp_assert(!"registration != duplicate"); /* always false */ -+ if (new_sub->namelen != 1) /* ignore root OID dups */ -+ netsnmp_assert(!"registration != duplicate"); /* always false */ - return MIB_DUPLICATE_REGISTRATION; - } - diff --git a/net-mgmt/net-snmp-devel/files/patch-callback.c b/net-mgmt/net-snmp-devel/files/patch-callback.c deleted file mode 100644 index 840d12c0d881..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-callback.c +++ /dev/null @@ -1,12 +0,0 @@ ---- snmplib/callback.c.orig Tue Jan 25 10:19:39 2005 -+++ snmplib/callback.c Tue Jan 25 10:19:53 2005 -@@ -34,6 +34,9 @@ - #include <strings.h> - #endif - -+#if HAVE_UNISTD_H -+#include <unistd.h> -+#endif - #if HAVE_DMALLOC_H - #include <dmalloc.h> - #endif diff --git a/net-mgmt/net-snmp-devel/files/patch-default_store.c b/net-mgmt/net-snmp-devel/files/patch-default_store.c deleted file mode 100644 index 076ecec1431e..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-default_store.c +++ /dev/null @@ -1,12 +0,0 @@ ---- snmplib/default_store.c.orig Tue Jan 25 10:20:31 2005 -+++ snmplib/default_store.c Tue Jan 25 10:20:47 2005 -@@ -145,6 +145,9 @@ - #include <winsock.h> - #endif - -+#if HAVE_UNISTD_H -+#include <unistd.h> -+#endif - #if HAVE_DMALLOC_H - #include <dmalloc.h> - #endif diff --git a/net-mgmt/net-snmp-devel/files/patch-disk.c b/net-mgmt/net-snmp-devel/files/patch-disk.c deleted file mode 100644 index d58269d1e08d..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-disk.c +++ /dev/null @@ -1,31 +0,0 @@ ---- agent/mibgroup/ucd-snmp/disk.c.orig 2008-07-05 22:11:22.366362753 +0900 -+++ agent/mibgroup/ucd-snmp/disk.c 2008-07-06 00:32:19.611196878 +0900 -@@ -73,6 +73,9 @@ - #if HAVE_SYS_VFS_H - #include <sys/vfs.h> - #endif -+#if defined(__FreeBSD__) && __FreeBSD_version >= 700055 -+#include <sys/ucred.h> -+#endif - #if defined(HAVE_STATFS) - #if HAVE_SYS_MOUNT_H - #include <sys/mount.h> -@@ -491,6 +494,18 @@ - dummy = 1; - } - endfsent(); /* close /etc/fstab */ -+#if defined(__FreeBSD__) && __FreeBSD_version >= 700055 -+ { -+ struct statfs *mntbuf; -+ size_t i, mntsize; -+ mntsize = getmntinfo(&mntbuf, MNT_NOWAIT); -+ for (i = 0; i < mntsize; i++) { -+ if (strncmp(mntbuf[i].f_fstypename, "zfs", 3) == 0) { -+ add_device(mntbuf[i].f_mntonname, mntbuf[i].f_mntfromname, -1, minpercent, 0); -+ } -+ } -+ } -+#endif - if(dummy != 0) { - /* - * dummy clause for else below diff --git a/net-mgmt/net-snmp-devel/files/patch-freebsd5.h b/net-mgmt/net-snmp-devel/files/patch-freebsd5.h deleted file mode 100644 index dcb8f97d093d..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-freebsd5.h +++ /dev/null @@ -1,10 +0,0 @@ ---- include/net-snmp/system/freebsd5.h.orig 2006-08-18 08:14:20.000000000 +0900 -+++ include/net-snmp/system/freebsd5.h 2008-03-25 21:12:05.556475473 +0900 -@@ -1,6 +1,7 @@ - /* freebsd5 is a superset of freebsd4 */ - #include "freebsd4.h" - #define freebsd4 freebsd4 -+#define freebsd5 freebsd5 - - /* don't define _KERNEL on FreeBSD 5.3 even if configure thinks we need it */ - #ifdef freebsd5 diff --git a/net-mgmt/net-snmp-devel/files/patch-freebsd7.h b/net-mgmt/net-snmp-devel/files/patch-freebsd7.h deleted file mode 100644 index 72f325d12ba3..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-freebsd7.h +++ /dev/null @@ -1,4 +0,0 @@ ---- include/net-snmp/system/freebsd7.h.orig Sun Jul 17 22:41:06 2005 -+++ include/net-snmp/system/freebsd7.h Sun Jul 17 22:41:28 2005 -@@ -0,0 +1 @@ -+#include "freebsd6.h" diff --git a/net-mgmt/net-snmp-devel/files/patch-freebsd8.h b/net-mgmt/net-snmp-devel/files/patch-freebsd8.h deleted file mode 100644 index 94ab52cbeec5..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-freebsd8.h +++ /dev/null @@ -1,4 +0,0 @@ ---- include/net-snmp/system/freebsd8.h.orig Sun Jul 17 22:41:06 2005 -+++ include/net-snmp/system/freebsd8.h Sun Jul 17 22:41:28 2005 -@@ -0,0 +1 @@ -+#include "freebsd7.h" diff --git a/net-mgmt/net-snmp-devel/files/patch-generic.h b/net-mgmt/net-snmp-devel/files/patch-generic.h deleted file mode 100644 index 9eddc80e0d1a..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-generic.h +++ /dev/null @@ -1,14 +0,0 @@ ---- include/net-snmp/system/generic.h.orig 2008-03-26 10:28:25.802233395 +0900 -+++ include/net-snmp/system/generic.h 2008-03-26 10:29:40.629721291 +0900 -@@ -1,3 +1,5 @@ -+#ifndef __NET_SNMP_SYSTEM_GENERIC_H__ -+#define __NET_SNMP_SYSTEM_GENERIC_H__ - - #define bsdlike bsdlike - -@@ -72,3 +74,5 @@ - */ - #define INP_NEXT_SYMBOL inp_next - #define INP_PREV_SYMBOL inp_prev -+ -+#endif /* !__NET_SNMP_SYSTEM_GENERIC_H__ */ diff --git a/net-mgmt/net-snmp-devel/files/patch-hr_storage.c b/net-mgmt/net-snmp-devel/files/patch-hr_storage.c deleted file mode 100644 index 4fc2bd0d5544..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-hr_storage.c +++ /dev/null @@ -1,17 +0,0 @@ ---- agent/mibgroup/host/hr_storage.c.orig 2007-06-08 19:33:58.000000000 +0900 -+++ agent/mibgroup/host/hr_storage.c 2008-03-25 21:26:23.470718989 +0900 -@@ -489,11 +489,13 @@ - * - *********************/ - -+/* kuriyama: should be removed? */ - static const char *hrs_descr[] = { - NULL, - "Memory Buffers", /* HRS_TYPE_MBUF */ - "Real Memory", /* HRS_TYPE_MEM */ -- "Swap Space" /* HRS_TYPE_SWAP */ -+ "Swap Space", /* HRS_TYPE_SWAP */ -+ "Memory Buffer Clusters" /* HRS_TYPE_MBUFCLUSTER */ - }; - - diff --git a/net-mgmt/net-snmp-devel/files/patch-hr_storage.h b/net-mgmt/net-snmp-devel/files/patch-hr_storage.h deleted file mode 100644 index a14eb9f1043c..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-hr_storage.h +++ /dev/null @@ -1,11 +0,0 @@ ---- agent/mibgroup/host/hr_storage.h.orig Tue Feb 25 22:17:48 2003 -+++ agent/mibgroup/host/hr_storage.h Wed May 5 15:27:40 2004 -@@ -12,6 +12,7 @@ - #define HRS_TYPE_MBUF 1 - #define HRS_TYPE_MEM 2 - #define HRS_TYPE_SWAP 3 --#define HRS_TYPE_FIXED_MAX 3 /* the largest fixed type */ -+#define HRS_TYPE_MBUFCLUSTER 4 -+#define HRS_TYPE_FIXED_MAX 4 /* the largest fixed type */ - - #endif /* _MIBGROUP_HRSTORAGE_H */ diff --git a/net-mgmt/net-snmp-devel/files/patch-hr_system.c b/net-mgmt/net-snmp-devel/files/patch-hr_system.c deleted file mode 100644 index f2d810ac0771..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-hr_system.c +++ /dev/null @@ -1,11 +0,0 @@ ---- agent/mibgroup/host/hr_system.c.orig Mon Feb 23 02:29:34 2004 -+++ agent/mibgroup/host/hr_system.c Sat Apr 3 00:00:24 2004 -@@ -596,6 +596,8 @@ - #ifndef UTMP_HAS_NO_TYPE - if (utmp_p->ut_type != USER_PROCESS) - continue; -+#else -+ if (*utmp_p->ut_name != '~') - #endif - #ifndef UTMP_HAS_NO_PID - /* This block of code fixes zombie user PIDs in the diff --git a/net-mgmt/net-snmp-devel/files/patch-interface_ioctl.c b/net-mgmt/net-snmp-devel/files/patch-interface_ioctl.c deleted file mode 100644 index 4939166949be..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-interface_ioctl.c +++ /dev/null @@ -1,13 +0,0 @@ ---- ./agent/mibgroup/if-mib/data_access/interface_ioctl.c.orig Mon Oct 25 12:57:23 2004 -+++ ./agent/mibgroup/if-mib/data_access/interface_ioctl.c Mon Oct 25 12:56:33 2004 -@@ -385,6 +385,10 @@ - if (rc < 0) - return 0; - -+#if defined(__FreeBSD__) -+ return ifrq.ifr_index; -+#else - return ifrq.ifr_ifindex; -+#endif - #endif /* SIOCGIFINDEX */ - } diff --git a/net-mgmt/net-snmp-devel/files/patch-interfaces.c b/net-mgmt/net-snmp-devel/files/patch-interfaces.c deleted file mode 100644 index bc56d6ca3a3e..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-interfaces.c +++ /dev/null @@ -1,157 +0,0 @@ ---- agent/mibgroup/mibII/interfaces.c.orig Wed Oct 26 00:52:19 2005 -+++ agent/mibgroup/mibII/interfaces.c Tue Feb 27 20:44:48 2007 -@@ -395,6 +395,133 @@ - return NULL; - } - -+#if defined(freebsd2) -+static char *physaddrbuf; -+static int nphysaddrs; -+struct sockaddr_dl **physaddrs; -+ -+void -+init_interfaces_setup(void) -+{ -+ int naddrs, ilen, bit; -+ static int mib[6] -+ = { CTL_NET, PF_ROUTE, 0, AF_LINK, NET_RT_IFLIST, 0 }; -+ char *cp; -+ size_t len; -+ struct rt_msghdr *rtm; -+ struct if_msghdr *ifm; -+ struct ifa_msghdr *ifam; -+ struct sockaddr *sa; -+ -+ naddrs = 0; -+ if (physaddrs) -+ free(physaddrs); -+ if (physaddrbuf) -+ free(physaddrbuf); -+ physaddrbuf = 0; -+ physaddrs = 0; -+ nphysaddrs = 0; -+ len = 0; -+ if (sysctl(mib, 6, 0, &len, 0, 0) < 0) -+ return; -+ -+ cp = physaddrbuf = malloc(len); -+ if (physaddrbuf == 0) -+ return; -+ if (sysctl(mib, 6, physaddrbuf, &len, 0, 0) < 0) { -+ free(physaddrbuf); -+ physaddrbuf = 0; -+ return; -+ } -+ -+ loop: -+ ilen = len; -+ cp = physaddrbuf; -+ while (ilen > 0) { -+ rtm = (struct rt_msghdr *) cp; -+ if (rtm->rtm_version != RTM_VERSION || rtm->rtm_type != RTM_IFINFO) { -+ free(physaddrs); -+ physaddrs = 0; -+ free(physaddrbuf); -+ physaddrbuf = 0; -+ } -+ ifm = (struct if_msghdr *) rtm; -+#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) -+ if (physaddrs != 0) -+ physaddrs[naddrs] = (void *) (ifm + 1); -+ naddrs++; -+#endif -+ ilen -= ifm->ifm_msglen; -+ cp += ifm->ifm_msglen; -+ rtm = (struct rt_msghdr *) cp; -+ while (ilen > 0 && rtm->rtm_type == RTM_NEWADDR) { -+#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) -+ ilen -= rtm->rtm_msglen; -+ cp += rtm->rtm_msglen; -+#else -+ int is_alias = 0; -+ ifam = (struct ifa_msghdr *) rtm; -+ ilen -= sizeof(*ifam); -+ cp += sizeof(*ifam); -+ sa = (struct sockaddr *) cp; -+#define ROUND(x) (((x) + sizeof(long) - 1) & ~sizeof(long)) -+ for (bit = 1; bit && ilen > 0; bit <<= 1) { -+ if (!(ifam->ifam_addrs & bit)) -+ continue; -+ ilen -= ROUND(sa->sa_len); -+ cp += ROUND(sa->sa_len); -+ -+ if (bit == RTA_IFA) { -+ if (physaddrs) -+#define satosdl(sa) ((struct sockaddr_dl *)(sa)) -+ physaddrs[naddrs++] -+ = satosdl(sa); -+ else -+ naddrs++; -+ } -+ sa = (struct sockaddr *) cp; -+ } -+#endif -+ rtm = (struct rt_msghdr *) cp; -+ } -+ } -+ if (physaddrs) { -+ nphysaddrs = naddrs; -+ return; -+ } -+ physaddrs = malloc(naddrs * sizeof(*physaddrs)); -+ if (physaddrs == 0) -+ return; -+ naddrs = 0; -+ goto loop; -+ -+} -+ -+static int -+get_phys_address(int iindex, char **ap, int *len) -+{ -+ int i; -+ int once = 1; -+ -+ do { -+ for (i = 0; i < nphysaddrs; i++) { -+ if (physaddrs[i]->sdl_index == iindex) -+ break; -+ } -+ if (i < nphysaddrs) -+ break; -+ init_interfaces_setup(); -+ } while (once--); -+ -+ if (i < nphysaddrs) { -+ *ap = LLADDR(physaddrs[i]); -+ *len = physaddrs[i]->sdl_alen; -+ return 0; -+ } -+ return -1; -+} -+#endif -+ - #ifdef USE_SYSCTL_IFLIST - - static u_char *if_list = 0; -@@ -603,10 +730,20 @@ - } - return (u_char *) & long_return; - case IFPHYSADDRESS: -+#if defined(freebsd2) -+ { -+ char *cp; -+ if (get_phys_address(interface, &cp, var_len)) -+ return NULL; -+ else -+ return cp; -+ } -+#else - /* - * XXX - */ - return NULL; -+#endif - case IFADMINSTATUS: - long_return = if_msg.ifm_flags & IFF_UP ? 1 : 2; - return (u_char *) & long_return; diff --git a/net-mgmt/net-snmp-devel/files/patch-ipv6.c b/net-mgmt/net-snmp-devel/files/patch-ipv6.c deleted file mode 100644 index 86637254c1c4..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-ipv6.c +++ /dev/null @@ -1,598 +0,0 @@ ---- agent/mibgroup/mibII/ipv6.c.orig 2007-05-25 07:01:04.000000000 +0900 -+++ agent/mibgroup/mibII/ipv6.c 2008-03-26 07:29:07.122940424 +0900 -@@ -8,10 +8,25 @@ - #define _KERNEL 1 - #define _I_DEFINED_KERNEL - #endif -+ -+/* make this source a wee bit more readable */ -+#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -+#define OS_NET_BSD_16_OR_LATER 1 -+#endif -+#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#define OS_NOT_FREEBSD_NOR_DARWIN 1 -+#endif -+#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#define OS_FREEBSD_OR_DARWIN 1 -+#if !defined(INP_IPV6PROTO) -+#define INP_IPV6PROTO 0x04 -+#endif -+#endif -+ - #include <sys/types.h> - #include <sys/param.h> - #include <sys/socket.h> --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if OS_FREEBSD_OR_DARWIN - # if HAVE_SYS_SOCKETVAR_H - # include <sys/socketvar.h> - # endif -@@ -80,7 +95,7 @@ - # include <netinet6/ip6_var.h> - #endif - #include <net/route.h> --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if OS_FREEBSD_OR_DARWIN - # if HAVE_NETINET_IN_PCB_H - # include <netinet/in_pcb.h> - # endif -@@ -578,7 +593,7 @@ - memcpy(result, &tmp, sizeof(tmp)); - return 0; - } --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if OS_FREEBSD_OR_DARWIN - q = (caddr_t) TAILQ_NEXT(&tmp, if_link); - #else - # if defined(__NetBSD__) || defined(__OpenBSD__) -@@ -809,7 +824,7 @@ - - if (if_getifnet(interface, &ifnet) < 0) - break; --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if OS_FREEBSD_OR_DARWIN - ifa = (caddr_t) TAILQ_FIRST(&ifnet.if_addrhead); - #else - # if defined(__NetBSD__) || defined(__OpenBSD__) -@@ -836,7 +851,7 @@ - *var_len = sdl.sdl_alen; - return (u_char *) (sdl.sdl_data + sdl.sdl_nlen); - } --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if OS_FREEBSD_OR_DARWIN - ifa = (caddr_t) TAILQ_NEXT(&ifaddr, ifa_link); - #else - # if defined(__NetBSD__) || defined(__OpenBSD__) -@@ -1229,32 +1244,33 @@ - size_t * length, - int exact, size_t * var_len, WriteMethod ** write_method) - { -- oid newname[MAX_OID_LEN]; -- oid savname[MAX_OID_LEN]; -+ oid newname[MAX_OID_LEN], savname[MAX_OID_LEN]; - int result; - int i, j; - caddr_t p; -- static struct in6pcb in6pcb, savpcb; -+ static struct in6pcb tstpcb, savpcb; - int found, savnameLen; --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -+#if OS_NOT_FREEBSD_NOR_DARWIN -+ static struct in6pcb udb6; -+#endif -+#if OS_NET_BSD_16_OR_LATER - struct inpcbtable udbtable; - caddr_t first; --#elif (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#endif -+#if OS_FREEBSD_OR_DARWIN - char *sysctl_buf; - struct xinpgen *xig, *oxig; --#else -- static struct in6pcb udb6; - #endif - - DEBUGMSGTL(("mibII/ipv6", "var_udp6: ")); - DEBUGMSGOID(("mibII/ipv6", name, *length)); - DEBUGMSG(("mibII/ipv6", " %d\n", exact)); - --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -+#if OS_NET_BSD_16_OR_LATER - if (!auto_nlist("udbtable", (char *) &udbtable, sizeof(udbtable))) - return NULL; - first = p = (caddr_t)udbtable.inpt_queue.cqh_first; --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#elif OS_NOT_FREEBSD_NOR_DARWIN - if (!auto_nlist("udb6", (char *) &udb6, sizeof(udb6))) - return NULL; - p = (caddr_t) udb6.in6p_next; -@@ -1283,9 +1299,10 @@ - (int) vp->namelen * sizeof(oid)); - DEBUGMSGTL(("mibII/ipv6", "start: p=%x\n", p)); - while ( --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -+#if OS_NET_BSD_16_OR_LATER - p && p != first --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#elif OS_NOT_FREEBSD_NOR_DARWIN -+ - p && (u_long) p != auto_nlist_value("udb6") - #else - xig->xig_len > sizeof(struct xinpgen) -@@ -1293,31 +1310,32 @@ - ) { - DEBUGMSGTL(("mibII/ipv6", "looping: p=%x\n", p)); - --#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -- if (!NETSNMP_KLOOKUP(p, (char *) &in6pcb, sizeof(in6pcb))) { -+#if OS_NOT_FREEBSD_NOR_DARWIN -+ if (!NETSNMP_KLOOKUP(p, (char *) &tstpcb, sizeof(tstpcb))) { - DEBUGMSGTL(("mibII/ipv6", "klookup fail for udb6 at %x\n", - p)); - found = 0; - break; - } - #else -- in6pcb = ((struct xinpcb *) xig)->xi_inp; -+ tstpcb = ((struct xinpcb *) xig)->xi_inp; - #endif --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -- if (in6pcb.in6p_af != AF_INET6) -+#if OS_NET_BSD_16_OR_LATER -+ if (tstpcb.in6p_af != AF_INET6) { -+ p = (caddr_t)tstpcb.in6p_queue.cqe_next; - goto skip; --#elif (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -- if (0 == (in6pcb.inp_vflag & INP_IPV6)) -+#elif OS_FREEBSD_OR_DARWIN -+ if (0 == (tstpcb.inp_vflag & INP_IPV6PROTO)) - goto skip; - #endif - - j = (int) vp->namelen; - for (i = 0; i < sizeof(struct in6_addr); i++) -- newname[j++] = in6pcb.in6p_laddr.s6_addr[i]; -- newname[j++] = ntohs(in6pcb.in6p_lport); -- if (IN6_IS_ADDR_LINKLOCAL(&in6pcb.in6p_laddr)) -+ newname[j++] = tstpcb.in6p_laddr.s6_addr[i]; -+ newname[j++] = ntohs(tstpcb.in6p_lport); -+ if (IN6_IS_ADDR_LINKLOCAL(&tstpcb.in6p_laddr)) - newname[j++] = -- ntohs(*(uint16_t *) & in6pcb.in6p_laddr.s6_addr[2]); -+ ntohs(*(uint16_t *) & tstpcb.in6p_laddr.s6_addr[2]); - else - newname[j++] = 0; - /*XXX*/ -@@ -1328,7 +1346,7 @@ - - result = snmp_oid_compare(name, *length, newname, j); - if (exact && (result == 0)) { -- memcpy(&savpcb, &in6pcb, sizeof(savpcb)); -+ memcpy(&savpcb, &tstpcb, sizeof(savpcb)); - savnameLen = j; - memcpy(savname, newname, j * sizeof(oid)); - found++; -@@ -1339,7 +1357,7 @@ - */ - if ((savnameLen == 0) || - (snmp_oid_compare(savname, savnameLen, newname, j) > 0)) { -- memcpy(&savpcb, &in6pcb, sizeof(savpcb)); -+ memcpy(&savpcb, &tstpcb, sizeof(savpcb)); - savnameLen = j; - memcpy(savname, newname, j * sizeof(oid)); - found++; -@@ -1347,15 +1365,15 @@ - } - - skip: --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -- p = (caddr_t)in6pcb.in6p_queue.cqe_next; --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -- p = (caddr_t) in6pcb.in6p_next; -+#if OS_NET_BSD_16_OR_LATER -+ p = (caddr_t)tstpcb.in6p_queue.cqe_next; -+#elif OS_NOT_FREEBSD_NOR_DARWIN -+ p = (caddr_t) tstpcb.in6p_next; - #else - xig = (struct xinpgen *) ((char *) xig + xig->xig_len); - #endif - } --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if OS_FREEBSD_OR_DARWIN - free(sysctl_buf); - #endif - DEBUGMSGTL(("mibII/ipv6", "found=%d\n", found)); -@@ -1363,7 +1381,7 @@ - return NULL; - *length = savnameLen; - memcpy((char *) name, (char *) savname, *length * sizeof(oid)); -- memcpy(&in6pcb, &savpcb, sizeof(savpcb)); -+ memcpy(&tstpcb, &savpcb, sizeof(savpcb)); - *write_method = 0; - *var_len = sizeof(long); /* default to 'long' results */ - -@@ -1376,14 +1394,14 @@ - switch (vp->magic) { - case IPV6UDPLOCALADDRESS: - *var_len = sizeof(struct in6_addr); -- return in6pcb.in6p_laddr.s6_addr; -+ return savpcb.in6p_laddr.s6_addr; - case IPV6UDPLOCALPORT: -- long_return = ntohs(in6pcb.in6p_lport); -+ long_return = ntohs(savpcb.in6p_lport); - return (u_char *) & long_return; - case IPV6UDPIFINDEX: -- if (IN6_IS_ADDR_LINKLOCAL(&in6pcb.in6p_laddr)) -+ if (IN6_IS_ADDR_LINKLOCAL(&savpcb.in6p_laddr)) - long_return = -- ntohs(*(uint16_t *) & in6pcb.in6p_laddr.s6_addr[2]); -+ ntohs(*(uint16_t *) & savpcb.in6p_laddr.s6_addr[2]); - else - long_return = 0; - /*XXX*/ return (u_char *) & long_return; -@@ -1401,24 +1419,24 @@ - size_t * length, - int exact, size_t * var_len, WriteMethod ** write_method) - { -- oid newname[MAX_OID_LEN]; -- oid savname[MAX_OID_LEN]; -+ oid newname[MAX_OID_LEN], savname[MAX_OID_LEN]; - int result; - int i, j; - caddr_t p; -- static struct in6pcb in6pcb, savpcb; -+ static struct in6pcb tstpcb, savpcb; - struct tcp6cb tcp6cb; - int found, savnameLen; - static int tcp6statemap[TCP6_NSTATES]; - static int initialized = 0; --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -+#if OS_NOT_FREEBSD_NOR_DARWIN -+ static struct in6pcb tcb6; -+#endif -+#if OS_NET_BSD_16_OR_LATER - struct inpcbtable tcbtable; - caddr_t first; --#elif (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#elif OS_FREEBSD_OR_DARWIN - char *sysctl_buf; - struct xinpgen *xig, *oxig; --#else -- static struct in6pcb tcb6; - #endif - - if (!initialized) { -@@ -1440,11 +1458,11 @@ - DEBUGMSGOID(("mibII/ipv6", name, *length)); - DEBUGMSG(("mibII/ipv6", " %d\n", exact)); - --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -+#if OS_NET_BSD_16_OR_LATER - if (!auto_nlist("tcbtable", (char *) &tcbtable, sizeof(tcbtable))) - return NULL; - first = p = (caddr_t)tcbtable.inpt_queue.cqh_first; --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#elif OS_NOT_FREEBSD_NOR_DARWIN - if (!auto_nlist("tcb6", (char *) &tcb6, sizeof(tcb6))) - return NULL; - p = (caddr_t) tcb6.in6p_next; -@@ -1473,9 +1491,10 @@ - (int) vp->namelen * sizeof(oid)); - DEBUGMSGTL(("mibII/ipv6", "start: p=%x\n", p)); - while ( --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -+#if OS_NET_BSD_16_OR_LATER - p && p != first --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#elif OS_NOT_FREEBSD_NOR_DARWIN -+ - p && (u_long) p != auto_nlist_value("tcb6") - #else - xig->xig_len > sizeof(struct xinpgen) -@@ -1483,39 +1502,39 @@ - ) { - DEBUGMSGTL(("mibII/ipv6", "looping: p=%x\n", p)); - --#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -- if (!NETSNMP_KLOOKUP(p, (char *) &in6pcb, sizeof(in6pcb))) { -+#if OS_NOT_FREEBSD_NOR_DARWIN -+ if (!NETSNMP_KLOOKUP(p, (char *) &tstpcb, sizeof(tstpcb))) { - DEBUGMSGTL(("mibII/ipv6", "klookup fail for tcb6 at %x\n", - p)); - found = 0; - break; - } - #else -- in6pcb = ((struct xinpcb *) xig)->xi_inp; -+ tstpcb = ((struct xinpcb *) xig)->xi_inp; - #endif --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -- if (in6pcb.in6p_af != AF_INET6) -+#if OS_NET_BSD_16_OR_LATER -+ if (tstpcb.in6p_af != AF_INET6) - goto skip; --#elif (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -- if (0 == (in6pcb.inp_vflag & INP_IPV6)) -+#elif OS_FREEBSD_OR_DARWIN -+ if (0 == (tstpcb.inp_vflag & INP_IPV6)) - goto skip; - #endif -- if (!NETSNMP_KLOOKUP(in6pcb.in6p_ppcb, (char *) &tcp6cb, sizeof(tcp6cb))) { -+ if (!NETSNMP_KLOOKUP(tstpcb.in6p_ppcb, (char *) &tcp6cb, sizeof(tcp6cb))) { - DEBUGMSGTL(("mibII/ipv6", "klookup fail for tcb6.tcp6cb at %x\n", -- in6pcb.in6p_ppcb)); -+ tstpcb.in6p_ppcb)); - found = 0; - break; - } - j = (int) vp->namelen; - for (i = 0; i < sizeof(struct in6_addr); i++) -- newname[j++] = in6pcb.in6p_laddr.s6_addr[i]; -- newname[j++] = ntohs(in6pcb.in6p_lport); -+ newname[j++] = tstpcb.in6p_laddr.s6_addr[i]; -+ newname[j++] = ntohs(tstpcb.in6p_lport); - for (i = 0; i < sizeof(struct in6_addr); i++) -- newname[j++] = in6pcb.in6p_faddr.s6_addr[i]; -- newname[j++] = ntohs(in6pcb.in6p_fport); -- if (IN6_IS_ADDR_LINKLOCAL(&in6pcb.in6p_laddr)) -+ newname[j++] = tstpcb.in6p_faddr.s6_addr[i]; -+ newname[j++] = ntohs(tstpcb.in6p_fport); -+ if (IN6_IS_ADDR_LINKLOCAL(&tstpcb.in6p_laddr)) - newname[j++] = -- ntohs(*(uint16_t *) & in6pcb.in6p_laddr.s6_addr[2]); -+ ntohs(*(uint16_t *) & tstpcb.in6p_laddr.s6_addr[2]); - else - newname[j++] = 0; - /*XXX*/ newname[j++] = tcp6statemap[tcp6cb.t_state]; -@@ -1526,13 +1545,13 @@ - DEBUGMSG(("mibII/ipv6", " %d\n", exact)); - - #if 1 /* this is very odd but sometimes happen, and cause infinite loop */ -- if (ntohs(in6pcb.in6p_lport) == 0) -+ if (ntohs(tstpcb.in6p_lport) == 0) - goto skip; - #endif - - result = snmp_oid_compare(name, *length, newname, j); - if (exact && (result == 0)) { -- memcpy(&savpcb, &in6pcb, sizeof(savpcb)); -+ memcpy(&savpcb, &tstpcb, sizeof(savpcb)); - savnameLen = j; - memcpy(savname, newname, j * sizeof(oid)); - found++; -@@ -1543,7 +1562,7 @@ - */ - if ((savnameLen == 0) || - (snmp_oid_compare(savname, savnameLen, newname, j) > 0)) { -- memcpy(&savpcb, &in6pcb, sizeof(savpcb)); -+ memcpy(&savpcb, &tstpcb, sizeof(savpcb)); - savnameLen = j; - memcpy(savname, newname, j * sizeof(oid)); - found++; -@@ -1551,15 +1570,15 @@ - } - - skip: --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -- p = (caddr_t)in6pcb.in6p_queue.cqe_next; --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -- p = (caddr_t) in6pcb.in6p_next; -+#if OS_NET_BSD_16_OR_LATER -+ p = (caddr_t)tstpcb.in6p_queue.cqe_next; -+#elif OS_NOT_FREEBSD_NOR_DARWIN -+ p = (caddr_t) tstpcb.in6p_next; - #else - xig = (struct xinpgen *) ((char *) xig + xig->xig_len); - #endif - } --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if OS_FREEBSD_OR_DARWIN - free(sysctl_buf); - #endif - DEBUGMSGTL(("mibII/ipv6", "found=%d\n", found)); -@@ -1580,20 +1599,20 @@ - switch (vp->magic) { - case IPV6TCPLOCALADDR: - *var_len = sizeof(struct in6_addr); -- return (u_char *) & in6pcb.in6p_laddr.s6_addr[0]; -+ return (u_char *) & savpcb.in6p_laddr.s6_addr[0]; - case IPV6TCPLOCALPORT: -- long_return = ntohs(in6pcb.in6p_lport); -+ long_return = ntohs(savpcb.in6p_lport); - return (u_char *) & long_return; - case IPV6TCPREMOTEADDR: - *var_len = sizeof(struct in6_addr); -- return (u_char *) & in6pcb.in6p_faddr.s6_addr[0]; -+ return (u_char *) & savpcb.in6p_faddr.s6_addr[0]; - case IPV6TCPREMOTEPORT: -- long_return = ntohs(in6pcb.in6p_fport); -+ long_return = ntohs(savpcb.in6p_fport); - return (u_char *) & long_return; - case IPV6TCPIFINDEX: -- if (IN6_IS_ADDR_LINKLOCAL(&in6pcb.in6p_laddr)) -+ if (IN6_IS_ADDR_LINKLOCAL(&savpcb.in6p_laddr)) - long_return = -- ntohs(*(uint16_t *) & in6pcb.in6p_laddr.s6_addr[2]); -+ ntohs(*(uint16_t *) & savpcb.in6p_laddr.s6_addr[2]); - else - long_return = 0; - /*XXX*/ return (u_char *) & long_return; -@@ -1640,22 +1659,23 @@ - size_t * length, - int exact, size_t * var_len, WriteMethod ** write_method) - { -- oid newname[MAX_OID_LEN]; -- oid savname[MAX_OID_LEN]; -+ oid newname[MAX_OID_LEN], savname[MAX_OID_LEN]; - int result; - int i, j; - caddr_t p; -- static struct in6pcb in6pcb, savpcb; -+ static struct in6pcb tstpcb, savpcb; - struct tcpcb tcpcb; - int found, savnameLen; --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -+#if OS_NOT_FREEBSD_NOR_DARWIN -+ static struct in6pcb tcb6; -+#endif -+#if OS_NET_BSD_16_OR_LATER - struct inpcbtable tcbtable; - caddr_t first; --#elif (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#endif -+#if OS_FREEBSD_OR_DARWIN - char *sysctl_buf; - struct xinpgen *xig, *oxig; --#else -- static struct in6pcb tcb6; - #endif - - DEBUGMSGTL(("mibII/ipv6", "var_tcp6: ")); -@@ -1695,9 +1715,9 @@ - (int) vp->namelen * sizeof(oid)); - DEBUGMSGTL(("mibII/ipv6", "start: p=%x\n", p)); - while ( --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -+#if OS_NET_BSD_16_OR_LATER - p && p != first --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -+#elif OS_NOT_FREEBSD_NOR_DARWIN - p && (u_long) p != auto_nlist_value("tcb6") - #else - xig->xig_len > sizeof(struct xinpgen) -@@ -1705,39 +1725,39 @@ - ) { - DEBUGMSGTL(("mibII/ipv6", "looping: p=%x\n", p)); - --#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -- if (!NETSNMP_KLOOKUP(p, (char *) &in6pcb, sizeof(in6pcb))) { -+#if OS_NOT_FREEBSD_NOR_DARWIN -+ if (!NETSNMP_KLOOKUP(p, (char *) &tstpcb, sizeof(tstpcb))) { - DEBUGMSGTL(("mibII/ipv6", "klookup fail for tcb6 at %x\n", - p)); - found = 0; - break; - } - #else -- in6pcb = ((struct xinpcb *) xig)->xi_inp; -+ tstpcb = ((struct xinpcb *) xig)->xi_inp; - #endif --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -- if (in6pcb.in6p_af != AF_INET6) -+#if OS_NET_BSD_16_OR_LATER -+ if (tstpcb.in6p_af != AF_INET6) - goto skip; --#elif (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -- if (0 == (in6pcb.inp_vflag & INP_IPV6)) -+#elif OS_FREEBSD_OR_DARWIN -+ if (0 == (tstpcb.inp_vflag & INP_IPV6)) - goto skip; - #endif -- if (!NETSNMP_KLOOKUP(in6pcb.in6p_ppcb, (char *) &tcpcb, sizeof(tcpcb))) { -+ if (!NETSNMP_KLOOKUP(tstpcb.in6p_ppcb, (char *) &tcpcb, sizeof(tcpcb))) { - DEBUGMSGTL(("mibII/ipv6", "klookup fail for tcb6.tcpcb at %x\n", -- in6pcb.in6p_ppcb)); -+ tstpcb.in6p_ppcb)); - found = 0; - break; - } - j = (int) vp->namelen; - for (i = 0; i < sizeof(struct in6_addr); i++) -- newname[j++] = in6pcb.in6p_laddr.s6_addr[i]; -- newname[j++] = ntohs(in6pcb.in6p_lport); -+ newname[j++] = tstpcb.in6p_laddr.s6_addr[i]; -+ newname[j++] = ntohs(tstpcb.in6p_lport); - for (i = 0; i < sizeof(struct in6_addr); i++) -- newname[j++] = in6pcb.in6p_faddr.s6_addr[i]; -- newname[j++] = ntohs(in6pcb.in6p_fport); -- if (IN6_IS_ADDR_LINKLOCAL(&in6pcb.in6p_laddr)) -+ newname[j++] = tstpcb.in6p_faddr.s6_addr[i]; -+ newname[j++] = ntohs(tstpcb.in6p_fport); -+ if (IN6_IS_ADDR_LINKLOCAL(&tstpcb.in6p_laddr)) - newname[j++] = -- ntohs(*(uint16_t *) & in6pcb.in6p_laddr.s6_addr[2]); -+ ntohs(*(uint16_t *) & tstpcb.in6p_laddr.s6_addr[2]); - else - newname[j++] = 0; - /*XXX*/ newname[j++] = mapTcpState((int)tcpcb.t_state); -@@ -1748,12 +1768,12 @@ - DEBUGMSG(("mibII/ipv6", " %d\n", exact)); - - #if 1 /* this is very odd but sometimes happen, and cause infinite loop */ -- if (ntohs(in6pcb.in6p_lport) == 0) -+ if (ntohs(tstpcb.in6p_lport) == 0) - goto skip; - #endif - result = snmp_oid_compare(name, *length, newname, j); - if (exact && (result == 0)) { -- memcpy(&savpcb, &in6pcb, sizeof(savpcb)); -+ memcpy(&savpcb, &tstpcb, sizeof(savpcb)); - savnameLen = j; - memcpy(savname, newname, j * sizeof(oid)); - found++; -@@ -1764,7 +1784,7 @@ - */ - if ((savnameLen == 0) || - (snmp_oid_compare(savname, savnameLen, newname, j) > 0)) { -- memcpy(&savpcb, &in6pcb, sizeof(savpcb)); -+ memcpy(&savpcb, &tstpcb, sizeof(savpcb)); - savnameLen = j; - memcpy(savname, newname, j * sizeof(oid)); - found++; -@@ -1772,15 +1792,15 @@ - } - - skip: --#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000 /*1.6Y*/ -- p = (caddr_t)in6pcb.in6p_queue.cqe_next; --#elif !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -- p = (caddr_t) in6pcb.in6p_next; -+#if OS_NET_BSD_16_OR_LATER -+ p = (caddr_t)tstpcb.in6p_queue.cqe_next; -+#elif OS_NOT_FREEBSD_NOR_DARWIN -+ p = (caddr_t) tstpcb.in6p_next; - #else - xig = (struct xinpgen *) ((char *) xig + xig->xig_len); - #endif - } --#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin) -+#if OS_FREEBSD_OR_DARWIN - free(sysctl_buf); - #endif - DEBUGMSGTL(("mibII/ipv6", "found=%d\n", found)); -@@ -1788,7 +1808,7 @@ - return NULL; - *length = savnameLen; - memcpy((char *) name, (char *) savname, *length * sizeof(oid)); -- memcpy(&in6pcb, &savpcb, sizeof(savpcb)); -+ memcpy(&tstpcb, &savpcb, sizeof(savpcb)); - *write_method = 0; - *var_len = sizeof(long); /* default to 'long' results */ - -@@ -1801,20 +1821,20 @@ - switch (vp->magic) { - case IPV6TCPLOCALADDR: - *var_len = sizeof(struct in6_addr); -- return (u_char *) & in6pcb.in6p_laddr.s6_addr[0]; -+ return (u_char *) & savpcb.in6p_laddr.s6_addr[0]; - case IPV6TCPLOCALPORT: -- long_return = ntohs(in6pcb.in6p_lport); -+ long_return = ntohs(savpcb.in6p_lport); - return (u_char *) & long_return; - case IPV6TCPREMOTEADDR: - *var_len = sizeof(struct in6_addr); -- return (u_char *) & in6pcb.in6p_faddr.s6_addr[0]; -+ return (u_char *) & savpcb.in6p_faddr.s6_addr[0]; - case IPV6TCPREMOTEPORT: -- long_return = ntohs(in6pcb.in6p_fport); -+ long_return = ntohs(savpcb.in6p_fport); - return (u_char *) & long_return; - case IPV6TCPIFINDEX: -- if (IN6_IS_ADDR_LINKLOCAL(&in6pcb.in6p_laddr)) -+ if (IN6_IS_ADDR_LINKLOCAL(&savpcb.in6p_laddr)) - long_return = -- ntohs(*(uint16_t *) & in6pcb.in6p_laddr.s6_addr[2]); -+ ntohs(*(uint16_t *) & savpcb.in6p_laddr.s6_addr[2]); - else - long_return = 0; - /*XXX*/ return (u_char *) & long_return; diff --git a/net-mgmt/net-snmp-devel/files/patch-keytools.c b/net-mgmt/net-snmp-devel/files/patch-keytools.c deleted file mode 100644 index b6bf51299bd9..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-keytools.c +++ /dev/null @@ -1,12 +0,0 @@ ---- snmplib/keytools.c.orig Tue Jan 25 10:17:48 2005 -+++ snmplib/keytools.c Tue Jan 25 10:18:07 2005 -@@ -32,6 +32,9 @@ - #include <strings.h> - #endif - -+#if HAVE_UNISTD_H -+#include <unistd.h> -+#endif - #if HAVE_DMALLOC_H - #include <dmalloc.h> - #endif diff --git a/net-mgmt/net-snmp-devel/files/patch-lcd_time.c b/net-mgmt/net-snmp-devel/files/patch-lcd_time.c deleted file mode 100644 index 60d00ac6a960..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-lcd_time.c +++ /dev/null @@ -1,12 +0,0 @@ ---- snmplib/lcd_time.c.orig Tue Jan 25 10:16:53 2005 -+++ snmplib/lcd_time.c Tue Jan 25 10:17:10 2005 -@@ -38,6 +38,9 @@ - #include <netinet/in.h> - #endif - -+#if HAVE_UNISTD_H -+#include <unistd.h> -+#endif - #if HAVE_DMALLOC_H - #include <dmalloc.h> - #endif diff --git a/net-mgmt/net-snmp-devel/files/patch-local:fixproc b/net-mgmt/net-snmp-devel/files/patch-local:fixproc deleted file mode 100644 index fa0f3fb65767..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-local:fixproc +++ /dev/null @@ -1,90 +0,0 @@ ---- local/fixproc.orig Wed May 25 01:23:54 2005 -+++ local/fixproc Wed Nov 30 12:16:05 2005 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -+#!%%PERL%% - # - # fixproc [-min n] [-max n] [-check | -kill | -restart | -exist | -fix] proc ... - # -@@ -131,7 +131,7 @@ - - use File::Temp qw(tempfile); - --$database_file = '/local/etc/fixproc.conf'; -+$database_file = '%%PREFIX%%/etc/fixproc.conf'; - - $debug = 0; # specify debug level using -dN - # currently defined: -d1 -@@ -157,6 +157,14 @@ - $shell_header = "#!/bin/sh\n"; - $shell_end_marker = 'shell_end_marker'; - -+open(command, "/bin/ps -p $$ |") || die "$0: can't run ps command\n"; -+if (split(' ', <command>) > 4) { -+ $ps_opts = 'ax'; -+} else { -+ $ps_opts = '-e'; -+} -+close command; -+ - &read_args(); - &read_database(); - # &dump_database(); # debug only -@@ -305,41 +313,47 @@ - - # first try kill - $! = $fixproc_error; -- open (COMMAND, "/bin/ps -e | /bin/grep $proc |") -+ open (COMMAND, "/bin/ps $ps_opts |") - || die "$0: can't run ps-grep-awk command\n"; - while (<COMMAND>) - { -- # match the first field of ps -e -+ if /$proc/ { -+ # match the first field of ps $ps_opts - $! = $fixproc_error; -- /^\s*(\d+)\s/ || die "$0: can't match ps -e output\n"; -- system "kill $1"; -+ /^\s*(\d+)\s/ || die "$0: can't match ps $ps_opts output\n"; -+ kill 15, $1; -+ } - } -+ close COMMAND; - - # if process still exist, try kill -9 - sleep 2; - $! = $fixproc_error; -- open (COMMAND, "/bin/ps -e | /bin/grep $proc |") -+ open (COMMAND, "/bin/ps $ps_opts |") - || die "$0: can't run ps-grep-awk command\n"; - $second_kill_needed = 0; - while (<COMMAND>) - { -- # match the first field of ps -e -+ if /$proc/ { -+ # match the first field of ps $ps_opts - $! = $fixproc_error; -- /^\s*(\d+)\s/ || die "$0: can't match ps -e output\n"; -- system "kill -9 $1"; -+ /^\s*(\d+)\s/ || die "$0: can't match ps $ps_opts output\n"; -+ kill 9, $1; - $second_kill_needed = 1; - } -+ close COMMAND; - return ($no_error) if ($second_kill_needed == 0); - - # see if kill -9 worked - sleep 2; - $! = $fixproc_error; -- open (COMMAND, "/bin/ps -e | /bin/grep $proc |") -+ open (COMMAND, "/bin/ps $ps_opts |") - || die "$0: can't run ps-grep-awk command\n"; - while (<COMMAND>) - { # a process still exist, return error -- return $cannot_kill_error; -+ return $cannot_kill_error if /$proc/; - } -+ close COMMAND; - return $no_error; # good, all dead - } - diff --git a/net-mgmt/net-snmp-devel/files/patch-local:ipf-mod.pl b/net-mgmt/net-snmp-devel/files/patch-local:ipf-mod.pl deleted file mode 100644 index 8bf98d4f1d52..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-local:ipf-mod.pl +++ /dev/null @@ -1,21 +0,0 @@ ---- local/ipf-mod.pl.orig Thu May 29 05:30:19 2003 -+++ local/ipf-mod.pl Thu May 29 05:40:13 2003 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -s -+#!%%PERL%% -s - ## - ## IP Filter UCD-SNMP pass module - ## -@@ -9,10 +9,10 @@ - ## Date: $ Tue Dec 1 10:24:08 EET 1998 $ - ## Version: 1.1a - --# Put this file in /usr/local/bin/ipf-mod.pl and then add the following -+# Put this file in %%PREFIX%%/bin/ipf-mod.pl and then add the following - # line to your snmpd.conf file (without the # at the front): - # --# pass .1.3.6.1.4.1.2021.13.2 /usr/local/bin/ipf-mod.pl -+# pass .1.3.6.1.4.1.2021.13.2 %%PREFIX%%/bin/ipf-mod.pl - - # enterprises.ucdavis.ucdExperimental.ipFilter = .1.3.6.1.4.1.2021.13.2 - # ipfInTable.ipfInEntry.ipfInIndex integer = 1.1.1 diff --git a/net-mgmt/net-snmp-devel/files/patch-local:mib2c b/net-mgmt/net-snmp-devel/files/patch-local:mib2c deleted file mode 100644 index a0a2ce336f86..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-local:mib2c +++ /dev/null @@ -1,21 +0,0 @@ ---- local/mib2c.orig Fri Sep 10 21:30:15 2004 -+++ local/mib2c Mon Oct 25 08:38:30 2004 -@@ -1,5 +1,4 @@ --#!/usr/bin/perl --#!/usr/bin/perl -w -+#!%%PERL%% - - # - # $Id: mib2c,v 5.57 2004/09/10 12:30:15 dts12 Exp $ -@@ -60,8 +59,9 @@ - if($ENV{MIB2C_DIR}) { - push @def_search_dirs, split(/:/, $ENV{MIB2C_DIR}); - } --push @def_search_dirs, "/usr/local/share/snmp/"; --push @def_search_dirs, "/usr/local/share/snmp/mib2c-data"; -+push @def_search_dirs, "%%PREFIX%%/share/snmp/"; -+push @def_search_dirs, "%%PREFIX%%/etc/snmp/"; -+push @def_search_dirs, "%%PREFIX%%/share/snmp/mib2c-data"; - push @def_search_dirs, "./mib2c-conf.d"; - - sub usage { diff --git a/net-mgmt/net-snmp-devel/files/patch-local:snmpcheck.def b/net-mgmt/net-snmp-devel/files/patch-local:snmpcheck.def deleted file mode 100644 index 4f3b4a2491da..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-local:snmpcheck.def +++ /dev/null @@ -1,8 +0,0 @@ ---- local/snmpcheck.def.orig Thu May 29 05:28:22 2003 -+++ local/snmpcheck.def Thu May 29 05:29:49 2003 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -w -+#!%%PERL%% -w - - use strict 'refs'; - require Net::Ping; diff --git a/net-mgmt/net-snmp-devel/files/patch-local:snmpconf b/net-mgmt/net-snmp-devel/files/patch-local:snmpconf deleted file mode 100644 index f2a0b11cf75e..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-local:snmpconf +++ /dev/null @@ -1,35 +0,0 @@ ---- local/snmpconf.orig Sun Aug 21 10:23:23 2005 -+++ local/snmpconf Wed Nov 30 12:19:42 2005 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -w -+#!%%PERL%% -w - - # - # A simple configuration file builder based on questions listed in -@@ -31,7 +31,7 @@ - $opts{'c'} = &my_getenv("SNMPSHAREPATH") . "/snmpconf-data"; - } - else { -- $opts{'c'} = "/usr/local/share/snmp/snmpconf-data"; -+ $opts{'c'} = "%%PREFIX%%/share/snmp/snmpconf-data"; - } - - # default config file path -@@ -39,7 +39,7 @@ - $confpath = &my_getenv("SNMPCONFPATH"); - } - else { -- $confpath = "/usr/local/share/snmp"; -+ $confpath = "%%PREFIX%%/share/snmp"; - } - - # home environment variable -@@ -100,7 +100,7 @@ - $ENV_SEPARATOR = ';'; - } - my @searchpath = split(/$ENV_SEPARATOR/, $confpath); --push @searchpath, "/usr/local/etc/snmp"; -+push @searchpath, "%%PREFIX%%/etc/snmp"; - push @searchpath, "."; - push @searchpath, "$home"; - diff --git a/net-mgmt/net-snmp-devel/files/patch-local:tkmib b/net-mgmt/net-snmp-devel/files/patch-local:tkmib deleted file mode 100644 index 3278d27c3809..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-local:tkmib +++ /dev/null @@ -1,9 +0,0 @@ ---- local/tkmib.orig Thu May 29 05:30:19 2003 -+++ local/tkmib Thu May 29 05:31:46 2003 -@@ -1,5 +1,4 @@ --#!/usr/bin/perl --#!/usr/bin/perl -w -+#!%%PERL%% -w - - require 5; - diff --git a/net-mgmt/net-snmp-devel/files/patch-local:traptoemail b/net-mgmt/net-snmp-devel/files/patch-local:traptoemail deleted file mode 100644 index 402506b540c6..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-local:traptoemail +++ /dev/null @@ -1,16 +0,0 @@ ---- local/traptoemail.orig Thu May 29 05:30:19 2003 -+++ local/traptoemail Thu May 29 05:35:13 2003 -@@ -1,11 +1,11 @@ --#!/usr/bin/perl -+#!%%PERL%% - - # This is a snmptrapd handler script to convert snmp traps into email - # messages. - - # Usage: - # Put a line like the following in your snmptrapd.conf file: --# traphandle TRAPOID|default /usr/local/bin/traptoemail [-f FROM] [-s SMTPSERVER]b ADDRESSES -+# traphandle TRAPOID|default %%PREFIX%%/bin/traptoemail [-f FROM] [-s SMTPSERVER]b ADDRESSES - # FROM defaults to "root" - # SMTPSERVER defaults to "localhost" - diff --git a/net-mgmt/net-snmp-devel/files/patch-memory_freebsd.c b/net-mgmt/net-snmp-devel/files/patch-memory_freebsd.c deleted file mode 100644 index 1f996ad6edf2..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-memory_freebsd.c +++ /dev/null @@ -1,53 +0,0 @@ ---- agent/mibgroup/hardware/memory/memory_freebsd.c.orig 2006-03-07 01:23:52.000000000 +0900 -+++ agent/mibgroup/hardware/memory/memory_freebsd.c 2008-08-24 23:35:12.857234897 +0900 -@@ -47,6 +47,9 @@ - int phys_mem_mib[] = { CTL_HW, HW_PHYSMEM }; - int user_mem_mib[] = { CTL_HW, HW_USERMEM }; - -+ long bufspace; -+ -+ - /* - * Retrieve the memory information from the underlying O/S... - */ -@@ -54,6 +57,7 @@ - sysctl(phys_mem_mib, 2, &phys_mem, &mem_size, NULL, 0); - sysctl(user_mem_mib, 2, &user_mem, &mem_size, NULL, 0); - auto_nlist(SUM_SYMBOL, (char *) &vmem, sizeof(vmem)); -+ auto_nlist(BUFSPACE_SYMBOL, (char *) &bufspace, sizeof(bufspace)); - #ifndef freebsd4 - pagesize = 1024; - #else -@@ -70,7 +74,7 @@ - if (!mem->descr) - mem->descr = strdup("Physical memory"); - mem->units = pagesize; -- mem->size = user_mem/pagesize; -+ mem->size = phys_mem/pagesize; - mem->free = total.t_free; - } - -@@ -125,10 +129,22 @@ - if (!mem->descr) - mem->descr = strdup("Cached memory"); - mem->units = vmem.v_page_size; -- mem->size = vmem.v_cache_count; -+ mem->size = vmem.v_cache_count + vmem.v_inactive_count; -+ mem->free = -1; -+ } -+ -+ mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_MBUF, 1 ); -+ if (!mem) { -+ snmp_log_perror("No Memory Buffer info entry"); -+ } else { -+ if (!mem->descr) -+ mem->descr = strdup("Memory Buffer"); -+ mem->units = pagesize; -+ mem->size = bufspace/pagesize; - mem->free = -1; - } - -+ - nswap = swapmode(pagesize); - mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_SWAP, 1 ); - if (!mem) { diff --git a/net-mgmt/net-snmp-devel/files/patch-mib.c b/net-mgmt/net-snmp-devel/files/patch-mib.c deleted file mode 100644 index af73abff4101..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-mib.c +++ /dev/null @@ -1,12 +0,0 @@ ---- snmplib/mib.c.orig Tue Jan 25 10:01:11 2005 -+++ snmplib/mib.c Tue Jan 25 10:02:02 2005 -@@ -75,6 +75,9 @@ - #include <winsock.h> - #endif - -+#if HAVE_UNISTD_H -+#include <unistd.h> -+#endif - #if HAVE_DMALLOC_H - #include <dmalloc.h> - #endif diff --git a/net-mgmt/net-snmp-devel/files/patch-net-snmp-config.h.in b/net-mgmt/net-snmp-devel/files/patch-net-snmp-config.h.in deleted file mode 100644 index ad6a26dc319e..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-net-snmp-config.h.in +++ /dev/null @@ -1,11 +0,0 @@ ---- include/net-snmp/net-snmp-config.h.in.orig 2007-07-20 06:00:35.000000000 +0900 -+++ include/net-snmp/net-snmp-config.h.in 2008-03-26 07:45:24.236908694 +0900 -@@ -1561,7 +1561,7 @@ - - #define NETSNMP_EXCACHETIME 30 - #define NETSNMP_CACHEFILE ".snmp-exec-cache" --#define NETSNMP_MAXCACHESIZE (200*80) /* roughly 200 lines max */ -+#define NETSNMP_MAXCACHESIZE (1500*80) /* roughly 1500 lines max */ - - /* misc defaults */ - diff --git a/net-mgmt/net-snmp-devel/files/patch-net-snmp-includes.h b/net-mgmt/net-snmp-devel/files/patch-net-snmp-includes.h deleted file mode 100644 index cfb1dd29e981..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-net-snmp-includes.h +++ /dev/null @@ -1,13 +0,0 @@ ---- include/net-snmp/net-snmp-includes.h.orig Mon Jan 24 08:24:47 2005 -+++ include/net-snmp/net-snmp-includes.h Mon Jan 24 08:25:11 2005 -@@ -49,6 +49,10 @@ - # endif - #endif - -+#if HAVE_UNISTD_H -+#include <unistd.h> -+#endif -+ - /* - * Must be right after system headers, but before library code for best usage - */ diff --git a/net-mgmt/net-snmp-devel/files/patch-parse.c b/net-mgmt/net-snmp-devel/files/patch-parse.c deleted file mode 100644 index 63eb1e023f19..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-parse.c +++ /dev/null @@ -1,12 +0,0 @@ ---- snmplib/parse.c.orig Tue Jan 25 10:04:35 2005 -+++ snmplib/parse.c Tue Jan 25 10:05:02 2005 -@@ -106,6 +106,9 @@ - #if defined(HAVE_REGEX_H) && defined(HAVE_REGCOMP) - #include <regex.h> - #endif -+#if HAVE_UNISTD_H -+#include <unistd.h> -+#endif - #if HAVE_DMALLOC_H - #include <dmalloc.h> - #endif diff --git a/net-mgmt/net-snmp-devel/files/patch-scapi.c b/net-mgmt/net-snmp-devel/files/patch-scapi.c deleted file mode 100644 index 2d6711989e35..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-scapi.c +++ /dev/null @@ -1,12 +0,0 @@ ---- snmplib/scapi.c.orig Tue Jan 25 10:18:44 2005 -+++ snmplib/scapi.c Tue Jan 25 10:19:01 2005 -@@ -46,6 +46,9 @@ - #include <netinet/in.h> - #endif - -+#if HAVE_UNISTD_H -+#include <unistd.h> -+#endif - #if HAVE_DMALLOC_H - #include <dmalloc.h> - #endif diff --git a/net-mgmt/net-snmp-devel/files/patch-snmpTCPIPv6Domain.c b/net-mgmt/net-snmp-devel/files/patch-snmpTCPIPv6Domain.c deleted file mode 100644 index 570f9bb9347f..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-snmpTCPIPv6Domain.c +++ /dev/null @@ -1,35 +0,0 @@ -Index: snmplib/snmpTCPIPv6Domain.c -diff -u -p snmplib/snmpTCPIPv6Domain.c.orig snmplib/snmpTCPIPv6Domain.c ---- snmplib/snmpTCPIPv6Domain.c.orig Fri Sep 16 19:30:49 2005 -+++ snmplib/snmpTCPIPv6Domain.c Fri Jan 11 13:40:09 2008 -@@ -96,13 +96,24 @@ netsnmp_tcp6_fmtaddr(netsnmp_transport * - if (to == NULL) { - return strdup("TCP/IPv6: unknown"); - } else { -- char addr[INET6_ADDRSTRLEN]; -- char tmp[INET6_ADDRSTRLEN + 8]; -+ char addr[NI_MAXHOST], tmp[NI_MAXHOST + NI_MAXSERV + 12]; - -- sprintf(tmp, "TCP/IPv6: [%s]:%hd", -- inet_ntop(AF_INET6, (void *) &(to->sin6_addr), addr, -- INET6_ADDRSTRLEN), ntohs(to->sin6_port)); -- return strdup(tmp); -+/* -+ * NI_WITHSCOPEID will be obsoleted. But some implementations require -+ * this flag to retrieve scoped name. -+ * (2002-07-25: kuriyama@FreeBSD.org) -+ */ -+#ifndef NI_WITHSCOPEID -+#define NI_WITHSCOPEID 0 -+#endif -+ if (getnameinfo((struct sockaddr *)to, sizeof(struct sockaddr_in6), -+ addr, sizeof(addr), NULL, 0, -+ NI_NUMERICHOST | NI_WITHSCOPEID)) { -+ return strdup("UDP/IPv6: unknown"); -+ } -+ snprintf(tmp, sizeof(tmp), "TCP/IPv6: [%s]:%hd", addr, -+ ntohs(to->sin6_port)); -+ return strdup(tmp); - } - } - diff --git a/net-mgmt/net-snmp-devel/files/patch-snmpUCDIPv6Domain.c b/net-mgmt/net-snmp-devel/files/patch-snmpUCDIPv6Domain.c deleted file mode 100644 index ad98e534bdf2..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-snmpUCDIPv6Domain.c +++ /dev/null @@ -1,33 +0,0 @@ ---- snmplib/snmpUDPIPv6Domain.c.orig 2007-06-11 07:22:55.000000000 +0900 -+++ snmplib/snmpUDPIPv6Domain.c 2008-03-26 07:47:55.942743517 +0900 -@@ -109,13 +109,24 @@ - if (to == NULL) { - return strdup("UDP/IPv6: unknown"); - } else { -- char addr[INET6_ADDRSTRLEN]; -- char tmp[INET6_ADDRSTRLEN + 8]; -+ char addr[NI_MAXHOST], tmp[NI_MAXHOST + NI_MAXSERV + 12]; - -- sprintf(tmp, "UDP/IPv6: [%s]:%hu", -- inet_ntop(AF_INET6, (void *) &(to->sin6_addr), addr, -- INET6_ADDRSTRLEN), ntohs(to->sin6_port)); -- return strdup(tmp); -+/* -+ * NI_WITHSCOPEID will be obsoleted. But some implementations require -+ * this flag to retrieve scoped name. -+ * (2002-07-25: kuriyama@FreeBSD.org) -+ */ -+#ifndef NI_WITHSCOPEID -+#define NI_WITHSCOPEID 0 -+#endif -+ if (getnameinfo((struct sockaddr *)to, sizeof(struct sockaddr_in6), -+ addr, sizeof(addr), NULL, 0, -+ NI_NUMERICHOST | NI_WITHSCOPEID)) { -+ return strdup("UDP/IPv6: unknown"); -+ } -+ snprintf(tmp, sizeof(tmp), "UDP/IPv6: [%s]:%hu", addr, -+ ntohs(to->sin6_port)); -+ return strdup(tmp); - } - } - diff --git a/net-mgmt/net-snmp-devel/files/patch-snmp_agent.c b/net-mgmt/net-snmp-devel/files/patch-snmp_agent.c deleted file mode 100644 index 6428559eb68b..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-snmp_agent.c +++ /dev/null @@ -1,13 +0,0 @@ -Index: agent/snmp_agent.c -diff -u -p agent/snmp_agent.c.orig agent/snmp_agent.c ---- agent/snmp_agent.c.orig Thu Aug 16 22:31:40 2007 -+++ agent/snmp_agent.c Fri Jan 11 13:06:27 2008 -@@ -819,7 +819,7 @@ netsnmp_agent_check_packet(netsnmp_sessi - } - #ifdef USE_LIBWRAP - /* Catch udp,udp6,tcp,tcp6 transports using "[" */ -- tcpudpaddr = strstr(addr_string, "["); -+ tcpudpaddr = strrchr(addr_string, '['); - if ( tcpudpaddr != 0 ) { - char sbuf[64]; - char *xp; diff --git a/net-mgmt/net-snmp-devel/files/patch-snmp_auth.c b/net-mgmt/net-snmp-devel/files/patch-snmp_auth.c deleted file mode 100644 index be52a5e4fd36..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-snmp_auth.c +++ /dev/null @@ -1,12 +0,0 @@ ---- snmplib/snmp_auth.c.orig Tue Jan 25 10:08:14 2005 -+++ snmplib/snmp_auth.c Tue Jan 25 10:08:34 2005 -@@ -63,6 +63,9 @@ - #include <arpa/inet.h> - #endif - -+#if HAVE_UNISTD_H -+#include <unistd.h> -+#endif - #if HAVE_DMALLOC_H - #include <dmalloc.h> - #endif diff --git a/net-mgmt/net-snmp-devel/files/patch-snmp_debug.c b/net-mgmt/net-snmp-devel/files/patch-snmp_debug.c deleted file mode 100644 index 6b24b5354b77..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-snmp_debug.c +++ /dev/null @@ -1,12 +0,0 @@ ---- snmplib/snmp_debug.c.orig Tue Jan 25 10:10:49 2005 -+++ snmplib/snmp_debug.c Tue Jan 25 10:11:06 2005 -@@ -22,6 +22,9 @@ - #include <winsock.h> - #endif - -+#if HAVE_UNISTD_H -+#include <unistd.h> -+#endif - #if HAVE_DMALLOC_H - #include <dmalloc.h> - #endif diff --git a/net-mgmt/net-snmp-devel/files/patch-snmp_logging.c b/net-mgmt/net-snmp-devel/files/patch-snmp_logging.c deleted file mode 100644 index f66b33d0dd6e..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-snmp_logging.c +++ /dev/null @@ -1,12 +0,0 @@ ---- snmplib/snmp_logging.c.orig Tue Jan 25 10:14:41 2005 -+++ snmplib/snmp_logging.c Tue Jan 25 10:15:05 2005 -@@ -65,6 +65,9 @@ - #include <varargs.h> - #endif - -+#if HAVE_UNISTD_H -+#include <unistd.h> -+#endif - #if HAVE_DMALLOC_H - #include <dmalloc.h> - #endif diff --git a/net-mgmt/net-snmp-devel/files/patch-snmp_transport.c b/net-mgmt/net-snmp-devel/files/patch-snmp_transport.c deleted file mode 100644 index e1ae87834fe9..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-snmp_transport.c +++ /dev/null @@ -1,12 +0,0 @@ ---- snmplib/snmp_transport.c.orig Tue Jan 25 10:21:33 2005 -+++ snmplib/snmp_transport.c Tue Jan 25 10:21:52 2005 -@@ -12,6 +12,9 @@ - #include <stdlib.h> - #endif - -+#if HAVE_UNISTD_H -+#include <unistd.h> -+#endif - #if HAVE_DMALLOC_H - #include <dmalloc.h> - #endif diff --git a/net-mgmt/net-snmp-devel/files/patch-snmpusm.c b/net-mgmt/net-snmp-devel/files/patch-snmpusm.c deleted file mode 100644 index 4eae56c1a0f0..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-snmpusm.c +++ /dev/null @@ -1,21 +0,0 @@ ---- snmplib/snmpusm.c.orig Thu Sep 16 07:57:47 2004 -+++ snmplib/snmpusm.c Tue Jan 25 10:23:02 2005 -@@ -54,6 +54,9 @@ - #include <netinet/in.h> - #endif - -+#if HAVE_UNISTD_H -+#include <unistd.h> -+#endif - #if HAVE_DMALLOC_H - #include <dmalloc.h> - #endif -@@ -89,6 +92,8 @@ - oid usmAESPrivProtocol[10] = { 1, 3, 6, 1, 6, 3, 10, 1, 2, 4 }; - /* backwards compat */ - oid *usmAES128PrivProtocol = usmAESPrivProtocol; -+oid *usmAES192PrivProtocol = usmAESPrivProtocol; -+oid *usmAES256PrivProtocol = usmAESPrivProtocol; - - static u_int dummy_etime, dummy_eboot; /* For ISENGINEKNOWN(). */ - diff --git a/net-mgmt/net-snmp-devel/files/patch-tcpTable.c b/net-mgmt/net-snmp-devel/files/patch-tcpTable.c deleted file mode 100644 index d96d0976189b..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-tcpTable.c +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/mibgroup/mibII/tcpTable.c.orig Wed Jun 9 05:53:17 2004 -+++ agent/mibgroup/mibII/tcpTable.c Thu Jun 24 23:21:32 2004 -@@ -275,6 +277,9 @@ - - int - TCP_Count_Connections( void ) { -+#if (defined(CAN_USE_SYSCTL) && defined(TCPCTL_PCBLIST)) -+ tcpTable_load(NULL, NULL); -+#endif - return tcp_estab; - } - diff --git a/net-mgmt/net-snmp-devel/files/patch-tools.c b/net-mgmt/net-snmp-devel/files/patch-tools.c deleted file mode 100644 index f24a401ec9e6..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-tools.c +++ /dev/null @@ -1,12 +0,0 @@ ---- snmplib/tools.c.orig Tue Jan 25 10:13:50 2005 -+++ snmplib/tools.c Tue Jan 25 10:14:06 2005 -@@ -44,6 +44,9 @@ - #include <arpa/inet.h> - #endif - -+#if HAVE_UNISTD_H -+#include <unistd.h> -+#endif - #if HAVE_DMALLOC_H - #include <dmalloc.h> - #endif diff --git a/net-mgmt/net-snmp-devel/files/patch-transform_oids.h b/net-mgmt/net-snmp-devel/files/patch-transform_oids.h deleted file mode 100644 index 674d4c1acb22..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-transform_oids.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/net-snmp/library/transform_oids.h.orig 2006-10-28 05:19:44.000000000 +0900 -+++ include/net-snmp/library/transform_oids.h 2008-03-26 07:50:45.393507729 +0900 -@@ -23,6 +23,8 @@ - /* XXX: OIDs not defined yet */ - NETSNMP_IMPORT oid usmAESPrivProtocol[10]; /* == { 1,3,6,1,6,3,10,1,2,4 }; */ - NETSNMP_IMPORT oid *usmAES128PrivProtocol; /* backwards compat */ -+NETSNMP_IMPORT oid *usmAES192PrivProtocol; /* backwards compat */ -+NETSNMP_IMPORT oid *usmAES256PrivProtocol; /* backwards compat */ - - #define USM_AUTH_PROTO_NOAUTH_LEN 10 - #define USM_AUTH_PROTO_MD5_LEN 10 diff --git a/net-mgmt/net-snmp-devel/files/snmpd.sh.in b/net-mgmt/net-snmp-devel/files/snmpd.sh.in deleted file mode 100644 index 0af14f41a7b0..000000000000 --- a/net-mgmt/net-snmp-devel/files/snmpd.sh.in +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: /tmp/pcvs/ports/net-mgmt/net-snmp-devel/files/Attic/snmpd.sh.in,v 1.7 2007-10-27 07:20:34 kuriyama Exp $ -# -# PROVIDE: snmpd -# REQUIRE: DAEMON -# -# Add the following line to /etc/rc.conf to enable snmpd: -# -# snmpd_enable="YES" -# - -snmpd_enable=${snmpd_enable-"NO"} -snmpd_flags=${snmpd_flags-""} -snmpd_pidfile=${snmpd_pidfile-"/var/run/snmpd.pid"} -snmpd_conffile=${snmpd_conffile-""} -snmpd_flush_cache=${snmpd_flush_cache-"NO"} - -. %%RC_SUBR%% - -load_rc_config net_snmpd - -if [ ! -z "$net_snmpd_enable" ]; then - echo "Warning: \$net_snmpd_enable is obsoleted." - echo " Use \$snmpd_enable instead." - snmpd_enable="$net_snmpd_enable" - [ ! -z "$net_snmpd_flags" ] && snmpd_flags="$net_snmpd_flags" -fi - -name=snmpd -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/${name} -pidfile=${snmpd_pidfile} -start_precmd=snmpd_precmd - -load_rc_config ${name} - -snmpd_precmd () { - if checkyesno snmpd_flush_cache; then - rm -vf /var/net-snmp/.snmp-exec-cache - fi -} - -case "${snmpd_flags}" in -*-p\ *) - echo "Warning: \$snmpd_flags includes -p option." \ - "Please use \$snmpd_pidfile instead." - ;; -*) - snmpd_flags="-p ${snmpd_pidfile} ${snmpd_flags}" - ;; -esac - -for conffile in ${snmpd_conffile}; do - if [ ! -z ${conffile} -a -f ${conffile} ]; then - if [ -z ${snmpd_conffile_set} ]; then - snmpd_conffile_set="${conffile}" - else - snmpd_conffile_set="${snmpd_conffile_set},${conffile}" - fi - else - echo "snmpd configuration file $conffile not set or not found." - exit 1 - fi -done - -case "${snmpd_flags}" in -*-c\ *) - echo "Warning: \$snmpd_flags includes -c option." \ - "Please use \$snmpd_conffile instead." - ;; -*) - if [ ! -z "${snmpd_conffile_set}" ]; then - snmpd_flags="-c ${snmpd_conffile_set} ${snmpd_flags}" - fi - ;; -esac - -run_rc_command "$1" diff --git a/net-mgmt/net-snmp-devel/files/snmptrapd.sh.in b/net-mgmt/net-snmp-devel/files/snmptrapd.sh.in deleted file mode 100644 index 33c3b2a44551..000000000000 --- a/net-mgmt/net-snmp-devel/files/snmptrapd.sh.in +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: /tmp/pcvs/ports/net-mgmt/net-snmp-devel/files/Attic/snmptrapd.sh.in,v 1.1 2006-05-08 05:00:27 clsung Exp $ -# -# PROVIDE: snmptrapd -# REQUIRE: DAEMON -# -# Add the following line to /etc/rc.conf to enable snmptrapd: -# -# snmptrapd_enable="YES" -# - -snmptrapd_enable=${snmptrapd_enable-"NO"} -snmptrapd_flags=${snmptrapd_flags-"-p /var/run/snmptrapd.pid"} - -. %%RC_SUBR%% - -load_rc_config net_snmptrapd - -if [ ! -z "$net_snmptrapd_enable" ]; then - echo "Warning: \$net_snmptrapd_enable is obsoleted." - echo " Use \$snmptrapd_enable instead." - snmptrapd_enable="$net_snmptrapd_enable" - [ ! -z "$net_snmptrapd_flags" ] && snmptrapd_flags="$net_snmptrapd_flags" -fi - -name=snmptrapd -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/${name} -pidfile=/var/run/${name}.pid - -load_rc_config ${name} -run_rc_command "$1" diff --git a/net-mgmt/net-snmp-devel/files/test.t b/net-mgmt/net-snmp-devel/files/test.t deleted file mode 100644 index cca9d9ed4191..000000000000 --- a/net-mgmt/net-snmp-devel/files/test.t +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/perl -w -# -# $FreeBSD$ - -use strict; -use Test::More tests => 1; - -my $cmd = 'snmpwalk -c public -v 1 localhost'; - -# ports/86572 -my $output = `$cmd hrSWRunType`; -like($output, qr/operatingSystem/, 'hrSWRunType'); diff --git a/net-mgmt/net-snmp-devel/pkg-descr b/net-mgmt/net-snmp-devel/pkg-descr deleted file mode 100644 index d1fc04717b8e..000000000000 --- a/net-mgmt/net-snmp-devel/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -This is Net-SNMP (previously known as "ucd-snmp"). - -Various tools relating to the Simple Network Management Protocol including: - - An extensible agent - An SNMP library - tools to request or set information from SNMP agents - tools to generate and handle SNMP traps - a version of the unix 'netstat' command using SNMP - a graphical Perl/Tk/SNMP based mib browser - -WWW: http://net-snmp.sourceforge.net/ diff --git a/net-mgmt/net-snmp-devel/pkg-message b/net-mgmt/net-snmp-devel/pkg-message deleted file mode 100644 index 203b8a6b6ed6..000000000000 --- a/net-mgmt/net-snmp-devel/pkg-message +++ /dev/null @@ -1,27 +0,0 @@ -**** This port installs snmp daemon, header files and libraries but don't - invokes snmpd by default. - If you want to invoke snmpd and/or snmptrapd at startup, put these - lines into /etc/rc.conf. - - snmpd_enable="YES" - snmpd_flags="-a" - snmpd_conffile="/usr/local/share/snmpd.conf /etc/snmpd.conf" - snmptrapd_enable="YES" - snmptrapd_flags="-a -p /var/run/snmptrapd.pid" - -**** You may specify the following make variables: - - NET_SNMP_SYS_CONTACT="kuriyama@FreeBSD.org" - NET_SNMP_SYS_LOCATION="Tokyo, Japan" - DEFAULT_SNMP_VERSION=3 - NET_SNMP_MIB_MODULES="host smux mibII/mta_sendmail ucd-snmp/diskio" - NET_SNMP_LOGFILE=/var/log/snmpd.log - NET_SNMP_PERSISTENTDIR=/var/net-snmp - - to define default values (or overwriting defaults). At least - setting first two variables, you will not be prompted during - configuration process. You may also set - - BATCH="yes" - - to avoid interactive configuration. diff --git a/net-mgmt/net-snmp-devel/pkg-plist b/net-mgmt/net-snmp-devel/pkg-plist deleted file mode 100644 index 6d9ec599c68c..000000000000 --- a/net-mgmt/net-snmp-devel/pkg-plist +++ /dev/null @@ -1,446 +0,0 @@ -bin/encode_keychange -bin/fixproc -bin/ipf-mod.pl -bin/mib2c -bin/mib2c-update -bin/net-snmp-config -bin/snmpbulkget -bin/snmpbulkwalk -bin/snmpcheck -bin/snmpconf -bin/snmpdelta -bin/snmpdf -bin/snmpget -bin/snmpgetnext -bin/snmpinform -bin/snmpnetstat -bin/snmpset -bin/snmpstatus -bin/snmptable -bin/snmptest -bin/snmptranslate -bin/snmptrap -bin/snmpusm -bin/snmpvacm -bin/snmpwalk -%%WITH_TKMIB%%bin/tkmib -bin/traptoemail -@exec mkdir %D/etc/snmp 2>/dev/null || true -include/net-snmp/agent/agent_callbacks.h -include/net-snmp/agent/agent_handler.h -include/net-snmp/agent/agent_index.h -include/net-snmp/agent/agent_module_config.h -include/net-snmp/agent/agent_read_config.h -include/net-snmp/agent/agent_registry.h -include/net-snmp/agent/agent_trap.h -include/net-snmp/agent/all_helpers.h -include/net-snmp/agent/auto_nlist.h -include/net-snmp/agent/baby_steps.h -include/net-snmp/agent/bulk_to_next.h -include/net-snmp/agent/cache_handler.h -include/net-snmp/agent/debug_handler.h -include/net-snmp/agent/ds_agent.h -include/net-snmp/agent/instance.h -include/net-snmp/agent/mfd.h -include/net-snmp/agent/mib_module_config.h -include/net-snmp/agent/mib_module_includes.h -include/net-snmp/agent/mib_modules.h -include/net-snmp/agent/mode_end_call.h -include/net-snmp/agent/multiplexer.h -include/net-snmp/agent/net-snmp-agent-includes.h -include/net-snmp/agent/null.h -include/net-snmp/agent/old_api.h -include/net-snmp/agent/read_only.h -include/net-snmp/agent/row_merge.h -include/net-snmp/agent/scalar.h -include/net-snmp/agent/scalar_group.h -include/net-snmp/agent/serialize.h -include/net-snmp/agent/set_helper.h -include/net-snmp/agent/snmp_agent.h -include/net-snmp/agent/snmp_vars.h -include/net-snmp/agent/stash_cache.h -include/net-snmp/agent/stash_to_next.h -include/net-snmp/agent/table.h -include/net-snmp/agent/table_array.h -include/net-snmp/agent/table_container.h -include/net-snmp/agent/table_data.h -include/net-snmp/agent/table_dataset.h -include/net-snmp/agent/table_iterator.h -include/net-snmp/agent/table_tdata.h -include/net-snmp/agent/util_funcs.h -include/net-snmp/agent/var_struct.h -include/net-snmp/agent/watcher.h -include/net-snmp/config_api.h -include/net-snmp/definitions.h -include/net-snmp/library/README -include/net-snmp/library/asn1.h -include/net-snmp/library/callback.h -include/net-snmp/library/check_varbind.h -include/net-snmp/library/cmu_compat.h -include/net-snmp/library/container.h -include/net-snmp/library/container_binary_array.h -include/net-snmp/library/container_iterator.h -include/net-snmp/library/container_list_ssll.h -include/net-snmp/library/container_null.h -include/net-snmp/library/data_list.h -include/net-snmp/library/default_store.h -include/net-snmp/library/factory.h -include/net-snmp/library/fd_event_manager.h -include/net-snmp/library/file_utils.h -include/net-snmp/library/getopt.h -include/net-snmp/library/int64.h -include/net-snmp/library/keytools.h -include/net-snmp/library/lcd_time.h -include/net-snmp/library/md5.h -include/net-snmp/library/mib.h -include/net-snmp/library/mt_support.h -include/net-snmp/library/oid_stash.h -include/net-snmp/library/parse.h -include/net-snmp/library/read_config.h -include/net-snmp/library/scapi.h -include/net-snmp/library/snmp-tc.h -include/net-snmp/library/snmp.h -include/net-snmp/library/snmpCallbackDomain.h -include/net-snmp/library/snmpTCPDomain.h -%%WITH_IPV6%%include/net-snmp/library/snmpTCPIPv6Domain.h -include/net-snmp/library/snmpUDPDomain.h -%%WITH_IPV6%%include/net-snmp/library/snmpUDPIPv6Domain.h -include/net-snmp/library/snmpUnixDomain.h -include/net-snmp/library/snmp_alarm.h -include/net-snmp/library/snmp_api.h -include/net-snmp/library/snmp_assert.h -include/net-snmp/library/snmp_client.h -include/net-snmp/library/snmp_debug.h -include/net-snmp/library/snmp_enum.h -include/net-snmp/library/snmp_impl.h -include/net-snmp/library/snmp_logging.h -include/net-snmp/library/snmp_parse_args.h -include/net-snmp/library/snmp_secmod.h -include/net-snmp/library/snmp_service.h -include/net-snmp/library/snmp_transport.h -include/net-snmp/library/snmpusm.h -include/net-snmp/library/snmpv3-security-includes.h -include/net-snmp/library/snmpv3.h -include/net-snmp/library/system.h -include/net-snmp/library/text_utils.h -include/net-snmp/library/tools.h -include/net-snmp/library/transform_oids.h -include/net-snmp/library/ucd_compat.h -include/net-snmp/library/vacm.h -include/net-snmp/library/winpipe.h -include/net-snmp/library/winservice.h -include/net-snmp/machine/generic.h -include/net-snmp/mib_api.h -include/net-snmp/net-snmp-config.h -include/net-snmp/net-snmp-includes.h -include/net-snmp/output_api.h -include/net-snmp/pdu_api.h -include/net-snmp/session_api.h -include/net-snmp/snmpv3_api.h -include/net-snmp/system/aix.h -include/net-snmp/system/bsd.h -include/net-snmp/system/bsdi.h -include/net-snmp/system/bsdi3.h -include/net-snmp/system/bsdi4.h -include/net-snmp/system/cygwin.h -include/net-snmp/system/darwin.h -include/net-snmp/system/darwin7.h -include/net-snmp/system/darwin8.h -include/net-snmp/system/darwin9.h -include/net-snmp/system/dragonfly.h -include/net-snmp/system/dynix.h -include/net-snmp/system/freebsd.h -include/net-snmp/system/freebsd2.h -include/net-snmp/system/freebsd3.h -include/net-snmp/system/freebsd4.h -include/net-snmp/system/freebsd5.h -include/net-snmp/system/freebsd6.h -include/net-snmp/system/freebsd7.h -include/net-snmp/system/freebsd8.h -include/net-snmp/system/generic.h -include/net-snmp/system/hpux.h -include/net-snmp/system/irix.h -include/net-snmp/system/linux.h -include/net-snmp/system/mingw32.h -include/net-snmp/system/mips.h -include/net-snmp/system/netbsd.h -include/net-snmp/system/openbsd.h -include/net-snmp/system/osf5.h -include/net-snmp/system/solaris.h -include/net-snmp/system/solaris2.3.h -include/net-snmp/system/solaris2.4.h -include/net-snmp/system/solaris2.5.h -include/net-snmp/system/solaris2.6.h -include/net-snmp/system/sunos.h -include/net-snmp/system/svr5.h -include/net-snmp/system/sysv.h -include/net-snmp/system/ultrix4.h -include/net-snmp/types.h -include/net-snmp/utilities.h -include/net-snmp/varbind_api.h -include/net-snmp/version.h -lib/libnetsnmp.a -lib/libnetsnmp.la -lib/libnetsnmp.so.%%SHLIB_VERSION%% -@exec ln -fs libnetsnmp.so.%%SHLIB_VERSION%% %B/libnetsnmp.so -@unexec rm -f %B/libnetsnmp.so 2> /dev/null || true -lib/libnetsnmpagent.a -lib/libnetsnmpagent.la -lib/libnetsnmpagent.so.%%SHLIB_VERSION%% -@exec ln -fs libnetsnmpagent.so.%%SHLIB_VERSION%% %B/libnetsnmpagent.so -@unexec rm -f %B/libnetsnmpagent.so 2> /dev/null || true -lib/libnetsnmphelpers.a -lib/libnetsnmphelpers.la -lib/libnetsnmphelpers.so.%%SHLIB_VERSION%% -@exec ln -fs libnetsnmphelpers.so.%%SHLIB_VERSION%% %B/libnetsnmphelpers.so -@unexec rm -f %B/libnetsnmphelpers.so 2> /dev/null || true -lib/libnetsnmpmibs.a -lib/libnetsnmpmibs.la -lib/libnetsnmpmibs.so.%%SHLIB_VERSION%% -@exec ln -fs libnetsnmpmibs.so.%%SHLIB_VERSION%% %B/libnetsnmpmibs.so -@unexec rm -f %B/libnetsnmpmibs.so 2> /dev/null || true -lib/libnetsnmptrapd.a -lib/libnetsnmptrapd.la -lib/libnetsnmptrapd.so.%%SHLIB_VERSION%% -@exec ln -fs libnetsnmptrapd.so.%%SHLIB_VERSION%% %B/libnetsnmptrapd.so -@unexec rm -f %B/libnetsnmptrapd.so 2> /dev/null || true -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Bundle/Makefile.subs.pl -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/ASN.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/OID.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/TrapReceiver.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent/Support.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent/default_store.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent/netsnmp_request_infoPtr.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/default_store.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SNMP.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/NetSNMP/.packlist -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN/ASN.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN/ASN.so -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN/autosplit.ix -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID/OID.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID/OID.so -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID/autosplit.ix -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/TrapReceiver/TrapReceiver.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/TrapReceiver/TrapReceiver.so -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/TrapReceiver/autosplit.ix -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/agent.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/agent.so -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/autosplit.ix -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store/autosplit.ix -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store/default_store.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store/default_store.so -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store/autosplit.ix -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store/default_store.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store/default_store.so -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/SNMP.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/SNMP.so -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/autosplit.ix -sbin/snmpd -sbin/snmptrapd -%%PORTDOCS%%%%DOCSDIR%%/AGENT.txt -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/FAQ -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.agentx -%%PORTDOCS%%%%DOCSDIR%%/README.krb5 -%%PORTDOCS%%%%DOCSDIR%%/README.snmpv3 -%%PORTDOCS%%%%DOCSDIR%%/README.thread -%%PORTDOCS%%%%DOCSDIR%%/README.smux -%%DATADIR%%/snmpd.conf.example -%%DATADIR%%/snmp_perl_trapd.pl -%%DATADIR%%/mib2c.access_functions.conf -%%DATADIR%%/mib2c.array-user.conf -%%DATADIR%%/mib2c.check_values.conf -%%DATADIR%%/mib2c.check_values_local.conf -%%DATADIR%%/mib2c.column_defines.conf -%%DATADIR%%/mib2c.column_enums.conf -%%DATADIR%%/mib2c.column_storage.conf -%%DATADIR%%/mib2c.conf -%%DATADIR%%/mib2c.container.conf -%%DATADIR%%/mib2c.create-dataset.conf -%%DATADIR%%/mib2c.genhtml.conf -%%DATADIR%%/mib2c.int_watch.conf -%%DATADIR%%/mib2c.iterate.conf -%%DATADIR%%/mib2c.iterate_access.conf -%%DATADIR%%/mib2c.mfd.conf -%%DATADIR%%/mib2c.notify.conf -%%DATADIR%%/mib2c.old-api.conf -%%DATADIR%%/mib2c.scalar.conf -%%DATADIR%%/mib2c.table_data.conf -%%DATADIR%%/mib2c-data/default-mfd-top.m2c -%%DATADIR%%/mib2c-data/details-enums.m2i -%%DATADIR%%/mib2c-data/details-node.m2i -%%DATADIR%%/mib2c-data/details-table.m2i -%%DATADIR%%/mib2c-data/generic-ctx-copy.m2i -%%DATADIR%%/mib2c-data/generic-ctx-get.m2i -%%DATADIR%%/mib2c-data/generic-ctx-set.m2i -%%DATADIR%%/mib2c-data/generic-data-allocate.m2i -%%DATADIR%%/mib2c-data/generic-data-context.m2i -%%DATADIR%%/mib2c-data/generic-get-char.m2i -%%DATADIR%%/mib2c-data/generic-get-decl-bot.m2i -%%DATADIR%%/mib2c-data/generic-get-decl.m2i -%%DATADIR%%/mib2c-data/generic-get-long.m2i -%%DATADIR%%/mib2c-data/generic-get-oid.m2i -%%DATADIR%%/mib2c-data/generic-header-bottom.m2i -%%DATADIR%%/mib2c-data/generic-header-top.m2i -%%DATADIR%%/mib2c-data/generic-source-includes.m2i -%%DATADIR%%/mib2c-data/generic-table-constants.m2c -%%DATADIR%%/mib2c-data/generic-table-enums.m2c -%%DATADIR%%/mib2c-data/generic-table-indexes-from-oid.m2i -%%DATADIR%%/mib2c-data/generic-table-indexes-set.m2i -%%DATADIR%%/mib2c-data/generic-table-indexes-to-oid.m2i -%%DATADIR%%/mib2c-data/generic-table-indexes-varbind-setup.m2i -%%DATADIR%%/mib2c-data/generic-table-indexes.m2i -%%DATADIR%%/mib2c-data/generic-table-oids.m2c -%%DATADIR%%/mib2c-data/generic-value-map-func.m2i -%%DATADIR%%/mib2c-data/generic-value-map-reverse.m2i -%%DATADIR%%/mib2c-data/generic-value-map.m2i -%%DATADIR%%/mib2c-data/m2c-internal-warning.m2i -%%DATADIR%%/mib2c-data/m2c_setup_enum.m2i -%%DATADIR%%/mib2c-data/m2c_setup_node.m2i -%%DATADIR%%/mib2c-data/m2c_setup_table.m2i -%%DATADIR%%/mib2c-data/m2c_table_save_defaults.m2i -%%DATADIR%%/mib2c-data/mfd-access-container-cached-defines.m2i -%%DATADIR%%/mib2c-data/mfd-access-unsorted-external-defines.m2i -%%DATADIR%%/mib2c-data/mfd-data-access.m2c -%%DATADIR%%/mib2c-data/mfd-data-get.m2c -%%DATADIR%%/mib2c-data/mfd-data-set.m2c -%%DATADIR%%/mib2c-data/mfd-doxygen.m2c -%%DATADIR%%/mib2c-data/mfd-interactive-setup.m2c -%%DATADIR%%/mib2c-data/mfd-interface.m2c -%%DATADIR%%/mib2c-data/mfd-makefile.m2m -%%DATADIR%%/mib2c-data/mfd-persistence.m2i -%%DATADIR%%/mib2c-data/mfd-readme.m2c -%%DATADIR%%/mib2c-data/mfd-top.m2c -%%DATADIR%%/mib2c-data/node-get.m2i -%%DATADIR%%/mib2c-data/node-set.m2i -%%DATADIR%%/mib2c-data/node-storage.m2i -%%DATADIR%%/mib2c-data/node-validate.m2i -%%DATADIR%%/mib2c-data/node-varbind-validate.m2i -%%DATADIR%%/mib2c-data/parent-dependencies.m2i -%%DATADIR%%/mib2c-data/parent-set.m2i -%%DATADIR%%/mib2c-data/subagent.m2c -%%DATADIR%%/mib2c-data/syntax-COUNTER64-get.m2i -%%DATADIR%%/mib2c-data/syntax-DateAndTime-get.m2d -%%DATADIR%%/mib2c-data/syntax-DateAndTime-get.m2i -%%DATADIR%%/mib2c-data/syntax-DateAndTime-readme.m2i -%%DATADIR%%/mib2c-data/syntax-InetAddress-get.m2i -%%DATADIR%%/mib2c-data/syntax-InetAddress-set.m2i -%%DATADIR%%/mib2c-data/syntax-InetAddressType-get.m2i -%%DATADIR%%/mib2c-data/syntax-InetAddressType-set.m2i -%%DATADIR%%/mib2c-data/syntax-RowStatus-dependencies.m2i -%%DATADIR%%/mib2c-data/syntax-RowStatus-get.m2i -%%DATADIR%%/mib2c-data/syntax-RowStatus-varbind-validate.m2i -%%DATADIR%%/mib2c-data/syntax-StorageType-dependencies.m2i -%%DATADIR%%/mib2c-data/syntax-TestAndIncr-get.m2i -%%DATADIR%%/mibs/AGENTX-MIB.txt -%%WITH_EVENT-MIB%%%%DATADIR%%/mibs/DISMAN-EVENT-MIB.txt -%%DATADIR%%/mibs/DISMAN-SCHEDULE-MIB.txt -%%DATADIR%%/mibs/DISMAN-SCRIPT-MIB.txt -%%DATADIR%%/mibs/EtherLike-MIB.txt -%%DATADIR%%/mibs/HCNUM-TC.txt -%%DATADIR%%/mibs/HOST-RESOURCES-MIB.txt -%%DATADIR%%/mibs/HOST-RESOURCES-TYPES.txt -%%DATADIR%%/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt -%%DATADIR%%/mibs/IANA-LANGUAGE-MIB.txt -%%DATADIR%%/mibs/IANA-RTPROTO-MIB.txt -%%DATADIR%%/mibs/IANAifType-MIB.txt -%%DATADIR%%/mibs/IF-INVERTED-STACK-MIB.txt -%%DATADIR%%/mibs/IF-MIB.txt -%%DATADIR%%/mibs/INET-ADDRESS-MIB.txt -%%DATADIR%%/mibs/IP-FORWARD-MIB.txt -%%DATADIR%%/mibs/IP-MIB.txt -%%DATADIR%%/mibs/IPV6-ICMP-MIB.txt -%%DATADIR%%/mibs/IPV6-MIB.txt -%%DATADIR%%/mibs/IPV6-TC.txt -%%DATADIR%%/mibs/IPV6-TCP-MIB.txt -%%DATADIR%%/mibs/IPV6-UDP-MIB.txt -%%WITH_MTA_SENDMAIL%%%%DATADIR%%/mibs/MTA-MIB.txt -%%DATADIR%%/mibs/NET-SNMP-AGENT-MIB.txt -%%DATADIR%%/mibs/NET-SNMP-EXAMPLES-MIB.txt -%%DATADIR%%/mibs/NET-SNMP-EXTEND-MIB.txt -%%DATADIR%%/mibs/NET-SNMP-MIB.txt -%%DATADIR%%/mibs/NET-SNMP-TC.txt -%%DATADIR%%/mibs/NET-SNMP-VACM-MIB.txt -%%WITH_MTA_SENDMAIL%%%%DATADIR%%/mibs/NETWORK-SERVICES-MIB.txt -%%DATADIR%%/mibs/NOTIFICATION-LOG-MIB.txt -%%DATADIR%%/mibs/RFC-1215.txt -%%DATADIR%%/mibs/RFC1155-SMI.txt -%%DATADIR%%/mibs/RFC1213-MIB.txt -%%DATADIR%%/mibs/RMON-MIB.txt -%%DATADIR%%/mibs/SMUX-MIB.txt -%%DATADIR%%/mibs/SNMP-COMMUNITY-MIB.txt -%%DATADIR%%/mibs/SNMP-FRAMEWORK-MIB.txt -%%DATADIR%%/mibs/SNMP-MPD-MIB.txt -%%DATADIR%%/mibs/SNMP-NOTIFICATION-MIB.txt -%%DATADIR%%/mibs/SNMP-PROXY-MIB.txt -%%DATADIR%%/mibs/SNMP-TARGET-MIB.txt -%%DATADIR%%/mibs/SNMP-USER-BASED-SM-MIB.txt -%%DATADIR%%/mibs/SNMP-USM-AES-MIB.txt -%%DATADIR%%/mibs/SNMP-USM-DH-OBJECTS-MIB.txt -%%DATADIR%%/mibs/SNMP-VIEW-BASED-ACM-MIB.txt -%%DATADIR%%/mibs/SNMPv2-CONF.txt -%%DATADIR%%/mibs/SNMPv2-MIB.txt -%%DATADIR%%/mibs/SNMPv2-SMI.txt -%%DATADIR%%/mibs/SNMPv2-TC.txt -%%DATADIR%%/mibs/SNMPv2-TM.txt -%%DATADIR%%/mibs/TCP-MIB.txt -%%DATADIR%%/mibs/TRANSPORT-ADDRESS-MIB.txt -%%DATADIR%%/mibs/UCD-DEMO-MIB.txt -%%DATADIR%%/mibs/UCD-DISKIO-MIB.txt -%%DATADIR%%/mibs/UCD-DLMOD-MIB.txt -%%DATADIR%%/mibs/UCD-IPFWACC-MIB.txt -%%DATADIR%%/mibs/UCD-SNMP-MIB.txt -%%DATADIR%%/mibs/UDP-MIB.txt -@unexec rm -f %D/%%DATADIR%%/mibs/.index 2>/dev/null || true -%%WITH_PERL%%%%DATADIR%%/snmp_perl.pl -%%DATADIR%%/snmpconf-data/snmp-data/authopts -%%DATADIR%%/snmpconf-data/snmp-data/debugging -%%DATADIR%%/snmpconf-data/snmp-data/mibs -%%DATADIR%%/snmpconf-data/snmp-data/output -%%DATADIR%%/snmpconf-data/snmp-data/snmpconf-config -%%DATADIR%%/snmpconf-data/snmpd-data/acl -%%DATADIR%%/snmpconf-data/snmpd-data/basic_setup -%%DATADIR%%/snmpconf-data/snmpd-data/extending -%%DATADIR%%/snmpconf-data/snmpd-data/monitor -%%DATADIR%%/snmpconf-data/snmpd-data/operation -%%DATADIR%%/snmpconf-data/snmpd-data/snmpconf-config -%%DATADIR%%/snmpconf-data/snmpd-data/system -%%DATADIR%%/snmpconf-data/snmpd-data/trapsinks -%%DATADIR%%/snmpconf-data/snmptrapd-data/authentication -%%DATADIR%%/snmpconf-data/snmptrapd-data/formatting -%%DATADIR%%/snmpconf-data/snmptrapd-data/logging -%%DATADIR%%/snmpconf-data/snmptrapd-data/runtime -%%DATADIR%%/snmpconf-data/snmptrapd-data/snmpconf-config -%%DATADIR%%/snmpconf-data/snmptrapd-data/traphandle -@dirrm %%DATADIR%%/mib2c-data/ -@dirrm %%DATADIR%%/snmpconf-data/snmptrapd-data -@dirrm %%DATADIR%%/snmpconf-data/snmpd-data -@dirrm %%DATADIR%%/snmpconf-data/snmp-data -@dirrm %%DATADIR%%/snmpconf-data -@dirrmtry %%DATADIR%%/mibs -@dirrmtry %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/TrapReceiver -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/NetSNMP -%%WITH_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP -%%WITH_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle -@exec mkdir /var/agentx -@dirrm include/net-snmp/system -@dirrm include/net-snmp/machine -@dirrm include/net-snmp/library -@dirrm include/net-snmp/agent -@dirrm include/net-snmp -@dirrmtry etc/snmp -@unexec rmdir /var/agentx 2>/dev/null || true diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile index fee0ee8b61d5..4981fefc875b 100644 --- a/net-mgmt/net-snmp/Makefile +++ b/net-mgmt/net-snmp/Makefile @@ -6,8 +6,7 @@ # PORTNAME= snmp -PORTVERSION= 5.4.1.2 -PORTREVISION= 2 +PORTVERSION= 5.4.2.1 CATEGORIES= net-mgmt ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= net-snmp diff --git a/net-mgmt/net-snmp/distinfo b/net-mgmt/net-snmp/distinfo index e02915a0ce75..d23d7dcb5c54 100644 --- a/net-mgmt/net-snmp/distinfo +++ b/net-mgmt/net-snmp/distinfo @@ -1,3 +1,3 @@ -MD5 (net-snmp-5.4.1.2.tar.gz) = 2dfcf97d65f3b7d34b78c8d4be11fc83 -SHA256 (net-snmp-5.4.1.2.tar.gz) = 17d67076ab5c5fb6dfaffe70a2757526f99b0638bca102dec27af08ec01a9068 -SIZE (net-snmp-5.4.1.2.tar.gz) = 5123346 +MD5 (net-snmp-5.4.2.1.tar.gz) = 984932520143f0c8bf7b7ce1fc9e1da1 +SHA256 (net-snmp-5.4.2.1.tar.gz) = 11a8baf167f7bfff60d2590e050991400a3a082923dbcdbf85e0e0ce46eb247c +SIZE (net-snmp-5.4.2.1.tar.gz) = 5185390 diff --git a/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_cpu.h b/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_cpu.h deleted file mode 100644 index 143133291f9e..000000000000 --- a/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_cpu.h +++ /dev/null @@ -1,18 +0,0 @@ - -$FreeBSD$ - ---- agent/mibgroup/hardware/cpu.h -+++ agent/mibgroup/hardware/cpu.h -@@ -12,10 +12,10 @@ - #elif defined(irix6) - config_require(hardware/cpu/cpu_sysinfo) - --#elif (defined(netbsd) || defined(netbsd1) || defined(netbsdelf) || defined(netbsdelf2)|| defined(netbsdelf3) || defined(openbsd2)|| defined(openbsd3) || defined(openbsd4)) -+#elif (defined(netbsd) || defined(netbsd1) || defined(netbsdelf) || defined(netbsdelf2)|| defined(netbsdelf3) || defined(openbsd2)|| defined(openbsd3) || defined(openbsd4) || defined(freebsd4) || defined(freebsd5)|| defined(freebsd6)) - config_require(hardware/cpu/cpu_sysctl) - --#elif (defined(freebsd2) || defined(freebsd3) || defined(freebsd4) || defined(freebsd5)|| defined(freebsd6)) -+#elif (defined(freebsd2) || defined(freebsd3)) - config_require(hardware/cpu/cpu_nlist) - - #elif (defined(aix4) || defined(aix5)) diff --git a/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c b/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c index 68d058961161..d35125033448 100644 --- a/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c +++ b/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c @@ -1,56 +1,24 @@ - -$FreeBSD$ - ---- agent/mibgroup/hardware/cpu/cpu_sysctl.c.orig -+++ agent/mibgroup/hardware/cpu/cpu_sysctl.c -@@ -11,7 +11,14 @@ - #include <unistd.h> - #include <sys/types.h> - -+#if defined(__FreeBSD__) -+#include <sys/resource.h> -+#if !defined(CPUSTATES) -+#include <sys/dkstat.h> -+#endif -+#else - #include <sys/sched.h> -+#endif - #include <sys/param.h> - #include <sys/sysctl.h> - #include <sys/vmmeter.h> -@@ -37,11 +44,11 @@ - strcpy(cpu->name, "Overall CPU statistics"); - - i = sizeof(n); -- sysctl(ncpu_mib, 2, &n, &i, NULL, 0); -+ sysctl(ncpu_mib, 2, &n, (void *)&i, NULL, 0); - if ( n <= 0 ) - n = 1; /* Single CPU system */ - i = sizeof(descr); -- sysctl(model_mib, 2, descr, &i, NULL, 0); -+ sysctl(model_mib, 2, descr, (void *)&i, NULL, 0); - for ( i = 0; i < n; i++ ) { - cpu = netsnmp_cpu_get_byIdx( i, 1 ); - cpu->status = 2; /* running */ -@@ -64,6 +71,8 @@ - #undef NETSNMP_CPU_STATS - #define NETSNMP_CPU_STATS uint64_t +--- agent/mibgroup/hardware/cpu/cpu_sysctl.c.orig 2008-05-27 21:47:30.000000000 +0900 ++++ agent/mibgroup/hardware/cpu/cpu_sysctl.c 2008-11-14 16:41:12.000000000 +0900 +@@ -16,6 +16,8 @@ + #if !defined(CPUSTATES) + #include <sys/dkstat.h> #endif +#elif defined(__FreeBSD__) +#define NETSNMP_KERN_CPU 0 /* FreeBSD - dummy value, sysctlnametomib(2) should be used */ #else - #error "No CPU statistics sysctl token" + #include <sys/sched.h> #endif -@@ -95,7 +104,7 @@ - #define NETSNMP_VM_STATS_TYPE struct uvmexp - #endif /* VM_UVMEXP2 || VM_UVMEXP */ +@@ -117,7 +119,7 @@ + #define NS_VM_SWAPIN v_swapin + #define NS_VM_SWAPOUT v_swapout --#elif defined(VM_METER) /* OpenBSD, NetBSD, FreeBSD */ +-#elif defined(VM_METER) /* OpenBSD, NetBSD */ +#elif defined(VM_METER) && !defined(__FreeBSD__) /* OpenBSD, NetBSD */ #define NETSNMP_VM_STATS VM_METER #define NETSNMP_VM_STATS_TYPE struct vmtotal -@@ -108,6 +117,15 @@ +@@ -130,6 +132,15 @@ #undef NS_VM_PAGEOUT #define NS_VM_SWAPIN v_swpin #define NS_VM_SWAPOUT v_swpout @@ -66,29 +34,3 @@ $FreeBSD$ #endif -@@ -126,7 +144,7 @@ - */ - NETSNMP_CPU_STATS cpu_stats[CPUSTATES]; - int cpu_mib[] = { CTL_KERN, NETSNMP_KERN_CPU }; -- int cpu_size = sizeof(cpu_stats); -+ size_t cpu_size = sizeof(cpu_stats); - #ifdef NETSNMP_KERN_MCPU - NETSNMP_KERN_MCPU_TYPE *mcpu_stats; - int mcpu_mib[] = { CTL_KERN, NETSNMP_KERN_MCPU }; -@@ -134,10 +152,13 @@ - #endif - NETSNMP_VM_STATS_TYPE mem_stats; - int mem_mib[] = { CTL_VM, NETSNMP_VM_STATS }; -- int mem_size = sizeof(NETSNMP_VM_STATS_TYPE); -+ size_t mem_size = sizeof(NETSNMP_VM_STATS_TYPE); - netsnmp_cpu_info *cpu = netsnmp_cpu_get_byIdx( -1, 0 ); -- -- sysctl(cpu_mib, 2, cpu_stats, &cpu_size, NULL, 0); -+#if defined(__FreeBSD__) -+ sysctlbyname("kern.cp_time", cpu_stats, &cpu_size, NULL, 0); -+#else -+ sysctl(cpu_time, 2, cpu_stats, &cpu_size, NULL, 0); -+#endif - cpu->user_ticks = (unsigned long)cpu_stats[CP_USER]; - cpu->nice_ticks = (unsigned long)cpu_stats[CP_NICE]; - cpu->sys2_ticks = (unsigned long)cpu_stats[CP_SYS]+cpu_stats[CP_INTR]; diff --git a/net-mgmt/net-snmp/files/patch-agent_registry.c b/net-mgmt/net-snmp/files/patch-agent_registry.c deleted file mode 100644 index 8c81bdf5ab52..000000000000 --- a/net-mgmt/net-snmp/files/patch-agent_registry.c +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/agent_registry.c.orig 2008-08-24 23:24:04.944441100 +0900 -+++ agent/agent_registry.c 2008-08-24 23:25:37.996227686 +0900 -@@ -532,7 +532,8 @@ - - if (next && (next->namelen == new_sub->namelen) && - (next->priority == new_sub->priority)) { -- netsnmp_assert(!"registration != duplicate"); /* always false */ -+ if (new_sub->namelen != 1) /* ignore root OID dups */ -+ netsnmp_assert(!"registration != duplicate"); /* always false */ - return MIB_DUPLICATE_REGISTRATION; - } - diff --git a/net-mgmt/net-snmp/files/patch-memory_freebsd.c b/net-mgmt/net-snmp/files/patch-memory_freebsd.c index 1f996ad6edf2..ccdc537e629a 100644 --- a/net-mgmt/net-snmp/files/patch-memory_freebsd.c +++ b/net-mgmt/net-snmp/files/patch-memory_freebsd.c @@ -1,24 +1,14 @@ ---- agent/mibgroup/hardware/memory/memory_freebsd.c.orig 2006-03-07 01:23:52.000000000 +0900 -+++ agent/mibgroup/hardware/memory/memory_freebsd.c 2008-08-24 23:35:12.857234897 +0900 -@@ -47,6 +47,9 @@ - int phys_mem_mib[] = { CTL_HW, HW_PHYSMEM }; - int user_mem_mib[] = { CTL_HW, HW_USERMEM }; - -+ long bufspace; -+ -+ - /* - * Retrieve the memory information from the underlying O/S... - */ -@@ -54,6 +57,7 @@ - sysctl(phys_mem_mib, 2, &phys_mem, &mem_size, NULL, 0); - sysctl(user_mem_mib, 2, &user_mem, &mem_size, NULL, 0); +--- agent/mibgroup/hardware/memory/memory_freebsd.c.orig 2008-05-28 20:48:46.000000000 +0900 ++++ agent/mibgroup/hardware/memory/memory_freebsd.c 2008-11-14 16:56:48.000000000 +0900 +@@ -59,6 +59,7 @@ + sysctlbyname("vfs.bufspace", &bufspace, &buf_size, NULL, 0); + sysctlbyname("vfs.maxbufspace", &maxbufspace, &buf_size, NULL, 0); auto_nlist(SUM_SYMBOL, (char *) &vmem, sizeof(vmem)); + auto_nlist(BUFSPACE_SYMBOL, (char *) &bufspace, sizeof(bufspace)); #ifndef freebsd4 pagesize = 1024; #else -@@ -70,7 +74,7 @@ +@@ -75,7 +76,7 @@ if (!mem->descr) mem->descr = strdup("Physical memory"); mem->units = pagesize; @@ -27,26 +17,20 @@ mem->free = total.t_free; } -@@ -125,10 +129,22 @@ - if (!mem->descr) - mem->descr = strdup("Cached memory"); - mem->units = vmem.v_page_size; -- mem->size = vmem.v_cache_count; -+ mem->size = vmem.v_cache_count + vmem.v_inactive_count; -+ mem->free = -1; -+ } -+ +@@ -134,6 +135,17 @@ + mem->free = vmem.v_cache_max - vmem.v_cache_count; + } + + mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_MBUF, 1 ); + if (!mem) { + snmp_log_perror("No Memory Buffer info entry"); + } else { + if (!mem->descr) -+ mem->descr = strdup("Memory Buffer"); ++ mem->descr = strdup("Memory Buffer"); + mem->units = pagesize; + mem->size = bufspace/pagesize; - mem->free = -1; - } - ++ mem->free = -1; ++ } + nswap = swapmode(pagesize); mem = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_SWAP, 1 ); diff --git a/net-mgmt/net-snmp/files/patch-snmpTCPIPv6Domain.c b/net-mgmt/net-snmp/files/patch-snmpTCPIPv6Domain.c index 570f9bb9347f..44c26b86d08c 100644 --- a/net-mgmt/net-snmp/files/patch-snmpTCPIPv6Domain.c +++ b/net-mgmt/net-snmp/files/patch-snmpTCPIPv6Domain.c @@ -1,19 +1,16 @@ -Index: snmplib/snmpTCPIPv6Domain.c -diff -u -p snmplib/snmpTCPIPv6Domain.c.orig snmplib/snmpTCPIPv6Domain.c ---- snmplib/snmpTCPIPv6Domain.c.orig Fri Sep 16 19:30:49 2005 -+++ snmplib/snmpTCPIPv6Domain.c Fri Jan 11 13:40:09 2008 -@@ -96,13 +96,24 @@ netsnmp_tcp6_fmtaddr(netsnmp_transport * +--- snmplib/snmpTCPIPv6Domain.c.orig 2008-06-17 17:57:14.000000000 +0900 ++++ snmplib/snmpTCPIPv6Domain.c 2008-11-14 21:34:12.000000000 +0900 +@@ -96,12 +96,23 @@ if (to == NULL) { return strdup("TCP/IPv6: unknown"); } else { - char addr[INET6_ADDRSTRLEN]; -- char tmp[INET6_ADDRSTRLEN + 8]; -+ char addr[NI_MAXHOST], tmp[NI_MAXHOST + NI_MAXSERV + 12]; +- char tmp[INET6_ADDRSTRLEN + 18]; ++ char addr[NI_MAXHOST], tmp[NI_MAXHOST + NI_MAXSERV + 12]; - sprintf(tmp, "TCP/IPv6: [%s]:%hd", - inet_ntop(AF_INET6, (void *) &(to->sin6_addr), addr, - INET6_ADDRSTRLEN), ntohs(to->sin6_port)); -- return strdup(tmp); +/* + * NI_WITHSCOPEID will be obsoleted. But some implementations require + * this flag to retrieve scoped name. @@ -29,7 +26,6 @@ diff -u -p snmplib/snmpTCPIPv6Domain.c.orig snmplib/snmpTCPIPv6Domain.c + } + snprintf(tmp, sizeof(tmp), "TCP/IPv6: [%s]:%hd", addr, + ntohs(to->sin6_port)); -+ return strdup(tmp); + return strdup(tmp); } } - diff --git a/net-mgmt/net-snmp/files/patch-snmpUCDIPv6Domain.c b/net-mgmt/net-snmp/files/patch-snmpUCDIPv6Domain.c index ad98e534bdf2..62ceec96c330 100644 --- a/net-mgmt/net-snmp/files/patch-snmpUCDIPv6Domain.c +++ b/net-mgmt/net-snmp/files/patch-snmpUCDIPv6Domain.c @@ -1,17 +1,16 @@ ---- snmplib/snmpUDPIPv6Domain.c.orig 2007-06-11 07:22:55.000000000 +0900 -+++ snmplib/snmpUDPIPv6Domain.c 2008-03-26 07:47:55.942743517 +0900 -@@ -109,13 +109,24 @@ +--- snmplib/snmpUDPIPv6Domain.c.orig 2007-09-29 22:10:22.000000000 +0900 ++++ snmplib/snmpUDPIPv6Domain.c 2008-11-14 21:36:45.000000000 +0900 +@@ -109,12 +109,22 @@ if (to == NULL) { return strdup("UDP/IPv6: unknown"); } else { - char addr[INET6_ADDRSTRLEN]; -- char tmp[INET6_ADDRSTRLEN + 8]; -+ char addr[NI_MAXHOST], tmp[NI_MAXHOST + NI_MAXSERV + 12]; - +- char tmp[INET6_ADDRSTRLEN + 18]; +- - sprintf(tmp, "UDP/IPv6: [%s]:%hu", - inet_ntop(AF_INET6, (void *) &(to->sin6_addr), addr, - INET6_ADDRSTRLEN), ntohs(to->sin6_port)); -- return strdup(tmp); ++ char addr[NI_MAXHOST], tmp[NI_MAXHOST + NI_MAXSERV + 12]; +/* + * NI_WITHSCOPEID will be obsoleted. But some implementations require + * this flag to retrieve scoped name. @@ -27,7 +26,6 @@ + } + snprintf(tmp, sizeof(tmp), "UDP/IPv6: [%s]:%hu", addr, + ntohs(to->sin6_port)); -+ return strdup(tmp); + return strdup(tmp); } } - diff --git a/net-mgmt/net-snmp/pkg-plist b/net-mgmt/net-snmp/pkg-plist index 6d9ec599c68c..1b132415b302 100644 --- a/net-mgmt/net-snmp/pkg-plist +++ b/net-mgmt/net-snmp/pkg-plist @@ -267,6 +267,7 @@ sbin/snmptrapd %%DATADIR%%/mib2c.mfd.conf %%DATADIR%%/mib2c.notify.conf %%DATADIR%%/mib2c.old-api.conf +%%DATADIR%%/mib2c.perl.conf %%DATADIR%%/mib2c.scalar.conf %%DATADIR%%/mib2c.table_data.conf %%DATADIR%%/mib2c-data/default-mfd-top.m2c @@ -370,6 +371,7 @@ sbin/snmptrapd %%DATADIR%%/mibs/RFC1155-SMI.txt %%DATADIR%%/mibs/RFC1213-MIB.txt %%DATADIR%%/mibs/RMON-MIB.txt +%%DATADIR%%/mibs/SCTP-MIB.txt %%DATADIR%%/mibs/SMUX-MIB.txt %%DATADIR%%/mibs/SNMP-COMMUNITY-MIB.txt %%DATADIR%%/mibs/SNMP-FRAMEWORK-MIB.txt diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile index 6bc2eee46608..9d6cddf93850 100644 --- a/net-mgmt/net-snmp53/Makefile +++ b/net-mgmt/net-snmp53/Makefile @@ -6,8 +6,7 @@ # PORTNAME= snmp -PORTVERSION= 5.3.2 -PORTREVISION= 3 +PORTVERSION= 5.3.2.3 CATEGORIES= net-mgmt ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= net-snmp diff --git a/net-mgmt/net-snmp53/distinfo b/net-mgmt/net-snmp53/distinfo index 9d7148eaa1d5..4c17f570c6bc 100644 --- a/net-mgmt/net-snmp53/distinfo +++ b/net-mgmt/net-snmp53/distinfo @@ -1,3 +1,3 @@ -MD5 (net-snmp-5.3.2.tar.gz) = 978b9c5e26a36806945761b8ad0a0ecb -SHA256 (net-snmp-5.3.2.tar.gz) = 8171e0592b8c7e5dbb4009a44843c9b7f3b089f4685555578a0f3eeb849d49e7 -SIZE (net-snmp-5.3.2.tar.gz) = 4320436 +MD5 (net-snmp-5.3.2.3.tar.gz) = aeb9a03a3c1df806f73165a3e3690b98 +SHA256 (net-snmp-5.3.2.3.tar.gz) = 41d24e80b204267b71982dd6bccba2cc0abbe6abaf09542a2bbad2971f018eb1 +SIZE (net-snmp-5.3.2.3.tar.gz) = 4331941 diff --git a/net-mgmt/xymon-client/Makefile b/net-mgmt/xymon-client/Makefile deleted file mode 100644 index 1a071dbb82c0..000000000000 --- a/net-mgmt/xymon-client/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# New ports collection makefile for: hobbit-client -# Date created: 24 Jan 2008 -# Whom: dirk.meyer@dinoex.sub.org -# -# $FreeBSD$ -# - -PORTNAME= hobbit -PORTVERSION= 4.2.0 -PORTREVISION= 2 -CATEGORIES= net-mgmt www -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= hobbitmon -PKGNAMESUFFIX= -client${PKGNAMESUFFIX2} - -MAINTAINER= dinoex@FreeBSD.org -COMMENT= System for monitoring servers and networks - Client - -# Options -BBUSER?= hobbit -BBHOSTIP?= 127.0.0.1 - -USE_GMAKE= yes -CONFIGURE_ENV= MAKE=gmake -MAKE_ENV+= BBUSER="${BBUSER}" -MAKE_ENV+= BBHOSTIP="${BBHOSTIP}" -USE_RC_SUBR= hobbit-client.sh -PLIST_SUB+= BBUSER="${BBUSER}" -CONFIG_FILES= clientlaunch.cfg hobbitclient.cfg localclient.cfg - -# Configure script is interactive -do-configure: - ${CP} ${FILESDIR}/Makefile ${WRKSRC}/ - -pre-install: - if ! pw groupshow ${BBUSER}; then pw groupadd ${BBUSER} -g 280; fi - if ! pw usershow ${BBUSER}; then pw useradd ${BBUSER} -g ${BBUSER} -u 280 \ - -h - -d ${NONEXISTENT} -s /usr/sbin/nologin -c "Hobbit Monitor"; fi - -post-install: -.for i in ${CONFIG_FILES} - ${CP} -np ${WWWDIR}/client/etc/${i}-dist \ - ${WWWDIR}/client/etc/${i} -.endfor - -.include <bsd.port.mk> diff --git a/net-mgmt/xymon-client/distinfo b/net-mgmt/xymon-client/distinfo deleted file mode 100644 index ae7b9ebf2057..000000000000 --- a/net-mgmt/xymon-client/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (hobbit-4.2.0.tar.gz) = 120fd876b8494e249de0bf0366fcdd9a -SHA256 (hobbit-4.2.0.tar.gz) = 0c2ab43668921316ec435e736a499853d047f0f88a87aa362ccbb8637d2c8d3e -SIZE (hobbit-4.2.0.tar.gz) = 2341167 diff --git a/net-mgmt/xymon-client/files/Makefile b/net-mgmt/xymon-client/files/Makefile deleted file mode 100644 index 94df6fed50fc..000000000000 --- a/net-mgmt/xymon-client/files/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# Toplevel Makefile for Hobbit -# $FreeBSD$ -BUILDTOPDIR=`pwd` -CLIENTONLY = yes -LOCALCLIENT = no - -# configure settings for Hobbit -# -# Toplevel dir -BBTOPDIR = ${PREFIX}/www/hobbit -# Server home dir for etc/, www/ -BBHOME = ${PREFIX}/www/hobbit/client - -# hobbit settings follows -# -# Username running hobbit -#BBUSER = nobody -# Hobbit server IP-address -#BBHOSTIP = 127.0.0.1 -# Large File Support settings -LFSDEF = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 - -include build/Makefile.FreeBSD - - -# -# Add local CFLAGS etc. settings here - -include build/Makefile.rules - diff --git a/net-mgmt/xymon-client/files/hobbit-client.sh.in b/net-mgmt/xymon-client/files/hobbit-client.sh.in deleted file mode 100644 index 865eecc168cc..000000000000 --- a/net-mgmt/xymon-client/files/hobbit-client.sh.in +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: hobbit_client -# REQUIRE: DAEMON - -. "%%RC_SUBR%%" - -name="hobbit_client" -rcvar=`set_rcvar` - -load_rc_config "$name" -: ${hobbit_client_enable:="NO"} -: ${hobbit_client_flags:=""} - -command="%%PREFIX%%/www/hobbit/client/runclient.sh" -start_cmd="%%PREFIX%%/www/hobbit/client/runclient.sh ${hobbit_client_flags} start" -stop_cmd="%%PREFIX%%/www/hobbit/client/runclient.sh ${hobbit_client_flags} stop" -status_cmd="%%PREFIX%%/www/hobbit/client/runclient.sh ${hobbit_client_flags} status" -reload_cmd="%%PREFIX%%/www/hobbit/client/runclient.sh ${hobbit_client_flags} restart" -pidfile="%%PREFIX%%/www/hobbit/client/logs/clientlaunch.`hostname`.pid" - -run_rc_command "$1" -# eof diff --git a/net-mgmt/xymon-client/files/patch-Makefile b/net-mgmt/xymon-client/files/patch-Makefile deleted file mode 100644 index 77d6d6045367..000000000000 --- a/net-mgmt/xymon-client/files/patch-Makefile +++ /dev/null @@ -1,18 +0,0 @@ ---- client/Makefile.orig 2006-08-09 22:09:58.000000000 +0200 -+++ client/Makefile 2008-01-28 12:01:34.000000000 +0100 -@@ -63,12 +63,12 @@ - if test ! -d $(INSTALLROOT)$(BBHOME)/tmp ; then mkdir -p $(INSTALLROOT)$(BBHOME)/tmp ; fi - if test ! -d $(INSTALLROOT)$(BBHOME)/logs; then mkdir -p $(INSTALLROOT)$(BBHOME)/logs; fi - if test ! -d $(INSTALLROOT)$(BBHOME)/ext ; then mkdir -p $(INSTALLROOT)$(BBHOME)/ext ; fi -- if test ! -f $(INSTALLROOT)$(BBHOME)/etc/localclient.cfg ; then cp localclient.cfg $(INSTALLROOT)$(BBHOME)/etc/ ; fi -+ if test ! -f $(INSTALLROOT)$(BBHOME)/etc/localclient.cfg ; then cp localclient.cfg $(INSTALLROOT)$(BBHOME)/etc/localclient.cfg-dist ; fi - cp -fp runclient.sh $(INSTALLROOT)$(BBHOME) - cp -fp $(PROGRAMS) hobbitclient*.sh $(COMMONTOOLS) $(EXTRATOOLS) $(INSTALLROOT)$(BBHOME)/bin/ - -- ../build/merge-sects clientlaunch.cfg $(INSTALLROOT)$(BBHOME)/etc/clientlaunch.cfg -- ../build/merge-lines hobbitclient.cfg $(INSTALLROOT)$(BBHOME)/etc/hobbitclient.cfg -+ ../build/merge-sects clientlaunch.cfg $(INSTALLROOT)$(BBHOME)/etc/clientlaunch.cfg-dist -+ ../build/merge-lines hobbitclient.cfg $(INSTALLROOT)$(BBHOME)/etc/hobbitclient.cfg-dist - ifndef PKGBUILD - chown -R $(BBUSER) $(INSTALLROOT)$(BBHOME) - endif diff --git a/net-mgmt/xymon-client/files/patch-freebsd-meminfo.c b/net-mgmt/xymon-client/files/patch-freebsd-meminfo.c deleted file mode 100644 index 9c556e5b039e..000000000000 --- a/net-mgmt/xymon-client/files/patch-freebsd-meminfo.c +++ /dev/null @@ -1,11 +0,0 @@ ---- client/freebsd-meminfo.c.orig 2006-08-09 22:09:58.000000000 +0200 -+++ client/freebsd-meminfo.c 2008-03-01 04:31:43.000000000 +0100 -@@ -23,7 +23,7 @@ - unsigned long physmem; - - int hw_pagesize[] = { CTL_HW, HW_PAGESIZE }; -- unsigned long pagesize; -+ int pagesize; - - int vm_vmtotal[] = { CTL_VM, VM_METER }; - struct vmtotal vmdata; diff --git a/net-mgmt/xymon-client/pkg-descr b/net-mgmt/xymon-client/pkg-descr deleted file mode 100644 index 848c6c0f2445..000000000000 --- a/net-mgmt/xymon-client/pkg-descr +++ /dev/null @@ -1,15 +0,0 @@ -Hobbit is a system for monitoring servers and networks. It has a great deal -of inspiration from the Big Brother monitor, but unlike Big Brother it is -designed to work well whether you need to monitor small network with just -a handful of hosts, or large networks with thousands of hosts. - -Hobbit is the successor to the bbgen toolkit, which has been available as -an add-on to Big Brother since late 2002. The name change was decided upon -when Hobbit acquired enough functionality to be a stand-alone product. -The tools that formed the bbgen toolkit are still present in Hobbit -and are quite important for it, so if you have used bbgen before, -Hobbit will seem quite familiar. - -This is the client. - -WWW: http://hobbitmon.sourceforge.net/ diff --git a/net-mgmt/xymon-client/pkg-plist b/net-mgmt/xymon-client/pkg-plist deleted file mode 100644 index 68a253276fa8..000000000000 --- a/net-mgmt/xymon-client/pkg-plist +++ /dev/null @@ -1,49 +0,0 @@ -@exec if ! pw groupshow %%BBUSER%% 2>/dev/null; then pw groupadd %%BBUSER%% -g 280; fi -@exec if ! pw usershow %%BBUSER%% 2>/dev/null; then pw useradd %%BBUSER%% -g %%BBUSER%% -u 280 -h - -d /nonexistent -s /usr/sbin/nologin -c "Hobbit Monitor"; fi -@unexec if pw usershow %%BBUSER%%; then pw userdel %%BBUSER%%; fi -%%WWWDIR%%/client/bin/bb -%%WWWDIR%%/client/bin/bbcmd -%%WWWDIR%%/client/bin/bbdigest -%%WWWDIR%%/client/bin/bbhostgrep -%%WWWDIR%%/client/bin/bbhostshow -%%WWWDIR%%/client/bin/clientupdate -%%WWWDIR%%/client/bin/freebsd-meminfo -%%WWWDIR%%/client/bin/hobbitclient-aix.sh -%%WWWDIR%%/client/bin/hobbitclient-darwin.sh -%%WWWDIR%%/client/bin/hobbitclient-freebsd.sh -%%WWWDIR%%/client/bin/hobbitclient-hp-ux.sh -%%WWWDIR%%/client/bin/hobbitclient-irix.sh -%%WWWDIR%%/client/bin/hobbitclient-linux.sh -%%WWWDIR%%/client/bin/hobbitclient-netbsd.sh -%%WWWDIR%%/client/bin/hobbitclient-openbsd.sh -%%WWWDIR%%/client/bin/hobbitclient-osf1.sh -%%WWWDIR%%/client/bin/hobbitclient-sco_sv.sh -%%WWWDIR%%/client/bin/hobbitclient-sunos.sh -%%WWWDIR%%/client/bin/hobbitclient.sh -%%WWWDIR%%/client/bin/hobbitlaunch -%%WWWDIR%%/client/bin/logfetch -%%WWWDIR%%/client/bin/msgcache -%%WWWDIR%%/client/bin/orcahobbit -@unexec if cmp -s %D/%%WWWDIR%%/client/etc/clientlaunch.cfg %D/%%WWWDIR%%/client/etc/clientlaunch.cfg-dist; then rm -f %D/%%WWWDIR%%/client/etc/clientlaunch.cfg; fi -@unexec if cmp -s %D/%%WWWDIR%%/client/etc/hobbitclient.cfg %D/%%WWWDIR%%/client/etc/hobbitclient.cfg-dist; then rm -f %D/%%WWWDIR%%/client/etc/hobbitclient.cfg; fi -@unexec if cmp -s %D/%%WWWDIR%%/client/etc/localclient.cfg %D/%%WWWDIR%%/client/etc/localclient.cfg-dist; then rm -f %D/%%WWWDIR%%/client/etc/localclient.cfg; fi -%%WWWDIR%%/client/etc/clientlaunch.cfg-dist -@exec [ ! -f %B/clientlaunch.cfg ] && cp %B/%f %B/clientlaunch.cfg -%%WWWDIR%%/client/etc/hobbitclient.cfg-dist -@exec [ ! -f %B/hobbitclient.cfg ] && cp %B/%f %B/hobbitclient.cfg -%%WWWDIR%%/client/etc/localclient.cfg-dist -@exec [ ! -f %B/localclient.cfg ] && cp %B/%f %B/localclient.cfg -%%WWWDIR%%/client/runclient.sh -@exec mkdir %D/%%WWWDIR%%/client/ext -@exec mkdir %D/%%WWWDIR%%/client/logs -@exec mkdir %D/%%WWWDIR%%/client/tmp -@exec chown %%BBUSER%% %D/%%WWWDIR%%/client/ext -@exec chown %%BBUSER%% %D/%%WWWDIR%%/client/logs -@exec chown %%BBUSER%% %D/%%WWWDIR%%/client/tmp -@dirrm %%WWWDIR%%/client/tmp -@dirrm %%WWWDIR%%/client/logs -@dirrm %%WWWDIR%%/client/ext -@dirrm %%WWWDIR%%/client/etc -@dirrm %%WWWDIR%%/client/bin -@dirrm %%WWWDIR%%/client -@dirrmtry %%WWWDIR%% diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile deleted file mode 100644 index fe16be01bf41..000000000000 --- a/net-mgmt/xymon-server/Makefile +++ /dev/null @@ -1,87 +0,0 @@ -# New ports collection makefile for: hobbit-server -# Date created: 24 Jan 2008 -# Whom: dirk.meyer@dinoex.sub.org -# -# $FreeBSD$ -# - -PORTNAME= hobbit -PORTVERSION= 4.2.0 -PORTREVISION= 3 -CATEGORIES= net-mgmt www -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= hobbitmon -PKGNAMESUFFIX= -server${PKGNAMESUFFIX2} - -MAINTAINER= dinoex@FreeBSD.org -COMMENT= System for monitoring servers and networks - -BUILD_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool -LIB_DEPENDS= png:${PORTSDIR}/graphics/png \ - pcre:${PORTSDIR}/devel/pcre -RUN_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool - -# Options -BBUSER?= hobbit -BBHOSTNAME?= hobbit.example.com -BBHOSTIP?= 127.0.0.1 - -USE_GMAKE= yes -USE_OPENSSL= yes -CONFIGURE_ENV= MAKE=gmake -MAKE_ENV+= BBUSER="${BBUSER}" -MAKE_ENV+= BBHOSTNAME="${BBHOSTNAME}" -MAKE_ENV+= BBHOSTIP="${BBHOSTIP}" -USE_RC_SUBR= hobbit-server.sh -SUB_LIST+= BBUSER="${BBUSER}" -PLIST_SUB+= BBUSER="${BBUSER}" VARBASE="/var" - -CONFIG_FILES= bb-hosts bb-services bbcombotest.cfg client-local.cfg \ - columndoc.csv hobbit-alerts.cfg hobbit-apache.conf \ - hobbit-clients.cfg hobbitcgi.cfg hobbitgraph.cfg \ - hobbitlaunch.cfg hobbitserver.cfg -FIXME1= bb-hosts hobbit-alerts.cfg hobbit-clients.cfg bbcombotest.cfg - -MAN1 = bb-ack.cgi.1 bb-csvinfo.cgi.1 bb-datepage.cgi.1 bb-eventlog.cgi.1 \ - bb-findhost.cgi.1 bb-hist.cgi.1 bb-rep.cgi.1 bb-replog.cgi.1 \ - bb-snapshot.cgi.1 bb-webpage.1 bb.1 bbcmd.1 bbcombotest.1 bbdigest.1 \ - bbgen.1 bbhostgrep.1 bbhostshow.1 bbretest-net.sh.1 bbtest-net.1 \ - clientupdate.1 hobbit-ackinfo.cgi.1 hobbit-confreport.cgi.1 \ - hobbit-ghosts.cgi.1 hobbit-hostgraphs.cgi.1 hobbit-nkedit.cgi.1 \ - hobbit-nkview.cgi.1 hobbit-statusreport.cgi.1 hobbitgraph.cgi.1 \ - hobbitping.1 hobbitsvc.cgi.1 logfetch.1 orcahobbit.1 -MAN5= bb-hosts.5 bb-services.5 bbcombotest.cfg.5 client-local.cfg.5 \ - clientlaunch.cfg.5 hobbit-alerts.cfg.5 hobbit-clients.cfg.5 \ - hobbit-nkview.cfg.5 hobbitcgi.cfg.5 hobbitclient.cfg.5 \ - hobbitgraph.cfg.5 hobbitlaunch.cfg.5 hobbitserver.cfg.5 hobbitweb.5 -MAN7= hobbit.7 -MAN8= bbmessage.cgi.8 bbproxy.8 hobbit-enadis.cgi.8 hobbit-mailack.8 \ - hobbitd.8 hobbitd_alert.8 hobbitd_channel.8 hobbitd_client.8 \ - hobbitd_filestore.8 hobbitd_history.8 hobbitd_hostdata.8 \ - hobbitd_rrd.8 hobbitd_sample.8 hobbitfetch.8 hobbitlaunch.8 \ - msgcache.8 trimhistory.8 - -.if defined(WITH_LDAP) -MAKE_ENV+= WITH_LDAP=1 -USE_OPENLDAP= yes -.endif - -# Configure script is interactive -do-configure: - ${CP} ${FILESDIR}/Makefile ${WRKSRC}/ - -pre-install: - if ! pw groupshow ${BBUSER}; then pw groupadd ${BBUSER} -g 280; fi - if ! pw usershow ${BBUSER}; then pw useradd ${BBUSER} -g ${BBUSER} -u 280 \ - -h - -d ${NONEXISTENT} -s /usr/sbin/nologin -c "Hobbit Monitor"; fi - -post-install: -.for i in ${FIXME1} - ${INSTALL_DATA} ${WRKSRC}/hobbitd/etcfiles/${i} ${WWWDIR}/server/etc/${i}-dist -.endfor -.for i in ${CONFIG_FILES} - ${CP} -np ${WWWDIR}/server/etc/${i}-dist \ - ${WWWDIR}/server/etc/${i} -.endfor - -.include <bsd.port.mk> diff --git a/net-mgmt/xymon-server/distinfo b/net-mgmt/xymon-server/distinfo deleted file mode 100644 index ae7b9ebf2057..000000000000 --- a/net-mgmt/xymon-server/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (hobbit-4.2.0.tar.gz) = 120fd876b8494e249de0bf0366fcdd9a -SHA256 (hobbit-4.2.0.tar.gz) = 0c2ab43668921316ec435e736a499853d047f0f88a87aa362ccbb8637d2c8d3e -SIZE (hobbit-4.2.0.tar.gz) = 2341167 diff --git a/net-mgmt/xymon-server/files/Makefile b/net-mgmt/xymon-server/files/Makefile deleted file mode 100644 index 9b25ee5e7910..000000000000 --- a/net-mgmt/xymon-server/files/Makefile +++ /dev/null @@ -1,76 +0,0 @@ -# Toplevel Makefile for Hobbit -# $FreeBSD$ -BUILDTOPDIR=`pwd` - -# configure settings for Hobbit -# -# Toplevel dir -BBTOPDIR = ${PREFIX}/www/hobbit -# Server home dir for etc/, bin/ -BBHOME = ${PREFIX}/www/hobbit/server -# Server data dir for hist/ etc. -BBVAR = ${PREFIX}/www/hobbit/data -# CGI scripts go in CGIDIR -CGIDIR = ${PREFIX}/www/hobbit/cgi-bin -# Admin CGI scripts go in SECURECGIDIR -SECURECGIDIR = ${PREFIX}/www/hobbit/cgi-secure -# Where to put logfiles -BBLOGDIR = /var/log/hobbit -# Where to install manpages -MANROOT = ${PREFIX}/man -# How to run fping or hobbitping -FPING = hobbitping - -# Username running hobbit -#BBUSER = nobody -# Hobbit server hostname -#BBHOSTNAME = hobbit.example.com -# Hobbit server IP-address -#BBHOSTIP = 127.0.0.1 -# Hobbit server OS -BBHOSTOS = freebsd - -# URL for Hobbit webpages -BBHOSTURL = /hobbit -# URL for Hobbit CGIs -BBCGIURL = /hobbit-cgi -# URL for Hobbit Admin CGIs -SECUREBBCGIURL = /hobbit-seccgi -# Webserver group-ID -HTTPDGID=80 - -# RRDtool settings -RRDDEF = -DRRDTOOL12 -RRDINCDIR = -I${LOCALBASE}/include -RRDLIBS = -L${LOCALBASE}/lib -lrrd -L${LOCALBASE}/lib -lpng -RPATHVAL += ${LOCALBASE}/lib - -# PCRE settings -PCREINCDIR = -I${LOCALBASE}/include -PCRELIBS = -L${LOCALBASE}/lib -lpcre -RPATHVAL += ${LOCALBASE}/lib -# -# OpenSSL settings -SSLFLAGS = -DBBGEN_SSL -SSLINCDIR = -I${OPENSSLINC} -SSLLIBS = -L${OPENSSLLIB} -lssl -lcrypto -RPATHVAL += ${OPENSSLLIB} -# -ifdef WITH_LDAP -# OpenLDAP settings -LDAPFLAGS = -DBBGEN_LDAP -DBBGEN_LDAP_USESTARTTLS -LDAPINCDIR = -I${PREFIX}/include -LDAPLIBS = -L${PREFIX}/lib -lldap -llber -RPATHVAL += ${PREFIX}/lib -endif -# -# Large File Support settings -LFSDEF = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 - -include build/Makefile.FreeBSD - - -# Add local CFLAGS etc. settings here - -include build/Makefile.rules - diff --git a/net-mgmt/xymon-server/files/hobbit-server.sh.in b/net-mgmt/xymon-server/files/hobbit-server.sh.in deleted file mode 100644 index e79f3950143d..000000000000 --- a/net-mgmt/xymon-server/files/hobbit-server.sh.in +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: hobbit_server -# REQUIRE: DAEMON - -. "%%RC_SUBR%%" - -name="hobbit_server" -rcvar=`set_rcvar` - -load_rc_config "$name" -: ${hobbit_server_enable:="NO"} - -command="su -m %%BBUSER%% -c '%%PREFIX%%/www/hobbit/server/hobbit.sh'" -start_cmd="su -m %%BBUSER%% -c '%%PREFIX%%/www/hobbit/server/hobbit.sh start'" -stop_cmd="su -m %%BBUSER%% -c '%%PREFIX%%/www/hobbit/server/hobbit.sh stop'" -status_cmd="su -m %%BBUSER%% -c '%%PREFIX%%/www/hobbit/server/hobbit.sh status'" -reload_cmd="su -m %%BBUSER%% -c '%%PREFIX%%/www/hobbit/server/hobbit.sh reload'" -restart_cmd="su -m %%BBUSER%% -c '%%PREFIX%%/www/hobbit/server/hobbit.sh restart'" -pidfile="/var/log/hobbit/hobbitd.pid" - -run_rc_command "$1" -# eof diff --git a/net-mgmt/xymon-server/files/patch-bbnet-Makefile b/net-mgmt/xymon-server/files/patch-bbnet-Makefile deleted file mode 100644 index 251c026d5702..000000000000 --- a/net-mgmt/xymon-server/files/patch-bbnet-Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- bbnet/Makefile.orig 2006-08-09 22:09:56.000000000 +0200 -+++ bbnet/Makefile 2008-01-28 16:08:57.000000000 +0100 -@@ -88,8 +88,8 @@ - cp -fp $(EXTENSIONS) $(INSTALLROOT)$(INSTALLEXTDIR)/ - - install-config: -- ../build/convert-bbservices $(INSTALLROOT)$(INSTALLETCDIR)/bb-services -- ../build/merge-sects bb-services $(INSTALLROOT)$(INSTALLETCDIR)/bb-services -+ ../build/convert-bbservices $(INSTALLROOT)$(INSTALLETCDIR)/bb-services-dist -+ ../build/merge-sects bb-services $(INSTALLROOT)$(INSTALLETCDIR)/bb-services-dist - - install-man: - mkdir -p $(INSTALLROOT)$(MANROOT)/man1 $(INSTALLROOT)$(MANROOT)/man5 diff --git a/net-mgmt/xymon-server/files/patch-bbwin b/net-mgmt/xymon-server/files/patch-bbwin deleted file mode 100644 index 3f7312b3ecca..000000000000 --- a/net-mgmt/xymon-server/files/patch-bbwin +++ /dev/null @@ -1,579 +0,0 @@ -diff -Naur /home/etienne/hobbit-4.2/hobbitd/client/bbwin.c ./hobbitd/client/bbwin.c ---- /home/etienne/hobbit-4.2/hobbitd/client/bbwin.c 1970-01-01 01:00:00.000000000 +0100 -+++ ./hobbitd/client/bbwin.c 2007-12-27 13:54:02.000000000 +0100 -@@ -0,0 +1,316 @@ -+/*----------------------------------------------------------------------------*/ -+/* Hobbit message daemon. */ -+/* */ -+/* Client backend module for BBWin/Windoes client */ -+/* */ -+/* Copyright (C) 2006-2007 Henrik Storner <henrik@hswn.dk> */ -+/* Copyright (C) 2007 Francois Lacroix */ -+/* Copyright (C) 2007 Etienne Grignon <etienne.grignon@gmail.com> */ -+/* */ -+/* This program is released under the GNU General Public License (GPL), */ -+/* version 2. See the file "COPYING" for details. */ -+/* */ -+/*----------------------------------------------------------------------------*/ -+ -+static char bbwin_rcsid[] = "$Id: bbwin.c,v 1.2 2007/07/18 21:20:15 henrik Exp $"; -+ -+static void bbwin_uptime_report(char *hostname, char *clientclass, enum ostype_t os, -+ void *hinfo, char *fromline, char *timestr, -+ char *uptimestr) -+{ -+ char *p, *myuptimestr = NULL; -+ float loadyellow, loadred; -+ int recentlimit, ancientlimit, maxclockdiff; -+ long uptimesecs = -1; -+ int uptimecolor = COL_GREEN; -+ char msgline[4096]; -+ strbuffer_t *upmsg; -+ -+ if (!want_msgtype(hinfo, MSG_CPU)) return; -+ if (!uptimestr) return; -+ -+ dbgprintf("Uptime check host %s\n", hostname); -+ -+ uptimesecs = 0; -+ -+ /* Parse to check data */ -+ p = strstr(uptimestr, "sec:"); -+ if (p) { -+ p += strcspn(p, "0123456789\r\n"); -+ uptimesecs = atol(p); -+ dbgprintf("uptimestr [%d]\n", uptimesecs); /* DEBUG TODO REMOVE */ -+ } -+ /* Parse to show a nice msg */ -+ myuptimestr = strchr(uptimestr, '\n'); -+ if (myuptimestr) { -+ ++myuptimestr; -+ } -+ get_cpu_thresholds(hinfo, clientclass, &loadyellow, &loadred, &recentlimit, &ancientlimit, &maxclockdiff); -+ dbgprintf("DEBUG recentlimit: [%d] ancienlimit: [%d]\n", recentlimit, ancientlimit); /* DEBUG TODO REMOVE */ -+ -+ upmsg = newstrbuffer(0); -+ if ((uptimesecs != -1) && (recentlimit != -1) && (uptimesecs < recentlimit)) { -+ if (uptimecolor == COL_GREEN) uptimecolor = COL_YELLOW; -+ addtobuffer(upmsg, "&yellow Machine recently rebooted\n"); -+ } -+ if ((uptimesecs != -1) && (ancientlimit != -1) && (uptimesecs > ancientlimit)) { -+ if (uptimecolor == COL_GREEN) uptimecolor = COL_YELLOW; -+ sprintf(msgline, "&yellow Machine has been up more than %d days\n", (ancientlimit / 86400)); -+ addtobuffer(upmsg, msgline); -+ } -+ -+ init_status(uptimecolor); -+ sprintf(msgline, "status %s.uptime %s %s %s\n", -+ commafy(hostname), colorname(uptimecolor), -+ (timestr ? timestr : "<No timestamp data>"), -+ ((uptimecolor == COL_GREEN) ? "OK" : "NOT ok")); -+ -+ addtostatus(msgline); -+ /* And add the info if pb */ -+ if (STRBUFLEN(upmsg)) { -+ addtostrstatus(upmsg); -+ addtostatus("\n"); -+ } -+ /* And add the msg we recevied */ -+ if (myuptimestr) { -+ addtostatus(myuptimestr); -+ addtostatus("\n"); -+ } -+ -+ dbgprintf("msgline %s", msgline); /* DEBUG TODO REMOVE */ -+ -+ if (fromline && !localmode) addtostatus(fromline); -+ finish_status(); -+ -+ freestrbuffer(upmsg); -+} -+ -+ -+static void bbwin_cpu_report(char *hostname, char *clientclass, enum ostype_t os, -+ void *hinfo, char *fromline, char *timestr, -+ char *cpuutilstr) -+{ -+ char *p, *topstr; -+ float load1, loadyellow, loadred; -+ int recentlimit, ancientlimit, maxclockdiff; -+ int cpucolor = COL_GREEN; -+ -+ char msgline[4096]; -+ strbuffer_t *cpumsg; -+ -+ if (!want_msgtype(hinfo, MSG_CPU)) return; -+ if (!cpuutilstr) return; -+ -+ dbgprintf("CPU check host %s\n", hostname); -+ -+ load1 = 0; -+ -+ p = strstr(cpuutilstr, "load="); -+ if (p) { -+ p += strcspn(p, "0123456789%\r\n"); -+ load1 = atol(p); -+ dbgprintf("load1 [%d]\n", load1); /* DEBUG TODO REMOVE */ -+ } -+ topstr = strstr(cpuutilstr, "CPU states"); -+ if (topstr) { -+ *(topstr - 1) = '\0'; -+ } -+ -+ get_cpu_thresholds(hinfo, clientclass, &loadyellow, &loadred, &recentlimit, &ancientlimit, &maxclockdiff); -+ dbgprintf("loadyellow: %d, loadred: %d\n", loadyellow, loadred); -+ -+ cpumsg = newstrbuffer(0); -+ if (load1 > loadred) { -+ cpucolor = COL_RED; -+ addtobuffer(cpumsg, "&red Load is CRITICAL\n"); -+ } -+ else if (load1 > loadyellow) { -+ cpucolor = COL_YELLOW; -+ addtobuffer(cpumsg, "&yellow Load is HIGH\n"); -+ } -+ init_status(cpucolor); -+ sprintf(msgline, "status %s.cpu %s %s %s", -+ commafy(hostname), colorname(cpucolor), -+ (timestr ? timestr : "<No timestamp data>"), -+ cpuutilstr); -+ -+ addtostatus(msgline); -+ /* And add the info if pb */ -+ if (STRBUFLEN(cpumsg)) { -+ addtostrstatus(cpumsg); -+ addtostatus("\n"); -+ } -+ /* And add the msg we recevied */ -+ if (topstr) { -+ addtostatus(topstr); -+ addtostatus("\n"); -+ } -+ -+ dbgprintf("msgline %s", msgline); /* DEBUG TODO REMOVE */ -+ -+ if (fromline && !localmode) addtostatus(fromline); -+ finish_status(); -+ -+ freestrbuffer(cpumsg); -+} -+ -+static void bbwin_clock_report(char *hostname, char *clientclass, enum ostype_t os, -+ void *hinfo, char *fromline, char *timestr, -+ char *clockstr, char *msgcachestr) -+{ -+ char *myclockstr; -+ int clockcolor = COL_GREEN; -+ float loadyellow, loadred; -+ int recentlimit, ancientlimit, maxclockdiff; -+ char msgline[4096]; -+ strbuffer_t *clockmsg; -+ -+ if (!want_msgtype(hinfo, MSG_CPU)) return; -+ if (!clockstr) return; -+ -+ dbgprintf("Clock check host %s\n", hostname); -+ -+ clockmsg = newstrbuffer(0); -+ -+ myclockstr = strstr(clockstr, "local"); -+ if (myclockstr) { -+ *(myclockstr - 1) = '\0'; -+ } -+ -+ get_cpu_thresholds(hinfo, clientclass, &loadyellow, &loadred, &recentlimit, &ancientlimit, &maxclockdiff); -+ -+ if (clockstr) { -+ char *p; -+ struct timeval clockval; -+ -+ p = strstr(clockstr, "epoch:"); -+ if (p && (sscanf(p, "epoch: %ld.%ld", (long int *)&clockval.tv_sec, (long int *)&clockval.tv_usec) == 2)) { -+ struct timeval clockdiff; -+ struct timezone tz; -+ int cachedelay = 0; -+ -+ if (msgcachestr) { -+ /* Message passed through msgcache, so adjust for the cache delay */ -+ p = strstr(msgcachestr, "Cachedelay:"); -+ if (p) cachedelay = atoi(p+11); -+ } -+ -+ gettimeofday(&clockdiff, &tz); -+ clockdiff.tv_sec -= (clockval.tv_sec + cachedelay); -+ clockdiff.tv_usec -= clockval.tv_usec; -+ if (clockdiff.tv_usec < 0) { -+ clockdiff.tv_usec += 1000000; -+ clockdiff.tv_sec -= 1; -+ } -+ -+ if ((maxclockdiff > 0) && (abs(clockdiff.tv_sec) > maxclockdiff)) { -+ if (clockcolor == COL_GREEN) clockcolor = COL_YELLOW; -+ sprintf(msgline, "&yellow System clock is %ld seconds off (max %ld)\n", -+ (long) clockdiff.tv_sec, (long) maxclockdiff); -+ addtobuffer(clockmsg, msgline); -+ } -+ else { -+ sprintf(msgline, "System clock is %ld seconds off\n", (long) clockdiff.tv_sec); -+ addtobuffer(clockmsg, msgline); -+ } -+ } -+ } -+ -+ init_status(clockcolor); -+ sprintf(msgline, "status %s.timediff %s %s %s\n", -+ commafy(hostname), colorname(clockcolor), -+ (timestr ? timestr : "<No timestamp data>"), -+ ((clockcolor == COL_GREEN) ? "OK" : "NOT ok")); -+ -+ addtostatus(msgline); -+ /* And add the info if pb */ -+ if (STRBUFLEN(clockmsg)) { -+ addtostrstatus(clockmsg); -+ addtostatus("\n"); -+ } -+ /* And add the msg we recevied */ -+ if (myclockstr) { -+ addtostatus(myclockstr); -+ addtostatus("\n"); -+ } -+ -+ dbgprintf("msgline %s", msgline); /* DEBUG TODO REMOVE */ -+ -+ if (fromline && !localmode) addtostatus(fromline); -+ finish_status(); -+ -+ freestrbuffer(clockmsg); -+} -+ -+void handle_win32_bbwin_client(char *hostname, char *clienttype, enum ostype_t os, -+ void *hinfo, char *sender, time_t timestamp, -+ char *clientdata) -+{ -+ char *timestr; -+ char *cpuutilstr; -+ char *uptimestr; -+ char *clockstr; -+ char *msgcachestr; -+ char *diskstr; -+ char *procsstr; -+ char *msgsstr; -+ char *portsstr; -+ char *memorystr; -+ char *netstatstr; -+ char *ifstatstr; -+ -+ char fromline[1024]; -+ -+ sprintf(fromline, "\nStatus message received from %s\n", sender); -+ -+ splitmsg(clientdata); -+ -+ /* Get all data by section timestr is the date time for all status */ -+ timestr = getdata("date"); -+ if (!timestr) return; -+ -+ uptimestr = getdata("uptime"); -+ clockstr = getdata("clock"); -+ msgcachestr = getdata("msgcache"); /* TODO check when it is usefull */ -+ cpuutilstr = getdata("cpu"); -+ procsstr = getdata("procs"); -+ diskstr = getdata("disk"); -+ portsstr = getdata("ports"); -+ memorystr = getdata("memory"); -+ msgsstr = getdata("msg"); -+ netstatstr = getdata("netstat"); -+ ifstatstr = getdata("ifstat"); -+ -+ bbwin_uptime_report(hostname, clienttype, os, hinfo, fromline, timestr, uptimestr); -+ bbwin_clock_report(hostname, clienttype, os, hinfo, fromline, timestr, clockstr, msgcachestr); -+ bbwin_cpu_report(hostname, clienttype, os, hinfo, fromline, timestr, cpuutilstr); -+ unix_procs_report(hostname, clienttype, os, hinfo, fromline, timestr, "Name", NULL, procsstr); -+ unix_ports_report(hostname, clienttype, os, hinfo, fromline, timestr, 1, 2, 3, portsstr); -+ unix_disk_report(hostname, clienttype, os, hinfo, fromline, timestr, "Avail", "Capacity", "Filesystem", diskstr); -+ -+ msgs_report(hostname, clienttype, os, hinfo, fromline, timestr, msgsstr); -+ file_report(hostname, clienttype, os, hinfo, fromline, timestr); -+ linecount_report(hostname, clienttype, os, hinfo, fromline, timestr); -+ -+ /* Data status */ -+ unix_netstat_report(hostname, clienttype, os, hinfo, fromline, timestr, netstatstr); -+ unix_ifstat_report(hostname, clienttype, os, hinfo, fromline, timestr, ifstatstr); -+ -+ if (memorystr) { -+ char *p; -+ long memphystotal, memphysused, -+ memactused, memacttotal, -+ memswaptotal, memswapused; -+ -+ memphystotal = memswaptotal = memphysused = memswapused = memactused = memacttotal = -1; -+ p = strstr(memorystr, "\nphysical:"); -+ if (p) sscanf(p, "\nphysical: %ld %ld", &memphystotal, &memphysused); -+ p = strstr(memorystr, "\npage:"); -+ if (p) sscanf(p, "\npage: %ld %ld", &memswaptotal, &memswapused); -+ p = strstr(memorystr, "\nvirtual:"); -+ if (p) sscanf(p, "\nvirtual: %ld %ld", &memacttotal, &memactused); -+ dbgprintf("DEBUG Memory %ld %ld %ld %ld %ld\n", memphystotal, memphysused, memactused, memswaptotal, memswapused); /* DEBUG TODO Remove*/ -+ unix_memory_report(hostname, clienttype, os, hinfo, fromline, timestr, -+ memphystotal, memphysused, memactused, memswaptotal, memswapused); -+ } -+} -diff -Naur /home/etienne/hobbit-4.2/hobbitd/hobbitd_client.c ./hobbitd/hobbitd_client.c ---- /home/etienne/hobbit-4.2/hobbitd/hobbitd_client.c 2007-10-30 14:21:10.000000000 +0100 -+++ ./hobbitd/hobbitd_client.c 2007-12-26 14:28:02.000000000 +0100 -@@ -1402,6 +1402,7 @@ - #include "client/darwin.c" - #include "client/irix.c" - #include "client/sco_sv.c" -+#include "client/bbwin.c" - - static volatile int reloadconfig = 0; - -@@ -1770,57 +1771,61 @@ - - combo_start(); - switch (os) { -- case OS_FREEBSD: -- handle_freebsd_client(hostname, clientclass, os, hinfo, sender, timestamp, restofmsg); -- break; -- -- case OS_NETBSD: -- handle_netbsd_client(hostname, clientclass, os, hinfo, sender, timestamp, restofmsg); -- break; -- -- case OS_OPENBSD: -- handle_openbsd_client(hostname, clientclass, os, hinfo, sender, timestamp, restofmsg); -- break; -- -- case OS_LINUX22: -- case OS_LINUX: -- case OS_RHEL3: -- handle_linux_client(hostname, clientclass, os, hinfo, sender, timestamp, restofmsg); -- break; -- -- case OS_DARWIN: -- handle_darwin_client(hostname, clientclass, os, hinfo, sender, timestamp, restofmsg); -- break; -- -- case OS_SOLARIS: -- handle_solaris_client(hostname, clientclass, os, hinfo, sender, timestamp, restofmsg); -- break; -- -- case OS_HPUX: -- handle_hpux_client(hostname, clientclass, os, hinfo, sender, timestamp, restofmsg); -- break; -- -- case OS_OSF: -- handle_osf_client(hostname, clientclass, os, hinfo, sender, timestamp, restofmsg); -- break; -- -- case OS_AIX: -- handle_aix_client(hostname, clientclass, os, hinfo, sender, timestamp, restofmsg); -- break; -- -- case OS_IRIX: -- handle_irix_client(hostname, clientclass, os, hinfo, sender, timestamp, restofmsg); -- break; -- -+ case OS_FREEBSD: -+ handle_freebsd_client(hostname, clientclass, os, hinfo, sender, timestamp, restofmsg); -+ break; -+ -+ case OS_NETBSD: -+ handle_netbsd_client(hostname, clientclass, os, hinfo, sender, timestamp, restofmsg); -+ break; -+ -+ case OS_OPENBSD: -+ handle_openbsd_client(hostname, clientclass, os, hinfo, sender, timestamp, restofmsg); -+ break; -+ -+ case OS_LINUX22: -+ case OS_LINUX: -+ case OS_RHEL3: -+ handle_linux_client(hostname, clientclass, os, hinfo, sender, timestamp, restofmsg); -+ break; -+ -+ case OS_DARWIN: -+ handle_darwin_client(hostname, clientclass, os, hinfo, sender, timestamp, restofmsg); -+ break; -+ -+ case OS_SOLARIS: -+ handle_solaris_client(hostname, clientclass, os, hinfo, sender, timestamp, restofmsg); -+ break; -+ -+ case OS_HPUX: -+ handle_hpux_client(hostname, clientclass, os, hinfo, sender, timestamp, restofmsg); -+ break; -+ -+ case OS_OSF: -+ handle_osf_client(hostname, clientclass, os, hinfo, sender, timestamp, restofmsg); -+ break; -+ -+ case OS_AIX: -+ handle_aix_client(hostname, clientclass, os, hinfo, sender, timestamp, restofmsg); -+ break; -+ -+ case OS_IRIX: -+ handle_irix_client(hostname, clientclass, os, hinfo, sender, timestamp, restofmsg); -+ break; -+ - case OS_SCO_SV: -- handle_sco_sv_client(hostname, clientclass, os, hinfo, sender, timestamp, restofmsg); -- break; -- -- case OS_WIN32: -- case OS_SNMP: -- case OS_UNKNOWN: -- errprintf("No client backend for OS '%s' sent by %s\n", clientos, sender); -- break; -+ handle_sco_sv_client(hostname, clientclass, os, hinfo, sender, timestamp, restofmsg); -+ break; -+ -+ case OS_WIN32_BBWIN: -+ handle_win32_bbwin_client(hostname, clientclass, os, hinfo, sender, timestamp, restofmsg); -+ break; -+ -+ case OS_WIN32: -+ case OS_SNMP: -+ case OS_UNKNOWN: -+ errprintf("No client backend for OS '%s' sent by %s\n", clientos, sender); -+ break; - } - combo_end(); - } -diff -Naur /home/etienne/hobbit-4.2/hobbitd/rrd/do_disk.c ./hobbitd/rrd/do_disk.c ---- /home/etienne/hobbit-4.2/hobbitd/rrd/do_disk.c 2007-10-30 14:21:04.000000000 +0100 -+++ ./hobbitd/rrd/do_disk.c 2007-12-27 13:54:50.000000000 +0100 -@@ -2,6 +2,7 @@ - /* Hobbit RRD handler module. */ - /* */ - /* Copyright (C) 2004-2006 Henrik Storner <henrik@hswn.dk> */ -+/* Copyright (C) 2007 Francois Lacroix */ - /* */ - /* This program is released under the GNU General Public License (GPL), */ - /* version 2. See the file "COPYING" for details. */ -@@ -16,7 +17,7 @@ - rra1, rra2, rra3, rra4, NULL }; - static char *disk_tpl = NULL; - -- enum { DT_IRIX, DT_AS400, DT_NT, DT_UNIX, DT_NETAPP, DT_NETWARE } dsystype; -+ enum { DT_IRIX, DT_AS400, DT_NT, DT_UNIX, DT_NETAPP, DT_NETWARE, DT_BBWIN } dsystype; - char *eoln, *curline; - static int ptnsetup = 0; - static pcre *inclpattern = NULL; -@@ -48,6 +49,7 @@ - else if (strstr(msg, "DASD")) dsystype = DT_AS400; - else if (strstr(msg, "NetWare Volumes")) dsystype = DT_NETWARE; - else if (strstr(msg, "NetAPP")) dsystype = DT_NETAPP; -+ else if (strstr(msg, "Summary")) dsystype = DT_BBWIN; /* Make sur it is a bbwin client v > 0.10 */ - else if (strstr(msg, "Filesystem")) dsystype = DT_NT; - else dsystype = DT_UNIX; - -@@ -83,6 +85,8 @@ - * Some Unix filesystem reports contain the word "Filesystem". - * So check if there's a slash in the NT filesystem letter - if yes, - * then it's really a Unix system after all. -+ * Not always has BBWIN > 0.10 not give the information also on mounted disk. -+ * (IE more than one letter) - */ - if ( (dsystype == DT_NT) && (*(columns[5])) && - ((strchr(columns[0], '/')) || (strlen(columns[0]) > 1)) ) -@@ -112,6 +116,7 @@ - pused = atoi(columns[columncount-1]); - aused = 0; /* Not available */ - break; -+ case DT_BBWIN: - case DT_NT: - diskname = xmalloc(strlen(columns[0])+2); - sprintf(diskname, "/%s", columns[0]); -diff -Naur /home/etienne/hobbit-4.2/hobbitd/rrd/do_ifstat.c ./hobbitd/rrd/do_ifstat.c ---- /home/etienne/hobbit-4.2/hobbitd/rrd/do_ifstat.c 2007-10-30 14:21:04.000000000 +0100 -+++ ./hobbitd/rrd/do_ifstat.c 2007-12-27 13:55:02.000000000 +0100 -@@ -2,6 +2,7 @@ - /* Hobbit RRD handler module. */ - /* */ - /* Copyright (C) 2005-2006 Henrik Storner <henrik@hswn.dk> */ -+/* Copyright (C) 2007 Francois Lacroix */ - /* */ - /* This program is released under the GNU General Public License (GPL), */ - /* version 2. See the file "COPYING" for details. */ -@@ -247,6 +248,10 @@ - if (pickdata(bol, ifstat_sco_sv_pcres[0], 0, &ifname, &rxstr, &txstr)) dmatch = 7; - break; - -+ case OS_WIN32_BBWIN: -+ if (pickdata(bol, ifstat_openbsd_pcres[0], 0, &ifname, &rxstr, &txstr)) dmatch = 7; -+ break; -+ - case OS_OSF: - case OS_IRIX: - case OS_SNMP: -diff -Naur /home/etienne/hobbit-4.2/hobbitd/rrd/do_netstat.c ./hobbitd/rrd/do_netstat.c ---- /home/etienne/hobbit-4.2/hobbitd/rrd/do_netstat.c 2007-10-30 14:21:04.000000000 +0100 -+++ ./hobbitd/rrd/do_netstat.c 2007-12-27 13:55:14.000000000 +0100 -@@ -2,6 +2,7 @@ - /* Hobbit RRD handler module. */ - /* */ - /* Copyright (C) 2004-2006 Henrik Storner <henrik@hswn.dk> */ -+/* Copyright (C) 2007 Francois Lacroix */ - /* */ - /* This program is released under the GNU General Public License (GPL), */ - /* version 2. See the file "COPYING" for details. */ -@@ -512,6 +513,7 @@ - break; - - case OS_WIN32: -+ case OS_WIN32_BBWIN: - havedata = do_valaftermarkerequal(netstat_win32_markers, datapart, outp); - break; - -diff -Naur /home/etienne/hobbit-4.2/hobbitd/rrd/do_vmstat.c ./hobbitd/rrd/do_vmstat.c ---- /home/etienne/hobbit-4.2/hobbitd/rrd/do_vmstat.c 2007-10-30 14:21:04.000000000 +0100 -+++ ./hobbitd/rrd/do_vmstat.c 2007-12-27 13:55:24.000000000 +0100 -@@ -2,6 +2,7 @@ - /* Hobbit RRD handler module. */ - /* */ - /* Copyright (C) 2004-2006 Henrik Storner <henrik@hswn.dk> */ -+/* Copyright (C) 2007 Francois Lacroix */ - /* */ - /* This program is released under the GNU General Public License (GPL), */ - /* version 2. See the file "COPYING" for details. */ -@@ -338,6 +339,7 @@ - case OS_HPUX: - layout = vmstat_hpux_layout; break; - case OS_WIN32: -+ case OS_WIN32_BBWIN: - errprintf("Cannot handle Win32 vmstat from host '%s' \n", hostname); - return -1; - case OS_FREEBSD: -diff -Naur /home/etienne/hobbit-4.2/lib/misc.c ./lib/misc.c ---- /home/etienne/hobbit-4.2/lib/misc.c 2007-10-30 14:21:02.000000000 +0100 -+++ ./lib/misc.c 2007-12-18 10:09:00.000000000 +0100 -@@ -69,6 +69,7 @@ - else if (strcasecmp(osname, "macosx") == 0) result = OS_DARWIN; - else if (strcasecmp(osname, "darwin") == 0) result = OS_DARWIN; - else if (strcasecmp(osname, "sco_sv") == 0) result = OS_SCO_SV; -+ else if (strcasecmp(osname, "bbwin") == 0) result = OS_WIN32_BBWIN; - - if (result == OS_UNKNOWN) dbgprintf("Unknown OS: '%s'\n", osname); - -@@ -94,6 +95,7 @@ - case OS_IRIX: return "irix"; - case OS_DARWIN: return "darwin"; - case OS_SCO_SV: return "sco_sv"; -+ case OS_WIN32_BBWIN: return "bbwin"; - case OS_UNKNOWN: return "unknown"; - } - -diff -Naur /home/etienne/hobbit-4.2/lib/misc.h ./lib/misc.h ---- /home/etienne/hobbit-4.2/lib/misc.h 2007-10-30 14:21:02.000000000 +0100 -+++ ./lib/misc.h 2007-12-12 11:34:06.000000000 +0100 -@@ -13,7 +13,7 @@ - - #include <stdio.h> - --enum ostype_t { OS_UNKNOWN, OS_SOLARIS, OS_OSF, OS_AIX, OS_HPUX, OS_WIN32, OS_FREEBSD, OS_NETBSD, OS_OPENBSD, OS_LINUX22, OS_LINUX, OS_RHEL3, OS_SNMP, OS_IRIX, OS_DARWIN, OS_SCO_SV } ; -+enum ostype_t { OS_UNKNOWN, OS_SOLARIS, OS_OSF, OS_AIX, OS_HPUX, OS_WIN32, OS_FREEBSD, OS_NETBSD, OS_OPENBSD, OS_LINUX22, OS_LINUX, OS_RHEL3, OS_SNMP, OS_IRIX, OS_DARWIN, OS_SCO_SV , OS_WIN32_BBWIN } ; - - extern enum ostype_t get_ostype(char *osname); - extern char *osname(enum ostype_t os); diff --git a/net-mgmt/xymon-server/files/patch-build-Makefile.rules b/net-mgmt/xymon-server/files/patch-build-Makefile.rules deleted file mode 100644 index 6a0dc2fe8f68..000000000000 --- a/net-mgmt/xymon-server/files/patch-build-Makefile.rules +++ /dev/null @@ -1,15 +0,0 @@ ---- build/Makefile.rules.orig 2006-08-09 22:09:57.000000000 +0200 -+++ build/Makefile.rules 2008-01-24 14:12:36.000000000 +0100 -@@ -22,9 +22,9 @@ - INSTALLTARGETS = install-client install-clientmsg - endif - else -- BUILDTARGETS = lib-build common-build bbdisplay-build bbnet-build bbproxy-build docs-build build-build hobbitd-build web-build client -- CLIENTTARGETS = lib-client common-client build-build -- INSTALLTARGETS = install-bbdisplay install-bbnet install-bbproxy install-man install-hobbitd install-web install-docs install-client install-servermsg -+ BUILDTARGETS = lib-build common-build bbdisplay-build bbnet-build bbproxy-build docs-build build-build hobbitd-build web-build -+ CLIENTTARGETS = -+ INSTALLTARGETS = install-bbdisplay install-bbnet install-bbproxy install-man install-hobbitd install-web install-docs install-servermsg - CFLAGS += $(PCREINCDIR) - endif - diff --git a/net-mgmt/xymon-server/files/patch-hobbitd-Makefile b/net-mgmt/xymon-server/files/patch-hobbitd-Makefile deleted file mode 100644 index 9e2089769b31..000000000000 --- a/net-mgmt/xymon-server/files/patch-hobbitd-Makefile +++ /dev/null @@ -1,25 +0,0 @@ ---- hobbitd/Makefile.orig 2006-08-09 22:10:05.000000000 +0200 -+++ hobbitd/Makefile 2008-01-28 14:40:13.000000000 +0100 -@@ -140,14 +140,14 @@ - cp -fp *.8 $(INSTALLROOT)$(MANROOT)/man8/ - - install-cfg: -- cd etcfiles; ../../build/merge-lines hobbitserver.cfg $(INSTALLROOT)$(INSTALLETCDIR)/hobbitserver.cfg LARRDCOLUMN=TRENDSCOLUMN LARRDS=TEST2RRD -- cd etcfiles; ../../build/merge-lines hobbitcgi.cfg $(INSTALLROOT)$(INSTALLETCDIR)/hobbitcgi.cfg -- cd etcfiles; ../../build/merge-sects hobbitlaunch.cfg $(INSTALLROOT)$(INSTALLETCDIR)/hobbitlaunch.cfg larrdstatus=rrdstatus larrddata=rrddata -- cd etcfiles; ../../build/merge-sects client-local.cfg $(INSTALLROOT)$(INSTALLETCDIR)/client-local.cfg -- cd etcfiles; ../../build/merge-sects hobbitgraph.cfg $(INSTALLROOT)$(INSTALLETCDIR)/hobbitgraph.cfg -- cd etcfiles; ../../build/merge-lines columndoc.csv $(INSTALLROOT)$(INSTALLETCDIR)/columndoc.csv -- cd etcfiles; (echo "bb-hosts"; echo "hobbit-alerts.cfg"; echo "hobbit-clients.cfg"; echo "bbcombotest.cfg"; echo "client-local.cfg") | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLETCDIR)/ -- cd etcfiles; cp -fp hobbit-apache.conf $(INSTALLROOT)$(INSTALLETCDIR)/hobbit-apache.conf -+ cd etcfiles; ../../build/merge-lines hobbitserver.cfg $(INSTALLROOT)$(INSTALLETCDIR)/hobbitserver.cfg-dist LARRDCOLUMN=TRENDSCOLUMN LARRDS=TEST2RRD -+ cd etcfiles; ../../build/merge-lines hobbitcgi.cfg $(INSTALLROOT)$(INSTALLETCDIR)/hobbitcgi.cfg-dist -+ cd etcfiles; ../../build/merge-sects hobbitlaunch.cfg $(INSTALLROOT)$(INSTALLETCDIR)/hobbitlaunch.cfg-dist larrdstatus=rrdstatus larrddata=rrddata -+ cd etcfiles; ../../build/merge-sects client-local.cfg $(INSTALLROOT)$(INSTALLETCDIR)/client-local.cfg-dist -+ cd etcfiles; ../../build/merge-sects hobbitgraph.cfg $(INSTALLROOT)$(INSTALLETCDIR)/hobbitgraph.cfg-dist -+ cd etcfiles; ../../build/merge-lines columndoc.csv $(INSTALLROOT)$(INSTALLETCDIR)/columndoc.csv-dist -+# cd etcfiles; (echo "bb-hosts"; echo "hobbit-alerts.cfg"; echo "hobbit-clients.cfg"; echo "bbcombotest.cfg"; echo "client-local.cfg") | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLETCDIR)/ -+ cd etcfiles; cp -fp hobbit-apache.conf $(INSTALLROOT)$(INSTALLETCDIR)/hobbit-apache.conf-dist - cd $(INSTALLROOT)$(BBHOME); rm -f hobbit.sh; ln -sf bin/hobbit.sh . - cd wwwfiles; find . | grep -v RCS | grep -v DIST | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLWWWDIR)/ ../../build/md5.dat - cd webfiles; find . | grep -v RCS | grep -v DIST | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLWEBDIR)/ ../../build/md5.dat diff --git a/net-mgmt/xymon-server/pkg-descr b/net-mgmt/xymon-server/pkg-descr deleted file mode 100644 index a696edf28b33..000000000000 --- a/net-mgmt/xymon-server/pkg-descr +++ /dev/null @@ -1,15 +0,0 @@ -Hobbit is a system for monitoring servers and networks. It has a great deal -of inspiration from the Big Brother monitor, but unlike Big Brother it is -designed to work well whether you need to monitor small network with just -a handful of hosts, or large networks with thousands of hosts. - -Hobbit is the successor to the bbgen toolkit, which has been available as -an add-on to Big Brother since late 2002. The name change was decided upon -when Hobbit acquired enough functionality to be a stand-alone product. -The tools that formed the bbgen toolkit are still present in Hobbit -and are quite important for it, so if you have used bbgen before, -Hobbit will seem quite familiar. - -This is the server. - -WWW: http://hobbitmon.sourceforge.net/ diff --git a/net-mgmt/xymon-server/pkg-plist b/net-mgmt/xymon-server/pkg-plist deleted file mode 100644 index 3fd1ab9322b0..000000000000 --- a/net-mgmt/xymon-server/pkg-plist +++ /dev/null @@ -1,390 +0,0 @@ -@exec if ! pw groupshow %%BBUSER%% 2>/dev/null; then pw groupadd %%BBUSER%% -g 280; fi -@exec if ! pw usershow %%BBUSER%% 2>/dev/null; then pw useradd %%BBUSER%% -g %%BBUSER%% -u 280 -h - -d /nonexistent -s /usr/sbin/nologin -c "Hobbit Monitor"; fi -@unexec if pw usershow %%BBUSER%%; then pw userdel %%BBUSER%%; fi -%%WWWDIR%%/cgi-bin/bb-csvinfo.sh -%%WWWDIR%%/cgi-bin/bb-datepage.sh -%%WWWDIR%%/cgi-bin/bb-eventlog.sh -%%WWWDIR%%/cgi-bin/bb-findhost.sh -%%WWWDIR%%/cgi-bin/bb-hist.sh -%%WWWDIR%%/cgi-bin/bb-histlog.sh -%%WWWDIR%%/cgi-bin/bb-hostsvc.sh -%%WWWDIR%%/cgi-bin/bb-rep.sh -%%WWWDIR%%/cgi-bin/bb-replog.sh -%%WWWDIR%%/cgi-bin/bb-snapshot.sh -%%WWWDIR%%/cgi-bin/hobbit-certreport.sh -%%WWWDIR%%/cgi-bin/hobbit-confreport.sh -%%WWWDIR%%/cgi-bin/hobbit-ghosts.sh -%%WWWDIR%%/cgi-bin/hobbit-hostgraphs.sh -%%WWWDIR%%/cgi-bin/hobbit-nkview.sh -%%WWWDIR%%/cgi-bin/hobbit-nongreen.sh -%%WWWDIR%%/cgi-bin/hobbitcolumn.sh -%%WWWDIR%%/cgi-bin/hobbitgraph.sh -%%WWWDIR%%/cgi-secure/bb-ack.sh -%%WWWDIR%%/cgi-secure/hobbit-ackinfo.sh -%%WWWDIR%%/cgi-secure/hobbit-enadis.sh -%%WWWDIR%%/cgi-secure/hobbit-nkedit.sh -%%WWWDIR%%/server/bin/bb -%%WWWDIR%%/server/bin/bb-ack.cgi -%%WWWDIR%%/server/bin/bb-csvinfo.cgi -%%WWWDIR%%/server/bin/bb-datepage.cgi -%%WWWDIR%%/server/bin/bb-eventlog.cgi -%%WWWDIR%%/server/bin/bb-findhost.cgi -%%WWWDIR%%/server/bin/bb-hist.cgi -%%WWWDIR%%/server/bin/bb-rep.cgi -%%WWWDIR%%/server/bin/bb-replog.cgi -%%WWWDIR%%/server/bin/bb-snapshot.cgi -%%WWWDIR%%/server/bin/bb-webpage -%%WWWDIR%%/server/bin/bbcmd -%%WWWDIR%%/server/bin/bbcombotest -%%WWWDIR%%/server/bin/bbdigest -%%WWWDIR%%/server/bin/bbgen -%%WWWDIR%%/server/bin/bbhostgrep -%%WWWDIR%%/server/bin/bbhostshow -%%WWWDIR%%/server/bin/bbmessage.cgi -%%WWWDIR%%/server/bin/bbproxy -%%WWWDIR%%/server/bin/bbtest-net -%%WWWDIR%%/server/bin/beastat -%%WWWDIR%%/server/bin/boilerplate.cgi -%%WWWDIR%%/server/bin/hobbit-ackinfo.cgi -%%WWWDIR%%/server/bin/hobbit-confreport.cgi -%%WWWDIR%%/server/bin/hobbit-enadis.cgi -%%WWWDIR%%/server/bin/hobbit-ghosts.cgi -%%WWWDIR%%/server/bin/hobbit-hostgraphs.cgi -%%WWWDIR%%/server/bin/hobbit-mailack -%%WWWDIR%%/server/bin/hobbit-nkedit.cgi -%%WWWDIR%%/server/bin/hobbit-nkview.cgi -%%WWWDIR%%/server/bin/hobbit-statusreport.cgi -%%WWWDIR%%/server/bin/hobbit.sh -%%WWWDIR%%/server/bin/hobbitd -%%WWWDIR%%/server/bin/hobbitd_alert -%%WWWDIR%%/server/bin/hobbitd_capture -%%WWWDIR%%/server/bin/hobbitd_channel -%%WWWDIR%%/server/bin/hobbitd_client -%%WWWDIR%%/server/bin/hobbitd_filestore -%%WWWDIR%%/server/bin/hobbitd_history -%%WWWDIR%%/server/bin/hobbitd_hostdata -%%WWWDIR%%/server/bin/hobbitd_larrd -%%WWWDIR%%/server/bin/hobbitd_rrd -%%WWWDIR%%/server/bin/hobbitd_sample -%%WWWDIR%%/server/bin/hobbitfetch -%%WWWDIR%%/server/bin/hobbitgraph.cgi -%%WWWDIR%%/server/bin/hobbitlaunch -%%WWWDIR%%/server/bin/hobbitping -%%WWWDIR%%/server/bin/hobbitreports.sh -%%WWWDIR%%/server/bin/hobbitsvc.cgi -%%WWWDIR%%/server/bin/moverrd.sh -%%WWWDIR%%/server/bin/trimhistory -@unexec if cmp -s %D/%%WWWDIR%%/server/etc/bb-hosts %D/%%WWWDIR%%/server/etc/bb-hosts-dist; then rm -f %D/%%WWWDIR%%/server/etc/bb-hosts; fi -@unexec if cmp -s %D/%%WWWDIR%%/server/etc/bb-services %D/%%WWWDIR%%/server/etc/bb-services-dist; then rm -f %D/%%WWWDIR%%/server/etc/bb-services; fi -@unexec if cmp -s %D/%%WWWDIR%%/server/etc/bbcombotest.cfg %D/%%WWWDIR%%/server/etc/bbcombotest.cfg-dist; then rm -f %D/%%WWWDIR%%/server/etc/bbcombotest.cfg; fi -@unexec if cmp -s %D/%%WWWDIR%%/server/etc/client-local.cfg %D/%%WWWDIR%%/server/etc/client-local.cfg-dist; then rm -f %D/%%WWWDIR%%/server/etc/client-local.cfg; fi -@unexec if cmp -s %D/%%WWWDIR%%/server/etc/columndoc.csv %D/%%WWWDIR%%/server/etc/columndoc.csv-dist; then rm -f %D/%%WWWDIR%%/server/etc/columndoc.csv; fi -@unexec if cmp -s %D/%%WWWDIR%%/server/etc/hobbit-alerts.cfg %D/%%WWWDIR%%/server/etc/hobbit-alerts.cfg-dist; then rm -f %D/%%WWWDIR%%/server/etc/hobbit-alerts.cfg; fi -@unexec if cmp -s %D/%%WWWDIR%%/server/etc/hobbit-apache.conf %D/%%WWWDIR%%/server/etc/hobbit-apache.conf-dist; then rm -f %D/%%WWWDIR%%/server/etc/hobbit-apache.conf; fi -@unexec if cmp -s %D/%%WWWDIR%%/server/etc/hobbit-clients.cfg %D/%%WWWDIR%%/server/etc/hobbit-clients.cfg-dist; then rm -f %D/%%WWWDIR%%/server/etc/hobbit-clients.cfg; fi -@unexec if cmp -s %D/%%WWWDIR%%/server/etc/hobbitcgi.cfg %D/%%WWWDIR%%/server/etc/hobbitcgi.cfg-dist; then rm -f %D/%%WWWDIR%%/server/etc/hobbitcgi.cfg; fi -@unexec if cmp -s %D/%%WWWDIR%%/server/etc/hobbitgraph.cfg %D/%%WWWDIR%%/server/etc/hobbitgraph.cfg-dist; then rm -f %D/%%WWWDIR%%/server/etc/hobbitgraph.cfg; fi -@unexec if cmp -s %D/%%WWWDIR%%/server/etc/hobbitlaunch.cfg %D/%%WWWDIR%%/server/etc/hobbitlaunch.cfg-dist; then rm -f %D/%%WWWDIR%%/server/etc/hobbitlaunch.cfg; fi -@unexec if cmp -s %D/%%WWWDIR%%/server/etc/hobbitserver.cfg %D/%%WWWDIR%%/server/etc/hobbitserver.cfg-dist; then rm -f %D/%%WWWDIR%%/server/etc/hobbitserver.cfg; fi -%%WWWDIR%%/server/etc/bb-hosts-dist -@exec [ ! -f %B/bb-hosts ] && cp %B/%f %B/bb-hosts -%%WWWDIR%%/server/etc/bb-services-dist -@exec [ ! -f %B/bb-services ] && cp %B/%f %B/bb-services -%%WWWDIR%%/server/etc/bbcombotest.cfg-dist -@exec [ ! -f %B/bbcombotest.cfg ] && cp %B/%f %B/bbcombotest.cfg -%%WWWDIR%%/server/etc/client-local.cfg-dist -@exec [ ! -f %B/client-local.cfg ] && cp %B/%f %B/client-local.cfg -%%WWWDIR%%/server/etc/columndoc.csv-dist -@exec [ ! -f %B/columndoc.cfg ] && cp %B/%f %B/columndoc.cfg -%%WWWDIR%%/server/etc/hobbit-alerts.cfg-dist -@exec [ ! -f %B/hobbit-alerts.cfg ] && cp %B/%f %B/hobbit-alerts.cfg -%%WWWDIR%%/server/etc/hobbit-apache.conf-dist -@exec [ ! -f %B/hobbit-apache.cfg ] && cp %B/%f %B/hobbit-apache.cfg -%%WWWDIR%%/server/etc/hobbit-clients.cfg-dist -@exec [ ! -f %B/hobbit-clients.cfg ] && cp %B/%f %B/hobbit-clients.cfg -@unexec if test ! -s %D/%%WWWDIR%%/server/etc/hobbit-nkview.cfg; then rm -f %D/%%WWWDIR%%/server/etc/hobbit-nkview.cfg; fi -@unexec if test ! -s %D/%%WWWDIR%%/server/etc/hobbit-nkview.cfg.bak; then rm -f %D/%%WWWDIR%%/server/etc/hobbit-nkview.cfg.bak; fi -@exec touch %D/%%WWWDIR%%/server/etc/hobbit-nkview.cfg %D/%%WWWDIR%%/server/etc/hobbit-nkview.cfg.bak -@exec chown %%BBUSER%% %D/%%WWWDIR%%/server/etc/hobbit-nkview.cfg %D/%%WWWDIR%%/server/etc/hobbit-nkview.cfg.bak -%%WWWDIR%%/server/etc/hobbitcgi.cfg-dist -@exec [ ! -f %B/hobbitcgi.cfg ] && cp %B/%f %B/hobbitcgi.cfg -%%WWWDIR%%/server/etc/hobbitgraph.cfg-dist -@exec [ ! -f %B/hobbitgraph.cfg ] && cp %B/%f %B/hobbitgraph.cfg -%%WWWDIR%%/server/etc/hobbitlaunch.cfg-dist -@exec [ ! -f %B/hobbitlaunch.cfg ] && cp %B/%f %B/hobbitlaunch.cfg -%%WWWDIR%%/server/etc/hobbitserver.cfg-dist -@exec [ ! -f %B/hobbitserver.cfg ] && cp %B/%f %B/hobbitserver.cfg -%%WWWDIR%%/server/ext/bbretest-net.sh -%%WWWDIR%%/server/hobbit.sh -%%WWWDIR%%/server/web/acknowledge_footer -%%WWWDIR%%/server/web/acknowledge_form -%%WWWDIR%%/server/web/acknowledge_header -%%WWWDIR%%/server/web/bb2_footer -%%WWWDIR%%/server/web/bb2_header -%%WWWDIR%%/server/web/bb_footer -%%WWWDIR%%/server/web/bb_header -%%WWWDIR%%/server/web/bbnk_footer -%%WWWDIR%%/server/web/bbnk_header -%%WWWDIR%%/server/web/bbrep_footer -%%WWWDIR%%/server/web/bbrep_header -%%WWWDIR%%/server/web/bbsnap2_footer -%%WWWDIR%%/server/web/bbsnap2_header -%%WWWDIR%%/server/web/bbsnap_footer -%%WWWDIR%%/server/web/bbsnap_header -%%WWWDIR%%/server/web/bbsnapnk_footer -%%WWWDIR%%/server/web/bbsnapnk_header -%%WWWDIR%%/server/web/columndoc_footer -%%WWWDIR%%/server/web/columndoc_header -%%WWWDIR%%/server/web/confreport_back -%%WWWDIR%%/server/web/confreport_footer -%%WWWDIR%%/server/web/confreport_front -%%WWWDIR%%/server/web/confreport_header -%%WWWDIR%%/server/web/event_footer -%%WWWDIR%%/server/web/event_form -%%WWWDIR%%/server/web/event_header -%%WWWDIR%%/server/web/findhost_footer -%%WWWDIR%%/server/web/findhost_form -%%WWWDIR%%/server/web/findhost_header -%%WWWDIR%%/server/web/ghosts_footer -%%WWWDIR%%/server/web/ghosts_header -%%WWWDIR%%/server/web/graphs_footer -%%WWWDIR%%/server/web/graphs_header -%%WWWDIR%%/server/web/hist_footer -%%WWWDIR%%/server/web/hist_header -%%WWWDIR%%/server/web/histlog_footer -%%WWWDIR%%/server/web/histlog_header -%%WWWDIR%%/server/web/hobbitnk_footer -%%WWWDIR%%/server/web/hobbitnk_header -%%WWWDIR%%/server/web/hostgraphs_footer -%%WWWDIR%%/server/web/hostgraphs_form -%%WWWDIR%%/server/web/hostgraphs_header -%%WWWDIR%%/server/web/hostsvc_footer -%%WWWDIR%%/server/web/hostsvc_header -%%WWWDIR%%/server/web/info_footer -%%WWWDIR%%/server/web/info_header -%%WWWDIR%%/server/web/maint_footer -%%WWWDIR%%/server/web/maint_form -%%WWWDIR%%/server/web/maint_header -%%WWWDIR%%/server/web/maintact_footer -%%WWWDIR%%/server/web/maintact_header -%%WWWDIR%%/server/web/nkack_form -%%WWWDIR%%/server/web/nkedit_footer -%%WWWDIR%%/server/web/nkedit_form -%%WWWDIR%%/server/web/nkedit_header -%%WWWDIR%%/server/web/replog_footer -%%WWWDIR%%/server/web/replog_header -%%WWWDIR%%/server/web/report_footer -%%WWWDIR%%/server/web/report_form -%%WWWDIR%%/server/web/report_form_daily -%%WWWDIR%%/server/web/report_form_monthly -%%WWWDIR%%/server/web/report_form_weekly -%%WWWDIR%%/server/web/report_header -%%WWWDIR%%/server/web/snapshot_footer -%%WWWDIR%%/server/web/snapshot_form -%%WWWDIR%%/server/web/snapshot_header -%%WWWDIR%%/server/web/zoom.js -%%WWWDIR%%/server/www/gifs/README -%%WWWDIR%%/server/www/gifs/arrow.gif -%%WWWDIR%%/server/www/gifs/bkg-blue.gif -%%WWWDIR%%/server/www/gifs/bkg-clear.gif -%%WWWDIR%%/server/www/gifs/bkg-green.gif -%%WWWDIR%%/server/www/gifs/bkg-purple.gif -%%WWWDIR%%/server/www/gifs/bkg-red.gif -%%WWWDIR%%/server/www/gifs/bkg-yellow.gif -%%WWWDIR%%/server/www/gifs/blue-ack.gif -%%WWWDIR%%/server/www/gifs/blue-recent.gif -%%WWWDIR%%/server/www/gifs/blue.gif -%%WWWDIR%%/server/www/gifs/clear-recent.gif -%%WWWDIR%%/server/www/gifs/clear.gif -%%WWWDIR%%/server/www/gifs/favicon-blue.ico -%%WWWDIR%%/server/www/gifs/favicon-clear.ico -%%WWWDIR%%/server/www/gifs/favicon-green.ico -%%WWWDIR%%/server/www/gifs/favicon-purple.ico -%%WWWDIR%%/server/www/gifs/favicon-red.ico -%%WWWDIR%%/server/www/gifs/favicon-unknown.ico -%%WWWDIR%%/server/www/gifs/favicon-yellow.ico -%%WWWDIR%%/server/www/gifs/green-recent.gif -%%WWWDIR%%/server/www/gifs/green.gif -%%WWWDIR%%/server/www/gifs/purple-ack.gif -%%WWWDIR%%/server/www/gifs/purple-recent.gif -%%WWWDIR%%/server/www/gifs/purple.gif -%%WWWDIR%%/server/www/gifs/red-ack.gif -%%WWWDIR%%/server/www/gifs/red-recent.gif -%%WWWDIR%%/server/www/gifs/red.gif -%%WWWDIR%%/server/www/gifs/unknown-recent.gif -%%WWWDIR%%/server/www/gifs/unknown.gif -%%WWWDIR%%/server/www/gifs/yellow-ack.gif -%%WWWDIR%%/server/www/gifs/yellow-recent.gif -%%WWWDIR%%/server/www/gifs/yellow.gif -%%WWWDIR%%/server/www/gifs/zoom.gif -%%WWWDIR%%/server/www/help/about.html -%%WWWDIR%%/server/www/help/bb-to-hobbit.html -%%WWWDIR%%/server/www/help/clonewarn.jpg -%%WWWDIR%%/server/www/help/configure.txt -%%WWWDIR%%/server/www/help/criticalsystems.html -%%WWWDIR%%/server/www/help/critview-detail-acked.jpg -%%WWWDIR%%/server/www/help/critview-detail-ackform.jpg -%%WWWDIR%%/server/www/help/critview-detail.jpg -%%WWWDIR%%/server/www/help/critview-disk.jpg -%%WWWDIR%%/server/www/help/critview-green.jpg -%%WWWDIR%%/server/www/help/editor-clonemaster.jpg -%%WWWDIR%%/server/www/help/editor-diskchanged.jpg -%%WWWDIR%%/server/www/help/editor-disksetup.jpg -%%WWWDIR%%/server/www/help/editor-main.jpg -%%WWWDIR%%/server/www/help/editor-makeclone.jpg -%%WWWDIR%%/server/www/help/editor-nohost.jpg -%%WWWDIR%%/server/www/help/editor-showclone.jpg -%%WWWDIR%%/server/www/help/hobbit-alerts.html -%%WWWDIR%%/server/www/help/hobbit-apacheconf.txt -%%WWWDIR%%/server/www/help/hobbit-bbhosts.png -%%WWWDIR%%/server/www/help/hobbit-clients.png -%%WWWDIR%%/server/www/help/hobbit-config.html -%%WWWDIR%%/server/www/help/hobbit-mrtg.html -%%WWWDIR%%/server/www/help/hobbit-tips.html -%%WWWDIR%%/server/www/help/hobbitmain.png -%%WWWDIR%%/server/www/help/hobbitprocs.png -%%WWWDIR%%/server/www/help/howtograph.html -%%WWWDIR%%/server/www/help/install.html -%%WWWDIR%%/server/www/help/known-issues.html -%%WWWDIR%%/server/www/help/mainview-acked.jpg -%%WWWDIR%%/server/www/help/mainview.jpg -%%WWWDIR%%/server/www/help/manpages/index.html -%%WWWDIR%%/server/www/help/manpages/man1/bb-ack.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bb-csvinfo.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bb-datepage.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bb-eventlog.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bb-findhost.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bb-hist.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bb-rep.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bb-replog.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bb-snapshot.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bb-webpage.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bb.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bbcmd.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bbcombotest.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bbdigest.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bbgen.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bbhostgrep.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bbhostshow.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bbretest-net.sh.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bbtest-net.1.html -%%WWWDIR%%/server/www/help/manpages/man1/clientupdate.1.html -%%WWWDIR%%/server/www/help/manpages/man1/hobbit-ackinfo.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/hobbit-confreport.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/hobbit-ghosts.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/hobbit-hostgraphs.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/hobbit-nkedit.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/hobbit-nkview.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/hobbit-statusreport.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/hobbitgraph.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/hobbitping.1.html -%%WWWDIR%%/server/www/help/manpages/man1/hobbitsvc.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/logfetch.1.html -%%WWWDIR%%/server/www/help/manpages/man1/orcahobbit.1.html -%%WWWDIR%%/server/www/help/manpages/man5/bb-hosts.5.html -%%WWWDIR%%/server/www/help/manpages/man5/bb-services.5.html -%%WWWDIR%%/server/www/help/manpages/man5/bbcombotest.cfg.5.html -%%WWWDIR%%/server/www/help/manpages/man5/client-local.cfg.5.html -%%WWWDIR%%/server/www/help/manpages/man5/clientlaunch.cfg.5.html -%%WWWDIR%%/server/www/help/manpages/man5/hobbit-alerts.cfg.5.html -%%WWWDIR%%/server/www/help/manpages/man5/hobbit-clients.cfg.5.html -%%WWWDIR%%/server/www/help/manpages/man5/hobbit-nkview.cfg.5.html -%%WWWDIR%%/server/www/help/manpages/man5/hobbitcgi.cfg.5.html -%%WWWDIR%%/server/www/help/manpages/man5/hobbitclient.cfg.5.html -%%WWWDIR%%/server/www/help/manpages/man5/hobbitgraph.cfg.5.html -%%WWWDIR%%/server/www/help/manpages/man5/hobbitlaunch.cfg.5.html -%%WWWDIR%%/server/www/help/manpages/man5/hobbitserver.cfg.5.html -%%WWWDIR%%/server/www/help/manpages/man5/hobbitweb.5.html -%%WWWDIR%%/server/www/help/manpages/man7/hobbit.7.html -%%WWWDIR%%/server/www/help/manpages/man8/bbmessage.cgi.8.html -%%WWWDIR%%/server/www/help/manpages/man8/bbproxy.8.html -%%WWWDIR%%/server/www/help/manpages/man8/hobbit-enadis.cgi.8.html -%%WWWDIR%%/server/www/help/manpages/man8/hobbit-mailack.8.html -%%WWWDIR%%/server/www/help/manpages/man8/hobbitd.8.html -%%WWWDIR%%/server/www/help/manpages/man8/hobbitd_alert.8.html -%%WWWDIR%%/server/www/help/manpages/man8/hobbitd_channel.8.html -%%WWWDIR%%/server/www/help/manpages/man8/hobbitd_client.8.html -%%WWWDIR%%/server/www/help/manpages/man8/hobbitd_filestore.8.html -%%WWWDIR%%/server/www/help/manpages/man8/hobbitd_history.8.html -%%WWWDIR%%/server/www/help/manpages/man8/hobbitd_hostdata.8.html -%%WWWDIR%%/server/www/help/manpages/man8/hobbitd_rrd.8.html -%%WWWDIR%%/server/www/help/manpages/man8/hobbitd_sample.8.html -%%WWWDIR%%/server/www/help/manpages/man8/hobbitfetch.8.html -%%WWWDIR%%/server/www/help/manpages/man8/hobbitlaunch.8.html -%%WWWDIR%%/server/www/help/manpages/man8/msgcache.8.html -%%WWWDIR%%/server/www/help/manpages/man8/trimhistory.8.html -%%WWWDIR%%/server/www/help/stdview-detail-acked.jpg -%%WWWDIR%%/server/www/menu/README -%%WWWDIR%%/server/www/menu/menu.css -%%WWWDIR%%/server/www/menu/menu.js -%%WWWDIR%%/server/www/menu/menu_items.js -%%WWWDIR%%/server/www/menu/menu_tpl.js -@exec mkdir %D/%%WWWDIR%%/data -@exec mkdir %D/%%WWWDIR%%/data/acks -@exec mkdir %D/%%WWWDIR%%/data/data -@exec mkdir %D/%%WWWDIR%%/data/disabled -@exec mkdir %D/%%WWWDIR%%/data/hist -@exec mkdir %D/%%WWWDIR%%/data/histlogs -@exec mkdir %D/%%WWWDIR%%/data/hostdata -@exec mkdir %D/%%WWWDIR%%/data/logs -@exec mkdir %D/%%WWWDIR%%/data/rrd -@exec mkdir %D/%%WWWDIR%%/server/download -@exec mkdir %D/%%WWWDIR%%/server/tmp -@exec mkdir %D/%%WWWDIR%%/server/www/html -@exec mkdir %D/%%WWWDIR%%/server/www/notes -@exec mkdir %D/%%WWWDIR%%/server/www/rep -@exec mkdir %D/%%WWWDIR%%/server/www/snap -@exec mkdir %D/%%WWWDIR%%/server/www/wml -@exec chown %%BBUSER%% %D/%%WWWDIR%%/data -@exec chown %%BBUSER%% %D/%%WWWDIR%%/data/acks -@exec chown %%BBUSER%% %D/%%WWWDIR%%/data/data -@exec chown %%BBUSER%% %D/%%WWWDIR%%/data/disabled -@exec chown %%BBUSER%% %D/%%WWWDIR%%/data/hist -@exec chown %%BBUSER%% %D/%%WWWDIR%%/data/histlogs -@exec chown %%BBUSER%% %D/%%WWWDIR%%/data/hostdata -@exec chown %%BBUSER%% %D/%%WWWDIR%%/data/logs -@exec chown %%BBUSER%% %D/%%WWWDIR%%/data/rrd -@exec chown %%BBUSER%% %D/%%WWWDIR%%/server/download -@exec chown %%BBUSER%% %D/%%WWWDIR%%/server/tmp -@exec chown %%BBUSER%% %D/%%WWWDIR%%/server/www/html -@exec chown %%BBUSER%% %D/%%WWWDIR%%/server/www/notes -@exec chown %%BBUSER%% %D/%%WWWDIR%%/server/www/rep -@exec chown %%BBUSER%% %D/%%WWWDIR%%/server/www/snap -@exec chown %%BBUSER%% %D/%%WWWDIR%%/server/www/wml -@dirrm %%WWWDIR%%/server/www/wml -@dirrm %%WWWDIR%%/server/www/snap -@dirrm %%WWWDIR%%/server/www/rep -@dirrm %%WWWDIR%%/server/www/notes -@dirrm %%WWWDIR%%/server/www/menu -@dirrm %%WWWDIR%%/server/www/html -@dirrm %%WWWDIR%%/server/www/help/manpages/man8 -@dirrm %%WWWDIR%%/server/www/help/manpages/man7 -@dirrm %%WWWDIR%%/server/www/help/manpages/man5 -@dirrm %%WWWDIR%%/server/www/help/manpages/man1 -@dirrm %%WWWDIR%%/server/www/help/manpages -@dirrm %%WWWDIR%%/server/www/help -@dirrm %%WWWDIR%%/server/www/gifs -@dirrm %%WWWDIR%%/server/www -@dirrm %%WWWDIR%%/server/web -@dirrm %%WWWDIR%%/server/tmp -@dirrm %%WWWDIR%%/server/ext -@dirrm %%WWWDIR%%/server/etc -@dirrm %%WWWDIR%%/server/download -@dirrm %%WWWDIR%%/server/bin -@dirrm %%WWWDIR%%/server -@dirrm %%WWWDIR%%/data/rrd -@dirrm %%WWWDIR%%/data/logs -@dirrm %%WWWDIR%%/data/hostdata -@dirrm %%WWWDIR%%/data/histlogs -@dirrm %%WWWDIR%%/data/hist -@dirrm %%WWWDIR%%/data/disabled -@dirrm %%WWWDIR%%/data/data -@dirrm %%WWWDIR%%/data/acks -@dirrm %%WWWDIR%%/data -@dirrm %%WWWDIR%%/cgi-secure -@dirrm %%WWWDIR%%/cgi-bin -@dirrmtry %%WWWDIR%% -@exec mkdir -p %%VARBASE%%/log/hobbit -@exec chown %%BBUSER%% %%VARBASE%%/log/hobbit -@cwd %%VARBASE%% -@dirrmtry log/hobbit diff --git a/net-mgmt/zabbix2-agent/Makefile b/net-mgmt/zabbix2-agent/Makefile deleted file mode 100644 index baae0847fa0f..000000000000 --- a/net-mgmt/zabbix2-agent/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# Ports collection makefile for: zabbix-agent -# Date created: Jun 18 2003 -# Whom: Sergey Akifyev <asa@gascom.ru> -# -# $FreeBSD$ -# - -PORTNAME= zabbix -PORTVERSION= 1.4.5 -PORTEPOCH= 2 -CATEGORIES= net-mgmt -MASTER_SITES= SF -PKGNAMESUFFIX= -agent - -MAINTAINER= d.lohansky@zsupport.ru -COMMENT= Application and network monitoring solution - -USE_GMAKE= yes -USE_RC_SUBR= zabbix_agentd -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-agent --disable-server -MAKE_ARGS= ARCH=freebsd -.ifndef WITHOUT_IPV6 -CONFIGURE_ARGS+=--enable-ipv6 -.endif - -ZABBIX_BIN= agent agentd get sender -ZABBIX_CFG= agent agentd -ZABBIX_BINFILES=${ZABBIX_BIN:S|^|zabbix_|:C|.+|&/&|:S|agentd/|agent/|} -ZABBIX_CFGFILES=${ZABBIX_CFG:S|^|zabbix_|:S|$|.conf|} -PLIST_FILES= ${ZABBIX_BIN:S|^|bin/zabbix_|} \ - ${ZABBIX_CFG:S|^|%%ETCDIR%%/zabbix_|:S|$|.conf.sample|} - -post-patch: - @${FIND} ${WRKSRC}/src/ -type f|${XARGS} \ - ${REINPLACE_CMD} -e 's|/etc/zabbix|${ETCDIR}|;s|/usr/sbin|${LOCALBASE}/sbin|' - -do-install: - @${ECHO_CMD} '@unexec rmdir %D/${ETCDIR_REL} 2>/dev/null || true' >> ${TMPPLIST} - @${INSTALL_PROGRAM} ${ZABBIX_BINFILES:S,^,${WRKSRC}/src/,} ${PREFIX}/bin/ - @${INSTALL} -d ${ETCDIR}/ - @for i in ${ZABBIX_CFGFILES};do\ - ${INSTALL_DATA} ${WRKSRC}/misc/conf/$$i ${ETCDIR}/$$i.sample;done - @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - -.include <bsd.port.mk> diff --git a/net-mgmt/zabbix2-agent/distinfo b/net-mgmt/zabbix2-agent/distinfo deleted file mode 100644 index 5f9b3bac2d66..000000000000 --- a/net-mgmt/zabbix2-agent/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (zabbix-1.4.5.tar.gz) = f87d73852fdab33f99beebfd16c21c63 -SHA256 (zabbix-1.4.5.tar.gz) = abde9b369960d9075605e12e915d05c04b3c81f1e3445b5d7b39919b0d1648c1 -SIZE (zabbix-1.4.5.tar.gz) = 4137972 diff --git a/net-mgmt/zabbix2-agent/files/patch-configure b/net-mgmt/zabbix2-agent/files/patch-configure deleted file mode 100644 index ca3fbf1c242a..000000000000 --- a/net-mgmt/zabbix2-agent/files/patch-configure +++ /dev/null @@ -1,12 +0,0 @@ ---- ./configure.orig Sat Jan 27 20:39:51 2007 -+++ ./configure Sat Jan 27 20:48:34 2007 -@@ -275,6 +275,9 @@ - # Factoring default headers for most tests. - ac_includes_default="\ - #include <stdio.h> -+#include <sys/socket.h> -+#include <sys/param.h> -+#include <netinet/in.h> - #if HAVE_SYS_TYPES_H - # include <sys/types.h> - #endif diff --git a/net-mgmt/zabbix2-agent/files/zabbix_agentd.in b/net-mgmt/zabbix2-agent/files/zabbix_agentd.in deleted file mode 100644 index cc3eeb70286b..000000000000 --- a/net-mgmt/zabbix2-agent/files/zabbix_agentd.in +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# PROVIDE: zabbix_agentd -# REQUIRE: DAEMON -# KEYWORD: shutdown - -. %%RC_SUBR%% - -name="zabbix_agentd" -rcvar=${name}_enable -load_rc_config $name -eval : \${${rcvar}='NO'} - -command="%%PREFIX%%/bin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - -run_rc_command "$1" diff --git a/net-mgmt/zabbix2-agent/pkg-descr b/net-mgmt/zabbix2-agent/pkg-descr deleted file mode 100644 index 52ecef039fcf..000000000000 --- a/net-mgmt/zabbix2-agent/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -Zabbix is software for application and network monitoring. -Zabbix supports both polling and trapping techniques to -collect data from monitored hosts. Flexible notification -mechanism allows easy and quckly configure email notifications -for pre-defined events. Zabbix is freely available under the -terms of the GNU General Public License (GPL). - -WWW: http://www.zabbix.com/ diff --git a/net-mgmt/zabbix2-agent/pkg-install b/net-mgmt/zabbix2-agent/pkg-install deleted file mode 100644 index f0b59f76cc4a..000000000000 --- a/net-mgmt/zabbix2-agent/pkg-install +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -# Script was taken from mysql323-server port, and modified -# to suit zabbix needs - -[ -n "${PACKAGE_BUILDING}" ] && exit 0 - -[ "${2}" = "POST-INSTALL" ] && exit 0 - -PATH=/bin:/usr/sbin - -USER=zabbix -GROUP=${USER} -UID=122 -GID=${UID} - -if pw group show "${GROUP}" 2>/dev/null; then - echo "You already have a group \"${GROUP}\", so I will use it." -else - if pw groupadd ${GROUP} -g ${GID}; then - echo "Added group \"${GROUP}\"." - else - echo "Adding group \"${GROUP}\" failed..." - exit 1 - fi -fi - -if pw user show "${USER}" 2>/dev/null; then - echo "You already have a user \"${USER}\", so I will use it." - if pw usermod ${USER} -d /nonexistent - then - echo "Changed home directory of \"${USER}\" to /nonexistent" - else - echo "Changing home directory of \"${USER}\" to /nonexistent failed..." - exit 1 - fi -else - if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -d /nonexistent -s /sbin/nologin -c "Zabbix Sandbox" - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi -fi diff --git a/net-mgmt/zabbix2/Makefile b/net-mgmt/zabbix2/Makefile deleted file mode 100644 index ea0950b25c7c..000000000000 --- a/net-mgmt/zabbix2/Makefile +++ /dev/null @@ -1,96 +0,0 @@ -# Ports collection makefile for: zabbix -# Date created: Jun 18 2003 -# Whom: Sergey Akifyev <asa@gascom.ru> -# -# $FreeBSD$ -# - -PORTNAME= zabbix -PORTVERSION= 1.4.5 -PORTREVISION= 1 -PORTEPOCH= 1 -CATEGORIES= net-mgmt -MASTER_SITES= SF - -MAINTAINER= d.lohansky@zsupport.ru -COMMENT= Application and network monitoring solution - -LIB_DEPENDS= netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp \ - iksemel.4:${PORTSDIR}/textproc/iksemel \ - curl.4:${PORTSDIR}/ftp/curl - -OPTIONS= MYSQL "Use MySQL backend" on \ - PGSQL "Use PostgreSQL backend" off \ - SQLITE "Use SQLite backend" off \ - LDAP "Support for checking LDAP servers" on \ - IPV6 "Support for IPv6" on \ - FPING "Use fping for pinging hosts" on - -USE_GMAKE= yes -USE_PHP= gd snmp sockets pcre bcmath -USE_RC_SUBR= zabbix_server.sh -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-agent --enable-server \ - --with-net-snmp=${LOCALBASE}/bin/net-snmp-config \ - --with-curl=${LOCALBASE}/bin/curl-config \ - --with-jabber=${LOCALBASE} -MAKE_ARGS= ARCH=freebsd -SUB_FILES= pkg-message - -.include <bsd.port.pre.mk> - -.ifndef WITHOUT_LDAP -USE_OPENLDAP= yes -CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} -LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls \ - sasl2.2:${PORTSDIR}/security/cyrus-sasl2 -.endif -.ifdef WITH_IPV6 -CONFIGURE_ARGS+=--enable-ipv6 -.endif -.ifndef WITHOUT_FPING -RUN_DEPENDS+= fping:${PORTSDIR}/net/fping -.endif -.ifndef WITHOUT_MYSQL -USE_MYSQL= yes -USE_PHP+= mysql -CONFIGURE_ARGS+=--with-mysql=${LOCALBASE}/bin/mysql_config -.elifdef WITH_PGSQL -USE_PGSQL= yes -USE_PHP+= pgsql -CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE}/bin/pg_config -.elifdef WITH_SQLITE -USE_SQLITE= yes -USE_PHP+= sqlite -CONFIGURE_ARGS+=--with-sqlite3=${LOCALBASE} -.else -IGNORE= zabbix needs a database backend -.endif - -post-patch: - @${FIND} ${WRKSRC}/src/ -type f|${XARGS} \ - ${REINPLACE_CMD} -e 's|/etc/zabbix|${ETCDIR}|;s|/usr/sbin|${LOCALBASE}/sbin|' - @${REINPLACE_CMD} -e '/test.*rf/s|-rf|-f|;/LDFLAGS/s|-static||;\ - /LIBS="-lnetsnmp/s|="|="-lcrypto |;s|-lsqlite3|-lsqlite3 ${PTHREAD_LIBS}|'\ - ${WRKSRC}/configure -.ifdef WITHOUT_FPING - @${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/misc/conf/zabbix_server.conf -.endif - -.if ${ARCH} == "amd64" -post-configure: - ${ECHO_CMD} "#define HAVE_VA_COPY 1" >> ${WRKSRC}/include/config.h -.endif - -do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/src/zabbix_server/zabbix_server ${PREFIX}/bin/ - @${INSTALL} -d ${ETCDIR}/ - @${INSTALL_DATA} ${WRKSRC}/misc/conf/zabbix_server.conf\ - ${ETCDIR}/zabbix_server.conf.sample - @cd ${WRKSRC}/frontends/&&${COPYTREE_SHARE} . ${DATADIR}/ - @cd ${WRKSRC}/upgrades/&&${COPYTREE_SHARE} dbpatches ${DATADIR}/ - @cd ${WRKSRC}/create/&&${COPYTREE_SHARE} "data schema" ${DATADIR}/create/ - @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> diff --git a/net-mgmt/zabbix2/distinfo b/net-mgmt/zabbix2/distinfo deleted file mode 100644 index 5f9b3bac2d66..000000000000 --- a/net-mgmt/zabbix2/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (zabbix-1.4.5.tar.gz) = f87d73852fdab33f99beebfd16c21c63 -SHA256 (zabbix-1.4.5.tar.gz) = abde9b369960d9075605e12e915d05c04b3c81f1e3445b5d7b39919b0d1648c1 -SIZE (zabbix-1.4.5.tar.gz) = 4137972 diff --git a/net-mgmt/zabbix2/files/patch-configure b/net-mgmt/zabbix2/files/patch-configure deleted file mode 100644 index ca3fbf1c242a..000000000000 --- a/net-mgmt/zabbix2/files/patch-configure +++ /dev/null @@ -1,12 +0,0 @@ ---- ./configure.orig Sat Jan 27 20:39:51 2007 -+++ ./configure Sat Jan 27 20:48:34 2007 -@@ -275,6 +275,9 @@ - # Factoring default headers for most tests. - ac_includes_default="\ - #include <stdio.h> -+#include <sys/socket.h> -+#include <sys/param.h> -+#include <netinet/in.h> - #if HAVE_SYS_TYPES_H - # include <sys/types.h> - #endif diff --git a/net-mgmt/zabbix2/files/patch-src__libs__zbxsysinfo__simple__simple.c b/net-mgmt/zabbix2/files/patch-src__libs__zbxsysinfo__simple__simple.c deleted file mode 100644 index fb6147c46d93..000000000000 --- a/net-mgmt/zabbix2/files/patch-src__libs__zbxsysinfo__simple__simple.c +++ /dev/null @@ -1,10 +0,0 @@ ---- ./src/libs/zbxsysinfo/simple/simple.c.orig Wed Jun 13 15:21:51 2007 -+++ ./src/libs/zbxsysinfo/simple/simple.c Wed Jun 13 15:22:02 2007 -@@ -37,6 +37,7 @@ - }; - - #ifdef HAVE_LDAP -+#include "ldap.h" - - static int check_ldap(char *hostname, short port, int *value_int) - { diff --git a/net-mgmt/zabbix2/files/pkg-message.in b/net-mgmt/zabbix2/files/pkg-message.in deleted file mode 100644 index 5ba8c2fd4809..000000000000 --- a/net-mgmt/zabbix2/files/pkg-message.in +++ /dev/null @@ -1,7 +0,0 @@ -=============================================================== -You can prepare a database for zabbix this way: -% cd %%DATADIR%%/create -% cat schema/<db>.sql data/data.sql data/images_<db>.sql\ -% | <db_client> -where <db> is your preferred database engine. -=============================================================== diff --git a/net-mgmt/zabbix2/files/zabbix_server.sh.in b/net-mgmt/zabbix2/files/zabbix_server.sh.in deleted file mode 100644 index 4543669f7000..000000000000 --- a/net-mgmt/zabbix2/files/zabbix_server.sh.in +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# PROVIDE: zabbix_server -# REQUIRE: DAEMON -# KEYWORD: shutdown - -. %%RC_SUBR%% - -name="zabbix_server" -rcvar=${name}_enable -load_rc_config $name -eval : \${${rcvar}='NO'} - -command="%%PREFIX%%/bin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - -run_rc_command "$1" diff --git a/net-mgmt/zabbix2/pkg-descr b/net-mgmt/zabbix2/pkg-descr deleted file mode 100644 index 52ecef039fcf..000000000000 --- a/net-mgmt/zabbix2/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -Zabbix is software for application and network monitoring. -Zabbix supports both polling and trapping techniques to -collect data from monitored hosts. Flexible notification -mechanism allows easy and quckly configure email notifications -for pre-defined events. Zabbix is freely available under the -terms of the GNU General Public License (GPL). - -WWW: http://www.zabbix.com/ diff --git a/net-mgmt/zabbix2/pkg-install b/net-mgmt/zabbix2/pkg-install deleted file mode 100644 index f0b59f76cc4a..000000000000 --- a/net-mgmt/zabbix2/pkg-install +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -# Script was taken from mysql323-server port, and modified -# to suit zabbix needs - -[ -n "${PACKAGE_BUILDING}" ] && exit 0 - -[ "${2}" = "POST-INSTALL" ] && exit 0 - -PATH=/bin:/usr/sbin - -USER=zabbix -GROUP=${USER} -UID=122 -GID=${UID} - -if pw group show "${GROUP}" 2>/dev/null; then - echo "You already have a group \"${GROUP}\", so I will use it." -else - if pw groupadd ${GROUP} -g ${GID}; then - echo "Added group \"${GROUP}\"." - else - echo "Adding group \"${GROUP}\" failed..." - exit 1 - fi -fi - -if pw user show "${USER}" 2>/dev/null; then - echo "You already have a user \"${USER}\", so I will use it." - if pw usermod ${USER} -d /nonexistent - then - echo "Changed home directory of \"${USER}\" to /nonexistent" - else - echo "Changing home directory of \"${USER}\" to /nonexistent failed..." - exit 1 - fi -else - if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -d /nonexistent -s /sbin/nologin -c "Zabbix Sandbox" - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi -fi diff --git a/net-mgmt/zabbix2/pkg-plist b/net-mgmt/zabbix2/pkg-plist deleted file mode 100644 index ddf09c2e0692..000000000000 --- a/net-mgmt/zabbix2/pkg-plist +++ /dev/null @@ -1,277 +0,0 @@ -bin/zabbix_server -%%ETCDIR%%/zabbix_server.conf.sample -%%DATADIR%%/create/data/data.sql -%%DATADIR%%/create/data/images/Hub.png -%%DATADIR%%/create/data/images/Hub_small.png -%%DATADIR%%/create/data/images/Network.png -%%DATADIR%%/create/data/images/Network_small.png -%%DATADIR%%/create/data/images/Notebook.png -%%DATADIR%%/create/data/images/Notebook_small.png -%%DATADIR%%/create/data/images/Phone.png -%%DATADIR%%/create/data/images/Phone_small.png -%%DATADIR%%/create/data/images/Printer.png -%%DATADIR%%/create/data/images/Printer_small.png -%%DATADIR%%/create/data/images/Router.png -%%DATADIR%%/create/data/images/Router_small.png -%%DATADIR%%/create/data/images/Satellite.png -%%DATADIR%%/create/data/images/Satellite_small.png -%%DATADIR%%/create/data/images/Server.png -%%DATADIR%%/create/data/images/Server_small.png -%%DATADIR%%/create/data/images/UPS.png -%%DATADIR%%/create/data/images/UPS_small.png -%%DATADIR%%/create/data/images/Workstation.png -%%DATADIR%%/create/data/images/Workstation_small.png -%%DATADIR%%/create/data/images_mysql.sql -%%DATADIR%%/create/data/images_oracle.sql -%%DATADIR%%/create/data/images_pgsql.sql -%%DATADIR%%/create/data/images_sqlite3.sql -%%DATADIR%%/create/schema/Makefile -%%DATADIR%%/create/schema/Makefile.am -%%DATADIR%%/create/schema/Makefile.in -%%DATADIR%%/create/schema/mysql.sql -%%DATADIR%%/create/schema/oracle.sql -%%DATADIR%%/create/schema/postgresql.sql -%%DATADIR%%/create/schema/sqlite.sql -%%DATADIR%%/dbpatches/1.4/mysql/patch.sql -%%DATADIR%%/dbpatches/1.4/oracle/patch.sql -%%DATADIR%%/dbpatches/1.4/postgresql/patch.sql -%%DATADIR%%/php/acknow.php -%%DATADIR%%/php/actionconf.php -%%DATADIR%%/php/actions.php -%%DATADIR%%/php/audio/trigger_off.wav -%%DATADIR%%/php/audio/trigger_on.wav -%%DATADIR%%/php/audio/trigger_on_average.wav -%%DATADIR%%/php/audio/trigger_on_disaster.wav -%%DATADIR%%/php/audio/trigger_on_high.wav -%%DATADIR%%/php/audio/trigger_on_warning.wav -%%DATADIR%%/php/audit.php -%%DATADIR%%/php/chart.php -%%DATADIR%%/php/chart2.php -%%DATADIR%%/php/chart3.php -%%DATADIR%%/php/chart4.php -%%DATADIR%%/php/chart5.php -%%DATADIR%%/php/chart_sla.php -%%DATADIR%%/php/charts.php -%%DATADIR%%/php/conf/COPYING -%%DATADIR%%/php/config.php -%%DATADIR%%/php/create/data.sql -%%DATADIR%%/php/create/mysql.sql -%%DATADIR%%/php/css.css -%%DATADIR%%/php/discovery.php -%%DATADIR%%/php/discoveryconf.php -%%DATADIR%%/php/events.php -%%DATADIR%%/php/exp_imp.php -%%DATADIR%%/php/graphs.php -%%DATADIR%%/php/history.php -%%DATADIR%%/php/hostprofiles.php -%%DATADIR%%/php/hosts.php -%%DATADIR%%/php/httpconf.php -%%DATADIR%%/php/httpdetails.php -%%DATADIR%%/php/httpmon.php -%%DATADIR%%/php/image.php -%%DATADIR%%/php/images/flash/zbxclock.swf -%%DATADIR%%/php/images/general/closed.gif -%%DATADIR%%/php/images/general/error_small.gif -%%DATADIR%%/php/images/general/help.gif -%%DATADIR%%/php/images/general/inst_completed.gif -%%DATADIR%%/php/images/general/inst_current.gif -%%DATADIR%%/php/images/general/inst_step.gif -%%DATADIR%%/php/images/general/opened.gif -%%DATADIR%%/php/images/general/sortdown.gif -%%DATADIR%%/php/images/general/sortdown_off.gif -%%DATADIR%%/php/images/general/sortup.gif -%%DATADIR%%/php/images/general/sortup_off.gif -%%DATADIR%%/php/images/general/tick.png -%%DATADIR%%/php/images/general/zabbix.ico -%%DATADIR%%/php/images/general/tree/I.gif -%%DATADIR%%/php/images/general/tree/L.gif -%%DATADIR%%/php/images/general/tree/O.gif -%%DATADIR%%/php/images/general/tree/T.gif -%%DATADIR%%/php/images/general/tree/X.gif -%%DATADIR%%/php/images/general/tree/Xc.gif -%%DATADIR%%/php/images/general/tree/Y.gif -%%DATADIR%%/php/images/general/tree/Yc.gif -%%DATADIR%%/php/images/general/tree/point.gif -%%DATADIR%%/php/images/general/warning_small.gif -%%DATADIR%%/php/images/general/zabbix.png -%%DATADIR%%/php/images/gradients/blink1.gif -%%DATADIR%%/php/images/gradients/blink2.gif -%%DATADIR%%/php/images/gradients/button.gif -%%DATADIR%%/php/images/gradients/menu_not_active.gif -%%DATADIR%%/php/images/gradients/table_head.gif -%%DATADIR%%/php/images/gradients/table_head2.gif -%%DATADIR%%/php/images/sysmaps/Hub.png -%%DATADIR%%/php/images/sysmaps/Hub_small.png -%%DATADIR%%/php/images/sysmaps/Network.png -%%DATADIR%%/php/images/sysmaps/Network_small.png -%%DATADIR%%/php/images/sysmaps/Notebook.png -%%DATADIR%%/php/images/sysmaps/Notebook_small.png -%%DATADIR%%/php/images/sysmaps/Phone.png -%%DATADIR%%/php/images/sysmaps/Phone_small.png -%%DATADIR%%/php/images/sysmaps/Printer.png -%%DATADIR%%/php/images/sysmaps/Printer_small.png -%%DATADIR%%/php/images/sysmaps/README -%%DATADIR%%/php/images/sysmaps/Router.png -%%DATADIR%%/php/images/sysmaps/Router_small.png -%%DATADIR%%/php/images/sysmaps/Satellite.png -%%DATADIR%%/php/images/sysmaps/Satellite_small.png -%%DATADIR%%/php/images/sysmaps/Server.png -%%DATADIR%%/php/images/sysmaps/Server_small.png -%%DATADIR%%/php/images/sysmaps/UPS.png -%%DATADIR%%/php/images/sysmaps/UPS_small.png -%%DATADIR%%/php/images/sysmaps/Workstation.png -%%DATADIR%%/php/images/sysmaps/Workstation_small.png -%%DATADIR%%/php/images/sysmaps/old/Hub.png -%%DATADIR%%/php/images/sysmaps/old/Notebook.png -%%DATADIR%%/php/images/sysmaps/old/Printer.png -%%DATADIR%%/php/images/sysmaps/old/Router.png -%%DATADIR%%/php/images/sysmaps/old/Server.png -%%DATADIR%%/php/images/sysmaps/old/Workstation.png -%%DATADIR%%/php/include/.htaccess -%%DATADIR%%/php/include/acknow.inc.php -%%DATADIR%%/php/include/actions.inc.php -%%DATADIR%%/php/include/audit.inc.php -%%DATADIR%%/php/include/classes/.htaccess -%%DATADIR%%/php/include/classes/cbutton.inc.php -%%DATADIR%%/php/include/classes/ccheckbox.inc.php -%%DATADIR%%/php/include/classes/ccolor.inc.php -%%DATADIR%%/php/include/classes/ccombobox.inc.php -%%DATADIR%%/php/include/classes/cfile.inc.php -%%DATADIR%%/php/include/classes/cflash.inc.php -%%DATADIR%%/php/include/classes/cflashclock.mod.php -%%DATADIR%%/php/include/classes/cform.inc.php -%%DATADIR%%/php/include/classes/cformtable.inc.php -%%DATADIR%%/php/include/classes/chelp.inc.php -%%DATADIR%%/php/include/classes/chostsinfo.mod.php -%%DATADIR%%/php/include/classes/ciframe.inc.php -%%DATADIR%%/php/include/classes/cimg.inc.php -%%DATADIR%%/php/include/classes/clink.inc.php -%%DATADIR%%/php/include/classes/clist.inc.php -%%DATADIR%%/php/include/classes/cmap.inc.php -%%DATADIR%%/php/include/classes/cpumenu.inc.php -%%DATADIR%%/php/include/classes/cserverinfo.mod.php -%%DATADIR%%/php/include/classes/cspan.inc.php -%%DATADIR%%/php/include/classes/ctable.inc.php -%%DATADIR%%/php/include/classes/ctableinfo.inc.php -%%DATADIR%%/php/include/classes/ctag.inc.php -%%DATADIR%%/php/include/classes/ctextarea.inc.php -%%DATADIR%%/php/include/classes/ctextbox.inc.php -%%DATADIR%%/php/include/classes/ctree.inc.php -%%DATADIR%%/php/include/classes/ctriggerinfo.mod.php -%%DATADIR%%/php/include/classes/cvar.inc.php -%%DATADIR%%/php/include/classes/graph.inc.php -%%DATADIR%%/php/include/config.inc.php -%%DATADIR%%/php/include/copt.lib.php -%%DATADIR%%/php/include/db.inc.php -%%DATADIR%%/php/include/defines.inc.php -%%DATADIR%%/php/include/discovery.inc.php -%%DATADIR%%/php/include/events.inc.php -%%DATADIR%%/php/include/export.inc.php -%%DATADIR%%/php/include/forms.inc.php -%%DATADIR%%/php/include/graphs.inc.php -%%DATADIR%%/php/include/hosts.inc.php -%%DATADIR%%/php/include/html.inc.php -%%DATADIR%%/php/include/httptest.inc.php -%%DATADIR%%/php/include/images.inc.php -%%DATADIR%%/php/include/import.inc.php -%%DATADIR%%/php/include/items.inc.php -%%DATADIR%%/php/include/js.inc.php -%%DATADIR%%/php/include/locales/cn_zh.inc.php -%%DATADIR%%/php/include/locales/de_de.inc.php -%%DATADIR%%/php/include/locales/en_gb.inc.php -%%DATADIR%%/php/include/locales/fr_fr.inc.php -%%DATADIR%%/php/include/locales/hu_hu.inc.php -%%DATADIR%%/php/include/locales/it_it.inc.php -%%DATADIR%%/php/include/locales/ja_jp.inc.php -%%DATADIR%%/php/include/locales/lv_lv.inc.php -%%DATADIR%%/php/include/locales/nl_nl.inc.php -%%DATADIR%%/php/include/locales/pt_br.inc.php -%%DATADIR%%/php/include/locales/ru_ru.inc.php -%%DATADIR%%/php/include/locales/sp_sp.inc.php -%%DATADIR%%/php/include/locales/sv_se.inc.php -%%DATADIR%%/php/include/locales.inc.php -%%DATADIR%%/php/include/maps.inc.php -%%DATADIR%%/php/include/media.inc.php -%%DATADIR%%/php/include/nodes.inc.php -%%DATADIR%%/php/include/page_footer.php -%%DATADIR%%/php/include/page_header.php -%%DATADIR%%/php/include/perm.inc.php -%%DATADIR%%/php/include/profiles.inc.php -%%DATADIR%%/php/include/screens.inc.php -%%DATADIR%%/php/include/services.inc.php -%%DATADIR%%/php/include/setup.inc.php -%%DATADIR%%/php/include/triggers.inc.php -%%DATADIR%%/php/include/users.inc.php -%%DATADIR%%/php/include/validate.inc.php -%%DATADIR%%/php/index.php -%%DATADIR%%/php/instal.php -%%DATADIR%%/php/items.php -%%DATADIR%%/php/js/blink.js -%%DATADIR%%/php/js/common.js -%%DATADIR%%/php/js/cookies.js -%%DATADIR%%/php/js/menu.js -%%DATADIR%%/php/js/services.js -%%DATADIR%%/php/js/showhint.js -%%DATADIR%%/php/js/tree.js -%%DATADIR%%/php/latest.php -%%DATADIR%%/php/map.php -%%DATADIR%%/php/maps.php -%%DATADIR%%/php/media_types.php -%%DATADIR%%/php/nodes.php -%%DATADIR%%/php/overview.php -%%DATADIR%%/php/popup.php -%%DATADIR%%/php/popup_gitem.php -%%DATADIR%%/php/popup_httpstep.php -%%DATADIR%%/php/popup_media.php -%%DATADIR%%/php/popup_right.php -%%DATADIR%%/php/popup_trexpr.php -%%DATADIR%%/php/popup_users.php -%%DATADIR%%/php/popup_usrgrp.php -%%DATADIR%%/php/profile.php -%%DATADIR%%/php/queue.php -%%DATADIR%%/php/report1.php -%%DATADIR%%/php/report2.php -%%DATADIR%%/php/report3.php -%%DATADIR%%/php/report4.php -%%DATADIR%%/php/report5.php -%%DATADIR%%/php/screenconf.php -%%DATADIR%%/php/screenedit.php -%%DATADIR%%/php/screens.php -%%DATADIR%%/php/services.php -%%DATADIR%%/php/services_form.php -%%DATADIR%%/php/setup.php -%%DATADIR%%/php/srv_status.php -%%DATADIR%%/php/sysmap.php -%%DATADIR%%/php/sysmaps.php -%%DATADIR%%/php/tr_comments.php -%%DATADIR%%/php/tr_events.php -%%DATADIR%%/php/tr_status.php -%%DATADIR%%/php/triggers.php -%%DATADIR%%/php/users.php -%%DATADIR%%/php/vtext.php -@dirrm %%DATADIR%%/create/data/images -@dirrm %%DATADIR%%/create/data -@dirrm %%DATADIR%%/create/schema -@dirrm %%DATADIR%%/create -@dirrm %%DATADIR%%/dbpatches/1.4/mysql -@dirrm %%DATADIR%%/dbpatches/1.4/oracle -@dirrm %%DATADIR%%/dbpatches/1.4/postgresql -@dirrm %%DATADIR%%/dbpatches/1.4 -@dirrm %%DATADIR%%/dbpatches -@dirrm %%DATADIR%%/php/audio -@dirrm %%DATADIR%%/php/create -@dirrm %%DATADIR%%/php/images/flash -@dirrm %%DATADIR%%/php/images/general/tree -@dirrm %%DATADIR%%/php/images/general -@dirrm %%DATADIR%%/php/images/gradients -@dirrm %%DATADIR%%/php/images/sysmaps/old -@dirrm %%DATADIR%%/php/images/sysmaps -@dirrm %%DATADIR%%/php/images -@dirrm %%DATADIR%%/php/include/classes -@dirrm %%DATADIR%%/php/include/locales -@dirrm %%DATADIR%%/php/include -@dirrm %%DATADIR%%/php/js -@dirrmtry %%ETCDIR%% -@dirrmtry %%DATADIR%%/php/conf -@dirrmtry %%DATADIR%%/php -@dirrmtry %%DATADIR%% |