Merge branch 'master' of git+ssh://openadk.org/git/openadk

8 files changed, 126 insertions, 152 deletions

diff --git a/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in b/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in
index f667eeb61..9e925158b 100644
--- a/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in
+++ b/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in
@@ -1,6 +1,6 @@
---- nspr-4.8.2.orig/mozilla/nsprpub/config/Makefile.in	2009-03-03 23:04:23.000000000 +0100
-+++ nspr-4.8.2/mozilla/nsprpub/config/Makefile.in	2010-05-02 12:25:27.673464050 +0200
-@@ -145,7 +145,7 @@ endif
+--- nspr-4.9.5.orig/mozilla/nsprpub/config/Makefile.in	2012-11-14 00:17:57.000000000 +0100
++++ nspr-4.9.5/mozilla/nsprpub/config/Makefile.in	2013-02-27 16:29:38.000000000 +0100
+@@ -113,7 +113,7 @@ endif
  
  $(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX)
  	@$(MAKE_OBJDIR)
diff --git a/package/pacemaker-mgmt/Makefile b/package/pacemaker-mgmt/Makefile
index 5a412863e..d4d79ee8e 100644
--- a/package/pacemaker-mgmt/Makefile
+++ b/package/pacemaker-mgmt/Makefile
@@ -3,45 +3,36 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=		Pacemaker-Python-GUI
-PKG_VERSION:=		2.1.0
+PKG_NAME:=		pacemaker-mgmt
+PKG_VERSION:=		2.0.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		22379f78409cec9df10c25983783ef6c
-PKG_DESCR:=		Pacemaker GUI
+PKG_MD5SUM:=		be16a38588d1c518f53e64e7e48e1c90
+PKG_DESCR:=		Pacemaker management daemon
 PKG_SECTION:=		ha
-PKG_BUILDDEP:=		pacemaker gnutls pam
+PKG_BUILDDEP:=		pacemaker gnutls pam python2
 PKG_URL:=		http://hg.clusterlabs.org/pacemaker/pygui/
 PKG_SITES:=		http://openadk.org/distfiles/
 
-PKG_CFLINE_PACEMAKER_PYTHON_GUI:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
 PKG_CFLINE_PACEMAKER_MGMTD:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
 
-PKG_SUBPKGS:=		PACEMAKER_PYTHON_GUI PACEMAKER_MGMTD
+PKG_SUBPKGS:=		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}))
 
+include $(TOPDIR)/mk/python.mk
+
+CONFIGURE_ENV+=		PYTHON=$(PYTHON)
 CONFIGURE_ARGS+=	--with-initdir=/etc/init.d \
 			--with-ocf-root=/usr/lib/ocf \
+			--without-ais-support \
 			--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
-	$(INSTALL_DIR) $(IDIR_PACEMAKER_PYTHON_GUI)/usr/share/heartbeat-gui
-	$(CP) $(WRKINST)/usr/lib/heartbeat-gui/* \
-		$(IDIR_PACEMAKER_PYTHON_GUI)/usr/lib/heartbeat-gui
-	$(CP) $(WRKINST)/usr/share/heartbeat-gui/* \
-		$(IDIR_PACEMAKER_PYTHON_GUI)/usr/share/heartbeat-gui
-	$(CP) $(WRKINST)/usr/bin/*_gui \
-		$(IDIR_PACEMAKER_PYTHON_GUI)/usr/bin
-
 pacemaker-mgmtd-install:
 	$(INSTALL_DIR) $(IDIR_PACEMAKER_MGMTD)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libhbmgmt*so* \
diff --git a/package/pacemaker-mgmt/patches/patch-configure b/package/pacemaker-mgmt/patches/patch-configure
index bfbf2ae69..cc517cf6e 100644
--- a/package/pacemaker-mgmt/patches/patch-configure
+++ b/package/pacemaker-mgmt/patches/patch-configure
@@ -1,11 +1,109 @@
---- Pacemaker-Python-GUI-2.1.0.orig/configure	2011-10-07 11:55:11.000000000 +0200
-+++ Pacemaker-Python-GUI-2.1.0/configure	2011-10-12 18:13:25.563559000 +0200
-@@ -5555,7 +5555,7 @@ case $libdir in
-     prefix|NONE|*exec_prefix*)
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking which lib directory to use" >&5
- $as_echo_n "checking which lib directory to use... " >&6; }
--    for aDir in lib64 lib
-+    for aDir in lib
-     do
-       trydir="${exec_prefix}/${aDir}"
-       if
+--- pacemaker-mgmt-2.0.2.orig/configure	2013-02-28 13:48:44.000000000 +0100
++++ pacemaker-mgmt-2.0.2/configure	2013-03-04 11:56:52.000000000 +0100
+@@ -1,4 +1,5 @@
+ #! /bin/sh
++set -x
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by GNU Autoconf 2.69.
+ #
+@@ -19866,35 +19867,6 @@ fi
+ 
+ 
+ 
+-STACKS=""
+-CLUSTERLIBS=""
+-if test $SUPPORT_HEARTBEAT = 1; then
+-   STACKS="$STACKS heartbeat"
+-   CLUSTERLIBS="$CLUSTERLIBS -lhbclient -lccmclient -lclm"
+-fi
+-
+-if test $SUPPORT_AIS = 1; then
+-   STACKS="$STACKS $AIS_VERSION"
+-   #CLUSTERLIBS="$CLUSTERLIBS ${AISMSGLIB}"
+-else
+-   AISPREFIX=""
+-   LCRSODIR="$libdir"
+-fi
+-
+-PKG_FEATURES="$PKG_FEATURES$STACKS"
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for supported stacks" >&5
+-$as_echo_n "checking for supported stacks... " >&6; }
+-if test x"$STACKS" = x; then
+-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "You must choose at least one cluster stack to support
+-See \`config.log' for more details" "$LINENO" 5; }
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $STACKS" >&5
+-$as_echo "$STACKS" >&6; }
+-
+-
+ 
+ 
+ 
+@@ -21522,62 +21494,9 @@ CPPFLAGS="$save_CPPFLAGS"
+ 
+ 
+ 
+-as_ac_File=`$as_echo "ac_cv_file_$sysconfdir/pam.d/common-account" | $as_tr_sh`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sysconfdir/pam.d/common-account" >&5
+-$as_echo_n "checking for $sysconfdir/pam.d/common-account... " >&6; }
+-if eval \${$as_ac_File+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  test "$cross_compiling" = yes &&
+-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+-if test -r "$sysconfdir/pam.d/common-account"; then
+-  eval "$as_ac_File=yes"
+-else
+-  eval "$as_ac_File=no"
+-fi
+-fi
+-eval ac_res=\$$as_ac_File
+-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+-
+-fi
+-
+-as_ac_File=`$as_echo "ac_cv_file_$sysconfdir/pam.d/common-auth" | $as_tr_sh`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sysconfdir/pam.d/common-auth" >&5
+-$as_echo_n "checking for $sysconfdir/pam.d/common-auth... " >&6; }
+-if eval \${$as_ac_File+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  test "$cross_compiling" = yes &&
+-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+-if test -r "$sysconfdir/pam.d/common-auth"; then
+-  eval "$as_ac_File=yes"
+-else
+-  eval "$as_ac_File=no"
+-fi
+-fi
+-eval ac_res=\$$as_ac_File
+-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+-
+-fi
+-
+- if test -f $sysconfdir/pam.d/common-account -a \
+-				    -f /etc/pam.d/common-auth; then
+-  USE_PAM_COMMON_TRUE=
+-  USE_PAM_COMMON_FALSE='#'
+-else
+-  USE_PAM_COMMON_TRUE='#'
+-  USE_PAM_COMMON_FALSE=
+-fi
+-
++USE_PAM_COMMON_TRUE='#'
++USE_PAM_COMMON_FALSE=
+ 
+-	if test "x${enable_mgmt_client}" != "xno" -a "x${PYTHON_INCLUDES}" = "x"; then
+-  		FatalMissingThing "Python.h" \
+-		  "The GUI managment module needs Python.h (Linux: python-devel package)"
+-	fi
+ 
+ 	if test "$ac_cv_header_security_pam_appl_h" = "no" -a "$ac_cv_header_pam_pam_appl_h" = "no"; then
+   		FatalMissingThing "security/pam_appl.h" \
diff --git a/package/pacemaker-mgmt/patches/patch-mgmt_daemon_mgmt_crm_c b/package/pacemaker-mgmt/patches/patch-mgmt_daemon_mgmt_crm_c
deleted file mode 100644
index 1882093d5..000000000
--- a/package/pacemaker-mgmt/patches/patch-mgmt_daemon_mgmt_crm_c
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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/pacemaker/Makefile b/package/pacemaker/Makefile
index b81855345..9168fd64d 100644
--- a/package/pacemaker/Makefile
+++ b/package/pacemaker/Makefile
@@ -4,14 +4,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		pacemaker
-PKG_VERSION:=		1.1.7
+PKG_VERSION:=		1.1.8
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		818682b8d937e6c6a6e5f999528328a5
+PKG_MD5SUM:=		3aaa95da2bdce96e0c244a2fb0e8b1e3
 PKG_DESCR:=		scalable High-Availability cluster resource manager
 PKG_SECTION:=		ha
 PKG_BUILDDEP:=		resource-agents cluster-glue pam gnutls corosync libtool
 PKG_DEPENDS:=		python2 python2-readline python2-bzip2 cluster-glue libuuid
-PKG_DEPENDS+=		bash resource-agents pam libgnutls glib libxslt libxml2 libltdl
+PKG_DEPENDS+=		bash resource-agents pam libgnutls glib libxslt libxml2 libltdl librt
 PKG_URL:=		http://www.clusterlabs.org/
 PKG_SITES:=		http://openadk.org/distfiles/
 
@@ -22,27 +22,17 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,PACEMAKER,pacemaker,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-# disable honour cflags stuff
-XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
-
 CONFIGURE_ARGS+=	--disable-fatal-warnings \
 			--with-corosync \
 			--without-ais \
 			--without-heartbeat
 CONFIGURE_ENV+=		ac_cv_path_HELP2MAN=''
-CFLAGS_FOR_BUILD+=	-I$(STAGING_DIR)/usr/include/heartbeat
-TARGET_CPPFLAGS+=	-I$(STAGING_DIR)/usr/include/heartbeat
-
-pre-configure:
-	$(SED) "s#@@STAGING_DIR@@#$(STAGING_DIR)#" $(WRKBUILD)/configure
 
 pacemaker-install:
 	$(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
diff --git a/package/pacemaker/patches/patch-configure b/package/pacemaker/patches/patch-configure
deleted file mode 100644
index 363b8595e..000000000
--- a/package/pacemaker/patches/patch-configure
+++ /dev/null
@@ -1,63 +0,0 @@
---- pacemaker-1.1.7.orig/configure	2012-07-31 13:24:43.000000000 +0200
-+++ pacemaker-1.1.7/configure	2012-07-31 13:27:31.000000000 +0200
-@@ -12965,7 +12965,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; }
-@@ -13208,7 +13208,7 @@ case $libdir in
-     *prefix*|NONE)
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking which lib directory to use" >&5
- $as_echo_n "checking which lib directory to use... " >&6; }
--    for aDir in lib64 lib
-+    for aDir in lib
-     do
-       trydir="${exec_prefix}/${aDir}"
-       if
-@@ -13261,33 +13261,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/Volumes/adk/openadk/target_i686_eglibc/usr/include/heartbeat"
- 
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: Host CPU: $host_cpu" >&5
-@@ -18920,7 +18898,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/pacemaker/patches/patch-mcp_pacemaker_h b/package/pacemaker/patches/patch-mcp_pacemaker_h
deleted file mode 100644
index 8848e6976..000000000
--- a/package/pacemaker/patches/patch-mcp_pacemaker_h
+++ /dev/null
@@ -1,10 +0,0 @@
---- pacemaker-1.1.7.orig/mcp/pacemaker.h	2012-03-28 08:14:13.000000000 +0200
-+++ pacemaker-1.1.7/mcp/pacemaker.h	2012-07-31 13:43:39.000000000 +0200
-@@ -21,6 +21,7 @@
- #include <sys/param.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-+#include <sys/resource.h>
- 
- #include <stdint.h>
- 
diff --git a/package/python2/Makefile b/package/python2/Makefile
index b7e4e01a7..4c5b17c5e 100644
--- a/package/python2/Makefile
+++ b/package/python2/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		15ed56733655e3fab785e49a7278d2fb
 PKG_DESCR:=		Python scripting language (Version 2)
 PKG_SECTION:=		lang
 PKG_BUILDDEP:=		zlib libffi openssl readline bzip2
-PKG_DEPENDS:=		libpthread zlib libffi libopenssl
+PKG_DEPENDS:=		libpthread zlib libffi libopenssl libgcc
 PKG_URL:=		http://www.python.org/
 PKG_SITES:=		http://www.python.org/ftp/python/${PKG_VERSION}/
 PKG_OPTS:=		noscripts