Changes 5.4.1.2:

* An increment only in the version number that was failing to be
  reported properly by the tools.

Changes 5.4.1.1:
* SECURITY BUG: A portion of SNMPv3 code had significantly weakened
  authentication cryptography and unauthenticated access to a system
  is a possibility.
* It is critical that all users update their installations bases
  IMMEDIATELY.
* If you were only using SNMPv1 or SNMPv2c you were already insecure
  beyond a level that this vulnerability affects.

5 files changed, 24 insertions, 21 deletions

diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index 11d20dcd0e3..aca2d0d7697 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.71 2008/06/28 16:07:08 christos Exp $
+# $NetBSD: Makefile,v 1.72 2008/07/15 09:14:01 adam Exp $
 
-DISTNAME=	net-snmp-5.4.1
-PKGREVISION=	5
+DISTNAME=	net-snmp-5.4.1.2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=net-snmp/}
 
@@ -17,7 +16,7 @@ GNU_CONFIGURE=		yes
 
 MAKE_JOBS_SAFE=		NO
 
-MAKE_ENV+=	OPSYS=${OPSYS:Q}
+MAKE_ENV+=	OPSYS=${OPSYS}
 
 # The self-test of Perl modules only works after installation because perl
 # can't load the shared libraries from WRKSRC/
@@ -54,7 +53,7 @@ BUILD_DEFS+=		NET_SNMP_MIBDIRS
 
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--with-defaults
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers}/lib
 CONFIGURE_ARGS+=	--with-sys-contact=${NET_SNMP_SYS_CONTACT:Q}
 CONFIGURE_ARGS+=	--with-sys-location=${NET_SNMP_SYS_LOCATION:Q}
@@ -65,7 +64,7 @@ CONFIGURE_ARGS+=	--with-sys-location=${NET_SNMP_SYS_LOCATION:Q}
 # will use '-s' to enable standard syslog logging anyway.
 #
 CONFIGURE_ARGS+=	--with-logfile=none
-CONFIGURE_ARGS+=	--with-persistent-directory=${NET_SNMP_PERSISTENTDIR:Q}
+CONFIGURE_ARGS+=	--with-persistent-directory=${NET_SNMP_PERSISTENTDIR}
 .if !empty(NET_SNMP_MIBDIRS)
 CONFIGURE_ARGS+=	--with-mibdirs=${NET_SNMP_MIBDIRS:Q}
 .endif
diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo
index bada54a34ef..2af65c30393 100644
--- a/net/net-snmp/distinfo
+++ b/net/net-snmp/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.47 2008/06/28 16:07:08 christos Exp $
+$NetBSD: distinfo,v 1.48 2008/07/15 09:14:01 adam Exp $
 
-SHA1 (net-snmp-5.4.1.tar.gz) = ac5ba033c10d53d3057415121f8c4936c643c208
-RMD160 (net-snmp-5.4.1.tar.gz) = 3723488dab8d164702a7d55c9c72eeaec07dd50c
-Size (net-snmp-5.4.1.tar.gz) = 5122455 bytes
+SHA1 (net-snmp-5.4.1.2.tar.gz) = aebe7d881f26403abd6b9ef3e69565beb041138d
+RMD160 (net-snmp-5.4.1.2.tar.gz) = ef8870420b651bc83a72cd792308886aa8fbfe8f
+Size (net-snmp-5.4.1.2.tar.gz) = 5123346 bytes
 SHA1 (patch-aa) = 51b09cc020776d136861d34f9ea529a986d2426d
 SHA1 (patch-ab) = 3227eeb8b54b37813d8b6949f8c6ddc446038bf2
 SHA1 (patch-ac) = acdcde40ec53215d7778b2d0a67656b82274d006
@@ -15,13 +15,13 @@ SHA1 (patch-ai) = c57baca06856187115db39fd50668203dad0a94c
 SHA1 (patch-aj) = 30c28c4801cea33d54e68bbde603e7d531dfb2f8
 SHA1 (patch-ak) = cccad21d4f56e79799a433ef7bf0e8ff4e917afb
 SHA1 (patch-al) = 2609e273d557e1ce06c1295d86965fe26ac7ff08
-SHA1 (patch-am) = 8843187b7916b0aeb9efff6628ecfb1f481b8cd3
+SHA1 (patch-am) = 58c2439ac2ad96e4114bc454d8148abd9dde4d43
 SHA1 (patch-an) = 167f23c62c085efc96a25bc2be5dca3c746dde6f
 SHA1 (patch-da) = 7466445c8388492344acdee236b153cb5f5b45e1
 SHA1 (patch-db) = bec0bee1860ee42ba64b4c07df2280e206eaf582
 SHA1 (patch-dc) = a60caa72af001f5bbda173e5daa9afc6a7180a60
 SHA1 (patch-dd) = 08da0d1da485959549ac461e5cbb7030f800e643
-SHA1 (patch-de) = 63fd3863d287f123f26e657cff5d87c00b21779c
+SHA1 (patch-de) = b505cef8542b30b3d28f5b3e61c473076e242d24
 SHA1 (patch-dg) = 6e6e396add0613dd76e3b8618008a7ebf8103c7c
 SHA1 (patch-dh) = c9a776d6574df008adae52a2f08930e0662f70b3
 SHA1 (patch-di) = e0e1039c1adbf10ae56c50998ff74b39193e7348
@@ -42,6 +42,6 @@ SHA1 (patch-eh) = c2dbd651a0fcf6e20b8a9eee68f0ab30763af912
 SHA1 (patch-ei) = 7eb4899b08b73c79f1eb8616bcebad38c0fbe148
 SHA1 (patch-ej) = c8047a6109bf6b833c56562d48b56b480c4299be
 SHA1 (patch-el) = f80dc7058b8a60e3be53e5673538f6eb2d173b68
-SHA1 (patch-ep) = 84dde63e97065c0776778583ae73e52adaffbd01
+SHA1 (patch-ep) = 91029b17538360ba09e8e74943d2c4481f89a33a
 SHA1 (patch-es) = c26c048ccbda7e4d28cb0a2263cdaa71befb4f96
 SHA1 (patch-et) = 63e31a08413b004608540a28a8fc448966320e7f
diff --git a/net/net-snmp/patches/patch-am b/net/net-snmp/patches/patch-am
index 2167a5da31f..c4162bb18fa 100644
--- a/net/net-snmp/patches/patch-am
+++ b/net/net-snmp/patches/patch-am
@@ -1,3 +1,5 @@
+$NetBSD: patch-am,v 1.8 2008/07/15 09:14:01 adam Exp $
+
 --- agent/mibgroup/host/hr_swrun.c.orig	2007-04-02 16:51:34 +0300
 +++ agent/mibgroup/host/hr_swrun.c	2007-09-12 21:41:48 +0300
 @@ -599,6 +599,8 @@
diff --git a/net/net-snmp/patches/patch-de b/net/net-snmp/patches/patch-de
index d474a7d4644..b7b7fd279d2 100644
--- a/net/net-snmp/patches/patch-de
+++ b/net/net-snmp/patches/patch-de
@@ -1,3 +1,5 @@
+$NetBSD: patch-de,v 1.6 2008/07/15 09:14:01 adam Exp $
+
 --- agent/mibgroup/mibII/ipv6.c.orig	2007-05-25 01:01:04 +0300
 +++ agent/mibgroup/mibII/ipv6.c	2008-05-26 22:26:32 +0300
 @@ -11,7 +11,7 @@
diff --git a/net/net-snmp/patches/patch-ep b/net/net-snmp/patches/patch-ep
index ecf104b40e5..5c1c9598462 100644
--- a/net/net-snmp/patches/patch-ep
+++ b/net/net-snmp/patches/patch-ep
@@ -1,8 +1,8 @@
-$NetBSD: patch-ep,v 1.3 2008/06/12 13:32:24 tron Exp $
+$NetBSD: patch-ep,v 1.4 2008/07/15 09:14:01 adam Exp $
 
---- snmplib/scapi.c.orig	2006-09-15 13:47:01.000000000 +0100
-+++ snmplib/scapi.c	2008-06-12 13:58:35.000000000 +0100
-@@ -272,7 +272,7 @@
+--- snmplib/scapi.c.orig	2008-06-09 21:20:35.000000000 +0200
++++ snmplib/scapi.c
+@@ -272,7 +272,7 @@ sc_generate_keyed_hash(const oid * autht
  
      u_char          buf[SNMP_MAXBUF_SMALL];
  #if  defined(NETSNMP_USE_OPENSSL) || defined(NETSNMP_USE_PKCS11)
@@ -11,14 +11,14 @@ $NetBSD: patch-ep,v 1.3 2008/06/12 13:32:24 tron Exp $
  #endif
  
      DEBUGTRACE;
-@@ -563,6 +563,10 @@
+@@ -553,6 +553,10 @@ sc_check_keyed_hash(const oid * authtype
      }
- 
+ #endif                          /* NETSNMP_ENABLE_TESTING_CODE */
  
 +    if (maclen != USM_MD5_AND_SHA_AUTH_LEN) {
 +        QUITFUN(SNMPERR_GENERR, sc_check_keyed_hash_quit);
 +    }
 +    
      /*
-      * Generate a full hash of the message, then compare
-      * the result with the given MAC which may shorter than
+      * Sanity check.
+      */