Hello community,
here is the log from the commit of package ypbind for openSUSE:Factory
checked in at Mon Jun 6 16:52:37 CEST 2011.
--------
--- ypbind/ypbind.changes 2010-07-07 14:56:59.000000000 +0200
+++ /mounts/work_src_done/STABLE/ypbind/ypbind.changes 2011-06-03
22:09:29.000000000 +0200
@@ -1,0 +2,10 @@
+Fri Jun 3 22:08:14 CEST 2011 - je...@suse.de
+
+- Update NetworkManager interface to use new NM_STATE_* (bnc#698030).
+
+-------------------------------------------------------------------
+Mon May 2 17:43:07 CEST 2011 - ku...@suse.de
+
+- Update to 1.33: Better error checking
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
ypbind-mt-1.32.tar.bz2
New:
----
ypbind-mt-1.33.tar.bz2
ypbind-mt-update-networkmanager-interface-to-use-new-nm_state
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ypbind.spec ++++++
--- /var/tmp/diff_new_pack.NNUwX8/_old 2011-06-06 16:51:55.000000000 +0200
+++ /var/tmp/diff_new_pack.NNUwX8/_new 2011-06-06 16:51:55.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package ypbind (Version 1.32)
+# spec file for package ypbind
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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,13 +29,14 @@
AutoReqProv: on
PreReq: %insserv_prereq %fillup_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Version: 1.32
+Version: 1.33
Release: 1
Url: http://www.linux-nis.org/nis/ypbind-mt
Summary: NIS client daemon
Source:
ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{version}.tar.bz2
Source1: SuSEfirewall.ypbind
#Patch: ypbind-mt-%{version}.diff
+Patch1: ypbind-mt-update-networkmanager-interface-to-use-new-nm_state
%description
This package provides the ypbind daemon. The ypbind daemon binds NIS
@@ -54,6 +55,7 @@
%prep
%setup -q -n ypbind-mt-%{version}
#%patch
+%patch1 -p1
%build
export CFLAGS=$RPM_OPT_FLAGS
++++++ ypbind-mt-1.32.tar.bz2 -> ypbind-mt-1.33.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-1.32/ChangeLog new/ypbind-mt-1.33/ChangeLog
--- old/ypbind-mt-1.32/ChangeLog 2010-07-07 14:34:23.000000000 +0200
+++ new/ypbind-mt-1.33/ChangeLog 2011-04-29 16:33:49.000000000 +0200
@@ -1,3 +1,12 @@
+2011-04-29 Thorsten Kukuk <ku...@suse.de>
+
+ * src/ypbind-mt.c (create_pidfile): return if no pidfile
+ could be created.
+ (main): Check if /dev/null could be opened.
+ * src/serv_list.c (ping_all): Initialize found with 0.
+ (ping_all): Check if we are inside the array.
+ Based on patches from Honza Horak <hho...@redhat.com>.
+
2010-07-07 Thorsten Kukuk <ku...@thkukuk.de>
* release version 1.32
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-1.32/NEWS new/ypbind-mt-1.33/NEWS
--- old/ypbind-mt-1.32/NEWS 2010-07-07 14:35:10.000000000 +0200
+++ new/ypbind-mt-1.33/NEWS 2011-04-29 16:34:10.000000000 +0200
@@ -1,9 +1,12 @@
ypbind-mt NEWS -- history of user-visible changes.
-Copyright (C) 1998-2010 Thorsten Kukuk
+Copyright (C) 1998-2011 Thorsten Kukuk
Please send bug reports, questions and suggestions to <ku...@thkukuk.de>.
+Version 1.33
+* Better error checking
+
Version 1.32
* Fix problems with SLP registration
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-1.32/configure new/ypbind-mt-1.33/configure
--- old/ypbind-mt-1.32/configure 2010-07-07 14:49:38.000000000 +0200
+++ new/ypbind-mt-1.33/configure 2011-04-29 16:34:39.000000000 +0200
@@ -2235,7 +2235,7 @@
# Define the identity of the package.
PACKAGE=ypbind-mt
- VERSION=1.32
+ VERSION=1.33
cat >>confdefs.h <<_ACEOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-1.32/configure.in
new/ypbind-mt-1.33/configure.in
--- old/ypbind-mt-1.32/configure.in 2010-07-07 14:49:27.000000000 +0200
+++ new/ypbind-mt-1.33/configure.in 2011-04-29 16:34:16.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.32)
+AM_INIT_AUTOMAKE(ypbind-mt, 1.33)
AM_CONFIG_HEADER(config.h)
AC_PREFIX_DEFAULT(/usr)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-1.32/lib/Makefile.in
new/ypbind-mt-1.33/lib/Makefile.in
--- old/ypbind-mt-1.32/lib/Makefile.in 2010-07-07 14:49:34.000000000 +0200
+++ new/ypbind-mt-1.33/lib/Makefile.in 2011-04-29 16:34:38.000000000 +0200
@@ -214,9 +214,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits lib/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/Makefile
+ $(AUTOMAKE) --gnits lib/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-1.32/man/Makefile.in
new/ypbind-mt-1.33/man/Makefile.in
--- old/ypbind-mt-1.32/man/Makefile.in 2010-07-07 14:49:34.000000000 +0200
+++ new/ypbind-mt-1.33/man/Makefile.in 2011-04-29 16:34:38.000000000 +0200
@@ -197,9 +197,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits man/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu man/Makefile
+ $(AUTOMAKE) --gnits man/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
Files old/ypbind-mt-1.32/po/de.gmo and new/ypbind-mt-1.33/po/de.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-1.32/po/de.po new/ypbind-mt-1.33/po/de.po
--- old/ypbind-mt-1.32/po/de.po 2009-11-30 10:15:39.000000000 +0100
+++ new/ypbind-mt-1.33/po/de.po 2011-04-29 16:34:50.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: ypbind-mt\n"
"Report-Msgid-Bugs-To: ku...@linux-nis.org\n"
-"POT-Creation-Date: 2009-11-30 10:15+0100\n"
+"POT-Creation-Date: 2011-04-29 16:34+0200\n"
"PO-Revision-Date: 2004-02-13 16:22+01:00\n"
"Last-Translator: Thorsten Kukuk <ku...@suse.de>\n"
"Language-Team: No Language-Team\n"
@@ -58,7 +58,7 @@
msgid "gethostbyname: Unknown error"
msgstr "gethostbyname: Unbekannter Fehler"
-#: src/serv_list.c:615 src/serv_list.c:924 src/serv_list.c:1043
+#: src/serv_list.c:615 src/serv_list.c:925 src/serv_list.c:1044
#, c-format
msgid "Answer for domain '%s' from server '%s'"
msgstr "Antwort f�r Domain \"%s\" vom Server \"%s\""
@@ -83,7 +83,7 @@
msgid "leave do_broadcast() for domain '%s'"
msgstr ""
-#: src/serv_list.c:812 src/serv_list.c:983
+#: src/serv_list.c:812 src/serv_list.c:984
#, c-format
msgid "ping host '%s', domain '%s'"
msgstr "Ping Host \"%s\", Domain \"%s\""
@@ -98,27 +98,27 @@
msgid "Server '%s' for domain '%s' answered ping but failed to bind"
msgstr "Server \"%s\" f�r Domain \"%s\" antwortet nicht."
-#: src/serv_list.c:1002
+#: src/serv_list.c:1003
#, c-format
msgid "clnt_create for server '%s' (domain '%s') failed"
msgstr "clnt_create f�r server \"%s\" (domain \"%s\") schlug fehl"
-#: src/serv_list.c:1023
+#: src/serv_list.c:1024
#, c-format
msgid "domain '%s' not served by '%s'"
msgstr "Domain \"%s\" wird nicht von \"%s\" unterst�tzt"
-#: src/serv_list.c:1145
+#: src/serv_list.c:1146
#, fuzzy
msgid "Pinging all active servers."
msgstr "Sende ein Ping zu allen aktiven Servern."
-#: src/serv_list.c:1147
+#: src/serv_list.c:1148
#, fuzzy
msgid "Checking for new fastest server."
msgstr "Suche erneut den schnellsten Server."
-#: src/serv_list.c:1159
+#: src/serv_list.c:1160
#, c-format
msgid "Requested domain %s, found %s, ignored."
msgstr ""
@@ -188,61 +188,61 @@
msgid "or start ypbind with the -broadcast option.\n"
msgstr "oder starte ypbind mit der -broadcast Option.\n"
-#: src/ypbind-mt.c:334
+#: src/ypbind-mt.c:335
#, c-format
msgid "cannot create pidfile %s"
msgstr "Kann Pidfile %s nicht erzeugen."
-#: src/ypbind-mt.c:362
+#: src/ypbind-mt.c:365
#, c-format
msgid "fcntl error: %s"
msgstr "fcntl Fehler: %s"
-#: src/ypbind-mt.c:374
+#: src/ypbind-mt.c:377
#, c-format
msgid "ypbind-mt already running (pid %d) - exiting"
msgstr "ypbind-mt l�uft bereits (pid %d) - beende mich"
-#: src/ypbind-mt.c:385
+#: src/ypbind-mt.c:388
msgid "cannot lock pidfile"
msgstr "Kann Pidfile nicht locken"
-#: src/ypbind-mt.c:437
+#: src/ypbind-mt.c:440
#, c-format
msgid "sigwait failed: ret=%d."
msgstr ""
-#: src/ypbind-mt.c:443
+#: src/ypbind-mt.c:446
msgid "SIGCHLD arrived, what should I do ?"
msgstr "SIGCHLD abgefangen, was soll ich machen ?"
-#: src/ypbind-mt.c:451
+#: src/ypbind-mt.c:454
#, c-format
msgid "Signal (%d) for quitting program arrived."
msgstr "Signal (%d) zum beenden des Programms bekommen."
-#: src/ypbind-mt.c:460
+#: src/ypbind-mt.c:463
msgid "cannot unlock pidfile"
msgstr "Kann Pidfile nicht unlocken."
-#: src/ypbind-mt.c:472
+#: src/ypbind-mt.c:475
msgid "SIGHUP arrived, reloading config file."
msgstr "SIGHUP abgefangen, Config Datei wird neu geladen."
-#: src/ypbind-mt.c:485
+#: src/ypbind-mt.c:488
msgid "Ignoring SIGPIPE."
msgstr ""
-#: src/ypbind-mt.c:488
+#: src/ypbind-mt.c:491
#, c-format
msgid "Unknown signal: %d"
msgstr "Unbekanntes Signal: %d"
-#: src/ypbind-mt.c:505
+#: src/ypbind-mt.c:508
msgid "Usage:\n"
msgstr "Aufruf:\n"
-#: src/ypbind-mt.c:506
+#: src/ypbind-mt.c:509
#, fuzzy
msgid ""
"\typbind [-broadcast | -ypset | -ypsetme] [-f configfile]\n"
@@ -252,101 +252,101 @@
" ypbind [-broadcast | -ypset | -ypsetme] [-p Port] [-f "
"configfile] [-no-ping] [-broken-server] [-local-only] [-debug]\n"
-#: src/ypbind-mt.c:508
+#: src/ypbind-mt.c:511
msgid "\t [-no-dbus]\n"
msgstr ""
-#: src/ypbind-mt.c:510
+#: src/ypbind-mt.c:513
msgid "\typbind -c [-f configfile]\n"
msgstr ""
-#: src/ypbind-mt.c:511
+#: src/ypbind-mt.c:514
msgid "\typbind --version\n"
msgstr ""
-#: src/ypbind-mt.c:547
+#: src/ypbind-mt.c:550
#, c-format
msgid "Cannot create UDP: %s"
msgstr "Kann UDP Socket nicht erzeugen: %s"
-#: src/ypbind-mt.c:565
+#: src/ypbind-mt.c:568
#, c-format
msgid "Cannot bind UDP: %s"
msgstr ""
-#: src/ypbind-mt.c:575
+#: src/ypbind-mt.c:578
msgid "Cannot create udp service."
msgstr "Kann UDP Servie nicht erzeugen."
-#: src/ypbind-mt.c:584
+#: src/ypbind-mt.c:587
msgid "Unable to register (YPBINDPROG, YPBINDVERS, udp)."
msgstr "Kann (YPBINDPROG, YPBINDVERS, upd) nicht beim portmapper registrieren."
-#: src/ypbind-mt.c:593
+#: src/ypbind-mt.c:596
msgid "Unable to register (YPBINDPROG, YPBINDOLDVERS, udp)."
msgstr ""
"Kann (YPBINDPROG, YPBINDOLDVERS, udp) nicht beim portmapper registrieren."
-#: src/ypbind-mt.c:603
+#: src/ypbind-mt.c:606
#, c-format
msgid "Cannot create TCP: %s"
msgstr "Kann TCP Socket nicht erzeugen: %s"
-#: src/ypbind-mt.c:622
+#: src/ypbind-mt.c:625
#, c-format
msgid "Cannot bind TCP: %s"
msgstr ""
-#: src/ypbind-mt.c:634
+#: src/ypbind-mt.c:637
msgid "Cannot create tcp service.\n"
msgstr "Kann TCP Service nicht erzeugen.\n"
-#: src/ypbind-mt.c:642
+#: src/ypbind-mt.c:645
msgid "Unable to register (YPBINDPROG, YPBINDVERS, tcp)."
msgstr "Kann (YPBINDPROG, YPBINDVERS, tcp) nicht beim portmapper registrieren."
-#: src/ypbind-mt.c:651
+#: src/ypbind-mt.c:654
msgid "Unable to register (YPBINDPROG, YPBINDOLDVERS, tcp)."
msgstr ""
"Kann (YPBINDPROG, YPBINDOLDVERS, tcp) nicht beim portmapper registrieren."
-#: src/ypbind-mt.c:752
+#: src/ypbind-mt.c:755
msgid "ERROR: domainname not set.\n"
msgstr "Fehler: Domainname wurde nicht gesetzt.\n"
-#: src/ypbind-mt.c:757
+#: src/ypbind-mt.c:760
msgid "domainname not set - aborting.\n"
msgstr "Domainname wurde nicht gesetzt - Abbruch.\n"
-#: src/ypbind-mt.c:766
+#: src/ypbind-mt.c:769
#, c-format
msgid "Config file %s is not ok.\n"
msgstr "Konfigurationsdatei %s ist nicht in Ordnung.\n"
-#: src/ypbind-mt.c:771
+#: src/ypbind-mt.c:774
#, c-format
msgid "Config file %s is ok.\n"
msgstr "Konfigurationsdatei %s ist in Ordnung.\n"
-#: src/ypbind-mt.c:778
+#: src/ypbind-mt.c:781
msgid "ypbind must be run as root\n"
msgstr "ypbind mu� als root gestartet werden.\n"
-#: src/ypbind-mt.c:786 src/ypbind-mt.c:795
+#: src/ypbind-mt.c:789 src/ypbind-mt.c:798
#, c-format
msgid "Could not create %s: %s\n"
msgstr "Kann %s nicht erzeugen: %s\n"
-#: src/ypbind-mt.c:802
+#: src/ypbind-mt.c:805
#, c-format
msgid "Could not change to directory %s: %s\n"
msgstr "Fehler beim Wechseln in das Verzeichnis %s: %s\n"
-#: src/ypbind-mt.c:894
+#: src/ypbind-mt.c:903
msgid "Could not block signals."
msgstr "Kann die Signale nicht blocken."
-#: src/ypbind-mt.c:942
+#: src/ypbind-mt.c:951
msgid "svc_run returned."
msgstr "svc_run hat sich beendet."
Files old/ypbind-mt-1.32/po/sv.gmo and new/ypbind-mt-1.33/po/sv.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-1.32/po/sv.po new/ypbind-mt-1.33/po/sv.po
--- old/ypbind-mt-1.32/po/sv.po 2009-11-30 10:15:39.000000000 +0100
+++ new/ypbind-mt-1.33/po/sv.po 2011-04-29 16:34:51.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: ypbind-mt 1.20-2\n"
"Report-Msgid-Bugs-To: ku...@linux-nis.org\n"
-"POT-Creation-Date: 2009-11-30 10:15+0100\n"
+"POT-Creation-Date: 2011-04-29 16:34+0200\n"
"PO-Revision-Date: 2006-11-12 16:48+0100\n"
"Last-Translator: Daniel Nylander <p...@danielnylander.se>\n"
"Language-Team: Swedish <tp...@listor.tp-sv.se>\n"
@@ -58,7 +58,7 @@
msgid "gethostbyname: Unknown error"
msgstr "gethostbyname: Ok�nt fel"
-#: src/serv_list.c:615 src/serv_list.c:924 src/serv_list.c:1043
+#: src/serv_list.c:615 src/serv_list.c:925 src/serv_list.c:1044
#, c-format
msgid "Answer for domain '%s' from server '%s'"
msgstr "Svar f�r dom�nen \"%s\" fr�n servern \"%s\""
@@ -83,7 +83,7 @@
msgid "leave do_broadcast() for domain '%s'"
msgstr "l�mna do_broadcast() f�r dom�nen \"%s\""
-#: src/serv_list.c:812 src/serv_list.c:983
+#: src/serv_list.c:812 src/serv_list.c:984
#, c-format
msgid "ping host '%s', domain '%s'"
msgstr "pinga v�rden \"%s\", dom�n \"%s\""
@@ -99,25 +99,25 @@
msgstr ""
"Servern \"%s\" f�r dom�nen \"%s\" svarade p� ping men misslyckades att binda"
-#: src/serv_list.c:1002
+#: src/serv_list.c:1003
#, c-format
msgid "clnt_create for server '%s' (domain '%s') failed"
msgstr "clnt_create f�r servern \"%s\" (dom�n \"%s\") misslyckades"
-#: src/serv_list.c:1023
+#: src/serv_list.c:1024
#, c-format
msgid "domain '%s' not served by '%s'"
msgstr "dom�nen \"%s\" hanteras inte av \"%s\""
-#: src/serv_list.c:1145
+#: src/serv_list.c:1146
msgid "Pinging all active servers."
msgstr "Pingar alla aktiva servrar."
-#: src/serv_list.c:1147
+#: src/serv_list.c:1148
msgid "Checking for new fastest server."
msgstr "Letar efter den snabbaste servern."
-#: src/serv_list.c:1159
+#: src/serv_list.c:1160
#, c-format
msgid "Requested domain %s, found %s, ignored."
msgstr "Beg�rd dom�n %s, hittade %s, ignoreras."
@@ -187,61 +187,61 @@
msgid "or start ypbind with the -broadcast option.\n"
msgstr "eller starta ypbind med flaggan -broadcast.\n"
-#: src/ypbind-mt.c:334
+#: src/ypbind-mt.c:335
#, c-format
msgid "cannot create pidfile %s"
msgstr "kan inte skapa pid-filen %s"
-#: src/ypbind-mt.c:362
+#: src/ypbind-mt.c:365
#, c-format
msgid "fcntl error: %s"
msgstr "fcntl-fel: %s"
-#: src/ypbind-mt.c:374
+#: src/ypbind-mt.c:377
#, c-format
msgid "ypbind-mt already running (pid %d) - exiting"
msgstr "ypbind-mt k�r redan (pid %d) - avslutar"
-#: src/ypbind-mt.c:385
+#: src/ypbind-mt.c:388
msgid "cannot lock pidfile"
msgstr "kan inte l�sa pid-fil"
-#: src/ypbind-mt.c:437
+#: src/ypbind-mt.c:440
#, c-format
msgid "sigwait failed: ret=%d."
msgstr "sigwait misslyckades: ret=%d."
-#: src/ypbind-mt.c:443
+#: src/ypbind-mt.c:446
msgid "SIGCHLD arrived, what should I do ?"
msgstr "SIGCHLD togs emot, vad ska jag g�ra?"
-#: src/ypbind-mt.c:451
+#: src/ypbind-mt.c:454
#, c-format
msgid "Signal (%d) for quitting program arrived."
msgstr "Signalen (%d) f�r programavslut togs emot."
-#: src/ypbind-mt.c:460
+#: src/ypbind-mt.c:463
msgid "cannot unlock pidfile"
msgstr "kan inte l�sa upp pid-fil"
-#: src/ypbind-mt.c:472
+#: src/ypbind-mt.c:475
msgid "SIGHUP arrived, reloading config file."
msgstr "SIGHUP togs emot, l�ser om konfigurationsfilen."
-#: src/ypbind-mt.c:485
+#: src/ypbind-mt.c:488
msgid "Ignoring SIGPIPE."
msgstr "Ignorerar SIGPIPE."
-#: src/ypbind-mt.c:488
+#: src/ypbind-mt.c:491
#, c-format
msgid "Unknown signal: %d"
msgstr "Ok�nd signal: %d"
-#: src/ypbind-mt.c:505
+#: src/ypbind-mt.c:508
msgid "Usage:\n"
msgstr "Anv�ndning:\n"
-#: src/ypbind-mt.c:506
+#: src/ypbind-mt.c:509
#, fuzzy
msgid ""
"\typbind [-broadcast | -ypset | -ypsetme] [-f configfile]\n"
@@ -251,99 +251,99 @@
"\typbind [-broadcast | -ypset | -ypsetme] [-p port] [-f konfigurationsfil]\n"
"\t [-no-ping] [-broken-server] [-local-only] [-i ping-interval] [-debug]\n"
-#: src/ypbind-mt.c:508
+#: src/ypbind-mt.c:511
msgid "\t [-no-dbus]\n"
msgstr "\t [-no-dbus]\n"
-#: src/ypbind-mt.c:510
+#: src/ypbind-mt.c:513
msgid "\typbind -c [-f configfile]\n"
msgstr "\typbind -c [-f konfigurationsfil]\n"
-#: src/ypbind-mt.c:511
+#: src/ypbind-mt.c:514
msgid "\typbind --version\n"
msgstr "\typbind --version\n"
-#: src/ypbind-mt.c:547
+#: src/ypbind-mt.c:550
#, c-format
msgid "Cannot create UDP: %s"
msgstr "Kan inte skapa UDP: %s"
-#: src/ypbind-mt.c:565
+#: src/ypbind-mt.c:568
#, c-format
msgid "Cannot bind UDP: %s"
msgstr "Kan inte binda UDP: %s"
-#: src/ypbind-mt.c:575
+#: src/ypbind-mt.c:578
msgid "Cannot create udp service."
msgstr "Kan inte skapa udp-tj�nst."
-#: src/ypbind-mt.c:584
+#: src/ypbind-mt.c:587
msgid "Unable to register (YPBINDPROG, YPBINDVERS, udp)."
msgstr "Kan inte registrera (YPBINDPROG, YPBINDVERS, udp)."
-#: src/ypbind-mt.c:593
+#: src/ypbind-mt.c:596
msgid "Unable to register (YPBINDPROG, YPBINDOLDVERS, udp)."
msgstr "Kan inte registrera (YPBINDPROG, YPBINDOLDVERS, udp)."
-#: src/ypbind-mt.c:603
+#: src/ypbind-mt.c:606
#, c-format
msgid "Cannot create TCP: %s"
msgstr "Kan inte skapa TCP: %s"
-#: src/ypbind-mt.c:622
+#: src/ypbind-mt.c:625
#, c-format
msgid "Cannot bind TCP: %s"
msgstr "Kan inte binda TCP: %s"
-#: src/ypbind-mt.c:634
+#: src/ypbind-mt.c:637
msgid "Cannot create tcp service.\n"
msgstr "Kan inte skapa tcp-tj�nst.\n"
-#: src/ypbind-mt.c:642
+#: src/ypbind-mt.c:645
msgid "Unable to register (YPBINDPROG, YPBINDVERS, tcp)."
msgstr "Kan inte registrera (YPBINDPROG, YPBINDVERS, tcp)."
-#: src/ypbind-mt.c:651
+#: src/ypbind-mt.c:654
msgid "Unable to register (YPBINDPROG, YPBINDOLDVERS, tcp)."
msgstr "Kan inte registrera (YPBINDPROG, YPBINDOLDVERS, tcp)."
-#: src/ypbind-mt.c:752
+#: src/ypbind-mt.c:755
msgid "ERROR: domainname not set.\n"
msgstr "FEL: domainname inte inst�llt.\n"
-#: src/ypbind-mt.c:757
+#: src/ypbind-mt.c:760
msgid "domainname not set - aborting.\n"
msgstr "domainname inte inst�llt - avbryter.\n"
-#: src/ypbind-mt.c:766
+#: src/ypbind-mt.c:769
#, c-format
msgid "Config file %s is not ok.\n"
msgstr "Konfigurationsfilen %s �r inte ok.\n"
-#: src/ypbind-mt.c:771
+#: src/ypbind-mt.c:774
#, c-format
msgid "Config file %s is ok.\n"
msgstr "Konfigurationsfilen %s �r ok.\n"
-#: src/ypbind-mt.c:778
+#: src/ypbind-mt.c:781
msgid "ypbind must be run as root\n"
msgstr "ypbind m�ste k�ras som root\n"
-#: src/ypbind-mt.c:786 src/ypbind-mt.c:795
+#: src/ypbind-mt.c:789 src/ypbind-mt.c:798
#, c-format
msgid "Could not create %s: %s\n"
msgstr "Kunde inte skapa %s: %s\n"
-#: src/ypbind-mt.c:802
+#: src/ypbind-mt.c:805
#, c-format
msgid "Could not change to directory %s: %s\n"
msgstr "Kunde inte �ndra till katalogen %s: %s\n"
-#: src/ypbind-mt.c:894
+#: src/ypbind-mt.c:903
msgid "Could not block signals."
msgstr "Kunde inte blockera signaler."
-#: src/ypbind-mt.c:942
+#: src/ypbind-mt.c:951
msgid "svc_run returned."
msgstr "svc_run �terv�nde."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-1.32/po/ypbind-mt.pot
new/ypbind-mt-1.33/po/ypbind-mt.pot
--- old/ypbind-mt-1.32/po/ypbind-mt.pot 2009-11-30 10:15:38.000000000 +0100
+++ new/ypbind-mt-1.33/po/ypbind-mt.pot 2011-04-29 16:34:50.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: ku...@linux-nis.org\n"
-"POT-Creation-Date: 2009-11-30 10:15+0100\n"
+"POT-Creation-Date: 2011-04-29 16:34+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <l...@li.org>\n"
@@ -59,7 +59,7 @@
msgid "gethostbyname: Unknown error"
msgstr ""
-#: src/serv_list.c:615 src/serv_list.c:924 src/serv_list.c:1043
+#: src/serv_list.c:615 src/serv_list.c:925 src/serv_list.c:1044
#, c-format
msgid "Answer for domain '%s' from server '%s'"
msgstr ""
@@ -84,7 +84,7 @@
msgid "leave do_broadcast() for domain '%s'"
msgstr ""
-#: src/serv_list.c:812 src/serv_list.c:983
+#: src/serv_list.c:812 src/serv_list.c:984
#, c-format
msgid "ping host '%s', domain '%s'"
msgstr ""
@@ -99,25 +99,25 @@
msgid "Server '%s' for domain '%s' answered ping but failed to bind"
msgstr ""
-#: src/serv_list.c:1002
+#: src/serv_list.c:1003
#, c-format
msgid "clnt_create for server '%s' (domain '%s') failed"
msgstr ""
-#: src/serv_list.c:1023
+#: src/serv_list.c:1024
#, c-format
msgid "domain '%s' not served by '%s'"
msgstr ""
-#: src/serv_list.c:1145
+#: src/serv_list.c:1146
msgid "Pinging all active servers."
msgstr ""
-#: src/serv_list.c:1147
+#: src/serv_list.c:1148
msgid "Checking for new fastest server."
msgstr ""
-#: src/serv_list.c:1159
+#: src/serv_list.c:1160
#, c-format
msgid "Requested domain %s, found %s, ignored."
msgstr ""
@@ -187,160 +187,160 @@
msgid "or start ypbind with the -broadcast option.\n"
msgstr ""
-#: src/ypbind-mt.c:334
+#: src/ypbind-mt.c:335
#, c-format
msgid "cannot create pidfile %s"
msgstr ""
-#: src/ypbind-mt.c:362
+#: src/ypbind-mt.c:365
#, c-format
msgid "fcntl error: %s"
msgstr ""
-#: src/ypbind-mt.c:374
+#: src/ypbind-mt.c:377
#, c-format
msgid "ypbind-mt already running (pid %d) - exiting"
msgstr ""
-#: src/ypbind-mt.c:385
+#: src/ypbind-mt.c:388
msgid "cannot lock pidfile"
msgstr ""
-#: src/ypbind-mt.c:437
+#: src/ypbind-mt.c:440
#, c-format
msgid "sigwait failed: ret=%d."
msgstr ""
-#: src/ypbind-mt.c:443
+#: src/ypbind-mt.c:446
msgid "SIGCHLD arrived, what should I do ?"
msgstr ""
-#: src/ypbind-mt.c:451
+#: src/ypbind-mt.c:454
#, c-format
msgid "Signal (%d) for quitting program arrived."
msgstr ""
-#: src/ypbind-mt.c:460
+#: src/ypbind-mt.c:463
msgid "cannot unlock pidfile"
msgstr ""
-#: src/ypbind-mt.c:472
+#: src/ypbind-mt.c:475
msgid "SIGHUP arrived, reloading config file."
msgstr ""
-#: src/ypbind-mt.c:485
+#: src/ypbind-mt.c:488
msgid "Ignoring SIGPIPE."
msgstr ""
-#: src/ypbind-mt.c:488
+#: src/ypbind-mt.c:491
#, c-format
msgid "Unknown signal: %d"
msgstr ""
-#: src/ypbind-mt.c:505
+#: src/ypbind-mt.c:508
msgid "Usage:\n"
msgstr ""
-#: src/ypbind-mt.c:506
+#: src/ypbind-mt.c:509
msgid ""
"\typbind [-broadcast | -ypset | -ypsetme] [-f configfile]\n"
"\t [-no-ping] [-broken-server] [-local-only] [-i ping-interval] [-debug] [-"
"verbose]\n"
msgstr ""
-#: src/ypbind-mt.c:508
+#: src/ypbind-mt.c:511
msgid "\t [-no-dbus]\n"
msgstr ""
-#: src/ypbind-mt.c:510
+#: src/ypbind-mt.c:513
msgid "\typbind -c [-f configfile]\n"
msgstr ""
-#: src/ypbind-mt.c:511
+#: src/ypbind-mt.c:514
msgid "\typbind --version\n"
msgstr ""
-#: src/ypbind-mt.c:547
+#: src/ypbind-mt.c:550
#, c-format
msgid "Cannot create UDP: %s"
msgstr ""
-#: src/ypbind-mt.c:565
+#: src/ypbind-mt.c:568
#, c-format
msgid "Cannot bind UDP: %s"
msgstr ""
-#: src/ypbind-mt.c:575
+#: src/ypbind-mt.c:578
msgid "Cannot create udp service."
msgstr ""
-#: src/ypbind-mt.c:584
+#: src/ypbind-mt.c:587
msgid "Unable to register (YPBINDPROG, YPBINDVERS, udp)."
msgstr ""
-#: src/ypbind-mt.c:593
+#: src/ypbind-mt.c:596
msgid "Unable to register (YPBINDPROG, YPBINDOLDVERS, udp)."
msgstr ""
-#: src/ypbind-mt.c:603
+#: src/ypbind-mt.c:606
#, c-format
msgid "Cannot create TCP: %s"
msgstr ""
-#: src/ypbind-mt.c:622
+#: src/ypbind-mt.c:625
#, c-format
msgid "Cannot bind TCP: %s"
msgstr ""
-#: src/ypbind-mt.c:634
+#: src/ypbind-mt.c:637
msgid "Cannot create tcp service.\n"
msgstr ""
-#: src/ypbind-mt.c:642
+#: src/ypbind-mt.c:645
msgid "Unable to register (YPBINDPROG, YPBINDVERS, tcp)."
msgstr ""
-#: src/ypbind-mt.c:651
+#: src/ypbind-mt.c:654
msgid "Unable to register (YPBINDPROG, YPBINDOLDVERS, tcp)."
msgstr ""
-#: src/ypbind-mt.c:752
+#: src/ypbind-mt.c:755
msgid "ERROR: domainname not set.\n"
msgstr ""
-#: src/ypbind-mt.c:757
+#: src/ypbind-mt.c:760
msgid "domainname not set - aborting.\n"
msgstr ""
-#: src/ypbind-mt.c:766
+#: src/ypbind-mt.c:769
#, c-format
msgid "Config file %s is not ok.\n"
msgstr ""
-#: src/ypbind-mt.c:771
+#: src/ypbind-mt.c:774
#, c-format
msgid "Config file %s is ok.\n"
msgstr ""
-#: src/ypbind-mt.c:778
+#: src/ypbind-mt.c:781
msgid "ypbind must be run as root\n"
msgstr ""
-#: src/ypbind-mt.c:786 src/ypbind-mt.c:795
+#: src/ypbind-mt.c:789 src/ypbind-mt.c:798
#, c-format
msgid "Could not create %s: %s\n"
msgstr ""
-#: src/ypbind-mt.c:802
+#: src/ypbind-mt.c:805
#, c-format
msgid "Could not change to directory %s: %s\n"
msgstr ""
-#: src/ypbind-mt.c:894
+#: src/ypbind-mt.c:903
msgid "Could not block signals."
msgstr ""
-#: src/ypbind-mt.c:942
+#: src/ypbind-mt.c:951
msgid "svc_run returned."
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-1.32/src/Makefile.in
new/ypbind-mt-1.33/src/Makefile.in
--- old/ypbind-mt-1.32/src/Makefile.in 2010-07-07 14:49:34.000000000 +0200
+++ new/ypbind-mt-1.33/src/Makefile.in 2011-04-29 16:34:38.000000000 +0200
@@ -222,9 +222,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits src/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu src/Makefile
+ $(AUTOMAKE) --gnits src/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -265,6 +265,22 @@
clean-sbinPROGRAMS:
-test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
+
+installcheck-sbinPROGRAMS: $(sbin_PROGRAMS)
+ bad=0; pid=$$$$; list="$(sbin_PROGRAMS)"; for p in $$list; do \
+ case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
+ *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
+ esac; \
+ f=`echo "$$p" | \
+ sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+ for opt in --help --version; do \
+ if "$(DESTDIR)$(sbindir)/$$f" $$opt >c$${pid}_.out \
+ 2>c$${pid}_.err </dev/null \
+ && test -n "`cat c$${pid}_.out`" \
+ && test -z "`cat c$${pid}_.err`"; then :; \
+ else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
+ done; \
+ done; rm -f c$${pid}_.???; exit $$bad
ypbind$(EXEEXT): $(ypbind_OBJECTS) $(ypbind_DEPENDENCIES)
@rm -f ypbind$(EXEEXT)
$(LINK) $(ypbind_OBJECTS) $(ypbind_LDADD) $(LIBS)
@@ -440,7 +456,7 @@
install-ps: install-ps-am
-installcheck-am:
+installcheck-am: installcheck-sbinPROGRAMS
maintainer-clean: maintainer-clean-am
-rm -rf ./$(DEPDIR)
@@ -471,10 +487,10 @@
install-exec-am install-html install-html-am install-info \
install-info-am install-man install-pdf install-pdf-am \
install-ps install-ps-am install-sbinPROGRAMS install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
- uninstall-am uninstall-sbinPROGRAMS
+ installcheck installcheck-am installcheck-sbinPROGRAMS \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+ ps ps-am tags uninstall uninstall-am uninstall-sbinPROGRAMS
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-1.32/src/serv_list.c
new/ypbind-mt-1.33/src/serv_list.c
--- old/ypbind-mt-1.32/src/serv_list.c 2009-11-30 10:01:19.000000000 +0100
+++ new/ypbind-mt-1.33/src/serv_list.c 2011-04-29 16:15:48.000000000 +0200
@@ -1,4 +1,4 @@
-/* Copyright (c) 1998-2009 Thorsten Kukuk
+/* Copyright (c) 1998-2009, 2011 Thorsten Kukuk
This file is part of ypbind-mt.
Author: Thorsten Kukuk <ku...@suse.de>
@@ -785,7 +785,7 @@
CLIENT *clnt;
struct findserv_req **pings;
struct sockaddr_in s_in, *any = NULL;
- int found = -1;
+ int found = 0;
u_int32_t xid_seed, xid_lookup;
int sock, dontblock = 1;
bool_t clnt_res;
@@ -906,7 +906,8 @@
/* NULL should not happen, we have got an answer from the server.
*/
log_msg (LOG_DEBUG,
_("Server '%s' for domain '%s' answered ping but failed
to bind"),
- list->server[list->active].host, domain);
+ (list->active >= 0) ? list->server[list->active].host :
"-",
+ domain);
}
else
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-1.32/src/ypbind-mt.c
new/ypbind-mt-1.33/src/ypbind-mt.c
--- old/ypbind-mt-1.32/src/ypbind-mt.c 2009-11-19 11:29:00.000000000 +0100
+++ new/ypbind-mt-1.33/src/ypbind-mt.c 2011-04-29 16:33:11.000000000 +0200
@@ -1,4 +1,4 @@
-/* Copyright (c) 1998 - 2009 Thorsten Kukuk
+/* Copyright (c) 1998 - 2009, 2011 Thorsten Kukuk
This file is part of ypbind-mt.
Author: Thorsten Kukuk <ku...@suse.de>
@@ -331,7 +331,10 @@
lock_fd = open (_YPBIND_PIDFILE, O_CREAT | O_RDWR,
S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
if (lock_fd < 0)
- log_msg (LOG_ERR, _("cannot create pidfile %s"), _YPBIND_PIDFILE);
+ {
+ log_msg (LOG_ERR, _("cannot create pidfile %s"), _YPBIND_PIDFILE);
+ return;
+ }
/* Make sure file gets correctly closed when process finished. */
flags = fcntl (lock_fd, F_GETFD, 0);
@@ -864,6 +867,12 @@
umask (0);
j = open ("/dev/null", O_RDWR);
+ if (j < 0)
+ {
+ log_msg (LOG_ERR, "Cannot open /dev/null: %s\n", strerror (errno));
+ exit (-1);
+ }
+ /* two dups: stdin, stdout, stderr */
if (dup (j) == -1)
{
log_msg (LOG_ERR, "Cannot dup file handle: %s\n", strerror (errno));
++++++ ypbind-mt-update-networkmanager-interface-to-use-new-nm_state ++++++
From: Jeff Mahoney <je...@suse.com>
Subject: ypbind-mt: Update NetworkManager interface to use new NM_STATE_*
References: bnc#698030
NetworkManager has added new 'connected' states and has renumbered the
state enum. Rather than just NM_STATE_CONNECTED, it now offers
NM_STATE_CONNECTED_{LOCAL,SITE,GLOBAL}.
This patch replaces checks against NM_STATE_CONNECTED with a function
that checks all three forms of connectivity.
Without this patch, ypbind will fail to start, with the following messages:
27167: NetworkManager is running.
27167: No network is available. Waiting...
27167: interface: org.freedesktop.DBus, object path: /org/freedesktop/DBus,
method: NameAcquired
<nothing>
yptest fails with "Can't communicate with ypbind."
With the patch, it starts up as expected and yptest returns useful results.
Without NetworkManager, ypbind works as expected.
Signed-off-by: Jeff Mahoney <je...@suse.com>
---
src/ypbind_dbus_nm.c | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
--- a/src/ypbind_dbus_nm.c
+++ b/src/ypbind_dbus_nm.c
@@ -42,12 +42,16 @@
#define NM_DBUS_VPN_SIGNAL_STATE_CHANGE "StateChange"
typedef enum NMState {
- NM_STATE_UNKNOWN = 0,
- NM_STATE_ASLEEP,
- NM_STATE_CONNECTING,
- NM_STATE_CONNECTED,
- NM_STATE_DISCONNECTED
+ NM_STATE_UNKNOWN = 0,
+ NM_STATE_ASLEEP = 10,
+ NM_STATE_DISCONNECTED = 20,
+ NM_STATE_DISCONNECTING = 30,
+ NM_STATE_CONNECTING = 40,
+ NM_STATE_CONNECTED_LOCAL = 50,
+ NM_STATE_CONNECTED_SITE = 60,
+ NM_STATE_CONNECTED_GLOBAL = 70
} NMState;
+#define NM_STATE_CONNECTED NM_STATE_CONNECTED_GLOBAL
#endif
@@ -133,6 +137,12 @@ dbus_reconnect (gpointer user_data)
return !status;
}
+static int is_connected_state(NMState state) {
+ return (state == NM_STATE_CONNECTED_LOCAL ||
+ state == NM_STATE_CONNECTED_SITE ||
+ state == NM_STATE_CONNECTED_GLOBAL);
+}
+
static DBusHandlerResult
dbus_filter (DBusConnection *connection,
DBusMessage *message, void *user_data __attribute__((unused)))
@@ -157,7 +167,7 @@ dbus_filter (DBusConnection *connection,
if (dbus_message_get_args (message, NULL, DBUS_TYPE_UINT32,
&state, DBUS_TYPE_INVALID))
{
- if (state == NM_STATE_CONNECTED)
+ if (is_connected_state(state))
go_online ();
else if (state == NM_STATE_DISCONNECTED)
go_offline ();
@@ -239,7 +249,7 @@ check_online (DBusConnection *connection
DBUS_TYPE_INVALID))
return -1;
- if (state != NM_STATE_CONNECTED)
+ if (!is_connected_state(state))
return 0;
return 1;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
