[Pkg-net-snmp-commits] r341 - in branches/net-snmp54/debian: . patches

[Jochen Friedrich]

Author: jochen
Date: 2011-01-05 13:05:02 +0000 (Wed, 05 Jan 2011)
New Revision: 341

Modified:
   branches/net-snmp54/debian/changelog
   branches/net-snmp54/debian/patches/61_vacm_missing_dependency_check.patch
Log:
Add missing include to 61_vacm_missing_dependency_check.patch to close #602809



Modified: branches/net-snmp54/debian/changelog
===================================================================
--- branches/net-snmp54/debian/changelog	2011-01-05 13:00:38 UTC (rev 340)
+++ branches/net-snmp54/debian/changelog	2011-01-05 13:05:02 UTC (rev 341)
@@ -1,8 +1,11 @@
-net-snmp (5.4.3~dfsg-2) unstable; urgency=low
+net-snmp (5.4.3~dfsg-2) unstable; urgency=high
 
   * Add libperl-dev to libsnmp-dev dependencies (Closes: #608794)
+  * Add missing include to 61_vacm_missing_dependency_check.patch
+    (Closes: #602809)
+  * High urgency due to RC bug fixes
 
- -- Jochen Friedrich <jochen at scram.de>  Wed, 05 Jan 2011 12:58:10 +0100
+ -- Jochen Friedrich <jochen at scram.de>  Wed, 05 Jan 2011 13:03:32 +0100
 
 net-snmp (5.4.3~dfsg-1) unstable; urgency=low
 

Modified: branches/net-snmp54/debian/patches/61_vacm_missing_dependency_check.patch
===================================================================
--- branches/net-snmp54/debian/patches/61_vacm_missing_dependency_check.patch	2011-01-05 13:00:38 UTC (rev 340)
+++ branches/net-snmp54/debian/patches/61_vacm_missing_dependency_check.patch	2011-01-05 13:05:02 UTC (rev 341)
@@ -1,5 +1,7 @@
---- a/agent/agent_read_config.c
-+++ b/agent/agent_read_config.c
+Index: net-snmp-5.4.3~dfsg/agent/agent_read_config.c
+===================================================================
+--- net-snmp-5.4.3~dfsg.orig/agent/agent_read_config.c	2008-07-24 08:53:02.000000000 +0200
++++ net-snmp-5.4.3~dfsg/agent/agent_read_config.c	2011-01-05 12:45:24.000000000 +0100
 @@ -282,7 +282,9 @@
      snmp_call_callbacks(SNMP_CALLBACK_APPLICATION,
                          SNMPD_CALLBACK_PRE_UPDATE_CONFIG, NULL);
@@ -10,8 +12,10 @@
      read_configs();
  }
  
---- a/apps/snmptrapd.c
-+++ b/apps/snmptrapd.c
+Index: net-snmp-5.4.3~dfsg/apps/snmptrapd.c
+===================================================================
+--- net-snmp-5.4.3~dfsg.orig/apps/snmptrapd.c	2010-04-30 21:10:17.000000000 +0200
++++ net-snmp-5.4.3~dfsg/apps/snmptrapd.c	2011-01-05 12:45:24.000000000 +0100
 @@ -1477,7 +1477,9 @@
  trapd_update_config(void)
  {
@@ -22,9 +26,19 @@
      read_configs();
  }
  
---- a/apps/snmptrapd_auth.c
-+++ b/apps/snmptrapd_auth.c
-@@ -32,8 +32,10 @@
+Index: net-snmp-5.4.3~dfsg/apps/snmptrapd_auth.c
+===================================================================
+--- net-snmp-5.4.3~dfsg.orig/apps/snmptrapd_auth.c	2006-09-15 02:48:50.000000000 +0200
++++ net-snmp-5.4.3~dfsg/apps/snmptrapd_auth.c	2011-01-05 12:47:02.000000000 +0100
+@@ -18,6 +18,7 @@
+ #include "snmptrapd_ds.h"
+ #include "mibII/vacm_conf.h"
+ #include <net-snmp/agent/agent_trap.h>
++#include <net-snmp/agent/net-snmp-agent-includes.h>
+ 
+ /**
+  * initializes the snmptrapd authorization code registering needed
+@@ -32,8 +33,10 @@
                                             netsnmp_trapd_auth);
      traph->authtypes = TRAP_AUTH_NONE;
  
@@ -35,7 +49,7 @@
  
      /* register a config token for turning off the authorization entirely */
      netsnmp_ds_register_config(ASN_BOOLEAN, "snmptrapd", "disableAuthorization",
-@@ -109,6 +111,7 @@
+@@ -109,6 +112,7 @@
          return NETSNMPTRAPD_HANDLER_FINISH;
      }
  
@@ -43,7 +57,7 @@
      /* check the pdu against each typo of VACM access we may want to
         check up on later.  We cache the results for future lookup on
         each call to netsnmp_trapd_check_auth */
-@@ -125,6 +128,7 @@
+@@ -125,6 +129,7 @@
          }
      }
      DEBUGMSGTL(("snmptrapd:auth", "Final bitmask auth: %x\n", ret));