The latest tarball does not unpack cleanly on Windows systems
(at least when using WinZip) - leaving certain files at the top
level of the file tree, rather than in their intended locations.
Among the files affected are snmpNotifyFilterTable* (part of the
'snmp-notification-mib' tree), which is included in the default
configuration. This means that the project will fail to build
(certainly under Visual Studio, and probably using MinGW or
Cygwin as well).
Proposal:
The contents of 'snmp-notification-mib/snmpNotifyFilterTable/*'
should be moved into 'notification' (alongside the other tables
from the same MIB). This allows these files to be extracted
from the tarball correctly, and the VC++ build to run successfully.
I'm appending a patch to update various files that would be
affected by this move. Apply this patch, and then run the
commands:
cd agent/mibgroup
mv snmp-notification-mib/snmpNotifyFilterTable/* notification
It might also prove necessary to run "make depend" (in both
agent and agent/mibgroup) to keep Make-based builds happy.
I'm calling for votes to apply this fix before the 5.4.1.rc2 release
(as well as the other active branches).
Dave
Index: agent/mibgroup/notification/snmpNotifyTable.c
===================================================================
--- agent/mibgroup/notification/snmpNotifyTable.c (revision 16585)
+++ agent/mibgroup/notification/snmpNotifyTable.c (working copy)
@@ -34,7 +34,7 @@
#include "target/snmpTargetParamsEntry.h"
#include "target/snmpTargetAddrEntry.h"
#include "target/target.h"
-#include "snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable.h"
+#include "notification/snmpNotifyFilterTable.h"
#include <net-snmp/agent/agent_callbacks.h>
#include <net-snmp/agent/agent_trap.h>
#include <net-snmp/agent/mib_module_config.h>
Index: agent/mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable.h
===================================================================
--- agent/mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable.h (revision 16585)
+++ agent/mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable.h (working copy)
@@ -22,8 +22,8 @@
* other required module components
*/
/* *INDENT-OFF* */
-config_require(snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable_interface)
-config_require(snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable_data_access)
+config_require(notification/snmpNotifyFilterTable_interface)
+config_require(notification/snmpNotifyFilterTable_data_access)
/* *INDENT-ON* */
/*
Index: agent/mibgroup/snmp-notification-mib/snmpNotifyFilterTable.h
===================================================================
--- agent/mibgroup/snmp-notification-mib/snmpNotifyFilterTable.h (revision 16585)
+++ agent/mibgroup/snmp-notification-mib/snmpNotifyFilterTable.h (working copy)
@@ -1 +1 @@
-config_require(snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable)
+config_require(notification/snmpNotifyFilterTable)
Index: agent/mibgroup/notification.h
===================================================================
--- agent/mibgroup/notification.h (revision 16585)
+++ agent/mibgroup/notification.h (working copy)
@@ -1,4 +1,4 @@
config_require(notification/snmpNotifyTable)
-config_require(snmp-notification-mib/snmpNotifyFilterTable)
+config_require(notification/snmpNotifyFilterTable)
config_require(notification/snmpNotifyFilterProfileTable)
Index: agent/mibgroup/snmp-notification-mib.h
===================================================================
--- agent/mibgroup/snmp-notification-mib.h (revision 16585)
+++ agent/mibgroup/snmp-notification-mib.h (working copy)
@@ -1,2 +1,2 @@
config_require(notification/snmpNotifyTable)
-config_require(snmp-notification-mib/snmpNotifyFilterTable)
+config_require(notification/snmpNotifyFilterTable)
Index: agent/mibgroup/utilities/iquery.c
Index: win32/mib_module_includes.h
===================================================================
--- win32/mib_module_includes.h (revision 16585)
+++ win32/mib_module_includes.h (working copy)
@@ -86,7 +86,7 @@
#include "mibgroup/snmpv3/usmStats.h"
#include "mibgroup/snmpv3/usmUser.h"
#include "mibgroup/notification/snmpNotifyTable.h"
-#include "mibgroup/snmp-notification-mib/snmpNotifyFilterTable.h"
+#include "mibgroup/notification/snmpNotifyFilterTable.h"
#include "mibgroup/notification/snmpNotifyFilterProfileTable.h"
#include "mibgroup/target/snmpTargetAddrEntry.h"
#include "mibgroup/target/snmpTargetParamsEntry.h"
Index: win32/netsnmpmibs/Makefile.in
===================================================================
--- win32/netsnmpmibs/Makefile.in (revision 16585)
+++ win32/netsnmpmibs/Makefile.in (working copy)
@@ -587,19 +587,19 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\..\agent\mibgroup\snmp-notification-mib\snmpNotifyFilterTable\snmpNotifyFilterTable.c
+SOURCE=..\..\agent\mibgroup\notification\snmpNotifyFilterTable.c
"$(INTDIR)\snmpNotifyFilterTable.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\..\agent\mibgroup\snmp-notification-mib\snmpNotifyFilterTable\snmpNotifyFilterTable_data_access.c
+SOURCE=..\..\agent\mibgroup\notification\snmpNotifyFilterTable_data_access.c
"$(INTDIR)\snmpNotifyFilterTable_data_access.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\..\agent\mibgroup\snmp-notification-mib\snmpNotifyFilterTable\snmpNotifyFilterTable_interface.c
+SOURCE=..\..\agent\mibgroup\notification\snmpNotifyFilterTable_interface.c
"$(INTDIR)\snmpNotifyFilterTable_interface.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
Index: win32/netsnmpmibs/netsnmpmibs.dsp
===================================================================
--- win32/netsnmpmibs/netsnmpmibs.dsp (revision 16585)
+++ win32/netsnmpmibs/netsnmpmibs.dsp (working copy)
@@ -237,15 +237,15 @@
# End Source File
# Begin Source File
-SOURCE=..\..\agent\mibgroup\snmp-notification-mib\snmpNotifyFilterTable\snmpNotifyFilterTable.c
+SOURCE=..\..\agent\mibgroup\notification\snmpNotifyFilterTable.c
# End Source File
# Begin Source File
-SOURCE=..\..\agent\mibgroup\snmp-notification-mib\snmpNotifyFilterTable\snmpNotifyFilterTable_data_access.c
+SOURCE=..\..\agent\mibgroup\notification\snmpNotifyFilterTable_data_access.c
# End Source File
# Begin Source File
-SOURCE=..\..\agent\mibgroup\snmp-notification-mib\snmpNotifyFilterTable\snmpNotifyFilterTable_interface.c
+SOURCE=..\..\agent\mibgroup\notification\snmpNotifyFilterTable_interface.c
# End Source File
# Begin Source File
Index: win32/netsnmpmibssdk/Makefile.in
===================================================================
--- win32/netsnmpmibssdk/Makefile.in (revision 16585)
+++ win32/netsnmpmibssdk/Makefile.in (working copy)
@@ -576,19 +576,19 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\..\agent\mibgroup\snmp-notification-mib\snmpNotifyFilterTable\snmpNotifyFilterTable.c
+SOURCE=..\..\agent\mibgroup\notification\snmpNotifyFilterTable.c
"$(INTDIR)\snmpNotifyFilterTable.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\..\agent\mibgroup\snmp-notification-mib\snmpNotifyFilterTable\snmpNotifyFilterTable_data_access.c
+SOURCE=..\..\agent\mibgroup\notification\snmpNotifyFilterTable_data_access.c
"$(INTDIR)\snmpNotifyFilterTable_data_access.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\..\agent\mibgroup\snmp-notification-mib\snmpNotifyFilterTable\snmpNotifyFilterTable_interface.c
+SOURCE=..\..\agent\mibgroup\notification\snmpNotifyFilterTable_interface.c
"$(INTDIR)\snmpNotifyFilterTable_interface.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
Index: win32/netsnmpmibssdk/netsnmpmibssdk.dsp
===================================================================
--- win32/netsnmpmibssdk/netsnmpmibssdk.dsp (revision 16585)
+++ win32/netsnmpmibssdk/netsnmpmibssdk.dsp (working copy)
@@ -193,15 +193,15 @@
# End Source File
# Begin Source File
-SOURCE=..\..\agent\mibgroup\snmp-notification-mib\snmpNotifyFilterTable\snmpNotifyFilterTable.c
+SOURCE=..\..\agent\mibgroup\notification\snmpNotifyFilterTable.c
# End Source File
# Begin Source File
-SOURCE=..\..\agent\mibgroup\snmp-notification-mib\snmpNotifyFilterTable\snmpNotifyFilterTable_data_access.c
+SOURCE=..\..\agent\mibgroup\notification\snmpNotifyFilterTable_data_access.c
# End Source File
# Begin Source File
-SOURCE=..\..\agent\mibgroup\snmp-notification-mib\snmpNotifyFilterTable\snmpNotifyFilterTable_interface.c
+SOURCE=..\..\agent\mibgroup\notification\snmpNotifyFilterTable_interface.c
# End Source File
# Begin Source File
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Net-snmp-coders mailing list
Net-snmp-coders@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/net-snmp-coders
