[prev in list] [next in list] [prev in thread] [next in thread]
List: opensuse-commit
Subject: commit ypbind
From: root () Hilbert ! suse ! de (h_root)
Date: 2008-08-30 0:23:12
Message-ID: 20080830002313.4CFA867815D () Hilbert ! suse ! de
[Download RAW message or body]
Hello community,
here is the log from the commit of package ypbind
checked in at Sat Aug 30 02:23:12 CEST 2008.
--------
--- ypbind/ypbind.changes 2008-08-14 17:35:11.000000000 +0200
+++ ypbind/ypbind.changes 2008-08-28 16:20:07.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Aug 28 16:19:43 CEST 2008 - kukuk@suse.de
+
+- Update to 1.22:
+ - Merge Patches
+ - Only write binding file if it has really changed
+
+-------------------------------------------------------------------
Old:
----
ypbind-mt-1.21.diff
ypbind-mt-1.21.tar.bz2
New:
----
ypbind-mt-1.22.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ypbind.spec ++++++
--- /var/tmp/diff_new_pack.n22887/_old 2008-08-30 02:21:57.000000000 +0200
+++ /var/tmp/diff_new_pack.n22887/_new 2008-08-30 02:21:57.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package ypbind (Version 1.21)
+# spec file for package ypbind (Version 1.22)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -29,13 +29,13 @@
AutoReqProv: on
PreReq: %insserv_prereq %fillup_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Version: 1.21
-Release: 33
+Version: 1.22
+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
+#Patch: ypbind-mt-%{version}.diff
%description
This package provides the ypbind daemon. The ypbind daemon binds NIS
@@ -53,7 +53,7 @@
%prep
%setup -q -n ypbind-mt-%{version}
-%patch
+#%patch
%build
export CFLAGS=$RPM_OPT_FLAGS
@@ -115,6 +115,10 @@
%dir /var/yp/binding
%changelog
+* Thu Aug 28 2008 kukuk@suse.de
+- Update to 1.22:
+ - Merge Patches
+ - Only write binding file if it has really changed
* Thu Aug 14 2008 kukuk@suse.de
- Adjust init script to new policy
* Thu Apr 17 2008 schwab@suse.de
++++++ ypbind-mt-1.21.tar.bz2 -> ypbind-mt-1.22.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ypbind-mt-1.21/aclocal.m4 new/ypbind-mt-1.22/aclocal.m4
--- old/ypbind-mt-1.21/aclocal.m4 2008-04-15 12:51:56.000000000 +0200
+++ new/ypbind-mt-1.22/aclocal.m4 2008-08-28 14:25:53.000000000 +0200
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,10 +11,13 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf. If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
#
@@ -84,16 +87,14 @@
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
- if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- else
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- [pkg_failed=yes])
- fi
-else
- pkg_failed=untried
+[if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ else
+ pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
@@ -137,9 +138,9 @@
if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout \
--print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors \
--print-errors "$2" 2>&1` else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -164,7 +165,7 @@
_PKG_TEXT
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
@@ -174,7 +175,7 @@
fi[]dnl
])# PKG_CHECK_MODULES
-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -189,7 +190,7 @@
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10], [],
+m4_if([$1], [1.10.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -205,8 +206,10 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -478,7 +481,7 @@
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
@@ -566,13 +569,13 @@
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 12
+# serial 13
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -677,16 +680,17 @@
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
+_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $1 | $1:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" \
>`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
@@ -958,7 +962,7 @@
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ypbind-mt-1.21/ChangeLog new/ypbind-mt-1.22/ChangeLog
--- old/ypbind-mt-1.21/ChangeLog 2008-04-15 13:22:39.000000000 +0200
+++ new/ypbind-mt-1.22/ChangeLog 2008-08-28 14:25:17.000000000 +0200
@@ -1,3 +1,15 @@
+2008-08-28 Thorsten Kukuk <kukuk@suse.de>
+
+ * release version 1.22
+
+ * src/serv_list.c: Only write binding file if there were
+ really changes. Based on patch from
+ Eric Sandeen <sandeen@redhat.com>.
+
+2008-08-27 Thorsten Kukuk <kukuk@suse.de>
+
+ * etc/ypbind.init: Adjust init script to new openSUSE policy
+
2008-04-15 Thorsten Kukuk <kukuk@suse.de>
* release version 1.21
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ypbind-mt-1.21/configure new/ypbind-mt-1.22/configure
--- old/ypbind-mt-1.21/configure 2008-04-15 12:51:58.000000000 +0200
+++ new/ypbind-mt-1.22/configure 2008-08-28 14:26:06.000000000 +0200
@@ -2119,7 +2119,7 @@
# Define the identity of the package.
PACKAGE=ypbind-mt
- VERSION=1.21
+ VERSION=1.22
cat >>confdefs.h <<_ACEOF
@@ -4987,11 +4987,10 @@
{ echo "$as_me:$LINENO: checking for DBUS" >&5
echo $ECHO_N "checking for DBUS... $ECHO_C" >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$DBUS_CFLAGS"; then
- pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$DBUS_CFLAGS"; then
+ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \
0.60\"") >&5 ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= 0.60") 2>&5
ac_status=$?
@@ -5001,15 +5000,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$DBUS_LIBS"; then
- pkg_cv_DBUS_LIBS="$DBUS_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$DBUS_LIBS"; then
+ pkg_cv_DBUS_LIBS="$DBUS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \
0.60\"") >&5 ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= 0.60") 2>&5
ac_status=$?
@@ -5019,9 +5016,8 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -5034,9 +5030,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout \
--print-errors "dbus-glib-1 >= 0.60"` + DBUS_PKG_ERRORS=`$PKG_CONFIG \
--short-errors --print-errors "dbus-glib-1 >= 0.60" 2>&1` else
- DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 \
>= 0.60"` + DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= 0.60" \
> 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$DBUS_PKG_ERRORS" >&5
@@ -5073,7 +5069,7 @@
and DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make \
sure it is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -5083,7 +5079,7 @@
and DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
@@ -5100,11 +5096,10 @@
{ echo "$as_me:$LINENO: checking for GLIB" >&5
echo $ECHO_N "checking for GLIB... $ECHO_C" >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$GLIB_CFLAGS"; then
- pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GLIB_CFLAGS"; then
+ pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \
2.6\"") >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.6") 2>&5
ac_status=$?
@@ -5114,15 +5109,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GLIB_LIBS"; then
- pkg_cv_GLIB_LIBS="$GLIB_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GLIB_LIBS"; then
+ pkg_cv_GLIB_LIBS="$GLIB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \
2.6\"") >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.6") 2>&5
ac_status=$?
@@ -5132,9 +5125,8 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -5147,9 +5139,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout \
--print-errors "glib-2.0 >= 2.6"` + GLIB_PKG_ERRORS=`$PKG_CONFIG \
--short-errors --print-errors "glib-2.0 >= 2.6" 2>&1` else
- GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= \
2.6"` + GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.6" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GLIB_PKG_ERRORS" >&5
@@ -5186,7 +5178,7 @@
and GLIB_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make \
sure it is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -5196,7 +5188,7 @@
and GLIB_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
@@ -9314,21 +9306,22 @@
fi
rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $ac_file | $ac_file:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X$ac_file : 'X\(//\)[^/]' \| \
- X$ac_file : 'X\(//\)$' \| \
- X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$_am_arg" : 'X\(//\)[^/]' \| \
+ X"$_am_arg" : 'X\(//\)$' \| \
+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$_am_arg" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -9365,7 +9358,7 @@
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ypbind-mt-1.21/configure.in new/ypbind-mt-1.22/configure.in
--- old/ypbind-mt-1.21/configure.in 2008-04-15 12:51:17.000000000 +0200
+++ new/ypbind-mt-1.22/configure.in 2008-08-28 14:25:45.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.21)
+AM_INIT_AUTOMAKE(ypbind-mt, 1.22)
AM_CONFIG_HEADER(config.h)
AC_PREFIX_DEFAULT(/usr)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ypbind-mt-1.21/etc/ypbind.init new/ypbind-mt-1.22/etc/ypbind.init
--- old/ypbind-mt-1.21/etc/ypbind.init 2008-04-15 13:14:41.000000000 +0200
+++ new/ypbind-mt-1.22/etc/ypbind.init 2008-08-27 17:34:49.000000000 +0200
@@ -12,8 +12,9 @@
### BEGIN INIT INFO
# Provides: ypbind
# Required-Start: $remote_fs $portmap
+# Required-Stop: $remote_fs $portmap
# Should-Start: ypserv slpd
-# Required-Stop: $portmap
+# Should-Stop: $null
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
# Short-Description: Start ypbind (necessary for a NIS client)
@@ -88,7 +89,7 @@
## Check if portmap or rpcbind is running, else abort with error
portmap_found=0
for prog in /sbin/rpcbind /sbin/portmap ; do
- checkproc $prog
+ test -x $prog && checkproc $prog
if [ $? -eq 0 ]; then
portmap_found=1
fi
@@ -106,7 +107,7 @@
test "$YPBIND_LOCAL_ONLY" = "yes" && OPTIONS="-local-only $OPTIONS"
test "$YPBIND_BROADCAST" = "yes" && OPTIONS="-broadcast $OPTIONS"
test "$YPBIND_BROKEN_SERVER" = "yes" && OPTIONS="-broken-server $OPTIONS"
- test "X$YPBIND_PING_INTERVAL" -ne "X" && OPTIONS="-ping-interval \
$YPBIND_PING_INTERVAL $OPTIONS" + test "X$YPBIND_PING_INTERVAL" != "X" && \
OPTIONS="-ping-interval $YPBIND_PING_INTERVAL $OPTIONS" test "$YPBIND_DBUS" = "no" \
&& OPTIONS="-no-dbus $OPTIONS"
startproc $YPBIND_BIN $YPBIND_OPTIONS $OPTIONS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ypbind-mt-1.21/lib/Makefile.in new/ypbind-mt-1.22/lib/Makefile.in
--- old/ypbind-mt-1.21/lib/Makefile.in 2008-04-15 12:51:57.000000000 +0200
+++ new/ypbind-mt-1.22/lib/Makefile.in 2008-08-28 14:33:48.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -61,7 +61,7 @@
libcompat_a_DEPENDENCIES = @LIBOBJS@
am_libcompat_a_OBJECTS = dns_hosts.$(OBJEXT)
libcompat_a_OBJECTS = $(am_libcompat_a_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -213,9 +213,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits lib/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnits lib/Makefile
+ $(AUTOMAKE) --gnu lib/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -269,8 +269,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -282,8 +282,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -293,13 +293,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ypbind-mt-1.21/Makefile.in new/ypbind-mt-1.22/Makefile.in
--- old/ypbind-mt-1.21/Makefile.in 2008-04-15 13:02:48.000000000 +0200
+++ new/ypbind-mt-1.22/Makefile.in 2008-08-28 14:33:48.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -342,8 +342,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -368,8 +368,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -379,13 +379,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -461,6 +460,10 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -488,6 +491,8 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -639,7 +644,7 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-shar dist-tarZ dist-zip distcheck distclean \
+ dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-generic distclean-hdr distclean-tags distcleancheck \
distdir distuninstallcheck dvi dvi-am html html-am info \
info-am install install-am install-data install-data-am \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ypbind-mt-1.21/man/Makefile.am new/ypbind-mt-1.22/man/Makefile.am
--- old/ypbind-mt-1.21/man/Makefile.am 2006-09-21 16:22:30.000000000 +0200
+++ new/ypbind-mt-1.22/man/Makefile.am 2008-08-28 14:33:40.000000000 +0200
@@ -12,11 +12,11 @@
XMLS = ypbind.8.xml yp.conf.5.xml
if ENABLE_REGENERATE_MAN
-%.5: %.5.xml
+yp.conf.5: yp.conf.5.xml
$(XMLLINT) --nonet --xinclude --postvalid --noout $<
$(XSLTPROC) -o $(srcdir)/$@ --path $(srcdir) --xinclude --nonet \
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-%.8: %.8.xml
+ypbind.8: ypbind.8.xml
$(XMLLINT) --nonet --xinclude --postvalid --noout $<
$(XSLTPROC) -o $(srcdir)/$@ --path $(srcdir) --xinclude --nonet \
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ypbind-mt-1.21/man/Makefile.in new/ypbind-mt-1.22/man/Makefile.in
--- old/ypbind-mt-1.21/man/Makefile.in 2008-04-15 12:51:57.000000000 +0200
+++ new/ypbind-mt-1.22/man/Makefile.in 2008-08-28 14:33:48.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -196,9 +196,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits man/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnits man/Makefile
+ $(AUTOMAKE) --gnu man/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -442,11 +442,11 @@
uninstall-man5 uninstall-man8
-@ENABLE_REGENERATE_MAN_TRUE@%.5: %.5.xml
+@ENABLE_REGENERATE_MAN_TRUE@yp.conf.5: yp.conf.5.xml
@ENABLE_REGENERATE_MAN_TRUE@ $(XMLLINT) --nonet --xinclude --postvalid --noout $<
@ENABLE_REGENERATE_MAN_TRUE@ $(XSLTPROC) -o $(srcdir)/$@ --path $(srcdir) --xinclude \
--nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-@ENABLE_REGENERATE_MAN_TRUE@%.8: %.8.xml
+@ENABLE_REGENERATE_MAN_TRUE@ypbind.8: ypbind.8.xml
@ENABLE_REGENERATE_MAN_TRUE@ $(XMLLINT) --nonet --xinclude --postvalid --noout $<
@ENABLE_REGENERATE_MAN_TRUE@ $(XSLTPROC) -o $(srcdir)/$@ --path $(srcdir) --xinclude \
--nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< # \
Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ypbind-mt-1.21/man/ypbind.8 new/ypbind-mt-1.22/man/ypbind.8
--- old/ypbind-mt-1.21/man/ypbind.8 2008-04-15 13:02:18.000000000 +0200
+++ new/ypbind-mt-1.22/man/ypbind.8 2008-08-28 14:40:14.000000000 +0200
@@ -1,11 +1,11 @@
.\" Title: ypbind
.\" Author:
-.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\" Date: 04/15/2008
+.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
+.\" Date: 08/28/2008
.\" Manual: ypbind-mt
.\" Source: ypbind-mt
.\"
-.TH "YPBIND" "8" "04/15/2008" "ypbind-mt" "ypbind\-mt"
+.TH "YPBIND" "8" "08/28/2008" "ypbind-mt" "ypbind\-mt"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ypbind-mt-1.21/man/yp.conf.5 new/ypbind-mt-1.22/man/yp.conf.5
--- old/ypbind-mt-1.21/man/yp.conf.5 2006-10-04 17:26:35.000000000 +0200
+++ new/ypbind-mt-1.22/man/yp.conf.5 2008-08-28 14:40:16.000000000 +0200
@@ -1,52 +1,62 @@
.\" Title: yp.conf
.\" Author:
-.\" Generator: DocBook XSL Stylesheets vsnapshot_2006\-08\-24_0226 \
<http://docbook.sf.net/>
-.\" Date: 10/04/2006
-.\" Manual: ypbind\-mt
-.\" Source: ypbind\-mt
+.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
+.\" Date: 08/28/2008
+.\" Manual: ypbind-mt
+.\" Source: ypbind-mt
.\"
-.TH "YP.CONF" "5" "10/04/2006" "ypbind\-mt" "ypbind\-mt"
+.TH "YP\.CONF" "5" "08/28/2008" "ypbind-mt" "ypbind\-mt"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
.SH "NAME"
-yp.conf \- NIS binding configuration file
+yp.conf - NIS binding configuration file
.SH "DESCRIPTION"
.PP
The file
-\fI/etc/yp.conf\fR
+\fI/etc/yp\.conf\fR
is read from
\fBypbind\fR(8)
-at startup or when receiving signal SIGHUP. The entries are used for the initial \
binding. Valid entries are
-.TP 3n
+at startup or when receiving signal SIGHUP\. The entries are used for the initial \
binding\. Valid entries are +.PP
\fBdomain\fR \fInisdomain\fR \fBserver\fR \fIhostname\fR
+.RS 4
Use server
\fIhostname\fR
for the domain
-\fInisdomain\fR. You could have more then one entry of this type for a single \
domain.
-.TP 3n
+\fInisdomain\fR\. You could have more then one entry of this type for a single \
domain\. +.RE
+.PP
\fBdomain\fR \fInisdomain\fR \fBbroadcast\fR
+.RS 4
Use broadcast on the local net for domain
-\fInisdomain\fR.
-.TP 3n
+\fInisdomain\fR\.
+.RE
+.PP
\fBdomain\fR \fInisdomain\fR \fBslp\fR
+.RS 4
Query the local running SLP server for hosts running ypserv and distributing
-\fInisdomain\fR. This option is only available, if
+\fInisdomain\fR\. This option is only available, if
\fBypbind\fR
-was compiled with SLP support.
-.TP 3n
+was compiled with SLP support\.
+.RE
+.PP
\fBypserver\fR \fIhostname\fR
+.RS 4
Use server
\fIhostname\fR
-for the local domain.
-.TP 3n
+for the local domain\.
+.RE
+.PP
\fBbroadcast\fR
-If no other server is given or all of them are not reachable, try a broadcast call \
for the default domain to find a server. +.RS 4
+If no other server is given or all of them are not reachable, try a broadcast call \
for the default domain to find a server\. +.RE
.PP
If for a specific domain the broadcast option and fixed server are given,
\fBypbind\-mt\fR
-tries at first the given servers before falling back to broadcasting for a running \
server. +tries at first the given servers before falling back to broadcasting for a \
running server\.
.SH "SEE ALSO"
.PP
@@ -55,4 +65,4 @@
.PP
\fBypbind\-mt\fR
-was written by Thorsten Kukuk <kukuk@thkukuk.de>.
+was written by Thorsten Kukuk <kukuk@thkukuk\.de>\.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ypbind-mt-1.21/NEWS new/ypbind-mt-1.22/NEWS
--- old/ypbind-mt-1.21/NEWS 2008-04-15 13:12:40.000000000 +0200
+++ new/ypbind-mt-1.22/NEWS 2008-08-28 14:40:01.000000000 +0200
@@ -4,6 +4,9 @@
Please send bug reports, questions and suggestions to <kukuk@thkukuk.de>.
+Version 1.22
+* Only write binding files if they really changed
+
Version 1.21
* Add -verbose option
* Fix typo in option handling
Files old/ypbind-mt-1.21/po/de.gmo and new/ypbind-mt-1.22/po/de.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ypbind-mt-1.21/po/de.po new/ypbind-mt-1.22/po/de.po
--- old/ypbind-mt-1.21/po/de.po 2008-04-15 13:22:45.000000000 +0200
+++ new/ypbind-mt-1.22/po/de.po 2008-08-28 14:40:05.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: ypbind-mt\n"
"Report-Msgid-Bugs-To: kukuk@linux-nis.org\n"
-"POT-Creation-Date: 2008-04-15 13:22+0200\n"
+"POT-Creation-Date: 2008-08-28 14:40+0200\n"
"PO-Revision-Date: 2004-02-13 16:22+01:00\n"
"Last-Translator: Thorsten Kukuk <kukuk@suse.de>\n"
"Language-Team: No Language-Team\n"
@@ -14,121 +14,121 @@
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/serv_list.c:399
+#: src/serv_list.c:426
msgid "Not enough memory !"
msgstr "Nicht genug Arbeitsspeicher !"
-#: src/serv_list.c:424
+#: src/serv_list.c:452
msgid "internal error: add_server called with NULL domain."
msgstr ""
"Interner Fehler: add_server wurde mit NULL pointer für domain aufgerufen."
-#: src/serv_list.c:439
+#: src/serv_list.c:467
#, c-format
msgid "add_server() domain: %s, broadcast"
msgstr "add_server() Domain: %s, Broadcast"
-#: src/serv_list.c:463
+#: src/serv_list.c:491
#, c-format
msgid "add_server() domain: %s, host: %s, NO SLOT FREE!"
msgstr "add_server() Domain: %s, Rechner: %s, Kein Slot mehr frei!"
-#: src/serv_list.c:470
+#: src/serv_list.c:498
#, c-format
msgid "add_server() domain: %s, host: %s, slot: %d"
msgstr "add_server() Domain: %s, Rechner: %s, Slot: %d"
-#: src/serv_list.c:500 src/serv_list.c:502
+#: src/serv_list.c:528 src/serv_list.c:530
msgid "Unknown host:"
msgstr "Unbekannter Rechner:"
-#: src/serv_list.c:506 src/serv_list.c:508
+#: src/serv_list.c:534 src/serv_list.c:536
msgid "Host name lookup failure"
msgstr "Fehler beim Auflösen des Rechnernamens"
-#: src/serv_list.c:513 src/serv_list.c:516
+#: src/serv_list.c:541 src/serv_list.c:544
msgid "No address associated with name:"
msgstr "Keine Addresse vorhanden für Rechner:"
-#: src/serv_list.c:520 src/serv_list.c:522
+#: src/serv_list.c:548 src/serv_list.c:550
msgid "Unknown server error"
msgstr "Unbekanter Server Fehler"
-#: src/serv_list.c:526 src/serv_list.c:528
+#: src/serv_list.c:554 src/serv_list.c:556
msgid "gethostbyname: Unknown error"
msgstr "gethostbyname: Unbekannter Fehler"
-#: src/serv_list.c:600 src/serv_list.c:912
+#: src/serv_list.c:628 src/serv_list.c:940
#, c-format
msgid "Answer for domain '%s' from server '%s'"
msgstr "Antwort für Domain \"%s\" vom Server \"%s\""
-#: src/serv_list.c:604
+#: src/serv_list.c:632
#, c-format
msgid "Answer for domain '%s' from unknown server '%s'"
msgstr "Antwort für Domain \"%s\" von unbekantem Server \"%s\""
-#: src/serv_list.c:611 src/serv_list.c:816
+#: src/serv_list.c:639 src/serv_list.c:844
#, c-format
msgid "Answer for domain '%s' from '%s' on illegal port %d."
msgstr "Antwort für Domain \"%s\" vom Server \"%s\" vom illegalen Port %d."
-#: src/serv_list.c:656
+#: src/serv_list.c:684
#, c-format
msgid "do_broadcast() for domain '%s' is called"
msgstr ""
-#: src/serv_list.c:691
+#: src/serv_list.c:719
#, c-format
msgid "leave do_broadcast() for domain '%s'"
msgstr ""
-#: src/serv_list.c:804 src/serv_list.c:957
+#: src/serv_list.c:832 src/serv_list.c:985
#, c-format
msgid "ping host '%s', domain '%s'"
msgstr "Ping Host \"%s\", Domain \"%s\""
-#: src/serv_list.c:829
+#: src/serv_list.c:857
#, c-format
msgid "host '%s' doesn't answer."
msgstr "Server \"%s\" antwortet nicht."
-#: src/serv_list.c:900
+#: src/serv_list.c:928
#, fuzzy, c-format
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:976
+#: src/serv_list.c:1004
#, 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:997
+#: src/serv_list.c:1025
#, c-format
msgid "domain '%s' not served by '%s'"
msgstr "Domain \"%s\" wird nicht von \"%s\" unterstützt"
-#: src/serv_list.c:1101
+#: src/serv_list.c:1129
#, fuzzy
msgid "Pinging all active servers."
msgstr "Sende ein Ping zu allen aktiven Servern."
-#: src/serv_list.c:1103
+#: src/serv_list.c:1131
#, fuzzy
msgid "Checking for new fastest server."
msgstr "Suche erneut den schnellsten Server."
-#: src/serv_list.c:1115
+#: src/serv_list.c:1143
#, c-format
msgid "Requested domain %s, found %s, ignored."
msgstr ""
-#: src/serv_list.c:1166
+#: src/serv_list.c:1194
#, c-format
msgid "Server for domain '%s' doesn't answer."
msgstr "Server für Domain \"%s\" antwortet nicht."
-#: src/serv_list.c:1172 src/serv_list.c:1177
+#: src/serv_list.c:1200 src/serv_list.c:1205
#, c-format
msgid "Server '%s' for domain '%s' doesn't answer."
msgstr "Server \"%s\" für Domain \"%s\" antwortet nicht."
Files old/ypbind-mt-1.21/po/sv.gmo and new/ypbind-mt-1.22/po/sv.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ypbind-mt-1.21/po/sv.po new/ypbind-mt-1.22/po/sv.po
--- old/ypbind-mt-1.21/po/sv.po 2008-04-15 13:22:45.000000000 +0200
+++ new/ypbind-mt-1.22/po/sv.po 2008-08-28 14:40:05.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: ypbind-mt 1.20-2\n"
"Report-Msgid-Bugs-To: kukuk@linux-nis.org\n"
-"POT-Creation-Date: 2008-04-15 13:22+0200\n"
+"POT-Creation-Date: 2008-08-28 14:40+0200\n"
"PO-Revision-Date: 2006-11-12 16:48+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -15,119 +15,119 @@
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/serv_list.c:399
+#: src/serv_list.c:426
msgid "Not enough memory !"
msgstr "Inte tillräckligt med minne!"
-#: src/serv_list.c:424
+#: src/serv_list.c:452
msgid "internal error: add_server called with NULL domain."
msgstr "internt fel: add_server anropades med NULL domän."
-#: src/serv_list.c:439
+#: src/serv_list.c:467
#, c-format
msgid "add_server() domain: %s, broadcast"
msgstr "add_server() domän: %s, broadcast"
-#: src/serv_list.c:463
+#: src/serv_list.c:491
#, c-format
msgid "add_server() domain: %s, host: %s, NO SLOT FREE!"
msgstr "add_server() domän: %s, värd: %s, INGEN LEDIG PLATS!"
-#: src/serv_list.c:470
+#: src/serv_list.c:498
#, c-format
msgid "add_server() domain: %s, host: %s, slot: %d"
msgstr "add_server() domän: %s, värd: %s, plats: %d"
-#: src/serv_list.c:500 src/serv_list.c:502
+#: src/serv_list.c:528 src/serv_list.c:530
msgid "Unknown host:"
msgstr "Okänd värd:"
-#: src/serv_list.c:506 src/serv_list.c:508
+#: src/serv_list.c:534 src/serv_list.c:536
msgid "Host name lookup failure"
msgstr "Uppslag av värdnamn misslyckades"
-#: src/serv_list.c:513 src/serv_list.c:516
+#: src/serv_list.c:541 src/serv_list.c:544
msgid "No address associated with name:"
msgstr "Ingen adress associerad med namnet:"
-#: src/serv_list.c:520 src/serv_list.c:522
+#: src/serv_list.c:548 src/serv_list.c:550
msgid "Unknown server error"
msgstr "Okänt serverfel"
-#: src/serv_list.c:526 src/serv_list.c:528
+#: src/serv_list.c:554 src/serv_list.c:556
msgid "gethostbyname: Unknown error"
msgstr "gethostbyname: Okänt fel"
-#: src/serv_list.c:600 src/serv_list.c:912
+#: src/serv_list.c:628 src/serv_list.c:940
#, c-format
msgid "Answer for domain '%s' from server '%s'"
msgstr "Svar för domänen \"%s\" från servern \"%s\""
-#: src/serv_list.c:604
+#: src/serv_list.c:632
#, c-format
msgid "Answer for domain '%s' from unknown server '%s'"
msgstr "Svar för domänen \"%s\" från okänd server \"%s\""
-#: src/serv_list.c:611 src/serv_list.c:816
+#: src/serv_list.c:639 src/serv_list.c:844
#, c-format
msgid "Answer for domain '%s' from '%s' on illegal port %d."
msgstr "Svar för domänen \"%s\" från \"%s\" på ogiltiga porten %d."
-#: src/serv_list.c:656
+#: src/serv_list.c:684
#, c-format
msgid "do_broadcast() for domain '%s' is called"
msgstr "do_broadcast() för domänen \"%s\" anropas"
-#: src/serv_list.c:691
+#: src/serv_list.c:719
#, c-format
msgid "leave do_broadcast() for domain '%s'"
msgstr "lämna do_broadcast() för domänen \"%s\""
-#: src/serv_list.c:804 src/serv_list.c:957
+#: src/serv_list.c:832 src/serv_list.c:985
#, c-format
msgid "ping host '%s', domain '%s'"
msgstr "pinga värden \"%s\", domän \"%s\""
-#: src/serv_list.c:829
+#: src/serv_list.c:857
#, c-format
msgid "host '%s' doesn't answer."
msgstr "värden \"%s\" svarar inte."
-#: src/serv_list.c:900
+#: src/serv_list.c:928
#, c-format
msgid "Server '%s' for domain '%s' answered ping but failed to bind"
msgstr ""
"Servern \"%s\" för domänen \"%s\" svarade på ping men misslyckades att binda"
-#: src/serv_list.c:976
+#: src/serv_list.c:1004
#, 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:997
+#: src/serv_list.c:1025
#, c-format
msgid "domain '%s' not served by '%s'"
msgstr "domänen \"%s\" hanteras inte av \"%s\""
-#: src/serv_list.c:1101
+#: src/serv_list.c:1129
msgid "Pinging all active servers."
msgstr "Pingar alla aktiva servrar."
-#: src/serv_list.c:1103
+#: src/serv_list.c:1131
msgid "Checking for new fastest server."
msgstr "Letar efter den snabbaste servern."
-#: src/serv_list.c:1115
+#: src/serv_list.c:1143
#, c-format
msgid "Requested domain %s, found %s, ignored."
msgstr "Begärd domän %s, hittade %s, ignoreras."
-#: src/serv_list.c:1166
+#: src/serv_list.c:1194
#, c-format
msgid "Server for domain '%s' doesn't answer."
msgstr "Servern för domänen \"%s\" svarar inte."
-#: src/serv_list.c:1172 src/serv_list.c:1177
+#: src/serv_list.c:1200 src/serv_list.c:1205
#, c-format
msgid "Server '%s' for domain '%s' doesn't answer."
msgstr "Servern \"%s\" för domänen \"%s\" svarar inte."
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ypbind-mt-1.21/po/ypbind-mt.pot \
new/ypbind-mt-1.22/po/ypbind-mt.pot
--- old/ypbind-mt-1.21/po/ypbind-mt.pot 2008-04-15 13:22:45.000000000 +0200
+++ new/ypbind-mt-1.22/po/ypbind-mt.pot 2008-08-28 14:40:04.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: kukuk@linux-nis.org\n"
-"POT-Creation-Date: 2008-04-15 13:22+0200\n"
+"POT-Creation-Date: 2008-08-28 14:40+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,118 +16,118 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/serv_list.c:399
+#: src/serv_list.c:426
msgid "Not enough memory !"
msgstr ""
-#: src/serv_list.c:424
+#: src/serv_list.c:452
msgid "internal error: add_server called with NULL domain."
msgstr ""
-#: src/serv_list.c:439
+#: src/serv_list.c:467
#, c-format
msgid "add_server() domain: %s, broadcast"
msgstr ""
-#: src/serv_list.c:463
+#: src/serv_list.c:491
#, c-format
msgid "add_server() domain: %s, host: %s, NO SLOT FREE!"
msgstr ""
-#: src/serv_list.c:470
+#: src/serv_list.c:498
#, c-format
msgid "add_server() domain: %s, host: %s, slot: %d"
msgstr ""
-#: src/serv_list.c:500 src/serv_list.c:502
+#: src/serv_list.c:528 src/serv_list.c:530
msgid "Unknown host:"
msgstr ""
-#: src/serv_list.c:506 src/serv_list.c:508
+#: src/serv_list.c:534 src/serv_list.c:536
msgid "Host name lookup failure"
msgstr ""
-#: src/serv_list.c:513 src/serv_list.c:516
+#: src/serv_list.c:541 src/serv_list.c:544
msgid "No address associated with name:"
msgstr ""
-#: src/serv_list.c:520 src/serv_list.c:522
+#: src/serv_list.c:548 src/serv_list.c:550
msgid "Unknown server error"
msgstr ""
-#: src/serv_list.c:526 src/serv_list.c:528
+#: src/serv_list.c:554 src/serv_list.c:556
msgid "gethostbyname: Unknown error"
msgstr ""
-#: src/serv_list.c:600 src/serv_list.c:912
+#: src/serv_list.c:628 src/serv_list.c:940
#, c-format
msgid "Answer for domain '%s' from server '%s'"
msgstr ""
-#: src/serv_list.c:604
+#: src/serv_list.c:632
#, c-format
msgid "Answer for domain '%s' from unknown server '%s'"
msgstr ""
-#: src/serv_list.c:611 src/serv_list.c:816
+#: src/serv_list.c:639 src/serv_list.c:844
#, c-format
msgid "Answer for domain '%s' from '%s' on illegal port %d."
msgstr ""
-#: src/serv_list.c:656
+#: src/serv_list.c:684
#, c-format
msgid "do_broadcast() for domain '%s' is called"
msgstr ""
-#: src/serv_list.c:691
+#: src/serv_list.c:719
#, c-format
msgid "leave do_broadcast() for domain '%s'"
msgstr ""
-#: src/serv_list.c:804 src/serv_list.c:957
+#: src/serv_list.c:832 src/serv_list.c:985
#, c-format
msgid "ping host '%s', domain '%s'"
msgstr ""
-#: src/serv_list.c:829
+#: src/serv_list.c:857
#, c-format
msgid "host '%s' doesn't answer."
msgstr ""
-#: src/serv_list.c:900
+#: src/serv_list.c:928
#, c-format
msgid "Server '%s' for domain '%s' answered ping but failed to bind"
msgstr ""
-#: src/serv_list.c:976
+#: src/serv_list.c:1004
#, c-format
msgid "clnt_create for server '%s' (domain '%s') failed"
msgstr ""
-#: src/serv_list.c:997
+#: src/serv_list.c:1025
#, c-format
msgid "domain '%s' not served by '%s'"
msgstr ""
-#: src/serv_list.c:1101
+#: src/serv_list.c:1129
msgid "Pinging all active servers."
msgstr ""
-#: src/serv_list.c:1103
+#: src/serv_list.c:1131
msgid "Checking for new fastest server."
msgstr ""
-#: src/serv_list.c:1115
+#: src/serv_list.c:1143
#, c-format
msgid "Requested domain %s, found %s, ignored."
msgstr ""
-#: src/serv_list.c:1166
+#: src/serv_list.c:1194
#, c-format
msgid "Server for domain '%s' doesn't answer."
msgstr ""
-#: src/serv_list.c:1172 src/serv_list.c:1177
+#: src/serv_list.c:1200 src/serv_list.c:1205
#, c-format
msgid "Server '%s' for domain '%s' doesn't answer."
msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
old/ypbind-mt-1.21/src/Makefile.in new/ypbind-mt-1.22/src/Makefile.in
--- old/ypbind-mt-1.21/src/Makefile.in 2008-04-15 12:51:58.000000000 +0200
+++ new/ypbind-mt-1.22/src/Makefile.in 2008-08-28 14:33:48.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -65,7 +65,7 @@
ypbind_dbus_nm.$(OBJEXT)
ypbind_OBJECTS = $(am_ypbind_OBJECTS)
ypbind_LDADD = $(LDADD)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -221,9 +221,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits src/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnits src/Makefile
+ $(AUTOMAKE) --gnu src/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -264,22 +264,6 @@
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)
@@ -319,8 +303,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -332,8 +316,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -343,13 +327,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -456,7 +439,7 @@
install-ps: install-ps-am
-installcheck-am: installcheck-sbinPROGRAMS
+installcheck-am:
maintainer-clean: maintainer-clean-am
-rm -rf ./$(DEPDIR)
@@ -487,10 +470,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 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
+ 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
# 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.21/src/serv_list.c new/ypbind-mt-1.22/src/serv_list.c
--- old/ypbind-mt-1.21/src/serv_list.c 2008-04-15 13:23:25.000000000 +0200
+++ new/ypbind-mt-1.22/src/serv_list.c 2008-08-28 14:38:11.000000000 +0200
@@ -81,6 +81,7 @@
struct bound_server server[_MAXSERVER];
struct bound_server ypset;
CLIENT *client_handle;
+ struct bound_server last; /* last written */
};
static inline char *
bound_host(struct binding *bptr)
@@ -133,26 +134,44 @@
sprintf (path1, "%s/%s.1", BINDINGDIR, entry->domain);
sprintf (path2, "%s/%s.2", BINDINGDIR, entry->domain);
- iov[0].iov_base = (caddr_t) &sport;
- iov[0].iov_len = sizeof (sport);
- iov[1].iov_base = (caddr_t) &ybres;
- iov[1].iov_len = sizeof ybres;
-
memset(&ybres, 0, sizeof (ybres));
ybres.ypbind_status = YPBIND_SUCC_VAL;
if (entry->active >= 0)
{
+ if (entry->last.host &&
+ !memcmp(&entry->server[entry->active].addr, &entry->last.addr,
+ sizeof(struct in_addr)) &&
+ entry->server[entry->active].port == entry->last.port)
+ {
+ if (debug_flag)
+ log_msg (LOG_DEBUG, "Entry for %s unchanged, skipping writeout",
+ entry->domain);
+ return;
+ }
+
memcpy (&ybres.ypbind_resp_u.ypbind_bindinfo.ypbind_binding_addr,
&entry->server[entry->active].addr, sizeof (struct in_addr));
memcpy (&ybres.ypbind_resp_u.ypbind_bindinfo.ypbind_binding_port,
&entry->server[entry->active].port, sizeof (unsigned short int));
+ entry->last= entry->server[entry->active];
}
else if (entry->active == -2) /* ypset was used */
{
+ if (entry->last.host &&
+ !memcmp(&entry->ypset.addr, &entry->last.addr,
+ sizeof(struct in_addr)) &&
+ entry->ypset.port == entry->last.port)
+ {
+ if (debug_flag)
+ log_msg (LOG_DEBUG, "Entry for %s unchanged, skipping writeout",
+ entry->domain);
+ return;
+ }
memcpy (&ybres.ypbind_resp_u.ypbind_bindinfo.ypbind_binding_addr,
&entry->ypset.addr, sizeof (struct in_addr));
memcpy (&ybres.ypbind_resp_u.ypbind_bindinfo.ypbind_binding_port,
&entry->ypset.port, sizeof (unsigned short int));
+ entry->last= entry->ypset;
}
else
{
@@ -160,10 +179,16 @@
libc will query ypbind direct. */
unlink (path1);
unlink (path2);
+ entry->last.host = NULL;
log_msg (LOG_ERR, "INTERNAL ERROR: update_bindingfile called without valid \
data!"); return;
}
+ iov[0].iov_base = (caddr_t) &sport;
+ iov[0].iov_len = sizeof (sport);
+ iov[1].iov_base = (caddr_t) &ybres;
+ iov[1].iov_len = sizeof ybres;
+
len = iov[0].iov_len + iov[1].iov_len;
if ((fd = open(path1, O_CREAT | O_RDWR | O_TRUNC, FILE_MODE )) != -1)
@@ -171,6 +196,7 @@
if (writev (fd, iov, 2) != len )
{
log_msg (LOG_ERR, "writev (%s): %s", path1, strerror (errno));
+ entry->last.host = NULL;
unlink (path1);
}
close (fd);
@@ -183,6 +209,7 @@
if (writev (fd, iov, 2) != len )
{
log_msg (LOG_ERR, "writev (%s): %s", path2, strerror (errno));
+ entry->last.host = NULL;
unlink (path2);
}
close (fd);
@@ -403,6 +430,7 @@
domainlist[max_domains - 1].ypset.host = NULL;
domainlist[max_domains - 1].active = (-1);
domainlist[max_domains - 1].use_broadcast = FALSE;
+ domainlist[max_domains - 1].last.host = NULL;
memset (domainlist[max_domains - 1].server, 0,
(_MAXSERVER * sizeof (struct bound_server)));
*entry = &domainlist[max_domains - 1];
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic