diff options
| author | cvs2svn <cvs2svn@FreeBSD.org> | 2006-03-23 22:24:03 +0000 |
|---|---|---|
| committer | cvs2svn <cvs2svn@FreeBSD.org> | 2006-03-23 22:24:03 +0000 |
| commit | 96fe98e1c6bc0301781b0dd7dbfeef3e3f137f43 (patch) | |
| tree | 7650cfe102643b74d6ad1d3efe1771281b5e66f0 /net-mgmt | |
| parent | - Cacti developers has modified one of oficial patches. (diff) | |
This commit was manufactured by cvs2svn to create tag 'RELEASE_5_5_0'.release/5.5.0
Diffstat (limited to 'net-mgmt')
204 files changed, 0 insertions, 9683 deletions
diff --git a/net-mgmt/cacti-spine/Makefile b/net-mgmt/cacti-spine/Makefile deleted file mode 100644 index 8e56538a6fb9..000000000000 --- a/net-mgmt/cacti-spine/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# New ports collection makefile for: cactid -# Date created: Feb 26 2005 -# Whom: clement@FreeBSD.org -# -# $FreeBSD$ -# - -PORTNAME= cactid -PORTVERSION= 0.8.6.g -CATEGORIES= net -MASTER_SITES= http://www.cacti.net/downloads/cactid/ -DISTNAME= cacti-${PORTNAME}-0.8.6g - -MAINTAINER= clement@FreeBSD.org -COMMENT= A multithreaded poller for Cacti written in C - -LIB_DEPENDS= netsnmp.9:${PORTSDIR}/net-mgmt/net-snmp - -GNU_CONFIGURE= YES -CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} --with-snmp=${LOCALBASE} -USE_MYSQL= YES -USE_OPENSSL= YES -USE_REINPLACE= YES - -post-patch: - @${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},' \ - ${WRKSRC}/cactid.h - -post-install: - @${MKDIR} ${EXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/cactid.conf ${EXAMPLESDIR} - @[ -e ${PREFIX}/etc/cactid.conf ] || \ - ${INSTALL_DATA} ${EXAMPLESDIR}/cactid.conf ${PREFIX}/etc/ - -.include <bsd.port.mk> diff --git a/net-mgmt/cacti-spine/distinfo b/net-mgmt/cacti-spine/distinfo deleted file mode 100644 index abd6830956be..000000000000 --- a/net-mgmt/cacti-spine/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (cacti-cactid-0.8.6g.tar.gz) = 8cd35272d86dc112ba1e82393d9f07c3 -SHA256 (cacti-cactid-0.8.6g.tar.gz) = 823d77fac9c7fd34d07004c7980bd621daaa1230c2e9c91fd9405a5bd05bfd80 -SIZE (cacti-cactid-0.8.6g.tar.gz) = 148921 diff --git a/net-mgmt/cacti-spine/files/patch-Makefile.in b/net-mgmt/cacti-spine/files/patch-Makefile.in deleted file mode 100644 index 5d48834ec407..000000000000 --- a/net-mgmt/cacti-spine/files/patch-Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ ---- Makefile.in.orig Wed Jan 19 06:04:10 2005 -+++ Makefile.in Mon Mar 21 16:41:51 2005 -@@ -227,12 +227,12 @@ - includeHEADERS_INSTALL = $(INSTALL_HEADER) - install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(includedir) -+ $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \ -- $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \ -+ echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f"; \ -+ $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f; \ - done - - uninstall-includeHEADERS: diff --git a/net-mgmt/cacti-spine/files/patch-cactid.h b/net-mgmt/cacti-spine/files/patch-cactid.h deleted file mode 100644 index d0c0743ebc19..000000000000 --- a/net-mgmt/cacti-spine/files/patch-cactid.h +++ /dev/null @@ -1,11 +0,0 @@ ---- cactid.h.orig Tue Oct 11 23:13:48 2005 -+++ cactid.h Sun Oct 30 14:15:22 2005 -@@ -55,7 +55,7 @@ - /* locations to search for the config file */ - #define CONFIG_PATHS 2 - #define CONFIG_PATH_1 "" --#define CONFIG_PATH_2 "/etc/" -+#define CONFIG_PATH_2 "%%PREFIX%%/etc/" - - /* config file defaults */ - #define DEFAULT_CONF_FILE "cactid.conf" diff --git a/net-mgmt/cacti-spine/files/patch-nfs_popen.c b/net-mgmt/cacti-spine/files/patch-nfs_popen.c deleted file mode 100644 index 3bc6e665ba31..000000000000 --- a/net-mgmt/cacti-spine/files/patch-nfs_popen.c +++ /dev/null @@ -1,10 +0,0 @@ ---- nft_popen.c.orig Sun Jan 15 10:27:41 2006 -+++ nft_popen.c Sun Jan 15 10:28:08 2006 -@@ -66,6 +66,7 @@ - #include <string.h> - #include <unistd.h> - #include <sys/wait.h> -+#include <sys/signal.h> - - #include <nft_popen.h> - diff --git a/net-mgmt/cacti-spine/pkg-descr b/net-mgmt/cacti-spine/pkg-descr deleted file mode 100644 index bf46eb143990..000000000000 --- a/net-mgmt/cacti-spine/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -Cactid is a poller for Cacti that primarily strives to be as fast as -possible. For this reason it is written in native C, makes use of POSIX -threads, and is linked directly against the net-snmp library for -minmumal SNMP polling overhead. Cactid is a replacement for the default -cmd.php poller so you must decide if using Cactid makes sense for your -installation. - -WWW: http://www.cacti.net/cactid_info.php diff --git a/net-mgmt/cacti-spine/pkg-plist b/net-mgmt/cacti-spine/pkg-plist deleted file mode 100644 index 23aafa65be4a..000000000000 --- a/net-mgmt/cacti-spine/pkg-plist +++ /dev/null @@ -1,17 +0,0 @@ -bin/cactid -@unexec if cmp -s %D/etc/cactid.conf %D/%%EXAMPLESDIR%%/cactid.conf; then rm -f %D/etc/cactid.conf; fi -%%EXAMPLESDIR%%/cactid.conf -@exec [ -f %D/etc/cactid.conf ] || cp %D/%%EXAMPLESDIR%%/httpd-std.conf %D/etc/cactid.conf -include/cactid/cactid.h -include/cactid/common.h -include/cactid/keywords.h -include/cactid/locks.h -include/cactid/nft_popen.h -include/cactid/php.h -include/cactid/ping.h -include/cactid/poller.h -include/cactid/snmp.h -include/cactid/sql.h -include/cactid/util.h -@dirrm include/cactid -@dirrm %%EXAMPLESDIR%% diff --git a/net-mgmt/cacti/Makefile b/net-mgmt/cacti/Makefile deleted file mode 100644 index 7ded291099d6..000000000000 --- a/net-mgmt/cacti/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# New ports collection makefile for: cacti -# Date created: 6 December 2003 -# Whom: Vincent Tantardini <vinc@freebsd-fr.org> -# -# $FreeBSD$ -# - -PORTNAME= cacti -PORTVERSION= 0.8.6h -PORTREVISION= 41 -CATEGORIES= net www -MASTER_SITES= http://www.cacti.net/downloads/ - -MAINTAINER= sem@FreeBSD.org -COMMENT= Web-driven graphing interface for RRDTool - -# Vendor's patches -PATCH_SITES= http://www.cacti.net/downloads/patches/${PORTVERSION}/ -PATCHFILES= fix_search_session_clear_issue.patch \ - fix_sql_syntax_related_to_default_rra_id.patch \ - nth_percentile_empty_return_set_issue.patch \ - mysql_5x_strict.patch - -PATCH_DIST_STRIP=-p1 - -RUN_DEPENDS= rrdtool:${PORTSDIR}/net/rrdtool \ - net-snmp-config:${PORTSDIR}/net-mgmt/net-snmp - -USE_MYSQL= yes -USE_PHP= mysql pcre session xml -WANT_PHP_WEB= yes -NO_BUILD= yes -PKGMESSAGE= ${WRKDIR}/pkg-message -PKGINSTALL= ${WRKDIR}/pkg-install -SUB_FILES= pkg-message pkg-install - -CACTIDIR?= share/cacti -CACTIUSER?= cacti -CACTIGROUP?= ${CACTIUSER} -PLIST_SUB+= CACTIDIR=${CACTIDIR} -SUB_LIST+= CACTIDIR=${CACTIDIR} CACTIUSER=${CACTIUSER} \ - CACTIGROUP=${CACTIGROUP} - -post-patch: - @${FIND} ${WRKSRC} -name \*.orig -delete; \ - ${MV} ${WRKSRC}/include/db-settings.php ${WRKSRC}/include/db-settings.php.orig - -pre-install: - @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL; \ - -do-install: - @${MKDIR} ${PREFIX}/${CACTIDIR}; \ - ${CP} -R ${WRKSRC}/* ${PREFIX}/${CACTIDIR}/; \ - if [ ! -f ${PREFIX}/${CACTIDIR}/include/db-settings.php ]; then \ - ${CP} ${PREFIX}/${CACTIDIR}/include/db-settings.php.orig \ - ${PREFIX}/${CACTIDIR}/include/db-settings.php; \ - fi - -post-install: - @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.mk> diff --git a/net-mgmt/cacti/distinfo b/net-mgmt/cacti/distinfo deleted file mode 100644 index 96e1e377580a..000000000000 --- a/net-mgmt/cacti/distinfo +++ /dev/null @@ -1,15 +0,0 @@ -MD5 (cacti-0.8.6h.tar.gz) = 5f6100b525b5b29e81f43cc7c55f4000 -SHA256 (cacti-0.8.6h.tar.gz) = 69b6ad51ee21c5367dc67a752a3745804531280356eb261d81f9636a647ca17e -SIZE (cacti-0.8.6h.tar.gz) = 1096877 -MD5 (fix_search_session_clear_issue.patch) = 20dd3bd4688e95490d649768e9191f3a -SHA256 (fix_search_session_clear_issue.patch) = e789254e185b258293fcb31053bbb59d0c243c25582987858539a80ec9b4e9bc -SIZE (fix_search_session_clear_issue.patch) = 1154 -MD5 (fix_sql_syntax_related_to_default_rra_id.patch) = 4ab874541b292e07eacbbce6dc505717 -SHA256 (fix_sql_syntax_related_to_default_rra_id.patch) = 458e1a64e97dc592b10e354b046079d5ea31101dd4f1f4d0e689c5d2ab363106 -SIZE (fix_sql_syntax_related_to_default_rra_id.patch) = 1058 -MD5 (nth_percentile_empty_return_set_issue.patch) = b64160dd736d404eb1b2537e9c80199d -SHA256 (nth_percentile_empty_return_set_issue.patch) = 63a9dfb702a50ba73b8d84da6a86588927eb192e022d07dcbe8ea7d5f9389982 -SIZE (nth_percentile_empty_return_set_issue.patch) = 4792 -MD5 (mysql_5x_strict.patch) = f5ed4305cc0b388e18be4e85b2534f1a -SHA256 (mysql_5x_strict.patch) = 346845072b3b66957f4f494f7dadb9a51df1c4320791f4f89943856fa858c2fe -SIZE (mysql_5x_strict.patch) = 5243 diff --git a/net-mgmt/cacti/files/patch-fix_df_output b/net-mgmt/cacti/files/patch-fix_df_output deleted file mode 100644 index 8df567b2255f..000000000000 --- a/net-mgmt/cacti/files/patch-fix_df_output +++ /dev/null @@ -1,9 +0,0 @@ ---- scripts/diskfree.pl.orig Wed Jan 4 06:08:30 2006 -+++ scripts/diskfree.pl Fri Jan 6 00:16:58 2006 -@@ -1,5 +1,5 @@ - #!/usr/bin/perl --open(PROCESS,"df --block-size=1024 -P $ARGV[0] | grep -v Filesystem |"); -+open(PROCESS,"df -k $ARGV[0] | grep -v Filesystem |"); - foreach (<PROCESS>) { - if ($_ =~ /($ARGV[0])(.* )(.*[0-9])(.* )(.*[0-9])(.* )(.*[0-9])(.* )(.*[0-9])%(.* )/) { - print "megabytes:$7 percent:$9"; diff --git a/net-mgmt/cacti/files/patch-include-config.php b/net-mgmt/cacti/files/patch-include-config.php deleted file mode 100644 index 39dd30e734c1..000000000000 --- a/net-mgmt/cacti/files/patch-include-config.php +++ /dev/null @@ -1,25 +0,0 @@ ---- include/config.php.orig Fri Jan 6 00:27:51 2006 -+++ include/config.php Fri Jan 6 00:28:39 2006 -@@ -24,7 +24,11 @@ - +-------------------------------------------------------------------------+ - */ - --/* make sure these values refect your actual database/host/user/password */ -+/* -+ * these are default values. do not change them. set your actual -+ * database/host/user/password in db-settings.php file instead. -+ * -+ */ - $database_type = "mysql"; - $database_default = "cacti"; - $database_hostname = "localhost"; -@@ -64,6 +68,9 @@ - $config["base_path"] = strtr(ereg_replace("(.*)[\/\\]include", "\\1", dirname(__FILE__)), "\\", "/"); - $config["library_path"] = ereg_replace("(.*[\/\\])include", "\\1lib", dirname(__FILE__)); - $config["include_path"] = dirname(__FILE__); -+ -+/* load user defined DB settings */ -+include($config["include_path"] . "/db-settings.php"); - - /* colors */ - $colors["dark_outline"] = "454E53"; diff --git a/net-mgmt/cacti/files/patch-include-db-settings.php b/net-mgmt/cacti/files/patch-include-db-settings.php deleted file mode 100644 index 7552ac99e4fd..000000000000 --- a/net-mgmt/cacti/files/patch-include-db-settings.php +++ /dev/null @@ -1,12 +0,0 @@ ---- /dev/null Tue Jun 21 16:31:36 2005 -+++ include/db-settings.php Tue Jun 21 16:29:15 2005 -@@ -0,0 +1,9 @@ -+<?php -+/* make sure these values refect your actual database/host/user/password */ -+$database_type = "mysql"; -+$database_default = "cacti"; -+$database_hostname = "localhost"; -+$database_username = "cactiuser"; -+$database_password = "cactiuser"; -+$database_port = "3306"; -+?> diff --git a/net-mgmt/cacti/files/pkg-install.in b/net-mgmt/cacti/files/pkg-install.in deleted file mode 100644 index e33cc5c0bcb9..000000000000 --- a/net-mgmt/cacti/files/pkg-install.in +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh - -PW=/usr/sbin/pw -UID=107 -GID=${UID} -CACTIUSER=%%CACTIUSER%% -CACTIGROUP=%%CACTIGROUP%% -CACTIDIR=%%CACTIDIR%% -PREFIX=%%PREFIX%% - -case $2 in - -PRE-INSTALL) - - if ${PW} group show "${CACTIGROUP}" 2>/dev/null; then - echo "You already have a group \"${CACTIGROUP}\", so I will use it." - else - if ${PW} groupadd ${CACTIGROUP} -g ${GID}; then - echo "Added group \"${CACTIGROUP}\"." - else - echo "Adding group \"${CACTIGROUP}\" failed..." - exit 1 - fi - fi - - if ${PW} user show "${CACTIUSER}" 2>/dev/null; then - echo "You already have a user \"${CACTIUSER}\", so I will use it." - else - if ${PW} useradd ${CACTIUSER} -u ${UID} -g ${CACTIGROUP} -h - \ - -d "/nonexistent" -s /sbin/nologin -c "Cacti Sandbox" - then - echo "Added user \"${CACTIUSER}\"." - else - echo "Adding user \"${CACTIUSER}\" failed..." - exit 1 - fi - fi - ;; - -POST-INSTALL) - - chown ${CACTIUSER}:${CACTIGROUP} ${PREFIX}/${CACTIDIR}/rra/ - chown -R ${CACTIUSER}:${CACTIGROUP} ${PREFIX}/${CACTIDIR}/log/ - chmod -R a+r ${PREFIX}/${CACTIDIR}/scripts/ - ;; -*) - exit 1 -;; -esac -exit diff --git a/net-mgmt/cacti/files/pkg-message.in b/net-mgmt/cacti/files/pkg-message.in deleted file mode 100644 index c52202cf44bd..000000000000 --- a/net-mgmt/cacti/files/pkg-message.in +++ /dev/null @@ -1,21 +0,0 @@ -======================================================================= -Cacti is now installed. If you intall it for the first time, -you may have to follow this steps to make it work correctly: - -1. Create the MySQL database: -# mysqladmin --user=root create cacti -2. Create a mysql user/password for cacti: - (change user and/or password if requered) -# echo "GRANT ALL ON cacti.* TO cactiuser@localhost IDENTIFIED BY 'cactiuser'; FLUSH PRIVILEGES;" | mysql -3. Import the default cacti database: -# mysql cacti < %%PREFIX%%/%%CACTIDIR%%/cacti.sql -4. Edit %%PREFIX%%/%%CACTIDIR%%/include/db-settings.php. -5. Add a line to your /etc/crontab file similar to: -*/5 * * * * %%CACTIUSER%% %%LOCALBASE%%/bin/php %%PREFIX%%/%%CACTIDIR%%/poller.php > /dev/null 2>&1 -6. Add alias in apache config for the cacti dir: -Alias /cacti "%%PREFIX%%/%%CACTIDIR%%/" -7. Open a cacti login page in your web browser and login with admin/admin. - -If you update cacti, open a login page right now. An updating process -will run automatically. -======================================================================= diff --git a/net-mgmt/cacti/pkg-descr b/net-mgmt/cacti/pkg-descr deleted file mode 100644 index fe8fa4325341..000000000000 --- a/net-mgmt/cacti/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -Cacti is a complete frontend to RRDTool, it stores all of the necessary -information to create graphs and populate them with data in a MySQL database. -The frontend is completely PHP driven. Along with being able to maintain -Graphs, Data Sources, and Round Robin Archives in a database, cacti handles -the data gathering. There is also SNMP support for those used to creating -traffic graphs with MRTG. - -WWW: http://www.cacti.net diff --git a/net-mgmt/cacti/pkg-plist b/net-mgmt/cacti/pkg-plist deleted file mode 100644 index 9325f0a3b7cf..000000000000 --- a/net-mgmt/cacti/pkg-plist +++ /dev/null @@ -1,408 +0,0 @@ -%%CACTIDIR%%/LICENSE -%%CACTIDIR%%/README -%%CACTIDIR%%/about.php -%%CACTIDIR%%/auth_changepassword.php -%%CACTIDIR%%/auth_login.php -%%CACTIDIR%%/cacti.sql -%%CACTIDIR%%/cdef.php -%%CACTIDIR%%/cmd.php -%%CACTIDIR%%/color.php -%%CACTIDIR%%/copy_cacti_user.php -%%CACTIDIR%%/data_input.php -%%CACTIDIR%%/data_queries.php -%%CACTIDIR%%/data_sources.php -%%CACTIDIR%%/data_templates.php -%%CACTIDIR%%/docs/CHANGELOG -%%CACTIDIR%%/docs/CONTRIB -%%CACTIDIR%%/docs/INSTALL -%%CACTIDIR%%/docs/README -%%CACTIDIR%%/docs/REQUIREMENTS -%%CACTIDIR%%/docs/UPGRADE -%%CACTIDIR%%/docs/html/LICENSE.html -%%CACTIDIR%%/docs/html/advanced_topics.html -%%CACTIDIR%%/docs/html/basics.html -%%CACTIDIR%%/docs/html/cdefs.html -%%CACTIDIR%%/docs/html/data_input_methods.html -%%CACTIDIR%%/docs/html/data_queries.html -%%CACTIDIR%%/docs/html/data_templates.html -%%CACTIDIR%%/docs/html/faq.html -%%CACTIDIR%%/docs/html/graph_howto.html -%%CACTIDIR%%/docs/html/graph_overview.html -%%CACTIDIR%%/docs/html/graph_permissions.html -%%CACTIDIR%%/docs/html/graph_settings.html -%%CACTIDIR%%/docs/html/graph_viewing.html -%%CACTIDIR%%/docs/html/host_templates.html -%%CACTIDIR%%/docs/html/host_variables.html -%%CACTIDIR%%/docs/html/how_to.html -%%CACTIDIR%%/docs/html/images/data_template.png -%%CACTIDIR%%/docs/html/images/graph_template.png -%%CACTIDIR%%/docs/html/images/graph_tree.png -%%CACTIDIR%%/docs/html/images/host_template.png -%%CACTIDIR%%/docs/html/images/new_device.png -%%CACTIDIR%%/docs/html/images/new_graphs.png -%%CACTIDIR%%/docs/html/images/user_management.png -%%CACTIDIR%%/docs/html/index.html -%%CACTIDIR%%/docs/html/install_unix.html -%%CACTIDIR%%/docs/html/install_windows.html -%%CACTIDIR%%/docs/html/installation.html -%%CACTIDIR%%/docs/html/making_scripts_work_with_cacti.html -%%CACTIDIR%%/docs/html/manual.css -%%CACTIDIR%%/docs/html/migration_php_scripts_to_script_server.html -%%CACTIDIR%%/docs/html/new_graphs.html -%%CACTIDIR%%/docs/html/php_script_server.html -%%CACTIDIR%%/docs/html/realm_permissions.html -%%CACTIDIR%%/docs/html/reference.html -%%CACTIDIR%%/docs/html/requirements.html -%%CACTIDIR%%/docs/html/rrdtool_features.html -%%CACTIDIR%%/docs/html/script_query_xml.html -%%CACTIDIR%%/docs/html/script_to_graph.html -%%CACTIDIR%%/docs/html/snmp_query_xml.html -%%CACTIDIR%%/docs/html/templates.html -%%CACTIDIR%%/docs/html/testing_script_in_script_server.html -%%CACTIDIR%%/docs/html/upgrade.html -%%CACTIDIR%%/docs/html/upgrade_using_hostmib_data_queries.html -%%CACTIDIR%%/docs/html/user_management.html -%%CACTIDIR%%/docs/html/using_cacti.html -%%CACTIDIR%%/docs/html/variables.html -%%CACTIDIR%%/docs/pdf/README -%%CACTIDIR%%/docs/text/manual.txt -%%CACTIDIR%%/gprint_presets.php -%%CACTIDIR%%/graph.php -%%CACTIDIR%%/graph_image.php -%%CACTIDIR%%/graph_settings.php -%%CACTIDIR%%/graph_templates.php -%%CACTIDIR%%/graph_templates_inputs.php -%%CACTIDIR%%/graph_templates_items.php -%%CACTIDIR%%/graph_view.php -%%CACTIDIR%%/graphs.php -%%CACTIDIR%%/graphs_items.php -%%CACTIDIR%%/graphs_new.php -%%CACTIDIR%%/host.php -%%CACTIDIR%%/host_templates.php -%%CACTIDIR%%/images/arrow.gif -%%CACTIDIR%%/images/auth_deny.gif -%%CACTIDIR%%/images/auth_login.gif -%%CACTIDIR%%/images/button_add.gif -%%CACTIDIR%%/images/button_cancel.gif -%%CACTIDIR%%/images/button_cancel2.gif -%%CACTIDIR%%/images/button_clear.gif -%%CACTIDIR%%/images/button_create.gif -%%CACTIDIR%%/images/button_default.gif -%%CACTIDIR%%/images/button_delete.gif -%%CACTIDIR%%/images/button_export.gif -%%CACTIDIR%%/images/button_go.gif -%%CACTIDIR%%/images/button_help.gif -%%CACTIDIR%%/images/button_import.gif -%%CACTIDIR%%/images/button_no.gif -%%CACTIDIR%%/images/button_refresh.gif -%%CACTIDIR%%/images/button_save.gif -%%CACTIDIR%%/images/button_view.gif -%%CACTIDIR%%/images/button_yes.gif -%%CACTIDIR%%/images/cacti_about_logo.gif -%%CACTIDIR%%/images/cacti_backdrop.gif -%%CACTIDIR%%/images/cacti_backdrop2.gif -%%CACTIDIR%%/images/cacti_logo.gif -%%CACTIDIR%%/images/calendar.gif -%%CACTIDIR%%/images/delete_icon.gif -%%CACTIDIR%%/images/delete_icon_large.gif -%%CACTIDIR%%/images/graph_properties.gif -%%CACTIDIR%%/images/graph_zoom.gif -%%CACTIDIR%%/images/hide.gif -%%CACTIDIR%%/images/left_border.gif -%%CACTIDIR%%/images/menu_line.gif -%%CACTIDIR%%/images/move_down.gif -%%CACTIDIR%%/images/move_up.gif -%%CACTIDIR%%/images/reload_icon_small.gif -%%CACTIDIR%%/images/shadow.gif -%%CACTIDIR%%/images/shadow_gray.gif -%%CACTIDIR%%/images/show.gif -%%CACTIDIR%%/images/tab_cacti.gif -%%CACTIDIR%%/images/tab_console.gif -%%CACTIDIR%%/images/tab_graphs.gif -%%CACTIDIR%%/images/tab_mode_list.gif -%%CACTIDIR%%/images/tab_mode_list_down.gif -%%CACTIDIR%%/images/tab_mode_preview.gif -%%CACTIDIR%%/images/tab_mode_preview_down.gif -%%CACTIDIR%%/images/tab_mode_tree.gif -%%CACTIDIR%%/images/tab_mode_tree_down.gif -%%CACTIDIR%%/images/tab_settings.gif -%%CACTIDIR%%/images/tab_settings_down.gif -%%CACTIDIR%%/images/transparent_line.gif -%%CACTIDIR%%/include/auth.php -%%CACTIDIR%%/include/bottom_footer.php -%%CACTIDIR%%/include/config.php -%%CACTIDIR%%/include/config_arrays.php -%%CACTIDIR%%/include/config_constants.php -%%CACTIDIR%%/include/config_form.php -%%CACTIDIR%%/include/config_settings.php -@unexec cmp -s %D/%%CACTIDIR%%/include/db-settings.php.orig %D/%%CACTIDIR%%/include/db-settings.php && rm -f %D/%%CACTIDIR%%/include/db-settings.php || true -%%CACTIDIR%%/include/db-settings.php.orig -@exec [ -f %D/%%CACTIDIR%%/include/db-settings.php ] || cp %D/%%CACTIDIR%%/include/db-settings.php.orig %D/%%CACTIDIR%%/include/db-settings.php -%%CACTIDIR%%/include/html/inc_data_source_filter_table.php -%%CACTIDIR%%/include/html/inc_data_template_filter_table.php -%%CACTIDIR%%/include/html/inc_device_filter_table.php -%%CACTIDIR%%/include/html/inc_graph_filter_table.php -%%CACTIDIR%%/include/html/inc_graph_items_filter_table.php -%%CACTIDIR%%/include/html/inc_graph_template_filter_table.php -%%CACTIDIR%%/include/html/inc_graph_view_filter_table.php -%%CACTIDIR%%/include/html/inc_timespan_selector.php -%%CACTIDIR%%/include/html/inc_timespan_settings.php -%%CACTIDIR%%/include/jscalendar/calendar-setup.js -%%CACTIDIR%%/include/jscalendar/calendar.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-af.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-br.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-ca.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-cs-win.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-da.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-de.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-du.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-el.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-en.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-es.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-fi.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-fr.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-hr-utf8.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-hr.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-hu.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-it.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-jp.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-ko-utf8.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-ko.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-lt-utf8.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-lt.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-nl.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-no.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-pl-utf8.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-pl.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-pt.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-ro.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-ru.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-si.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-sk.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-sp.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-sv.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-tr.js -%%CACTIDIR%%/include/jscalendar/lang/calendar-zh.js -%%CACTIDIR%%/include/layout.js -%%CACTIDIR%%/include/main.css -%%CACTIDIR%%/include/top_graph_header.php -%%CACTIDIR%%/include/top_header.php -%%CACTIDIR%%/include/treeview/ftiens4.js -%%CACTIDIR%%/include/treeview/ftiens4_export.js -%%CACTIDIR%%/include/treeview/ftv2blank.gif -%%CACTIDIR%%/include/treeview/ftv2lastnode.gif -%%CACTIDIR%%/include/treeview/ftv2mlastnode.gif -%%CACTIDIR%%/include/treeview/ftv2mnode.gif -%%CACTIDIR%%/include/treeview/ftv2node.gif -%%CACTIDIR%%/include/treeview/ftv2plastnode.gif -%%CACTIDIR%%/include/treeview/ftv2pnode.gif -%%CACTIDIR%%/include/treeview/ftv2vertline.gif -%%CACTIDIR%%/include/treeview/ua.js -%%CACTIDIR%%/include/zoom.js -%%CACTIDIR%%/index.php -%%CACTIDIR%%/install/0_8_1_to_0_8_2.php -%%CACTIDIR%%/install/0_8_2_to_0_8_2a.php -%%CACTIDIR%%/install/0_8_2a_to_0_8_3.php -%%CACTIDIR%%/install/0_8_3_to_0_8_4.php -%%CACTIDIR%%/install/0_8_4_to_0_8_5.php -%%CACTIDIR%%/install/0_8_5a_to_0_8_6.php -%%CACTIDIR%%/install/0_8_6_to_0_8_6a.php -%%CACTIDIR%%/install/0_8_6c_to_0_8_6d.php -%%CACTIDIR%%/install/0_8_6d_to_0_8_6e.php -%%CACTIDIR%%/install/0_8_6f_to_0_8_6g.php -%%CACTIDIR%%/install/0_8_6g_to_0_8_6h.php -%%CACTIDIR%%/install/0_8_to_0_8_1.php -%%CACTIDIR%%/install/index.php -%%CACTIDIR%%/install/install_finish.gif -%%CACTIDIR%%/install/install_next.gif -%%CACTIDIR%%/lib/adodb/adodb-csvlib.inc.php -%%CACTIDIR%%/lib/adodb/adodb-datadict.inc.php -%%CACTIDIR%%/lib/adodb/adodb-error.inc.php -%%CACTIDIR%%/lib/adodb/adodb-errorhandler.inc.php -%%CACTIDIR%%/lib/adodb/adodb-errorpear.inc.php -%%CACTIDIR%%/lib/adodb/adodb-exceptions.inc.php -%%CACTIDIR%%/lib/adodb/adodb-iterator.inc.php -%%CACTIDIR%%/lib/adodb/adodb-lib.inc.php -%%CACTIDIR%%/lib/adodb/adodb-pager.inc.php -%%CACTIDIR%%/lib/adodb/adodb-pear.inc.php -%%CACTIDIR%%/lib/adodb/adodb-perf.inc.php -%%CACTIDIR%%/lib/adodb/adodb-php4.inc.php -%%CACTIDIR%%/lib/adodb/adodb-time.inc.php -%%CACTIDIR%%/lib/adodb/adodb-xmlschema.inc.php -%%CACTIDIR%%/lib/adodb/adodb.inc.php -%%CACTIDIR%%/lib/adodb/datadict/datadict-access.inc.php -%%CACTIDIR%%/lib/adodb/datadict/datadict-db2.inc.php -%%CACTIDIR%%/lib/adodb/datadict/datadict-firebird.inc.php -%%CACTIDIR%%/lib/adodb/datadict/datadict-generic.inc.php -%%CACTIDIR%%/lib/adodb/datadict/datadict-ibase.inc.php -%%CACTIDIR%%/lib/adodb/datadict/datadict-informix.inc.php -%%CACTIDIR%%/lib/adodb/datadict/datadict-mssql.inc.php -%%CACTIDIR%%/lib/adodb/datadict/datadict-mysql.inc.php -%%CACTIDIR%%/lib/adodb/datadict/datadict-oci8.inc.php -%%CACTIDIR%%/lib/adodb/datadict/datadict-postgres.inc.php -%%CACTIDIR%%/lib/adodb/datadict/datadict-sapdb.inc.php -%%CACTIDIR%%/lib/adodb/datadict/datadict-sybase.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-access.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-ado.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-ado5.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-ado_access.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-ado_mssql.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-borland_ibase.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-csv.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-db2.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-fbsql.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-firebird.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-ibase.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-informix.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-informix72.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-ldap.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-mssql.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-mssqlpo.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-mysql.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-mysqli.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-mysqlt.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-netezza.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-oci8.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-oci805.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-oci8po.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-odbc.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-odbc_mssql.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-odbc_oracle.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-odbtp.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-odbtp_unicode.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-oracle.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-pdo.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-postgres.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-postgres64.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-postgres7.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-proxy.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-sapdb.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-sqlanywhere.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-sqlite.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-sqlitepo.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-sybase.inc.php -%%CACTIDIR%%/lib/adodb/drivers/adodb-vfp.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-ar.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-hu.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-bg.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-bgutf8.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-ca.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-cn.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-cz.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-de.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-en.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-es.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-fr.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-it.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-nl.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-pl.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-pt-br.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-ro.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-ru1251.inc.php -%%CACTIDIR%%/lib/adodb/lang/adodb-sv.inc.php -%%CACTIDIR%%/lib/adodb/license.txt -%%CACTIDIR%%/lib/adodb/toexport.inc.php -%%CACTIDIR%%/lib/adodb/tohtml.inc.php -%%CACTIDIR%%/lib/api_data_source.php -%%CACTIDIR%%/lib/api_device.php -%%CACTIDIR%%/lib/api_graph.php -%%CACTIDIR%%/lib/api_poller.php -%%CACTIDIR%%/lib/api_tree.php -%%CACTIDIR%%/lib/auth.php -%%CACTIDIR%%/lib/cdef.php -%%CACTIDIR%%/lib/data_query.php -%%CACTIDIR%%/lib/database.php -%%CACTIDIR%%/lib/export.php -%%CACTIDIR%%/lib/functions.php -%%CACTIDIR%%/lib/graph_export.php -%%CACTIDIR%%/lib/graph_variables.php -%%CACTIDIR%%/lib/html.php -%%CACTIDIR%%/lib/html_form.php -%%CACTIDIR%%/lib/html_form_template.php -%%CACTIDIR%%/lib/html_tree.php -%%CACTIDIR%%/lib/html_utility.php -%%CACTIDIR%%/lib/html_validate.php -%%CACTIDIR%%/lib/import.php -%%CACTIDIR%%/lib/ping.php -%%CACTIDIR%%/lib/poller.php -%%CACTIDIR%%/lib/rrd.php -%%CACTIDIR%%/lib/snmp.php -%%CACTIDIR%%/lib/sort.php -%%CACTIDIR%%/lib/template.php -%%CACTIDIR%%/lib/tree.php -%%CACTIDIR%%/lib/utility.php -%%CACTIDIR%%/lib/variables.php -%%CACTIDIR%%/lib/xml.php -%%CACTIDIR%%/log/cacti.log -%%CACTIDIR%%/logout.php -%%CACTIDIR%%/poller.php -%%CACTIDIR%%/poller_commands.php -%%CACTIDIR%%/poller_export.php -%%CACTIDIR%%/poller_reindex_hosts.php -%%CACTIDIR%%/rebuild_poller_cache.php -%%CACTIDIR%%/resource/script_queries/host_cpu.xml -%%CACTIDIR%%/resource/script_queries/host_disk.xml -%%CACTIDIR%%/resource/script_queries/unix_disk.xml -%%CACTIDIR%%/resource/script_server/host_cpu.xml -%%CACTIDIR%%/resource/script_server/host_disk.xml -%%CACTIDIR%%/resource/snmp_queries/host_disk.xml -%%CACTIDIR%%/resource/snmp_queries/interface.xml -%%CACTIDIR%%/resource/snmp_queries/kbridge.xml -%%CACTIDIR%%/resource/snmp_queries/net-snmp_disk.xml -%%CACTIDIR%%/resource/snmp_queries/netware_cpu.xml -%%CACTIDIR%%/resource/snmp_queries/netware_disk.xml -%%CACTIDIR%%/rra.php -%%CACTIDIR%%/rra/.placeholder -%%CACTIDIR%%/script_server.php -%%CACTIDIR%%/script_server.pl -%%CACTIDIR%%/scripts/3com_cable_modem.pl -%%CACTIDIR%%/scripts/diskfree.pl -%%CACTIDIR%%/scripts/diskfree.sh -%%CACTIDIR%%/scripts/linux_memory.pl -%%CACTIDIR%%/scripts/loadavg.pl -%%CACTIDIR%%/scripts/loadavg_multi.pl -%%CACTIDIR%%/scripts/ping.pl -%%CACTIDIR%%/scripts/query_host_cpu.php -%%CACTIDIR%%/scripts/query_host_partitions.php -%%CACTIDIR%%/scripts/query_unix_partitions.pl -%%CACTIDIR%%/scripts/sql.php -%%CACTIDIR%%/scripts/ss_fping.php -%%CACTIDIR%%/scripts/ss_host_cpu.php -%%CACTIDIR%%/scripts/ss_host_disk.php -%%CACTIDIR%%/scripts/ss_sql.php -%%CACTIDIR%%/scripts/unix_processes.pl -%%CACTIDIR%%/scripts/unix_tcp_connections.pl -%%CACTIDIR%%/scripts/unix_users.pl -%%CACTIDIR%%/scripts/weatherbug.pl -%%CACTIDIR%%/scripts/webhits.pl -%%CACTIDIR%%/settings.php -%%CACTIDIR%%/templates_export.php -%%CACTIDIR%%/templates_import.php -%%CACTIDIR%%/tree.php -%%CACTIDIR%%/user_admin.php -%%CACTIDIR%%/utilities.php -@dirrm %%CACTIDIR%%/scripts -@dirrm %%CACTIDIR%%/rra -@dirrm %%CACTIDIR%%/resource/snmp_queries -@dirrm %%CACTIDIR%%/resource/script_server -@dirrm %%CACTIDIR%%/resource/script_queries -@dirrm %%CACTIDIR%%/resource -@dirrm %%CACTIDIR%%/log -@dirrm %%CACTIDIR%%/lib/adodb/lang -@dirrm %%CACTIDIR%%/lib/adodb/drivers -@dirrm %%CACTIDIR%%/lib/adodb/datadict -@dirrm %%CACTIDIR%%/lib/adodb -@dirrm %%CACTIDIR%%/lib -@dirrm %%CACTIDIR%%/install -@dirrm %%CACTIDIR%%/include/treeview -@dirrm %%CACTIDIR%%/include/jscalendar/lang -@dirrm %%CACTIDIR%%/include/jscalendar -@dirrm %%CACTIDIR%%/include/html -@dirrmtry %%CACTIDIR%%/include -@dirrm %%CACTIDIR%%/images -@dirrm %%CACTIDIR%%/docs/text -@dirrm %%CACTIDIR%%/docs/pdf -@dirrm %%CACTIDIR%%/docs/html/images -@dirrm %%CACTIDIR%%/docs/html -@dirrm %%CACTIDIR%%/docs -@dirrmtry %%CACTIDIR%% diff --git a/net-mgmt/jffnms/Makefile b/net-mgmt/jffnms/Makefile deleted file mode 100644 index a8837da92fef..000000000000 --- a/net-mgmt/jffnms/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# Ports collection makefile for: jffnms -# Date created: Aug 21 2003 -# Whom: Sergey Akifyev <asa@gascom.ru> -# -# $FreeBSD$ -# - -PORTNAME= jffnms -PORTVERSION= 0.8.2 -PORTREVISION= 1 -CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR=${PORTNAME} - -MAINTAINER= asa@agava.com -COMMENT= Very advanced network monitoring and control system - -RUN_DEPENDS= neato:${PORTSDIR}/graphics/graphviz \ - rrdtool:${PORTSDIR}/net/rrdtool10 \ - nmap:${PORTSDIR}/security/nmap \ - ${LOCALBASE}/sbin/tmpwatch:${PORTSDIR}/sysutils/tmpwatch - -USE_PHP= gd snmp sockets -USE_MYSQL= yes -USE_REINPLACE= yes - -JFFNMSDIR?= share/jffnms -CRONTAB?= /usr/bin/crontab - -PLIST_SUB= JFFNMSDIR=${JFFNMSDIR} - -do-build: - -do-install: - @-${RM} ${WRKSRC}/engine/tmpwatch.sh.orig > /dev/null 2>&1 - @${MKDIR} ${PREFIX}/${JFFNMSDIR} - @${CP} -R ${WRKSRC}/* ${PREFIX}/${JFFNMSDIR} - @${CHOWN} -R www:www ${PREFIX}/${JFFNMSDIR} - @${SED} -e 's|%LOCALBASE%|${PREFIX}|g' \ - -e 's|%JFFNMSDIR%|${PREFIX}/${JFFNMSDIR}|g' ${FILESDIR}/jffnms.cron \ - > ${PREFIX}/${JFFNMSDIR}/jffnms.cron - @${SED} -e 's|%JFFNMSDIR%|${PREFIX}/${JFFNMSDIR}|g' \ - -e 's|%JFFNMS%|${DISTNAME}|g' ${FILESDIR}/jffnms_db.sh \ - > ${PREFIX}/${JFFNMSDIR}/jffnms_db.sh - @${CRONTAB} -u www ${PREFIX}/${JFFNMSDIR}/jffnms.cron - @${SED} -e 's|%JFFNMSDIR%|${PREFIX}/${JFFNMSDIR}|g' ${PKGMESSAGE} - -# -# !!! Maintainer only !!! -# -packinglist: pkg-plist.new -pkg-plist.new: - @${ECHO_MSG} '---> Making ${@}' - @${FIND} '${PREFIX}/${JFFNMSDIR}' -type f | \ - ${SED} -e 's|^${PREFIX}/${JFFNMSDIR}|%%JFFNMSDIR%%|' | \ - ${SORT} -t / > ${@} - @${FIND} '${PREFIX}/${JFFNMSDIR}' -type d | \ - ${SORT} -rt / | \ - ${SED} -e 's|^${PREFIX}/${JFFNMSDIR}|@dirrm %%JFFNMSDIR%%|' >> ${@} - @${ECHO} "@exec crontab -u www %%JFFNMSDIR%%/jffnms.cron" >> ${@} - @${ECHO} "@unexec crontab -u www -l | sed 's|.*JFFNMS.*||' | crontab -u www -" >> ${@} - -.include <bsd.port.mk> diff --git a/net-mgmt/jffnms/distinfo b/net-mgmt/jffnms/distinfo deleted file mode 100644 index 77e52d7d05d0..000000000000 --- a/net-mgmt/jffnms/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (jffnms-0.8.2.tar.gz) = 10c4dbead14c7e53a040140620768d19 -SHA256 (jffnms-0.8.2.tar.gz) = d42b2b9e0a65b744bec12f2eea34efe14a4b836c37c37f187d835774395edf90 -SIZE (jffnms-0.8.2.tar.gz) = 557085 diff --git a/net-mgmt/jffnms/files/jffnms.cron b/net-mgmt/jffnms/files/jffnms.cron deleted file mode 100644 index 9039597de48e..000000000000 --- a/net-mgmt/jffnms/files/jffnms.cron +++ /dev/null @@ -1,11 +0,0 @@ -# jffnms crontab file -# Created by Sergey Akifyev <asa@gascom.ru> -JFFNMS=%JFFNMSDIR%/engine -PATH=${PATH}:/bin:/usr/bin:%LOCALBASE%/bin:/sbin:/usr/sbin:/%LOCALBASE%/sbin # JFFNMS -*/1 * * * * cd $JFFNMS && php -q consolidate.php >/dev/null 2>&1 -*/5 * * * * cd $JFFNMS && php -q poller.php >/dev/null 2>&1 -*/30 * * * * cd $JFFNMS && php -q rrd_analizer.php >/dev/null 2>&1 -*/30 * * * * cd $JFFNMS && php -q autodiscovery_interfaces.php > /dev/null 2>&1 -02 4 * * * cd $JFFNMS && php -q tftp_get_host_config.php >/dev/null 2>&1 -02 5 * * * cd $JFFNMS && php -q cleanup_raw_tables.php >/dev/null 2>&1 -20 5 * * * cd $JFFNMS && sh tmpwatch.sh $JFFNMS >/dev/null 2>&1 diff --git a/net-mgmt/jffnms/files/jffnms_db.sh b/net-mgmt/jffnms/files/jffnms_db.sh deleted file mode 100644 index fbad3589fb2d..000000000000 --- a/net-mgmt/jffnms/files/jffnms_db.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# Created by Sergey Akifyev <asa@gascom.ru> -# - -{ - echo "CREATE DATABASE jffnms; - GRANT ALL PRIVILEGES ON jffnms.* TO jffnms@localhost - IDENTIFIED BY 'jffnms'; - FLUSH PRIVILEGES; use jffnms;" - cat %JFFNMSDIR%/docs/%JFFNMS%.mysql -} | mysql ${*} diff --git a/net-mgmt/jffnms/pkg-descr b/net-mgmt/jffnms/pkg-descr deleted file mode 100644 index 8894ea2d2353..000000000000 --- a/net-mgmt/jffnms/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -JFFNMS is a Network Management System designed to -mantain a IP SNMP / Syslog / Tacacs+ Network. It -can be used to monitor any standards compilant SNMP -device, Server, TCP port or Custom Poller, also it -has some Cisco oriented features. - -WWW: http://jffnms.sourceforge.net/ diff --git a/net-mgmt/jffnms/pkg-message b/net-mgmt/jffnms/pkg-message deleted file mode 100644 index a22b65276b23..000000000000 --- a/net-mgmt/jffnms/pkg-message +++ /dev/null @@ -1,14 +0,0 @@ -==================================================== -ACHTUNG!!! - -1) Run %JFFNMSDIR%/jffnms_db.sh -when MySQL is running - -2) Configure apache to serve pages from -%JFFNMSDIR% - -3) Modify 'Register globals = on' in php.ini - -4) Go to http://<your-hostname>/htdocs/admin/setup.php and -finish setting up JFFNMS -==================================================== diff --git a/net-mgmt/jffnms/pkg-plist b/net-mgmt/jffnms/pkg-plist deleted file mode 100644 index 000a4d487198..000000000000 --- a/net-mgmt/jffnms/pkg-plist +++ /dev/null @@ -1,587 +0,0 @@ -%%JFFNMSDIR%%/BUGS -%%JFFNMSDIR%%/Changelog -%%JFFNMSDIR%%/INSTALL -%%JFFNMSDIR%%/INSTALL.win32.txt -%%JFFNMSDIR%%/LICENSE -%%JFFNMSDIR%%/TODO -%%JFFNMSDIR%%/UPGRADE -%%JFFNMSDIR%%/UPGRADE.win32.txt -%%JFFNMSDIR%%/conf/config.parse.func.inc.php -%%JFFNMSDIR%%/conf/config.parse.inc.php -%%JFFNMSDIR%%/conf/config.php -%%JFFNMSDIR%%/conf/jffnms.conf.defaults -%%JFFNMSDIR%%/docs/apache-example -%%JFFNMSDIR%%/docs/cisco-example -%%JFFNMSDIR%%/docs/jffnms-0.8.2.mysql -%%JFFNMSDIR%%/docs/jffnms-0.8.2.pgsql -%%JFFNMSDIR%%/docs/sla-creation-example.txt -%%JFFNMSDIR%%/docs/unix/crontab -%%JFFNMSDIR%%/docs/unix/msyslog-example -%%JFFNMSDIR%%/docs/unix/php.ini.example -%%JFFNMSDIR%%/docs/unix/snmp.conf -%%JFFNMSDIR%%/docs/unix/snmptrapd.conf -%%JFFNMSDIR%%/docs/unix/syslog-ng-example -%%JFFNMSDIR%%/docs/unix/syslog.conf -%%JFFNMSDIR%%/docs/unix/tac_plus.cfg -%%JFFNMSDIR%%/docs/unix/tftp -%%JFFNMSDIR%%/docs/upgrade/jffnms-0.8.1-to-0.8.2.patch -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.8.1-to-0.8.2.mysql.diff.alarmed_hosts -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.8.1-to-0.8.2.mysql.diff.alteon -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.8.1-to-0.8.2.mysql.diff.bgp -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.8.1-to-0.8.2.mysql.diff.cisco_nat -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.8.1-to-0.8.2.mysql.diff.cpq_far -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.8.1-to-0.8.2.mysql.diff.iptables -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.8.1-to-0.8.2.mysql.diff.isdn -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.8.1-to-0.8.2.mysql.diff.pix -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.8.1-to-0.8.2.mysql.diff.pix_syslog -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.8.1-to-0.8.2.mysql.diff.rechable -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.8.1-to-0.8.2.mysql.diff.sensors -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.8.1-to-0.8.2.mysql.diff.system_mib -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.8.1-to-0.8.2.mysql.diff.traps -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.8.1-to-0.8.2.mysql.diff.ups_mib -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.8.1-to-0.8.2.mysql.diff.win_security -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.8.1-to-0.8.2.mysql.diff.windows_informant -%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.8.1-to-0.8.2.mysql.diff.x_fix_internal_ids -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.8.1-to-0.8.2.pgsql.diff.alarmed_hosts -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.8.1-to-0.8.2.pgsql.diff.alteon -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.8.1-to-0.8.2.pgsql.diff.bgp -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.8.1-to-0.8.2.pgsql.diff.cisco_nat -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.8.1-to-0.8.2.pgsql.diff.cpq_far -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.8.1-to-0.8.2.pgsql.diff.iptables -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.8.1-to-0.8.2.pgsql.diff.isdn -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.8.1-to-0.8.2.pgsql.diff.pix -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.8.1-to-0.8.2.pgsql.diff.pix_syslog -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.8.1-to-0.8.2.pgsql.diff.rechable -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.8.1-to-0.8.2.pgsql.diff.sensors -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.8.1-to-0.8.2.pgsql.diff.system_mib -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.8.1-to-0.8.2.pgsql.diff.traps -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.8.1-to-0.8.2.pgsql.diff.ups_mib -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.8.1-to-0.8.2.pgsql.diff.win_security -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.8.1-to-0.8.2.pgsql.diff.windows_informant -%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.8.1-to-0.8.2.pgsql.diff.x_fix_internal_ids -%%JFFNMSDIR%%/docs/utils/adjust_bw.php -%%JFFNMSDIR%%/docs/utils/clean_auth.php -%%JFFNMSDIR%%/docs/utils/exp_poller_test.php -%%JFFNMSDIR%%/docs/utils/export_custom.php -%%JFFNMSDIR%%/docs/utils/import_custom.php -%%JFFNMSDIR%%/docs/utils/int_values_convert.php -%%JFFNMSDIR%%/docs/utils/jffnms-snmp/iptables.inc.php -%%JFFNMSDIR%%/docs/utils/jffnms-snmp/jffnms-snmp.php -%%JFFNMSDIR%%/docs/utils/jffnms-snmp/snmpd.conf.example -%%JFFNMSDIR%%/docs/utils/jffnms-snmp/tc.inc.php -%%JFFNMSDIR%%/docs/utils/lines.sh -%%JFFNMSDIR%%/docs/utils/makedb_release.php -%%JFFNMSDIR%%/docs/utils/mib.php -%%JFFNMSDIR%%/docs/utils/perl_wddx.pl -%%JFFNMSDIR%%/docs/utils/ping.php -%%JFFNMSDIR%%/docs/utils/rrd_export.php -%%JFFNMSDIR%%/docs/utils/rrd_import.php -%%JFFNMSDIR%%/docs/utils/satellite-client.php -%%JFFNMSDIR%%/docs/utils/satellite_sync.php -%%JFFNMSDIR%%/docs/utils/slice-rrd.php -%%JFFNMSDIR%%/docs/utils/sql_alter_pg.php -%%JFFNMSDIR%%/docs/utils/sql_diff.php -%%JFFNMSDIR%%/docs/utils/syslog_file_import.php -%%JFFNMSDIR%%/docs/utils/tftp_put_host_config.php -%%JFFNMSDIR%%/docs/windows/SYSLOG_JFFNMS.win32.txt -%%JFFNMSDIR%%/docs/windows/httpd.conf -%%JFFNMSDIR%%/docs/windows/php.ini -%%JFFNMSDIR%%/engine/actions/email.inc.php -%%JFFNMSDIR%%/engine/actions/none.inc.php -%%JFFNMSDIR%%/engine/actions/smsclient.inc.php -%%JFFNMSDIR%%/engine/analyzers/sla.inc.php -%%JFFNMSDIR%%/engine/autodiscovery_interfaces.php -%%JFFNMSDIR%%/engine/autodiscovery_network.php -%%JFFNMSDIR%%/engine/backends/alarm.php -%%JFFNMSDIR%%/engine/backends/buffer.php -%%JFFNMSDIR%%/engine/backends/db.php -%%JFFNMSDIR%%/engine/backends/event.php -%%JFFNMSDIR%%/engine/backends/multi_buffer.php -%%JFFNMSDIR%%/engine/backends/no_backend.php -%%JFFNMSDIR%%/engine/backends/rrd.php -%%JFFNMSDIR%%/engine/backends/verify_interface_number.php -%%JFFNMSDIR%%/engine/cleanup_raw_tables.php -%%JFFNMSDIR%%/engine/configs/alteon_webos.inc.php -%%JFFNMSDIR%%/engine/configs/cisco_catos.inc.php -%%JFFNMSDIR%%/engine/configs/cisco_cc.inc.php -%%JFFNMSDIR%%/engine/configs/cisco_sys.inc.php -%%JFFNMSDIR%%/engine/configs/none.inc.php -%%JFFNMSDIR%%/engine/consolidate.php -%%JFFNMSDIR%%/engine/consolidate/alarms.php -%%JFFNMSDIR%%/engine/consolidate/events.php -%%JFFNMSDIR%%/engine/consolidate/events_latest.php -%%JFFNMSDIR%%/engine/consolidate/syslog.php -%%JFFNMSDIR%%/engine/consolidate/tacacs.php -%%JFFNMSDIR%%/engine/consolidate/traps.php -%%JFFNMSDIR%%/engine/discovery/alteon_realservers.inc.php -%%JFFNMSDIR%%/engine/discovery/alteon_realservices.inc.php -%%JFFNMSDIR%%/engine/discovery/alteon_virtualservers.inc.php -%%JFFNMSDIR%%/engine/discovery/apache.inc.php -%%JFFNMSDIR%%/engine/discovery/apc.inc.php -%%JFFNMSDIR%%/engine/discovery/bgp_peers.inc.php -%%JFFNMSDIR%%/engine/discovery/brocade_fcports.inc.php -%%JFFNMSDIR%%/engine/discovery/brocade_sensors.inc.php -%%JFFNMSDIR%%/engine/discovery/cisco_accounting.inc.php -%%JFFNMSDIR%%/engine/discovery/cisco_envmib.inc.php -%%JFFNMSDIR%%/engine/discovery/cisco_saagent.inc.php -%%JFFNMSDIR%%/engine/discovery/cisco_serial_port.inc.php -%%JFFNMSDIR%%/engine/discovery/cpqmib.inc.php -%%JFFNMSDIR%%/engine/discovery/css_vips.inc.php -%%JFFNMSDIR%%/engine/discovery/host_information.inc.php -%%JFFNMSDIR%%/engine/discovery/hostmib_apps.inc.php -%%JFFNMSDIR%%/engine/discovery/iis_info.inc.php -%%JFFNMSDIR%%/engine/discovery/informant_ldisks.inc.php -%%JFFNMSDIR%%/engine/discovery/linux_iptables.inc.php -%%JFFNMSDIR%%/engine/discovery/linux_tc.inc.php -%%JFFNMSDIR%%/engine/discovery/livingston_serial_port.inc.php -%%JFFNMSDIR%%/engine/discovery/none.inc.php -%%JFFNMSDIR%%/engine/discovery/ntp_client.inc.php -%%JFFNMSDIR%%/engine/discovery/pix_connections.inc.php -%%JFFNMSDIR%%/engine/discovery/reachability.inc.php -%%JFFNMSDIR%%/engine/discovery/sensors.inc.php -%%JFFNMSDIR%%/engine/discovery/simple.inc.php -%%JFFNMSDIR%%/engine/discovery/smokeping.inc.php -%%JFFNMSDIR%%/engine/discovery/snmp_interfaces.inc.php -%%JFFNMSDIR%%/engine/discovery/storage.inc.php -%%JFFNMSDIR%%/engine/discovery/tcp_ports.inc.php -%%JFFNMSDIR%%/engine/discovery/ups.inc.php -%%JFFNMSDIR%%/engine/discovery/ups_lines.inc.php -%%JFFNMSDIR%%/engine/graphs/acct_bytes.inc.php -%%JFFNMSDIR%%/engine/graphs/acct_packets.inc.php -%%JFFNMSDIR%%/engine/graphs/alteon_failures_sessions.inc.php -%%JFFNMSDIR%%/engine/graphs/alteon_load_average.inc.php -%%JFFNMSDIR%%/engine/graphs/alteon_memory.inc.php -%%JFFNMSDIR%%/engine/graphs/alteon_octets.inc.php -%%JFFNMSDIR%%/engine/graphs/alteon_octets_aggregation.inc.php -%%JFFNMSDIR%%/engine/graphs/alteon_sessionrate.inc.php -%%JFFNMSDIR%%/engine/graphs/alteon_sessionrate_aggregation.inc.php -%%JFFNMSDIR%%/engine/graphs/alteon_sessions.inc.php -%%JFFNMSDIR%%/engine/graphs/alteon_sessions_aggregation.inc.php -%%JFFNMSDIR%%/engine/graphs/apache_bpr.inc.php -%%JFFNMSDIR%%/engine/graphs/apache_cplo.inc.php -%%JFFNMSDIR%%/engine/graphs/apache_tac.inc.php -%%JFFNMSDIR%%/engine/graphs/apache_tac_aggregation.inc.php -%%JFFNMSDIR%%/engine/graphs/apache_tkb.inc.php -%%JFFNMSDIR%%/engine/graphs/apache_tkb_aggregation.inc.php -%%JFFNMSDIR%%/engine/graphs/apache_workers.inc.php -%%JFFNMSDIR%%/engine/graphs/apc_load_capacity.inc.php -%%JFFNMSDIR%%/engine/graphs/apc_time_remaining.inc.php -%%JFFNMSDIR%%/engine/graphs/apc_voltages.inc.php -%%JFFNMSDIR%%/engine/graphs/apps_instances.inc.php -%%JFFNMSDIR%%/engine/graphs/apps_memory.inc.php -%%JFFNMSDIR%%/engine/graphs/bgp_routes.inc.php -%%JFFNMSDIR%%/engine/graphs/bgp_updates.inc.php -%%JFFNMSDIR%%/engine/graphs/brocade_sensor.inc.php -%%JFFNMSDIR%%/engine/graphs/cisco_mac_bytes.inc.php -%%JFFNMSDIR%%/engine/graphs/cisco_mac_packets.inc.php -%%JFFNMSDIR%%/engine/graphs/cisco_nat_active.inc.php -%%JFFNMSDIR%%/engine/graphs/cisco_nat_packets.inc.php -%%JFFNMSDIR%%/engine/graphs/cisco_saagent_jitter.inc.php -%%JFFNMSDIR%%/engine/graphs/cisco_saagent_packetloss.inc.php -%%JFFNMSDIR%%/engine/graphs/cisco_saagent_rtl.inc.php -%%JFFNMSDIR%%/engine/graphs/cisco_serial.inc.php -%%JFFNMSDIR%%/engine/graphs/cpu_util.inc.php -%%JFFNMSDIR%%/engine/graphs/cpu_util_aggregation.inc.php -%%JFFNMSDIR%%/engine/graphs/css_vip_hits.inc.php -%%JFFNMSDIR%%/engine/graphs/css_vip_output_only_traffic.inc.php -%%JFFNMSDIR%%/engine/graphs/drop_packets.inc.php -%%JFFNMSDIR%%/engine/graphs/error_packets.inc.php -%%JFFNMSDIR%%/engine/graphs/error_rate.inc.php -%%JFFNMSDIR%%/engine/graphs/frames.inc.php -%%JFFNMSDIR%%/engine/graphs/hostmib_users_procs.inc.php -%%JFFNMSDIR%%/engine/graphs/iis_tbr.inc.php -%%JFFNMSDIR%%/engine/graphs/iis_tcgir.inc.php -%%JFFNMSDIR%%/engine/graphs/iis_tfs.inc.php -%%JFFNMSDIR%%/engine/graphs/iis_tptg.inc.php -%%JFFNMSDIR%%/engine/graphs/inf_ldisk_rate.inc.php -%%JFFNMSDIR%%/engine/graphs/inf_ldisk_time.inc.php -%%JFFNMSDIR%%/engine/graphs/iptables_rate.inc.php -%%JFFNMSDIR%%/engine/graphs/iptables_rate_aggregation.inc.php -%%JFFNMSDIR%%/engine/graphs/memory.inc.php -%%JFFNMSDIR%%/engine/graphs/packetloss.inc.php -%%JFFNMSDIR%%/engine/graphs/packets.inc.php -%%JFFNMSDIR%%/engine/graphs/packets_aggregation.inc.php -%%JFFNMSDIR%%/engine/graphs/packets_new.inc.php -%%JFFNMSDIR%%/engine/graphs/pix_connections.inc.php -%%JFFNMSDIR%%/engine/graphs/pm_serial.inc.php -%%JFFNMSDIR%%/engine/graphs/response_time.inc.php -%%JFFNMSDIR%%/engine/graphs/rtt.inc.php -%%JFFNMSDIR%%/engine/graphs/sensor_value.inc.php -%%JFFNMSDIR%%/engine/graphs/sql_records.inc.php -%%JFFNMSDIR%%/engine/graphs/storage.inc.php -%%JFFNMSDIR%%/engine/graphs/storage_aggregation.inc.php -%%JFFNMSDIR%%/engine/graphs/tc_rate.inc.php -%%JFFNMSDIR%%/engine/graphs/tc_rate_aggregation.inc.php -%%JFFNMSDIR%%/engine/graphs/tcp_conn_delay.inc.php -%%JFFNMSDIR%%/engine/graphs/tcp_conn_number.inc.php -%%JFFNMSDIR%%/engine/graphs/tcp_conn_number_aggregation.inc.php -%%JFFNMSDIR%%/engine/graphs/tcpmib_connections.inc.php -%%JFFNMSDIR%%/engine/graphs/temperature.inc.php -%%JFFNMSDIR%%/engine/graphs/temperature_aggregation.inc.php -%%JFFNMSDIR%%/engine/graphs/traffic.inc.php -%%JFFNMSDIR%%/engine/graphs/traffic_aggregation.inc.php -%%JFFNMSDIR%%/engine/graphs/traffic_pl.inc.php -%%JFFNMSDIR%%/engine/graphs/traffic_util.inc.php -%%JFFNMSDIR%%/engine/graphs/traffic_words.inc.php -%%JFFNMSDIR%%/engine/graphs/ucd_cpu_linux.inc.php -%%JFFNMSDIR%%/engine/graphs/ucd_cpu_linux_aggregation.inc.php -%%JFFNMSDIR%%/engine/graphs/ucd_cpu_solaris.inc.php -%%JFFNMSDIR%%/engine/graphs/ucd_load_average.inc.php -%%JFFNMSDIR%%/engine/graphs/ucd_load_average_aggregation.inc.php -%%JFFNMSDIR%%/engine/graphs/ucd_memory.inc.php -%%JFFNMSDIR%%/engine/graphs/ups_charge_remaining.inc.php -%%JFFNMSDIR%%/engine/graphs/ups_current.inc.php -%%JFFNMSDIR%%/engine/graphs/ups_current_aggregation.inc.php -%%JFFNMSDIR%%/engine/graphs/ups_load.inc.php -%%JFFNMSDIR%%/engine/graphs/ups_load_aggregation.inc.php -%%JFFNMSDIR%%/engine/graphs/ups_time_remaining.inc.php -%%JFFNMSDIR%%/engine/graphs/ups_voltage.inc.php -%%JFFNMSDIR%%/engine/graphs/ups_voltage_aggregation.inc.php -%%JFFNMSDIR%%/engine/handlers/bool.inc.php -%%JFFNMSDIR%%/engine/handlers/none.inc.php -%%JFFNMSDIR%%/engine/handlers/rrd_ds.inc.php -%%JFFNMSDIR%%/engine/handlers/tcp_ports.inc.php -%%JFFNMSDIR%%/engine/launcher.inc.php -%%JFFNMSDIR%%/engine/poller.php -%%JFFNMSDIR%%/engine/poller2.php -%%JFFNMSDIR%%/engine/poller_helper.php -%%JFFNMSDIR%%/engine/pollers/apache.php -%%JFFNMSDIR%%/engine/pollers/bgp_peer_status.php -%%JFFNMSDIR%%/engine/pollers/brocade_fcport_phystate.php -%%JFFNMSDIR%%/engine/pollers/buffer.php -%%JFFNMSDIR%%/engine/pollers/cisco_accounting.php -%%JFFNMSDIR%%/engine/pollers/cisco_envmib_status.php -%%JFFNMSDIR%%/engine/pollers/cisco_saagent_backwardjitter.php -%%JFFNMSDIR%%/engine/pollers/cisco_saagent_bwpacketloss.php -%%JFFNMSDIR%%/engine/pollers/cisco_saagent_forwardjitter.php -%%JFFNMSDIR%%/engine/pollers/cisco_saagent_fwpacketloss.php -%%JFFNMSDIR%%/engine/pollers/cisco_saagent_rtl.php -%%JFFNMSDIR%%/engine/pollers/cisco_saagent_verify.php -%%JFFNMSDIR%%/engine/pollers/cisco_serial_port_status.php -%%JFFNMSDIR%%/engine/pollers/cisco_snmp_ping_end.php -%%JFFNMSDIR%%/engine/pollers/cisco_snmp_ping_get_pl.php -%%JFFNMSDIR%%/engine/pollers/cisco_snmp_ping_get_rtt.php -%%JFFNMSDIR%%/engine/pollers/cisco_snmp_ping_start.php -%%JFFNMSDIR%%/engine/pollers/cisco_snmp_ping_wait.php -%%JFFNMSDIR%%/engine/pollers/db.php -%%JFFNMSDIR%%/engine/pollers/hostmib_apps.php -%%JFFNMSDIR%%/engine/pollers/hostmib_perf.php -%%JFFNMSDIR%%/engine/pollers/internal.php -%%JFFNMSDIR%%/engine/pollers/livingston_serial_port_status.php -%%JFFNMSDIR%%/engine/pollers/no_poller.php -%%JFFNMSDIR%%/engine/pollers/ntp_client.php -%%JFFNMSDIR%%/engine/pollers/odbc_query.php -%%JFFNMSDIR%%/engine/pollers/reachability_end.php -%%JFFNMSDIR%%/engine/pollers/reachability_start.php -%%JFFNMSDIR%%/engine/pollers/reachability_status.php -%%JFFNMSDIR%%/engine/pollers/reachability_values.php -%%JFFNMSDIR%%/engine/pollers/reachability_wait.php -%%JFFNMSDIR%%/engine/pollers/smokeping.php -%%JFFNMSDIR%%/engine/pollers/snmp_counter.php -%%JFFNMSDIR%%/engine/pollers/snmp_interface_status_all.php -%%JFFNMSDIR%%/engine/pollers/snmp_status.php -%%JFFNMSDIR%%/engine/pollers/snmp_walk_average.php -%%JFFNMSDIR%%/engine/pollers/sql_status.php -%%JFFNMSDIR%%/engine/pollers/tcp_connection_number.php -%%JFFNMSDIR%%/engine/pollers/tcp_port_content.php -%%JFFNMSDIR%%/engine/pollers/tcp_status.php -%%JFFNMSDIR%%/engine/pollers/udp_status.php -%%JFFNMSDIR%%/engine/pollers/ups_line.php -%%JFFNMSDIR%%/engine/pollers/verify_interface_number.php -%%JFFNMSDIR%%/engine/pollers/verify_smokeping_number.php -%%JFFNMSDIR%%/engine/pollers/verify_tc_class_number.php -%%JFFNMSDIR%%/engine/rrd_analizer.php -%%JFFNMSDIR%%/engine/satellite/distribution.inc.php -%%JFFNMSDIR%%/engine/satellite/ping.inc.php -%%JFFNMSDIR%%/engine/satellite/poller.inc.php -%%JFFNMSDIR%%/engine/satellite_distribution.php -%%JFFNMSDIR%%/engine/shared/.check -%%JFFNMSDIR%%/engine/shared/catos.inc.php -%%JFFNMSDIR%%/engine/shared/percentile.inc.php -%%JFFNMSDIR%%/engine/shared/webos.inc.php -%%JFFNMSDIR%%/engine/temp/.check -%%JFFNMSDIR%%/engine/tftp_get_host_config.php -%%JFFNMSDIR%%/engine/ticket/tiba.inc.php -%%JFFNMSDIR%%/engine/tmpwatch.sh -%%JFFNMSDIR%%/engine/tools/if_admin.inc.php -%%JFFNMSDIR%%/engine/tools/if_alias.inc.php -%%JFFNMSDIR%%/engine/tools/none.inc.php -%%JFFNMSDIR%%/engine/tools/separator.inc.php -%%JFFNMSDIR%%/engine/tools/tcp_cnx.inc.php -%%JFFNMSDIR%%/engine/trap_receiver.php -%%JFFNMSDIR%%/engine/trap_receiver.sh -%%JFFNMSDIR%%/engine/trap_receivers/none.inc.php -%%JFFNMSDIR%%/engine/trap_receivers/static.inc.php -%%JFFNMSDIR%%/engine/trap_receivers/unknown.inc.php -%%JFFNMSDIR%%/engine/windows/autodiscovery_interfaces.bat -%%JFFNMSDIR%%/engine/windows/cleanup_raw_tables.bat -%%JFFNMSDIR%%/engine/windows/consolidate.bat -%%JFFNMSDIR%%/engine/windows/poller.bat -%%JFFNMSDIR%%/engine/windows/rrd_analizer.bat -%%JFFNMSDIR%%/engine/windows/tftpget_hosts.bat -%%JFFNMSDIR%%/htdocs/.check -%%JFFNMSDIR%%/htdocs/.htaccess -%%JFFNMSDIR%%/htdocs/admin/adm/adm_alarms.php -%%JFFNMSDIR%%/htdocs/admin/adm/adm_hosts.inc.php -%%JFFNMSDIR%%/htdocs/admin/adm/adm_hosts_config.php -%%JFFNMSDIR%%/htdocs/admin/adm/adm_interfaces.php -%%JFFNMSDIR%%/htdocs/admin/adm/adm_journals.inc.php -%%JFFNMSDIR%%/htdocs/admin/adm/adm_nad.php -%%JFFNMSDIR%%/htdocs/admin/adm/adm_profiles.php -%%JFFNMSDIR%%/htdocs/admin/adm/adm_profiles_options.php -%%JFFNMSDIR%%/htdocs/admin/adm/adm_satellites.inc.php -%%JFFNMSDIR%%/htdocs/admin/adm/adm_standard.php -%%JFFNMSDIR%%/htdocs/admin/adm/adm_triggers_rules.php -%%JFFNMSDIR%%/htdocs/admin/adm/adm_users.inc.php -%%JFFNMSDIR%%/htdocs/admin/adm/structures.php -%%JFFNMSDIR%%/htdocs/admin/adm/test.php -%%JFFNMSDIR%%/htdocs/admin/calendar.php -%%JFFNMSDIR%%/htdocs/admin/calendar/calendar-blue2.css -%%JFFNMSDIR%%/htdocs/admin/calendar/calendar-en.js -%%JFFNMSDIR%%/htdocs/admin/calendar/calendar-setup_stripped.js -%%JFFNMSDIR%%/htdocs/admin/calendar/calendar_stripped.js -%%JFFNMSDIR%%/htdocs/admin/color_select.php -%%JFFNMSDIR%%/htdocs/admin/event_filter.php -%%JFFNMSDIR%%/htdocs/admin/menu.php -%%JFFNMSDIR%%/htdocs/admin/menu_frame.php -%%JFFNMSDIR%%/htdocs/admin/menu_interface_list.php -%%JFFNMSDIR%%/htdocs/admin/reports/state_report.php -%%JFFNMSDIR%%/htdocs/admin/sat_session.inc.php -%%JFFNMSDIR%%/htdocs/admin/satellite.php -%%JFFNMSDIR%%/htdocs/admin/setup.php -%%JFFNMSDIR%%/htdocs/admin/tools.php -%%JFFNMSDIR%%/htdocs/auth.php -%%JFFNMSDIR%%/htdocs/blank.php -%%JFFNMSDIR%%/htdocs/controls.php -%%JFFNMSDIR%%/htdocs/default.css -%%JFFNMSDIR%%/htdocs/events.php -%%JFFNMSDIR%%/htdocs/frame_interfaces.php -%%JFFNMSDIR%%/htdocs/frame_interfaces_events.php -%%JFFNMSDIR%%/htdocs/images/a-down.png -%%JFFNMSDIR%%/htdocs/images/a-left.png -%%JFFNMSDIR%%/htdocs/images/a-right.png -%%JFFNMSDIR%%/htdocs/images/a-top.png -%%JFFNMSDIR%%/htdocs/images/a-up.png -%%JFFNMSDIR%%/htdocs/images/a1-down.png -%%JFFNMSDIR%%/htdocs/images/alert.gif -%%JFFNMSDIR%%/htdocs/images/alert.png -%%JFFNMSDIR%%/htdocs/images/alert2.gif -%%JFFNMSDIR%%/htdocs/images/all.png -%%JFFNMSDIR%%/htdocs/images/ar.png -%%JFFNMSDIR%%/htdocs/images/at.png -%%JFFNMSDIR%%/htdocs/images/au.png -%%JFFNMSDIR%%/htdocs/images/b-left.png -%%JFFNMSDIR%%/htdocs/images/b-right.png -%%JFFNMSDIR%%/htdocs/images/be.png -%%JFFNMSDIR%%/htdocs/images/br.png -%%JFFNMSDIR%%/htdocs/images/bullet1.png -%%JFFNMSDIR%%/htdocs/images/bullet2.png -%%JFFNMSDIR%%/htdocs/images/bullet3.png -%%JFFNMSDIR%%/htdocs/images/bullet4.png -%%JFFNMSDIR%%/htdocs/images/bullet5.png -%%JFFNMSDIR%%/htdocs/images/bullet6.png -%%JFFNMSDIR%%/htdocs/images/ca.png -%%JFFNMSDIR%%/htdocs/images/calendar.png -%%JFFNMSDIR%%/htdocs/images/color.png -%%JFFNMSDIR%%/htdocs/images/config.png -%%JFFNMSDIR%%/htdocs/images/config1.png -%%JFFNMSDIR%%/htdocs/images/csv.png -%%JFFNMSDIR%%/htdocs/images/de.png -%%JFFNMSDIR%%/htdocs/images/delete.png -%%JFFNMSDIR%%/htdocs/images/edit.png -%%JFFNMSDIR%%/htdocs/images/es.png -%%JFFNMSDIR%%/htdocs/images/est.png -%%JFFNMSDIR%%/htdocs/images/eu.png -%%JFFNMSDIR%%/htdocs/images/event.png -%%JFFNMSDIR%%/htdocs/images/event2.png -%%JFFNMSDIR%%/htdocs/images/filter.png -%%JFFNMSDIR%%/htdocs/images/filter3.png -%%JFFNMSDIR%%/htdocs/images/filter4.png -%%JFFNMSDIR%%/htdocs/images/fr.png -%%JFFNMSDIR%%/htdocs/images/graph.png -%%JFFNMSDIR%%/htdocs/images/home.png -%%JFFNMSDIR%%/htdocs/images/host.png -%%JFFNMSDIR%%/htdocs/images/int1.png -%%JFFNMSDIR%%/htdocs/images/it.png -%%JFFNMSDIR%%/htdocs/images/java.png -%%JFFNMSDIR%%/htdocs/images/jffnms.ico -%%JFFNMSDIR%%/htdocs/images/jffnms.png -%%JFFNMSDIR%%/htdocs/images/jffnms_small.png -%%JFFNMSDIR%%/htdocs/images/lock.png -%%JFFNMSDIR%%/htdocs/images/log.png -%%JFFNMSDIR%%/htdocs/images/logoff.png -%%JFFNMSDIR%%/htdocs/images/mail.png -%%JFFNMSDIR%%/htdocs/images/mail2.png -%%JFFNMSDIR%%/htdocs/images/map2.png -%%JFFNMSDIR%%/htdocs/images/mess.png -%%JFFNMSDIR%%/htdocs/images/minus.png -%%JFFNMSDIR%%/htdocs/images/new.png -%%JFFNMSDIR%%/htdocs/images/new2.png -%%JFFNMSDIR%%/htdocs/images/normal.png -%%JFFNMSDIR%%/htdocs/images/nosound.png -%%JFFNMSDIR%%/htdocs/images/ok.png -%%JFFNMSDIR%%/htdocs/images/pen.png -%%JFFNMSDIR%%/htdocs/images/pencil.png -%%JFFNMSDIR%%/htdocs/images/pl.png -%%JFFNMSDIR%%/htdocs/images/plus.png -%%JFFNMSDIR%%/htdocs/images/popup.png -%%JFFNMSDIR%%/htdocs/images/query.png -%%JFFNMSDIR%%/htdocs/images/refresh.png -%%JFFNMSDIR%%/htdocs/images/refresh2.png -%%JFFNMSDIR%%/htdocs/images/service.png -%%JFFNMSDIR%%/htdocs/images/sla.png -%%JFFNMSDIR%%/htdocs/images/sound.png -%%JFFNMSDIR%%/htdocs/images/tag.png -%%JFFNMSDIR%%/htdocs/images/temp/.check -%%JFFNMSDIR%%/htdocs/images/text.png -%%JFFNMSDIR%%/htdocs/images/tickmark.png -%%JFFNMSDIR%%/htdocs/images/tool.png -%%JFFNMSDIR%%/htdocs/images/uk.png -%%JFFNMSDIR%%/htdocs/images/unknown.png -%%JFFNMSDIR%%/htdocs/images/usa.png -%%JFFNMSDIR%%/htdocs/images/user2.png -%%JFFNMSDIR%%/htdocs/images/users.png -%%JFFNMSDIR%%/htdocs/images/uy.png -%%JFFNMSDIR%%/htdocs/images/world.png -%%JFFNMSDIR%%/htdocs/index.php -%%JFFNMSDIR%%/htdocs/login.php -%%JFFNMSDIR%%/htdocs/logout.php -%%JFFNMSDIR%%/htdocs/sounds/18_16b.wav -%%JFFNMSDIR%%/htdocs/sounds/boing.wav -%%JFFNMSDIR%%/htdocs/sounds/down.wav -%%JFFNMSDIR%%/htdocs/sounds/tling.wav -%%JFFNMSDIR%%/htdocs/sounds/up.wav -%%JFFNMSDIR%%/htdocs/start.php -%%JFFNMSDIR%%/htdocs/view_interfaces.php -%%JFFNMSDIR%%/htdocs/view_interfaces_map_list.php -%%JFFNMSDIR%%/htdocs/view_performance.php -%%JFFNMSDIR%%/htdocs/views/infobox.js -%%JFFNMSDIR%%/htdocs/views/source_hosts_dhtml.inc.php -%%JFFNMSDIR%%/htdocs/views/source_hosts_get.inc.php -%%JFFNMSDIR%%/htdocs/views/source_hosts_init.inc.php -%%JFFNMSDIR%%/htdocs/views/source_hosts_normal.inc.php -%%JFFNMSDIR%%/htdocs/views/source_hosts_text.inc.php -%%JFFNMSDIR%%/htdocs/views/source_hosts_urls.inc.php -%%JFFNMSDIR%%/htdocs/views/source_interfaces_dhtml.inc.php -%%JFFNMSDIR%%/htdocs/views/source_interfaces_get.inc.php -%%JFFNMSDIR%%/htdocs/views/source_interfaces_infobox.inc.php -%%JFFNMSDIR%%/htdocs/views/source_interfaces_init.inc.php -%%JFFNMSDIR%%/htdocs/views/source_interfaces_normal.inc.php -%%JFFNMSDIR%%/htdocs/views/source_interfaces_performance.inc.php -%%JFFNMSDIR%%/htdocs/views/source_interfaces_text.inc.php -%%JFFNMSDIR%%/htdocs/views/source_interfaces_urls.inc.php -%%JFFNMSDIR%%/htdocs/views/source_maps_dhtml.inc.php -%%JFFNMSDIR%%/htdocs/views/source_maps_get.inc.php -%%JFFNMSDIR%%/htdocs/views/source_maps_init.inc.php -%%JFFNMSDIR%%/htdocs/views/source_maps_normal.inc.php -%%JFFNMSDIR%%/htdocs/views/source_maps_text.inc.php -%%JFFNMSDIR%%/htdocs/views/source_maps_urls.inc.php -%%JFFNMSDIR%%/htdocs/views/source_none.inc.php -%%JFFNMSDIR%%/htdocs/views/toolbox.inc.php -%%JFFNMSDIR%%/htdocs/views/toolbox.js -%%JFFNMSDIR%%/htdocs/views/view_dhtml_break_by_card.inc.php -%%JFFNMSDIR%%/htdocs/views/view_dhtml_break_by_zone.inc.php -%%JFFNMSDIR%%/htdocs/views/view_dhtml_break_finish_row.inc.php -%%JFFNMSDIR%%/htdocs/views/view_dhtml_break_next_line_span.inc.php -%%JFFNMSDIR%%/htdocs/views/view_dhtml_break_show.inc.php -%%JFFNMSDIR%%/htdocs/views/view_dhtml_html_init.inc.php -%%JFFNMSDIR%%/htdocs/views/view_dhtml_init.inc.php -%%JFFNMSDIR%%/htdocs/views/view_dhtml_interface_show.inc.php -%%JFFNMSDIR%%/htdocs/views/view_dhtml_no_interfaces.inc.php -%%JFFNMSDIR%%/htdocs/views/view_dynmap.js -%%JFFNMSDIR%%/htdocs/views/view_dynmap_finish.inc.php -%%JFFNMSDIR%%/htdocs/views/view_dynmap_html_init.inc.php -%%JFFNMSDIR%%/htdocs/views/view_dynmap_interface_process.inc.php -%%JFFNMSDIR%%/htdocs/views/view_dynmap_line.php -%%JFFNMSDIR%%/htdocs/views/view_dynmap_no_interfaces.inc.php -%%JFFNMSDIR%%/htdocs/views/view_dynmap_save.inc.php -%%JFFNMSDIR%%/htdocs/views/view_graphviz_break_by_host.inc.php -%%JFFNMSDIR%%/htdocs/views/view_graphviz_finish.inc.php -%%JFFNMSDIR%%/htdocs/views/view_graphviz_init.inc.php -%%JFFNMSDIR%%/htdocs/views/view_graphviz_interface_show.inc.php -%%JFFNMSDIR%%/htdocs/views/view_none.inc.php -%%JFFNMSDIR%%/htdocs/views/view_normal_break_by_card.inc.php -%%JFFNMSDIR%%/htdocs/views/view_normal_break_by_host.inc.php -%%JFFNMSDIR%%/htdocs/views/view_normal_break_by_zone.inc.php -%%JFFNMSDIR%%/htdocs/views/view_normal_break_finish_row.inc.php -%%JFFNMSDIR%%/htdocs/views/view_normal_break_init.inc.php -%%JFFNMSDIR%%/htdocs/views/view_normal_break_next_line_span.inc.php -%%JFFNMSDIR%%/htdocs/views/view_normal_break_show.inc.php -%%JFFNMSDIR%%/htdocs/views/view_normal_finish.inc.php -%%JFFNMSDIR%%/htdocs/views/view_normal_html_init.inc.php -%%JFFNMSDIR%%/htdocs/views/view_normal_init.inc.php -%%JFFNMSDIR%%/htdocs/views/view_normal_interface_show.inc.php -%%JFFNMSDIR%%/htdocs/views/view_normal_no_interfaces.inc.php -%%JFFNMSDIR%%/htdocs/views/view_performance_init.inc.php -%%JFFNMSDIR%%/htdocs/views/view_performance_interface_show.inc.php -%%JFFNMSDIR%%/htdocs/views/view_text_finish.inc.php -%%JFFNMSDIR%%/htdocs/views/view_text_html_init.inc.php -%%JFFNMSDIR%%/htdocs/views/view_text_interface_show.inc.php -%%JFFNMSDIR%%/htdocs/views/view_text_no_interfaces.inc.php -%%JFFNMSDIR%%/jffnms.cron -%%JFFNMSDIR%%/jffnms_db.sh -%%JFFNMSDIR%%/lib/api.classes.inc.php -%%JFFNMSDIR%%/lib/api.db.inc.php -%%JFFNMSDIR%%/lib/api.events.inc.php -%%JFFNMSDIR%%/lib/api.hosts.inc.php -%%JFFNMSDIR%%/lib/api.inc.php -%%JFFNMSDIR%%/lib/api.interface.inc.php -%%JFFNMSDIR%%/lib/api.maps.inc.php -%%JFFNMSDIR%%/lib/api.nad.inc.php -%%JFFNMSDIR%%/lib/api.network.inc.php -%%JFFNMSDIR%%/lib/api.profile.inc.php -%%JFFNMSDIR%%/lib/api.rrdtool.inc.php -%%JFFNMSDIR%%/lib/api.satellites.inc.php -%%JFFNMSDIR%%/lib/api.tools.inc.php -%%JFFNMSDIR%%/lib/api.triggers.inc.php -%%JFFNMSDIR%%/lib/api.user.inc.php -%%JFFNMSDIR%%/lib/api.zones.inc.php -%%JFFNMSDIR%%/lib/gui.admin.inc.php -%%JFFNMSDIR%%/lib/gui.controls.inc.php -%%JFFNMSDIR%%/lib/gui.inc.php -%%JFFNMSDIR%%/lib/gui.toolkit.inc.php -%%JFFNMSDIR%%/logs/.check -%%JFFNMSDIR%%/rrd/.check -%%JFFNMSDIR%%/tftpd/.check -@dirrm %%JFFNMSDIR%%/tftpd -@dirrm %%JFFNMSDIR%%/rrd -@dirrm %%JFFNMSDIR%%/logs -@dirrm %%JFFNMSDIR%%/lib -@dirrm %%JFFNMSDIR%%/htdocs/views -@dirrm %%JFFNMSDIR%%/htdocs/sounds -@dirrm %%JFFNMSDIR%%/htdocs/images/temp -@dirrm %%JFFNMSDIR%%/htdocs/images -@dirrm %%JFFNMSDIR%%/htdocs/admin/reports -@dirrm %%JFFNMSDIR%%/htdocs/admin/calendar -@dirrm %%JFFNMSDIR%%/htdocs/admin/adm -@dirrm %%JFFNMSDIR%%/htdocs/admin -@dirrm %%JFFNMSDIR%%/htdocs -@dirrm %%JFFNMSDIR%%/engine/windows -@dirrm %%JFFNMSDIR%%/engine/trap_receivers -@dirrm %%JFFNMSDIR%%/engine/tools -@dirrm %%JFFNMSDIR%%/engine/ticket -@dirrm %%JFFNMSDIR%%/engine/temp -@dirrm %%JFFNMSDIR%%/engine/shared -@dirrm %%JFFNMSDIR%%/engine/satellite -@dirrm %%JFFNMSDIR%%/engine/pollers -@dirrm %%JFFNMSDIR%%/engine/handlers -@dirrm %%JFFNMSDIR%%/engine/graphs -@dirrm %%JFFNMSDIR%%/engine/discovery -@dirrm %%JFFNMSDIR%%/engine/consolidate -@dirrm %%JFFNMSDIR%%/engine/configs -@dirrm %%JFFNMSDIR%%/engine/backends -@dirrm %%JFFNMSDIR%%/engine/analyzers -@dirrm %%JFFNMSDIR%%/engine/actions -@dirrm %%JFFNMSDIR%%/engine -@dirrm %%JFFNMSDIR%%/docs/windows -@dirrm %%JFFNMSDIR%%/docs/utils/jffnms-snmp -@dirrm %%JFFNMSDIR%%/docs/utils -@dirrm %%JFFNMSDIR%%/docs/upgrade/pgsql -@dirrm %%JFFNMSDIR%%/docs/upgrade/mysql -@dirrm %%JFFNMSDIR%%/docs/upgrade -@dirrm %%JFFNMSDIR%%/docs/unix -@dirrm %%JFFNMSDIR%%/docs -@dirrm %%JFFNMSDIR%%/conf -@dirrm %%JFFNMSDIR%% -@exec crontab -u www %%JFFNMSDIR%%/jffnms.cron -@unexec crontab -u www -l | sed 's|.*JFFNMS.*||' | crontab -u www - diff --git a/net-mgmt/mrtg-ping-probe/Makefile b/net-mgmt/mrtg-ping-probe/Makefile deleted file mode 100644 index 55e1732660e6..000000000000 --- a/net-mgmt/mrtg-ping-probe/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# New ports collection makefile for: mrng-cfgtg-ping-probe -# Date created: 17 Jan 2004 -# Whom: sanpei@FreeBSD.org -# -# $FreeBSD$ -# - -PORTNAME= mrtg-ping-probe -PORTVERSION= 2.2.0 -CATEGORIES= net -MASTER_SITES= ftp://ftp.pwo.de/pub/pwo/mrtg/${PORTNAME}/ - -MAINTAINER= sanpei@FreeBSD.org -COMMENT= A Round Trip Time and Packet Loss Probe for MRTG - -RUN_DEPENDS= ${LOCALBASE}/bin/mrtg:${PORTSDIR}/net-mgmt/mrtg - -USE_PERL5= YES -USE_REINPLACE= yes - -MAN1= ${PORTNAME}.1 - -post-patch: - @${REINPLACE_CMD} -e 's|%%PERL%%|${PERL5}|' ${WRKSRC}/${PORTNAME} - @${CHMOD} +x ${WRKSRC}/${PORTNAME} - -do-install: - @${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - @${INSTALL_SCRIPT} ${WRKSRC}/mrtg-ping-cfg ${PREFIX}/bin - @${INSTALL_DATA} ${WRKSRC}/mrtg.cfg-ping ${PREFIX}/etc/mrtg - @${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${PREFIX}/man/man1 - -.include <bsd.port.mk> diff --git a/net-mgmt/mrtg-ping-probe/distinfo b/net-mgmt/mrtg-ping-probe/distinfo deleted file mode 100644 index bb044b41f59f..000000000000 --- a/net-mgmt/mrtg-ping-probe/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (mrtg-ping-probe-2.2.0.tar.gz) = 5eec5bc5f1c5097248c701d54639d292 -SHA256 (mrtg-ping-probe-2.2.0.tar.gz) = 2708459c1beb5ab482fa28ff62720f6a2d5707475d40e53a2829927572c96a0e -SIZE (mrtg-ping-probe-2.2.0.tar.gz) = 36923 diff --git a/net-mgmt/mrtg-ping-probe/files/patch-aa b/net-mgmt/mrtg-ping-probe/files/patch-aa deleted file mode 100644 index d9e81c42c8a7..000000000000 --- a/net-mgmt/mrtg-ping-probe/files/patch-aa +++ /dev/null @@ -1,8 +0,0 @@ ---- mrtg-ping-probe.org Sat Jan 17 22:27:33 2004 -+++ mrtg-ping-probe Sat Jan 17 22:27:53 2004 -@@ -1,4 +1,4 @@ --#!/bin/perl -+#!%%PERL%% - ################################################################## - # @(#) $Id: mrtg-ping-probe,v 2.5 2003/09/13 18:04:29 pwo Exp $ - # @(#) mrtg-ping-probe release $Name: Release_2_2_0 $ diff --git a/net-mgmt/mrtg-ping-probe/files/patch-ab b/net-mgmt/mrtg-ping-probe/files/patch-ab deleted file mode 100644 index f16832bbc659..000000000000 --- a/net-mgmt/mrtg-ping-probe/files/patch-ab +++ /dev/null @@ -1,17 +0,0 @@ ---- mrtg-ping-cfg.org Sat Jan 17 22:28:55 2004 -+++ mrtg-ping-cfg Sat Jan 17 22:35:40 2004 -@@ -1,4 +1,4 @@ --#!/bin/ksh -+#!/bin/sh - # - # mrtg-ping-cfg <device> <"Title of page"> - # -@@ -10,7 +10,7 @@ - # IT Site Infrastructure Services - - # location of mrtg ping probe --PING_PROBE=/usr/local/httpd/mrtg/mrtg-ping-probe -+PING_PROBE=/usr/local/bin/mrtg-ping-probe - - if [ $# -ne 2 ] - then diff --git a/net-mgmt/mrtg-ping-probe/pkg-descr b/net-mgmt/mrtg-ping-probe/pkg-descr deleted file mode 100644 index 7ae2841fb75e..000000000000 --- a/net-mgmt/mrtg-ping-probe/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -mrtg-ping-probe is a ping probe for MRTG 2.x. It is used to monitor -the round trip time and packet loss to networked devices. MRTG uses -its output to generate graphs visualizing minimum and maximum round -trip times or packet loss. - -WWW: http://pwo.de/projects/mrtg/ - -Yoshiro MIHIRA -<sanpei@FreeBSD.org> diff --git a/net-mgmt/mrtg-ping-probe/pkg-plist b/net-mgmt/mrtg-ping-probe/pkg-plist deleted file mode 100644 index abef662a5bd1..000000000000 --- a/net-mgmt/mrtg-ping-probe/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -bin/mrtg-ping-cfg -bin/mrtg-ping-probe -etc/mrtg/mrtg.cfg-ping diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile deleted file mode 100644 index 650604d4d691..000000000000 --- a/net-mgmt/nagios2/Makefile +++ /dev/null @@ -1,118 +0,0 @@ -# New ports collection makefile for: nagios -# Date created: 19 May 2002 -# Whom: Blaz Zupan <blaz@si.FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= nagios -PORTVERSION= 2.0 -CATEGORIES= net-mgmt -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= nagios - -MAINTAINER= jarrod@netleader.com.au -COMMENT= Extremely powerful network monitoring system - -LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd -RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins - -USE_GETOPT_LONG= yes -USE_ICONV= yes -USE_PERL5_BUILD= yes -USE_AUTOTOOLS= autoconf:259 -USE_RC_SUBR= nagios.sh -USE_REINPLACE= yes - -OPTIONS= EMBEDDED_PERL "Enable embedded Perl [requires Perl 5.8+]" OFF \ - NANOSLEEP "Use nanosleep in event timing" OFF - -GNU_CONFIGURE= yes - -NAGIOSUSER?= nagios -NAGIOSGROUP?= nagios -NAGIOSDIR?= /var/spool/nagios - -NAGIOSWWWDIR?= www/nagios -NAGIOSHTMURL?= /nagios -NAGIOSCGIURL?= ${NAGIOSHTMURL}/cgi-bin - -# Suggested NAGIOSHOMEURL values: -# Home: main.html -# Tactical Overview: ${NAGIOSCGIURL}/tac.cgi -# Service Detail: ${NAGIOSCGIURL}/status.cgi?host=all -# Host Detail: ${NAGIOSCGIURL}/status.cgi?hostgroup=all&style=hostdetail -# Status Map: ${NAGIOSCGIURL}/statusmap.cgi?host=all -NAGIOSHOMEURL?= main.html - -.include <bsd.port.pre.mk> - -CPPFLAGS= -I${LOCALBASE}/include -fPIC -CFLAGS+= ${CPPFLAGS} - -CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \ - --with-command-group=${WWWGRP} \ - --with-nagios-user=${NAGIOSUSER} \ - --with-nagios-group=${NAGIOSGROUP} \ - --with-htmurl=${NAGIOSHTMURL} \ - --with-cgiurl=${NAGIOSCGIURL} \ - --sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \ - --libexecdir=${PREFIX}/libexec/nagios \ - --datadir=${PREFIX}/${NAGIOSWWWDIR} \ - --sysconfdir=${PREFIX}/etc/nagios \ - --localstatedir=${NAGIOSDIR} \ - --prefix=${PREFIX} - -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - LIBS="-L${LOCALBASE}/lib" \ - PERL=${PERL} - -INSTALL_TARGET= install install-commandmode install-config - -PLIST_SUB= NAGIOSDIR=${NAGIOSDIR} \ - NAGIOSWWWDIR=${NAGIOSWWWDIR} \ - NAGIOSUSER=${NAGIOSUSER} \ - NAGIOSGROUP=${NAGIOSGROUP} \ - NAGIOSHTMURL=${NAGIOSHTMURL} \ - NAGIOSCGIURL=${NAGIOSCGIURL} \ - WWWGRP=${WWWGRP} - -SUB_FILES= pkg-install \ - pkg-deinstall \ - pkg-message - -SUB_LIST= PREFIX=${PREFIX} \ - ${PLIST_SUB} - -.if defined(WITH_EMBEDDED_PERL) -.if ${PERL_LEVEL} >= 500800 -USE_PERL5= yes -CONFIGURE_ARGS+= --enable-embedded-perl \ - --with-perlcache -.else -IGNORE= "Embedded Perl requires Perl 5.8 or higher (see lang/perl5.8)" -.endif -PLIST_SUB+= EMBEDDED_PERL="" -.else -PLIST_SUB+= EMBEDDED_PERL="@comment " -.endif - -.if defined(WITH_NANOSLEEP) -CONFIGURE_ARGS+= --enable-nanosleep -.endif - -post-patch: - ${REINPLACE_CMD} -e 's#"main.html"#"${NAGIOSHOMEURL:S/\//\\\//g:S/&/\\&/g}"#' ${WRKSRC}/html/index.html.in - -pre-install: - @${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL - -post-install: - @${CHMOD} 775 ${NAGIOSDIR} ${NAGIOSDIR}/archives ${NAGIOSDIR}/rw - @${CHOWN} ${NAGIOSUSER}:${NAGIOSGROUP} ${NAGIOSDIR} ${NAGIOSDIR}/archives - @${CHOWN} ${NAGIOSUSER}:${WWWGRP} ${NAGIOSDIR}/rw - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> diff --git a/net-mgmt/nagios2/distinfo b/net-mgmt/nagios2/distinfo deleted file mode 100644 index 4323cba2a6d4..000000000000 --- a/net-mgmt/nagios2/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (nagios-2.0.tar.gz) = 2a30ccf68bdbebc9c6f5a06e9c09e757 -SHA256 (nagios-2.0.tar.gz) = 0a0e7b190d3e05cd119d0ccc822a790e4a083b30cebda0fc3bb5b802bfcc1669 -SIZE (nagios-2.0.tar.gz) = 1735569 diff --git a/net-mgmt/nagios2/files/nagios.sh.in b/net-mgmt/nagios2/files/nagios.sh.in deleted file mode 100644 index b31fa8081eed..000000000000 --- a/net-mgmt/nagios2/files/nagios.sh.in +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# -# Add the following lines to /etc/rc.conf to enable nagios: -# nagios_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable nagios. -# nagios_flags (str): Set to "" by default. -# nagios_configfile (str): Set to "%%PREFIX%%/etc/nagios/nagios.cfg" by default. -# - -. %%RC_SUBR%% - -name="nagios" -rcvar=`set_rcvar` - -command="%%PREFIX%%/bin/nagios" -command_args="-d" -extra_commands="reload" -pidfile="%%NAGIOSDIR%%/nagios.lock" -nagios_user="%%NAGIOSUSER%%" - -start_precmd="start_precmd" -stop_postcmd="stop_postcmd" -restart_precmd="nagios_checkconfig" -sig_reload=HUP - -[ -z "${nagios_enable}" ] && nagios_enable="NO" -[ -z "${nagios_flags}" ] && nagios_flags="" -[ -z "${nagios_configfile}" ] && nagios_configfile="%%PREFIX%%/etc/nagios/nagios.cfg" - -load_rc_config "${name}" - -required_files="${nagios_configfile}" -command_args="${command_args} ${nagios_configfile}" - -nagios_checkconfig() { - echo -n "Performing sanity check of nagios configuration: " - ${command} -v ${nagios_configfile} 2>&1 >/dev/null - if [ $? != 0 ]; then - echo "FAILED" - ${command} -v ${nagios_configfile} - return 1 - else - echo "OK" - fi -} - -start_precmd() { - if ! nagios_checkconfig; then - return 1 - fi - - su -m "${nagios_user}" -c "touch \"%%NAGIOSDIR%%/nagios.log\" \"%%NAGIOSDIR%%/status.sav\"" - rm -f "%%NAGIOSDIR%%/rw/nagios.cmd" -} - -stop_postcmd() { - rm -f "%%NAGIOSDIR%%/nagios.tmp" "%%NAGIOSDIR%%/rw/nagios.cmd" -} - -run_rc_command "$1" diff --git a/net-mgmt/nagios2/files/patch-Makefile.in b/net-mgmt/nagios2/files/patch-Makefile.in deleted file mode 100644 index b8b172b25938..000000000000 --- a/net-mgmt/nagios2/files/patch-Makefile.in +++ /dev/null @@ -1,34 +0,0 @@ ---- Makefile.in.orig Sat Nov 26 17:35:35 2005 -+++ Makefile.in Wed Dec 28 23:06:40 2005 -@@ -177,7 +177,7 @@ - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR) - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives - if [ $(INSTALLPERLSTUFF) = yes ]; then \ -- $(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(BINDIR); \ -+ $(INSTALL) -m 644 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(BINDIR); \ - fi; - - @echo "" -@@ -204,14 +204,14 @@ - - - install-config: -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR) -- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample -- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample -- $(INSTALL) -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample -- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/bigger.cfg $(DESTDIR)$(CFGDIR)/bigger.cfg-sample -- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/minimal.cfg $(DESTDIR)$(CFGDIR)/minimal.cfg-sample -- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/checkcommands.cfg $(DESTDIR)$(CFGDIR)/checkcommands.cfg-sample -- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg-sample -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR) -+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample -+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample -+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample -+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/bigger.cfg $(DESTDIR)$(CFGDIR)/bigger.cfg-sample -+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/minimal.cfg $(DESTDIR)$(CFGDIR)/minimal.cfg-sample -+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/checkcommands.cfg $(DESTDIR)$(CFGDIR)/checkcommands.cfg-sample -+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg-sample - - @echo "" - @echo "*** Sample config file installed ***" diff --git a/net-mgmt/nagios2/files/patch-base-Makefile.in b/net-mgmt/nagios2/files/patch-base-Makefile.in deleted file mode 100644 index 4e83fe27623a..000000000000 --- a/net-mgmt/nagios2/files/patch-base-Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ ---- base/Makefile.in.orig Thu Dec 9 07:48:33 2004 -+++ base/Makefile.in Sat Feb 12 13:59:24 2005 -@@ -181,10 +181,10 @@ - devclean: distclean - - install: -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) -- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR) -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) -+ $(INSTALL) -m 755 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR) - $(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@ -- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR) -+ $(INSTALL) -m 755 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR) - $(STRIP) $(DESTDIR)$(BINDIR)/@nagiostats_name@ - - diff --git a/net-mgmt/nagios2/files/patch-cgi-Makefile.in b/net-mgmt/nagios2/files/patch-cgi-Makefile.in deleted file mode 100644 index 27e6a10cf9bd..000000000000 --- a/net-mgmt/nagios2/files/patch-cgi-Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ ---- cgi/Makefile.in.orig Mon Oct 25 07:05:54 2004 -+++ cgi/Makefile.in Sat Feb 12 13:56:57 2005 -@@ -191,9 +191,9 @@ - devclean: distclean - - install: -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR) -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR) - for file in *.cgi; do \ -- $(INSTALL) -m 775 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \ -+ $(INSTALL) -m 755 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \ - $(STRIP) $(DESTDIR)$(CGIDIR)/$$file; \ - done - diff --git a/net-mgmt/nagios2/files/patch-configure.in b/net-mgmt/nagios2/files/patch-configure.in deleted file mode 100644 index d10acf12fd5e..000000000000 --- a/net-mgmt/nagios2/files/patch-configure.in +++ /dev/null @@ -1,19 +0,0 @@ ---- configure.in.orig Thu Feb 10 02:00:10 2005 -+++ configure.in Sat Feb 12 14:11:54 2005 -@@ -6,7 +6,6 @@ - - AC_INIT(base/nagios.c) - AC_CONFIG_HEADER(include/config.h include/snprintf.h include/nagios.h include/cgiutils.h) --AC_PREFIX_DEFAULT(/usr/local/nagios) - - PKG_NAME=nagios - PKG_VERSION="2.0b2" -@@ -137,7 +136,7 @@ - AC_SUBST(nagios_grp) - AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user") - AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp") --INSTALL_OPTS="-o $nagios_user -g $nagios_grp" -+INSTALL_OPTS="-o root -g wheel" - AC_SUBST(INSTALL_OPTS) - - AC_ARG_WITH(command_user,--with-command-user=<user> sets user name for command access,command_user=$withval,command_user=$nagios_user) diff --git a/net-mgmt/nagios2/files/patch-contrib-Makefile.in b/net-mgmt/nagios2/files/patch-contrib-Makefile.in deleted file mode 100644 index dd80e3019859..000000000000 --- a/net-mgmt/nagios2/files/patch-contrib-Makefile.in +++ /dev/null @@ -1,17 +0,0 @@ ---- contrib/Makefile.in.orig Tue Nov 15 12:19:36 2005 -+++ contrib/Makefile.in Wed Dec 28 17:49:25 2005 -@@ -46,10 +46,10 @@ - devclean: distclean - - install: -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR) -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) -- for f in $(CGIS); do $(INSTALL) -m 775 $(INSTALL_OPTS) $$f $(DESTDIR)$(CGIDIR); done -- for f in $(UTILS); do $(INSTALL) -m 775 $(INSTALL_OPTS) $$f $(DESTDIR)$(BINDIR); done -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR) -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) -+ for f in $(CGIS); do $(INSTALL) -m 755 $(INSTALL_OPTS) $$f $(DESTDIR)$(CGIDIR); done -+ for f in $(UTILS); do $(INSTALL) -m 755 $(INSTALL_OPTS) $$f $(DESTDIR)$(BINDIR); done - - ############################################################################## - # rules and dependencies for actual target programs diff --git a/net-mgmt/nagios2/files/patch-html-Makefile.in b/net-mgmt/nagios2/files/patch-html-Makefile.in deleted file mode 100644 index a34e47dc2970..000000000000 --- a/net-mgmt/nagios2/files/patch-html-Makefile.in +++ /dev/null @@ -1,61 +0,0 @@ ---- html/Makefile.in.orig Thu Apr 10 05:46:02 2003 -+++ html/Makefile.in Sat Feb 12 13:53:16 2005 -@@ -33,37 +33,37 @@ - devclean: distclean - - install: -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR) -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi -- $(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR) -- $(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR) -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi -+ $(INSTALL) -m 644 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR) -+ $(INSTALL) -m 644 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs - for file in *.html; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done -+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done - for file in media/*.wav; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done -+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done - for file in stylesheets/*.css; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done -+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done - for file in contexthelp/*.html; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done -+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done - for file in docs/*.html; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done -+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done - for file in docs/images/*.*; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done -+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done - for file in images/*.gif; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done -+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done - for file in images/*.jpg; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done -+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done - for file in images/*.png; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done -+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done - for file in images/logos/*.*; \ -- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done -+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done - - - diff --git a/net-mgmt/nagios2/files/patch-include-config.h.in b/net-mgmt/nagios2/files/patch-include-config.h.in deleted file mode 100644 index 9c3c10cc3d5f..000000000000 --- a/net-mgmt/nagios2/files/patch-include-config.h.in +++ /dev/null @@ -1,26 +0,0 @@ ---- include/config.h.in.orig Mon Aug 29 17:34:30 2005 -+++ include/config.h.in Mon Aug 29 17:41:03 2005 -@@ -108,11 +108,6 @@ - #include <stdio.h> - #include <stdlib.h> - --#undef HAVE_SYS_RESOURCE_H --#ifdef HAVE_SYS_RESOURCE_H --#include <sys/resource.h> --#endif -- - #undef HAVE_PWD_H - #ifdef HAVE_PWD_H - #include <pwd.h> -@@ -190,6 +185,11 @@ - #else - #include <time.h> - #endif -+#endif -+ -+#undef HAVE_SYS_RESOURCE_H -+#ifdef HAVE_SYS_RESOURCE_H -+#include <sys/resource.h> - #endif - - #undef HAVE_SYS_TIMEB_H diff --git a/net-mgmt/nagios2/files/pkg-deinstall.in b/net-mgmt/nagios2/files/pkg-deinstall.in deleted file mode 100644 index 6b20aa9bc962..000000000000 --- a/net-mgmt/nagios2/files/pkg-deinstall.in +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -NAGIOSDIR=%%NAGIOSDIR%% -NAGIOSUSER=%%NAGIOSUSER%% -NAGIOSGROUP=%%NAGIOSGROUP%% - -if [ "$2" = "POST-DEINSTALL" ]; then - if /usr/sbin/pw group show "${NAGIOSGROUP}" 2>&1 >/dev/null; then - echo "You should manually remove the \"${NAGIOSGROUP}\" group." - fi - - if /usr/sbin/pw user show "${NAGIOSUSER}" 2>&1 >/dev/null; then - echo "You should manually remove the \"${NAGIOSUSER}\" user." - fi - - if [ -e "${NAGIOSDIR}" ]; then - echo "You should manually remove the \"${NAGIOSDIR}\" directory." - fi -fi diff --git a/net-mgmt/nagios2/files/pkg-install.in b/net-mgmt/nagios2/files/pkg-install.in deleted file mode 100644 index 2575727530e0..000000000000 --- a/net-mgmt/nagios2/files/pkg-install.in +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -NAGIOSDIR=%%NAGIOSDIR%% -NAGIOSUSER=%%NAGIOSUSER%% -NAGIOSGROUP=%%NAGIOSGROUP%% - -ask() { - local question default answer - - question=$1 - default=$2 - if [ -z "${PACKAGE_BUILDING}" ]; then - read -p "${question} [${default}]? " answer - fi - if [ "x${answer}" = "x" ]; then - answer=${default} - fi - echo ${answer} -} - -yesno() { - local default question answer - - question=$1 - default=$2 - while :; do - answer=$(ask "${question}" "${default}") - case "${answer}" in - [Yy][Ee][Ss]|[Yy]) - return 0 - ;; - [Nn][Oo]|[Nn]) - return 1 - ;; - esac - echo "Please answer yes or no." - done -} - -if [ "$2" = "PRE-INSTALL" ]; then - if /usr/sbin/pw group show "${NAGIOSGROUP}" 2>&1 >/dev/null; then - echo "You already have a \"${NAGIOSGROUP}\" group, so I will use it." - else - echo "You need a \"${NAGIOSGROUP}\" group." - if yesno "Would you like me to create it" "YES"; then - /usr/sbin/pw groupadd "${NAGIOSGROUP}" -h - || exit - echo "Done." - else - echo "Please create the \"${NAGIOSGROUP}\" group manually and try again." - exit 1 - fi - fi - - if /usr/sbin/pw user show "${NAGIOSUSER}" 2>&1 >/dev/null; then - echo "You already have a \"${NAGIOSUSER}\" user, so I will use it." - else - echo "You need a \"${NAGIOSUSER}\" user." - if yesno "Would you like me to create it" "YES"; then - /usr/sbin/pw useradd "${NAGIOSUSER}" -g "${NAGIOSGROUP}" -h - -d "${NAGIOSDIR}" \ - -s /sbin/nologin -c "Nagios pseudo-user" || exit - else - echo "Please create the \"${NAGIOSUSER}\" user manually and try again." - exit 1 - fi - fi -fi diff --git a/net-mgmt/nagios2/files/pkg-message.in b/net-mgmt/nagios2/files/pkg-message.in deleted file mode 100644 index 41b08b6bcc67..000000000000 --- a/net-mgmt/nagios2/files/pkg-message.in +++ /dev/null @@ -1,36 +0,0 @@ -********************************************************************** - - Enable nagios in /etc/rc.conf with the following line: - - nagios_enable="YES" - - Configuration templates are available in %%PREFIX%%/etc/nagios as - *.cfg-sample files. Copy then to *.cfg files where required and - edit to suit your needs. Documentation is available in HTML form - in %%PREFIX%%/%%NAGIOSWWWDIR%%/docs. - - If you don't already have a web server running, you will need to - install and configure one to finish off your nagios installation. - When used with Apache, the following should be sufficient to publish - the web component of nagios (modification of allow list encouraged): - - <Directory %%PREFIX%%/%%NAGIOSWWWDIR%%> - Order allow,deny - Allow from all - </Directory> - - <Directory %%PREFIX%%/%%NAGIOSWWWDIR%%/cgi-bin> - Options ExecCGI - </Directory> - - ScriptAlias %%NAGIOSCGIURL%%/ %%PREFIX%%/%%NAGIOSWWWDIR%%/cgi-bin/ - Alias %%NAGIOSHTMURL%%/ %%PREFIX%%/%%NAGIOSWWWDIR%%/ - -********************************************************************** - - Users experiencing troubles with logos used in the Status Map CGI - should first check the value of the physical_html_path variable - defined in %%PREFIX%%/etc/nagios/cgi.cfg. Refer to the example in - %%PREFIX%%/etc/nagios/cgi.cfg-sample for the correct value. - -********************************************************************** diff --git a/net-mgmt/nagios2/pkg-descr b/net-mgmt/nagios2/pkg-descr deleted file mode 100644 index b1ff9995e7fc..000000000000 --- a/net-mgmt/nagios2/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -Nagios is a host and service monitor designed to inform you of network -problems before your clients, end-users or managers do. It has been -designed to run under the Linux operating system, but works fine under -most *NIX variants as well. The monitoring daemon runs intermittent -checks on hosts and services you specify using external "plugins" -which return status information to Nagios. When problems are -encountered, the daemon can send notifications out to administrative -contacts in a variety of different ways (email, instant message, SMS, -etc.). Current status information, historical logs, and reports can -all be accessed via a web browser. - -WWW: http://www.nagios.org/ diff --git a/net-mgmt/nagios2/pkg-plist b/net-mgmt/nagios2/pkg-plist deleted file mode 100644 index f2b4d4334ddf..000000000000 --- a/net-mgmt/nagios2/pkg-plist +++ /dev/null @@ -1,302 +0,0 @@ -@exec mkdir -p %D/%%NAGIOSWWWDIR%%/ssi -@exec mkdir -p %%NAGIOSDIR%%/archives -@exec mkdir -p %%NAGIOSDIR%%/rw -@exec chmod 775 %%NAGIOSDIR%% %%NAGIOSDIR%%/archives %%NAGIOSDIR%%/rw -@exec chown %%NAGIOSUSER%%:%%NAGIOSGROUP%% %%NAGIOSDIR%% %%NAGIOSDIR%%/archives -@exec chown %%NAGIOSUSER%%:%%WWWGRP%% %%NAGIOSDIR%%/rw -bin/nagios -bin/nagiostats -%%EMBEDDED_PERL%%bin/p1.pl -etc/nagios/bigger.cfg-sample -etc/nagios/cgi.cfg-sample -etc/nagios/checkcommands.cfg-sample -etc/nagios/minimal.cfg-sample -etc/nagios/misccommands.cfg-sample -etc/nagios/nagios.cfg-sample -etc/nagios/resource.cfg-sample -%%NAGIOSWWWDIR%%/cgi-bin/avail.cgi -%%NAGIOSWWWDIR%%/cgi-bin/cmd.cgi -%%NAGIOSWWWDIR%%/cgi-bin/config.cgi -%%NAGIOSWWWDIR%%/cgi-bin/extinfo.cgi -%%NAGIOSWWWDIR%%/cgi-bin/histogram.cgi -%%NAGIOSWWWDIR%%/cgi-bin/history.cgi -%%NAGIOSWWWDIR%%/cgi-bin/notifications.cgi -%%NAGIOSWWWDIR%%/cgi-bin/outages.cgi -%%NAGIOSWWWDIR%%/cgi-bin/showlog.cgi -%%NAGIOSWWWDIR%%/cgi-bin/status.cgi -%%NAGIOSWWWDIR%%/cgi-bin/statusmap.cgi -%%NAGIOSWWWDIR%%/cgi-bin/statuswml.cgi -%%NAGIOSWWWDIR%%/cgi-bin/statuswrl.cgi -%%NAGIOSWWWDIR%%/cgi-bin/summary.cgi -%%NAGIOSWWWDIR%%/cgi-bin/tac.cgi -%%NAGIOSWWWDIR%%/cgi-bin/trends.cgi -%%NAGIOSWWWDIR%%/contexthelp/A1.html -%%NAGIOSWWWDIR%%/contexthelp/A2.html -%%NAGIOSWWWDIR%%/contexthelp/A3.html -%%NAGIOSWWWDIR%%/contexthelp/A4.html -%%NAGIOSWWWDIR%%/contexthelp/A5.html -%%NAGIOSWWWDIR%%/contexthelp/A6.html -%%NAGIOSWWWDIR%%/contexthelp/A7.html -%%NAGIOSWWWDIR%%/contexthelp/B1.html -%%NAGIOSWWWDIR%%/contexthelp/C1.html -%%NAGIOSWWWDIR%%/contexthelp/D1.html -%%NAGIOSWWWDIR%%/contexthelp/E1.html -%%NAGIOSWWWDIR%%/contexthelp/F1.html -%%NAGIOSWWWDIR%%/contexthelp/G1.html -%%NAGIOSWWWDIR%%/contexthelp/G2.html -%%NAGIOSWWWDIR%%/contexthelp/G3.html -%%NAGIOSWWWDIR%%/contexthelp/G4.html -%%NAGIOSWWWDIR%%/contexthelp/G5.html -%%NAGIOSWWWDIR%%/contexthelp/G6.html -%%NAGIOSWWWDIR%%/contexthelp/H1.html -%%NAGIOSWWWDIR%%/contexthelp/H2.html -%%NAGIOSWWWDIR%%/contexthelp/H3.html -%%NAGIOSWWWDIR%%/contexthelp/H4.html -%%NAGIOSWWWDIR%%/contexthelp/H5.html -%%NAGIOSWWWDIR%%/contexthelp/H6.html -%%NAGIOSWWWDIR%%/contexthelp/H7.html -%%NAGIOSWWWDIR%%/contexthelp/H8.html -%%NAGIOSWWWDIR%%/contexthelp/I1.html -%%NAGIOSWWWDIR%%/contexthelp/I2.html -%%NAGIOSWWWDIR%%/contexthelp/I3.html -%%NAGIOSWWWDIR%%/contexthelp/I4.html -%%NAGIOSWWWDIR%%/contexthelp/I5.html -%%NAGIOSWWWDIR%%/contexthelp/I6.html -%%NAGIOSWWWDIR%%/contexthelp/I7.html -%%NAGIOSWWWDIR%%/contexthelp/I8.html -%%NAGIOSWWWDIR%%/contexthelp/I9.html -%%NAGIOSWWWDIR%%/contexthelp/J1.html -%%NAGIOSWWWDIR%%/contexthelp/K1.html -%%NAGIOSWWWDIR%%/contexthelp/L1.html -%%NAGIOSWWWDIR%%/contexthelp/L10.html -%%NAGIOSWWWDIR%%/contexthelp/L11.html -%%NAGIOSWWWDIR%%/contexthelp/L12.html -%%NAGIOSWWWDIR%%/contexthelp/L13.html -%%NAGIOSWWWDIR%%/contexthelp/L2.html -%%NAGIOSWWWDIR%%/contexthelp/L3.html -%%NAGIOSWWWDIR%%/contexthelp/L4.html -%%NAGIOSWWWDIR%%/contexthelp/L5.html -%%NAGIOSWWWDIR%%/contexthelp/L6.html -%%NAGIOSWWWDIR%%/contexthelp/L7.html -%%NAGIOSWWWDIR%%/contexthelp/L8.html -%%NAGIOSWWWDIR%%/contexthelp/L9.html -%%NAGIOSWWWDIR%%/contexthelp/M1.html -%%NAGIOSWWWDIR%%/contexthelp/M2.html -%%NAGIOSWWWDIR%%/contexthelp/M3.html -%%NAGIOSWWWDIR%%/contexthelp/M4.html -%%NAGIOSWWWDIR%%/contexthelp/M5.html -%%NAGIOSWWWDIR%%/contexthelp/M6.html -%%NAGIOSWWWDIR%%/contexthelp/N1.html -%%NAGIOSWWWDIR%%/contexthelp/N2.html -%%NAGIOSWWWDIR%%/contexthelp/N3.html -%%NAGIOSWWWDIR%%/contexthelp/N4.html -%%NAGIOSWWWDIR%%/contexthelp/N5.html -%%NAGIOSWWWDIR%%/contexthelp/N6.html -%%NAGIOSWWWDIR%%/contexthelp/N7.html -%%NAGIOSWWWDIR%%/docs/about.html -%%NAGIOSWWWDIR%%/docs/adaptive.html -%%NAGIOSWWWDIR%%/docs/addons.html -%%NAGIOSWWWDIR%%/docs/beginners.html -%%NAGIOSWWWDIR%%/docs/cgiauth.html -%%NAGIOSWWWDIR%%/docs/cgiincludes.html -%%NAGIOSWWWDIR%%/docs/cgis.html -%%NAGIOSWWWDIR%%/docs/checkscheduling.html -%%NAGIOSWWWDIR%%/docs/clusters.html -%%NAGIOSWWWDIR%%/docs/commandfile.html -%%NAGIOSWWWDIR%%/docs/config.html -%%NAGIOSWWWDIR%%/docs/configcgi.html -%%NAGIOSWWWDIR%%/docs/configextinfo.html -%%NAGIOSWWWDIR%%/docs/configmain.html -%%NAGIOSWWWDIR%%/docs/configobject.html -%%NAGIOSWWWDIR%%/docs/dependencies.html -%%NAGIOSWWWDIR%%/docs/distributed.html -%%NAGIOSWWWDIR%%/docs/downtime.html -%%NAGIOSWWWDIR%%/docs/embeddedperl.html -%%NAGIOSWWWDIR%%/docs/escalations.html -%%NAGIOSWWWDIR%%/docs/eventhandlers.html -%%NAGIOSWWWDIR%%/docs/extcommands.html -%%NAGIOSWWWDIR%%/docs/flapping.html -%%NAGIOSWWWDIR%%/docs/freshness.html -%%NAGIOSWWWDIR%%/docs/funstuff.html -%%NAGIOSWWWDIR%%/docs/images/activepassive.png -%%NAGIOSWWWDIR%%/docs/images/cgi-avail-a.png -%%NAGIOSWWWDIR%%/docs/images/cgi-avail-b.png -%%NAGIOSWWWDIR%%/docs/images/cgi-cmd.png -%%NAGIOSWWWDIR%%/docs/images/cgi-config.png -%%NAGIOSWWWDIR%%/docs/images/cgi-extinfo-a.png -%%NAGIOSWWWDIR%%/docs/images/cgi-extinfo-b.png -%%NAGIOSWWWDIR%%/docs/images/cgi-extinfo-c.png -%%NAGIOSWWWDIR%%/docs/images/cgi-extinfo-d.png -%%NAGIOSWWWDIR%%/docs/images/cgi-histogram.png -%%NAGIOSWWWDIR%%/docs/images/cgi-history.png -%%NAGIOSWWWDIR%%/docs/images/cgi-notifications.png -%%NAGIOSWWWDIR%%/docs/images/cgi-outages.png -%%NAGIOSWWWDIR%%/docs/images/cgi-showlog.png -%%NAGIOSWWWDIR%%/docs/images/cgi-status-a.png -%%NAGIOSWWWDIR%%/docs/images/cgi-status-b.png -%%NAGIOSWWWDIR%%/docs/images/cgi-status-c.png -%%NAGIOSWWWDIR%%/docs/images/cgi-status-d.png -%%NAGIOSWWWDIR%%/docs/images/cgi-statusmap.png -%%NAGIOSWWWDIR%%/docs/images/cgi-statuswml.png -%%NAGIOSWWWDIR%%/docs/images/cgi-statuswrl.png -%%NAGIOSWWWDIR%%/docs/images/cgi-summary.png -%%NAGIOSWWWDIR%%/docs/images/cgi-tac.png -%%NAGIOSWWWDIR%%/docs/images/cgi-trends.png -%%NAGIOSWWWDIR%%/docs/images/checktiming.png -%%NAGIOSWWWDIR%%/docs/images/distributed.png -%%NAGIOSWWWDIR%%/docs/images/host-dependencies.png -%%NAGIOSWWWDIR%%/docs/images/indirecthostcheck.png -%%NAGIOSWWWDIR%%/docs/images/indirectsvccheck.png -%%NAGIOSWWWDIR%%/docs/images/indirectsvccheck2.png -%%NAGIOSWWWDIR%%/docs/images/interleaved1.png -%%NAGIOSWWWDIR%%/docs/images/interleaved2.png -%%NAGIOSWWWDIR%%/docs/images/interleaved3.png -%%NAGIOSWWWDIR%%/docs/images/logofullsize.png -%%NAGIOSWWWDIR%%/docs/images/mrtgstats.png -%%NAGIOSWWWDIR%%/docs/images/network-heirarchy.png -%%NAGIOSWWWDIR%%/docs/images/network-outage1.png -%%NAGIOSWWWDIR%%/docs/images/network-outage2.png -%%NAGIOSWWWDIR%%/docs/images/noninterleaved1.png -%%NAGIOSWWWDIR%%/docs/images/noninterleaved2.png -%%NAGIOSWWWDIR%%/docs/images/physical-network.png -%%NAGIOSWWWDIR%%/docs/images/plugintheory.png -%%NAGIOSWWWDIR%%/docs/images/redudancy.png -%%NAGIOSWWWDIR%%/docs/images/redundancy.png -%%NAGIOSWWWDIR%%/docs/images/service-dependencies.png -%%NAGIOSWWWDIR%%/docs/images/statetransitions.png -%%NAGIOSWWWDIR%%/docs/images/statetransitions2.png -%%NAGIOSWWWDIR%%/docs/index.html -%%NAGIOSWWWDIR%%/docs/indirectchecks.html -%%NAGIOSWWWDIR%%/docs/installing.html -%%NAGIOSWWWDIR%%/docs/installweb.html -%%NAGIOSWWWDIR%%/docs/int-snmptrap.html -%%NAGIOSWWWDIR%%/docs/int-tcpwrappers.html -%%NAGIOSWWWDIR%%/docs/macros.html -%%NAGIOSWWWDIR%%/docs/nagiostats.html -%%NAGIOSWWWDIR%%/docs/networkoutages.html -%%NAGIOSWWWDIR%%/docs/networkreachability.html -%%NAGIOSWWWDIR%%/docs/notifications.html -%%NAGIOSWWWDIR%%/docs/parallelization.html -%%NAGIOSWWWDIR%%/docs/passivechecks.html -%%NAGIOSWWWDIR%%/docs/perfdata.html -%%NAGIOSWWWDIR%%/docs/plugins.html -%%NAGIOSWWWDIR%%/docs/plugintheory.html -%%NAGIOSWWWDIR%%/docs/redundancy.html -%%NAGIOSWWWDIR%%/docs/robots.txt -%%NAGIOSWWWDIR%%/docs/security.html -%%NAGIOSWWWDIR%%/docs/stalking.html -%%NAGIOSWWWDIR%%/docs/starting.html -%%NAGIOSWWWDIR%%/docs/statetypes.html -%%NAGIOSWWWDIR%%/docs/stoprestart.html -%%NAGIOSWWWDIR%%/docs/templaterecursion.html -%%NAGIOSWWWDIR%%/docs/templatetricks.html -%%NAGIOSWWWDIR%%/docs/timeperiods.html -%%NAGIOSWWWDIR%%/docs/toc.html -%%NAGIOSWWWDIR%%/docs/tuning.html -%%NAGIOSWWWDIR%%/docs/verifyconfig.html -%%NAGIOSWWWDIR%%/docs/volatileservices.html -%%NAGIOSWWWDIR%%/docs/whatsnew.html -%%NAGIOSWWWDIR%%/docs/xodtemplate.html -%%NAGIOSWWWDIR%%/images/ack.gif -%%NAGIOSWWWDIR%%/images/action.gif -%%NAGIOSWWWDIR%%/images/command.png -%%NAGIOSWWWDIR%%/images/comment.gif -%%NAGIOSWWWDIR%%/images/contexthelp1.gif -%%NAGIOSWWWDIR%%/images/contexthelp2.gif -%%NAGIOSWWWDIR%%/images/critical.png -%%NAGIOSWWWDIR%%/images/delay.gif -%%NAGIOSWWWDIR%%/images/delete.gif -%%NAGIOSWWWDIR%%/images/detail.gif -%%NAGIOSWWWDIR%%/images/disabled.gif -%%NAGIOSWWWDIR%%/images/down.gif -%%NAGIOSWWWDIR%%/images/downtime.gif -%%NAGIOSWWWDIR%%/images/empty.gif -%%NAGIOSWWWDIR%%/images/enabled.gif -%%NAGIOSWWWDIR%%/images/extinfo.gif -%%NAGIOSWWWDIR%%/images/flapping.gif -%%NAGIOSWWWDIR%%/images/greendot.gif -%%NAGIOSWWWDIR%%/images/histogram.png -%%NAGIOSWWWDIR%%/images/history.gif -%%NAGIOSWWWDIR%%/images/hostevent.gif -%%NAGIOSWWWDIR%%/images/info.png -%%NAGIOSWWWDIR%%/images/left.gif -%%NAGIOSWWWDIR%%/images/logofullsize.jpg -%%NAGIOSWWWDIR%%/images/logos/nagios.gd2 -%%NAGIOSWWWDIR%%/images/logos/nagios.gif -%%NAGIOSWWWDIR%%/images/logos/nagiosvrml.png -%%NAGIOSWWWDIR%%/images/logos/unknown.gd2 -%%NAGIOSWWWDIR%%/images/logos/unknown.gif -%%NAGIOSWWWDIR%%/images/logrotate.png -%%NAGIOSWWWDIR%%/images/ndisabled.gif -%%NAGIOSWWWDIR%%/images/noack.gif -%%NAGIOSWWWDIR%%/images/notes.gif -%%NAGIOSWWWDIR%%/images/notify.gif -%%NAGIOSWWWDIR%%/images/orangedot.gif -%%NAGIOSWWWDIR%%/images/passiveonly.gif -%%NAGIOSWWWDIR%%/images/recovery.png -%%NAGIOSWWWDIR%%/images/redudancy.png -%%NAGIOSWWWDIR%%/images/redundancy.png -%%NAGIOSWWWDIR%%/images/restart.gif -%%NAGIOSWWWDIR%%/images/right.gif -%%NAGIOSWWWDIR%%/images/sblogo.jpg -%%NAGIOSWWWDIR%%/images/serviceevent.gif -%%NAGIOSWWWDIR%%/images/start.gif -%%NAGIOSWWWDIR%%/images/status.gif -%%NAGIOSWWWDIR%%/images/status2.gif -%%NAGIOSWWWDIR%%/images/status3.gif -%%NAGIOSWWWDIR%%/images/status4.gif -%%NAGIOSWWWDIR%%/images/stop.gif -%%NAGIOSWWWDIR%%/images/tacdisabled.jpg -%%NAGIOSWWWDIR%%/images/tacdisabled.png -%%NAGIOSWWWDIR%%/images/tacenabled.jpg -%%NAGIOSWWWDIR%%/images/tacenabled.png -%%NAGIOSWWWDIR%%/images/thermcrit.png -%%NAGIOSWWWDIR%%/images/thermok.png -%%NAGIOSWWWDIR%%/images/thermwarn.png -%%NAGIOSWWWDIR%%/images/trends.gif -%%NAGIOSWWWDIR%%/images/trendshost.png -%%NAGIOSWWWDIR%%/images/trendssvc.png -%%NAGIOSWWWDIR%%/images/unknown.png -%%NAGIOSWWWDIR%%/images/up.gif -%%NAGIOSWWWDIR%%/images/warning.png -%%NAGIOSWWWDIR%%/images/weblogo1.png -%%NAGIOSWWWDIR%%/images/zoom1.gif -%%NAGIOSWWWDIR%%/images/zoom2.gif -%%NAGIOSWWWDIR%%/index.html -%%NAGIOSWWWDIR%%/main.html -%%NAGIOSWWWDIR%%/media/critical.wav -%%NAGIOSWWWDIR%%/media/hostdown.wav -%%NAGIOSWWWDIR%%/media/warning.wav -%%NAGIOSWWWDIR%%/robots.txt -%%NAGIOSWWWDIR%%/side.html -%%NAGIOSWWWDIR%%/stylesheets/avail.css -%%NAGIOSWWWDIR%%/stylesheets/checksanity.css -%%NAGIOSWWWDIR%%/stylesheets/cmd.css -%%NAGIOSWWWDIR%%/stylesheets/common.css -%%NAGIOSWWWDIR%%/stylesheets/config.css -%%NAGIOSWWWDIR%%/stylesheets/extinfo.css -%%NAGIOSWWWDIR%%/stylesheets/histogram.css -%%NAGIOSWWWDIR%%/stylesheets/history.css -%%NAGIOSWWWDIR%%/stylesheets/ministatus.css -%%NAGIOSWWWDIR%%/stylesheets/notifications.css -%%NAGIOSWWWDIR%%/stylesheets/outages.css -%%NAGIOSWWWDIR%%/stylesheets/showlog.css -%%NAGIOSWWWDIR%%/stylesheets/status.css -%%NAGIOSWWWDIR%%/stylesheets/statusmap.css -%%NAGIOSWWWDIR%%/stylesheets/summary.css -%%NAGIOSWWWDIR%%/stylesheets/tac.css -%%NAGIOSWWWDIR%%/stylesheets/trends.css -@dirrmtry etc/nagios -@dirrm %%NAGIOSWWWDIR%%/cgi-bin -@dirrm %%NAGIOSWWWDIR%%/contexthelp -@dirrm %%NAGIOSWWWDIR%%/docs/images -@dirrm %%NAGIOSWWWDIR%%/docs -@dirrm %%NAGIOSWWWDIR%%/images/logos -@dirrm %%NAGIOSWWWDIR%%/images -@dirrm %%NAGIOSWWWDIR%%/media -@dirrm %%NAGIOSWWWDIR%%/ssi -@dirrm %%NAGIOSWWWDIR%%/stylesheets -@dirrmtry %%NAGIOSWWWDIR%% -@unexec rmdir %%NAGIOSDIR%%/archives 2>/dev/null || true -@unexec rmdir %%NAGIOSDIR%%/rw 2>/dev/null || true -@unexec rmdir %%NAGIOSDIR%% 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 3e3a709d7866..000000000000 --- a/net-mgmt/net-snmp-devel/Makefile +++ /dev/null @@ -1,276 +0,0 @@ -# New ports collection makefile for: ucd-snmp -# Date created: 26 June 1996 -# Whom: gpalmer -# -# $FreeBSD$ -# - -PORTNAME= snmp -PORTVERSION= 5.2.2 -PORTREVISION= 1 -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 -PATCH_DEPENDS= ${LIBTOOL_DEPENDS} - -USE_REINPLACE= yes -USE_AUTOTOOLS= autoconf:259 libtool:15 -USE_RC_SUBR= yes -USE_OPENSSL= yes -INSTALLS_SHLIB= yes -.if !defined(WITHOUT_PERL) -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="-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 ${OSVERSION} >= 400014 && !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= 9 -PLIST_SUB+= SHLIB_VERSION=${SHLIB_VERSION} -SCRIPTS_SUB= PREFIX=${PREFIX} PERL=${PERL} -RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} - -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 -_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= mib2c.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 -MAN3= add_mibdir.3 add_module_replacement.3 default_store.3 \ - get_module_node.3 init_mib.3 init_mib_internals.3 mib_api.3 \ - netsnmp_agent.3 netsnmp_bulk_to_next.3 netsnmp_debug.3 \ - netsnmp_example_scalar_int.3 netsnmp_handler.3 \ - netsnmp_instance.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_scalar.3 \ - netsnmp_serialize.3 netsnmp_table.3 netsnmp_table_array.3 \ - netsnmp_table_data.3 netsnmp_table_dataset.3 \ - netsnmp_table_iterator.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_mib.3 \ - read_module.3 read_module_node.3 read_objid.3 shutdown_mib.3 \ - snmp_agent_api.3 snmp_alarm.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 \ - netsnmp_Container_iterator.3 \ - netsnmp_baby_steps.3 \ - netsnmp_cache_handler.3 netsnmp_container.3 \ - netsnmp_iterator_info_s.3 \ - netsnmp_leaf.3 \ - netsnmp_row_merge.3 netsnmp_scalar_group_group.3 \ - netsnmp_stash_cache.3 netsnmp_utilities.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 \ - snmptrapd.conf.5 variables.5 -MAN8= snmpd.8 snmptrapd.8 - -BIN_FILES= snmpbulkwalk snmpget snmpgetnext snmpnetstat53 snmpset \ - snmpstatus snmptest snmptranslate snmptrap snmpwalk -SBIN_FILES= snmpd snmptrapd -STARTUP_DIR= ${PREFIX}/etc/rc.d -STARTUP_FILES= snmpd.sh snmptrapd.sh -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 - -pre-everything:: - @${ECHO_MSG} - @${ECHO_MSG} "You may use the following build options:" - @${ECHO_MSG} - @${ECHO_MSG} "WITH_INETADDRESS_HACK=yes builds with the inetaddress hack" - @${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: patch-autoconf patch-script-files patch-startup-files - -patch-autoconf: - @${AWK} '/@synopsis/,/taken from libtool.m4/' ${WRKSRC}/aclocal.m4 > ${WRKSRC}/aclocal.m4.tmp - @${CAT} ${LIBTOOL_M4} >> ${WRKSRC}/aclocal.m4.tmp - @${CP} ${LTMAIN} ${WRKSRC} - @${MV} ${WRKSRC}/aclocal.m4.tmp ${WRKSRC}/aclocal.m4 - -patch-script-files: -.for filename in ${SCRIPT_FILES} - @${REINPLACE_CMD} ${SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${WRKSRC}/local/${filename} -.endfor - -patch-startup-files: -.for filename in ${STARTUP_FILES} - @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/${filename}.sample > ${WRKDIR}/${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) = .*!\1 = ${MAN3PERLPREFIX}/man/man3!; \ - s! doc_(perl|site|\$$\(INSTALLDIRS\))_install$$!!; \ - ' -.else - ${REINPLACE_CMD} -e 's| perlinstall||' ${WRKSRC}/Makefile -.endif - -post-install: strip-files install-startup-files install-config-files install-doc-files display-message - -strip-files: - @cd ${PREFIX}/bin; ${STRIP_CMD} ${BIN_FILES} - @cd ${PREFIX}/sbin; ${STRIP_CMD} ${SBIN_FILES} - -install-startup-files: -.for filename in ${STARTUP_FILES} - @${INSTALL_SCRIPT} ${WRKDIR}/${filename} ${STARTUP_DIR} -.endfor - -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,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/ethereal,net/ifstat,net/quagga,net/rtg,net/tethereal,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 e3befea5bb8d..000000000000 --- a/net-mgmt/net-snmp-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (net-snmp-5.2.2.tar.gz) = 2d9cdf956d6be5c5fcf2f898b403389b -SHA256 (net-snmp-5.2.2.tar.gz) = ed5cc617e4cfe38af64a3ded8542c4e61d045dbeec00d5b93a31afc3337135fd -SIZE (net-snmp-5.2.2.tar.gz) = 3919826 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 f5631707a352..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Tue Oct 11 20:49:23 2005 -+++ Makefile.in Wed Nov 30 11:35:12 2005 -@@ -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 freebsd5.h freebsd6.h \ -+ darwin.h darwin7.h darwin8.h freebsd5.h freebsd6.h freebsd7.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.6.h solaris2.7.h solaris2.8.h solaris2.9.h solaris2.10.h \ diff --git a/net-mgmt/net-snmp-devel/files/patch-agent_index.c b/net-mgmt/net-snmp-devel/files/patch-agent_index.c deleted file mode 100644 index d6254de2148e..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-agent_index.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/agent_index.c.orig Mon Jan 24 09:14:39 2005 -+++ agent/agent_index.c Mon Jan 24 09:14:55 2005 -@@ -39,10 +39,6 @@ - #include <netinet/in.h> - #endif - --#if HAVE_DMALLOC_H --#include <dmalloc.h> --#endif -- - #include <net-snmp/net-snmp-includes.h> - #include <net-snmp/agent/net-snmp-agent-includes.h> - #include <net-snmp/agent/agent_callbacks.h> diff --git a/net-mgmt/net-snmp-devel/files/patch-agent_read_config.c b/net-mgmt/net-snmp-devel/files/patch-agent_read_config.c deleted file mode 100644 index d38b96de7668..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-agent_read_config.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/agent_read_config.c.orig Mon Jan 24 09:12:58 2005 -+++ agent/agent_read_config.c Mon Jan 24 09:13:13 2005 -@@ -84,10 +84,6 @@ - #include <inet/mib2.h> - #endif - --#if HAVE_DMALLOC_H --#include <dmalloc.h> --#endif -- - #if HAVE_UNISTD_H - #include <unistd.h> - #endif 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 4eab10a699f9..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-agent_registry.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/agent_registry.c.orig Mon Jan 24 09:14:00 2005 -+++ agent/agent_registry.c Mon Jan 24 09:14:08 2005 -@@ -51,10 +51,6 @@ - #include <netinet/in.h> - #endif - --#if HAVE_DMALLOC_H --#include <dmalloc.h> --#endif -- - #include <net-snmp/net-snmp-includes.h> - #include <net-snmp/agent/net-snmp-agent-includes.h> - #include <net-snmp/agent/agent_callbacks.h> diff --git a/net-mgmt/net-snmp-devel/files/patch-at.c b/net-mgmt/net-snmp-devel/files/patch-at.c deleted file mode 100644 index 363f1b07991e..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-at.c +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/mibgroup/mibII/at.c.orig Mon Jan 24 09:08:41 2005 -+++ agent/mibgroup/mibII/at.c Mon Jan 24 09:08:58 2005 -@@ -90,9 +90,6 @@ - #if HAVE_WINSOCK_H - #include <winsock.h> - #endif --#if HAVE_DMALLOC_H --#include <dmalloc.h> --#endif - - #ifdef hpux11 - #include <sys/mib.h> diff --git a/net-mgmt/net-snmp-devel/files/patch-auto_nlist.c b/net-mgmt/net-snmp-devel/files/patch-auto_nlist.c deleted file mode 100644 index c15443a03afd..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-auto_nlist.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/auto_nlist.c.orig Mon Jan 24 09:11:07 2005 -+++ agent/auto_nlist.c Mon Jan 24 09:11:24 2005 -@@ -21,10 +21,6 @@ - #include <kvm.h> - #endif - --#if HAVE_DMALLOC_H --#include <dmalloc.h> --#endif -- - #include <net-snmp/agent/auto_nlist.h> - #include "autonlist.h" - #include "kernel.h" 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-configure.in b/net-mgmt/net-snmp-devel/files/patch-configure.in deleted file mode 100644 index 172adf21bf2b..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-configure.in +++ /dev/null @@ -1,38 +0,0 @@ ---- configure.in.orig Tue Nov 29 14:16:55 2005 -+++ configure.in Wed Nov 30 11:49:24 2005 -@@ -2075,7 +2075,7 @@ - # fall back - CFLAG="-f" - fi --for i in /vmunix /hp-ux /stand/vmunix /dev/ksyms /kernel/unix /kernel/genunix /netbsd /unix /kernel /bsd /mach_kernel -+for i in /vmunix /hp-ux /stand/vmunix /dev/ksyms /kernel/unix /kernel/genunix /netbsd /unix /kernel /bsd /mach_kernel /boot/kernel/kernel /dev/null - do - if test -f $i -o $CFLAG $i; then - ac_cv_KERNEL_LOC="$i" -@@ -2989,6 +2989,26 @@ - # checking for 4.3 vs 4.4 rtentry. - AC_CACHE_CHECK(type of rtentry structure,ac_cv_RTENTRY_TYPE, - [ -+ -+dnl 4.4 compatible but renamed on FreeBSD -+AC_TRY_COMPILE([ -+#include <sys/types.h> -+#define KERNEL -+#define _KERNEL -+#include <sys/socket.h> -+#undef KERNEL -+#undef _KERNEL -+#include <net/route.h> -+],[ -+ -+#ifndef STRUCT_RTENTRY_HAS_RT_DST -+#define rt_dst rt_nodes->rn_key -+#endif -+ -+ struct rtentry rt; -+ rt.rt_nodes[0].rn_bit = 1; -+ rt.rt_dst; -+ ], ac_cv_RTENTRY_TYPE="BSD-4.4") - - # 4.4 compat - AC_TRY_COMPILE([ 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-freebsd5.h b/net-mgmt/net-snmp-devel/files/patch-freebsd5.h deleted file mode 100644 index 8bc6de2831b5..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-freebsd5.h +++ /dev/null @@ -1,10 +0,0 @@ ---- include/net-snmp/system/freebsd5.h.orig Wed Sep 1 00:13:46 2004 -+++ include/net-snmp/system/freebsd5.h Wed Sep 1 00:13:57 2004 -@@ -7,6 +7,7 @@ - #define freebsd3 1 - /* freebsd5 is a superset of freebsd4 */ - #define freebsd4 1 -+#define freebsd5 1 - - #undef IFADDR_SYMBOL - #define IFADDR_SYMBOL "in_ifaddrhead" 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-hr_storage.c b/net-mgmt/net-snmp-devel/files/patch-hr_storage.c deleted file mode 100644 index ef250fa6540e..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-hr_storage.c +++ /dev/null @@ -1,221 +0,0 @@ ---- agent/mibgroup/host/hr_storage.c.orig Fri Oct 7 07:55:23 2005 -+++ agent/mibgroup/host/hr_storage.c Wed Nov 30 12:01:05 2005 -@@ -233,6 +233,10 @@ - void sol_get_swapinfo(int *, int *); - #endif - -+#if defined(__FreeBSD__) && __FreeBSD_version >= 500102 -+void collect_mbuf(long *long_mbuf, long *long_mbufc); -+#endif -+ - #define HRSTORE_MEMSIZE 1 - #define HRSTORE_INDEX 2 - #define HRSTORE_TYPE 3 -@@ -472,7 +476,8 @@ - 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 */ - }; - - -@@ -611,6 +616,7 @@ - storage_type_id[storage_type_len - 1] = 3; /* Virtual Mem */ - break; - case HRS_TYPE_MBUF: -+ case HRS_TYPE_MBUFCLUSTER: - storage_type_id[storage_type_len - 1] = 1; /* Other */ - break; - default: -@@ -704,7 +710,7 @@ - long_return = memory_totals.t_vm; - #endif - break; --#else /* !linux && !solaris2 && !hpux10 && !hpux11 && ... */ -+#else - case HRS_TYPE_MEM: - long_return = physmem; - break; -@@ -726,13 +732,45 @@ - i++) - long_return += mbstat.m_mtypes[i]; - #elif defined(MBSTAT_SYMBOL) && defined(STRUCT_MBSTAT_HAS_M_MBUFS) -+#if !defined(__FreeBSD__) || __FreeBSD_version < 500021 - long_return = mbstat.m_mbufs; -+#elif defined(__FreeBSD__) && __FreeBSD_version < 500024 -+ /* mbuf stats disabled */ -+ return NULL; -+#elif defined(__FreeBSD__) -+ { -+ size_t mlen = sizeof(int); -+ int nmbufs; -+ if (sysctlbyname("kern.ipc.nmbufs", &nmbufs, &mlen, -+ NULL, 0) < 0) { -+ return NULL; -+ } -+ long_return = nmbufs; -+ break; -+ } -+#else -+#error "XXX" -+ /* XXX TODO: implement new method */ -+ return NULL; -+#endif /* __FreeBSD__ */ - #elif defined(NO_DUMMY_VALUES) - goto try_next; - #else - long_return = 0; - #endif - break; -+#if defined(__FreeBSD__) && __FreeBSD_version >= 500024 -+ case HRS_TYPE_MBUFCLUSTER: { -+ size_t mlen = sizeof(int); -+ int nmbclusters; -+ if (sysctlbyname("kern.ipc.nmbclusters", &nmbclusters, &mlen, -+ NULL, 0) < 0) { -+ return NULL; -+ } -+ long_return = nmbclusters; -+ break; -+ } -+#endif - default: - #if NO_DUMMY_VALUES - goto try_next; -@@ -796,6 +834,12 @@ - #endif - #elif defined(MBSTAT_SYMBOL) && defined(STRUCT_MBSTAT_HAS_M_CLUSTERS) - long_return = mbstat.m_clusters - mbstat.m_clfree; /* unlikely, but... */ -+#elif defined(__FreeBSD__) && __FreeBSD_version < 500102 -+ /* mbuf stats disabled */ -+ return NULL; -+#elif defined(__FreeBSD__) -+ collect_mbuf((long*)&long_return, (long*)NULL); -+ break; - #elif defined(NO_DUMMY_VALUES) - goto try_next; - #else -@@ -803,6 +847,11 @@ - #endif - break; - #endif /* !linux && !solaris2 && !hpux10 && !hpux11 && ... */ -+#if defined(__FreeBSD__) && __FreeBSD_version >= 500102 -+ case HRS_TYPE_MBUFCLUSTER: -+ collect_mbuf(NULL, &long_return); -+ break; -+#endif - default: - #if NO_DUMMY_VALUES - goto try_next; -@@ -829,7 +878,11 @@ - break; - #if !defined(linux) && !defined(solaris2) && !defined(hpux10) && !defined(hpux11) && defined(MBSTAT_SYMBOL) - case HRS_TYPE_MBUF: -+#if defined(__FreeBSD__) && __FreeBSD_version >= 502113 -+ long_return = mbstat.m_mcfail + mbstat.m_mpfail; -+#else - long_return = mbstat.m_drops; -+#endif - break; - #endif /* !linux && !solaris2 && !hpux10 && !hpux11 && MBSTAT_SYMBOL */ - default: -@@ -955,3 +1008,97 @@ - *usedP = ainfo.ani_resv; - } - #endif /* solaris2 */ -+ -+#if defined(__FreeBSD__) && __FreeBSD_version >= 500102 -+void -+collect_mbuf(long *long_mbuf, long *long_mbufc) -+{ -+#if __FreeBSD_version >= 502113 -+ size_t mlen; -+ struct mbstat mbstat; -+ -+ mlen = sizeof mbstat; -+ if (sysctlbyname("kern.ipc.mbstat", &mbstat, &mlen, NULL, 0) < 0) { -+ warn("sysctl: retrieving mbstat"); -+ return; -+ } -+ if (mbstat.m_mbufs < 0) mbstat.m_mbufs = 0; /* XXX */ -+ if (mbstat.m_mclusts < 0) mbstat.m_mclusts = 0; /* XXX */ -+ if (long_mbuf) { -+ *long_mbuf = mbstat.m_mbufs; -+ } -+ if (long_mbufc) { -+ *long_mbufc = mbstat.m_mclusts; -+ } -+#else -+ int i, j, num_objs; -+ size_t mlen; -+ u_long totused[2]; -+ u_long totnum, totfree; -+ struct mbstat mbstat; -+ struct mbpstat **mbpstat = NULL; -+ -+ if (sysctlbyname("kern.ipc.mb_statpcpu", NULL, &mlen, NULL, 0) < 0) { -+ warn("sysctl: retrieving mb_statpcpu len"); -+ goto err; -+ } -+ num_objs = (int)(mlen / sizeof(struct mbpstat)); -+ if ((mbpstat = calloc(num_objs, sizeof(struct mbpstat *))) == NULL) { -+ warn("calloc: cannot allocate memory for mbpstats pointers"); -+ goto err; -+ } -+ if ((mbpstat[0] = calloc(num_objs, sizeof(struct mbpstat))) == NULL) { -+ warn("calloc: cannot allocate memory for mbpstats"); -+ goto err; -+ } -+ -+ if (sysctlbyname("kern.ipc.mb_statpcpu", mbpstat[0], &mlen, NULL, 0) < 0) { -+ warn("sysctl: retrieving mb_statpcpu"); -+ goto err; -+ } -+ mlen = sizeof mbstat; -+ if (sysctlbyname("kern.ipc.mbstat", &mbstat, &mlen, NULL, 0) < 0) { -+ warn("sysctl: retrieving mbstat"); -+ goto err; -+ } -+ -+ for (i = 0; i < num_objs; i++) -+ mbpstat[i] = mbpstat[0] + i; -+ -+#define GENLST (num_objs - 1) -+ -+ totnum = mbpstat[GENLST]->mb_mbbucks * mbstat.m_mbperbuck; -+ totfree = mbpstat[GENLST]->mb_mbfree; -+ for (i = 0; i < (num_objs - 1); i++) { -+ if (mbpstat[i]->mb_active == 0) -+ continue; -+ totnum += mbpstat[i]->mb_mbbucks * mbstat.m_mbperbuck; -+ totfree += mbpstat[i]->mb_mbfree; -+ } -+ totused[0] = totnum - totfree; -+ totnum = mbpstat[GENLST]->mb_clbucks * mbstat.m_clperbuck; -+ totfree = mbpstat[GENLST]->mb_clfree; -+ for (i = 0; i < (num_objs - 1); i++) { -+ if (mbpstat[i]->mb_active == 0) -+ continue; -+ totnum += mbpstat[i]->mb_clbucks * mbstat.m_clperbuck; -+ totfree += mbpstat[i]->mb_clfree; -+ } -+ totused[1] = totnum - totfree; -+ -+ if (long_mbuf) { -+ *long_mbuf = totused[0]; -+ } -+ if (long_mbufc) { -+ *long_mbufc = totused[1]; -+ } -+ -+ err: -+ if (mbpstat != NULL) { -+ if (mbpstat[0] != NULL) -+ free(mbpstat[0]); -+ free(mbpstat); -+ } -+#endif -+} -+#endif 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_swrun.c b/net-mgmt/net-snmp-devel/files/patch-hr_swrun.c deleted file mode 100644 index 8f709c2f9a2a..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-hr_swrun.c +++ /dev/null @@ -1,78 +0,0 @@ ---- agent/mibgroup/host/hr_swrun.c.orig Thu Oct 20 04:32:20 2005 -+++ agent/mibgroup/host/hr_swrun.c Wed Nov 30 12:50:12 2005 -@@ -585,7 +585,7 @@ - string[ sizeof(string)-1 ] = 0; - #endif - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - strcpy(string, proc_table[LowProcIndex].ki_comm); - #else - strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); -@@ -698,7 +698,7 @@ - *cp1 = 0; - #endif - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - strcpy(string, proc_table[LowProcIndex].ki_comm); - #else - strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); -@@ -868,8 +868,23 @@ - if (pid < PID_MAXSYS) - long_return = 2; /* operatingSystem */ - else --#endif - long_return = 4; /* application */ -+#elif HAVE_KVM_GETPROCS -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 -+ if (proc_table[LowProcIndex].ki_flag & P_SYSTEM) { -+ if (proc_table[LowProcIndex].ki_pri.pri_class == PRI_ITHD) -+ long_return = 3;/* deviceDriver */ -+ else -+ long_return = 2;/* operatingSystem */ -+ } else -+ long_return = 4; /* application */ -+#else -+ if (proc_table[LowProcIndex].kp_proc.p_flag & P_SYSTEM) -+ long_return = 2; /* operatingSystem */ -+ else -+ long_return = 4; /* application */ -+#endif -+#endif - return (u_char *) & long_return; - case HRSWRUN_STATUS: - #if defined(cygwin) -@@ -901,7 +916,7 @@ - } - #else - #if HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - switch (proc_table[LowProcIndex].ki_stat) { - #else - switch (proc_table[LowProcIndex].kp_proc.p_stat) { -@@ -1000,7 +1015,13 @@ - long_return = proc_buf->p_utime * 100 + proc_buf->p_stime * 100; - #endif - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 -+ /* XXX: Accessing ki_paddr causes sig10 ... -+ long_return = proc_table[LowProcIndex].ki_paddr->p_uticks + -+ proc_table[LowProcIndex].ki_paddr->p_sticks + -+ proc_table[LowProcIndex].ki_paddr->p_iticks; */ -+ long_return = 0; -+ #elif defined(freebsd5) - long_return = proc_table[LowProcIndex].ki_runtime / 100000; - #else - long_return = proc_table[LowProcIndex].kp_proc.p_uticks + -@@ -1365,7 +1386,7 @@ - #elif defined(solaris2) - return proc_table[current_proc_entry++]; - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - if (proc_table[current_proc_entry].ki_stat != 0) - return proc_table[current_proc_entry++].ki_pid; - #else 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 37cc368ab1c9..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-interfaces.c +++ /dev/null @@ -1,293 +0,0 @@ ---- agent/mibgroup/mibII/interfaces.c.orig Tue Jan 4 00:51:32 2005 -+++ agent/mibgroup/mibII/interfaces.c Thu Apr 7 11:47:45 2005 -@@ -399,6 +399,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; -@@ -607,10 +734,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; -@@ -2250,129 +2387,17 @@ - u_char *var_ifEntry(struct variable *, oid *, size_t *, int, - size_t *, WriteMethod ** write); - --static char *physaddrbuf; --static int nphysaddrs; --struct sockaddr_dl **physaddrs; -- - void --init_interfaces_setup(void) -+Interface_Scan_Init(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 -+Interface_Scan_Next(short *Index, -+ char *Name, -+ struct ifnet *Retifnet, struct in_ifaddr *Retin_ifaddr) - { -- 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; -+ return 0; - } - - int 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 29e2de99aa97..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-ipv6.c +++ /dev/null @@ -1,603 +0,0 @@ ---- agent/mibgroup/mibII/ipv6.c.orig Thu Jul 8 05:31:54 2004 -+++ agent/mibgroup/mibII/ipv6.c Mon Oct 25 08:32:31 2004 -@@ -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 -@@ -575,7 +590,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__) -@@ -806,7 +821,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__) -@@ -827,7 +842,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__) -@@ -1220,32 +1235,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; -@@ -1274,9 +1290,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) -@@ -1284,31 +1301,32 @@ - ) { - DEBUGMSGTL(("mibII/ipv6", "looping: p=%x\n", p)); - --#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -- if (klookup((u_long) p, (char *) &in6pcb, sizeof(in6pcb)) < 0) { -+#if OS_NOT_FREEBSD_NOR_DARWIN -+ if (klookup((u_long) p, (char *) &tstpcb, sizeof(tstpcb)) < 0) { - 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*/ -@@ -1319,7 +1337,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++; -@@ -1330,7 +1348,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++; -@@ -1338,15 +1356,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)); -@@ -1354,7 +1372,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 */ - -@@ -1367,14 +1385,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; -@@ -1392,24 +1410,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) { -@@ -1431,11 +1449,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; -@@ -1464,9 +1482,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) -@@ -1474,41 +1493,41 @@ - ) { - DEBUGMSGTL(("mibII/ipv6", "looping: p=%x\n", p)); - --#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -- if (klookup((u_long) p, (char *) &in6pcb, sizeof(in6pcb)) < 0) { -+#if OS_NOT_FREEBSD_NOR_DARWIN -+ if (klookup((u_long) p, (char *) &tstpcb, sizeof(tstpcb)) < 0) { - 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_IPV6PROTO)) - goto skip; - #endif - if (klookup -- ((u_long) in6pcb.in6p_ppcb, (char *) &tcp6cb, sizeof(tcp6cb)) -+ ((u_long) tstpcb.in6p_ppcb, (char *) &tcp6cb, sizeof(tcp6cb)) - < 0) { - 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]; -@@ -1519,13 +1538,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++; -@@ -1536,7 +1555,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++; -@@ -1544,15 +1563,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)); -@@ -1573,20 +1592,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; -@@ -1633,22 +1652,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: ")); -@@ -1688,9 +1708,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) -@@ -1698,41 +1718,41 @@ - ) { - DEBUGMSGTL(("mibII/ipv6", "looping: p=%x\n", p)); - --#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -- if (klookup((u_long) p, (char *) &in6pcb, sizeof(in6pcb)) < 0) { -+#if OS_NOT_FREEBSD_NOR_DARWIN -+ if (klookup((u_long) p, (char *) &tstpcb, sizeof(in6pcb)) < 0) { - 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_IPV6PROTO)) - goto skip; - #endif - if (klookup -- ((u_long) in6pcb.in6p_ppcb, (char *) &tcpcb, sizeof(tcpcb)) -+ ((u_long) tstpcb.in6p_ppcb, (char *) &tcpcb, sizeof(tcpcb)) - < 0) { -- DEBUGMSGTL(("mibII/ipv6", "klookup fail for tcb6.tcpcb at %x\n", -- in6pcb.in6p_ppcb)); -+ DEBUGMSGTL(("mibII/ipv6", "klookup fail for tcb6.tcp6cb at %x\n", -+ 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); -@@ -1743,12 +1763,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++; -@@ -1759,7 +1779,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++; -@@ -1767,15 +1787,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)); -@@ -1783,7 +1803,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 */ - -@@ -1796,20 +1816,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-master.c b/net-mgmt/net-snmp-devel/files/patch-master.c deleted file mode 100644 index 12e553acc8e0..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-master.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/mibgroup/agentx/master.c.orig Mon Jan 24 09:16:00 2005 -+++ agent/mibgroup/agentx/master.c Mon Jan 24 09:16:21 2005 -@@ -39,10 +39,6 @@ - #endif - #include <errno.h> - --#if HAVE_DMALLOC_H --#include <dmalloc.h> --#endif -- - #if HAVE_UNISTD_H - #include <unistd.h> - #endif diff --git a/net-mgmt/net-snmp-devel/files/patch-master_admin.c b/net-mgmt/net-snmp-devel/files/patch-master_admin.c deleted file mode 100644 index cb4767076810..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-master_admin.c +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/mibgroup/agentx/master_admin.c.orig Mon Jan 24 09:18:07 2005 -+++ agent/mibgroup/agentx/master_admin.c Mon Jan 24 09:18:15 2005 -@@ -35,9 +35,6 @@ - #if HAVE_SYS_SOCKET_H - #include <sys/socket.h> - #endif --#if HAVE_DMALLOC_H --#include <dmalloc.h> --#endif - - #include <net-snmp/net-snmp-includes.h> - #include <net-snmp/agent/net-snmp-agent-includes.h> 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-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-oid_stash.c b/net-mgmt/net-snmp-devel/files/patch-oid_stash.c deleted file mode 100644 index 7978b27d587f..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-oid_stash.c +++ /dev/null @@ -1,13 +0,0 @@ ---- snmplib/oid_stash.c.orig Mon Jan 24 09:43:04 2005 -+++ snmplib/oid_stash.c Mon Jan 24 09:43:14 2005 -@@ -5,10 +5,6 @@ - #include <stdlib.h> - #include <sys/types.h> - --#if HAVE_DMALLOC_H --#include <dmalloc.h> --#endif -- - #include <net-snmp/net-snmp-includes.h> - - /** @defgroup oid_stash Store and retrieve data referenced by an OID. 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 365b6f398ebe..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-snmpTCPIPv6Domain.c +++ /dev/null @@ -1,30 +0,0 @@ ---- snmplib/snmpTCPIPv6Domain.c.orig Sat Oct 16 03:52:29 2004 -+++ snmplib/snmpTCPIPv6Domain.c Mon Oct 25 09:22:06 2004 -@@ -95,13 +95,21 @@ - if (to == NULL) { - return strdup("TCP/IPv6: unknown"); - } else { -- char addr[INET6_ADDRSTRLEN]; -- char tmp[INET6_ADDRSTRLEN + 8]; -+ char tmp[NI_MAXHOST]; - -- 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(to, sizeof(struct sockaddr_in6), tmp, sizeof(tmp), -+ NULL, 0, NI_NUMERICHOST | NI_WITHSCOPEID)) { -+ return strdup("UDP/IPv6: unknown"); -+ } -+ 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 c36abaaba730..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-snmpUCDIPv6Domain.c +++ /dev/null @@ -1,30 +0,0 @@ ---- snmplib/snmpUDPIPv6Domain.c.orig Sat Oct 16 03:52:29 2004 -+++ snmplib/snmpUDPIPv6Domain.c Mon Oct 25 09:28:10 2004 -@@ -104,13 +104,21 @@ - if (to == NULL) { - return strdup("UDP/IPv6: unknown"); - } else { -- char addr[INET6_ADDRSTRLEN]; -- char tmp[INET6_ADDRSTRLEN + 8]; -+ char tmp[NI_MAXHOST]; - -- sprintf(tmp, "UDP/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(to, sizeof(struct sockaddr_in6), tmp, sizeof(tmp), -+ NULL, 0, NI_NUMERICHOST | NI_WITHSCOPEID)) { -+ return strdup("UDP/IPv6: unknown"); -+ } -+ return strdup(tmp); - } - } - diff --git a/net-mgmt/net-snmp-devel/files/patch-snmpUDPDomain.c b/net-mgmt/net-snmp-devel/files/patch-snmpUDPDomain.c deleted file mode 100644 index 8ed548828d8c..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-snmpUDPDomain.c +++ /dev/null @@ -1,11 +0,0 @@ ---- snmplib/snmpUDPDomain.c.orig Mon Jan 24 10:47:16 2005 -+++ snmplib/snmpUDPDomain.c Mon Jan 24 10:47:41 2005 -@@ -88,7 +88,7 @@ - } else { - char tmp[64]; - -- sprintf(tmp, "UDP: [%s]:%hd", -+ sprintf(tmp, "UDP: [%s]:%hu", - inet_ntoa(to->sin_addr), ntohs(to->sin_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 a663a5576c56..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-snmp_agent.c +++ /dev/null @@ -1,10 +0,0 @@ ---- agent/snmp_agent.c.orig Thu Mar 17 17:17:43 2005 -+++ agent/snmp_agent.c Wed Nov 30 12:23:41 2005 -@@ -839,6 +839,7 @@ - ; - else if (hosts_ctl("snmpd", STRING_UNKNOWN, STRING_UNKNOWN, STRING_UNKNOWN)){ - snmp_log(allow_severity, "Connection from <UNKNOWN> (%s)\n", addr_string); -+ SNMP_FREE(addr_string); - addr_string = strdup("<UNKNOWN>"); - } else { - snmp_log(deny_severity, "Connection from <UNKNOWN> (%s) REFUSED\n", addr_string); 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-snmp_vars.c b/net-mgmt/net-snmp-devel/files/patch-snmp_vars.c deleted file mode 100644 index 5004187b2108..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-snmp_vars.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/snmp_vars.c.orig Mon Jan 24 09:12:09 2005 -+++ agent/snmp_vars.c Mon Jan 24 09:12:23 2005 -@@ -136,10 +136,6 @@ - #include <inet/mib2.h> - #endif - --#if HAVE_DMALLOC_H --#include <dmalloc.h> --#endif -- - #include <net-snmp/net-snmp-includes.h> - #include <net-snmp/agent/net-snmp-agent-includes.h> - #include <net-snmp/agent/mib_modules.h> diff --git a/net-mgmt/net-snmp-devel/files/patch-snmpd.8.def b/net-mgmt/net-snmp-devel/files/patch-snmpd.8.def deleted file mode 100644 index ac853823ca25..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-snmpd.8.def +++ /dev/null @@ -1,13 +0,0 @@ ---- man/snmpd.8.def.orig Wed Feb 26 04:11:19 2003 -+++ man/snmpd.8.def Sat Mar 29 22:05:07 2003 -@@ -211,6 +211,10 @@ - the error "Error opening specified endpoint". Likewise, since AAL5 - PVC support is only currently available on Linux, it will fail with - the same error on other platforms. -+.PP -+.B snmpd -+uses libwrap's access control if configured by --with-libwrap. -+Access control patterns may only reference IP addresses. - - .RE - .SH CONFIGURATION FILES 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-subagent.c b/net-mgmt/net-snmp-devel/files/patch-subagent.c deleted file mode 100644 index f198c4da7990..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-subagent.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/mibgroup/agentx/subagent.c.orig Mon Jan 24 09:17:08 2005 -+++ agent/mibgroup/agentx/subagent.c Mon Jan 24 09:17:12 2005 -@@ -36,10 +36,6 @@ - #include <netinet/in.h> - #endif - --#if HAVE_DMALLOC_H --#include <dmalloc.h> --#endif -- - #include <net-snmp/net-snmp-includes.h> - #include <net-snmp/agent/net-snmp-agent-includes.h> - #include <net-snmp/library/snmp_assert.h> diff --git a/net-mgmt/net-snmp-devel/files/patch-sysORTable.c b/net-mgmt/net-snmp-devel/files/patch-sysORTable.c deleted file mode 100644 index e48aa29e5c86..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-sysORTable.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/mibgroup/mibII/sysORTable.c.orig Mon Jan 24 08:27:58 2005 -+++ agent/mibgroup/mibII/sysORTable.c Mon Jan 24 08:28:10 2005 -@@ -34,10 +34,6 @@ - #include <netinet/in.h> - #endif - --#if HAVE_DMALLOC_H --#include <dmalloc.h> --#endif -- - #include <net-snmp/net-snmp-includes.h> - #include <net-snmp/agent/net-snmp-agent-includes.h> - #include <net-snmp/agent/agent_callbacks.h> 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 874acac2f086..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 Wed Dec 8 19:34:06 2004 -+++ include/net-snmp/library/transform_oids.h Wed Dec 8 19:34:34 2004 -@@ -23,6 +23,8 @@ - /* XXX: OIDs not defined yet */ - extern oid usmAESPrivProtocol[10]; /* == { 1,3,6,1,6,3,10,1,2,4 }; */ - extern oid *usmAES128PrivProtocol; /* backwards compat */ -+extern oid *usmAES192PrivProtocol; /* backwards compat */ -+extern 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/patch-ucd_snmp.h b/net-mgmt/net-snmp-devel/files/patch-ucd_snmp.h deleted file mode 100644 index 2690553112a1..000000000000 --- a/net-mgmt/net-snmp-devel/files/patch-ucd_snmp.h +++ /dev/null @@ -1,11 +0,0 @@ ---- agent/mibgroup/ucd_snmp.h.orig Mon Oct 25 21:36:55 2004 -+++ agent/mibgroup/ucd_snmp.h Mon Oct 25 21:37:20 2004 -@@ -39,6 +39,8 @@ - config_arch_require(freebsd4, ucd-snmp/memory_freebsd2) - config_arch_require(freebsd5, ucd-snmp/vmstat_freebsd2) - config_arch_require(freebsd5, ucd-snmp/memory_freebsd2) -+config_arch_require(freebsd6, ucd-snmp/vmstat_freebsd2) -+config_arch_require(freebsd6, ucd-snmp/memory_freebsd2) - config_arch_require(netbsd1, ucd-snmp/vmstat_netbsd1) - config_arch_require(netbsd1, ucd-snmp/memory_netbsd1) - config_arch_require(openbsd2, ucd-snmp/vmstat_netbsd1) diff --git a/net-mgmt/net-snmp-devel/files/snmpd.sh.sample b/net-mgmt/net-snmp-devel/files/snmpd.sh.sample deleted file mode 100644 index 062017469936..000000000000 --- a/net-mgmt/net-snmp-devel/files/snmpd.sh.sample +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# 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-"-p /var/run/snmpd.pid"} - -. %%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=/var/run/${name}.pid -sig_stop=-KILL - -load_rc_config ${name} -run_rc_command "$1" diff --git a/net-mgmt/net-snmp-devel/files/snmptrapd.sh.sample b/net-mgmt/net-snmp-devel/files/snmptrapd.sh.sample deleted file mode 100644 index 35821ee9e973..000000000000 --- a/net-mgmt/net-snmp-devel/files/snmptrapd.sh.sample +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# 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 4a213e367a42..000000000000 --- a/net-mgmt/net-snmp-devel/pkg-message +++ /dev/null @@ -1,26 +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 -p /var/run/snmpd.pid" - 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 bb9716891e18..000000000000 --- a/net-mgmt/net-snmp-devel/pkg-plist +++ /dev/null @@ -1,433 +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/snmpnetstat53 -bin/snmpset -bin/snmpstatus -bin/snmptable -bin/snmptest -bin/snmptranslate -bin/snmptrap -bin/snmpusm -bin/snmpvacm -bin/snmpwalk -%%WITH_TKMIB%%bin/tkmib -bin/traptoemail -etc/rc.d/snmpd.sh -etc/rc.d/snmptrapd.sh -@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/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/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/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_locking.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_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/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/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/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.6.h -include/net-snmp/system/solaris2.7.h -include/net-snmp/system/solaris2.8.h -include/net-snmp/system/solaris2.9.h -include/net-snmp/system/solaris2.10.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/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/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-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-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 -%%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 -@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 diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile deleted file mode 100644 index 3e3a709d7866..000000000000 --- a/net-mgmt/net-snmp53/Makefile +++ /dev/null @@ -1,276 +0,0 @@ -# New ports collection makefile for: ucd-snmp -# Date created: 26 June 1996 -# Whom: gpalmer -# -# $FreeBSD$ -# - -PORTNAME= snmp -PORTVERSION= 5.2.2 -PORTREVISION= 1 -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 -PATCH_DEPENDS= ${LIBTOOL_DEPENDS} - -USE_REINPLACE= yes -USE_AUTOTOOLS= autoconf:259 libtool:15 -USE_RC_SUBR= yes -USE_OPENSSL= yes -INSTALLS_SHLIB= yes -.if !defined(WITHOUT_PERL) -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="-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 ${OSVERSION} >= 400014 && !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= 9 -PLIST_SUB+= SHLIB_VERSION=${SHLIB_VERSION} -SCRIPTS_SUB= PREFIX=${PREFIX} PERL=${PERL} -RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} - -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 -_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= mib2c.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 -MAN3= add_mibdir.3 add_module_replacement.3 default_store.3 \ - get_module_node.3 init_mib.3 init_mib_internals.3 mib_api.3 \ - netsnmp_agent.3 netsnmp_bulk_to_next.3 netsnmp_debug.3 \ - netsnmp_example_scalar_int.3 netsnmp_handler.3 \ - netsnmp_instance.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_scalar.3 \ - netsnmp_serialize.3 netsnmp_table.3 netsnmp_table_array.3 \ - netsnmp_table_data.3 netsnmp_table_dataset.3 \ - netsnmp_table_iterator.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_mib.3 \ - read_module.3 read_module_node.3 read_objid.3 shutdown_mib.3 \ - snmp_agent_api.3 snmp_alarm.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 \ - netsnmp_Container_iterator.3 \ - netsnmp_baby_steps.3 \ - netsnmp_cache_handler.3 netsnmp_container.3 \ - netsnmp_iterator_info_s.3 \ - netsnmp_leaf.3 \ - netsnmp_row_merge.3 netsnmp_scalar_group_group.3 \ - netsnmp_stash_cache.3 netsnmp_utilities.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 \ - snmptrapd.conf.5 variables.5 -MAN8= snmpd.8 snmptrapd.8 - -BIN_FILES= snmpbulkwalk snmpget snmpgetnext snmpnetstat53 snmpset \ - snmpstatus snmptest snmptranslate snmptrap snmpwalk -SBIN_FILES= snmpd snmptrapd -STARTUP_DIR= ${PREFIX}/etc/rc.d -STARTUP_FILES= snmpd.sh snmptrapd.sh -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 - -pre-everything:: - @${ECHO_MSG} - @${ECHO_MSG} "You may use the following build options:" - @${ECHO_MSG} - @${ECHO_MSG} "WITH_INETADDRESS_HACK=yes builds with the inetaddress hack" - @${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: patch-autoconf patch-script-files patch-startup-files - -patch-autoconf: - @${AWK} '/@synopsis/,/taken from libtool.m4/' ${WRKSRC}/aclocal.m4 > ${WRKSRC}/aclocal.m4.tmp - @${CAT} ${LIBTOOL_M4} >> ${WRKSRC}/aclocal.m4.tmp - @${CP} ${LTMAIN} ${WRKSRC} - @${MV} ${WRKSRC}/aclocal.m4.tmp ${WRKSRC}/aclocal.m4 - -patch-script-files: -.for filename in ${SCRIPT_FILES} - @${REINPLACE_CMD} ${SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${WRKSRC}/local/${filename} -.endfor - -patch-startup-files: -.for filename in ${STARTUP_FILES} - @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/${filename}.sample > ${WRKDIR}/${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) = .*!\1 = ${MAN3PERLPREFIX}/man/man3!; \ - s! doc_(perl|site|\$$\(INSTALLDIRS\))_install$$!!; \ - ' -.else - ${REINPLACE_CMD} -e 's| perlinstall||' ${WRKSRC}/Makefile -.endif - -post-install: strip-files install-startup-files install-config-files install-doc-files display-message - -strip-files: - @cd ${PREFIX}/bin; ${STRIP_CMD} ${BIN_FILES} - @cd ${PREFIX}/sbin; ${STRIP_CMD} ${SBIN_FILES} - -install-startup-files: -.for filename in ${STARTUP_FILES} - @${INSTALL_SCRIPT} ${WRKDIR}/${filename} ${STARTUP_DIR} -.endfor - -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,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/ethereal,net/ifstat,net/quagga,net/rtg,net/tethereal,security/libfwbuilder,sysutils/apcupsd,sysutils/jailadmin,sysutils/nut - -.include <bsd.port.post.mk> diff --git a/net-mgmt/net-snmp53/distinfo b/net-mgmt/net-snmp53/distinfo deleted file mode 100644 index e3befea5bb8d..000000000000 --- a/net-mgmt/net-snmp53/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (net-snmp-5.2.2.tar.gz) = 2d9cdf956d6be5c5fcf2f898b403389b -SHA256 (net-snmp-5.2.2.tar.gz) = ed5cc617e4cfe38af64a3ded8542c4e61d045dbeec00d5b93a31afc3337135fd -SIZE (net-snmp-5.2.2.tar.gz) = 3919826 diff --git a/net-mgmt/net-snmp53/files/extra-patch-local:Makefile.in b/net-mgmt/net-snmp53/files/extra-patch-local:Makefile.in deleted file mode 100644 index 50a941bffa3a..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/files/patch-Makefile.in b/net-mgmt/net-snmp53/files/patch-Makefile.in deleted file mode 100644 index f5631707a352..000000000000 --- a/net-mgmt/net-snmp53/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Tue Oct 11 20:49:23 2005 -+++ Makefile.in Wed Nov 30 11:35:12 2005 -@@ -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 freebsd5.h freebsd6.h \ -+ darwin.h darwin7.h darwin8.h freebsd5.h freebsd6.h freebsd7.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.6.h solaris2.7.h solaris2.8.h solaris2.9.h solaris2.10.h \ diff --git a/net-mgmt/net-snmp53/files/patch-agent_index.c b/net-mgmt/net-snmp53/files/patch-agent_index.c deleted file mode 100644 index d6254de2148e..000000000000 --- a/net-mgmt/net-snmp53/files/patch-agent_index.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/agent_index.c.orig Mon Jan 24 09:14:39 2005 -+++ agent/agent_index.c Mon Jan 24 09:14:55 2005 -@@ -39,10 +39,6 @@ - #include <netinet/in.h> - #endif - --#if HAVE_DMALLOC_H --#include <dmalloc.h> --#endif -- - #include <net-snmp/net-snmp-includes.h> - #include <net-snmp/agent/net-snmp-agent-includes.h> - #include <net-snmp/agent/agent_callbacks.h> diff --git a/net-mgmt/net-snmp53/files/patch-agent_read_config.c b/net-mgmt/net-snmp53/files/patch-agent_read_config.c deleted file mode 100644 index d38b96de7668..000000000000 --- a/net-mgmt/net-snmp53/files/patch-agent_read_config.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/agent_read_config.c.orig Mon Jan 24 09:12:58 2005 -+++ agent/agent_read_config.c Mon Jan 24 09:13:13 2005 -@@ -84,10 +84,6 @@ - #include <inet/mib2.h> - #endif - --#if HAVE_DMALLOC_H --#include <dmalloc.h> --#endif -- - #if HAVE_UNISTD_H - #include <unistd.h> - #endif diff --git a/net-mgmt/net-snmp53/files/patch-agent_registry.c b/net-mgmt/net-snmp53/files/patch-agent_registry.c deleted file mode 100644 index 4eab10a699f9..000000000000 --- a/net-mgmt/net-snmp53/files/patch-agent_registry.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/agent_registry.c.orig Mon Jan 24 09:14:00 2005 -+++ agent/agent_registry.c Mon Jan 24 09:14:08 2005 -@@ -51,10 +51,6 @@ - #include <netinet/in.h> - #endif - --#if HAVE_DMALLOC_H --#include <dmalloc.h> --#endif -- - #include <net-snmp/net-snmp-includes.h> - #include <net-snmp/agent/net-snmp-agent-includes.h> - #include <net-snmp/agent/agent_callbacks.h> diff --git a/net-mgmt/net-snmp53/files/patch-at.c b/net-mgmt/net-snmp53/files/patch-at.c deleted file mode 100644 index 363f1b07991e..000000000000 --- a/net-mgmt/net-snmp53/files/patch-at.c +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/mibgroup/mibII/at.c.orig Mon Jan 24 09:08:41 2005 -+++ agent/mibgroup/mibII/at.c Mon Jan 24 09:08:58 2005 -@@ -90,9 +90,6 @@ - #if HAVE_WINSOCK_H - #include <winsock.h> - #endif --#if HAVE_DMALLOC_H --#include <dmalloc.h> --#endif - - #ifdef hpux11 - #include <sys/mib.h> diff --git a/net-mgmt/net-snmp53/files/patch-auto_nlist.c b/net-mgmt/net-snmp53/files/patch-auto_nlist.c deleted file mode 100644 index c15443a03afd..000000000000 --- a/net-mgmt/net-snmp53/files/patch-auto_nlist.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/auto_nlist.c.orig Mon Jan 24 09:11:07 2005 -+++ agent/auto_nlist.c Mon Jan 24 09:11:24 2005 -@@ -21,10 +21,6 @@ - #include <kvm.h> - #endif - --#if HAVE_DMALLOC_H --#include <dmalloc.h> --#endif -- - #include <net-snmp/agent/auto_nlist.h> - #include "autonlist.h" - #include "kernel.h" diff --git a/net-mgmt/net-snmp53/files/patch-callback.c b/net-mgmt/net-snmp53/files/patch-callback.c deleted file mode 100644 index 840d12c0d881..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/files/patch-configure.in b/net-mgmt/net-snmp53/files/patch-configure.in deleted file mode 100644 index 172adf21bf2b..000000000000 --- a/net-mgmt/net-snmp53/files/patch-configure.in +++ /dev/null @@ -1,38 +0,0 @@ ---- configure.in.orig Tue Nov 29 14:16:55 2005 -+++ configure.in Wed Nov 30 11:49:24 2005 -@@ -2075,7 +2075,7 @@ - # fall back - CFLAG="-f" - fi --for i in /vmunix /hp-ux /stand/vmunix /dev/ksyms /kernel/unix /kernel/genunix /netbsd /unix /kernel /bsd /mach_kernel -+for i in /vmunix /hp-ux /stand/vmunix /dev/ksyms /kernel/unix /kernel/genunix /netbsd /unix /kernel /bsd /mach_kernel /boot/kernel/kernel /dev/null - do - if test -f $i -o $CFLAG $i; then - ac_cv_KERNEL_LOC="$i" -@@ -2989,6 +2989,26 @@ - # checking for 4.3 vs 4.4 rtentry. - AC_CACHE_CHECK(type of rtentry structure,ac_cv_RTENTRY_TYPE, - [ -+ -+dnl 4.4 compatible but renamed on FreeBSD -+AC_TRY_COMPILE([ -+#include <sys/types.h> -+#define KERNEL -+#define _KERNEL -+#include <sys/socket.h> -+#undef KERNEL -+#undef _KERNEL -+#include <net/route.h> -+],[ -+ -+#ifndef STRUCT_RTENTRY_HAS_RT_DST -+#define rt_dst rt_nodes->rn_key -+#endif -+ -+ struct rtentry rt; -+ rt.rt_nodes[0].rn_bit = 1; -+ rt.rt_dst; -+ ], ac_cv_RTENTRY_TYPE="BSD-4.4") - - # 4.4 compat - AC_TRY_COMPILE([ diff --git a/net-mgmt/net-snmp53/files/patch-default_store.c b/net-mgmt/net-snmp53/files/patch-default_store.c deleted file mode 100644 index 076ecec1431e..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/files/patch-freebsd5.h b/net-mgmt/net-snmp53/files/patch-freebsd5.h deleted file mode 100644 index 8bc6de2831b5..000000000000 --- a/net-mgmt/net-snmp53/files/patch-freebsd5.h +++ /dev/null @@ -1,10 +0,0 @@ ---- include/net-snmp/system/freebsd5.h.orig Wed Sep 1 00:13:46 2004 -+++ include/net-snmp/system/freebsd5.h Wed Sep 1 00:13:57 2004 -@@ -7,6 +7,7 @@ - #define freebsd3 1 - /* freebsd5 is a superset of freebsd4 */ - #define freebsd4 1 -+#define freebsd5 1 - - #undef IFADDR_SYMBOL - #define IFADDR_SYMBOL "in_ifaddrhead" diff --git a/net-mgmt/net-snmp53/files/patch-freebsd7.h b/net-mgmt/net-snmp53/files/patch-freebsd7.h deleted file mode 100644 index 72f325d12ba3..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/files/patch-hr_storage.c b/net-mgmt/net-snmp53/files/patch-hr_storage.c deleted file mode 100644 index ef250fa6540e..000000000000 --- a/net-mgmt/net-snmp53/files/patch-hr_storage.c +++ /dev/null @@ -1,221 +0,0 @@ ---- agent/mibgroup/host/hr_storage.c.orig Fri Oct 7 07:55:23 2005 -+++ agent/mibgroup/host/hr_storage.c Wed Nov 30 12:01:05 2005 -@@ -233,6 +233,10 @@ - void sol_get_swapinfo(int *, int *); - #endif - -+#if defined(__FreeBSD__) && __FreeBSD_version >= 500102 -+void collect_mbuf(long *long_mbuf, long *long_mbufc); -+#endif -+ - #define HRSTORE_MEMSIZE 1 - #define HRSTORE_INDEX 2 - #define HRSTORE_TYPE 3 -@@ -472,7 +476,8 @@ - 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 */ - }; - - -@@ -611,6 +616,7 @@ - storage_type_id[storage_type_len - 1] = 3; /* Virtual Mem */ - break; - case HRS_TYPE_MBUF: -+ case HRS_TYPE_MBUFCLUSTER: - storage_type_id[storage_type_len - 1] = 1; /* Other */ - break; - default: -@@ -704,7 +710,7 @@ - long_return = memory_totals.t_vm; - #endif - break; --#else /* !linux && !solaris2 && !hpux10 && !hpux11 && ... */ -+#else - case HRS_TYPE_MEM: - long_return = physmem; - break; -@@ -726,13 +732,45 @@ - i++) - long_return += mbstat.m_mtypes[i]; - #elif defined(MBSTAT_SYMBOL) && defined(STRUCT_MBSTAT_HAS_M_MBUFS) -+#if !defined(__FreeBSD__) || __FreeBSD_version < 500021 - long_return = mbstat.m_mbufs; -+#elif defined(__FreeBSD__) && __FreeBSD_version < 500024 -+ /* mbuf stats disabled */ -+ return NULL; -+#elif defined(__FreeBSD__) -+ { -+ size_t mlen = sizeof(int); -+ int nmbufs; -+ if (sysctlbyname("kern.ipc.nmbufs", &nmbufs, &mlen, -+ NULL, 0) < 0) { -+ return NULL; -+ } -+ long_return = nmbufs; -+ break; -+ } -+#else -+#error "XXX" -+ /* XXX TODO: implement new method */ -+ return NULL; -+#endif /* __FreeBSD__ */ - #elif defined(NO_DUMMY_VALUES) - goto try_next; - #else - long_return = 0; - #endif - break; -+#if defined(__FreeBSD__) && __FreeBSD_version >= 500024 -+ case HRS_TYPE_MBUFCLUSTER: { -+ size_t mlen = sizeof(int); -+ int nmbclusters; -+ if (sysctlbyname("kern.ipc.nmbclusters", &nmbclusters, &mlen, -+ NULL, 0) < 0) { -+ return NULL; -+ } -+ long_return = nmbclusters; -+ break; -+ } -+#endif - default: - #if NO_DUMMY_VALUES - goto try_next; -@@ -796,6 +834,12 @@ - #endif - #elif defined(MBSTAT_SYMBOL) && defined(STRUCT_MBSTAT_HAS_M_CLUSTERS) - long_return = mbstat.m_clusters - mbstat.m_clfree; /* unlikely, but... */ -+#elif defined(__FreeBSD__) && __FreeBSD_version < 500102 -+ /* mbuf stats disabled */ -+ return NULL; -+#elif defined(__FreeBSD__) -+ collect_mbuf((long*)&long_return, (long*)NULL); -+ break; - #elif defined(NO_DUMMY_VALUES) - goto try_next; - #else -@@ -803,6 +847,11 @@ - #endif - break; - #endif /* !linux && !solaris2 && !hpux10 && !hpux11 && ... */ -+#if defined(__FreeBSD__) && __FreeBSD_version >= 500102 -+ case HRS_TYPE_MBUFCLUSTER: -+ collect_mbuf(NULL, &long_return); -+ break; -+#endif - default: - #if NO_DUMMY_VALUES - goto try_next; -@@ -829,7 +878,11 @@ - break; - #if !defined(linux) && !defined(solaris2) && !defined(hpux10) && !defined(hpux11) && defined(MBSTAT_SYMBOL) - case HRS_TYPE_MBUF: -+#if defined(__FreeBSD__) && __FreeBSD_version >= 502113 -+ long_return = mbstat.m_mcfail + mbstat.m_mpfail; -+#else - long_return = mbstat.m_drops; -+#endif - break; - #endif /* !linux && !solaris2 && !hpux10 && !hpux11 && MBSTAT_SYMBOL */ - default: -@@ -955,3 +1008,97 @@ - *usedP = ainfo.ani_resv; - } - #endif /* solaris2 */ -+ -+#if defined(__FreeBSD__) && __FreeBSD_version >= 500102 -+void -+collect_mbuf(long *long_mbuf, long *long_mbufc) -+{ -+#if __FreeBSD_version >= 502113 -+ size_t mlen; -+ struct mbstat mbstat; -+ -+ mlen = sizeof mbstat; -+ if (sysctlbyname("kern.ipc.mbstat", &mbstat, &mlen, NULL, 0) < 0) { -+ warn("sysctl: retrieving mbstat"); -+ return; -+ } -+ if (mbstat.m_mbufs < 0) mbstat.m_mbufs = 0; /* XXX */ -+ if (mbstat.m_mclusts < 0) mbstat.m_mclusts = 0; /* XXX */ -+ if (long_mbuf) { -+ *long_mbuf = mbstat.m_mbufs; -+ } -+ if (long_mbufc) { -+ *long_mbufc = mbstat.m_mclusts; -+ } -+#else -+ int i, j, num_objs; -+ size_t mlen; -+ u_long totused[2]; -+ u_long totnum, totfree; -+ struct mbstat mbstat; -+ struct mbpstat **mbpstat = NULL; -+ -+ if (sysctlbyname("kern.ipc.mb_statpcpu", NULL, &mlen, NULL, 0) < 0) { -+ warn("sysctl: retrieving mb_statpcpu len"); -+ goto err; -+ } -+ num_objs = (int)(mlen / sizeof(struct mbpstat)); -+ if ((mbpstat = calloc(num_objs, sizeof(struct mbpstat *))) == NULL) { -+ warn("calloc: cannot allocate memory for mbpstats pointers"); -+ goto err; -+ } -+ if ((mbpstat[0] = calloc(num_objs, sizeof(struct mbpstat))) == NULL) { -+ warn("calloc: cannot allocate memory for mbpstats"); -+ goto err; -+ } -+ -+ if (sysctlbyname("kern.ipc.mb_statpcpu", mbpstat[0], &mlen, NULL, 0) < 0) { -+ warn("sysctl: retrieving mb_statpcpu"); -+ goto err; -+ } -+ mlen = sizeof mbstat; -+ if (sysctlbyname("kern.ipc.mbstat", &mbstat, &mlen, NULL, 0) < 0) { -+ warn("sysctl: retrieving mbstat"); -+ goto err; -+ } -+ -+ for (i = 0; i < num_objs; i++) -+ mbpstat[i] = mbpstat[0] + i; -+ -+#define GENLST (num_objs - 1) -+ -+ totnum = mbpstat[GENLST]->mb_mbbucks * mbstat.m_mbperbuck; -+ totfree = mbpstat[GENLST]->mb_mbfree; -+ for (i = 0; i < (num_objs - 1); i++) { -+ if (mbpstat[i]->mb_active == 0) -+ continue; -+ totnum += mbpstat[i]->mb_mbbucks * mbstat.m_mbperbuck; -+ totfree += mbpstat[i]->mb_mbfree; -+ } -+ totused[0] = totnum - totfree; -+ totnum = mbpstat[GENLST]->mb_clbucks * mbstat.m_clperbuck; -+ totfree = mbpstat[GENLST]->mb_clfree; -+ for (i = 0; i < (num_objs - 1); i++) { -+ if (mbpstat[i]->mb_active == 0) -+ continue; -+ totnum += mbpstat[i]->mb_clbucks * mbstat.m_clperbuck; -+ totfree += mbpstat[i]->mb_clfree; -+ } -+ totused[1] = totnum - totfree; -+ -+ if (long_mbuf) { -+ *long_mbuf = totused[0]; -+ } -+ if (long_mbufc) { -+ *long_mbufc = totused[1]; -+ } -+ -+ err: -+ if (mbpstat != NULL) { -+ if (mbpstat[0] != NULL) -+ free(mbpstat[0]); -+ free(mbpstat); -+ } -+#endif -+} -+#endif diff --git a/net-mgmt/net-snmp53/files/patch-hr_storage.h b/net-mgmt/net-snmp53/files/patch-hr_storage.h deleted file mode 100644 index a14eb9f1043c..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/files/patch-hr_swrun.c b/net-mgmt/net-snmp53/files/patch-hr_swrun.c deleted file mode 100644 index 8f709c2f9a2a..000000000000 --- a/net-mgmt/net-snmp53/files/patch-hr_swrun.c +++ /dev/null @@ -1,78 +0,0 @@ ---- agent/mibgroup/host/hr_swrun.c.orig Thu Oct 20 04:32:20 2005 -+++ agent/mibgroup/host/hr_swrun.c Wed Nov 30 12:50:12 2005 -@@ -585,7 +585,7 @@ - string[ sizeof(string)-1 ] = 0; - #endif - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - strcpy(string, proc_table[LowProcIndex].ki_comm); - #else - strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); -@@ -698,7 +698,7 @@ - *cp1 = 0; - #endif - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - strcpy(string, proc_table[LowProcIndex].ki_comm); - #else - strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); -@@ -868,8 +868,23 @@ - if (pid < PID_MAXSYS) - long_return = 2; /* operatingSystem */ - else --#endif - long_return = 4; /* application */ -+#elif HAVE_KVM_GETPROCS -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 -+ if (proc_table[LowProcIndex].ki_flag & P_SYSTEM) { -+ if (proc_table[LowProcIndex].ki_pri.pri_class == PRI_ITHD) -+ long_return = 3;/* deviceDriver */ -+ else -+ long_return = 2;/* operatingSystem */ -+ } else -+ long_return = 4; /* application */ -+#else -+ if (proc_table[LowProcIndex].kp_proc.p_flag & P_SYSTEM) -+ long_return = 2; /* operatingSystem */ -+ else -+ long_return = 4; /* application */ -+#endif -+#endif - return (u_char *) & long_return; - case HRSWRUN_STATUS: - #if defined(cygwin) -@@ -901,7 +916,7 @@ - } - #else - #if HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - switch (proc_table[LowProcIndex].ki_stat) { - #else - switch (proc_table[LowProcIndex].kp_proc.p_stat) { -@@ -1000,7 +1015,13 @@ - long_return = proc_buf->p_utime * 100 + proc_buf->p_stime * 100; - #endif - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 -+ /* XXX: Accessing ki_paddr causes sig10 ... -+ long_return = proc_table[LowProcIndex].ki_paddr->p_uticks + -+ proc_table[LowProcIndex].ki_paddr->p_sticks + -+ proc_table[LowProcIndex].ki_paddr->p_iticks; */ -+ long_return = 0; -+ #elif defined(freebsd5) - long_return = proc_table[LowProcIndex].ki_runtime / 100000; - #else - long_return = proc_table[LowProcIndex].kp_proc.p_uticks + -@@ -1365,7 +1386,7 @@ - #elif defined(solaris2) - return proc_table[current_proc_entry++]; - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - if (proc_table[current_proc_entry].ki_stat != 0) - return proc_table[current_proc_entry++].ki_pid; - #else diff --git a/net-mgmt/net-snmp53/files/patch-hr_system.c b/net-mgmt/net-snmp53/files/patch-hr_system.c deleted file mode 100644 index f2d810ac0771..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/files/patch-interface_ioctl.c b/net-mgmt/net-snmp53/files/patch-interface_ioctl.c deleted file mode 100644 index 4939166949be..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/files/patch-interfaces.c b/net-mgmt/net-snmp53/files/patch-interfaces.c deleted file mode 100644 index 37cc368ab1c9..000000000000 --- a/net-mgmt/net-snmp53/files/patch-interfaces.c +++ /dev/null @@ -1,293 +0,0 @@ ---- agent/mibgroup/mibII/interfaces.c.orig Tue Jan 4 00:51:32 2005 -+++ agent/mibgroup/mibII/interfaces.c Thu Apr 7 11:47:45 2005 -@@ -399,6 +399,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; -@@ -607,10 +734,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; -@@ -2250,129 +2387,17 @@ - u_char *var_ifEntry(struct variable *, oid *, size_t *, int, - size_t *, WriteMethod ** write); - --static char *physaddrbuf; --static int nphysaddrs; --struct sockaddr_dl **physaddrs; -- - void --init_interfaces_setup(void) -+Interface_Scan_Init(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 -+Interface_Scan_Next(short *Index, -+ char *Name, -+ struct ifnet *Retifnet, struct in_ifaddr *Retin_ifaddr) - { -- 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; -+ return 0; - } - - int diff --git a/net-mgmt/net-snmp53/files/patch-ipv6.c b/net-mgmt/net-snmp53/files/patch-ipv6.c deleted file mode 100644 index 29e2de99aa97..000000000000 --- a/net-mgmt/net-snmp53/files/patch-ipv6.c +++ /dev/null @@ -1,603 +0,0 @@ ---- agent/mibgroup/mibII/ipv6.c.orig Thu Jul 8 05:31:54 2004 -+++ agent/mibgroup/mibII/ipv6.c Mon Oct 25 08:32:31 2004 -@@ -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 -@@ -575,7 +590,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__) -@@ -806,7 +821,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__) -@@ -827,7 +842,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__) -@@ -1220,32 +1235,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; -@@ -1274,9 +1290,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) -@@ -1284,31 +1301,32 @@ - ) { - DEBUGMSGTL(("mibII/ipv6", "looping: p=%x\n", p)); - --#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -- if (klookup((u_long) p, (char *) &in6pcb, sizeof(in6pcb)) < 0) { -+#if OS_NOT_FREEBSD_NOR_DARWIN -+ if (klookup((u_long) p, (char *) &tstpcb, sizeof(tstpcb)) < 0) { - 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*/ -@@ -1319,7 +1337,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++; -@@ -1330,7 +1348,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++; -@@ -1338,15 +1356,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)); -@@ -1354,7 +1372,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 */ - -@@ -1367,14 +1385,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; -@@ -1392,24 +1410,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) { -@@ -1431,11 +1449,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; -@@ -1464,9 +1482,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) -@@ -1474,41 +1493,41 @@ - ) { - DEBUGMSGTL(("mibII/ipv6", "looping: p=%x\n", p)); - --#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -- if (klookup((u_long) p, (char *) &in6pcb, sizeof(in6pcb)) < 0) { -+#if OS_NOT_FREEBSD_NOR_DARWIN -+ if (klookup((u_long) p, (char *) &tstpcb, sizeof(tstpcb)) < 0) { - 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_IPV6PROTO)) - goto skip; - #endif - if (klookup -- ((u_long) in6pcb.in6p_ppcb, (char *) &tcp6cb, sizeof(tcp6cb)) -+ ((u_long) tstpcb.in6p_ppcb, (char *) &tcp6cb, sizeof(tcp6cb)) - < 0) { - 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]; -@@ -1519,13 +1538,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++; -@@ -1536,7 +1555,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++; -@@ -1544,15 +1563,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)); -@@ -1573,20 +1592,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; -@@ -1633,22 +1652,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: ")); -@@ -1688,9 +1708,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) -@@ -1698,41 +1718,41 @@ - ) { - DEBUGMSGTL(("mibII/ipv6", "looping: p=%x\n", p)); - --#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin) -- if (klookup((u_long) p, (char *) &in6pcb, sizeof(in6pcb)) < 0) { -+#if OS_NOT_FREEBSD_NOR_DARWIN -+ if (klookup((u_long) p, (char *) &tstpcb, sizeof(in6pcb)) < 0) { - 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_IPV6PROTO)) - goto skip; - #endif - if (klookup -- ((u_long) in6pcb.in6p_ppcb, (char *) &tcpcb, sizeof(tcpcb)) -+ ((u_long) tstpcb.in6p_ppcb, (char *) &tcpcb, sizeof(tcpcb)) - < 0) { -- DEBUGMSGTL(("mibII/ipv6", "klookup fail for tcb6.tcpcb at %x\n", -- in6pcb.in6p_ppcb)); -+ DEBUGMSGTL(("mibII/ipv6", "klookup fail for tcb6.tcp6cb at %x\n", -+ 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); -@@ -1743,12 +1763,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++; -@@ -1759,7 +1779,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++; -@@ -1767,15 +1787,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)); -@@ -1783,7 +1803,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 */ - -@@ -1796,20 +1816,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-snmp53/files/patch-keytools.c b/net-mgmt/net-snmp53/files/patch-keytools.c deleted file mode 100644 index b6bf51299bd9..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/files/patch-lcd_time.c b/net-mgmt/net-snmp53/files/patch-lcd_time.c deleted file mode 100644 index 60d00ac6a960..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/files/patch-local:fixproc b/net-mgmt/net-snmp53/files/patch-local:fixproc deleted file mode 100644 index fa0f3fb65767..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/files/patch-local:ipf-mod.pl b/net-mgmt/net-snmp53/files/patch-local:ipf-mod.pl deleted file mode 100644 index 8bf98d4f1d52..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/files/patch-local:mib2c b/net-mgmt/net-snmp53/files/patch-local:mib2c deleted file mode 100644 index a0a2ce336f86..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/files/patch-local:snmpcheck.def b/net-mgmt/net-snmp53/files/patch-local:snmpcheck.def deleted file mode 100644 index 4f3b4a2491da..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/files/patch-local:snmpconf b/net-mgmt/net-snmp53/files/patch-local:snmpconf deleted file mode 100644 index f2a0b11cf75e..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/files/patch-local:tkmib b/net-mgmt/net-snmp53/files/patch-local:tkmib deleted file mode 100644 index 3278d27c3809..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/files/patch-local:traptoemail b/net-mgmt/net-snmp53/files/patch-local:traptoemail deleted file mode 100644 index 402506b540c6..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/files/patch-master.c b/net-mgmt/net-snmp53/files/patch-master.c deleted file mode 100644 index 12e553acc8e0..000000000000 --- a/net-mgmt/net-snmp53/files/patch-master.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/mibgroup/agentx/master.c.orig Mon Jan 24 09:16:00 2005 -+++ agent/mibgroup/agentx/master.c Mon Jan 24 09:16:21 2005 -@@ -39,10 +39,6 @@ - #endif - #include <errno.h> - --#if HAVE_DMALLOC_H --#include <dmalloc.h> --#endif -- - #if HAVE_UNISTD_H - #include <unistd.h> - #endif diff --git a/net-mgmt/net-snmp53/files/patch-master_admin.c b/net-mgmt/net-snmp53/files/patch-master_admin.c deleted file mode 100644 index cb4767076810..000000000000 --- a/net-mgmt/net-snmp53/files/patch-master_admin.c +++ /dev/null @@ -1,12 +0,0 @@ ---- agent/mibgroup/agentx/master_admin.c.orig Mon Jan 24 09:18:07 2005 -+++ agent/mibgroup/agentx/master_admin.c Mon Jan 24 09:18:15 2005 -@@ -35,9 +35,6 @@ - #if HAVE_SYS_SOCKET_H - #include <sys/socket.h> - #endif --#if HAVE_DMALLOC_H --#include <dmalloc.h> --#endif - - #include <net-snmp/net-snmp-includes.h> - #include <net-snmp/agent/net-snmp-agent-includes.h> diff --git a/net-mgmt/net-snmp53/files/patch-mib.c b/net-mgmt/net-snmp53/files/patch-mib.c deleted file mode 100644 index af73abff4101..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/files/patch-net-snmp-includes.h b/net-mgmt/net-snmp53/files/patch-net-snmp-includes.h deleted file mode 100644 index cfb1dd29e981..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/files/patch-oid_stash.c b/net-mgmt/net-snmp53/files/patch-oid_stash.c deleted file mode 100644 index 7978b27d587f..000000000000 --- a/net-mgmt/net-snmp53/files/patch-oid_stash.c +++ /dev/null @@ -1,13 +0,0 @@ ---- snmplib/oid_stash.c.orig Mon Jan 24 09:43:04 2005 -+++ snmplib/oid_stash.c Mon Jan 24 09:43:14 2005 -@@ -5,10 +5,6 @@ - #include <stdlib.h> - #include <sys/types.h> - --#if HAVE_DMALLOC_H --#include <dmalloc.h> --#endif -- - #include <net-snmp/net-snmp-includes.h> - - /** @defgroup oid_stash Store and retrieve data referenced by an OID. diff --git a/net-mgmt/net-snmp53/files/patch-parse.c b/net-mgmt/net-snmp53/files/patch-parse.c deleted file mode 100644 index 63eb1e023f19..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/files/patch-scapi.c b/net-mgmt/net-snmp53/files/patch-scapi.c deleted file mode 100644 index 2d6711989e35..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/files/patch-snmpTCPIPv6Domain.c b/net-mgmt/net-snmp53/files/patch-snmpTCPIPv6Domain.c deleted file mode 100644 index 365b6f398ebe..000000000000 --- a/net-mgmt/net-snmp53/files/patch-snmpTCPIPv6Domain.c +++ /dev/null @@ -1,30 +0,0 @@ ---- snmplib/snmpTCPIPv6Domain.c.orig Sat Oct 16 03:52:29 2004 -+++ snmplib/snmpTCPIPv6Domain.c Mon Oct 25 09:22:06 2004 -@@ -95,13 +95,21 @@ - if (to == NULL) { - return strdup("TCP/IPv6: unknown"); - } else { -- char addr[INET6_ADDRSTRLEN]; -- char tmp[INET6_ADDRSTRLEN + 8]; -+ char tmp[NI_MAXHOST]; - -- 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(to, sizeof(struct sockaddr_in6), tmp, sizeof(tmp), -+ NULL, 0, NI_NUMERICHOST | NI_WITHSCOPEID)) { -+ return strdup("UDP/IPv6: unknown"); -+ } -+ return strdup(tmp); - } - } - diff --git a/net-mgmt/net-snmp53/files/patch-snmpUCDIPv6Domain.c b/net-mgmt/net-snmp53/files/patch-snmpUCDIPv6Domain.c deleted file mode 100644 index c36abaaba730..000000000000 --- a/net-mgmt/net-snmp53/files/patch-snmpUCDIPv6Domain.c +++ /dev/null @@ -1,30 +0,0 @@ ---- snmplib/snmpUDPIPv6Domain.c.orig Sat Oct 16 03:52:29 2004 -+++ snmplib/snmpUDPIPv6Domain.c Mon Oct 25 09:28:10 2004 -@@ -104,13 +104,21 @@ - if (to == NULL) { - return strdup("UDP/IPv6: unknown"); - } else { -- char addr[INET6_ADDRSTRLEN]; -- char tmp[INET6_ADDRSTRLEN + 8]; -+ char tmp[NI_MAXHOST]; - -- sprintf(tmp, "UDP/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(to, sizeof(struct sockaddr_in6), tmp, sizeof(tmp), -+ NULL, 0, NI_NUMERICHOST | NI_WITHSCOPEID)) { -+ return strdup("UDP/IPv6: unknown"); -+ } -+ return strdup(tmp); - } - } - diff --git a/net-mgmt/net-snmp53/files/patch-snmpUDPDomain.c b/net-mgmt/net-snmp53/files/patch-snmpUDPDomain.c deleted file mode 100644 index 8ed548828d8c..000000000000 --- a/net-mgmt/net-snmp53/files/patch-snmpUDPDomain.c +++ /dev/null @@ -1,11 +0,0 @@ ---- snmplib/snmpUDPDomain.c.orig Mon Jan 24 10:47:16 2005 -+++ snmplib/snmpUDPDomain.c Mon Jan 24 10:47:41 2005 -@@ -88,7 +88,7 @@ - } else { - char tmp[64]; - -- sprintf(tmp, "UDP: [%s]:%hd", -+ sprintf(tmp, "UDP: [%s]:%hu", - inet_ntoa(to->sin_addr), ntohs(to->sin_port)); - return strdup(tmp); - } diff --git a/net-mgmt/net-snmp53/files/patch-snmp_agent.c b/net-mgmt/net-snmp53/files/patch-snmp_agent.c deleted file mode 100644 index a663a5576c56..000000000000 --- a/net-mgmt/net-snmp53/files/patch-snmp_agent.c +++ /dev/null @@ -1,10 +0,0 @@ ---- agent/snmp_agent.c.orig Thu Mar 17 17:17:43 2005 -+++ agent/snmp_agent.c Wed Nov 30 12:23:41 2005 -@@ -839,6 +839,7 @@ - ; - else if (hosts_ctl("snmpd", STRING_UNKNOWN, STRING_UNKNOWN, STRING_UNKNOWN)){ - snmp_log(allow_severity, "Connection from <UNKNOWN> (%s)\n", addr_string); -+ SNMP_FREE(addr_string); - addr_string = strdup("<UNKNOWN>"); - } else { - snmp_log(deny_severity, "Connection from <UNKNOWN> (%s) REFUSED\n", addr_string); diff --git a/net-mgmt/net-snmp53/files/patch-snmp_auth.c b/net-mgmt/net-snmp53/files/patch-snmp_auth.c deleted file mode 100644 index be52a5e4fd36..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/files/patch-snmp_debug.c b/net-mgmt/net-snmp53/files/patch-snmp_debug.c deleted file mode 100644 index 6b24b5354b77..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/files/patch-snmp_logging.c b/net-mgmt/net-snmp53/files/patch-snmp_logging.c deleted file mode 100644 index f66b33d0dd6e..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/files/patch-snmp_transport.c b/net-mgmt/net-snmp53/files/patch-snmp_transport.c deleted file mode 100644 index e1ae87834fe9..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/files/patch-snmp_vars.c b/net-mgmt/net-snmp53/files/patch-snmp_vars.c deleted file mode 100644 index 5004187b2108..000000000000 --- a/net-mgmt/net-snmp53/files/patch-snmp_vars.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/snmp_vars.c.orig Mon Jan 24 09:12:09 2005 -+++ agent/snmp_vars.c Mon Jan 24 09:12:23 2005 -@@ -136,10 +136,6 @@ - #include <inet/mib2.h> - #endif - --#if HAVE_DMALLOC_H --#include <dmalloc.h> --#endif -- - #include <net-snmp/net-snmp-includes.h> - #include <net-snmp/agent/net-snmp-agent-includes.h> - #include <net-snmp/agent/mib_modules.h> diff --git a/net-mgmt/net-snmp53/files/patch-snmpd.8.def b/net-mgmt/net-snmp53/files/patch-snmpd.8.def deleted file mode 100644 index ac853823ca25..000000000000 --- a/net-mgmt/net-snmp53/files/patch-snmpd.8.def +++ /dev/null @@ -1,13 +0,0 @@ ---- man/snmpd.8.def.orig Wed Feb 26 04:11:19 2003 -+++ man/snmpd.8.def Sat Mar 29 22:05:07 2003 -@@ -211,6 +211,10 @@ - the error "Error opening specified endpoint". Likewise, since AAL5 - PVC support is only currently available on Linux, it will fail with - the same error on other platforms. -+.PP -+.B snmpd -+uses libwrap's access control if configured by --with-libwrap. -+Access control patterns may only reference IP addresses. - - .RE - .SH CONFIGURATION FILES diff --git a/net-mgmt/net-snmp53/files/patch-snmpusm.c b/net-mgmt/net-snmp53/files/patch-snmpusm.c deleted file mode 100644 index 4eae56c1a0f0..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/files/patch-subagent.c b/net-mgmt/net-snmp53/files/patch-subagent.c deleted file mode 100644 index f198c4da7990..000000000000 --- a/net-mgmt/net-snmp53/files/patch-subagent.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/mibgroup/agentx/subagent.c.orig Mon Jan 24 09:17:08 2005 -+++ agent/mibgroup/agentx/subagent.c Mon Jan 24 09:17:12 2005 -@@ -36,10 +36,6 @@ - #include <netinet/in.h> - #endif - --#if HAVE_DMALLOC_H --#include <dmalloc.h> --#endif -- - #include <net-snmp/net-snmp-includes.h> - #include <net-snmp/agent/net-snmp-agent-includes.h> - #include <net-snmp/library/snmp_assert.h> diff --git a/net-mgmt/net-snmp53/files/patch-sysORTable.c b/net-mgmt/net-snmp53/files/patch-sysORTable.c deleted file mode 100644 index e48aa29e5c86..000000000000 --- a/net-mgmt/net-snmp53/files/patch-sysORTable.c +++ /dev/null @@ -1,13 +0,0 @@ ---- agent/mibgroup/mibII/sysORTable.c.orig Mon Jan 24 08:27:58 2005 -+++ agent/mibgroup/mibII/sysORTable.c Mon Jan 24 08:28:10 2005 -@@ -34,10 +34,6 @@ - #include <netinet/in.h> - #endif - --#if HAVE_DMALLOC_H --#include <dmalloc.h> --#endif -- - #include <net-snmp/net-snmp-includes.h> - #include <net-snmp/agent/net-snmp-agent-includes.h> - #include <net-snmp/agent/agent_callbacks.h> diff --git a/net-mgmt/net-snmp53/files/patch-tcpTable.c b/net-mgmt/net-snmp53/files/patch-tcpTable.c deleted file mode 100644 index d96d0976189b..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/files/patch-tools.c b/net-mgmt/net-snmp53/files/patch-tools.c deleted file mode 100644 index f24a401ec9e6..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/files/patch-transform_oids.h b/net-mgmt/net-snmp53/files/patch-transform_oids.h deleted file mode 100644 index 874acac2f086..000000000000 --- a/net-mgmt/net-snmp53/files/patch-transform_oids.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/net-snmp/library/transform_oids.h.orig Wed Dec 8 19:34:06 2004 -+++ include/net-snmp/library/transform_oids.h Wed Dec 8 19:34:34 2004 -@@ -23,6 +23,8 @@ - /* XXX: OIDs not defined yet */ - extern oid usmAESPrivProtocol[10]; /* == { 1,3,6,1,6,3,10,1,2,4 }; */ - extern oid *usmAES128PrivProtocol; /* backwards compat */ -+extern oid *usmAES192PrivProtocol; /* backwards compat */ -+extern oid *usmAES256PrivProtocol; /* backwards compat */ - - #define USM_AUTH_PROTO_NOAUTH_LEN 10 - #define USM_AUTH_PROTO_MD5_LEN 10 diff --git a/net-mgmt/net-snmp53/files/patch-ucd_snmp.h b/net-mgmt/net-snmp53/files/patch-ucd_snmp.h deleted file mode 100644 index 2690553112a1..000000000000 --- a/net-mgmt/net-snmp53/files/patch-ucd_snmp.h +++ /dev/null @@ -1,11 +0,0 @@ ---- agent/mibgroup/ucd_snmp.h.orig Mon Oct 25 21:36:55 2004 -+++ agent/mibgroup/ucd_snmp.h Mon Oct 25 21:37:20 2004 -@@ -39,6 +39,8 @@ - config_arch_require(freebsd4, ucd-snmp/memory_freebsd2) - config_arch_require(freebsd5, ucd-snmp/vmstat_freebsd2) - config_arch_require(freebsd5, ucd-snmp/memory_freebsd2) -+config_arch_require(freebsd6, ucd-snmp/vmstat_freebsd2) -+config_arch_require(freebsd6, ucd-snmp/memory_freebsd2) - config_arch_require(netbsd1, ucd-snmp/vmstat_netbsd1) - config_arch_require(netbsd1, ucd-snmp/memory_netbsd1) - config_arch_require(openbsd2, ucd-snmp/vmstat_netbsd1) diff --git a/net-mgmt/net-snmp53/files/snmpd.sh.sample b/net-mgmt/net-snmp53/files/snmpd.sh.sample deleted file mode 100644 index 062017469936..000000000000 --- a/net-mgmt/net-snmp53/files/snmpd.sh.sample +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# 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-"-p /var/run/snmpd.pid"} - -. %%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=/var/run/${name}.pid -sig_stop=-KILL - -load_rc_config ${name} -run_rc_command "$1" diff --git a/net-mgmt/net-snmp53/files/snmptrapd.sh.sample b/net-mgmt/net-snmp53/files/snmptrapd.sh.sample deleted file mode 100644 index 35821ee9e973..000000000000 --- a/net-mgmt/net-snmp53/files/snmptrapd.sh.sample +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# 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-snmp53/files/test.t b/net-mgmt/net-snmp53/files/test.t deleted file mode 100644 index cca9d9ed4191..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/pkg-descr b/net-mgmt/net-snmp53/pkg-descr deleted file mode 100644 index d1fc04717b8e..000000000000 --- a/net-mgmt/net-snmp53/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-snmp53/pkg-message b/net-mgmt/net-snmp53/pkg-message deleted file mode 100644 index 4a213e367a42..000000000000 --- a/net-mgmt/net-snmp53/pkg-message +++ /dev/null @@ -1,26 +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 -p /var/run/snmpd.pid" - 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-snmp53/pkg-plist b/net-mgmt/net-snmp53/pkg-plist deleted file mode 100644 index bb9716891e18..000000000000 --- a/net-mgmt/net-snmp53/pkg-plist +++ /dev/null @@ -1,433 +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/snmpnetstat53 -bin/snmpset -bin/snmpstatus -bin/snmptable -bin/snmptest -bin/snmptranslate -bin/snmptrap -bin/snmpusm -bin/snmpvacm -bin/snmpwalk -%%WITH_TKMIB%%bin/tkmib -bin/traptoemail -etc/rc.d/snmpd.sh -etc/rc.d/snmptrapd.sh -@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/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/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/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_locking.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_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/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/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/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.6.h -include/net-snmp/system/solaris2.7.h -include/net-snmp/system/solaris2.8.h -include/net-snmp/system/solaris2.9.h -include/net-snmp/system/solaris2.10.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/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/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-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-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 -%%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 -@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 diff --git a/net-mgmt/nfsen-devel/Makefile b/net-mgmt/nfsen-devel/Makefile deleted file mode 100644 index dc5b6ba7d466..000000000000 --- a/net-mgmt/nfsen-devel/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# New ports collection makefile for: nfsen -# Date created: 25 March 2005 -# Whom: janos.mohacsi@bsd.hu -# -# $FreeBSD$ -# - -PORTNAME= nfsen -PORTVERSION= 1.2.2 -CATEGORIES= net-mgmt -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ - http://nfsen.sourceforge.net/ -MASTER_SITE_SUBDIR= ${PORTNAME} - -MAINTAINER= janos.mohacsi@bsd.hu -COMMENT= Web based frontend to nfdump netflow collector - -RUN_DEPENDS= ${SITE_PERL}/RRDp.pm:${PORTSDIR}/net/rrdtool \ - nfdump:${PORTSDIR}/net-mgmt/nfdump - -HAS_CONFIGURE= yes -USE_ICONV= yes -USE_PERL5= yes -USE_PHP= session pcre -NO_BUILD= yes -USE_REINPLACE= yes -PLIST_SUB+= PORTNAME=${PORTNAME} - -.include <bsd.port.pre.mk> - -pre-everything:: -.if ${PERL_LEVEL} < 500600 -IGNORE= requires at least perl 5.6.0 -.endif - -do-configure: - ${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' -e 's,%%PORTNAME%%,${PORTNAME},' \ - ${WRKSRC}/etc/nfsen-dist.conf - ${REINPLACE_CMD} -e 's,%%PERL%%,${PERL},' ${WRKSRC}/install.pl - ${RM} ${WRKSRC}/etc/nfsen-dist.conf.* - -do-install: - ${MKDIR} ${PREFIX}/var/${PORTNAME}/profiles/live - cd ${WRKSRC} ;${PERL} ${WRKSRC}/install.pl ${WRKSRC}/etc/nfsen-dist.conf - ${INSTALL_SCRIPT} ${WRKSRC}/install.pl ${PREFIX}/bin/nfsen-reconfigure - @${ECHO_MSG} "Configure your ${LOCALBASE}/etc/nfsen.conf to have necessary profiles "; - @${ECHO_MSG} "Then run 'nfsen-reconfigure ${LOCALBASE}/etc/nfsen.conf' to correctly setup profile files"; - -.include <bsd.port.post.mk> diff --git a/net-mgmt/nfsen-devel/distinfo b/net-mgmt/nfsen-devel/distinfo deleted file mode 100644 index 38da4e5ce623..000000000000 --- a/net-mgmt/nfsen-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (nfsen-1.2.2.tar.gz) = 26bbb94766ef70f1e350004cc671b2d7 -SHA256 (nfsen-1.2.2.tar.gz) = 6a9a4d31cb5fe7592656f16c3390fae0c3845283c2b47c938f07665fa7fa52a2 -SIZE (nfsen-1.2.2.tar.gz) = 3331005 diff --git a/net-mgmt/nfsen-devel/files/patch-etc_nfsen-dist.conf b/net-mgmt/nfsen-devel/files/patch-etc_nfsen-dist.conf deleted file mode 100644 index 999891b1f352..000000000000 --- a/net-mgmt/nfsen-devel/files/patch-etc_nfsen-dist.conf +++ /dev/null @@ -1,75 +0,0 @@ - -$FreeBSD$ - ---- etc/nfsen-dist.conf.orig -+++ etc/nfsen-dist.conf -@@ -26,7 +26,7 @@ - - # - # Required for default layout --$BASEDIR = "/data/nfsen"; -+$BASEDIR = "%%PREFIX%%"; - - # - # Where to install the NfSen binaries -@@ -34,7 +34,7 @@ - - # - # Where to install the NfSen Perl modules --$LIBEXECDIR="${BASEDIR}/libexec"; -+$LIBEXECDIR="${BASEDIR}/libexec/%%PORTNAME%%/"; - - # - # Where to install the config files -@@ -44,7 +44,7 @@ - # NfSen html pages directory: - # All php scripts will be installed here. - # URL: Entry point for nfsen: http://<webserver>/nfsen/nfsen.php --$HTMLDIR = "/var/www/nfsen/"; -+$HTMLDIR = "%%PREFIX%%/www/%%PORTNAME%%/"; - - # - # Where to install the docs -@@ -52,20 +52,20 @@ - - # - # Var space for NfSen --$VARDIR="${BASEDIR}/var"; -+$VARDIR="${BASEDIR}/var/%%PORTNAME%%"; - - # - # The Profiles stat directory, where all profile information - # RRD DBs and gif pictures of the profile are stored --$PROFILESTATDIR="${BASEDIR}/profiles"; -+$PROFILESTATDIR="${VARDIR}/profiles"; - - # - # The Profiles directory, where all netflow data is stored --$PROFILEDATADIR="${BASEDIR}/profiles"; -+$PROFILEDATADIR="${VARDIR}/profiles"; - - # - # Where go all the backend plugins --$BACKEND_PLUGINDIR="${BASEDIR}/plugins"; -+$BACKEND_PLUGINDIR="${LIBEXECDIR}/plugins"; - - # - # Where go all the frontend plugins -@@ -82,7 +82,7 @@ - # This may be a different or the same uid than your web server. - # Note: This user must be in group $WWWGROUP, otherwise nfcapd - # is not able to write data files! --$USER = "netflow"; -+$USER = "www"; - - # user and group of the web server process - # All netflow processing will be done with this user -@@ -105,7 +105,7 @@ - - %sources = ( - 'upstream1' => { 'port' => '9995', 'col' => '#0000ff' }, -- 'peer1' => { 'port' => '9996', 'col' => '#ff0000' }, -+# 'peer1' => { 'port' => '9996', 'col' => '#ff0000' }, - ); - - # diff --git a/net-mgmt/nfsen-devel/files/patch-html_navigator.php b/net-mgmt/nfsen-devel/files/patch-html_navigator.php deleted file mode 100644 index 9249f8afc3d2..000000000000 --- a/net-mgmt/nfsen-devel/files/patch-html_navigator.php +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- html/navigator.php.orig -+++ html/navigator.php -@@ -18,7 +18,7 @@ - * Copy the doc directory into HTML dir - */ - -- // print "<a href='$DOCURL/NfSen.html' target='_blank' >Docu</a>\n"; -+ print "<a href='$DOCURL/NfSen.html' target='_blank' >Docu</a>\n"; - - print "<a href='$self?bookmark=" . $_SESSION['bookmark'] . "'>Bookmark URL</a>\n"; - print "Selected Profile: \n"; diff --git a/net-mgmt/nfsen-devel/files/patch-install.pl b/net-mgmt/nfsen-devel/files/patch-install.pl deleted file mode 100644 index 6aabeb302540..000000000000 --- a/net-mgmt/nfsen-devel/files/patch-install.pl +++ /dev/null @@ -1,40 +0,0 @@ - -$FreeBSD$ - ---- install.pl.orig -+++ install.pl -@@ -56,33 +56,7 @@ - # Get Perl - sub GetPerl { - -- my $whichperl; -- my $ans; -- chomp($whichperl = `which perl`); -- if ( length $whichperl ) { -- print "Perl to use: [$whichperl] "; -- chomp($ans = <STDIN>); -- if ( length $ans ) { -- $whichperl = $ans; -- } -- } else { -- print "No Perl found in PATH. Please specify where to find perl [] "; -- chomp($whichperl = <STDIN>); -- } -- -- while (1) { -- if ( -x $whichperl ) { -- my $err = system("$whichperl -e 'require 5.6.0;'") >> 8; -- last if $err == 0; -- print "Found errors while testing Perl\n"; -- } else { -- print "No executable: '$whichperl'\n"; -- } -- print "Perl to use: [] "; -- chomp($whichperl = <STDIN>); -- } -- -- return $whichperl; -+ return "%%PERL%%"; - - } # End of GetPerl - diff --git a/net-mgmt/nfsen-devel/pkg-descr b/net-mgmt/nfsen-devel/pkg-descr deleted file mode 100644 index 312491947d5d..000000000000 --- a/net-mgmt/nfsen-devel/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -NfSen is a graphical web based front end for the nfdump netflow tools. - -NfSen allows you to: - - * Display your netflow data: Flows, Packets and Bytes using RRD - (Round Robin Database). - * Easily navigate through the netflow data. - * Process the netflow data within the specified time span. - * Create history as well as continuous profiles. - * Write your own plugins to process netflow data on a regular interval - -WWW: http://nfsen.sourceforge.net/ diff --git a/net-mgmt/nfsen-devel/pkg-plist b/net-mgmt/nfsen-devel/pkg-plist deleted file mode 100644 index 3b824342b6b2..000000000000 --- a/net-mgmt/nfsen-devel/pkg-plist +++ /dev/null @@ -1,107 +0,0 @@ -bin/nfsen -bin/nfsen-reconfigure -bin/nfsen-run -bin/nfsen.rc -bin/pid_check.pl -bin/testPlugin -@unexec if cmp -s %D/etc/nfsen.conf %D/etc/nfsen-dist.conf; then rm -f %D/etc/nfsen.conf; fi -etc/nfsen-dist.conf -@exec [ -f %D/etc/nfsen.conf ] || cp %D/etc/nfsen-dist.conf %D/etc/nfsen.conf -etc/nfsen-shell-param -libexec/%%PORTNAME%%/GenGraph.pl -libexec/%%PORTNAME%%/Log.pm -libexec/%%PORTNAME%%/NfConf.pm -libexec/%%PORTNAME%%/NfProfile.pm -libexec/%%PORTNAME%%/NfSen.pm -libexec/%%PORTNAME%%/NfSenRRD.pm -libexec/%%PORTNAME%%/Notification.pm -libexec/%%PORTNAME%%/plugins/demoplugin.pm -www/%%PORTNAME%%/conf.php -www/%%PORTNAME%%/EmptyGraph.gif -www/%%PORTNAME%%/ErrorGraph.gif -www/%%PORTNAME%%/css-admin.html -www/%%PORTNAME%%/css.html -www/%%PORTNAME%%/details.php -www/%%PORTNAME%%/edit.png -www/%%PORTNAME%%/info.php -www/%%PORTNAME%%/invisible.gif -www/%%PORTNAME%%/navigator.php -www/%%PORTNAME%%/navigator.php.orig -www/%%PORTNAME%%/nfsen.php -www/%%PORTNAME%%/nfsenutil.php -www/%%PORTNAME%%/overview.php -www/%%PORTNAME%%/pic.php -www/%%PORTNAME%%/process.php -www/%%PORTNAME%%/profileadmin.php -www/%%PORTNAME%%/rrdgraph.php -www/%%PORTNAME%%/trash.png -www/%%PORTNAME%%/plugins/demoplugin.php -www/%%PORTNAME%%/doc/BSD-license.html -www/%%PORTNAME%%/doc/Bookmark.png -www/%%PORTNAME%%/doc/BuildingProfile.png -www/%%PORTNAME%%/doc/ConfirmDelete.png -www/%%PORTNAME%%/doc/DefaultFilter.png -www/%%PORTNAME%%/doc/DeleteProfile.png -www/%%PORTNAME%%/doc/DisabledSources.png -www/%%PORTNAME%%/doc/InputEnd.png -www/%%PORTNAME%%/doc/Navigating.png -www/%%PORTNAME%%/doc/NewProfile.png -www/%%PORTNAME%%/doc/NfSen.html -www/%%PORTNAME%%/doc/OutOfData.png -www/%%PORTNAME%%/doc/ProcessingControls.png -www/%%PORTNAME%%/doc/ProcessingOutput.png -www/%%PORTNAME%%/doc/ProfileCreated.png -www/%%PORTNAME%%/doc/ResetWindow.png -www/%%PORTNAME%%/doc/SelectLeft.png -www/%%PORTNAME%%/doc/SelectRight.png -www/%%PORTNAME%%/doc/StatSummary.png -www/%%PORTNAME%%/doc/TimeWindow.png -www/%%PORTNAME%%/doc/WinScale.png -www/%%PORTNAME%%/doc/bytes.png -www/%%PORTNAME%%/doc/cursor_control.png -www/%%PORTNAME%%/doc/details-graphs.png -www/%%PORTNAME%%/doc/details-processing.png -www/%%PORTNAME%%/doc/dirstruct.png -www/%%PORTNAME%%/doc/edit.png -www/%%PORTNAME%%/doc/exiisting.png -www/%%PORTNAME%%/doc/flows.png -www/%%PORTNAME%%/doc/linegraph.png -www/%%PORTNAME%%/doc/nfsen-options.png -www/%%PORTNAME%%/doc/overview.png -www/%%PORTNAME%%/doc/packets.png -www/%%PORTNAME%%/doc/plugins.png -www/%%PORTNAME%%/doc/processing-1.png -www/%%PORTNAME%%/doc/selectprofile.png -www/%%PORTNAME%%/doc/stat.png -www/%%PORTNAME%%/doc/views-2.png -www/%%PORTNAME%%/doc/views.png -@dirrm www/%%PORTNAME%%/plugins -@dirrm www/%%PORTNAME%%/doc -@dirrm www/%%PORTNAME%% -@exec mkdir -p %D/var/%%PORTNAME%%/profiles/live/upstream1 -var/%%PORTNAME%%/profiles/live/flows.rrd -var/%%PORTNAME%%/profiles/live/flows_tcp.rrd -var/%%PORTNAME%%/profiles/live/flows_udp.rrd -var/%%PORTNAME%%/profiles/live/flows_icmp.rrd -var/%%PORTNAME%%/profiles/live/flows_other.rrd -var/%%PORTNAME%%/profiles/live/packets.rrd -var/%%PORTNAME%%/profiles/live/packets_tcp.rrd -var/%%PORTNAME%%/profiles/live/packets_udp.rrd -var/%%PORTNAME%%/profiles/live/packets_icmp.rrd -var/%%PORTNAME%%/profiles/live/packets_other.rrd -var/%%PORTNAME%%/profiles/live/traffic.rrd -var/%%PORTNAME%%/profiles/live/traffic_tcp.rrd -var/%%PORTNAME%%/profiles/live/traffic_udp.rrd -var/%%PORTNAME%%/profiles/live/traffic_icmp.rrd -var/%%PORTNAME%%/profiles/live/traffic_other.rrd -var/%%PORTNAME%%/profiles/live/profile.dat -@exec mkdir -p %D/var/%%PORTNAME%%/run -@exec mkdir -p %D/var/%%PORTNAME%%/filters -@dirrm var/%%PORTNAME%%/run -@dirrm var/%%PORTNAME%%/filters -@dirrmtry var/%%PORTNAME%%/profiles/live/upstream1 -@dirrmtry var/%%PORTNAME%%/profiles/live -@dirrmtry var/%%PORTNAME%%/profiles -@dirrmtry var/%%PORTNAME%% -@dirrm libexec/%%PORTNAME%%/plugins -@dirrm libexec/%%PORTNAME%% diff --git a/net-mgmt/rancid-devel/Makefile b/net-mgmt/rancid-devel/Makefile deleted file mode 100644 index ea9eb3d67e3e..000000000000 --- a/net-mgmt/rancid-devel/Makefile +++ /dev/null @@ -1,94 +0,0 @@ -# New ports collection makefile for: rancid -# Date created: 3 June 2002 -# Whom: Janos.Mohacsi@bsd.hu -# -# $FreeBSD$ -# - -PORTNAME= rancid -PORTVERSION= 2.3.1 -PORTREVISION= 1 -CATEGORIES= net-mgmt -MASTER_SITES= ftp://ftp.shrubbery.net/pub/rancid/ - -MAINTAINER= janos.mohacsi@bsd.hu -COMMENT= Really Awesome New Cisco confIg Differ - -BUILD_DEPENDS= expect:${PORTSDIR}/lang/expect -RUN_DEPENDS= expect:${PORTSDIR}/lang/expect \ - ${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \ - ${SITE_PERL}/LockFile/Simple.pm:${PORTSDIR}/devel/p5-LockFile-Simple - -USE_PERL5= yes -PKGMESSAGE= ${WRKDIR}/pkg-message -USE_GMAKE= yes -HAS_CONFIGURE= yes -CONFIGURE_ARGS= \ - --prefix=${PREFIX}/ \ - --localstatedir=${PREFIX}/var/${PORTNAME}/ \ - --bindir=${PREFIX}/libexec/${PORTNAME}/ \ - --sysconfdir=${PREFIX}/etc/${PORTNAME}/ - -MAN1= alogin.1 blogin.1 cat5rancid.1 clogin.1 control_rancid.1 \ - cssrancid.1 elogin.1 erancid.1 f10rancid.1 flogin.1 fnrancid.1 \ - francid.1 hlogin.1 hrancid.1 htlogin.1 htrancid.1 jerancid.1 \ - jlogin.1 jrancid.1 lg_intro.1 mrancid.1 nlogin.1 nrancid.1 \ - nslogin.1 nsrancid.1 par.1 prancid.1 rancid-cvs.1 rancid-run.1 \ - rancid.1 rancid_intro.1 rivlogin.1 rivrancid.1 tntlogin.1 \ - tntrancid.1 xrancid.1 zrancid.1 - -MAN5= lg.conf.5 cloginrc.5 rancid.conf.5 router.db.5 - -OLDCONFIG_FILE1= bin/env -OLDCONFIG_FILE2= util/lg/lg.conf -NEWERCONFIG_FILES1= etc/rancid.conf -NEWERCONFIG_FILES2= etc/lg.conf -NEWCONFIG_FILES= rancid.conf lg.conf - -pre-everything:: - @ ${ECHO} "Make sure your rancid repository is quit before upgrading; disable rancid cron jobs" - -post-install: - ${LN} -s ${PREFIX}/libexec/${PORTNAME}/rancid-cvs ${PREFIX}/bin - ${LN} -s ${PREFIX}/libexec/${PORTNAME}/rancid-run ${PREFIX}/bin - @ ${SED} -e "s:%%INSTDIR%%:${PREFIX}:g" pkg-message >${PKGMESSAGE} -.if !defined(BATCH) - @ ${ECHO} - @ ${CAT} ${PKGMESSAGE} - @ ${ECHO} -.endif -.for file in ${NEWCONFIG_FILES} - @ if [ -f ${PREFIX}/etc/${PORTNAME}/${file} ] ; then \ - ${ECHO} "WARNING: *** new ${file} file is installed as ${PREFIX}/rancid/${file}.sample"; \ - ${ECHO} " : *** review ${file}.sample for new/deprecated switches or install in place ${file}"; \ - fi -.endfor - @ if [ -f ${PREFIX}/rancid/$NEWERCONFIG_FILE1} ] ; then \ - ${ECHO} "WARNING: *** ${PREFIX}/rancid/${NEWERCONFIG_FILE1} has been replaced with "; \ - ${ECHO} " : *** ${PREFIX}/etc/${PORTNAME}/rancid.conf. Merge from sample and old file "; \ - fi - @ if [ -f ${PREFIX}/rancid/${NEWERCONFIG_FILE2} ] ; then \ - ${ECHO} "WARNING: *** ${PREFIX}/rancid/${NEWERCONFIG_FILE2} has been replaced with "; \ - ${ECHO} " : *** ${PREFIX}/etc/${PORTNAME}/lg.conf. Merge from sample and old file "; \ - fi - @ if [ -f ${PREFIX}/rancid/${NEWERCONFIG_FILE1} -o \ - -f ${PREFIX}/rancid/${NEWERCONFIG_FILE2} ] ; then \ - ${ECHO} "WARNING: *** New CVS Repository will be stored ${PREFIX}/var/${PORTNAME}/ "; \ - ${ECHO} " : *** Copy the repository if you want to keep the history "; \ - fi - - @ if [ -f ${PREFIX}/rancid/${OLDCONFIG_FILE1} ] ; then \ - ${ECHO} "WARNING: *** ${PREFIX}/rancid/${OLDCONFIG_FILE1} has been replaced with "; \ - ${ECHO} " : *** ${PREFIX}/etc/${PORTNAME}/rancid.conf. Merge from sample and old file "; \ - fi - @ if [ -f ${PREFIX}/rancid/${OLDCONFIG_FILE2} ] ; then \ - ${ECHO} "WARNING: *** ${PREFIX}/rancid/${OLDCONFIG_FILE2} has been replaced with "; \ - ${ECHO} " : *** ${PREFIX}/etc/${PORTNAME}/lg.conf. Merge from sample and old file "; \ - fi - @ if [ -f ${PREFIX}/rancid/${OLDCONFIG_FILE1} -o \ - -f ${PREFIX}/rancid/${OLDCONFIG_FILE2} ] ; then \ - ${ECHO} "WARNING: *** New CVS Repository will be stored ${PREFIX}/rancid/var "; \ - ${ECHO} " : *** Copy the repository if you want to keep the history "; \ - fi - -.include <bsd.port.mk> diff --git a/net-mgmt/rancid-devel/distinfo b/net-mgmt/rancid-devel/distinfo deleted file mode 100644 index fed6b2420ee6..000000000000 --- a/net-mgmt/rancid-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (rancid-2.3.1.tar.gz) = b188595e528515b4f87078f63936d355 -SHA256 (rancid-2.3.1.tar.gz) = 32ceca2bbedf92577fbe780dd2b6c7d7a012974728e4932ce6a19897907dc2fa -SIZE (rancid-2.3.1.tar.gz) = 276562 diff --git a/net-mgmt/rancid-devel/files/patch-etc::Makefile.am b/net-mgmt/rancid-devel/files/patch-etc::Makefile.am deleted file mode 100644 index 67a61d8b98e0..000000000000 --- a/net-mgmt/rancid-devel/files/patch-etc::Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ - -$FreeBSD$ - ---- etc/Makefile.am.orig Tue Jan 13 19:02:00 2004 -+++ etc/Makefile.am Wed May 5 16:36:40 2004 -@@ -33,26 +33,8 @@ - endif - - install-data-local: all -- @if test "$(DO_CONF_INSTALL)" = "yes"; then \ -- if test -f $(sysconfdir)/rancid.conf ; then \ -- echo ""; \ -- echo "WARNING: *** $(sysconfdir)/rancid.conf exists. See "; \ -- echo " *** $(pkgdatadir)/rancid.conf.sample for new"; \ -- echo " *** examples."; \ -- echo ""; \ -- else \ -- $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/rancid.conf; \ -- fi; \ -- if test -f $(sysconfdir)/lg.conf ; then \ -- echo ""; \ -- echo "WARNING: *** $(sysconfdir)/lg.conf exists. See "; \ -- echo " *** $(pkgdatadir)/lg.conf.sample for new"; \ -- echo " *** examples."; \ -- echo ""; \ -- else \ -- $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/lg.conf; \ -- fi; \ -- fi -+ $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/ -+ $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/ - - #clean: - # rm -f Makefile rancid.conf $(BIN_DATAS) $(BIN_PROGS) diff --git a/net-mgmt/rancid-devel/files/patch-etc::Makefile.in b/net-mgmt/rancid-devel/files/patch-etc::Makefile.in deleted file mode 100644 index f5c70a4d9d68..000000000000 --- a/net-mgmt/rancid-devel/files/patch-etc::Makefile.in +++ /dev/null @@ -1,34 +0,0 @@ - -$FreeBSD$ - ---- etc/Makefile.in.orig Fri Feb 6 16:56:50 2004 -+++ etc/Makefile.in Wed May 5 16:40:00 2004 -@@ -347,26 +347,8 @@ - - - install-data-local: all -- @if test "$(DO_CONF_INSTALL)" = "yes"; then \ -- if test -f $(sysconfdir)/rancid.conf ; then \ -- echo ""; \ -- echo "WARNING: *** $(sysconfdir)/rancid.conf exists. See "; \ -- echo " *** $(pkgdatadir)/rancid.conf.sample for new"; \ -- echo " *** examples."; \ -- echo ""; \ -- else \ -- $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/rancid.conf; \ -- fi; \ -- if test -f $(sysconfdir)/lg.conf ; then \ -- echo ""; \ -- echo "WARNING: *** $(sysconfdir)/lg.conf exists. See "; \ -- echo " *** $(pkgdatadir)/lg.conf.sample for new"; \ -- echo " *** examples."; \ -- echo ""; \ -- else \ -- $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/lg.conf; \ -- fi; \ -- fi -+ $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/ -+ $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/ - - lg.conf.sample: Makefile $(srcdir)/lg.conf.sample.in - rm -f lg.conf.sample lg.conf.sample.tmp; \ diff --git a/net-mgmt/rancid-devel/pkg-descr b/net-mgmt/rancid-devel/pkg-descr deleted file mode 100644 index 676fe9aae64c..000000000000 --- a/net-mgmt/rancid-devel/pkg-descr +++ /dev/null @@ -1,16 +0,0 @@ -Rancid monitors a router's (or device's) configuration, including software -and hardware (cards, serial numbers, etc), using CVS. Rancid currently -supports Bay routers, Cisco routers, Juniper routers, Catalyst switches, -Foundry switches, Redback NASs, ADC EZT3 muxes, MRTd (and thus likely IRRd), -Alteon switches, HP procurve switches, Hitachi routers. - -Rancid logs into each of the devices in a router table file, runs various -commands, chomps the output, and emails any differences ( sample) from -the previous collection to a mail list. - -A looking glass is also included with rancid, based on Ed Kern's in use on -http://nitrous.digex.net/. Rancid version has added functions, supports cisco, - juniper, and foundry and uses the login scripts that come with rancid; -so it can use rsh, telnet, or ssh to connect to your router(s). - -WWW: http://www.shrubbery.net/rancid/ diff --git a/net-mgmt/rancid-devel/pkg-message b/net-mgmt/rancid-devel/pkg-message deleted file mode 100644 index 2c086cfd4f36..000000000000 --- a/net-mgmt/rancid-devel/pkg-message +++ /dev/null @@ -1,11 +0,0 @@ -For further configuration information please look at -%%INSTDIR%%/share/rancid/README. - -If you are upgrading from the previous version of rancid look at -%%INSTDIR%%/share/rancid/UPGRADING. - -If you would like to set up Rancid to be browseable from Web, -you need to install devel/cvsweb or devel/viewcvs. - -For rancid looking-glass copy the actual CGIs (located at -%%INSTDIR%%/libexec/rancid/{lg.cgi lgform.cgi}) to your cgi-bin. diff --git a/net-mgmt/rancid-devel/pkg-plist b/net-mgmt/rancid-devel/pkg-plist deleted file mode 100644 index 30e9fdf886e2..000000000000 --- a/net-mgmt/rancid-devel/pkg-plist +++ /dev/null @@ -1,70 +0,0 @@ -@exec mkdir -p %D/var/rancid -@exec chmod 775 %D/var/rancid -@dirrmtry var -bin/rancid-cvs -bin/rancid-run -libexec/rancid/alogin -libexec/rancid/arancid -libexec/rancid/blogin -libexec/rancid/brancid -libexec/rancid/cat5rancid -libexec/rancid/clogin -libexec/rancid/control_rancid -libexec/rancid/cssrancid -libexec/rancid/elogin -libexec/rancid/erancid -libexec/rancid/f10rancid -libexec/rancid/flogin -libexec/rancid/fnrancid -libexec/rancid/francid -libexec/rancid/hlogin -libexec/rancid/hpuifilter -libexec/rancid/hrancid -libexec/rancid/htlogin -libexec/rancid/htrancid -libexec/rancid/jerancid -libexec/rancid/jlogin -libexec/rancid/jrancid -libexec/rancid/lg.cgi -libexec/rancid/lgform.cgi -libexec/rancid/mrancid -libexec/rancid/nlogin -libexec/rancid/nrancid -libexec/rancid/nslogin -libexec/rancid/nsrancid -libexec/rancid/par -libexec/rancid/prancid -libexec/rancid/rancid -libexec/rancid/rancid-cvs -libexec/rancid/rancid-fe -libexec/rancid/rancid-run -libexec/rancid/rivlogin -libexec/rancid/rivrancid -libexec/rancid/rrancid -libexec/rancid/tntlogin -libexec/rancid/tntrancid -libexec/rancid/xrancid -libexec/rancid/zrancid -etc/rancid/lg.conf.sample -etc/rancid/rancid.conf.sample -share/rancid/CHANGES -share/rancid/COPYING -share/rancid/FAQ -share/rancid/README -share/rancid/README.lg -share/rancid/README.misc -share/rancid/UPGRADING -share/rancid/cisco-load.exp -share/rancid/cisco-reload.exp -share/rancid/cloginrc.sample -share/rancid/downreport -share/rancid/getipacctg -share/rancid/index.html -share/rancid/lg.conf.sample -share/rancid/lgnotes.html -share/rancid/rancid.conf.sample -share/rancid/rtrfilter -@dirrm share/rancid -@dirrm var/rancid -@dirrm etc/rancid -@dirrm libexec/rancid diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile deleted file mode 100644 index d2a614d9268c..000000000000 --- a/net-mgmt/smokeping/Makefile +++ /dev/null @@ -1,283 +0,0 @@ -# New ports collection makefile for: SmokePing -# Date created: Tue Feb 12 22:17:40 CET 2002 -# Whom: Lars Thegler <lars@thegler.dk> -# -# $FreeBSD$ -# - -PORTNAME= smokeping -PORTVERSION= 2.0.5 -CATEGORIES= net www -MASTER_SITES= http://people.ee.ethz.ch/~oetiker/webtools/smokeping/pub/ - -MAINTAINER= lth@FreeBSD.org -COMMENT= Latency logging and graphing system - -RUN_DEPENDS= rrdtool:${PORTSDIR}/net/rrdtool \ - ${SITE_PERL}/CGI/SpeedyCGI.pm:${PORTSDIR}/www/p5-CGI-SpeedyCGI \ - ${SITE_PERL}/BER.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session \ - ${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \ - ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ - ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser \ - ${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net - -OPTIONS= FPING "Support for fping probes" on -OPTIONS+= ECHOPING "Support for EchoPing probes" off -OPTIONS+= CURL "Support for Curl probes" off -OPTIONS+= LDAP "Support for LDAP probes" off -OPTIONS+= LDAPSSL "Support for SSL-enabled LDAP probes" off -OPTIONS+= RADIUS "Support for Radius probes" off -OPTIONS+= TELNET "Support for TelnetIOSPing probes" off -OPTIONS+= DNS "Support for AnotherDNS probes" off - -.include <bsd.port.pre.mk> - -.ifdef(WITH_FPING) -RUN_DEPENDS+= ${LOCALBASE}/sbin/fping:${PORTSDIR}/net/fping -.endif - -.ifdef(WITH_ECHOPING) -RUN_DEPENDS+= ${LOCALBASE}/bin/echoping:${PORTSDIR}/net/echoping -.endif - -.ifdef(WITH_CURL) -RUN_DEPENDS+= ${LOCALBASE}/bin/curl:${PORTSDIR}/ftp/curl -.endif - -.if defined(WITH_LDAP) || defined(WITH_LDAPSSL) -RUN_DEPENDS+= ${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap -.endif - -.ifdef(WITH_RADIUS) -RUN_DEPENDS+= ${SITE_PERL}/Authen/Radius.pm:${PORTSDIR}/security/p5-Authen-Radius -.endif - -.if defined(WITH_LDAP) || defined(WITH_LDAPSSL) || defined(WITH_RADIUS) -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes -.endif - -.ifdef(WITH_LDAPSSL) -RUN_DEPENDS+= ${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL -.endif - -.ifdef(WITH_TELNET) -RUN_DEPENDS+= ${SITE_PERL}/Net/Telnet.pm:${PORTSDIR}/net/p5-Net-Telnet -.endif - -.ifdef(WITH_DNS) -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS -.endif - -NO_BUILD= yes -USE_REINPLACE= yes -USE_PERL5= yes - -MAN1= smokeping.1 \ - smokeping.cgi.1 \ - tSmoke.1 -MAN3= Config::Grammar.3 \ - Smokeping.3 \ - Smokeping::Examples.3 \ - Smokeping::RRDtools.3 \ - Smokeping::matchers::Avgratio.3 \ - Smokeping::matchers::Median.3 \ - Smokeping::matchers::base.3 \ - Smokeping::probes::AnotherDNS.3 \ - Smokeping::probes::AnotherSSH.3 \ - Smokeping::probes::CiscoRTTMonDNS.3 \ - Smokeping::probes::CiscoRTTMonEchoICMP.3 \ - Smokeping::probes::CiscoRTTMonTcpConnect.3 \ - Smokeping::probes::Curl.3 \ - Smokeping::probes::DNS.3 \ - Smokeping::probes::EchoPing.3 \ - Smokeping::probes::EchoPingChargen.3 \ - Smokeping::probes::EchoPingDiscard.3 \ - Smokeping::probes::EchoPingHttp.3 \ - Smokeping::probes::EchoPingHttps.3 \ - Smokeping::probes::EchoPingIcp.3 \ - Smokeping::probes::EchoPingSmtp.3 \ - Smokeping::probes::FPing.3 \ - Smokeping::probes::FPing6.3 \ - Smokeping::probes::IOSPing.3 \ - Smokeping::probes::LDAP.3 \ - Smokeping::probes::Radius.3 \ - Smokeping::probes::RemoteFPing.3 \ - Smokeping::probes::SSH.3 \ - Smokeping::probes::TelnetIOSPing.3 \ - Smokeping::probes::base.3 \ - Smokeping::probes::basefork.3 \ - Smokeping::probes::basevars.3 \ - Smokeping::probes::passwordchecker.3 \ - Smokeping::probes::skel.3 -MAN5= smokeping_config.5 -MAN7= smokeping_examples.7 \ - smokeping_extend.7 \ - smokeping_install.7 \ - smokeping_upgrade.7 - -PKGMESSAGE= ${WRKDIR}/pkg-message -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall - -USER= smokeping -GROUP= smokeping -WWW_USER= www -WWW_UID= 80 -WWW_GROUP= www -WWW_GID= 80 - -FILES_SUB= USER=${USER} GROUP=${GROUP} \ - WWW_USER=${WWW_USER} WWW_UID=${WWW_UID} \ - WWW_GROUP=${WWW_GROUP} WWW_GID=${WWW_GID} \ - PERL=${PERL} PREFIX=${PREFIX} - -DOC1= CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO -DOC2= Config/Grammar \ - Smokeping \ - Smokeping/Examples \ - Smokeping/RRDtools \ - Smokeping/matchers/Avgratio \ - Smokeping/matchers/Median \ - Smokeping/matchers/base \ - Smokeping/probes/AnotherDNS \ - Smokeping/probes/AnotherSSH \ - Smokeping/probes/CiscoRTTMonDNS \ - Smokeping/probes/CiscoRTTMonEchoICMP \ - Smokeping/probes/CiscoRTTMonTcpConnect \ - Smokeping/probes/Curl \ - Smokeping/probes/DNS \ - Smokeping/probes/EchoPing \ - Smokeping/probes/EchoPingChargen \ - Smokeping/probes/EchoPingDiscard \ - Smokeping/probes/EchoPingHttp \ - Smokeping/probes/EchoPingHttps \ - Smokeping/probes/EchoPingIcp \ - Smokeping/probes/EchoPingSmtp \ - Smokeping/probes/FPing \ - Smokeping/probes/FPing6 \ - Smokeping/probes/IOSPing \ - Smokeping/probes/LDAP \ - Smokeping/probes/Radius \ - Smokeping/probes/RemoteFPing \ - Smokeping/probes/SSH \ - Smokeping/probes/TelnetIOSPing \ - Smokeping/probes/base \ - Smokeping/probes/basefork \ - Smokeping/probes/basevars \ - Smokeping/probes/passwordchecker \ - Smokeping/probes/skel \ - smokeping.cgi \ - smokeping \ - smokeping_config \ - smokeping_examples \ - smokeping_extend \ - smokeping_install \ - smokeping_upgrade \ - tSmoke - -EXAMPLES= config.echoping \ - config.fping-instances \ - config.multiple-probes \ - config.simple \ - config.targetvars-with-Curl \ - config.template - -ETC1= basepage.html config smokemail tmail - -# Things that shouldn't have been in the tarball in the first place -post-extract: - @${RM} ${WRKSRC}/lib/BER.pm - @${RM} ${WRKSRC}/lib/SNMP_*.pm - -pre-patch: - @${REINPLACE_CMD} -e s!/usr/bin/!%%PREFIX%%/bin/! \ - ${WRKSRC}/lib/Smokeping.pm \ - ${WRKSRC}/lib/Smokeping/Examples.pm \ - ${WRKSRC}/lib/Smokeping/probes/Curl.pm \ - ${WRKSRC}/lib/Smokeping/probes/IOSPing.pm \ - ${WRKSRC}/lib/Smokeping/probes/DNS.pm \ - ${WRKSRC}/lib/Smokeping/probes/RemoteFPing.pm \ - ${WRKSRC}/lib/Smokeping/probes/SSH.pm \ - ${WRKSRC}/lib/Smokeping/probes/FPing6.pm \ - ${WRKSRC}/lib/Smokeping/probes/EchoPing.pm \ - ${WRKSRC}/lib/Smokeping/probes/FPing.pm - @${REINPLACE_CMD} -e s!/usr/share/smokeping/etc/!%%PREFIX%%/etc/smokeping/! \ - ${WRKSRC}/lib/Smokeping/probes/passwordchecker.pm - -post-patch: - @${FIND} ${WRKSRC} -name \*.orig -delete - -pre-configure: - @${REINPLACE_CMD} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${WRKSRC}/lib/Smokeping.pm \ - ${WRKSRC}/lib/Smokeping/Examples.pm \ - ${WRKSRC}/bin/smokeping.dist \ - ${WRKSRC}/bin/tSmoke.dist \ - ${WRKSRC}/htdocs/smokeping.cgi.dist \ - ${WRKSRC}/etc/config.dist \ - ${WRKSRC}/lib/Smokeping/probes/*.pm - @${FIND} ${WRKSRC} -name \*.bak -delete - @${SED} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${PKGDIR}/pkg-message > ${PKGMESSAGE} - @${SED} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${PKGDIR}/pkg-install > ${PKGINSTALL} - @${SED} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${PKGDIR}/pkg-deinstall > ${PKGDEINSTALL} - @${MV} ${WRKSRC}/bin/smokeping.dist ${WRKSRC}/bin/smokeping - @${MV} ${WRKSRC}/bin/tSmoke.dist ${WRKSRC}/bin/tSmoke - @${MV} ${WRKSRC}/htdocs/smokeping.cgi.dist ${WRKSRC}/htdocs/smokeping.cgi - -pre-su-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - -do-install: - @${INSTALL_SCRIPT} ${WRKSRC}/bin/smokeping ${PREFIX}/bin - @${INSTALL_SCRIPT} ${WRKSRC}/bin/tSmoke ${PREFIX}/bin -.if !defined(NOPORTDOCS) - @(cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1) - @(cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MAN5} ${PREFIX}/man/man5) - @(cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MAN7} ${PREFIX}/man/man7) -.for FILE in ${MAN3} - @${INSTALL_MAN} `${FIND} ${WRKSRC}/doc -name ${FILE}` ${PREFIX}/man/man3 -.endfor - @${MKDIR} ${DOCSDIR} - @${MKDIR} ${DOCSDIR}/Config - @${MKDIR} ${DOCSDIR}/Smokeping/matchers - @${MKDIR} ${DOCSDIR}/Smokeping/probes - @(cd ${WRKSRC} && ${INSTALL_DATA} ${DOC1} ${DOCSDIR}) -.for FILE in ${DOC2} - @${INSTALL_DATA} ${WRKSRC}/doc/${FILE}.html ${DOCSDIR}/${FILE}.html - @${INSTALL_DATA} ${WRKSRC}/doc/${FILE}.txt ${DOCSDIR}/${FILE}.txt -.endfor - @${MKDIR} ${EXAMPLESDIR} - @(cd ${WRKSRC}/doc/examples && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}) -.endif - @${MKDIR} ${PREFIX}/etc/smokeping -.for FILE in ${ETC1} - @${INSTALL_DATA} ${WRKSRC}/etc/${FILE}.dist ${PREFIX}/etc/smokeping - @if [ ! -f ${PREFIX}/etc/smokeping/${FILE} ]; then \ - ${INSTALL_DATA} ${WRKSRC}/etc/${FILE}.dist ${PREFIX}/etc/smokeping/${FILE} ; \ - fi -.endfor - @${MKDIR} ${PREFIX}/smokeping/htdocs - @${INSTALL_SCRIPT} ${WRKSRC}/htdocs/smokeping.cgi ${PREFIX}/smokeping/htdocs/smokeping.cgi - @${CP} -R ${WRKSRC}/lib ${PREFIX}/smokeping/ - @${MKDIR} ${PREFIX}/var/smokeping - @${CHOWN} ${USER}:${GROUP} ${PREFIX}/var/smokeping - @${MKDIR} ${PREFIX}/smokeping/htdocs/img - @${CHOWN} ${WWW_USER}:${WWW_GROUP} ${PREFIX}/smokeping/htdocs/img - @if [ ! -f ${PREFIX}/etc/rc.d/smokeping.sh ]; then \ - ${ECHO} "Installing ${PREFIX}/etc/rc.d/smokeping.sh startup file."; \ - ${INSTALL_SCRIPT} ${FILESDIR}/smokeping.sh ${PREFIX}/etc/rc.d/smokeping.sh; \ - fi - -post-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.if !defined(BATCH) - @${CAT} ${PKGMESSAGE} -.endif - -post-deinstall: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDEINSTALL} ${PKGNAME} POST-DEINSTALL - -.include <bsd.port.post.mk> diff --git a/net-mgmt/smokeping/distinfo b/net-mgmt/smokeping/distinfo deleted file mode 100644 index 1431119fe04f..000000000000 --- a/net-mgmt/smokeping/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (smokeping-2.0.5.tar.gz) = c965439c147012b91585c3e134225b4d -SHA256 (smokeping-2.0.5.tar.gz) = 9cd7cf12a3183dae5c3fe6f2ad1e4f4ed7396e8f01081b6784084f934e6901f1 -SIZE (smokeping-2.0.5.tar.gz) = 375851 diff --git a/net-mgmt/smokeping/files/patch-bin-smokeping.dist b/net-mgmt/smokeping/files/patch-bin-smokeping.dist deleted file mode 100644 index 417df107efd9..000000000000 --- a/net-mgmt/smokeping/files/patch-bin-smokeping.dist +++ /dev/null @@ -1,43 +0,0 @@ ---- bin/smokeping.dist.orig Mon Sep 26 22:15:57 2005 -+++ bin/smokeping.dist Thu Oct 6 10:37:31 2005 -@@ -1,12 +1,11 @@ --#!/usr/sepp/bin/perl-5.8.4 -w -+#!%%PERL%% -w - # -*-perl-*- - --use lib qw(/usr/pack/rrdtool-1.0.49-to/lib/perl); --use lib qw(lib); -+use lib qw(%%PREFIX%%/smokeping/lib); - - use Smokeping 2.000005; - --Smokeping::main("etc/config.dist"); -+Smokeping::main("%%PREFIX%%/etc/smokeping/config"); - - =head1 NAME - -@@ -112,22 +111,8 @@ - - =head1 SETUP - --When installing SmokePing, this file has to be adjusted to fit your --local system. Three paths have to be entered. -- --One pointing to your B<rrdtool> installation -- -- use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl); -- --One pointing to the place where you have installed the SmokePing libraries -- -- use lib qw(/home/oetiker/public_html/smokeping/lib); -- --The third path is the argument to the Smokeping::main command. It points to --the SmokePing configuration file. -- -- use Smokeping; -- Smokeping::main("/home/oetiker/.smokeping/config"); -+When installing SmokePing, this file has been adjusted to fit your -+local system. There should be no need for further path adjustments. - - =head1 COPYRIGHT - diff --git a/net-mgmt/smokeping/files/patch-bin-tSmoke.dist b/net-mgmt/smokeping/files/patch-bin-tSmoke.dist deleted file mode 100644 index f1eb14004b99..000000000000 --- a/net-mgmt/smokeping/files/patch-bin-tSmoke.dist +++ /dev/null @@ -1,63 +0,0 @@ ---- bin/tSmoke.dist.orig Mon Sep 19 00:50:50 2005 -+++ bin/tSmoke.dist Mon Sep 19 00:54:58 2005 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -+#!%%PERL%% - # - #----------------------------------------------- - # tSmoke.pl -@@ -50,8 +50,7 @@ - # -- Getopt::Long - # - # Point the lib variables to your implementation --use lib qw(lib); --use lib "/usr/local/rrdtool-1.0.39/lib/perl"; -+use lib qw(%%PREFIX%%/smokeping/lib); - - use Smokeping 2.000001; - use Net::SMTP; -@@ -60,7 +59,7 @@ - use RRDs; - - # Point to your Smokeping config file --my $cfgfile = "etc/config.dist"; -+my $cfgfile = "%%PREFIX%%/etc/config"; - - # global variables - my $cfg; -@@ -479,33 +478,8 @@ - - =head1 SETUP - --When installing tSmoke, some variables must be adjusted to fit your local system. -- --We need to use the following B<libraries>: -- --=over -- --=item Smokeping -- --=item RRDTool Perl bindings -- --=item Getopt::Long -- --=back -- --Set up your libraries: -- -- use lib "/usr/local/smokeping/lib"; -- use lib "/usr/local/rrdtool-1.0.39/lib/perl"; -- --Point to your Smokeping B<config> file -- -- my $cfgfile = "/usr/local/smokeping/etc/config"; -- --Modify the Smokeping config file to include a path for tmail in the --General section: -- -- tmail = /usr/local/smokeping/etc/tmail -+When installing tSmoke, this file has been adjusted to fit your -+local system. There should be no need for further path adjustments. - - =head1 COPYRIGHT - diff --git a/net-mgmt/smokeping/files/patch-etc-config.dist b/net-mgmt/smokeping/files/patch-etc-config.dist deleted file mode 100644 index 1269ebf8109c..000000000000 --- a/net-mgmt/smokeping/files/patch-etc-config.dist +++ /dev/null @@ -1,42 +0,0 @@ ---- etc/config.dist.orig Thu Jun 2 15:47:39 2005 -+++ etc/config.dist Sun Sep 18 18:14:12 2005 -@@ -7,14 +7,14 @@ - owner = Joe Random - contact = joe@some.place.xyz - mailhost = smtp.mailhost.abc --sendmail = /usr/lib/sendmail --imgcache = /home/oetiker/public_html/.simg --imgurl = ../.simg --datadir = /home/oetiker/data/projects/AADJ-smokeping/dist/var --piddir = /home/oetiker/data/projects/AADJ-smokeping/dist/var -+sendmail = /usr/sbin/sendmail -+imgcache = %%PREFIX%%/smokeping/htdocs/img -+imgurl = /smokeimg -+datadir = %%PREFIX%%/var/smokeping -+piddir = %%PREFIX%%/var/smokeping - cgiurl = http://people.ee.ethz.ch/~oetiker/smokeping/smokeping.cgi --smokemail = /home/oetiker/data/projects/AADJ-smokeping/dist/etc/smokemail.dist --tmail = /home/oetiker/data/projects/AADJ-smokeping/dist/etc/tmail.dist -+smokemail = %%PREFIX%%/etc/smokeping/smokemail -+tmail = %%PREFIX%%/etc/smokeping/tmail - # specify this to get syslog logging - syslogfacility = local0 - # each probe is now run in its own process -@@ -66,7 +66,7 @@ - - *** Presentation *** - --template = /home/oetiker/data/projects/AADJ-smokeping/dist/etc/basepage.html.dist -+template = %%PREFIX%%/etc/smokeping/basepage.html - - + overview - -@@ -89,7 +89,7 @@ - - + FPing - --binary = /usr/sepp/bin/fping -+binary = %%PREFIX%%/sbin/fping - - *** Targets *** - diff --git a/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist b/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist deleted file mode 100644 index 3623eb494057..000000000000 --- a/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist +++ /dev/null @@ -1,19 +0,0 @@ ---- htdocs/smokeping.cgi.dist.orig Mon Sep 26 22:15:57 2005 -+++ htdocs/smokeping.cgi.dist Thu Oct 6 10:40:18 2005 -@@ -1,13 +1,12 @@ --#!/usr/sepp/bin/speedy -w -+#!%%PREFIX%%/bin/speedy -w - # -*-perl-*- - --use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl); --use lib qw(/home/oetiker/data/projects/AADJ-smokeping/dist/lib); -+use lib qw(%%PREFIX%%/smokeping/lib); - use CGI::Carp qw(fatalsToBrowser); - - use Smokeping 2.000005; - --Smokeping::cgi("/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config"); -+Smokeping::cgi("%%PREFIX%%/etc/smokeping/config"); - - =head1 NAME - diff --git a/net-mgmt/smokeping/files/smokeping.sh b/net-mgmt/smokeping/files/smokeping.sh deleted file mode 100644 index e47e7470d6d2..000000000000 --- a/net-mgmt/smokeping/files/smokeping.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then - echo "$0: Cannot determine the PREFIX" >&2 - exit 1 -fi - -case "$1" in -start) - [ -r ${PREFIX}/etc/smokeping/config ] && \ - su -f -m smokeping -c ${PREFIX}/bin/smokeping > /dev/null && \ - echo -n ' smokeping' - ;; -restart) - [ -r ${PREFIX}/etc/smokeping/config ] && \ - su -f -m smokeping -c "${PREFIX}/bin/smokeping --restart" > /dev/null && \ - echo -n ' smokeping' - ;; -stop) - [ -r ${PREFIX}/var/smokeping/smokeping.pid ] && \ - su -f -m smokeping -c "kill `cat ${PREFIX}/var/smokeping/smokeping.pid`" > /dev/null && \ - echo -n ' smokeping' - ;; -*) - echo "Usage: `basename $0` {start|restart|stop}" >&2 - ;; -esac - -exit 0 diff --git a/net-mgmt/smokeping/pkg-deinstall b/net-mgmt/smokeping/pkg-deinstall deleted file mode 100644 index e02852135496..000000000000 --- a/net-mgmt/smokeping/pkg-deinstall +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -echo 'Stopping Smokeping daemon.' -if [ -f ${PKG_PREFIX}/var/smokeping/smokeping.pid ]; then - if [ -x ${PKG_PREFIX}/etc/rc.d/smokeping.sh ]; then - ${PKG_PREFIX}/etc/rc.d/smokeping.sh stop > /dev/null - fi - rm ${PKG_PREFIX}/var/smokeping/smokeping.pid -fi - -case $2 in -POST-DEINSTALL) - - if [ ! -n "$BATCH" ]; then - - if [ -d ${PKG_PREFIX}/etc/smokeping -o -d ${PKG_PREFIX}/var/smokeping ]; then - echo '=================================================================' - echo - echo 'You seem to have some custom config and data.' - echo 'The "%%USER%%" user and "%%GROUP%%" group were therefore not deleted.' - echo - echo 'You may delete them with:' - echo - echo ' pw groupdel %%GROUP%%' - echo ' pw userdel %%USER%%' - echo - echo 'The config and data can be deleted with:' - echo - echo " rm -R ${PKG_PREFIX}/etc/smokeping" - echo " rm -R ${PKG_PREFIX}/var/smokeping" - echo - echo '=================================================================' - else - if pw groupdel -n %%GROUP%%; then - echo 'Removed group "%%GROUP%%".' - else - echo 'Removing group "%%GROUP%%" failed...' - exit 1 - fi - - if pw userdel -n %%USER%%; then - echo 'Removed user "%%USER%%".' - else - echo 'Removing user "%%USER%%" failed...' - exit 1 - fi - fi - fi - - exit 0 - ;; -esac diff --git a/net-mgmt/smokeping/pkg-descr b/net-mgmt/smokeping/pkg-descr deleted file mode 100644 index 4142f66a6688..000000000000 --- a/net-mgmt/smokeping/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -SmokePing is a latency logging and graphing system. It consists of a -daemon process which organizes the latency measurements and a CGI -which presents the graphs. - -WWW: http://people.ee.ethz.ch/~oetiker/webtools/smokeping/ - ---lars -lars@thegler.dk diff --git a/net-mgmt/smokeping/pkg-install b/net-mgmt/smokeping/pkg-install deleted file mode 100644 index b0c96b325b67..000000000000 --- a/net-mgmt/smokeping/pkg-install +++ /dev/null @@ -1,51 +0,0 @@ -#! /bin/sh -# -# $FreeBSD$ -# - -case $2 in -PRE-INSTALL) - if ! pw groupshow %%WWW_GROUP%% 2>/dev/null 1>&2; then - if pw groupadd %%WWW_GROUP%% -g %%WWW_GID%%; then - echo 'Added group "%%WWW_GROUP%%".' - else - echo 'Adding group "%%WWW_GROUP%%" failed...' - exit 1 - fi - fi - - if ! pw usershow %%WWW_USER%% 2>/dev/null 1>&2; then - if pw useradd %%WWW_USER%% -u %%WWW_UID%% -g %%WWW_GROUP%% -h - \ - -s /sbin/nologin -d /nonexistent \ - -c "World Wide Web Owner"; \ - then - echo 'Added user "%%WWW_USER%%".' - else - echo 'Adding user "%%WWW_USER%%" failed...' - exit 1 - fi - fi - - if ! pw groupshow %%GROUP%% 2>/dev/null 1>&2; then - if pw groupadd %%GROUP%%; then - echo 'Added group "%%GROUP%%".' - else - echo 'Adding group "%%GROUP%%" failed...' - exit 1 - fi - fi - - if ! pw usershow %%USER%% 2>/dev/null 1>&2; then - if pw useradd %%USER%% -g %%GROUP%% -h - \ - -s /nonexistent -c "SmokePing Daemon"; \ - then - echo 'Added user "%%USER%%".' - else - echo 'Adding user "%%USER%%" failed...' - exit 1 - fi - fi - - exit 0 - ;; -esac diff --git a/net-mgmt/smokeping/pkg-message b/net-mgmt/smokeping/pkg-message deleted file mode 100644 index b95c237cbed4..000000000000 --- a/net-mgmt/smokeping/pkg-message +++ /dev/null @@ -1,33 +0,0 @@ -================================================================= - -SmokePing has now been installed in %%PREFIX%%/smokeping/. - -NOTE: A set of sample configuration files have been installed: - - %%PREFIX%%/etc/smokeping/config - %%PREFIX%%/etc/smokeping/smokemail - %%PREFIX%%/etc/smokeping/basepage.html - %%PREFIX%%/etc/smokeping/tmail - -You *MUST* edit these to suit your requirements. Please read the -manpages 'smokeping_install' and 'smokeping_config' for further -details on installation and configuration. - -If you are upgrading from a previous version of Smokeping, the -manpage 'smokeping_upgrade' may be of help. - - -Once configured, you can start SmokePing data collection by running: - - %%PREFIX%%/etc/rc.d/smokeping.sh start - - -To enable Apache web access, add the following to your -%%PREFIX%%/etc/apache/httpd.conf: - - ScriptAlias /smokeping.cgi %%PREFIX%%/smokeping/htdocs/smokeping.cgi - Alias /smokeimg/ %%PREFIX%%/smokeping/htdocs/img/ - -Enjoy! - -================================================================= diff --git a/net-mgmt/smokeping/pkg-plist b/net-mgmt/smokeping/pkg-plist deleted file mode 100644 index 564a10446dc3..000000000000 --- a/net-mgmt/smokeping/pkg-plist +++ /dev/null @@ -1,167 +0,0 @@ -bin/smokeping -bin/tSmoke -etc/rc.d/smokeping.sh -@unexec if cmp -s %D/etc/smokeping/basepage.html %D/etc/smokeping/basepage.html.dist; then rm -f %D/etc/smokeping/basepage.html; fi -etc/smokeping/basepage.html.dist -@exec [ -f %B/basepage.html ] || cp %B/%f %B/basepage.html -@unexec if cmp -s %D/etc/smokeping/config %D/etc/smokeping/config.dist; then rm -f %D/etc/smokeping/config; fi -etc/smokeping/config.dist -@exec [ -f %B/config ] || cp %B/%f %B/config -@unexec if cmp -s %D/etc/smokeping/smokemail %D/etc/smokeping/smokemail.dist; then rm -f %D/etc/smokeping/smokemail; fi -etc/smokeping/smokemail.dist -@exec [ -f %B/smokemail ] || cp %B/%f %B/smokemail -@unexec if cmp -s %D/etc/smokeping/tmail %D/etc/smokeping/tmail.dist; then rm -f %D/etc/smokeping/tmail; fi -etc/smokeping/tmail.dist -@exec [ -f %B/tmail ] || cp %B/%f %B/tmail -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/Smokeping.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping.txt -%%PORTDOCS%%%%DOCSDIR%%/smokeping.cgi.html -%%PORTDOCS%%%%DOCSDIR%%/smokeping.cgi.txt -%%PORTDOCS%%%%DOCSDIR%%/smokeping.html -%%PORTDOCS%%%%DOCSDIR%%/smokeping.txt -%%PORTDOCS%%%%DOCSDIR%%/smokeping_config.html -%%PORTDOCS%%%%DOCSDIR%%/smokeping_config.txt -%%PORTDOCS%%%%DOCSDIR%%/smokeping_install.html -%%PORTDOCS%%%%DOCSDIR%%/smokeping_install.txt -%%PORTDOCS%%%%DOCSDIR%%/Config/Grammar.html -%%PORTDOCS%%%%DOCSDIR%%/Config/Grammar.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/matchers/Avgratio.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/matchers/Avgratio.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/matchers/base.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/matchers/base.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/matchers/Median.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/matchers/Median.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/AnotherDNS.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/AnotherDNS.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/AnotherSSH.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/AnotherSSH.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/CiscoRTTMonDNS.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/CiscoRTTMonDNS.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/CiscoRTTMonEchoICMP.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/CiscoRTTMonEchoICMP.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/CiscoRTTMonTcpConnect.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/CiscoRTTMonTcpConnect.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/Curl.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/Curl.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/DNS.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/DNS.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPing.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPing.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingChargen.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingChargen.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingDiscard.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingDiscard.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingHttp.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingHttp.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingHttps.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingHttps.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingIcp.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingIcp.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingSmtp.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingSmtp.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/FPing.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/FPing.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/FPing6.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/FPing6.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/IOSPing.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/IOSPing.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/LDAP.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/LDAP.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/Radius.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/Radius.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/RemoteFPing.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/RemoteFPing.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/SSH.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/SSH.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/TelnetIOSPing.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/TelnetIOSPing.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/base.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/base.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/basefork.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/basefork.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/basevars.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/basevars.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/passwordchecker.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/passwordchecker.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/skel.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/skel.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/Examples.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/Examples.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/RRDtools.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/RRDtools.txt -%%PORTDOCS%%%%DOCSDIR%%/smokeping_examples.html -%%PORTDOCS%%%%DOCSDIR%%/smokeping_examples.txt -%%PORTDOCS%%%%DOCSDIR%%/smokeping_extend.html -%%PORTDOCS%%%%DOCSDIR%%/smokeping_extend.txt -%%PORTDOCS%%%%DOCSDIR%%/smokeping_upgrade.html -%%PORTDOCS%%%%DOCSDIR%%/smokeping_upgrade.txt -%%PORTDOCS%%%%DOCSDIR%%/tSmoke.html -%%PORTDOCS%%%%DOCSDIR%%/tSmoke.txt -%%PORTDOCS%%%%EXAMPLESDIR%%/config.echoping -%%PORTDOCS%%%%EXAMPLESDIR%%/config.fping-instances -%%PORTDOCS%%%%EXAMPLESDIR%%/config.multiple-probes -%%PORTDOCS%%%%EXAMPLESDIR%%/config.simple -%%PORTDOCS%%%%EXAMPLESDIR%%/config.targetvars-with-Curl -%%PORTDOCS%%%%EXAMPLESDIR%%/config.template -smokeping/htdocs/smokeping.cgi -smokeping/lib/Smokeping.pm -smokeping/lib/Smokeping/ciscoRttMonMIB.pm -smokeping/lib/Smokeping/matchers/base.pm -smokeping/lib/Smokeping/matchers/Median.pm -smokeping/lib/Smokeping/matchers/Avgratio.pm -smokeping/lib/Smokeping/probes/AnotherDNS.pm -smokeping/lib/Smokeping/probes/AnotherSSH.pm -smokeping/lib/Smokeping/probes/CiscoRTTMonDNS.pm -smokeping/lib/Smokeping/probes/CiscoRTTMonEchoICMP.pm -smokeping/lib/Smokeping/probes/CiscoRTTMonTcpConnect.pm -smokeping/lib/Smokeping/probes/Curl.pm -smokeping/lib/Smokeping/probes/DNS.pm -smokeping/lib/Smokeping/probes/EchoPing.pm -smokeping/lib/Smokeping/probes/EchoPingChargen.pm -smokeping/lib/Smokeping/probes/EchoPingDiscard.pm -smokeping/lib/Smokeping/probes/EchoPingHttp.pm -smokeping/lib/Smokeping/probes/EchoPingHttps.pm -smokeping/lib/Smokeping/probes/EchoPingIcp.pm -smokeping/lib/Smokeping/probes/EchoPingSmtp.pm -smokeping/lib/Smokeping/probes/FPing.pm -smokeping/lib/Smokeping/probes/FPing6.pm -smokeping/lib/Smokeping/probes/IOSPing.pm -smokeping/lib/Smokeping/probes/LDAP.pm -smokeping/lib/Smokeping/probes/Radius.pm -smokeping/lib/Smokeping/probes/RemoteFPing.pm -smokeping/lib/Smokeping/probes/SSH.pm -smokeping/lib/Smokeping/probes/TelnetIOSPing.pm -smokeping/lib/Smokeping/probes/base.pm -smokeping/lib/Smokeping/probes/basefork.pm -smokeping/lib/Smokeping/probes/basevars.pm -smokeping/lib/Smokeping/probes/passwordchecker.pm -smokeping/lib/Smokeping/probes/skel.pm -smokeping/lib/Smokeping/Examples.pm -smokeping/lib/Smokeping/RRDtools.pm -smokeping/lib/Config/Grammar.pm -@dirrmtry etc/smokeping -@exec mkdir -p %D/smokeping/htdocs/img; chown www:www %D/smokeping/htdocs/img -@unexec rm -rf %D/smokeping/htdocs/img 2>/dev/null || true -@exec mkdir -p %D/var/smokeping -@exec chown smokeping:smokeping %D/var/smokeping -@dirrmtry var/smokeping -@dirrmtry var -@dirrm smokeping/htdocs -@dirrm smokeping/lib/Config -@dirrm smokeping/lib/Smokeping/probes -@dirrm smokeping/lib/Smokeping/matchers -@dirrm smokeping/lib/Smokeping -@dirrm smokeping/lib -%%PORTDOCS%%@dirrm %%DOCSDIR%%/Config -%%PORTDOCS%%@dirrm %%DOCSDIR%%/Smokeping/probes -%%PORTDOCS%%@dirrm %%DOCSDIR%%/Smokeping/matchers -%%PORTDOCS%%@dirrm %%DOCSDIR%%/Smokeping -%%PORTDOCS%%@dirrm %%DOCSDIR%% -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% -@dirrmtry smokeping diff --git a/net-mgmt/zabbix-agent/Makefile b/net-mgmt/zabbix-agent/Makefile deleted file mode 100644 index ab2a6bc70bf4..000000000000 --- a/net-mgmt/zabbix-agent/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# Ports collection makefile for: zabbix -# Date created: Jun 18 2003 -# Whom: Sergey Akifyev <asa@gascom.ru> -# -# $FreeBSD$ -# - -PORTNAME= zabbix-agent -CATEGORIES= net - -MAINTAINER= asa@gascom.ru -COMMENT= Very advanced network monitoring system (agent only) - -ZABBIX_AGENT_ONLY=yes -MASTERDIR= ${.CURDIR}/../../net-mgmt/zabbix - -.include "${MASTERDIR}/Makefile" diff --git a/net-mgmt/zabbix2-agent/Makefile b/net-mgmt/zabbix2-agent/Makefile deleted file mode 100644 index ab2a6bc70bf4..000000000000 --- a/net-mgmt/zabbix2-agent/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# Ports collection makefile for: zabbix -# Date created: Jun 18 2003 -# Whom: Sergey Akifyev <asa@gascom.ru> -# -# $FreeBSD$ -# - -PORTNAME= zabbix-agent -CATEGORIES= net - -MAINTAINER= asa@gascom.ru -COMMENT= Very advanced network monitoring system (agent only) - -ZABBIX_AGENT_ONLY=yes -MASTERDIR= ${.CURDIR}/../../net-mgmt/zabbix - -.include "${MASTERDIR}/Makefile" diff --git a/net-mgmt/zabbix2/Makefile b/net-mgmt/zabbix2/Makefile deleted file mode 100644 index dc3a7a463c5a..000000000000 --- a/net-mgmt/zabbix2/Makefile +++ /dev/null @@ -1,112 +0,0 @@ -# Ports collection makefile for: zabbix -# Date created: Jun 18 2003 -# Whom: Sergey Akifyev <asa@gascom.ru> -# -# $FreeBSD$ -# - -PORTNAME= zabbix -PORTVERSION= 1.0 -PORTREVISION= 4 -PORTEPOCH= 1 -CATEGORIES?= net-mgmt -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} - -MAINTAINER= asa@gascom.ru -COMMENT= Very advanced network monitoring system - -.ifndef(ZABBIX_AGENT_ONLY) -OPTIONS= PGSQL "Use a PostgreSQL backend" off \ - MYSQL "Use a MySQL backend" on \ - FPING "Use fping for pinging hosts" on -.endif - -.ifdef(ZABBIX_AGENT_ONLY) -PKGNAMESUFFIX= -agent -PLIST= ${MASTERDIR}/pkg-plist.agent -.else # ZABBIX_AGENT_ONLY -LIB_DEPENDS= netsnmp.9:${PORTSDIR}/net-mgmt/net-snmp -USE_PHP= gd snmp sockets -SUB_FILES= pkg-message -.endif # ZABBIX_AGENT_ONLY - -.include <bsd.port.pre.mk> - -.ifndef(WITHOUT_FPING) -RUN_DEPENDS+= ${LOCALBASE}/sbin/fping:${PORTSDIR}/net/fping -.endif - -.ifndef(ZABBIX_AGENT_ONLY) -.ifndef(WITH_PGSQL) -.ifdef(WITHOUT_MYSQL) -IGNORE= You should configure to use either a MySQL or PostgreSQL backend -.endif -.endif - -.ifdef(WITH_PGSQL) -USE_PGSQL= yes -CONFIGURE_ARGS+=--with-pgsql -.endif -.ifndef(WITHOUT_MYSQL) -USE_MYSQL= yes -CONFIGURE_ARGS= --with-mysql -.endif -CONFIGURE_ARGS+=--with-net-snmp -.endif # ZABBIX_AGENT_ONLY - -USE_RC_SUBR= zabbix_agent.sh -.if !defined(ZABBIX_AGENT_ONLY) -USE_RC_SUBR+= zabbix_suckerd.sh -.endif - -USE_REINPLACE= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include - -ZABBIX_BINARIES= zabbix_agent zabbix_agentd zabbix_sender -ZABBIX_CONFIGS= zabbix_agent.conf zabbix_agentd.conf -.ifndef(ZABBIX_AGENT_ONLY) -ZABBIX_BINARIES+= zabbix_suckerd zabbix_trapper zabbix_trapperd -ZABBIX_CONFIGS+= zabbix_suckerd.conf zabbix_trapper.conf zabbix_trapperd.conf -.endif - -pre-patch: -.ifndef(ZABBIX_AGENT_ONLY) -post-patch: - @${REINPLACE_CMD} 's|%LOCALBASE%|${LOCALBASE}|' ${WRKSRC}/src/zabbix_sucker/zabbix_sucker.c -.ifdef WITHOUT_FPING - @${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/misc/conf/zabbix_suckerd.conf -.endif -.endif # ZABBIX_AGENT_ONLY - -.if ${ARCH} == "amd64" -post-configure: - ${ECHO_CMD} "#define HAVE_VA_COPY 1" >> ${WRKSRC}/include/config.h -.endif - -do-install: -.for FILE in ${ZABBIX_BINARIES} - ${INSTALL_PROGRAM} ${WRKSRC}/bin/${FILE} ${PREFIX}/bin -.endfor - ${MKDIR} ${PREFIX}/etc/zabbix - ${LN} -sf ${PREFIX}/etc/zabbix /etc/zabbix -.for FILE in ${ZABBIX_CONFIGS} - ${INSTALL_DATA} ${WRKSRC}/misc/conf/${FILE} \ - ${PREFIX}/etc/zabbix/${FILE}.sample -.endfor -.ifndef(ZABBIX_AGENT_ONLY) - ${MKDIR} ${PREFIX}/share/zabbix - ${MKDIR} ${PREFIX}/share/zabbix/create - ${CP} -Rf ${WRKSRC}/frontends/* ${PREFIX}/share/zabbix - ${CP} -Rf ${WRKSRC}/create/* ${PREFIX}/share/zabbix/create - ${CP} -Rf ${WRKSRC}/upgrades/dbpatches ${PREFIX}/share/zabbix - ${INSTALL_SCRIPT} ${MASTERDIR}/scripts/dbsetup.sh \ - ${PREFIX}/share/zabbix/create -.endif - ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL -.ifndef(ZABBIX_AGENT_ONLY) - @${CAT} ${PKGMESSAGE} -.endif - -.include <bsd.port.post.mk> diff --git a/net-mgmt/zabbix2/distinfo b/net-mgmt/zabbix2/distinfo deleted file mode 100644 index 4216dd0b2af9..000000000000 --- a/net-mgmt/zabbix2/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (zabbix-1.0.tar.gz) = e83a3b92f13942081ed2f3fe3f3084d8 -SHA256 (zabbix-1.0.tar.gz) = 3368a2bd825fdc32075b469779037e556b3d02b64bcf8412cd3b8988cafb5e2e -SIZE (zabbix-1.0.tar.gz) = 1847471 diff --git a/net-mgmt/zabbix2/files/patch-src-zabbix_sucker-Makefile.in b/net-mgmt/zabbix2/files/patch-src-zabbix_sucker-Makefile.in deleted file mode 100644 index d72d0587df50..000000000000 --- a/net-mgmt/zabbix2/files/patch-src-zabbix_sucker-Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- src/zabbix_sucker/Makefile.in.orig Mon Sep 1 21:34:12 2003 -+++ src/zabbix_sucker/Makefile.in Mon Sep 1 21:34:37 2003 -@@ -1,7 +1,7 @@ - # Build rules - --INCLUDE = @MYSQL_INCLUDE@ @PGSQL_INCLUDE@ @SNMP_INCLUDE@ --LIBS = @LIBS@ @MYSQL_LFLAGS@ @PGSQL_LFLAGS@ @SNMP_LFLAGS@ -+INCLUDE = @MYSQL_INCLUDE@ @PGSQL_INCLUDE@ @SNMP_INCLUDE@ -I$(LOCALBASE)/include -+LIBS = @LIBS@ @MYSQL_LFLAGS@ @PGSQL_LFLAGS@ @SNMP_LFLAGS@ -L$(LOCALBASE)/lib - - all: - diff --git a/net-mgmt/zabbix2/files/patch-src-zabbix_sucker-zabbix_sucker.c b/net-mgmt/zabbix2/files/patch-src-zabbix_sucker-zabbix_sucker.c deleted file mode 100644 index 1b8ca44f8aac..000000000000 --- a/net-mgmt/zabbix2/files/patch-src-zabbix_sucker-zabbix_sucker.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/zabbix_sucker/zabbix_sucker.c.orig Wed Jan 14 07:43:02 2004 -+++ src/zabbix_sucker/zabbix_sucker.c Wed Jan 14 07:43:21 2004 -@@ -254,7 +254,7 @@ - } - if(CONFIG_FPING_LOCATION == NULL) - { -- CONFIG_FPING_LOCATION=strdup("/usr/sbin/fping"); -+ CONFIG_FPING_LOCATION=strdup("%LOCALBASE%/sbin/fping"); - } - } - diff --git a/net-mgmt/zabbix2/files/pkg-message.in b/net-mgmt/zabbix2/files/pkg-message.in deleted file mode 100644 index 99c664bc233a..000000000000 --- a/net-mgmt/zabbix2/files/pkg-message.in +++ /dev/null @@ -1,8 +0,0 @@ -==================================================== -ACHTUNG!!! - -Run dbsetup.sh from %%PREFIX%%/share/zabbix/create -to setup database tables. Arguments, given to -it will be passed to mysql client, allowing -connection do non-local MySQL server -==================================================== diff --git a/net-mgmt/zabbix2/files/zabbix_agent.sh.in b/net-mgmt/zabbix2/files/zabbix_agent.sh.in deleted file mode 100644 index 3d6b3f081e1d..000000000000 --- a/net-mgmt/zabbix2/files/zabbix_agent.sh.in +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -. %%RC_SUBR%% - -name="zabbix_agentd" -rcvar=`set_rcvar` -command="${prefix}/bin/${name}" -required_files="/etc/zabbix/${name}.conf" - -run_rc_command "$1" diff --git a/net-mgmt/zabbix2/files/zabbix_suckerd.sh.in b/net-mgmt/zabbix2/files/zabbix_suckerd.sh.in deleted file mode 100644 index e038375d80b8..000000000000 --- a/net-mgmt/zabbix2/files/zabbix_suckerd.sh.in +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -. %%RC_SUBR%% - -name="zabbix_suckerd" -rcvar=`set_rcvar` -command="${prefix}/bin/${name}" -required_files="/etc/zabbix/${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 a85383fa4768..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://zabbix.sourceforge.net/ diff --git a/net-mgmt/zabbix2/pkg-install b/net-mgmt/zabbix2/pkg-install deleted file mode 100644 index bd120120918d..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=112 -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 c2c4ab66dfa5..000000000000 --- a/net-mgmt/zabbix2/pkg-plist +++ /dev/null @@ -1,199 +0,0 @@ -etc/zabbix/zabbix_agent.conf.sample -etc/zabbix/zabbix_agentd.conf.sample -etc/zabbix/zabbix_suckerd.conf.sample -etc/zabbix/zabbix_trapper.conf.sample -etc/zabbix/zabbix_trapperd.conf.sample -bin/zabbix_agent -bin/zabbix_agentd -bin/zabbix_sender -bin/zabbix_suckerd -bin/zabbix_trapper -bin/zabbix_trapperd -%%DATADIR%%/php/audio/disaster_on.wav -%%DATADIR%%/php/audio/warning_off.wav -%%DATADIR%%/php/audio/warning_on.wav -%%DATADIR%%/php/about.php -%%DATADIR%%/php/actions.php -%%DATADIR%%/php/alarms.php -%%DATADIR%%/php/alerts.php -%%DATADIR%%/php/chart.php -%%DATADIR%%/php/chart2.php -%%DATADIR%%/php/chart3.php -%%DATADIR%%/php/chart4.php -%%DATADIR%%/php/chart5.php -%%DATADIR%%/php/chart_diff.php -%%DATADIR%%/php/chart_sla.php -%%DATADIR%%/php/charts.php -%%DATADIR%%/php/compare.php -%%DATADIR%%/php/config.php -%%DATADIR%%/php/css.css -%%DATADIR%%/php/graph.php -%%DATADIR%%/php/graphs.php -%%DATADIR%%/php/helpdesk.php -%%DATADIR%%/php/history.php -%%DATADIR%%/php/hosts.php -%%DATADIR%%/php/index.php -%%DATADIR%%/php/items.php -%%DATADIR%%/php/latest.php -%%DATADIR%%/php/latestalarms.php -%%DATADIR%%/php/map.php -%%DATADIR%%/php/maps.php -%%DATADIR%%/php/media.php -%%DATADIR%%/php/queue.php -%%DATADIR%%/php/report1.php -%%DATADIR%%/php/report2.php -%%DATADIR%%/php/report3.php -%%DATADIR%%/php/screenconf.php -%%DATADIR%%/php/screenedit.php -%%DATADIR%%/php/screens.php -%%DATADIR%%/php/services.php -%%DATADIR%%/php/srv_status.php -%%DATADIR%%/php/sysmap.php -%%DATADIR%%/php/sysmaps.php -%%DATADIR%%/php/tr_comments.php -%%DATADIR%%/php/tr_status.php -%%DATADIR%%/php/trend.php -%%DATADIR%%/php/trends.php -%%DATADIR%%/php/triggers.php -%%DATADIR%%/php/users.php -%%DATADIR%%/php/images/sysmaps/old/Notebook.png -%%DATADIR%%/php/images/sysmaps/old/Hub.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/images/sysmaps/UPS.png -%%DATADIR%%/php/images/sysmaps/Notebook.png -%%DATADIR%%/php/images/sysmaps/Hub.png -%%DATADIR%%/php/images/sysmaps/Printer.png -%%DATADIR%%/php/images/sysmaps/Router.png -%%DATADIR%%/php/images/sysmaps/Server.png -%%DATADIR%%/php/images/sysmaps/Workstation.png -%%DATADIR%%/php/images/sysmaps/README -%%DATADIR%%/php/images/sysmaps/Phone.png -%%DATADIR%%/php/images/sysmaps/Network.png -%%DATADIR%%/php/images/sysmaps/Satellite.png -%%DATADIR%%/php/include/.htaccess -%%DATADIR%%/php/include/classes.inc.php -%%DATADIR%%/php/include/config.inc.php -%%DATADIR%%/php/include/db.inc.php -%%DATADIR%%/php/include/defines.inc.php -%%DATADIR%%/create/data/data.sql -%%DATADIR%%/create/mysql/schema.sql -%%DATADIR%%/create/postgresql/schema.sql -%%DATADIR%%/create/dbsetup.sh -%%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11/mysql/patch.sql -%%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11/postgresql/patch.sql -%%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12/mysql/patch.sql -%%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12/postgresql/patch.sql -%%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1/mysql/patch.sql -%%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1/postgresql/patch.sql -%%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4/mysql/patch.sql -%%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4/postgresql/patch.sql -%%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5/mysql/patch.sql -%%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5/postgresql/patch.sql -%%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7/mysql/patch.sql -%%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7/postgresql/patch.sql -%%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8/mysql/patch.sql -%%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8/postgresql/patch.sql -%%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9/mysql/patch.sql -%%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9/postgresql/patch.sql -%%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10/mysql/patch.sql -%%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10/postgresql/patch.sql -%%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3/mysql/patch.sql -%%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3/postgresql/patch.sql -%%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4/mysql/patch.sql -%%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4/postgresql/patch.sql -%%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5/mysql/patch.sql -%%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5/postgresql/patch.sql -%%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6/mysql/patch.sql -%%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6/postgresql/patch.sql -%%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7/mysql/patch.sql -%%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7/postgresql/patch.sql -%%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8/mysql/patch.sql -%%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8/postgresql/patch.sql -%%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9/mysql/patch.sql -%%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9/postgresql/patch.sql -%%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10/mysql/patch.sql -%%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10/postgresql/patch.sql -%%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/mysql/patch.sql -%%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/postgresql/patch.sql -%%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/mysql/patch.sql -%%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/postgresql/patch.sql -%%DATADIR%%/dbpatches/1.0beta13_to_1.0beta14/mysql/patch.sql -%%DATADIR%%/dbpatches/1.0beta13_to_1.0beta14/postgresql/patch.sql -@dirrm etc/zabbix -@dirrm %%DATADIR%%/php/audio -@dirrm %%DATADIR%%/php/images/sysmaps/old -@dirrm %%DATADIR%%/php/images/sysmaps -@dirrm %%DATADIR%%/php/images -@dirrm %%DATADIR%%/php/include -@dirrm %%DATADIR%%/php -@dirrm %%DATADIR%%/create/data -@dirrm %%DATADIR%%/create/mysql -@dirrm %%DATADIR%%/create/postgresql -@dirrm %%DATADIR%%/create -@dirrm %%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11/mysql -@dirrm %%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11/postgresql -@dirrm %%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11 -@dirrm %%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12/mysql -@dirrm %%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12/postgresql -@dirrm %%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12 -@dirrm %%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1/mysql -@dirrm %%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1/postgresql -@dirrm %%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1 -@dirrm %%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4/mysql -@dirrm %%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4/postgresql -@dirrm %%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4 -@dirrm %%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5/mysql -@dirrm %%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5/postgresql -@dirrm %%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5 -@dirrm %%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7/mysql -@dirrm %%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7/postgresql -@dirrm %%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7 -@dirrm %%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8/mysql -@dirrm %%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8/postgresql -@dirrm %%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8 -@dirrm %%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9/mysql -@dirrm %%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9/postgresql -@dirrm %%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9 -@dirrm %%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10/mysql -@dirrm %%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10/postgresql -@dirrm %%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10 -@dirrm %%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3/mysql -@dirrm %%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3/postgresql -@dirrm %%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3 -@dirrm %%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4/mysql -@dirrm %%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4/postgresql -@dirrm %%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4 -@dirrm %%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5/mysql -@dirrm %%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5/postgresql -@dirrm %%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5 -@dirrm %%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6/mysql -@dirrm %%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6/postgresql -@dirrm %%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6 -@dirrm %%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7/mysql -@dirrm %%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7/postgresql -@dirrm %%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7 -@dirrm %%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8/mysql -@dirrm %%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8/postgresql -@dirrm %%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8 -@dirrm %%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9/mysql -@dirrm %%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9/postgresql -@dirrm %%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9 -@dirrm %%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10/mysql -@dirrm %%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10/postgresql -@dirrm %%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10 -@dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/mysql -@dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/postgresql -@dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11 -@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/mysql -@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/postgresql -@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13 -@dirrm %%DATADIR%%/dbpatches/1.0beta13_to_1.0beta14/mysql -@dirrm %%DATADIR%%/dbpatches/1.0beta13_to_1.0beta14/postgresql -@dirrm %%DATADIR%%/dbpatches/1.0beta13_to_1.0beta14 -@dirrm %%DATADIR%%/dbpatches -@dirrm %%DATADIR%% -@exec ln -sf %D/etc/zabbix /etc/zabbix -@unexec rm /etc/zabbix diff --git a/net-mgmt/zabbix2/pkg-plist.agent b/net-mgmt/zabbix2/pkg-plist.agent deleted file mode 100644 index 2e5a1980939c..000000000000 --- a/net-mgmt/zabbix2/pkg-plist.agent +++ /dev/null @@ -1,8 +0,0 @@ -bin/zabbix_agent -bin/zabbix_agentd -bin/zabbix_sender -etc/zabbix/zabbix_agent.conf.sample -etc/zabbix/zabbix_agentd.conf.sample -@dirrm etc/zabbix -@exec ln -sf %D/etc/zabbix /etc/zabbix -@unexec rm /etc/zabbix diff --git a/net-mgmt/zabbix2/scripts/dbsetup.sh b/net-mgmt/zabbix2/scripts/dbsetup.sh deleted file mode 100644 index 240f46157640..000000000000 --- a/net-mgmt/zabbix2/scripts/dbsetup.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -{ - echo "create database zabbix; use zabbix;" - cat mysql/schema.sql data/data.sql -} | mysql ${*} |