update to latest version

6 files changed, 83 insertions, 2 deletions

diff --git a/package/cluster-glue/Makefile b/package/cluster-glue/Makefile
index 5e45c71ad..f02b5e8d0 100644
--- a/package/cluster-glue/Makefile
+++ b/package/cluster-glue/Makefile
@@ -4,15 +4,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		cluster-glue
-PKG_VERSION:=		1.0.10
+PKG_VERSION:=		1.0.11
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		67e35a8e1a78376af039aa53644f0de2
+PKG_MD5SUM:=		bd5a20fc9185da17caf113776d1eac47
 PKG_DESCR:=		Cluster Glue library and tools
 PKG_SECTION:=		ha
 PKG_BUILDDEP:=		glib bzip2 e2fsprogs libaio
 PKG_DEPENDS:=		libaio
 PKG_URL:=		http://www.linux-ha.org/wiki/Cluster_Glue
 PKG_SITES:=		http://openadk.org/distfiles/
+PKG_NOPARALLEL:=	1
 
 PKG_CFLINE_CLUSTER_GLUE:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
 PKG_ARCH_DEPENDS:=	x86 x86_64
diff --git a/package/cluster-glue/patches/patch-lib_clplumbing_Makefile_in b/package/cluster-glue/patches/patch-lib_clplumbing_Makefile_in
new file mode 100644
index 000000000..203ebc6b1
--- /dev/null
+++ b/package/cluster-glue/patches/patch-lib_clplumbing_Makefile_in
@@ -0,0 +1,20 @@
+--- cluster-glue-1.0.11.orig/lib/clplumbing/Makefile.in	2013-02-27 15:20:39.000000000 +0100
++++ cluster-glue-1.0.11/lib/clplumbing/Makefile.in	2013-02-27 15:38:14.000000000 +0100
+@@ -121,6 +121,7 @@ PROGRAMS = $(test_PROGRAMS)
+ am_base64_md5_test_OBJECTS = base64_md5_test.$(OBJEXT)
+ base64_md5_test_OBJECTS = $(am_base64_md5_test_OBJECTS)
+ base64_md5_test_DEPENDENCIES = libplumb.la \
++	$(top_builddir)/lib/pils/libpils.la \
+ 	$(top_builddir)/replace/libreplace.la
+ am_ipctest_OBJECTS = ipctest.$(OBJEXT)
+ ipctest_OBJECTS = $(am_ipctest_OBJECTS)
+@@ -454,7 +455,8 @@ ipctransientserver_LDADD = libplumb.la $
+ #netstring_test_SOURCES	= netstring_test.c
+ #netstring_test_LDADD	= libplumb.la $(top_builddir)/replace/libreplace.la libhbclient.la $(gliblib)
+ base64_md5_test_SOURCES = base64_md5_test.c
+-base64_md5_test_LDADD = libplumb.la $(top_builddir)/replace/libreplace.la $(GLIBLIB)
++base64_md5_test_LDADD = libplumb.la $(top_builddir)/replace/libreplace.la $(GLIBLIB) \
++			$(top_builddir)/lib/pils/libpils.la
+ EXTRA_DIST = $(test_SCRIPTS)
+ all: all-am
+ 
diff --git a/package/cluster-glue/patches/patch-lib_stonith_Makefile_in b/package/cluster-glue/patches/patch-lib_stonith_Makefile_in
new file mode 100644
index 000000000..d5558f681
--- /dev/null
+++ b/package/cluster-glue/patches/patch-lib_stonith_Makefile_in
@@ -0,0 +1,18 @@
+--- cluster-glue-1.0.11.orig/lib/stonith/Makefile.in	2013-02-27 15:20:40.000000000 +0100
++++ cluster-glue-1.0.11/lib/stonith/Makefile.in	2013-02-27 15:39:57.000000000 +0100
+@@ -111,6 +111,7 @@ meatclient_DEPENDENCIES =
+ am_sbd_OBJECTS = sbd-sbd-md.$(OBJEXT) sbd-sbd-common.$(OBJEXT)
+ sbd_OBJECTS = $(am_sbd_OBJECTS)
+ sbd_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
++	$(top_builddir)/lib/pils/libpils.la \
+ 	$(top_builddir)/lib/clplumbing/libplumbgpl.la
+ sbd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=link $(CCLD) $(sbd_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+@@ -385,6 +386,7 @@ sbd_SOURCES = sbd-md.c sbd-common.c
+ sbd_CFLAGS = -D_GNU_SOURCE
+ sbd_LDADD = $(GLIBLIB) -laio				\
+ 			$(top_builddir)/lib/clplumbing/libplumb.la	\
++			$(top_builddir)/lib/pils/libpils.la \
+ 			$(top_builddir)/lib/clplumbing/libplumbgpl.la
+ 
+ lib_LTLIBRARIES = libstonith.la
diff --git a/package/cluster-glue/patches/patch-logd_Makefile_in b/package/cluster-glue/patches/patch-logd_Makefile_in
new file mode 100644
index 000000000..f159c2941
--- /dev/null
+++ b/package/cluster-glue/patches/patch-logd_Makefile_in
@@ -0,0 +1,20 @@
+--- cluster-glue-1.0.11.orig/logd/Makefile.in	2013-02-27 15:20:40.000000000 +0100
++++ cluster-glue-1.0.11/logd/Makefile.in	2013-02-27 15:57:45.000000000 +0100
+@@ -362,14 +362,15 @@ AM_CFLAGS = @CFLAGS@
+ initddir = @INITDIR@
+ ha_logd_SOURCES = ha_logd.c
+ ha_logd_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la		\
++		$(top_builddir)/lib/pils/libpils.la \
+ 		    $(top_builddir)/lib/clplumbing/libplumbgpl.la
+ 
+ 
+ #		    $(top_builddir)/lib/apphb/libapphb.la
+ ha_logger_SOURCES = ha_logger.c
+-ha_logger_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la
++ha_logger_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la $(top_builddir)/lib/pils/libpils.la
+ logtest_SOURCES = logtest.c
+-logtest_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la
++logtest_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la $(top_builddir)/lib/pils/libpils.la
+ initd_SCRIPTS = logd
+ all: all-am
+ 
diff --git a/package/cluster-glue/patches/patch-lrm_admin_Makefile_in b/package/cluster-glue/patches/patch-lrm_admin_Makefile_in
new file mode 100644
index 000000000..3e51b9d66
--- /dev/null
+++ b/package/cluster-glue/patches/patch-lrm_admin_Makefile_in
@@ -0,0 +1,11 @@
+--- cluster-glue-1.0.11.orig/lrm/admin/Makefile.in	2013-02-27 15:20:40.000000000 +0100
++++ cluster-glue-1.0.11/lrm/admin/Makefile.in	2013-02-27 15:42:54.000000000 +0100
+@@ -349,7 +349,7 @@ INCLUDES = -I$(top_builddir)/include -I$
+ 					-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
+ 
+ halibdir = $(libdir)/@HB_PKG@
+-COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la $(GLIBLIB)
++COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la $(GLIBLIB) $(top_builddir)/lib/pils/libpils.la
+ sbin_SCRIPTS = cibsecret
+ lrmadmin_SOURCES = lrmadmin.c
+ lrmadmin_LDFLAGS = $(COMMONLIBS)
diff --git a/package/cluster-glue/patches/patch-lrm_test_Makefile_in b/package/cluster-glue/patches/patch-lrm_test_Makefile_in
new file mode 100644
index 000000000..1086c9082
--- /dev/null
+++ b/package/cluster-glue/patches/patch-lrm_test_Makefile_in
@@ -0,0 +1,11 @@
+--- cluster-glue-1.0.11.orig/lrm/test/Makefile.in	2013-02-27 15:20:41.000000000 +0100
++++ cluster-glue-1.0.11/lrm/test/Makefile.in	2013-02-27 15:52:00.000000000 +0100
+@@ -401,7 +401,7 @@ SUBDIRS = testcases
+ INCLUDES = -I$(top_builddir)/include  -I$(top_srcdir)/include \
+ 			-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
+ 
+-COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la $(GLIBLIB)
++COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la $(GLIBLIB) $(top_builddir)/lib/pils/libpils.la
+ apitest_SOURCES = apitest.c
+ apitest_LDFLAGS = $(COMMONLIBS)
+ apitest_LDADD = $(top_builddir)/lib/$(LRM_DIR)/liblrm.la