comparison: snmp/snmp.patch
snmp/snmp.patch
- changeset 588
- 300d43423c2e
- parent 353
- 198005e4aad2
- child 589
- 6db023bc5512
equal
deleted
inserted
replaced
| 1:6dd1ebf7c04e | 2:79d384fcb28c |
|---|---|
| 1 Index: Makefile.in | |
| 2 diff -Nau Makefile.in.orig Makefile.in | |
| 3 --- Makefile.in.orig 2011-07-02 00:35:46.000000000 +0200 | |
| 4 +++ Makefile.in 2011-09-15 09:22:50.255341188 +0200 | |
| 5 @@ -19,7 +19,7 @@ | |
| 6 INCLUDESUBDIR=system | |
| 7 INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.h bsdi4.h bsdi.h cygwin.h \ | |
| 8 darwin.h darwin7.h darwin8.h darwin9.h darwin10.h dragonfly.h dynix.h \ | |
| 9 - freebsd2.h freebsd3.h freebsd4.h freebsd5.h freebsd6.h freebsd.h \ | |
| 10 + freebsd2.h freebsd3.h freebsd4.h freebsd5.h freebsd6.h freebsd7.h freebsd8.h freebsd9.h freebsd.h \ | |
| 11 generic.h \ | |
| 12 hpux.h irix.h linux.h mingw32.h mips.h netbsd.h openbsd.h osf5.h \ | |
| 13 solaris2.3.h solaris2.4.h solaris2.5.h solaris2.6.h \ | |
| 14 Index: agent/auto_nlist.c | 1 Index: agent/auto_nlist.c |
| 15 diff -Nau agent/auto_nlist.c.orig agent/auto_nlist.c | 2 diff -Nau agent/auto_nlist.c.orig agent/auto_nlist.c |
| 16 --- agent/auto_nlist.c.orig 2011-07-02 00:35:46.000000000 +0200 | 3 --- agent/auto_nlist.c.orig 2011-07-02 00:35:46.000000000 +0200 |
| 17 +++ agent/auto_nlist.c 2011-09-15 09:22:50.256627584 +0200 | 4 +++ agent/auto_nlist.c 2011-09-15 09:22:50.256627584 +0200 |
| 18 @@ -53,6 +53,7 @@ | 5 @@ -53,6 +53,7 @@ |
| 152 int fd; | 139 int fd; |
| 153 Index: apps/snmptrapd.c | 140 Index: apps/snmptrapd.c |
| 154 diff -Nau apps/snmptrapd.c.orig apps/snmptrapd.c | 141 diff -Nau apps/snmptrapd.c.orig apps/snmptrapd.c |
| 155 --- apps/snmptrapd.c.orig 2011-07-02 00:35:46.000000000 +0200 | 142 --- apps/snmptrapd.c.orig 2011-07-02 00:35:46.000000000 +0200 |
| 156 +++ apps/snmptrapd.c 2011-09-15 09:22:50.270293197 +0200 | 143 +++ apps/snmptrapd.c 2011-09-15 09:22:50.270293197 +0200 |
| 157 @@ -657,6 +657,7 @@ | 144 @@ -653,6 +653,7 @@ |
| 158 */ | 145 */ |
| 159 #if HAVE_GETPID | 146 #if HAVE_GETPID |
| 160 strcat(options, "p:"); | 147 strcat(options, "p:"); |
| 161 + parse_config_pidFile(NULL, "@l_prefix@/var/snmp/snmptrapd.pid"); | 148 + parse_config_pidFile(NULL, "@l_prefix@/var/snmp/snmptrapd.pid"); |
| 162 #endif | 149 #endif |
| 174 + int __netsnmp_setenv(const char *, const char *, int); | 161 + int __netsnmp_setenv(const char *, const char *, int); |
| 175 +# define setenv(a,b,c) __netsnmp_setenv(a,b,c) | 162 +# define setenv(a,b,c) __netsnmp_setenv(a,b,c) |
| 176 #endif | 163 #endif |
| 177 | 164 |
| 178 NETSNMP_IMPORT | 165 NETSNMP_IMPORT |
| 179 Index: include/net-snmp/system/freebsd8.h | |
| 180 diff -Nau include/net-snmp/system/freebsd8.h.orig include/net-snmp/system/freebsd8.h | |
| 181 --- include/net-snmp/system/freebsd8.h.orig 2011-07-02 00:35:46.000000000 +0200 | |
| 182 +++ include/net-snmp/system/freebsd8.h 2011-09-15 09:22:50.272179012 +0200 | |
| 183 @@ -1,3 +1,6 @@ | |
| 184 +/* freebsd8 is a superset of freebsd7 */ | |
| 185 +#include "freebsd7.h" | |
| 186 +#define freebsd7 freebsd7 | |
| 187 /* freebsd8 is a superset of freebsd4 */ | |
| 188 #include "freebsd7.h" | |
| 189 #define freebsd7 freebsd7 | |
| 190 Index: include/net-snmp/system/freebsd9.h | |
| 191 diff -Nau include/net-snmp/system/freebsd9.h.orig include/net-snmp/system/freebsd9.h | |
| 192 --- include/net-snmp/system/freebsd9.h.orig 1970-01-01 01:00:00.000000000 +0100 | |
| 193 +++ include/net-snmp/system/freebsd9.h 2011-09-15 09:22:50.272889416 +0200 | |
| 194 @@ -0,0 +1,3 @@ | |
| 195 +/* freebsd9 is a superset of freebsd8 */ | |
| 196 +#include "freebsd8.h" | |
| 197 +#define freebsd8 freebsd8 | |
| 198 Index: snmplib/system.c | 166 Index: snmplib/system.c |
| 199 diff -Nau snmplib/system.c.orig snmplib/system.c | 167 diff -Nau snmplib/system.c.orig snmplib/system.c |
| 200 --- snmplib/system.c.orig 2011-07-02 00:35:46.000000000 +0200 | 168 --- snmplib/system.c.orig 2011-07-02 00:35:46.000000000 +0200 |
| 201 +++ snmplib/system.c 2011-09-15 09:22:50.274625796 +0200 | 169 +++ snmplib/system.c 2011-09-15 09:22:50.274625796 +0200 |
| 202 @@ -1044,7 +1044,7 @@ | 170 @@ -1048,7 +1048,7 @@ |
| 203 | 171 |
| 204 #ifndef HAVE_SETENV | 172 #ifndef HAVE_SETENV |
| 205 int | 173 int |
| 206 -setenv(const char *name, const char *value, int overwrite) | 174 -setenv(const char *name, const char *value, int overwrite) |
| 207 +__netsnmp_setenv(const char *name, const char *value, int overwrite) | 175 +__netsnmp_setenv(const char *name, const char *value, int overwrite) |
