diff options
author | adam <adam@pkgsrc.org> | 2006-01-24 22:16:55 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2006-01-24 22:16:55 +0000 |
commit | a4dca0bf59bd7fd5ed233d9fc882fd1a501db6a3 (patch) | |
tree | 7d38b0f822c429b0c57d850a23ca9a1b73def393 | |
parent | 768b44f22626ea22fa3f0f0913f7acbc9c3e4cae (diff) | |
download | pkgsrc-a4dca0bf59bd7fd5ed233d9fc882fd1a501db6a3.tar.gz |
Changes 5.3.0.1:
*** Security Fix ***
Changes 5.3:
*** Important Notes ***
Several very significant changes have been made in Net-SNMP for this
release that warrant special attention.
- shared library version number no longer matches the release number. We
now follow the versioning scheme recommended by libtool. For the 5.3
release this means that the libraries now have a SONAME ending with
".so.10", e.g. libnetsnmp.so.10.
- snmpd has not been truncating log files at startup, as documented in
the man pages, for a while now. This default behaviour has been restored.
Please use the '-A' flag if you want to continue appending to your log
files at startup.
- snmptrapd will no longer accept all traps by default. It must be
configured with authorized SNMPv1/v2c community strings and/or SNMPv3
users. Non-authorized traps/informs will be dropped.
- Due to a copyright statement that didn't allow modifications,
snmpnetstat has been completely rewritten. The new version now
accepts the same command-line options as the other tools, which
has introduced a number of incompatible changes. However, it
does now finally support SNMPv3.
-rw-r--r-- | net/net-snmp/Makefile | 5 | ||||
-rw-r--r-- | net/net-snmp/PLIST | 18 | ||||
-rw-r--r-- | net/net-snmp/buildlink3.mk | 4 | ||||
-rw-r--r-- | net/net-snmp/distinfo | 26 | ||||
-rw-r--r-- | net/net-snmp/options.mk | 6 | ||||
-rw-r--r-- | net/net-snmp/patches/patch-aa | 15 | ||||
-rw-r--r-- | net/net-snmp/patches/patch-ab | 180 | ||||
-rw-r--r-- | net/net-snmp/patches/patch-ac | 25 | ||||
-rw-r--r-- | net/net-snmp/patches/patch-ad | 15 | ||||
-rw-r--r-- | net/net-snmp/patches/patch-af | 6 | ||||
-rw-r--r-- | net/net-snmp/patches/patch-ag | 51 | ||||
-rw-r--r-- | net/net-snmp/patches/patch-ai | 21 | ||||
-rw-r--r-- | net/net-snmp/patches/patch-aj | 6 | ||||
-rw-r--r-- | net/net-snmp/patches/patch-ak | 22 | ||||
-rw-r--r-- | net/net-snmp/patches/patch-al | 26 | ||||
-rw-r--r-- | net/net-snmp/patches/patch-am | 17 | ||||
-rw-r--r-- | net/net-snmp/patches/patch-an | 60 |
17 files changed, 123 insertions, 380 deletions
diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile index 2c12a5503fb..2bbe0f04556 100644 --- a/net/net-snmp/Makefile +++ b/net/net-snmp/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.41 2006/01/18 18:14:18 kim Exp $ +# $NetBSD: Makefile,v 1.42 2006/01/24 22:16:55 adam Exp $ -DISTNAME= net-snmp-5.2.1.2 -PKGREVISION= 2 +DISTNAME= net-snmp-5.3.0.1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=net-snmp/} \ ftp://ftp.net-smnp.org/pub/sourceforge/net-snmp/ diff --git a/net/net-snmp/PLIST b/net/net-snmp/PLIST index 10a07370223..9b02fc230f1 100644 --- a/net/net-snmp/PLIST +++ b/net/net-snmp/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2005/05/03 15:40:57 wiz Exp $ +@comment $NetBSD: PLIST,v 1.13 2006/01/24 22:16:55 adam Exp $ bin/encode_keychange bin/fixproc bin/ipf-mod.pl @@ -64,6 +64,8 @@ include/net-snmp/agent/table_container.h include/net-snmp/agent/table_data.h include/net-snmp/agent/table_dataset.h include/net-snmp/agent/table_iterator.h +include/net-snmp/agent/table_tdata.h +include/net-snmp/agent/util_funcs.h include/net-snmp/agent/var_struct.h include/net-snmp/agent/watcher.h include/net-snmp/config_api.h @@ -81,6 +83,8 @@ include/net-snmp/library/container_null.h include/net-snmp/library/data_list.h include/net-snmp/library/default_store.h include/net-snmp/library/factory.h +include/net-snmp/library/fd_event_manager.h +include/net-snmp/library/file_utils.h include/net-snmp/library/getopt.h include/net-snmp/library/int64.h include/net-snmp/library/keytools.h @@ -107,7 +111,6 @@ 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 @@ -116,6 +119,7 @@ include/net-snmp/library/snmpusm.h include/net-snmp/library/snmpv3-security-includes.h include/net-snmp/library/snmpv3.h include/net-snmp/library/system.h +include/net-snmp/library/text_utils.h include/net-snmp/library/tools.h include/net-snmp/library/transform_oids.h include/net-snmp/library/ucd_compat.h @@ -138,6 +142,7 @@ 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 @@ -155,6 +160,7 @@ 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.10.h include/net-snmp/system/solaris2.6.h include/net-snmp/system/solaris2.7.h include/net-snmp/system/solaris2.8.h @@ -316,6 +322,8 @@ man/man5/mib2c.conf.5 man/man5/snmp.conf.5 man/man5/snmp_config.5 man/man5/snmpd.conf.5 +man/man5/snmpd.examples.5 +man/man5/snmpd.internal.5 man/man5/snmptrapd.conf.5 man/man5/variables.5 man/man8/snmpd.8 @@ -357,6 +365,7 @@ share/snmp/mib2c-data/m2c-internal-warning.m2i share/snmp/mib2c-data/m2c_setup_enum.m2i share/snmp/mib2c-data/m2c_setup_node.m2i share/snmp/mib2c-data/m2c_setup_table.m2i +share/snmp/mib2c-data/m2c_table_save_defaults.m2i share/snmp/mib2c-data/mfd-access-container-cached-defines.m2i share/snmp/mib2c-data/mfd-access-unsorted-external-defines.m2i share/snmp/mib2c-data/mfd-data-access.m2c @@ -366,11 +375,13 @@ share/snmp/mib2c-data/mfd-doxygen.m2c share/snmp/mib2c-data/mfd-interactive-setup.m2c share/snmp/mib2c-data/mfd-interface.m2c share/snmp/mib2c-data/mfd-makefile.m2m +share/snmp/mib2c-data/mfd-persistence.m2i share/snmp/mib2c-data/mfd-readme.m2c share/snmp/mib2c-data/mfd-top.m2c share/snmp/mib2c-data/node-get.m2i share/snmp/mib2c-data/node-set.m2i share/snmp/mib2c-data/node-storage.m2i +share/snmp/mib2c-data/node-validate.m2i share/snmp/mib2c-data/node-varbind-validate.m2i share/snmp/mib2c-data/parent-dependencies.m2i share/snmp/mib2c-data/parent-set.m2i @@ -396,6 +407,7 @@ share/snmp/mib2c.column_defines.conf share/snmp/mib2c.column_enums.conf share/snmp/mib2c.column_storage.conf share/snmp/mib2c.conf +share/snmp/mib2c.container.conf share/snmp/mib2c.create-dataset.conf share/snmp/mib2c.genhtml.conf share/snmp/mib2c.int_watch.conf @@ -405,7 +417,9 @@ share/snmp/mib2c.mfd.conf share/snmp/mib2c.notify.conf share/snmp/mib2c.old-api.conf share/snmp/mib2c.scalar.conf +share/snmp/mib2c.table_data.conf share/snmp/mibs/AGENTX-MIB.txt +share/snmp/mibs/DISMAN-EVENT-MIB.txt share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt share/snmp/mibs/DISMAN-SCRIPT-MIB.txt share/snmp/mibs/EtherLike-MIB.txt diff --git a/net/net-snmp/buildlink3.mk b/net/net-snmp/buildlink3.mk index 3fbe6929d4b..9eee157b06b 100644 --- a/net/net-snmp/buildlink3.mk +++ b/net/net-snmp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2005/07/14 20:49:49 adrianp Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2006/01/24 22:16:55 adam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ NET_SNMP_BUILDLINK3_MK:= ${NET_SNMP_BUILDLINK3_MK}+ @@ -18,4 +18,4 @@ BUILDLINK_PKGSRCDIR.net-snmp?= ../../net/net-snmp .include "../../security/tcp_wrappers/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo index e3aaf5ae971..e210d01f070 100644 --- a/net/net-snmp/distinfo +++ b/net/net-snmp/distinfo @@ -1,18 +1,12 @@ -$NetBSD: distinfo,v 1.18 2005/10/18 04:48:51 grant Exp $ +$NetBSD: distinfo,v 1.19 2006/01/24 22:16:55 adam Exp $ -SHA1 (net-snmp-5.2.1.2.tar.gz) = e93a76e081df0bfb5aa126dbad5f182176f9579e -RMD160 (net-snmp-5.2.1.2.tar.gz) = 30abfbde24caa7d04990bd111822b98b012f4a0c -Size (net-snmp-5.2.1.2.tar.gz) = 3869893 bytes -SHA1 (patch-aa) = df9bcea942743e9bcd843724612b7d82ea364eca -SHA1 (patch-ab) = 7e0fc7f52e3947d589bed850e847bd89e8daec1d -SHA1 (patch-ac) = 43dbf5519feac2a13b893f659090fa24de773ee8 -SHA1 (patch-ad) = 9703dc9451f3fa7a61bae9c8d13b916aa52c0a6b +SHA1 (net-snmp-5.3.0.1.tar.gz) = c58ddabe4281c3681a268bd48de6865e812f2ec5 +RMD160 (net-snmp-5.3.0.1.tar.gz) = 86b7e56b512faf73d2a08ac3df2def4560b62945 +Size (net-snmp-5.3.0.1.tar.gz) = 4183370 bytes SHA1 (patch-ae) = 750412088b9ccd5fb50bd6e7fc049903f6113a39 -SHA1 (patch-af) = 09c60f20179f0cadf116aa31335e9ec4ef54c4c8 -SHA1 (patch-ag) = 12455e8adc88b1c6b1b14ca1513c4753ead0e932 -SHA1 (patch-ai) = 8255b8ebfea1242076c87f879169d5f24b0f83e1 -SHA1 (patch-aj) = 495d2c2b409c5957a9baaa29ecd699a4d6946332 -SHA1 (patch-ak) = f0ad557de72a3c63f91911cd81e1dc01824a1d29 -SHA1 (patch-al) = 9eb788cd5a55823fad125744c91a6dd0bd70d5b3 -SHA1 (patch-am) = e4affa1c4c2365496d5a3b44e63d5c75c2e32f34 -SHA1 (patch-an) = 76c8996667b95bbdc0ccbe4a257d614e638c66fa +SHA1 (patch-af) = 0a2819ff5113315a64de555e22c061bddc21b44e +SHA1 (patch-ag) = e60efca053477394acaab2f67f31f5e151c80e37 +SHA1 (patch-aj) = eb17148368c9d02c0e589052b99003e7e21f2917 +SHA1 (patch-al) = 2609e273d557e1ce06c1295d86965fe26ac7ff08 +SHA1 (patch-am) = 9a9ed6feb2f249b294d939a00e92d3ef9dbde21b +SHA1 (patch-an) = 167f23c62c085efc96a25bc2be5dca3c746dde6f diff --git a/net/net-snmp/options.mk b/net/net-snmp/options.mk index 687f59b5c31..e29740c70e3 100644 --- a/net/net-snmp/options.mk +++ b/net/net-snmp/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2005/10/03 21:36:59 wiz Exp $ +# $NetBSD: options.mk,v 1.5 2006/01/24 22:16:55 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.net-snmp PKG_SUPPORTED_OPTIONS= ssl @@ -14,10 +14,10 @@ PKG_SUPPORTED_OPTIONS+= inet6 .if !empty(PKG_OPTIONS:Minet6) CONFIGURE_ARGS+= --enable-ipv6 -PLIST_SUBST+= IPV6H= +PLIST_SUBST+= IPV6H= .else CONFIGURE_ARGS+= --disable-ipv6 -PLIST_SUBST+= IPV6H="@comment " +PLIST_SUBST+= IPV6H="@comment " .endif .if !empty(PKG_OPTIONS:Mssl) diff --git a/net/net-snmp/patches/patch-aa b/net/net-snmp/patches/patch-aa deleted file mode 100644 index 50b37f54575..00000000000 --- a/net/net-snmp/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2004/05/14 13:30:34 adam Exp $ - ---- agent/snmp_agent.c.orig 2004-03-15 23:52:08.000000000 +0000 -+++ agent/snmp_agent.c -@@ -92,6 +92,10 @@ SOFTWARE. - #include <net-snmp/agent/net-snmp-agent-includes.h> - #include <net-snmp/library/snmp_assert.h> - -+#if HAVE_SYSLOG_H -+#include <syslog.h> -+#endif -+ - #ifdef USE_LIBWRAP - #include <tcpd.h> - #include <syslog.h> diff --git a/net/net-snmp/patches/patch-ab b/net/net-snmp/patches/patch-ab deleted file mode 100644 index f5ddf92d325..00000000000 --- a/net/net-snmp/patches/patch-ab +++ /dev/null @@ -1,180 +0,0 @@ -$NetBSD: patch-ab,v 1.5 2005/05/25 13:49:10 tron Exp $ - ---- local/fixproc.orig 2002-04-20 08:30:13.000000000 +0100 -+++ local/fixproc 2005-05-25 14:36:18.000000000 +0100 -@@ -129,6 +129,8 @@ - # - # Timothy Kong 3/1995 - -+use File::Temp qw(tempfile); -+ - $database_file = '/local/etc/fixproc.conf'; - - $debug = 0; # specify debug level using -dN -@@ -191,20 +193,19 @@ - sub create_sh_script - { - local ($file) = pop (@_); -+ local ($fh) = pop (@_); - local ($i) = pop (@_); - -- printf (stderr "create_sh_script\n") if ($debug > 0); -+ printf (STDERR "create_sh_script\n") if ($debug > 0); - - $! = $fixproc_error; -- open (file, ">"."$file") || die "$0: cannot open $file\n"; - while ( $shell_lines[$i] ne $shell_end_marker ) - { -- printf (file "%s", $shell_lines[$i]); -+ printf ($fh "%s", $shell_lines[$i]); - $i++; - } -- close (file); -- system "chmod +x $file"; -- return file; -+ close ($fh); -+ chmod 0755, $file; - } - - -@@ -212,7 +213,7 @@ - { - local ($proc) = pop(@_); - -- printf (stderr "do_fix\n") if ($debug > 0); -+ printf (STDERR "do_fix\n") if ($debug > 0); - - if ($fix{$proc} eq '') - { -@@ -230,14 +231,13 @@ - else - { - # it must be "shell", so execute the shell script defined in database -+ local ($tmpfh, $tmpfile) = tempfile("fix_XXXXXXXX", DIR => "/tmp"); - -- local ($tmpfile) = "/tmp/fix_$$"; -- -- &create_sh_script ($fix{$proc}, $tmpfile); -+ &create_sh_script ($fix{$proc}, $tmpfh, $tmpfile); - - # return code is number divided by 256 - $error_code = (system "$tmpfile") / 256; -- system "rm $tmpfile"; -+ unlink($tmpfile); - return ($fix_failed_error) if ($error_code != 0); - # sleep needed here? - return &do_exist ($proc); -@@ -249,7 +249,7 @@ - { - local ($proc) = pop(@_); - -- printf (stderr "do_check\n") if ($debug > 0); -+ printf (STDERR "do_check\n") if ($debug > 0); - - if ($check{$proc} eq '') - { -@@ -262,13 +262,13 @@ - # if not "exist", then it must be "shell", so execute the shell script - # defined in database - -- local ($tmpfile) = "/tmp/check_$$"; -+ local ($tmpfh, $tmpfile) = tempfile("check_XXXXXXXX", DIR => "/tmp"); - -- &create_sh_script ($check{$proc}, $tmpfile); -+ &create_sh_script ($fix{$proc}, $tmpfh, $tmpfile); - - # return code is number divided by 256 - $error_code = (system "$tmpfile") / 256; -- system "rm $tmpfile"; -+ unlink($tmpfile); - return ($check_failed_error) if ($error_code != 0); - - # check passed, continue -@@ -281,13 +281,13 @@ - { - local ($proc) = pop(@_); - -- printf (stderr "do_exist\n") if ($debug > 0); -+ printf (STDERR "do_exist\n") if ($debug > 0); - - # do ps, check to see if min <= no. of processes <= max - $! = $fixproc_error; -- open (command, "/bin/ps -e | /bin/grep $proc | /bin/wc -l |") -+ open (COMMAND, "/bin/ps -e | /bin/grep $proc | /bin/wc -l |") - || die "$0: can't run ps-grep-wc command\n"; -- $proc_count = <command>; -+ $proc_count = <COMMAND>; - if (($proc_count < $min{$proc}) || ($proc_count > $max{$proc})) - { - return $check_failed_error; -@@ -301,13 +301,13 @@ - local ($proc) = pop(@_); - local ($second_kill_needed); - -- printf (stderr "do_kill\n") if ($debug > 0); -+ printf (STDERR "do_kill\n") if ($debug > 0); - - # first try kill - $! = $fixproc_error; -- open (command, "/bin/ps -e | /bin/grep $proc |") -+ open (COMMAND, "/bin/ps -e | /bin/grep $proc |") - || die "$0: can't run ps-grep-awk command\n"; -- while (<command>) -+ while (<COMMAND>) - { - # match the first field of ps -e - $! = $fixproc_error; -@@ -318,10 +318,10 @@ - # if process still exist, try kill -9 - sleep 2; - $! = $fixproc_error; -- open (command, "/bin/ps -e | /bin/grep $proc |") -+ open (COMMAND, "/bin/ps -e | /bin/grep $proc |") - || die "$0: can't run ps-grep-awk command\n"; - $second_kill_needed = 0; -- while (<command>) -+ while (<COMMAND>) - { - # match the first field of ps -e - $! = $fixproc_error; -@@ -334,9 +334,9 @@ - # see if kill -9 worked - sleep 2; - $! = $fixproc_error; -- open (command, "/bin/ps -e | /bin/grep $proc |") -+ open (COMMAND, "/bin/ps -e | /bin/grep $proc |") - || die "$0: can't run ps-grep-awk command\n"; -- while (<command>) -+ while (<COMMAND>) - { # a process still exist, return error - return $cannot_kill_error; - } -@@ -349,7 +349,7 @@ - local ($proc) = pop(@_); - local ($error_code); - -- printf (stderr "do_restart\n") if ($debug > 0); -+ printf (STDERR "do_restart\n") if ($debug > 0); - - $error_code = &do_kill ($proc); - return $error_code if ($error_code != $no_error); -@@ -369,7 +369,7 @@ - local ($proc) = pop(@_); - local ($error_code); - -- printf (stderr "work_on_proc\n") if ($debug > 0); -+ printf (STDERR "work_on_proc\n") if ($debug > 0); - - if ($cmd_line_action eq '') - { -@@ -475,8 +475,8 @@ - local ($str2); - - $! = $fixproc_error; -- open (db, $database_file) || die 'cannot open database file $database_file\n'; -- while (<db>) -+ open (DB, $database_file) || die 'cannot open database file $database_file\n'; -+ while (<DB>) - { - if ((! /\S/) || (/^[ \t]*#.*$/)) - { diff --git a/net/net-snmp/patches/patch-ac b/net/net-snmp/patches/patch-ac deleted file mode 100644 index eedbe43747d..00000000000 --- a/net/net-snmp/patches/patch-ac +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2004/05/14 13:30:34 adam Exp $ - ---- include/net-snmp/system/netbsd.h.orig 2002-04-20 07:30:12.000000000 +0000 -+++ include/net-snmp/system/netbsd.h -@@ -1,5 +1,7 @@ - #include "bsd.h" - -+#include <sys/param.h> -+ - #define PCB_TABLE 1 - #undef TCP_SYMBOL - #define TCP_SYMBOL "tcbtable" -@@ -22,6 +24,12 @@ - #define INP_PREV_SYMBOL inp_queue.cqe_prev - #define HAVE_INPCBTABLE 1 - -+#if __NetBSD_Version__ >= 106300000 /* NetBSD 1.6ZD */ -+#undef IFADDR_SYMBOL -+#define IFADDR_SYMBOL "in_ifaddrhead" -+#undef TOTAL_MEMORY_SYMBOL -+#endif -+ - #define UTMP_FILE _PATH_UTMP - - #ifndef netbsd1 diff --git a/net/net-snmp/patches/patch-ad b/net/net-snmp/patches/patch-ad deleted file mode 100644 index 1622aed926c..00000000000 --- a/net/net-snmp/patches/patch-ad +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2005/03/30 12:10:58 adam Exp $ - ---- agent/mibgroup/ucd_snmp.h.orig 2004-08-17 09:06:38.000000000 +0000 -+++ agent/mibgroup/ucd_snmp.h -@@ -41,6 +41,10 @@ config_arch_require(freebsd5, ucd-snmp/v - config_arch_require(freebsd5, ucd-snmp/memory_freebsd2) - config_arch_require(netbsd1, ucd-snmp/vmstat_netbsd1) - config_arch_require(netbsd1, ucd-snmp/memory_netbsd1) -+config_arch_require(netbsd, ucd-snmp/vmstat_netbsd1) -+config_arch_require(netbsd, ucd-snmp/memory_netbsd1) -+config_arch_require(netbsdelf, ucd-snmp/vmstat_netbsd1) -+config_arch_require(netbsdelf, ucd-snmp/memory_netbsd1) - config_arch_require(openbsd2, ucd-snmp/vmstat_netbsd1) - config_arch_require(openbsd2, ucd-snmp/memory_netbsd1) - config_arch_require(bsdi4, ucd-snmp/vmstat_bsdi4) diff --git a/net/net-snmp/patches/patch-af b/net/net-snmp/patches/patch-af index 258933b6f1f..8aeb61b1488 100644 --- a/net/net-snmp/patches/patch-af +++ b/net/net-snmp/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.4 2005/03/30 12:10:58 adam Exp $ +$NetBSD: patch-af,v 1.5 2006/01/24 22:16:55 adam Exp $ ---- configure.orig 2005-01-25 01:00:12.000000000 +0000 +--- configure.orig 2006-01-14 02:51:51.000000000 +0100 +++ configure -@@ -16597,6 +16597,53 @@ fi +@@ -15503,6 +15503,53 @@ fi fi diff --git a/net/net-snmp/patches/patch-ag b/net/net-snmp/patches/patch-ag index fb93b73182e..74ecdb86136 100644 --- a/net/net-snmp/patches/patch-ag +++ b/net/net-snmp/patches/patch-ag @@ -1,19 +1,32 @@ -$NetBSD: patch-ag,v 1.4 2005/08/01 11:56:54 wiz Exp $ ---- agent/mibgroup/host/hr_storage.c.orig 2004-10-17 11:59:14.000000000 +1000 -+++ agent/mibgroup/host/hr_storage.c 2005-07-30 19:04:20.000000000 +1000 -@@ -164,7 +164,14 @@ - #define HRFS_mount f_mntonname - #define HRFS_HAS_FRSIZE STRUCT_STATVFS_HAS_F_FRSIZE - --#elif defined(HAVE_STATVFS) -+#elif defined(HAVE_STATVFS) && defined(__NetBSD__) -+ -+extern struct statvfs *HRFS_entry; -+extern int fscount; -+#define HRFS_statfs statvfs -+#define HRFS_mount f_mntonname -+ -+#elif defined(HAVE_STATVFS) && defined(STRUCT_STATVFS_HAS_MNT_DIR) - - extern struct mntent *HRFS_entry; - extern int fscount; +$NetBSD: patch-ag,v 1.5 2006/01/24 22:16:55 adam Exp $ + +--- agent/mibgroup/host/hr_storage.c.orig 2006-01-24 22:10:22.000000000 +0100 ++++ agent/mibgroup/host/hr_storage.c +@@ -73,6 +73,13 @@ + #endif + #endif /* vm/vm.h */ + #endif /* sys/vm.h */ ++#if HAVE_SYS_POOL_H ++#if defined(MBPOOL_SYMBOL) && defined(MCLPOOL_SYMBOL) ++#define __POOL_EXPOSE ++#include <sys/pool.h> ++#else ++#undef HAVE_SYS_POOL_H ++#endif + #if defined(HAVE_UVM_UVM_PARAM_H) && defined(HAVE_UVM_UVM_EXTERN_H) + #include <uvm/uvm_param.h> + #include <uvm/uvm_extern.h> +@@ -86,13 +93,6 @@ + #if HAVE_FCNTL_H + #include <fcntl.h> + #endif +-#if HAVE_SYS_POOL_H +-#if defined(MBPOOL_SYMBOL) && defined(MCLPOOL_SYMBOL) +-#define __POOL_EXPOSE +-#include <sys/pool.h> +-#else +-#undef HAVE_SYS_POOL_H +-#endif + #endif + #if HAVE_SYS_MBUF_H + #include <sys/mbuf.h> diff --git a/net/net-snmp/patches/patch-ai b/net/net-snmp/patches/patch-ai deleted file mode 100644 index 37078d6d236..00000000000 --- a/net/net-snmp/patches/patch-ai +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ai,v 1.2 2004/08/13 11:28:50 adam Exp $ - ---- agent/mibgroup/mibII/tcpTable.c.orig 2004-06-08 20:53:17.000000000 +0000 -+++ agent/mibgroup/mibII/tcpTable.c -@@ -88,6 +88,7 @@ struct netsnmp_inpcb_s { - int state; - netsnmp_inpcb *inp_next; - }; -+#define INP_NEXT_SYMBOL inp_next - #define TCPTABLE_ENTRY_TYPE netsnmp_inpcb - #define TCPTABLE_STATE state - #define TCPTABLE_LOCALADDRESS pcb.inp_laddr.s_addr -@@ -792,7 +793,7 @@ tcpTable_load(netsnmp_cache *cache, void - nnew->state == 8 /* closeWait */ ) - tcp_estab++; - -- entry = nnew->inp_queue.cqe_next; /* Next kernel entry */ -+ entry = nnew->INP_NEXT_SYMBOL; /* Next kernel entry */ - nnew->inp_next = tcp_head; - tcp_head = nnew; - diff --git a/net/net-snmp/patches/patch-aj b/net/net-snmp/patches/patch-aj index fa2a2b06eed..b03d14f203c 100644 --- a/net/net-snmp/patches/patch-aj +++ b/net/net-snmp/patches/patch-aj @@ -1,6 +1,6 @@ -$NetBSD: patch-aj,v 1.2 2005/03/30 12:10:58 adam Exp $ +$NetBSD: patch-aj,v 1.3 2006/01/24 22:16:55 adam Exp $ ---- net-snmp-config.in.orig 2005-03-30 13:48:27.000000000 +0000 +--- net-snmp-config.in.orig 2005-11-15 17:37:58.000000000 +0100 +++ net-snmp-config.in @@ -34,7 +34,7 @@ libdir=@libdir@ NSC_LDFLAGS="@LDFLAGS@" @@ -8,6 +8,6 @@ $NetBSD: patch-aj,v 1.2 2005/03/30 12:10:58 adam Exp $ NSC_LIBDIR=-L${libdir} -NSC_LIBS="@LIBS@ @WRAPLIBS@" +NSC_LIBS="@LIBS@" - NSC_AGENTLIBS="@AGENTLIBS@ @WRAPLIBS@" + NSC_AGENTLIBS="@AGENTLIBS@ @WRAPLIBS@ @PERLLDOPTS@" NSC_PREFIX=$prefix NSC_EXEC_PREFIX=$exec_prefix diff --git a/net/net-snmp/patches/patch-ak b/net/net-snmp/patches/patch-ak deleted file mode 100644 index 244b6d1360b..00000000000 --- a/net/net-snmp/patches/patch-ak +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ak,v 1.2 2005/08/01 11:56:54 wiz Exp $ ---- agent/mibgroup/ucd-snmp/disk.c.orig 2005-07-30 18:48:29.000000000 +1000 -+++ agent/mibgroup/ucd-snmp/disk.c 2005-07-30 18:49:20.000000000 +1000 -@@ -73,15 +73,17 @@ - #if HAVE_SYS_VFS_H - #include <sys/vfs.h> - #endif --#if (!defined(HAVE_STATVFS)) && defined(HAVE_STATFS) -+#ifdef HAVE_STATFS - #if HAVE_SYS_MOUNT_H - #include <sys/mount.h> - #endif - #if HAVE_SYS_SYSCTL_H - #include <sys/sysctl.h> - #endif -+#ifndef HAVE_STATVFS - #define statvfs statfs - #endif -+#endif - #if HAVE_VM_VM_H - #include <vm/vm.h> - #endif diff --git a/net/net-snmp/patches/patch-al b/net/net-snmp/patches/patch-al index a523e0acb9b..9b845e83771 100644 --- a/net/net-snmp/patches/patch-al +++ b/net/net-snmp/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.3 2005/10/18 04:48:52 grant Exp $ +$NetBSD: patch-al,v 1.4 2006/01/24 22:16:55 adam Exp $ ---- agent/mibgroup/host/hr_network.c.orig 2004-01-30 00:54:01.000000000 +1100 +--- agent/mibgroup/host/hr_network.c.orig 2005-10-28 20:49:36.000000000 +0200 +++ agent/mibgroup/host/hr_network.c -@@ -189,6 +189,10 @@ static short HRN_index; +@@ -193,6 +193,10 @@ static netsnmp_interface_entry *HRN_ifne static char HRN_name[MAX_PHYSADDR_LEN]; static nmapi_phystat HRN_ifnet; #define M_Interface_Scan_Next(a, b, c, d) Interface_Scan_Next(a, b, c) @@ -12,17 +12,17 @@ $NetBSD: patch-al,v 1.3 2005/10/18 04:48:52 grant Exp $ +#define M_Interface_Scan_Next(a, b, c, d) Interface_Scan_Next(a, b, c, d) #else /* hpux11 */ static char HRN_name[16]; - static struct ifnet HRN_ifnet; -@@ -215,7 +219,7 @@ Init_HR_Network(void) - int + #ifndef WIN32 +@@ -222,7 +226,7 @@ int Get_Next_HR_Network(void) { --#ifndef solaris2 -+#if (!defined solaris2 && !defined darwin) - if (M_Interface_Scan_Next(&HRN_index, HRN_name, &HRN_ifnet, NULL)) - return (HRDEV_NETWORK << HRDEV_TYPE_SHIFT) + HRN_index; - else -@@ -231,7 +235,11 @@ Save_HR_Network_Info(void) + short HRN_index; +-#if !defined( solaris2) && ! defined( WIN32 ) ++#if !defined(solaris2) && !defined(darwin) && !defined(WIN32) + if (M_Interface_Scan_Next(&HRN_index, HRN_name, &HRN_ifnet, NULL) == 0) + HRN_index = -1; + #else +@@ -245,7 +249,11 @@ Save_HR_Network_Info(void) HRN_savedFlags = HRN_ifnet.if_entry.ifOper; HRN_savedErrors = HRN_ifnet.if_entry.ifInErrors + HRN_ifnet.if_entry.ifOutErrors; @@ -32,6 +32,6 @@ $NetBSD: patch-al,v 1.3 2005/10/18 04:48:52 grant Exp $ + HRN_savedFlags = HRN_ifnet.ifm_data.ifi_ierrors + + HRN_ifnet.ifm_data.ifi_oerrors; +#else + #ifndef WIN32 HRN_savedFlags = HRN_ifnet.if_flags; HRN_savedErrors = HRN_ifnet.if_ierrors + HRN_ifnet.if_oerrors; - #endif /* hpux11 */ diff --git a/net/net-snmp/patches/patch-am b/net/net-snmp/patches/patch-am index 91428a17a69..6f49d335228 100644 --- a/net/net-snmp/patches/patch-am +++ b/net/net-snmp/patches/patch-am @@ -1,12 +1,13 @@ -$NetBSD: patch-am,v 1.2 2005/08/01 11:56:54 wiz Exp $ ---- agent/mibgroup/host/hr_swrun.c.orig 2005-07-30 21:47:42.000000000 +1000 -+++ agent/mibgroup/host/hr_swrun.c 2005-07-30 21:47:46.000000000 +1000 -@@ -1070,6 +1070,8 @@ - #else - proc_table[LowProcIndex].kp_eproc.e_vm.vm_map.size / 1024; +$NetBSD: patch-am,v 1.3 2006/01/24 22:16:55 adam Exp $ + +--- agent/mibgroup/host/hr_swrun.c.orig 2005-10-28 23:28:45.000000000 +0200 ++++ agent/mibgroup/host/hr_swrun.c +@@ -884,6 +884,8 @@ var_hrswrun(struct variable * vp, + else + long_return = 4; /* application */ #endif +#elif defined darwin + long_return = -1; #else - long_return = proc_table[LowProcIndex].kp_eproc.e_vm.vm_tsize + - proc_table[LowProcIndex].kp_eproc.e_vm.vm_ssize + + long_return = 4; /* application */ + #endif diff --git a/net/net-snmp/patches/patch-an b/net/net-snmp/patches/patch-an index be361506056..98521afaea8 100644 --- a/net/net-snmp/patches/patch-an +++ b/net/net-snmp/patches/patch-an @@ -1,27 +1,28 @@ -$NetBSD: patch-an,v 1.2 2005/08/01 11:56:54 wiz Exp $ ---- agent/mibgroup/mibII/route_write.c.orig 2005-07-30 22:18:06.000000000 +1000 -+++ agent/mibgroup/mibII/route_write.c 2005-07-30 22:18:28.000000000 +1000 -@@ -102,7 +102,7 @@ +$NetBSD: patch-an,v 1.3 2006/01/24 22:16:55 adam Exp $ + +--- agent/mibgroup/mibII/route_write.c.orig 2005-09-16 19:00:23.000000000 +0200 ++++ agent/mibgroup/mibII/route_write.c +@@ -97,7 +97,7 @@ int addRoute(u_long dstip, u_long gwip, u_long iff, u_short flags) { --#ifndef dynix -+#if !(defined dynix || defined darwin) +-#if defined SIOCADDRT && !defined(irix6) ++#if defined SIOCADDRT && !defined(irix6) && !defined(darwin) struct sockaddr_in dst; struct sockaddr_in gateway; int s, rc; -@@ -141,6 +141,55 @@ +@@ -132,6 +132,54 @@ addRoute(u_long dstip, u_long gwip, u_lo + if (rc < 0) + snmp_log_perror("ioctl"); return rc; - #endif - +#elif defined darwin + size_t sa_in_size = sizeof(struct sockaddr_in); -+ int s, rc; ++ int s, rc; + struct sockaddr_in dst; + struct sockaddr_in gateway; + struct { -+ struct rt_msghdr hdr; -+ char space[512]; ++ struct rt_msghdr hdr; ++ char space[512]; + } rtmsg; + + s = socket(PF_ROUTE, SOCK_RAW, 0); @@ -49,44 +50,43 @@ $NetBSD: patch-an,v 1.2 2005/08/01 11:56:54 wiz Exp $ + rtmsg.hdr.rtm_version = RTM_VERSION; + rtmsg.hdr.rtm_addrs = RTA_DST | RTA_GATEWAY; + rtmsg.hdr.rtm_flags = RTF_GATEWAY; -+ ++ + bcopy((char *)&dst, rtmsg.space, sa_in_size); + bcopy((char *)&gateway, (rtmsg.space+sa_in_size), sa_in_size); -+ ++ + rc = sizeof(struct rt_msghdr) + sa_in_size + sa_in_size; + rtmsg.hdr.rtm_msglen = rc; -+ ++ + if ((rc = write(s, (char *)&rtmsg, rc)) < 0) { + snmp_log_perror("writing to routing socket"); + return -1; + } + + return (rc); -+ - #else /* dynix */ - /* - * Throws up the following errors: -@@ -166,7 +215,7 @@ + + #else /* SIOCADDRT */ + return -1; +@@ -143,7 +191,7 @@ addRoute(u_long dstip, u_long gwip, u_lo int delRoute(u_long dstip, u_long gwip, u_long iff, u_short flags) { --#ifndef dynix -+#if !(defined dynix || defined darwin) +-#if defined SIOCDELRT && !defined(irix6) ++#if defined SIOCDELRT && !defined(irix6) && !defined(darwin) struct sockaddr_in dst; struct sockaddr_in gateway; -@@ -205,6 +254,56 @@ +@@ -178,6 +226,56 @@ delRoute(u_long dstip, u_long gwip, u_lo + close(s); return rc; - #endif +#elif defined darwin + size_t sa_in_size = sizeof(struct sockaddr_in); -+ int s, rc; ++ int s, rc; + struct sockaddr_in dst; + struct sockaddr_in gateway; + struct { -+ struct rt_msghdr hdr; -+ char space[512]; ++ struct rt_msghdr hdr; ++ char space[512]; + } rtmsg; + + s = socket(PF_ROUTE, SOCK_RAW, 0); @@ -129,6 +129,6 @@ $NetBSD: patch-an,v 1.2 2005/08/01 11:56:54 wiz Exp $ + + return rc; + - #else /* dynix */ - /* - * See 'addRoute' for the list of errors. + #else /* SIOCDELRT */ + return 0; + #endif |