[pkgsrc/trunk]: pkgsrc/net/net-snmp Changes 5.3.0.1:

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/322d377e4f63
branches:  trunk
changeset: 506995:322d377e4f63
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue Jan 24 22:16:55 2006 +0000

description:
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.

diffstat:

 net/net-snmp/Makefile         |    5 +-
 net/net-snmp/PLIST            |   18 +++-
 net/net-snmp/buildlink3.mk    |    4 +-
 net/net-snmp/distinfo         |   26 ++---
 net/net-snmp/options.mk       |    6 +-
 net/net-snmp/patches/patch-aa |   15 ---
 net/net-snmp/patches/patch-ab |  180 ------------------------------------------
 net/net-snmp/patches/patch-ac |   25 -----
 net/net-snmp/patches/patch-ad |   15 ---
 net/net-snmp/patches/patch-af |    6 +-
 net/net-snmp/patches/patch-ag |   51 +++++++----
 net/net-snmp/patches/patch-ai |   21 ----
 net/net-snmp/patches/patch-aj |    6 +-
 net/net-snmp/patches/patch-ak |   22 -----
 net/net-snmp/patches/patch-al |   26 +++---
 net/net-snmp/patches/patch-am |   17 ++-
 net/net-snmp/patches/patch-an |   60 +++++++-------
 17 files changed, 123 insertions(+), 380 deletions(-)

diffs (truncated from 770 to 300 lines):

diff -r d3eb3ae6c3d5 -r 322d377e4f63 net/net-snmp/Makefile
--- a/net/net-snmp/Makefile     Tue Jan 24 21:52:51 2006 +0000
+++ b/net/net-snmp/Makefile     Tue Jan 24 22:16:55 2006 +0000
@@ -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 -r d3eb3ae6c3d5 -r 322d377e4f63 net/net-snmp/PLIST
--- a/net/net-snmp/PLIST        Tue Jan 24 21:52:51 2006 +0000
+++ b/net/net-snmp/PLIST        Tue Jan 24 22:16:55 2006 +0000
@@ -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_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/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_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/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/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/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/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_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-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_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.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 -r d3eb3ae6c3d5 -r 322d377e4f63 net/net-snmp/buildlink3.mk
--- a/net/net-snmp/buildlink3.mk        Tue Jan 24 21:52:51 2006 +0000
+++ b/net/net-snmp/buildlink3.mk        Tue Jan 24 22:16:55 2006 +0000
@@ -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 @@
 
 .include "../../security/tcp_wrappers/buildlink3.mk"
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
diff -r d3eb3ae6c3d5 -r 322d377e4f63 net/net-snmp/distinfo
--- a/net/net-snmp/distinfo     Tue Jan 24 21:52:51 2006 +0000
+++ b/net/net-snmp/distinfo     Tue Jan 24 22:16:55 2006 +0000
@@ -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 -r d3eb3ae6c3d5 -r 322d377e4f63 net/net-snmp/options.mk
--- a/net/net-snmp/options.mk   Tue Jan 24 21:52:51 2006 +0000
+++ b/net/net-snmp/options.mk   Tue Jan 24 22:16:55 2006 +0000
@@ -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 @@
 
 .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 -r d3eb3ae6c3d5 -r 322d377e4f63 net/net-snmp/patches/patch-aa
--- a/net/net-snmp/patches/patch-aa     Tue Jan 24 21:52:51 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r d3eb3ae6c3d5 -r 322d377e4f63 net/net-snmp/patches/patch-ab
--- a/net/net-snmp/patches/patch-ab     Tue Jan 24 21:52:51 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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;