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: 10-Mar-2006 16:12:42
Branch: HEAD Handle: 2006031015124200
Modified files:
openpkg-src/heartbeat heartbeat.patch heartbeat.spec
Log:
upgrading package: heartbeat 2.0.2 -> 2.0.4
Summary:
Revision Changes Path
1.4 +63 -27 openpkg-src/heartbeat/heartbeat.patch
1.14 +4 -4 openpkg-src/heartbeat/heartbeat.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/heartbeat/heartbeat.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 heartbeat.patch
--- openpkg-src/heartbeat/heartbeat.patch 25 Sep 2005 08:25:28 -0000
1.3
+++ openpkg-src/heartbeat/heartbeat.patch 10 Mar 2006 15:12:42 -0000
1.4
@@ -1,9 +1,9 @@
Index: configure
---- 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/$host
+--- configure.orig 2006-02-10 18:21:44 +0100
++++ configure 2006-02-11 09:44:47 +0100
+@@ -2074,8 +2074,7 @@
+
+ pf_argv_set=""
case "$host_os" in
-*bsd*) LIBS="-L/usr/local/lib"
- CPPFLAGS="$CPPFLAGS -I/usr/local/include"
@@ -11,7 +11,7 @@
INIT_EXT=".sh"
;;
-@@ -2223,7 +2222,7 @@
+@@ -2252,7 +2251,7 @@
_ACEOF
@@ -20,7 +20,7 @@
cat >>confdefs.h <<_ACEOF
-@@ -23504,13 +23503,13 @@
+@@ -24088,13 +24087,13 @@
fi
@@ -37,7 +37,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23573,7 +23572,7 @@
+@@ -24157,7 +24156,7 @@
#define HAVE_LIBGNUGETOPT 1
_ACEOF
@@ -46,7 +46,7 @@
fi
-@@ -35163,7 +35162,6 @@
+@@ -36982,7 +36981,6 @@
# We had to eliminate -Wnested-externs because of libtool changes
WARNLIST="all missing-prototypes
missing-declarations
@@ -54,7 +54,7 @@
pointer-arith
write-strings
cast-qual cast-align
-@@ -39520,7 +39518,7 @@
+@@ -41519,7 +41517,7 @@
@@ -64,9 +64,9 @@
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 @@
+--- replace/Makefile.in.orig 2006-02-10 18:21:40 +0100
++++ replace/Makefile.in 2006-02-11 09:44:47 +0100
+@@ -425,7 +425,7 @@
rm -f "$${dir}/so_locations"; \
done
libreplace.la: $(libreplace_la_OBJECTS) $(libreplace_la_DEPENDENCIES)
@@ -75,21 +75,9 @@
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
+--- replace/uuid_parse.c.orig 2005-11-09 17:06:21 +0100
++++ replace/uuid_parse.c 2006-02-11 09:44:52 +0100
@@ -496,7 +496,7 @@
* with IEEE 802 addresses obtained from
* network cards
@@ -99,3 +87,51 @@
}
has_init = 1;
}
+Index: crm/admin/Makefile.in
+--- crm/admin/Makefile.in.orig 2006-03-10 15:57:35 +0100
++++ crm/admin/Makefile.in 2006-03-10 16:04:08 +0100
+@@ -466,8 +466,7 @@
+ noinst_HEADERS =
+ crmadmin_SOURCES = crmadmin.c
+ crmadmin_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
+-crmadmin_LDADD = $(COMMONLIBS) \
+- $(top_builddir)/crm/pengine/libpengine.la
++crmadmin_LDADD = $(top_builddir)/crm/pengine/libpengine.la $(COMMONLIBS)
+
+ crm_uuid_SOURCES = crm_uuid.c
+ crm_uuid_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
+@@ -477,21 +476,18 @@
+ cibadmin_LDADD = $(COMMONLIBS)
+ ccm_tool_SOURCES = ccm_epoche.c
+ ccm_tool_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
+-ccm_tool_LDADD = $(COMMONLIBS) \
+- $(top_builddir)/membership/ccm/libccmclient.la
++ccm_tool_LDADD = $(top_builddir)/membership/ccm/libccmclient.la
$(COMMONLIBS)
+
+ crm_diff_SOURCES = xml_diff.c
+ crm_diff_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
+ crm_diff_LDADD = $(COMMONLIBS)
+ crm_mon_SOURCES = crm_mon.c
+ crm_mon_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
+-crm_mon_LDADD = $(COMMONLIBS) \
+- $(top_builddir)/crm/pengine/libpengine.la
++crm_mon_LDADD = $(top_builddir)/crm/pengine/libpengine.la $(COMMONLIBS)
+
+ crm_verify_SOURCES = crm_verify.c
+ crm_verify_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
+-crm_verify_LDADD = $(COMMONLIBS) \
+- $(top_builddir)/crm/pengine/libpengine.la
++crm_verify_LDADD = $(top_builddir)/crm/pengine/libpengine.la $(COMMONLIBS)
+
+ crm_master_SOURCES = crm_attribute.c
+ crm_master_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
+@@ -504,8 +500,7 @@
+ crm_attribute_LDADD = $(COMMONLIBS)
+ crm_resource_SOURCES = crm_resource.c
+ crm_resource_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
+-crm_resource_LDADD = $(COMMONLIBS) \
+- $(top_builddir)/crm/pengine/libpengine.la
++crm_resource_LDADD = $(top_builddir)/crm/pengine/libpengine.la
$(COMMONLIBS)
+
+ iso8601_SOURCES = test.iso8601.c
+ iso8601_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/heartbeat/heartbeat.spec
============================================================================
$ cvs diff -u -r1.13 -r1.14 heartbeat.spec
--- openpkg-src/heartbeat/heartbeat.spec 1 Jan 2006 13:14:28 -0000
1.13
+++ openpkg-src/heartbeat/heartbeat.spec 10 Mar 2006 15:12:42 -0000
1.14
@@ -34,8 +34,8 @@
Class: EVAL
Group: System
License: GPL
-Version: 2.0.2
-Release: 20050925
+Version: 2.0.4
+Release: 20060310
# list of sources
Source0: http://linux-ha.org/download/heartbeat-%{version}.tar.gz
@@ -50,8 +50,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, perl, pkgconfig, make, gcc
PreReq: OpenPKG, openpkg >= 20040130, perl
-BuildPreReq: libnet, libxml, uuid, glib, snmp, curl, openssl, gettext,
libiconv, getopt
-PreReq: libnet, libxml, uuid, glib, snmp, curl, openssl, gettext,
libiconv, getopt
+BuildPreReq: libnet, libxml, uuid, glib, snmp, curl, openssl, gettext,
libiconv, getopt, ncurses
+PreReq: libnet, libxml, uuid, glib, snmp, curl, openssl, gettext,
libiconv, getopt, ncurses
AutoReq: no
AutoReqProv: no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
