heartbeat.patch 2.2 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788
  1. Index: lib/plugins/stonith/apcmastersnmp.c
  2. --- lib/plugins/stonith/apcmastersnmp.c.orig 2004-09-13 18:36:49 +0200
  3. +++ lib/plugins/stonith/apcmastersnmp.c 2004-09-22 17:16:14 +0200
  4. @@ -22,6 +22,12 @@
  5. #include <portability.h>
  6. #ifdef HAVE_CONFIG_H
  7. #include <config.h>
  8. +#undef PACKAGE
  9. +#undef PACKAGE_BUGREPORT
  10. +#undef PACKAGE_NAME
  11. +#undef PACKAGE_STRING
  12. +#undef PACKAGE_TARNAME
  13. +#undef PACKAGE_VERSION
  14. #endif
  15. #include <stdio.h>
  16. #include <stdlib.h>
  17. Index: replace/Makefile.in
  18. --- replace/Makefile.in.orig 2004-09-18 16:26:22 +0200
  19. +++ replace/Makefile.in 2004-09-22 17:16:14 +0200
  20. @@ -346,7 +346,7 @@
  21. rm -f "$${dir}/so_locations"; \
  22. done
  23. libreplace.la: $(libreplace_la_OBJECTS) $(libreplace_la_DEPENDENCIES)
  24. - $(LINK) $(libreplace_la_LDFLAGS) $(libreplace_la_OBJECTS) $(libreplace_la_LIBADD) $(LIBS)
  25. + $(LINK) $(libreplace_la_LDFLAGS) $(libreplace_la_OBJECTS) $(libreplace_la_LIBADD)
  26. mostlyclean-compile:
  27. -rm -f *.$(OBJEXT)
  28. Index: configure
  29. --- configure.orig 2004-09-18 16:25:06 +0200
  30. +++ configure 2004-09-22 17:31:04 +0200
  31. @@ -2029,13 +2029,11 @@
  32. USE_MODULES=0
  33. echo Our Host OS: $host_os
  34. case "$host_os" in
  35. -solaris*) LIBS="-L/usr/local/lib $LIBS"
  36. - CPPFLAGS="$CPPFLAGS -I/usr/local/include -I/opt/sfw/include"
  37. +solaris*)
  38. INIT_EXT=".sh"
  39. ;;
  40. -*bsd*) LIBS="-L/usr/local/lib"
  41. - CPPFLAGS="$CPPFLAGS -I/usr/local/include"
  42. +*bsd*)
  43. INIT_EXT=".sh"
  44. ;;
  45. @@ -2107,7 +2105,7 @@
  46. docdir=${datadir}/doc/${HB_PKG}-${VERSION}
  47. -HA_VARLIBDIR="${localstatedir}/lib"
  48. +HA_VARLIBDIR="${localstatedir}/heartbeat"
  49. cat >>confdefs.h <<_ACEOF
  50. @@ -29823,7 +29821,6 @@
  51. # We had to eliminate -Wnested-externs because of libtool changes
  52. WARNLIST="all missing-prototypes
  53. missing-declarations
  54. - strict-prototypes
  55. pointer-arith
  56. write-strings
  57. cast-qual cast-align
  58. @@ -38642,7 +38639,7 @@
  59. -HB_RC_DIR=$sysconfdir/ha.d/rc.d
  60. +HB_RC_DIR=$sysconfdir/rc.d
  61. cat >>confdefs.h <<_ACEOF
  62. Index: linux-ha/portability.h
  63. --- linux-ha/portability.h.orig 2004-04-29 05:12:24.000000000 +0200
  64. +++ linux-ha/portability.h 2004-09-23 13:07:29.240260479 +0200
  65. @@ -116,10 +116,6 @@
  66. # include <uuid.h>
  67. #endif /* HAVE_UUID_H */
  68. -#ifdef HAVE_UUID_UUID_H
  69. -# include <uuid/uuid.h>
  70. -#endif /* HAVE_UUID_UUID_H */
  71. -
  72. #ifndef HA_HAVE_NFDS_T
  73. typedef unsigned int nfds_t;
  74. #endif