diff --git a/network/net-snmp/net-snmp-5.7.1-0001-fix-disable-set-support.patch b/network/net-snmp/net-snmp-5.7.1-0001-fix-disable-set-support.patch deleted file mode 100644 index a9661aa7d..000000000 --- a/network/net-snmp/net-snmp-5.7.1-0001-fix-disable-set-support.patch +++ /dev/null @@ -1,64 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../net-snmp/net-snmp-5.7.1-0001-fix-disable-set.patch -# Copyright (C) 2012 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -From: Dave Shield -Date: Tue, 28 Feb 2012 09:27:11 +0000 (+0000) -Subject: Skip SET-based baby-steps when compiled with --disable-set-support. -X-Git-Tag: v5.5.2.pre1~10 -X-Git-Url: http://net-snmp.git.sourceforge.net/git/gitweb.cgi?p=net-snmp%2Fnet-snmp;a=commitdiff_plain;h=eed0bcbc43fea18259f0f63b2081b6d10535a052 - -Skip SET-based baby-steps when compiled with --disable-set-support. -Inspired by bug #3454168 ---- - -diff --git a/agent/mibgroup/ip-mib/ipDefaultRouterTable/ipDefaultRouterTable_interface.c b/agent/mibgroup/ip-mib/ipDefaultRouterTable/ipDefaultRouterTable_interface.c -index afe7e57..7da7ba0 100644 ---- a/agent/mibgroup/ip-mib/ipDefaultRouterTable/ipDefaultRouterTable_interface.c -+++ b/agent/mibgroup/ip-mib/ipDefaultRouterTable/ipDefaultRouterTable_interface.c -@@ -222,6 +222,13 @@ _ipDefaultRouterTable_initialize_interface - */ - if (access_multiplexer->object_lookup) - mfd_modes |= BABY_STEP_OBJECT_LOOKUP; -+ if (access_multiplexer->pre_request) -+ mfd_modes |= BABY_STEP_PRE_REQUEST; -+ if (access_multiplexer->post_request) -+ mfd_modes |= BABY_STEP_POST_REQUEST; -+ -+#ifndef NETSNMP_DISABLE_SET_SUPPORT -+ /* XXX - are these actually necessary? */ - if (access_multiplexer->set_values) - mfd_modes |= BABY_STEP_SET_VALUES; - if (access_multiplexer->irreversible_commit) -@@ -229,11 +236,6 @@ _ipDefaultRouterTable_initialize_interface - if (access_multiplexer->object_syntax_checks) - mfd_modes |= BABY_STEP_CHECK_OBJECT; - -- if (access_multiplexer->pre_request) -- mfd_modes |= BABY_STEP_PRE_REQUEST; -- if (access_multiplexer->post_request) -- mfd_modes |= BABY_STEP_POST_REQUEST; -- - if (access_multiplexer->undo_setup) - mfd_modes |= BABY_STEP_UNDO_SETUP; - if (access_multiplexer->undo_cleanup) -@@ -249,6 +251,7 @@ _ipDefaultRouterTable_initialize_interface - mfd_modes |= BABY_STEP_COMMIT; - if (access_multiplexer->undo_commit) - mfd_modes |= BABY_STEP_UNDO_COMMIT; -+#endif - - handler = netsnmp_baby_steps_handler_get(mfd_modes); - netsnmp_inject_handler(reginfo, handler); diff --git a/network/net-snmp/net-snmp-5.7.1-0002-fix-enable-read-only.patch b/network/net-snmp/net-snmp-5.7.1-0002-fix-enable-read-only.patch deleted file mode 100644 index aba41c151..000000000 --- a/network/net-snmp/net-snmp-5.7.1-0002-fix-enable-read-only.patch +++ /dev/null @@ -1,47 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../net-snmp/net-snmp-5.7.1-0002-fix-enable-read-only.patch -# Copyright (C) 2012 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -From: Dave Shield -Date: Tue, 28 Feb 2012 10:03:25 +0000 (+0000) -Subject: CHANGES: BUG: 3454168: configure: Fix building with --enable-read-only -X-Git-Tag: v5.7.2.pre1~81 -X-Git-Url: http://net-snmp.git.sourceforge.net/git/gitweb.cgi?p=net-snmp%2Fnet-snmp;a=commitdiff_plain;h=36423e210bfb65ef121c6a66aec438c7c237d3df - -CHANGES: BUG: 3454168: configure: Fix building with --enable-read-only ---- - -diff --git a/agent/mibgroup/ip-mib/ipDefaultRouterTable/ipDefaultRouterTable_interface.c b/agent/mibgroup/ip-mib/ipDefaultRouterTable/ipDefaultRouterTable_interface.c -index 632dfec..40ad72b 100644 ---- a/agent/mibgroup/ip-mib/ipDefaultRouterTable/ipDefaultRouterTable_interface.c -+++ b/agent/mibgroup/ip-mib/ipDefaultRouterTable/ipDefaultRouterTable_interface.c -@@ -232,7 +232,7 @@ _ipDefaultRouterTable_initialize_interface - if (access_multiplexer->post_request) - mfd_modes |= BABY_STEP_POST_REQUEST; - --#ifndef NETSNMP_DISABLE_SET_SUPPORT -+#if !(defined(NETSNMP_NO_WRITE_SUPPORT) || defined(NETSNMP_DISABLE_SET_SUPPORT)) - /* XXX - are these actually necessary? */ - if (access_multiplexer->set_values) - mfd_modes |= BABY_STEP_SET_VALUES; -@@ -256,7 +256,7 @@ _ipDefaultRouterTable_initialize_interface - mfd_modes |= BABY_STEP_COMMIT; - if (access_multiplexer->undo_commit) - mfd_modes |= BABY_STEP_UNDO_COMMIT; --#endif -+#endif /* NETSNMP_NO_WRITE_SUPPORT || NETSNMP_DISABLE_SET_SUPPORT */ - - handler = netsnmp_baby_steps_handler_get(mfd_modes); - netsnmp_inject_handler(reginfo, handler); diff --git a/network/net-snmp/net-snmp.desc b/network/net-snmp/net-snmp.desc index 1241fca7f..20fa31dde 100644 --- a/network/net-snmp/net-snmp.desc +++ b/network/net-snmp/net-snmp.desc @@ -3,7 +3,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../net-snmp/net-snmp.desc -[COPY] Copyright (C) 2006 - 2012 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2013 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -31,8 +31,8 @@ [L] OpenSource [S] Stable -[V] 5.7.1 +[V] 5.7.2 [P] X -----5---9 133.500 -[D] 2996408128 net-snmp-5.7.1.tar.gz http://dl.sourceforge.net/sourceforge/net-snmp/ +[D] 554399289 net-snmp-5.7.2.tar.gz http://dl.sourceforge.net/sourceforge/net-snmp/