Hello community,
here is the log from the commit of package ypbind for openSUSE:Factory
checked in at Mon Jul 19 21:30:12 CEST 2010.
--------
--- ypbind/ypbind.changes 2009-11-30 10:26:53.000000000 +0100
+++ /mounts/work_src_done/STABLE/ypbind/ypbind.changes 2010-07-07 14:56:59.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Jul 7 14:54:51 CEST 2010 - kukuk@suse.de
+
+- Update to 1.32: Fix problems with dbus
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
ypbind-mt-1.31.tar.bz2
New:
----
ypbind-mt-1.32.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ypbind.spec ++++++
--- /var/tmp/diff_new_pack.MGeV9l/_old 2010-07-19 21:30:07.000000000 +0200
+++ /var/tmp/diff_new_pack.MGeV9l/_new 2010-07-19 21:30:07.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package ypbind (Version 1.31)
+# spec file for package ypbind (Version 1.32)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -29,7 +29,7 @@
AutoReqProv: on
PreReq: %insserv_prereq %fillup_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Version: 1.31
+Version: 1.32
Release: 1
Url: http://www.linux-nis.org/nis/ypbind-mt
Summary: NIS client daemon
++++++ ypbind-mt-1.31.tar.bz2 -> ypbind-mt-1.32.tar.bz2 ++++++
++++ 2590 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypbind-mt-1.31/ChangeLog new/ypbind-mt-1.32/ChangeLog
--- old/ypbind-mt-1.31/ChangeLog 2009-11-30 10:12:20.000000000 +0100
+++ new/ypbind-mt-1.32/ChangeLog 2010-07-07 14:34:23.000000000 +0200
@@ -1,4 +1,11 @@
-2009-11-30 Thorsten Kukuk
+2010-07-07 Thorsten Kukuk
+
+ * release version 1.32
+
+ * src/ypbind_dbus_nm.c: Fixed reporting Error adding match.
+ Patch from Karel Klic .
+
+2009-11-30 Thorsten Kukuk
* release version 1.31
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypbind-mt-1.31/NEWS new/ypbind-mt-1.32/NEWS
--- old/ypbind-mt-1.31/NEWS 2009-11-30 10:15:17.000000000 +0100
+++ new/ypbind-mt-1.32/NEWS 2010-07-07 14:35:10.000000000 +0200
@@ -1,9 +1,12 @@
ypbind-mt NEWS -- history of user-visible changes.
-Copyright (C) 1998-2009 Thorsten Kukuk
+Copyright (C) 1998-2010 Thorsten Kukuk
Please send bug reports, questions and suggestions to .
+Version 1.32
+* Fix problems with SLP registration
+
Version 1.31
* Fix broadcast option
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypbind-mt-1.31/configure.in new/ypbind-mt-1.32/configure.in
--- old/ypbind-mt-1.31/configure.in 2009-11-30 10:15:04.000000000 +0100
+++ new/ypbind-mt-1.32/configure.in 2010-07-07 14:49:27.000000000 +0200
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(src/ypbind-mt.c)
-AM_INIT_AUTOMAKE(ypbind-mt, 1.31)
+AM_INIT_AUTOMAKE(ypbind-mt, 1.32)
AM_CONFIG_HEADER(config.h)
AC_PREFIX_DEFAULT(/usr)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypbind-mt-1.31/man/yp.conf.5 new/ypbind-mt-1.32/man/yp.conf.5
--- old/ypbind-mt-1.31/man/yp.conf.5 2009-06-19 13:44:46.000000000 +0200
+++ new/ypbind-mt-1.32/man/yp.conf.5 2010-07-07 14:29:38.000000000 +0200
@@ -1,12 +1,12 @@
.\" Title: yp.conf
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.74.0 http://docbook.sf.net/
-.\" Date: 06/19/2009
+.\" Date: 07/07/2010
.\" Manual: ypbind-mt
.\" Source: ypbind-mt
.\" Language: English
.\"
-.TH "YP\&.CONF" "5" "06/19/2009" "ypbind-mt" "ypbind\-mt"
+.TH "YP\&.CONF" "5" "07/07/2010" "ypbind-mt" "ypbind\-mt"
.\" -----------------------------------------------------------------
.\" * (re)Define some macros
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypbind-mt-1.31/man/ypbind.8 new/ypbind-mt-1.32/man/ypbind.8
--- old/ypbind-mt-1.31/man/ypbind.8 2009-06-19 13:44:44.000000000 +0200
+++ new/ypbind-mt-1.32/man/ypbind.8 2010-07-07 14:29:37.000000000 +0200
@@ -1,12 +1,12 @@
.\" Title: ypbind
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.74.0 http://docbook.sf.net/
-.\" Date: 06/19/2009
+.\" Date: 07/07/2010
.\" Manual: ypbind-mt
.\" Source: ypbind-mt
.\" Language: English
.\"
-.TH "YPBIND" "8" "06/19/2009" "ypbind-mt" "ypbind\-mt"
+.TH "YPBIND" "8" "07/07/2010" "ypbind-mt" "ypbind\-mt"
.\" -----------------------------------------------------------------
.\" * (re)Define some macros
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypbind-mt-1.31/src/ypbind_dbus_nm.c new/ypbind-mt-1.32/src/ypbind_dbus_nm.c
--- old/ypbind-mt-1.31/src/ypbind_dbus_nm.c 2009-11-19 11:05:14.000000000 +0100
+++ new/ypbind-mt-1.32/src/ypbind_dbus_nm.c 2010-07-07 14:27:26.000000000 +0200
@@ -51,6 +51,17 @@
#endif
+#define DBUS_MESSAGE_MATCH \
+ "type='signal'," \
+ "interface='" DBUS_INTERFACE_DBUS "'," \
+ "sender='" DBUS_SERVICE_DBUS "'"
+
+#define NM_MESSAGE_MATCH \
+ "type='signal'," \
+ "interface='" NM_DBUS_INTERFACE "'," \
+ "sender='" NM_DBUS_SERVICE "'," \
+ "path='" NM_DBUS_PATH "'"
+
#include "ypbind.h"
#include "log_msg.h"
#include "local.h"
@@ -276,10 +287,7 @@
if (!dbus_connection_add_filter (connection, dbus_filter, NULL, NULL))
goto out;
- dbus_bus_add_match (connection, "type='signal',"
- "interface='" DBUS_INTERFACE_DBUS "',"
- "sender='" DBUS_SERVICE_DBUS "'",
- &error);
+ dbus_bus_add_match (connection, DBUS_MESSAGE_MATCH, &error);
if (dbus_error_is_set (&error))
{
log_msg (LOG_ERR, "Error adding match, %s: %s",
@@ -291,16 +299,17 @@
goto out;
}
- dbus_bus_add_match (connection,
- "type='signal',"
- "interface='" NM_DBUS_INTERFACE "',"
- "sender='" NM_DBUS_SERVICE "',"
- "path='" NM_DBUS_PATH "'", &error);
+ dbus_bus_add_match (connection, NM_MESSAGE_MATCH, &error);
if (dbus_error_is_set (&error))
{
log_msg (LOG_ERR, "Error adding match, %s: %s",
error.name, error.message);
dbus_error_free (&error);
+
+ dbus_bus_remove_match (connection, DBUS_MESSAGE_MATCH, &error);
+ if (dbus_error_is_set (&error)) /* ignore the error */
+ dbus_error_free (&error);
+
dbus_connection_unref (connection);
connection = NULL;
goto out;
@@ -314,6 +323,24 @@
if (!check_for_nm (connection))
{
/* NetworkManager not in use. */
+
+ /* The matches must be removed here. When dbus_init() is
+ called repeatedly without removing matches, it starts to
+ report errors:
+ Error adding match, org.freedesktop.DBus.Error.LimitsExceeded:
+ Connection ":1.0" is not allowed to add more match rules
+ */
+ dbus_bus_remove_match (connection, DBUS_MESSAGE_MATCH, &error);
+ if (dbus_error_is_set (&error))
+ {
+ /* ignore the error, most likely it is MatchRuleNotFound. */
+ dbus_error_free (&error);
+ }
+
+ dbus_bus_remove_match (connection, NM_MESSAGE_MATCH, &error);
+ if (dbus_error_is_set (&error))
+ dbus_error_free (&error);
+
dbus_connection_unref (connection);
is_online = 1;
return 0;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
