[Pkg-net-snmp-commits] r335 - in branches: net-snmp54/debian/patches net-snmp54-dev/debian/patches

[Thomas Anders]

Author: anders-guest
Date: 2010-06-27 23:39:51 +0000 (Sun, 27 Jun 2010)
New Revision: 335

Removed:
   branches/net-snmp54-dev/debian/patches/31_silence_subcontainer.README
   branches/net-snmp54-dev/debian/patches/31_silence_subcontainer.patch
Modified:
   branches/net-snmp54-dev/debian/patches/61_vacm_missing_dependency_check.README
   branches/net-snmp54/debian/patches/61_vacm_missing_dependency_check.README
Log:
sync patches with upstream


Modified: branches/net-snmp54/debian/patches/61_vacm_missing_dependency_check.README
===================================================================
--- branches/net-snmp54/debian/patches/61_vacm_missing_dependency_check.README	2010-06-10 16:11:07 UTC (rev 334)
+++ branches/net-snmp54/debian/patches/61_vacm_missing_dependency_check.README	2010-06-27 23:39:51 UTC (rev 335)
@@ -1 +1,2 @@
 Do not call vacm_standard_views() if the corresponding module was not compiled.
+(applied upstream in changeset 19116)

Deleted: branches/net-snmp54-dev/debian/patches/31_silence_subcontainer.README
===================================================================
--- branches/net-snmp54-dev/debian/patches/31_silence_subcontainer.README	2010-06-10 16:11:07 UTC (rev 334)
+++ branches/net-snmp54-dev/debian/patches/31_silence_subcontainer.README	2010-06-27 23:39:51 UTC (rev 335)
@@ -1,3 +0,0 @@
-Upstream Change 17254:
-
-CHANGES: snmpd: BUG: 1693039: be silent when insert fails.

Deleted: branches/net-snmp54-dev/debian/patches/31_silence_subcontainer.patch
===================================================================
--- branches/net-snmp54-dev/debian/patches/31_silence_subcontainer.patch	2010-06-10 16:11:07 UTC (rev 334)
+++ branches/net-snmp54-dev/debian/patches/31_silence_subcontainer.patch	2010-06-27 23:39:51 UTC (rev 335)
@@ -1,26 +0,0 @@
-Index: snmplib/container.c
-===================================================================
---- net-snmp-5.4.2.1.orig/snmplib/container.c	(Revision 17253)
-+++ net-snmp-5.4.2.1/snmplib/container.c	(Revision 17254)
-@@ -275,7 +275,7 @@
-     if(x) {
-         int rc = x->insert(x,k);
-         if(rc)
--            snmp_log(LOG_ERR,"error on subcontainer '%s' insert (%d)\n",
-+            snmp_log(LOG_DEBUG,"error on subcontainer '%s' insert (%d)\n",
-                      x->container_name ? x->container_name : "", rc);
-         else {
-             rc = CONTAINER_INSERT_HELPER(x->next, k);
-Index: include/net-snmp/library/container.h
-===================================================================
---- net-snmp-5.4.2.1.orig/include/net-snmp/library/container.h	(Revision 17253)
-+++ net-snmp-5.4.2.1/include/net-snmp/library/container.h	(Revision 17254)
-@@ -358,7 +358,7 @@
-         if(x) {
-             int rc = x->insert(x,k);
-             if(rc)
--                snmp_log(LOG_ERR,"error on subcontainer '%s' insert (%d)\n",
-+                snmp_log(LOG_DEBUG,"error on subcontainer '%s' insert (%d)\n",
-                          x->container_name ? x->container_name : "", rc);
-             else {
-                 rc = CONTAINER_INSERT_HELPER(x->next, k);

Modified: branches/net-snmp54-dev/debian/patches/61_vacm_missing_dependency_check.README
===================================================================
--- branches/net-snmp54-dev/debian/patches/61_vacm_missing_dependency_check.README	2010-06-10 16:11:07 UTC (rev 334)
+++ branches/net-snmp54-dev/debian/patches/61_vacm_missing_dependency_check.README	2010-06-27 23:39:51 UTC (rev 335)
@@ -1 +1,2 @@
 Do not call vacm_standard_views() if the corresponding module was not compiled.
+(applied upstream in changeset 19116)