sysmon.patch 2.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103
  1. Index: autoconf/Makefile.in
  2. --- autoconf/Makefile.in.orig 2003-11-06 04:41:31 +0100
  3. +++ autoconf/Makefile.in 2007-09-29 19:05:30 +0200
  4. @@ -11,7 +11,7 @@
  5. CC = @CC@
  6. LEX = @LEX@
  7. CFILE = @sysconfdir@/sysmon.conf
  8. -INCLUDES = -I/usr/local/include
  9. +INCLUDES = @CPPFLAGS@
  10. CFLAGS = @CFLAGS@ '@SENDMAIL@' -DCFILE='"$(CFILE)"' @SNP@ $(INCLUDES)
  11. #@IPV6@
  12. Index: configure
  13. --- configure.orig 2005-09-21 03:23:51 +0200
  14. +++ configure 2007-09-29 19:05:30 +0200
  15. @@ -1390,14 +1390,6 @@
  16. fi;
  17. - if test "x/usr/local/" != x -a -d /usr/local/; then
  18. - if test -d /usr/local//lib; then
  19. - LDFLAGS="-L/usr/local//lib $LDFLAGS"
  20. - fi
  21. - if test -d /usr/local//include; then
  22. - CPPFLAGS="-I/usr/local//include $CPPFLAGS"
  23. - fi
  24. - fi
  25. ac_ext=c
  26. @@ -4475,14 +4467,6 @@
  27. - if test "x/usr/local/ssl" != x -a -d /usr/local/ssl; then
  28. - if test -d /usr/local/ssl/lib; then
  29. - LDFLAGS="-L/usr/local/ssl/lib $LDFLAGS"
  30. - fi
  31. - if test -d /usr/local/ssl/include; then
  32. - CPPFLAGS="-I/usr/local/ssl/include $CPPFLAGS"
  33. - fi
  34. - fi
  35. echo "$as_me:$LINENO: checking for main in -lssl" >&5
  36. echo $ECHO_N "checking for main in -lssl... $ECHO_C" >&6
  37. Index: src/config.h
  38. --- src/config.h.orig 2005-10-12 05:30:05 +0200
  39. +++ src/config.h 2007-09-29 19:05:30 +0200
  40. @@ -13,7 +13,7 @@
  41. #include <string.h>
  42. #include <pwd.h>
  43. #include <limits.h>
  44. -#if (defined(__svr4__) || defined(unixware)) /* slo-laris */
  45. +#if defined(__svr4__) || defined(unixware) || (defined(__sun) && defined(__SVR4)) /* slo-laris */
  46. #include <sys/filio.h>
  47. #endif
  48. #include <sys/types.h>
  49. @@ -72,11 +72,7 @@
  50. #endif /* HAVE_LIBNCURSES */
  51. #ifdef NICEINTERFACE
  52. -#ifdef sgi
  53. -#include "/usr/local/include/ncurses.h"
  54. -#else
  55. #include <curses.h>
  56. -#endif /* sgi */
  57. #endif /* NICEINTERFACE */
  58. #ifdef HAVE_NET_SNMP_VERSION_H
  59. Index: src/page.c
  60. --- src/page.c.orig 2003-12-16 18:33:44 +0100
  61. +++ src/page.c 2007-09-29 19:05:38 +0200
  62. @@ -102,17 +102,17 @@
  63. memcpy(out,tmp,1024);
  64. break;
  65. case 'c':
  66. - snprintf(tmp, 1024, "%s %ld", out,
  67. + snprintf(tmp, 1024, "%s%ld", out,
  68. svc->downct);
  69. memcpy(out,tmp,1024);
  70. break;
  71. case 'C':
  72. - snprintf(tmp, 1024, "%s %ld", out,
  73. + snprintf(tmp, 1024, "%s%ld", out,
  74. svc->upct);
  75. memcpy(out,tmp,1024);
  76. break;
  77. case 'p':
  78. - snprintf(tmp, 1024, "%s %d", out,
  79. + snprintf(tmp, 1024, "%s%d", out,
  80. svc->port);
  81. memcpy(out,tmp,1024);
  82. break;
  83. @@ -122,7 +122,7 @@
  84. value = (100.0000-((tmp1/tmp2) * 100));
  85. if (value<0) value=0.000;
  86. if (tmp2==0) value=100.00;
  87. - snprintf(tmp, 1024, "%s %10.6f%%", out,
  88. + snprintf(tmp, 1024, "%s%.1f%%", out,
  89. value);
  90. memcpy(out,tmp,1024);
  91. break;