OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Sep-2005 10:25:28
Branch: HEAD Handle: 2005092509252800
Modified files:
openpkg-src/heartbeat heartbeat.patch heartbeat.spec
Log:
upgrading package: heartbeat 1.2.3 -> 2.0.2
Summary:
Revision Changes Path
1.3 +47 -74 openpkg-src/heartbeat/heartbeat.patch
1.12 +5 -3 openpkg-src/heartbeat/heartbeat.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/heartbeat/heartbeat.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 heartbeat.patch
--- openpkg-src/heartbeat/heartbeat.patch 23 Sep 2004 15:56:21 -0000
1.2
+++ openpkg-src/heartbeat/heartbeat.patch 25 Sep 2005 08:25:28 -0000
1.3
@@ -1,81 +1,18 @@
-Index: lib/plugins/stonith/apcmastersnmp.c
---- lib/plugins/stonith/apcmastersnmp.c.orig 2004-09-13 18:36:49 +0200
-+++ lib/plugins/stonith/apcmastersnmp.c 2004-09-22 17:16:14 +0200
-@@ -22,6 +22,12 @@
- #include <portability.h>
- #ifdef HAVE_CONFIG_H
- #include <config.h>
-+#undef PACKAGE
-+#undef PACKAGE_BUGREPORT
-+#undef PACKAGE_NAME
-+#undef PACKAGE_STRING
-+#undef PACKAGE_TARNAME
-+#undef PACKAGE_VERSION
- #endif
- #include <stdio.h>
- #include <stdlib.h>
-Index: replace/Makefile.in
---- replace/Makefile.in.orig 2004-09-18 16:26:22 +0200
-+++ replace/Makefile.in 2004-09-22 17:16:14 +0200
-@@ -346,7 +346,7 @@
- rm -f "$${dir}/so_locations"; \
- done
- libreplace.la: $(libreplace_la_OBJECTS) $(libreplace_la_DEPENDENCIES)
-- $(LINK) $(libreplace_la_LDFLAGS) $(libreplace_la_OBJECTS)
$(libreplace_la_LIBADD) $(LIBS)
-+ $(LINK) $(libreplace_la_LDFLAGS) $(libreplace_la_OBJECTS)
$(libreplace_la_LIBADD)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-Index: linux-ha/portability.h
---- linux-ha/portability.h.orig 2004-04-29 05:12:24.000000000 +0200
-+++ linux-ha/portability.h 2004-09-23 13:07:29.240260479 +0200
-@@ -116,10 +116,6 @@
- # include <uuid.h>
- #endif /* HAVE_UUID_H */
-
--#ifdef HAVE_UUID_UUID_H
--# include <uuid/uuid.h>
--#endif /* HAVE_UUID_UUID_H */
--
- #ifndef HA_HAVE_NFDS_T
- typedef unsigned int nfds_t;
- #endif
-Index: libltdl/Makefile.in
---- libltdl/Makefile.in.orig 2004-09-18 16:28:06 +0200
-+++ libltdl/Makefile.in 2004-09-23 15:54:43 +0200
-@@ -303,9 +303,9 @@
- rm -f "$${dir}/so_locations"; \
- done
- libltdl.la: $(libltdl_la_OBJECTS) $(libltdl_la_DEPENDENCIES)
-- $(LINK) -rpath $(libdir) $(libltdl_la_LDFLAGS) $(libltdl_la_OBJECTS)
$(libltdl_la_LIBADD) $(LIBS)
-+ $(LINK) -rpath $(libdir) $(libltdl_la_LDFLAGS) $(libltdl_la_OBJECTS)
$(libltdl_la_LIBADD)
- libltdlc.la: $(libltdlc_la_OBJECTS) $(libltdlc_la_DEPENDENCIES)
-- $(LINK) $(libltdlc_la_LDFLAGS) $(libltdlc_la_OBJECTS)
$(libltdlc_la_LIBADD) $(LIBS)
-+ $(LINK) $(libltdlc_la_LDFLAGS) $(libltdlc_la_OBJECTS)
$(libltdlc_la_LIBADD)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
Index: configure
---- configure.orig 2004-09-18 16:25:06 +0200
-+++ configure 2004-09-23 16:05:09 +0200
-@@ -2029,13 +2029,11 @@
+--- configure.orig 2005-09-23 21:33:10 +0200
++++ configure 2005-09-25 09:51:20 +0200
+@@ -2059,8 +2059,7 @@
USE_MODULES=0
- echo Our Host OS: $host_os
+ echo Our Host OS: $host_os/$host
case "$host_os" in
--solaris*) LIBS="-L/usr/local/lib $LIBS"
-- CPPFLAGS="$CPPFLAGS -I/usr/local/include -I/opt/sfw/include"
-+solaris*)
- INIT_EXT=".sh"
- ;;
-
-*bsd*) LIBS="-L/usr/local/lib"
- CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-+*bsd*)
++*bsd*)
INIT_EXT=".sh"
;;
-@@ -2107,7 +2105,7 @@
- docdir=${datadir}/doc/${HB_PKG}-${VERSION}
+@@ -2223,7 +2222,7 @@
+ _ACEOF
-HA_VARLIBDIR="${localstatedir}/lib"
@@ -83,7 +20,7 @@
cat >>confdefs.h <<_ACEOF
-@@ -22173,13 +22171,13 @@
+@@ -23504,13 +23503,13 @@
fi
@@ -100,7 +37,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22242,7 +22240,7 @@
+@@ -23573,7 +23572,7 @@
#define HAVE_LIBGNUGETOPT 1
_ACEOF
@@ -109,7 +46,7 @@
fi
-@@ -29823,7 +29821,6 @@
+@@ -35163,7 +35162,6 @@
# We had to eliminate -Wnested-externs because of libtool changes
WARNLIST="all missing-prototypes
missing-declarations
@@ -117,7 +54,7 @@
pointer-arith
write-strings
cast-qual cast-align
-@@ -38642,7 +38639,7 @@
+@@ -39520,7 +39518,7 @@
@@ -126,3 +63,39 @@
cat >>confdefs.h <<_ACEOF
+Index: replace/Makefile.in
+--- replace/Makefile.in.orig 2005-09-23 21:33:05 +0200
++++ replace/Makefile.in 2005-09-25 09:49:46 +0200
+@@ -399,7 +399,7 @@
+ rm -f "$${dir}/so_locations"; \
+ done
+ libreplace.la: $(libreplace_la_OBJECTS) $(libreplace_la_DEPENDENCIES)
+- $(LINK) $(libreplace_la_LDFLAGS) $(libreplace_la_OBJECTS)
$(libreplace_la_LIBADD) $(LIBS)
++ $(LINK) $(libreplace_la_LDFLAGS) $(libreplace_la_OBJECTS)
$(libreplace_la_LIBADD)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+Index: crm/crmd/join_dc.c
+--- crm/crmd/join_dc.c.orig 2005-09-14 17:24:48 +0200
++++ crm/crmd/join_dc.c 2005-09-25 09:57:12 +0200
+@@ -285,7 +285,7 @@
+ CRM_DEV_ASSERT(cib_not_master != rc);
+ clear_bit_inplace(fsa_input_register, R_CIB_ASKED);
+ if(rc != cib_ok) {
+- crm_log_maybe(rc==cib_old_data?LOG_WARNING:LOG_ERR,
++ crm_log_maybe((rc==cib_old_data?LOG_WARNING:LOG_ERR),
+ "Sync from %s resulted in an error: %s",
+ (char*)user_data, cib_error2string(rc));
+
+Index: replace/uuid_parse.c
+--- replace/uuid_parse.c.orig 2005-06-12 08:11:18 +0200
++++ replace/uuid_parse.c 2005-09-25 10:01:19 +0200
+@@ -496,7 +496,7 @@
+ * with IEEE 802 addresses obtained from
+ * network cards
+ */
+- node_id[0] |= 0x80;
++ node_id[0] |= 0x01;
+ }
+ has_init = 1;
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/heartbeat/heartbeat.spec
============================================================================
$ cvs diff -u -r1.11 -r1.12 heartbeat.spec
--- openpkg-src/heartbeat/heartbeat.spec 1 Aug 2005 13:54:09 -0000
1.11
+++ openpkg-src/heartbeat/heartbeat.spec 25 Sep 2005 08:25:28 -0000
1.12
@@ -22,6 +22,8 @@
## SUCH DAMAGE.
##
+# FIXME: rse: OSSP uuid still not supported in Heartbeat 2.x
+
# package information
Name: heartbeat
Summary: High-Availability Communication Daemon
@@ -32,8 +34,8 @@
Class: EVAL
Group: System
License: GPL
-Version: 1.2.3
-Release: 20050801
+Version: 2.0.2
+Release: 20050925
# list of sources
Source0: http://linux-ha.org/download/heartbeat-%{version}.tar.gz
@@ -62,7 +64,6 @@
%track
prog heartbeat = {
- comment = "thl: 2.0.0 bails out with: does not yet support ossp
implementation of uuid"
version = %{version}
url = http://linux-ha.org/download/index.html
regex = heartbeat-(\d+\.[02468]\.\d+)\.tar\.gz
@@ -95,6 +96,7 @@
--with-group-id=%{l_muid} \
--with-ccmuser-name=%{l_musr} \
--with-ccmuser-id=%{l_muid} \
+ --with-uuid=any \
--enable-static \
--enable-shared
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
