Hello community,
here is the log from the commit of package pacemaker-mgmt for openSUSE:Factory checked in at 2012-06-15 19:35:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pacemaker-mgmt (Old)
and /work/SRC/openSUSE:Factory/.pacemaker-mgmt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pacemaker-mgmt", Maintainer is "YGao@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pacemaker-mgmt/pacemaker-mgmt.changes 2012-05-23 09:07:27.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.pacemaker-mgmt.new/pacemaker-mgmt.changes 2012-06-15 19:35:38.000000000 +0200
@@ -1,0 +2,19 @@
+Fri Jun 1 07:53:46 UTC 2012 - ygao@suse.com
+
+- Update to version 2.1.1
+- High: Core: Fix compilation against gnutls-3.0.19
+- Medium: Core: Support of setting key exchange methods with
+ gnutls_priority_set_direct() which is recommended by newer
+ versions of GNUTLS
+- Low: Build: Properly determine variables of gnutls
+- Low: Build: Properly handle "PKG_FEATURES"
+- Low: Build: Determine "CRM_DAEMON_DIR" via pkg-config first
+- Low: Build: Remove useless "HA_LIBDIR" variable
+- Low: Build: Remove useless "/var/lib/heartbeat/mgmt" directory
+- Medium: Build: Requires python-devel and swig on building only if
+ "--enable-mgmt-client"
+- Medium: Build: Add configure option "--disable-mgmt-client"
+- Medium: mgmtd: Resolve an implicit declaration (cl#5022)
+- Upstream version cs: 2d6a31215fd6a7790fdd80b78e2930480d596f51
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pacemaker-mgmt.spec ++++++
--- /var/tmp/diff_new_pack.TEDhN8/_old 2012-06-15 19:35:41.000000000 +0200
+++ /var/tmp/diff_new_pack.TEDhN8/_new 2012-06-15 19:35:41.000000000 +0200
@@ -37,9 +37,9 @@
Summary: Management Tools for Pacemaker based HA solution
License: GPL-2.0+
Group: Productivity/Clustering/HA
-Version: 2.1.0
+Version: 2.1.1
Release: 0
-Url: http://hg.clusterlabs.org/pacemaker/pygui
+Url: https://github.com/ClusterLabs/pacemaker-mgmt
Source: pacemaker-mgmt.tar.bz2
Source1: pacemaker_starter.py
Source2: pacemaker-starter.glade
@@ -49,7 +49,7 @@
Conflicts: pacemaker-pygui
Requires: cluster-glue
Requires: findutils
-Requires: pacemaker >= 1.1.6
+Requires: pacemaker
Recommends: pacemaker-mgmt-client
%if 0%{?suse_version}
BuildRequires: libglue-devel
@@ -122,7 +122,7 @@
Authors:
--------
- Yan Gao
+ Yan Gao
%package client
Summary: Management Tools for Pacemaker based HA solution
@@ -134,8 +134,11 @@
Requires: pygtk2
%else
Requires: python-gtk
+Requires: python-xml
+%if 0%{?suse_version} < 1140
Requires: pyxml
%endif
+%endif
%if 0%{?centos_version} == 0 && 0%{?rhel_version} == 0
Requires: python-lxml
%endif
@@ -155,7 +158,7 @@
Authors:
--------
- Yan Gao
+ Yan Gao
%package devel
Summary: Management Tools for Pacemaker based HA solution
@@ -172,7 +175,7 @@
Authors:
--------
- Yan Gao
+ Yan Gao
%prep
###########################################################
++++++ pacemaker-mgmt.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pacemaker-mgmt/Makefile.am new/pacemaker-mgmt/Makefile.am
--- old/pacemaker-mgmt/Makefile.am 2011-10-28 11:13:52.000000000 +0200
+++ new/pacemaker-mgmt/Makefile.am 2012-06-01 09:30:59.000000000 +0200
@@ -41,7 +41,11 @@
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) doc
+
+if MGMT_CLIENT_BUILD
+SUBDIRS += po
+endif
tgz:
rm -f $(TARFILE)
@@ -84,10 +88,12 @@
ssh $(OBS_SERVER) -- "cd $(OBS_PREFIX)/server:ha-clustering:Factory/$(OBS_PROJECT); /usr/bin/osc commit -m \"New $(OBS_PROJECT) snapshot - $(shell $(HG) id)\""
install-exec-local:
+if MGMT_CLIENT_BUILD
-mkdir -p $(DESTDIR)$(bindir)
-cd $(DESTDIR)$(libdir)/heartbeat-gui && rm -f haclient.py && ln -s $(datadir)/heartbeat-gui/haclient.py .
-cd $(DESTDIR)$(bindir) && rm -f crm_gui && ln -s $(datadir)/heartbeat-gui/haclient.py crm_gui
-cd $(DESTDIR)$(bindir) && rm -f hb_gui && ln -s $(datadir)/heartbeat-gui/haclient.py hb_gui
+endif
dist-clean-local:
rm -f autoconf automake autoheader
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pacemaker-mgmt/configure.in new/pacemaker-mgmt/configure.in
--- old/pacemaker-mgmt/configure.in 2011-10-28 11:13:52.000000000 +0200
+++ new/pacemaker-mgmt/configure.in 2012-06-01 09:30:59.000000000 +0200
@@ -14,6 +14,8 @@
AC_INIT(README.in)
AC_PREREQ(2.53)
+PKG_FEATURES=""
+
AC_CONFIG_AUX_DIR(.)
AC_CANONICAL_HOST
@@ -191,6 +193,10 @@
[ --enable-thread-safe Enable some client libraries to be thread safe.
[default=no]])
+AC_ARG_ENABLE([mgmt-client],
+[ --enable-mgmt-client Enable building of mgmt-client related functionality.
+ [default=yes]], [], [enable_mgmt_client=yes])
+
AC_ARG_ENABLE([snmp],
[ --enable-snmp Enable building of SNMP related functionality.
[default=yes]])
@@ -1225,8 +1231,8 @@
AC_SUBST(LIBDIR)
AC_DEFINE_UNQUOTED(LIBDIR,"$LIBDIR", lib directory)
-HA_LIBDIR=`extract_header_define $GLUE_HEADER HA_LIBDIR`
-AC_SUBST(HA_LIBDIR)
+#HA_LIBDIR=`extract_header_define $GLUE_HEADER HA_LIBDIR`
+#AC_SUBST(HA_LIBDIR)
HA_LIBHBDIR=`extract_header_define $GLUE_HEADER HA_LIBHBDIR`
AC_SUBST(HA_LIBHBDIR)
@@ -1270,12 +1276,11 @@
AC_MSG_FAILURE(Pacemaker development headers were not found)
fi
-CRM_DAEMON_DIR=`extract_header_define $CRM_HEADER CRM_DAEMON_DIR`
+CRM_DAEMON_DIR=`$PKGCONFIG pcmk --variable=daemondir`
if test x"$CRM_DAEMON_DIR" = x""; then
-
- CRM_DAEMON_DIR=`$PKGCONFIG pcmk --variable=daemondir`
- AC_DEFINE_UNQUOTED(CRM_DAEMON_DIR,"$CRM_DAEMON_DIR", Location for Pacemaker daemons)
+ CRM_DAEMON_DIR=`extract_header_define $CRM_HEADER CRM_DAEMON_DIR`
fi
+AC_DEFINE_UNQUOTED(CRM_DAEMON_DIR,"$CRM_DAEMON_DIR", Location for Pacemaker daemons)
AC_PATH_PROGS(HG, hg false)
AC_MSG_CHECKING(build revision)
@@ -1519,6 +1524,12 @@
AC_SUBST(LCRSODIR)
dnl
+dnl mgmt checks
+dnl
+
+AM_CONDITIONAL(MGMT_CLIENT_BUILD, test "x${enable_mgmt_client}" != "xno")
+
+dnl
dnl SNMP checks
dnl
@@ -1920,8 +1931,14 @@
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_CHECK_LIB(gnutls, gnutls_init)
+AC_CHECK_FUNCS(gnutls_priority_set_direct)
+
AC_SUBST(GNUTLSHEAD)
AC_SUBST(GNUTLSLIBS)
@@ -2136,7 +2153,7 @@
AM_CONDITIONAL(USE_PAM_COMMON, test -f $sysconfdir/pam.d/common-account -a \
-f /etc/pam.d/common-auth)
- if test "x${PYTHON_INCLUDES}" = "x"; then
+ 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
@@ -2151,12 +2168,14 @@
"The GUI managment module needs GNU/TLS header files"
fi
- if test -z "$SWIG"; then
+ if test "x${enable_mgmt_client}" != "xno" -a -z "$SWIG"; then
FatalMissingThing "swig" \
"The GUI managment module needs swig" \
"You can get it from http://swig.org/"
fi
+CheckMissingThings
+
dnl **********************************************
dnl TSA plugin configuration
dnl **********************************************
@@ -2212,6 +2231,9 @@
AC_SUBST(ECHO_CMD)
dnl *** "echo" adjustments (end) ***
+AC_DEFINE_UNQUOTED(PKG_FEATURES, "$PKG_FEATURES", Set of enabled features)
+AC_SUBST(PKG_FEATURES)
+
dnl The Makefiles and shell scripts we output
AC_CONFIG_FILES(Makefile \
README \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pacemaker-mgmt/lib/mgmt/Makefile.am new/pacemaker-mgmt/lib/mgmt/Makefile.am
--- old/pacemaker-mgmt/lib/mgmt/Makefile.am 2011-10-28 11:13:52.000000000 +0200
+++ new/pacemaker-mgmt/lib/mgmt/Makefile.am 2012-06-01 09:30:59.000000000 +0200
@@ -24,19 +24,20 @@
-I$(top_builddir) -I$(top_srcdir)
halibdir = $(libdir)/@HB_PKG@
+if MGMT_CLIENT_BUILD
guilibdir = $(libdir)/heartbeat-gui
+endif
havarlibdir = $(localstatedir)/lib/@HB_PKG@
COMMONLIBS = $(GLIBLIB)
-MGMT_DIR = mgmt
-mgmtdir = $(HA_VARLIBHBDIR)/$(MGMT_DIR)
+#MGMT_DIR = mgmt
+#mgmtdir = $(HA_VARLIBHBDIR)/$(MGMT_DIR)
apigid = @HA_APIGROUP@
EXTRA_DIST = pymgmt.i
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
@@ -47,18 +48,20 @@
libhbmgmtcommon_la_LIBADD = $(COMMONLIBS) $(top_builddir)/replace/libreplace.la
libhbmgmtcommon_la_CFLAGS = $(INCLUDES)
+if MGMT_CLIENT_BUILD
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 = $(GNUTLSLIBS) $(top_builddir)/replace/libreplace.la
guilib_DATA = pymgmt.py
pymgmt_wrap.c pymgmt.py: pymgmt.i
$(SWIG) -python $^
+endif
-install-exec-local:
- $(mkinstalldirs) $(DESTDIR)$(mgmtdir)
- -chgrp $(apigid) $(DESTDIR)/$(mgmtdir)
- chmod 770 $(DESTDIR)/$(mgmtdir)
+#install-exec-local:
+# $(mkinstalldirs) $(DESTDIR)$(mgmtdir)
+# -chgrp $(apigid) $(DESTDIR)/$(mgmtdir)
+# chmod 770 $(DESTDIR)/$(mgmtdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pacemaker-mgmt/lib/mgmt/mgmt_tls_lib.c new/pacemaker-mgmt/lib/mgmt/mgmt_tls_lib.c
--- old/pacemaker-mgmt/lib/mgmt/mgmt_tls_lib.c 2011-10-28 11:13:52.000000000 +0200
+++ new/pacemaker-mgmt/lib/mgmt/mgmt_tls_lib.c 2012-06-01 09:30:59.000000000 +0200
@@ -28,9 +28,11 @@
#include
#include
#include
-#include
#include
#include
+#include
+
+#include
#define DH_BITS 1024
@@ -58,8 +60,13 @@
int ret;
gnutls_session* session = (gnutls_session*)gnutls_malloc(sizeof(gnutls_session));
gnutls_init(session, GNUTLS_CLIENT);
+#ifdef HAVE_GNUTLS_PRIORITY_SET_DIRECT
+/* http://www.manpagez.com/info/gnutls/gnutls-2.10.4/gnutls_81.php#Echo-Server-... */
+ gnutls_priority_set_direct(*session, "NORMAL:+ANON-DH", NULL);
+#else
gnutls_set_default_priority(*session);
gnutls_kx_set_priority (*session, kx_prio);
+#endif
gnutls_credentials_set(*session, GNUTLS_CRD_ANON, anoncred_client);
gnutls_transport_set_ptr(*session, (gnutls_transport_ptr) GINT_TO_POINTER(sock));
ret = gnutls_handshake(*session);
@@ -131,8 +138,13 @@
int ret;
gnutls_session* session = (gnutls_session*)gnutls_malloc(sizeof(gnutls_session));
gnutls_init(session, GNUTLS_SERVER);
+#ifdef HAVE_GNUTLS_PRIORITY_SET_DIRECT
+/* http://www.manpagez.com/info/gnutls/gnutls-2.10.4/gnutls_81.php#Echo-Server-... */
+ gnutls_priority_set_direct(*session, "NORMAL:+ANON-DH", NULL);
+#else
gnutls_set_default_priority(*session);
gnutls_kx_set_priority (*session, kx_prio);
+#endif
gnutls_credentials_set(*session, GNUTLS_CRD_ANON, anoncred_server);
gnutls_dh_set_prime_bits(*session, DH_BITS);
gnutls_transport_set_ptr(*session, (gnutls_transport_ptr) GINT_TO_POINTER(sock));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pacemaker-mgmt/mgmt/Makefile.am new/pacemaker-mgmt/mgmt/Makefile.am
--- old/pacemaker-mgmt/mgmt/Makefile.am 2011-10-28 11:13:52.000000000 +0200
+++ new/pacemaker-mgmt/mgmt/Makefile.am 2012-06-01 09:30:59.000000000 +0200
@@ -17,4 +17,8 @@
#
MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = daemon client
+SUBDIRS = daemon
+
+if MGMT_CLIENT_BUILD
+SUBDIRS += client
+endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pacemaker-mgmt/mgmt/daemon/mgmtd.c new/pacemaker-mgmt/mgmt/daemon/mgmtd.c
--- old/pacemaker-mgmt/mgmt/daemon/mgmtd.c 2011-10-28 11:13:52.000000000 +0200
+++ new/pacemaker-mgmt/mgmt/daemon/mgmtd.c 2012-06-01 09:30:59.000000000 +0200
@@ -22,6 +22,7 @@
#include
#include
+#include
#ifdef HAVE_SYS_SOCKET_H
#include
#endif
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org