[Astlinux-commits] SF.net SVN: astlinux:[6073] branches/1.0/package

[<abe...@us...>]

Revision: 6073
          http://sourceforge.net/p/astlinux/code/6073
Author:   abelbeck
Date:     2013-05-05 01:47:36 +0000 (Sun, 05 May 2013)
Log Message:
-----------
netsnmp, version bump to 5.7.2, enable Unix transport and agentx.
asterisk, enable netsnmp for Asterisk 1.8 and 11 builds.

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk.mk
    branches/1.0/package/netsnmp/netsnmp.mk

Removed Paths:
-------------
    branches/1.0/package/netsnmp/netsnmp-CVE-2012-2141.patch
    branches/1.0/package/netsnmp/netsnmp-swinst-crash.patch

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2013-05-03 17:16:44 UTC (rev 6072)
+++ branches/1.0/package/asterisk/asterisk.mk	2013-05-05 01:47:36 UTC (rev 6073)
@@ -101,13 +101,19 @@
 			--with-imap="$(BUILD_DIR)/uw-imap-2007e" 
 endif
 
-#ifeq ($(strip $(BR2_PACKAGE_NETSNMP)),y)
-#ASTERISK_EXTRAS+=netsnmp
-#ASTERISK_CONFIGURE_ARGS+= \
-#			--with-netsnmp="$(STAGING_DIR)/usr"
-#endif
+ifneq ($(ASTERISK_VERSION_TUPLE),1.4)
+ ifeq ($(strip $(BR2_PACKAGE_NETSNMP)),y)
+ASTERISK_EXTRAS+=netsnmp
 ASTERISK_CONFIGURE_ARGS+= \
+			--with-netsnmp="$(STAGING_DIR)/usr"
+ else
+ASTERISK_CONFIGURE_ARGS+= \
 			--without-netsnmp
+ endif
+else
+ASTERISK_CONFIGURE_ARGS+= \
+			--without-netsnmp
+endif
 
 ifeq ($(strip $(BR2_PACKAGE_MYSQL_CLIENT)),y)
 ASTERISK_EXTRAS+=mysql_client

Deleted: branches/1.0/package/netsnmp/netsnmp-CVE-2012-2141.patch
===================================================================
--- branches/1.0/package/netsnmp/netsnmp-CVE-2012-2141.patch	2013-05-03 17:16:44 UTC (rev 6072)
+++ branches/1.0/package/netsnmp/netsnmp-CVE-2012-2141.patch	2013-05-05 01:47:36 UTC (rev 6073)
@@ -1,35 +0,0 @@
-From 4c5633f1603e4bd03ed05c37d782ec8911759c47 Mon Sep 17 00:00:00 2001
-From: Robert Story <rs...@fr...>
-Date: Mon, 14 May 2012 11:40:06 -0400
-Subject: [PATCH] NEWS: snmp: BUG: 3526549: CVE-2012-2141 Array index error leading to crash
-
----
- agent/mibgroup/agent/extend.c |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/agent/mibgroup/agent/extend.c b/agent/mibgroup/agent/extend.c
-index d00475f..1f8586a 100644
---- a/agent/mibgroup/agent/extend.c
-+++ b/agent/mibgroup/agent/extend.c
-@@ -1126,7 +1126,7 @@ _extend_find_entry( netsnmp_request_info       *request,
-              * ...and check the line requested is valid
-              */
-             line_idx = *table_info->indexes->next_variable->val.integer;
--            if (eptr->numlines < line_idx)
-+            if (line_idx < 1 || line_idx > eptr->numlines)
-                 return NULL;
-         }
-         return eptr;
-@@ -1299,6 +1299,10 @@ handle_nsExtendOutput2Table(netsnmp_mib_handler          *handler,
-                  * Determine which line we've been asked for....
-                  */
-                 line_idx = *table_info->indexes->next_variable->val.integer;
-+                if (line_idx < 1 || line_idx > extension->numlines) {
-+                    netsnmp_set_request_error(reqinfo, request, SNMP_NOSUCHINSTANCE);
-+                    continue;
-+                }
-                 cp  = extension->lines[line_idx-1];
- 
-                 /* 
--- 
-1.7.4.1

Deleted: branches/1.0/package/netsnmp/netsnmp-swinst-crash.patch
===================================================================
--- branches/1.0/package/netsnmp/netsnmp-swinst-crash.patch	2013-05-03 17:16:44 UTC (rev 6072)
+++ branches/1.0/package/netsnmp/netsnmp-swinst-crash.patch	2013-05-05 01:47:36 UTC (rev 6073)
@@ -1,18 +0,0 @@
-Fixes runtime error with uClibc (and possibly others).
-
-Original patch and bug description:
-http://sourceforge.net/tracker/?func=detail&aid=3436528&group_id=12694&atid=312694
-
---- net-snmp-5.7.1/agent/mibgroup/host/data_access/swinst_pkginfo.c
-+++ /home/fabled//net-snmp-5.7.1.patched/agent/mibgroup/host/data_access/swinst_pkginfo.c
-@@ -140,7 +140,8 @@
-         memcpy( entry->swDate, cp, date_len );
-         entry->swDate_len = date_len;
-     }
--    closedir( d );
-+    if (d != NULL)
-+        closedir( d );
- 
-     DEBUGMSGTL(("swinst:load:arch"," loaded %d entries\n",
-                 (int)CONTAINER_SIZE(container)));
-

Modified: branches/1.0/package/netsnmp/netsnmp.mk
===================================================================
--- branches/1.0/package/netsnmp/netsnmp.mk	2013-05-03 17:16:44 UTC (rev 6072)
+++ branches/1.0/package/netsnmp/netsnmp.mk	2013-05-05 01:47:36 UTC (rev 6073)
@@ -4,8 +4,8 @@
 #
 #############################################################
 
-NETSNMP_VERSION = 5.7.1
-NETSNMP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/net-snmp
+NETSNMP_VERSION = 5.7.2
+NETSNMP_SITE = http://downloads.sourceforge.net/project/net-snmp/net-snmp/$(NETSNMP_VERSION)
 NETSNMP_SOURCE = net-snmp-$(NETSNMP_VERSION).tar.gz
 NETSNMP_INSTALL_STAGING = YES
 NETSNMP_CONF_ENV = ac_cv_NETSNMP_CAN_USE_SYSCTL=yes
@@ -18,9 +18,8 @@
 		--enable-silent-libtool --enable-mfd-rewrites \
 		--with-sys-contact="root@localhost" \
 		--with-sys-location="Unknown" \
-		--with-mib-modules="host ucd-snmp/dlmod" \
-		--with-out-mib-modules="disman/event disman/schedule utilities" \
-		--with-out-transports="Unix"
+		--with-mib-modules="host ucd-snmp/dlmod agentx" \
+		--with-out-mib-modules="disman/event disman/schedule utilities"
 NETSNMP_MAKE = $(MAKE1)
 NETSNMP_BLOAT_MIBS = BRIDGE DISMAN-EVENT DISMAN-SCHEDULE DISMAN-SCRIPT EtherLike RFC-1215 RFC1155-SMI RFC1213 SCTP SMUX
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.