[gentoo-commits] gentoo-x86 commit in sys-cluster/pacemaker-gui/files: pacemaker-gui-2.0.0-gnutls.patch pacemaker-gui-2.0.0-doc.patch mgmtd.init

[Alexys Jacob (ultrabug)]

ultrabug    11/02/21 14:46:15

  Added:                pacemaker-gui-2.0.0-gnutls.patch
                        pacemaker-gui-2.0.0-doc.patch mgmtd.init
  Log:
  Initial import
  
  (Portage version: 2.1.9.40/cvs/Linux x86_64, RepoMan options: --force)

Revision  Changes    Path
1.1                  sys-cluster/pacemaker-gui/files/pacemaker-gui-2.0.0-gnutls.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/pacemaker-gui/files/pacemaker-gui-2.0.0-gnutls.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/pacemaker-gui/files/pacemaker-gui-2.0.0-gnutls.patch?rev=1.1&content-type=text/plain

Index: pacemaker-gui-2.0.0-gnutls.patch
===================================================================
--- configure.in	2010-06-28 17:52:56.949797667 +0000
+++ configure.in	2010-06-28 17:54:51.839826869 +0000
@@ -1490,8 +1490,6 @@
    LCRSODIR="$libdir"
 fi
 
-PKG_FEATURES="$PKG_FEATURES$STACKS"
-
 AC_MSG_CHECKING(for supported stacks)
 if test x"$STACKS" = x; then
    AC_MSG_FAILURE(You must choose at least one cluster stack to support)
@@ -1973,7 +1971,9 @@
 	GNUTLSLIBS="`$LIBGNUTLS_CONFIG --libs`";
 	AC_MSG_RESULT($GNUTLSLIBS)
 else
-	AC_CHECK_LIB(gnutls, gnutls_init)
+	PKG_CHECK_MODULES(GNUTLS, [gnutls])
+	GNUTLSHEAD=$GNUTLS_CFLAGS
+	GNUTLSLIBS=$GNUTLS_LIBS
 fi
 AC_SUBST(GNUTLSHEAD)
 AC_SUBST(GNUTLSLIBS)

--- lib/mgmt/Makefile.am	2010-03-26 11:05:47.000000000 +0000
+++ lib/mgmt/Makefile.am	2010-06-28 17:56:38.339798756 +0000
@@ -35,8 +35,7 @@
 
 lib_LTLIBRARIES = libhbmgmttls.la libhbmgmtclient.la libhbmgmtcommon.la
 libhbmgmttls_la_SOURCES = mgmt_tls_lib.c
-libhbmgmttls_la_LIBADD  = $(COMMONLIBS)
-libhbmgmttls_la_LDFLAGS = $(GNUTLSLIBS)
+libhbmgmttls_la_LIBADD  = $(COMMONLIBS) $(GNUTLSLIBS)
 libhbmgmttls_la_CFLAGS = $(INCLUDES) $(GNUTLSHEAD)
 
 libhbmgmtclient_la_SOURCES = mgmt_client_lib.c
@@ -50,8 +49,8 @@
 guilib_LTLIBRARIES = _pymgmt.la
 _pymgmt_la_SOURCES = pymgmt_wrap.c mgmt_client_lib.c mgmt_tls_lib.c mgmt_common_lib.c
 _pymgmt_la_CFLAGS = @PYTHON_INCLUDES@ -I$(top_builddir)/include -w
-_pymgmt_la_LDFLAGS = -module $(GNUTLSLIBS)
-_pymgmt_la_LIBADD = $(top_builddir)/replace/libreplace.la
+_pymgmt_la_LDFLAGS = -module 
+_pymgmt_la_LIBADD = $(top_builddir)/replace/libreplace.la $(GNUTLSLIBS)
 
 guilib_DATA = pymgmt.py
 



1.1                  sys-cluster/pacemaker-gui/files/pacemaker-gui-2.0.0-doc.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/pacemaker-gui/files/pacemaker-gui-2.0.0-doc.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/pacemaker-gui/files/pacemaker-gui-2.0.0-doc.patch?rev=1.1&content-type=text/plain

Index: pacemaker-gui-2.0.0-doc.patch
===================================================================
--- Makefile.am	2010-03-26 12:05:47.000000000 +0100
+++ Makefile.am.doc	2010-07-02 14:53:52.429888536 +0200
@@ -41,7 +41,7 @@
 SNMP_SUBAGENT_DIR = snmp_subagent
 endif
 
-SUBDIRS	= $(LIBLTDL_DIR) replace include lib mgmt $(CIM_PROVIDER_DIR) $(TSA_PLUGIN_DIR) $(SNMP_SUBAGENT_DIR) doc po
+SUBDIRS	= $(LIBLTDL_DIR) replace include lib mgmt $(CIM_PROVIDER_DIR) $(TSA_PLUGIN_DIR) $(SNMP_SUBAGENT_DIR) po
 
 tgz:
 	rm -f $(TARFILE)



1.1                  sys-cluster/pacemaker-gui/files/mgmtd.init

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/pacemaker-gui/files/mgmtd.init?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/pacemaker-gui/files/mgmtd.init?rev=1.1&content-type=text/plain

Index: mgmtd.init
===================================================================
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker-gui/files/mgmtd.init,v 1.1 2011/02/21 14:46:15 ultrabug Exp $

PIDFILE="/var/run/pcmk-mgmtd.pid"
BINARY="/usr/lib/heartbeat/mgmtd"

# Adjust on the installed stack
if [ -f /etc/init.d/corosync ]; then
   DEPEND="pacemaker"
   export HA_cluster_type="openais"
else
    DEPEND="heartbeat"
    export HA_cluster_type="heartbeat"
fi

depend() {
   need $DEPEND
}

start() {
   ebegin "Starting Pacemaker Management daemon"
   start-stop-daemon --start --pidfile "${PIDFILE}" -m -x ${BINARY} -b -- -v
   eend $?
}

stop() {
   ebegin "Stopping Pacemaker Management daemon"
   start-stop-daemon --stop --pidfile "${PIDFILE}"
   eend $?
}

restart() {
   ebegin "Restarting Pacemaker Management daemon"
   svc_stop
   svc_start
   eend $?
}