- updated for 0.5.0

Changed files:
    openhpi-snmp.patch -> 1.2

diff --git a/openhpi-snmp.patch b/openhpi-snmp.patch
index 66c7198656efb7acfae79373ac55e40b92e12eed..0d6812a0c81b16d135817606e246e103dd62a237 100644 (file)
--- a/openhpi-snmp.patch
+++ b/openhpi-snmp.patch
@@ -1,9 +1,77 @@
---- openhpi-0.4/src/plugins/snmp_client/snmp_client.h.orig     2003-12-10 21:33:50.000000000 +0100
-+++ openhpi-0.4/src/plugins/snmp_client/snmp_client.h  2003-12-12 20:35:27.163125536 +0100
-@@ -19,6 +19,23 @@
+--- openhpi-0.5.0/src/snmp/snmp_util.h.orig    2004-02-03 02:21:51.000000000 +0100
++++ openhpi-0.5.0/src/snmp/snmp_util.h 2004-02-09 20:30:52.079895432 +0100
+@@ -20,6 +20,23 @@
  #include <net-snmp/net-snmp-config.h>
  #include <net-snmp/net-snmp-includes.h>
  
++/* workaround for net-snmp-config.h vs our config.h conflict */
++#ifdef PACKAGE_BUGREPORT
++#  undef PACKAGE_BUGREPORT
++#endif
++#ifdef PACKAGE_NAME
++#  undef PACKAGE_NAME
++#endif
++#ifdef PACKAGE_STRING
++#  undef PACKAGE_STRING
++#endif
++#ifdef PACKAGE_TARNAME
++#  undef PACKAGE_TARNAME
++#endif
++#ifdef PACKAGE_VERSION
++#  undef PACKAGE_VERSION
++#endif
++
+ #define MAX_ASN_STR_LEN 300
+ 
+ /* Place-holder for values set and returned by snmp */
+--- openhpi-0.5.0/src/plugins/snmp_client/snmp_client.c.orig   2004-02-05 23:08:45.000000000 +0100
++++ openhpi-0.5.0/src/plugins/snmp_client/snmp_client.c        2004-02-09 20:28:43.087505256 +0100
+@@ -18,6 +18,26 @@
+ /* used for defining and externing the arrays that hold oids */
+ #define _SNMP_CLIENT_C_ 
+  
++#include <net-snmp/net-snmp-config.h>
++#include <net-snmp/net-snmp-includes.h> 
++
++/* workaround for net-snmp-config.h vs our config.h conflict */
++#ifdef PACKAGE_BUGREPORT
++#  undef PACKAGE_BUGREPORT
++#endif
++#ifdef PACKAGE_NAME
++#  undef PACKAGE_NAME
++#endif
++#ifdef PACKAGE_STRING
++#  undef PACKAGE_STRING
++#endif
++#ifdef PACKAGE_TARNAME
++#  undef PACKAGE_TARNAME
++#endif
++#ifdef PACKAGE_VERSION
++#  undef PACKAGE_VERSION
++#endif
++
+ #include <SaHpi.h>
+ #include <openhpi.h>
+ 
+@@ -25,9 +45,6 @@
+ #include <rpt_utils.h>
+ #include <snmp_util.h>
+ 
+-#include <net-snmp/net-snmp-config.h>
+-#include <net-snmp/net-snmp-includes.h> 
+-
+ #include <snmp_client.h>
+ #include <snmp_client_res.h>
+ 
+--- openhpi-0.5.0/src/plugins/snmp_client/snmp_client_discover.c.orig  2004-02-05 19:36:52.000000000 +0100
++++ openhpi-0.5.0/src/plugins/snmp_client/snmp_client_discover.c       2004-02-09 20:29:17.430284360 +0100
+@@ -18,6 +18,26 @@
+ #include <stdio.h>
+ #include <time.h>
+ 
++#include <net-snmp/net-snmp-config.h>
++#include <net-snmp/net-snmp-includes.h>
++
 +/* workaround for net-snmp-config.h vs our config.h conflict */
 +#ifdef PACKAGE_BUGREPORT
 +#  undef PACKAGE_BUGREPORT
@@ -24,12 +92,64 @@
  #include <SaHpi.h>
  #include <openhpi.h>
  #include <epath_utils.h>
---- openhpi-0.4/src/plugins/snmp_bc/snmp_bc.h.orig     2003-12-05 23:09:46.000000000 +0100
-+++ openhpi-0.4/src/plugins/snmp_bc/snmp_bc.h  2003-12-12 21:20:58.228940424 +0100
-@@ -19,6 +19,23 @@
- #include <net-snmp/net-snmp-config.h>
- #include <net-snmp/net-snmp-includes.h>
+@@ -25,9 +45,6 @@
+ #include <uid_utils.h>
+ #include <snmp_util.h>
+ 
+-#include <net-snmp/net-snmp-config.h>
+-#include <net-snmp/net-snmp-includes.h>
+-
+ #include <snmp_client.h>
+ #include <snmp_client_res.h>
+ #include <snmp_client_utils.h>
+--- openhpi-0.5.0/src/plugins/snmp_client/snmp_client_gen_evts.c.orig  2004-02-04 19:44:02.000000000 +0100
++++ openhpi-0.5.0/src/plugins/snmp_client/snmp_client_gen_evts.c       2004-02-09 20:29:42.341497280 +0100
+@@ -14,9 +14,25 @@
+  *      David Judkovics <djudkovi@us.ibm.com>
+  *
+  */
+-#include <SaHpi.h>
+-#include <openhpi.h>
++#include <net-snmp/net-snmp-config.h>
++#include <net-snmp/net-snmp-includes.h> 
  
++/* workaround for net-snmp-config.h vs our config.h conflict */
++#ifdef PACKAGE_BUGREPORT
++#  undef PACKAGE_BUGREPORT
++#endif
++#ifdef PACKAGE_NAME
++#  undef PACKAGE_NAME
++#endif
++#ifdef PACKAGE_STRING
++#  undef PACKAGE_STRING
++#endif
++#ifdef PACKAGE_TARNAME
++#  undef PACKAGE_TARNAME
++#endif
++#ifdef PACKAGE_VERSION
++#  undef PACKAGE_VERSION
++#endif
+ 
+ #include <SaHpi.h>
+ #include <openhpi.h>
+@@ -26,8 +42,6 @@
+ #include <snmp_util.h>
+ 
+ 
+-#include <net-snmp/net-snmp-config.h>
+-#include <net-snmp/net-snmp-includes.h> 
+ 
+ #include <snmp_client.h>
+ #include <snmp_client_res.h>
+--- openhpi-0.5.0/src/plugins/snmp_client/snmp_client_get_rdrs.c.orig  2004-02-05 23:09:48.000000000 +0100
++++ openhpi-0.5.0/src/plugins/snmp_client/snmp_client_get_rdrs.c       2004-02-09 20:29:59.036959184 +0100
+@@ -18,6 +18,26 @@
+ #include <stdio.h>
+ #include <time.h>
+ 
++#include <net-snmp/net-snmp-config.h>
++#include <net-snmp/net-snmp-includes.h>
++
 +/* workaround for net-snmp-config.h vs our config.h conflict */
 +#ifdef PACKAGE_BUGREPORT
 +#  undef PACKAGE_BUGREPORT
@@ -49,13 +169,26 @@
 +
  #include <SaHpi.h>
  #include <openhpi.h>
+ #include <epath_utils.h>
+@@ -25,9 +45,6 @@
+ #include <uid_utils.h>
+ #include <snmp_util.h>
  
---- openhpi-0.4/src/plugins/snmp_bc/snmp_bc_discover.h.orig    2003-12-09 21:55:40.000000000 +0100
-+++ openhpi-0.4/src/plugins/snmp_bc/snmp_bc_discover.h 2003-12-12 21:29:36.473155328 +0100
-@@ -18,6 +18,23 @@
- #define SNMP_BC_DISCOVER_H
- #include <net-snmp/net-snmp-config.h>
- #include <net-snmp/net-snmp-includes.h>
+-#include <net-snmp/net-snmp-config.h>
+-#include <net-snmp/net-snmp-includes.h>
+-
+ #include <snmp_client.h>
+ #include <snmp_client_res.h>
+ 
+--- openhpi-0.5.0/src/plugins/snmp_client/snmp_client_utils.c.orig     2004-02-06 19:41:26.000000000 +0100
++++ openhpi-0.5.0/src/plugins/snmp_client/snmp_client_utils.c  2004-02-09 20:30:23.269275312 +0100
+@@ -18,6 +18,26 @@
+ #include <stdio.h>
+ #include <time.h>
+ 
++#include <net-snmp/net-snmp-config.h>
++#include <net-snmp/net-snmp-includes.h>
++
 +/* workaround for net-snmp-config.h vs our config.h conflict */
 +#ifdef PACKAGE_BUGREPORT
 +#  undef PACKAGE_BUGREPORT
@@ -73,12 +206,27 @@
 +#  undef PACKAGE_VERSION
 +#endif
 +
+ #include <SaHpi.h>
  #include <openhpi.h>
- #include <bc_resources.h>
- #include <snmp_bc.h>
---- openhpi-0.4/src/plugins/snmp_bc/snmp_bc_sel.h.orig 2003-11-17 18:17:07.000000000 +0100
-+++ openhpi-0.4/src/plugins/snmp_bc/snmp_bc_sel.h      2003-12-12 21:30:17.083981544 +0100
-@@ -21,6 +21,23 @@
+ #include <epath_utils.h>
+@@ -25,9 +45,6 @@
+ #include <uid_utils.h>
+ #include <snmp_util.h>
+ 
+-#include <net-snmp/net-snmp-config.h>
+-#include <net-snmp/net-snmp-includes.h>
+-
+ #include <snmp_client.h>
+ #include <snmp_client_res.h>
+ #include <snmp_client_utils.h>
+--- openhpi-0.5.0/src/plugins/snmp_bc/snmp_bc_session.h.orig   2003-12-05 23:09:46.000000000 +0100
++++ openhpi-0.5.0/src/plugins/snmp_bc/snmp_bc_session.h        2004-02-09 20:28:55.759578808 +0100
+@@ -17,11 +17,29 @@
+ #ifndef SNMP_BC_SESSION_H
+ #define SNMP_BC_SESSION_H
+ 
+-#include <SaHpi.h>
+-#include <openhpi.h>
  #include <net-snmp/net-snmp-config.h>
  #include <net-snmp/net-snmp-includes.h>
  
@@ -99,6 +247,9 @@
 +#  undef PACKAGE_VERSION
 +#endif
 +
- #include <SaHpi.h>
- #include <openhpi.h>
- #include <time.h>
++#include <SaHpi.h>
++#include <openhpi.h>
++
+ /**
+  * This handle will be unique per instance of
+  * this plugin. SNMP session data is stored