push pacemaker stuff in a usable state.

20 files changed, 210 insertions, 88 deletions

diff --git a/package/Pacemaker-Python-GUI/Makefile b/package/Pacemaker-Python-GUI/Makefile
new file mode 100644
index 000000000..616fa9360
--- /dev/null
+++ b/package/Pacemaker-Python-GUI/Makefile
@@ -0,0 +1,47 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		Pacemaker-Python-GUI
+PKG_VERSION:=		2.1.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		22379f78409cec9df10c25983783ef6c
+PKG_DESCR:=		Pacemaker GUI
+PKG_SECTION:=		ha
+PKG_BUILDDEP:=		pacemaker gnutls pam
+PKG_URL:=		http://hg.clusterlabs.org/pacemaker/pygui/
+PKG_SITES:=		http://openadk.org/distfiles/
+
+PKG_SUBPKGS:=		PACEMAKER_PYTHON_GUI PACEMAKER_MGMTD
+PKGSD_PACEMAKER_MGMTD:=	Management daemon for Pacemaker GUI
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,PACEMAKER_PYTHON_GUI,pacemaker-python-gui,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PACEMAKER_MGMTD,pacemaker-mgmtd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_ARGS+=	--with-initdir=/etc/init.d \
+			--with-ocf-root=/usr/lib/ocf \
+			--disable-fatal-warnings
+TARGET_CFLAGS+=		-I$(STAGING_DIR)/usr/include/python2.7 \
+			-I$(STAGING_DIR)/usr/include/pacemaker \
+			-I$(STAGING_DIR)/usr/include/heartbeat
+
+pacemaker-python-gui-install:
+	$(INSTALL_DIR) $(IDIR_PACEMAKER_PYTHON_GUI)/usr/bin
+	$(INSTALL_DIR) $(IDIR_PACEMAKER_PYTHON_GUI)/usr/lib/heartbeat-gui
+	$(CP) $(WRKINST)/usr/lib/heartbeat-gui/* \
+		$(IDIR_PACEMAKER_PYTHON_GUI)/usr/lib/heartbeat-gui
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/hb_gui \
+		$(IDIR_PACEMAKER_PYTHON_GUI)/usr/bin
+
+pacemaker-mgmtd-install:
+	$(INSTALL_DIR) $(IDIR_PACEMAKER_MGMTD)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libhbmgmt*so* \
+		$(IDIR_PACEMAKER_MGMTD)/usr/lib
+	$(INSTALL_DIR) $(IDIR_PACEMAKER_MGMTD)/usr/lib/heartbeat
+	$(INSTALL_BIN) $(WRKINST)/usr/lib/heartbeat/mgmtd \
+		$(IDIR_PACEMAKER_MGMTD)/usr/lib/heartbeat
+	
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/Pacemaker-Python-GUI/patches/patch-mgmt_daemon_mgmt_crm_c b/package/Pacemaker-Python-GUI/patches/patch-mgmt_daemon_mgmt_crm_c
new file mode 100644
index 000000000..1882093d5
--- /dev/null
+++ b/package/Pacemaker-Python-GUI/patches/patch-mgmt_daemon_mgmt_crm_c
@@ -0,0 +1,32 @@
+--- Pacemaker-Python-GUI-2.1.0.orig/mgmt/daemon/mgmt_crm.c	2011-08-03 13:54:23.000000000 +0200
++++ Pacemaker-Python-GUI-2.1.0/mgmt/daemon/mgmt_crm.c	2011-10-07 16:15:59.000000000 +0200
+@@ -1393,7 +1393,7 @@ on_cleanup_rsc(char* argv[], int argc)
+ 				argv[1], cib_error2string(rc));
+ 	} else {
+ 		buffer = crm_concat("fail-count", argv[2], '-');
+-		delete_attr(cib_conn, cib_sync_call, XML_CIB_TAG_STATUS, dest_node, NULL, NULL,
++		delete_attr(cib_conn, cib_sync_call, XML_CIB_TAG_STATUS, dest_node, NULL,
+ 				NULL, buffer, NULL, FALSE);
+ 		crm_free(dest_node);
+ 		crm_free(buffer);
+@@ -1403,7 +1403,7 @@ on_cleanup_rsc(char* argv[], int argc)
+ 	sleep(2); /* wait for the refresh */
+ 	now_s = crm_itoa(now);
+ 	update_attr(cib_conn, cib_sync_call,
+-		    XML_CIB_TAG_CRMCONFIG, NULL, NULL, NULL, NULL, "last-lrm-refresh", now_s, FALSE);
++		    XML_CIB_TAG_CRMCONFIG, NULL, NULL, NULL, "last-lrm-refresh", now_s, FALSE);
+ 	crm_free(now_s);
+ 
+ 	crmd_channel->ops->destroy(crmd_channel);
+@@ -1509,9 +1509,11 @@ on_get_rsc_status(char* argv[], int argc
+ 				strncat(buf, " (orphaned)", sizeof(buf)-strlen(buf)-1);
+ 			}
+ 
++			/*
+ 			if(is_set(rsc->flags, pe_rsc_failure_ignored)) {
+ 				strncat(buf, " (failure ignored)", sizeof(buf)-strlen(buf)-1);
+ 			}
++			*/
+ 
+ 			ret = mgmt_msg_append(ret, buf);
+ 			break;
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 27ecdaa7c..fa1fecd86 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		47
+PKG_RELEASE:=		48
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 
diff --git a/package/base-files/src/init b/package/base-files/src/init
index a9564011d..c57149fe3 100755
--- a/package/base-files/src/init
+++ b/package/base-files/src/init
@@ -12,6 +12,7 @@ mount -o nosuid,nodev,noexec -t sysfs sysfs /sys
 mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev
 [ -d /dev/pts ] || mkdir /dev/pts 
 [ -d /dev/shm ] || mkdir /dev/shm
+mount -o nosuid,noexec -t tmpfs tmpfs /dev/shm
 mount -o nosuid,noexec -t devpts devpts /dev/pts
 exec 0<>/dev/console >&0 2>&0
 echo >/dev/mdev.seq
diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in
index 9c55d74aa..1b2d9d5fd 100644
--- a/package/busybox/config/coreutils/Config.in
+++ b/package/busybox/config/coreutils/Config.in
@@ -776,7 +776,7 @@ config BUSYBOX_TRUE
 
 config BUSYBOX_TTY
 	bool "tty"
-	default n
+	default y
 	help
 	  tty is used to print the name of the current terminal to
 	  standard output.
diff --git a/package/cluster-glue/Makefile b/package/cluster-glue/Makefile
index 140526ebc..170ae3a08 100644
--- a/package/cluster-glue/Makefile
+++ b/package/cluster-glue/Makefile
@@ -14,7 +14,6 @@ PKG_URL:=		http://www.linux-ha.org/wiki/Cluster_Glue
 PKG_SITES:=		http://openadk.org/distfiles/
 
 PKG_CFLINE_CLUSTER_GLUE:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-PKG_HOST_DEPENDS:=	!darwin
 PKG_ARCH_DEPENDS:=	x86 x86_64
 
 include $(TOPDIR)/mk/package.mk
@@ -28,8 +27,10 @@ CONFIGURE_ARGS+=	--disable-bundled-ltdl \
 			--enable-fatal-warnings=no
 
 cluster-glue-install:
-	$(INSTALL_DIR) $(IDIR_CLUSTER_GLUE)/usr/lib
+	$(INSTALL_DIR) $(IDIR_CLUSTER_GLUE)/usr/lib/heartbeat
 	$(CP) $(WRKINST)/usr/lib/*.so* \
 		$(IDIR_CLUSTER_GLUE)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/heartbeat/* \
+		$(IDIR_CLUSTER_GLUE)/usr/lib/heartbeat
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/corosync/Makefile b/package/corosync/Makefile
index 378fd618a..eb5ae8197 100644
--- a/package/corosync/Makefile
+++ b/package/corosync/Makefile
@@ -4,13 +4,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		corosync
-PKG_VERSION:=		1.3.1
+PKG_VERSION:=		1.4.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		c58459a009a3a9d0b9c00e276a190d90
+PKG_MD5SUM:=		66231146af210637393748add091021d
 PKG_DESCR:=		Cluster Engine	
 PKG_SECTION:=		ha
+PKG_DEPENDS:=		cluster-glue
 PKG_URL:=		http://www.corosync.org/
-PKG_SITES:=		http://openadk.org/distfiles/
+PKG_SITES:=		ftp://ftp:downloads@ftp.corosync.org/downloads/corosync-1.4.1/
 
 PKG_CFLINE_COROSYNC:=	select ADK_KERNEL_IP_MULTICAST
 
diff --git a/package/corosync/patches/patch-Makefile_in b/package/corosync/patches/patch-Makefile_in
deleted file mode 100644
index 4fc1ef74a..000000000
--- a/package/corosync/patches/patch-Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- corosync-1.3.1.orig/Makefile.in	2011-04-25 04:39:52.000000000 +0200
-+++ corosync-1.3.1/Makefile.in	2011-06-25 21:58:51.012672595 +0200
-@@ -320,7 +320,7 @@ corosysconf_DATA = conf/corosync.conf.ex
- 			  conf/corosync.conf.example.udpu
- 
- SUBDIRS = include lcr lib exec services tools test pkgconfig \
--			  man init
-+			  init
- 
- RPMBUILDOPTS = --define "_sourcedir $(abs_builddir)" \
- 		  --define "_specdir $(abs_builddir)" \
diff --git a/package/corosync/patches/patch-tools_corosync-keygen_c b/package/corosync/patches/patch-tools_corosync-keygen_c
index 6e147930c..eecf92026 100644
--- a/package/corosync/patches/patch-tools_corosync-keygen_c
+++ b/package/corosync/patches/patch-tools_corosync-keygen_c
@@ -1,5 +1,5 @@
---- corosync-1.3.1.orig/tools/corosync-keygen.c	2011-04-25 04:37:50.000000000 +0200
-+++ corosync-1.3.1/tools/corosync-keygen.c	2011-05-26 07:27:22.000000000 +0200
+--- corosync-1.4.1.orig/tools/corosync-keygen.c	2011-07-26 10:08:43.000000000 +0200
++++ corosync-1.4.1/tools/corosync-keygen.c	2011-10-04 21:03:05.000000000 +0200
 @@ -65,11 +65,11 @@ int main (void) {
  		}
  	}
diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile
index b82a80281..b4306c66d 100644
--- a/package/libxslt/Makefile
+++ b/package/libxslt/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libxslt
 PKG_VERSION:=		1.1.24
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		e83ec5d27fc4c10c6f612879bea9a153
 PKG_DESCR:=		XSLT Library
 PKG_SECTION:=		libs
@@ -42,7 +42,8 @@ xsltproc-install:
 
 libxslt-install:
 	${INSTALL_DIR} ${IDIR_LIBXSLT}/usr/lib
-	${CP} ${WRKINST}/usr/lib/lib?xslt.so* ${IDIR_LIBXSLT}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libxslt.so* ${IDIR_LIBXSLT}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libexslt.so* ${IDIR_LIBXSLT}/usr/lib
 
 libxslt-dev-install:
 	${INSTALL_DIR} ${IDIR_LIBXSLT_DEV}/usr/include
diff --git a/package/openais/files/openais.init b/package/openais/files/openais.init
index f36121c7a..25b2d8974 100644
--- a/package/openais/files/openais.init
+++ b/package/openais/files/openais.init
@@ -10,13 +10,16 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	mount -t tmpfs -o size=4M tmpfs /dev/shm
 	[ -d /var/lib/corosync ] || mkdir -p /var/lib/corosync
+	mkdir -p /var/lib/heartbeat/crm 
+	chown hacluster:haclient /var/lib/heartbeat/crm
+	chmod 775 /var/lib/heartbeat/crm
+	mkdir -p /var/lib/pengine
+	chown hacluster /var/lib/pengine
 	/usr/sbin/aisexec
   	;;
 stop)
 	kill $(pgrep -f corosync)
-	umount /dev/shm
 	;;
 restart)
 	sh $0 stop
diff --git a/package/pacemaker/Makefile b/package/pacemaker/Makefile
index 82b217f17..25dc896ff 100644
--- a/package/pacemaker/Makefile
+++ b/package/pacemaker/Makefile
@@ -9,12 +9,13 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		bfe2127d31e5244d0106a5c290fd0dc2
 PKG_DESCR:=		scalable High-Availability cluster resource manager
 PKG_SECTION:=		ha
-PKG_DEPENDS:=		python2
+PKG_BUILDDEP:=		resource-agents cluster-glue pam gnutls
+PKG_DEPENDS:=		python2 python2-readline python2-bzip2 cluster-glue
+PKG_DEPENDS+=		bash resource-agents pam libgnutls glib libxslt libxml2
 PKG_URL:=		http://www.clusterlabs.org/
 PKG_SITES:=		http://openadk.org/distfiles/
 
 PKG_CFLINE_PACEMAKER:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-PKG_HOST_DEPENDS:=	!darwin
 PKG_ARCH_DEPENDS:=	x86
 
 include $(TOPDIR)/mk/package.mk
@@ -24,15 +25,25 @@ $(eval $(call PKG_template,PACEMAKER,pacemaker,$(PKG_VERSION)-${PKG_RELEASE},${P
 # disable honour cflags stuff
 XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 
-CONFIGURE_ARGS+=	--includedir=$(STAGING_TARGET_DIR)/usr/include \
-			--disable-fatal-warnings
+CONFIGURE_ARGS+=	--disable-fatal-warnings
 CONFIGURE_ENV+=		ac_cv_path_HELP2MAN=''
-CFLAGS_FOR_BUILD+=	-I$(STAGING_TARGET_DIR)/usr/include/heartbeat
+CFLAGS_FOR_BUILD+=	-I$(STAGING_DIR)/usr/include/heartbeat
+
+pre-configure:
+	$(SED) "s#@@STAGING_DIR@@#$(STAGING_DIR)#" $(WRKBUILD)/configure
 
 pacemaker-install:
-	$(INSTALL_DIR) $(IDIR_PACEMAKER)/usr/lib
+	$(INSTALL_DIR) $(IDIR_PACEMAKER)/usr/lib/heartbeat
+	$(INSTALL_DIR) $(IDIR_PACEMAKER)/usr/lib/ocf
 	$(CP) $(WRKINST)/usr/lib/lib*.so* \
 		$(IDIR_PACEMAKER)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/heartbeat/* \
+		$(IDIR_PACEMAKER)/usr/lib/heartbeat
+	$(CP) $(WRKINST)/usr/lib/ocf/* \
+		$(IDIR_PACEMAKER)/usr/lib/ocf
+	$(INSTALL_DIR) $(IDIR_PACEMAKER)/usr/share/pacemaker
+	$(CP) $(WRKINST)/usr/share/pacemaker/* \
+		$(IDIR_PACEMAKER)/usr/share/pacemaker
 	$(INSTALL_DIR) $(IDIR_PACEMAKER)/usr/sbin
 	$(CP) $(WRKINST)/usr/sbin/* \
 		$(IDIR_PACEMAKER)/usr/sbin
diff --git a/package/pacemaker/files/pacemaker.postinst b/package/pacemaker/files/pacemaker.postinst
new file mode 100644
index 000000000..acda216de
--- /dev/null
+++ b/package/pacemaker/files/pacemaker.postinst
@@ -0,0 +1,8 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+
+gid=$(get_next_gid)
+gid2=$(get_next_gid)
+add_user hacluster $(get_next_uid) $gid /tmp
+add_group hacluster $gid
+add_group haclient $gid2
diff --git a/package/pacemaker/patches/patch-configure b/package/pacemaker/patches/patch-configure
index 5206c0b3b..320b06924 100644
--- a/package/pacemaker/patches/patch-configure
+++ b/package/pacemaker/patches/patch-configure
@@ -1,5 +1,5 @@
 --- pacemaker-1.0.11.orig/configure	2011-05-24 17:00:37.000000000 +0200
-+++ pacemaker-1.0.11/configure	2011-06-25 22:21:57.912681957 +0200
++++ pacemaker-1.0.11/configure	2011-10-07 12:41:11.000000000 +0200
 @@ -12484,7 +12484,7 @@ $as_echo_n "checking for $2 in $1... " >
  	  printf "#include <stdio.h>\n" > ${Cfile}.c
  	  printf "#include <%s>\n" $1 >> ${Cfile}.c
@@ -49,7 +49,7 @@
 -esac
 -
 -CFLAGS="$CFLAGS -I${prefix}/include/heartbeat"
-+CFLAGS="$CFLAGS -I${includedir}/heartbeat"
++CFLAGS="$CFLAGS -I@@STAGING_DIR@@/usr/include/heartbeat"
  
  
  
diff --git a/package/pacemaker/patches/patch-configure.orig b/package/pacemaker/patches/patch-configure.orig
deleted file mode 100644
index a3eca9a9d..000000000
--- a/package/pacemaker/patches/patch-configure.orig
+++ /dev/null
@@ -1,54 +0,0 @@
---- pacemaker-1.0.11.orig/configure	2011-05-24 17:00:37.000000000 +0200
-+++ pacemaker-1.0.11/configure	2011-05-24 17:39:43.000000000 +0200
-@@ -12484,7 +12484,7 @@ $as_echo_n "checking for $2 in $1... " >
- 	  printf "#include <stdio.h>\n" > ${Cfile}.c
- 	  printf "#include <%s>\n" $1 >> ${Cfile}.c
- 	  printf "int main(int argc, char **argv) { printf(\"%%s\", %s); return 0; }\n" $2 >> ${Cfile}.c
--	  $CC $CFLAGS ${Cfile}.c -o ${Cfile}
-+	  $CC_FOR_BUILD $CFLAGS_FOR_BUILD ${Cfile}.c -o ${Cfile}
- 	  value=`${Cfile}`
- 	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $value" >&5
- $as_echo "$value" >&6; }
-@@ -12713,33 +12713,11 @@ $as_echo "$as_me: WARNING: $j directory 
- done
- 
- 
--case "$host_os" in
--*bsd*)		LIBS="-L/usr/local/lib"
--		CPPFLAGS="$CPPFLAGS -I/usr/local/include"
--		INIT_EXT=".sh"
--		;;
--*solaris*)
--		;;
--*linux*)
--
- cat >>confdefs.h <<_ACEOF
- #define ON_LINUX 1
- _ACEOF
- 
--  		CFLAGS="$CFLAGS -I${prefix}/include"
-- 		;;
--darwin*)
--
--cat >>confdefs.h <<_ACEOF
--#define ON_DARWIN 1
--_ACEOF
--
--  		LIBS="$LIBS -L${prefix}/lib"
--  		CFLAGS="$CFLAGS -I${prefix}/include"
--		;;
--esac
--
--CFLAGS="$CFLAGS -I${prefix}/include/heartbeat"
-+CFLAGS="$CFLAGS -I${includedir}/heartbeat"
- 
- 
- 
-@@ -17159,7 +17137,6 @@ else
- 
- 	# We had to eliminate -Wnested-externs because of libtool changes
-         EXTRA_FLAGS="-fgnu89-inline
--		-fstack-protector-all
- 		-Wall
- 		-Waggregate-return
- 		-Wbad-function-cast
diff --git a/package/pam/Makefile b/package/pam/Makefile
new file mode 100644
index 000000000..a9381495e
--- /dev/null
+++ b/package/pam/Makefile
@@ -0,0 +1,32 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		pam
+PKG_VERSION:=		1.1.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		ff8f3c4382b78ac211e11bcd56ab17bf
+PKG_DESCR:=		Pluggable Authentication Modules
+PKG_BUILDDEP:=		flex
+PKG_SECTION:=		misc
+PKG_SITES:=		http://openadk.org/distfiles/
+
+DISTFILES:=		Linux-PAM-$(PKG_VERSION).tar.gz
+WRKDIST=                ${WRKDIR}/Linux-PAM-${PKG_VERSION}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,PAM,pam,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+pam-install:
+	$(INSTALL_DIR) $(IDIR_PAM)/etc/security
+	$(CP) $(WRKINST)/etc/security/* $(IDIR_PAM)/etc/security
+	$(INSTALL_DIR) $(IDIR_PAM)/lib/security
+	$(CP) $(WRKINST)/lib/libpam*.so* $(IDIR_PAM)/lib
+	$(CP) $(WRKINST)/lib/security/*.so* $(IDIR_PAM)/lib/security
+	$(CP) $(WRKBUILD)/conf/pam.conf $(IDIR_PAM)/etc
+	# /lib is not automatically installed to staging area
+	$(CP) $(WRKINST)/lib/libpam*.so* $(STAGING_DIR)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/pam/patches/patch-Makefile_in b/package/pam/patches/patch-Makefile_in
new file mode 100644
index 000000000..12574da06
--- /dev/null
+++ b/package/pam/patches/patch-Makefile_in
@@ -0,0 +1,24 @@
+--- Linux-PAM-1.1.4.orig/Makefile.in	2011-06-24 12:48:16.000000000 +0200
++++ Linux-PAM-1.1.4/Makefile.in	2011-10-07 11:42:21.000000000 +0200
+@@ -75,8 +75,8 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re
+   distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc \
+-	examples xtests
++DIST_SUBDIRS = libpam tests libpamc libpam_misc modules po conf \
++	examples
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
+@@ -258,8 +258,8 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 check-news
+-@STATIC_MODULES_FALSE@SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests
+-@STATIC_MODULES_TRUE@SUBDIRS = modules libpam libpamc libpam_misc tests po conf doc examples xtests
++@STATIC_MODULES_FALSE@SUBDIRS = libpam tests libpamc libpam_misc modules po conf examples
++@STATIC_MODULES_TRUE@SUBDIRS = modules libpam libpamc libpam_misc tests po conf examples
+ CLEANFILES = *~
+ M4_FILES = m4/gettext.m4 m4/iconv.m4 m4/intlmacosx.m4 \
+ 	m4/japhar_grep_cflags.m4 m4/jh_path_xml_catalog.m4 \
diff --git a/package/pam/patches/patch-conf_Makefile_in b/package/pam/patches/patch-conf_Makefile_in
new file mode 100644
index 000000000..b4a0d7afb
--- /dev/null
+++ b/package/pam/patches/patch-conf_Makefile_in
@@ -0,0 +1,11 @@
+--- Linux-PAM-1.1.4.orig/conf/Makefile.in	2011-06-24 12:48:02.000000000 +0200
++++ Linux-PAM-1.1.4/conf/Makefile.in	2011-10-07 11:32:37.000000000 +0200
+@@ -236,7 +236,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = pam_conv1
++SUBDIRS = 
+ CLEANFILES = *~
+ EXTRA_DIST = install_conf md5itall pam.conf
+ all: all-recursive
diff --git a/package/resource-agents/Makefile b/package/resource-agents/Makefile
index 6611a579c..657529326 100644
--- a/package/resource-agents/Makefile
+++ b/package/resource-agents/Makefile
@@ -5,24 +5,28 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		resource-agents
 PKG_VERSION:=		3.9.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		b5d0c178082ff186c36ab145b5bbf5df
 PKG_DESCR:=		Resource agents for clusters
 PKG_SECTION:=		ha
+PKG_BUILDDEP:=		glib cluster-glue
 PKG_URL:=		https://github.com/ClusterLabs/resource-agents
 PKG_SITES:=		http://openadk.org/distfiles/
 
 PKG_CFLINE_RESOURCE_AGENTS:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-PKG_HOST_DEPENDS:=	!darwin
 PKG_ARCH_DEPENDS:=	x86
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,RESOURCE_AGENTS,resource-agents,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIGURE_ARGS+=	--with-ocf-root=/usr/lib/ocf
+
 resource-agents-install:
 	$(INSTALL_DIR) $(IDIR_RESOURCE_AGENTS)/usr/share/cluster
 	$(CP) $(WRKINST)/usr/share/cluster/*.sh \
 		$(IDIR_RESOURCE_AGENTS)/usr/share/cluster
+	$(INSTALL_DIR) $(IDIR_RESOURCE_AGENTS)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/* $(IDIR_RESOURCE_AGENTS)/usr/lib
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/resource-agents/patches/patch-configure b/package/resource-agents/patches/patch-configure
new file mode 100644
index 000000000..62d1beba5
--- /dev/null
+++ b/package/resource-agents/patches/patch-configure
@@ -0,0 +1,11 @@
+--- resource-agents-3.9.0.orig/configure	2011-05-24 15:37:07.000000000 +0200
++++ resource-agents-3.9.0/configure	2011-10-07 20:11:45.000000000 +0200
+@@ -6171,7 +6171,7 @@ $as_echo_n "checking for $2 in $1... " >
+ 	  printf "#include <stdio.h>\n" > ${Cfile}.c
+ 	  printf "#include <%s>\n" $1 >> ${Cfile}.c
+ 	  printf "int main(int argc, char **argv) { printf(\"%%s\", %s); return 0; }\n" $2 >> ${Cfile}.c
+-	  $CC $CFLAGS ${Cfile}.c -o ${Cfile}
++	  $CC_FOR_BUILD $CFLAGS_FOR_BUILD ${Cfile}.c -o ${Cfile}
+ 	  value=`${Cfile}`
+ 	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $value" >&5
+ $as_echo "$value" >&6; }