Hello community,
here is the log from the commit of package ypbind for openSUSE:Factory checked
in at 2020-02-03 11:12:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ypbind (Old)
and /work/SRC/openSUSE:Factory/.ypbind.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ypbind"
Mon Feb 3 11:12:35 2020 rev:57 rq:769012 version:2.7.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/ypbind/ypbind.changes 2019-07-30
12:39:32.378932239 +0200
+++ /work/SRC/openSUSE:Factory/.ypbind.new.26092/ypbind.changes 2020-02-03
11:12:49.805830126 +0100
@@ -1,0 +2,18 @@
+Fri Jan 31 09:50:26 UTC 2020 - Thorsten Kukuk <ku...@suse.com>
+
+- Update to version 2.7.2
+ - change /run/yp.conf to /run/netconfig/yp.conf
+
+-------------------------------------------------------------------
+Thu Jan 30 08:25:34 UTC 2020 - Thorsten Kukuk <ku...@suse.com>
+
+- ypbind-systemd-pre: fix path of second yp.conf
+
+-------------------------------------------------------------------
+Wed Jan 29 12:18:32 UTC 2020 - Thorsten Kukuk <ku...@suse.com>
+
+- Update to version 2.7.1
+ - try /run/yp.conf if /etc/yp.conf does not exist
+ - strip down /etc/sysconfig/ypbind to a generic option list only
+
+-------------------------------------------------------------------
Old:
----
ypbind-mt-2.6.1.tar.xz
ypbind-systemd-exec
ypbind-systemd-post
New:
----
ypbind-mt-2.7.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ypbind.spec ++++++
--- /var/tmp/diff_new_pack.wLRf33/_old 2020-02-03 11:12:50.449830452 +0100
+++ /var/tmp/diff_new_pack.wLRf33/_new 2020-02-03 11:12:50.453830453 +0100
@@ -16,7 +16,7 @@
#
Name: ypbind
-Version: 2.6.1
+Version: 2.7.2
Release: 0
Summary: NIS client daemon
License: GPL-2.0-only
@@ -25,9 +25,7 @@
Source: %{name}-mt-%{version}.tar.xz
Source2: ypbind.service
Source3: ypbind-systemd-pre
-Source4: ypbind-systemd-post
-Source5: ypbind-systemd-exec
-Source6: ypbind.conf
+Source4: ypbind.conf
BuildRequires: pkgconfig
BuildRequires: pkgconfig(libnsl) >= 1.0.1
BuildRequires: pkgconfig(libsystemd)
@@ -66,12 +64,10 @@
install -D -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/ypbind.service
mkdir -p %{buildroot}%{_libexecdir}/ypbind
install -m 755 %{SOURCE3} %{buildroot}%{_libexecdir}/ypbind/ypbind-systemd-pre
-install -m 755 %{SOURCE4} %{buildroot}%{_libexecdir}/ypbind/ypbind-systemd-post
-install -m 755 %{SOURCE5} %{buildroot}%{_libexecdir}/ypbind/ypbind-systemd-exec
# create symlink for rcypbind
ln -s /sbin/service %{buildroot}%{_sbindir}/rcypbind
mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d
-install -m 644 %{SOURCE6} %{buildroot}%{_prefix}/lib/tmpfiles.d/
+install -m 644 %{SOURCE4} %{buildroot}%{_prefix}/lib/tmpfiles.d/
%pre
%service_add_pre ypbind.service
++++++ ypbind-mt-2.6.1.tar.xz -> ypbind-mt-2.7.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.6.1/NEWS new/ypbind-mt-2.7.2/NEWS
--- old/ypbind-mt-2.6.1/NEWS 2019-07-30 09:15:03.000000000 +0200
+++ new/ypbind-mt-2.7.2/NEWS 2020-01-31 09:42:49.000000000 +0100
@@ -1,11 +1,20 @@
ypbind-mt NEWS -- history of user-visible changes.
-Copyright (C) 1998-2019 Thorsten Kukuk
+Copyright (C) 1998-2020 Thorsten Kukuk
Please send bug reports, questions and suggestions to <ku...@thkukuk.de>.
+Version 2.7.2
+* Use /run/netconfig/yp.conf
+
+Version 2.7.1
+* Strip down /etc/sysconfig/ypbind
+
+Version 2.7.0
+* Try /run/yp.conf if /etc/yp.conf does not exist
+
Version 2.6.1
-* Check if libc already provides gettid().
+* Check if libc already provides gettid()
Version 2.6
* Fix crash of ypbind on reload
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.6.1/configure
new/ypbind-mt-2.7.2/configure
--- old/ypbind-mt-2.6.1/configure 2019-07-30 09:15:09.000000000 +0200
+++ new/ypbind-mt-2.7.2/configure 2020-01-31 09:43:02.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ypbind-mt 2.6.1.
+# Generated by GNU Autoconf 2.69 for ypbind-mt 2.7.2.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@
# Identity of this package.
PACKAGE_NAME='ypbind-mt'
PACKAGE_TARNAME='ypbind-mt'
-PACKAGE_VERSION='2.6.1'
-PACKAGE_STRING='ypbind-mt 2.6.1'
+PACKAGE_VERSION='2.7.2'
+PACKAGE_STRING='ypbind-mt 2.7.2'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1323,7 +1323,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ypbind-mt 2.6.1 to adapt to many kinds of systems.
+\`configure' configures ypbind-mt 2.7.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1393,7 +1393,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ypbind-mt 2.6.1:";;
+ short | recursive ) echo "Configuration of ypbind-mt 2.7.2:";;
esac
cat <<\_ACEOF
@@ -1511,7 +1511,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ypbind-mt configure 2.6.1
+ypbind-mt configure 2.7.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1876,7 +1876,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ypbind-mt $as_me 2.6.1, which was
+It was created by ypbind-mt $as_me 2.7.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2741,7 +2741,7 @@
# Define the identity of the package.
PACKAGE='ypbind-mt'
- VERSION='2.6.1'
+ VERSION='2.7.2'
cat >>confdefs.h <<_ACEOF
@@ -8011,7 +8011,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ypbind-mt $as_me 2.6.1, which was
+This file was extended by ypbind-mt $as_me 2.7.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8077,7 +8077,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ypbind-mt config.status 2.6.1
+ypbind-mt config.status 2.7.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.6.1/configure.ac
new/ypbind-mt-2.7.2/configure.ac
--- old/ypbind-mt-2.6.1/configure.ac 2019-07-30 09:14:37.000000000 +0200
+++ new/ypbind-mt-2.7.2/configure.ac 2020-01-31 09:42:30.000000000 +0100
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([ypbind-mt], [2.6.1])
+AC_INIT([ypbind-mt], [2.7.2])
AC_CONFIG_SRCDIR([src/ypbind-mt.c])
AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS(config.h)
@@ -62,7 +62,7 @@
AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test x$enable_man != xno)
dnl internationalization macros
-AM_GNU_GETTEXT_VERSION
+AM_GNU_GETTEXT_VERSION([0.19])
AM_GNU_GETTEXT([external])
AC_OUTPUT(Makefile lib/Makefile src/Makefile man/Makefile po/Makefile.in)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.6.1/etc/sysconfig.ypbind
new/ypbind-mt-2.7.2/etc/sysconfig.ypbind
--- old/ypbind-mt-2.6.1/etc/sysconfig.ypbind 2019-07-30 09:07:15.000000000
+0200
+++ new/ypbind-mt-2.7.2/etc/sysconfig.ypbind 2020-01-29 13:15:11.000000000
+0100
@@ -5,56 +5,6 @@
## ServiceRestart: ypbind
#
# Extra options for ypbind. Here you can add options like "-ypset",
-# "-ypsetme" or "-p port".
+# "-ypsetme" and "-broadcast".
#
YPBIND_OPTIONS=""
-
-## Type: yesno
-## Default: no
-## ServiceRestart: ypbind
-#
-# If this option is set, ypbind will only bind to the loopback
-# interface and remote hosts cannot query it. (yes|no)
-#
-YPBIND_LOCAL_ONLY="no"
-
-## Type: yesno
-## Default: no
-## ServiceRestart: ypbind
-#
-# If this option is set to "yes", ypbind will ignore /etc/yp.conf
-# and use a broadcast call to find a NIS server in the local subnet.
-# You should avoid to use this, it is a big security risk. (yes|no)
-#
-YPBIND_BROADCAST="no"
-
-## Type: yesno
-## Default: no
-## ServiceRestart: ypbind
-#
-# You should set this to "yes" if you have a NIS server in your network,
-# which binds only to high ports over 1024. Since this is a security risk,
-# you should consider to replace the NIS server with another
-# implementation. (yes|no)
-#
-YPBIND_BROKEN_SERVER="no"
-
-## Type: yesno
-## Default: no
-## ServiceRestart: ypbind
-#
-# Causes ypbind to syslog any and all changes in the server its
-# bound to. (yes|no)
-#
-YPBIND_VERBOSE="no"
-
-## Type: integer
-## Default: ""
-## ServiceRestart: ypbind
-#
-# The default value for ypbind to check, if a NIS server is still
-# reacheable, is 20 seconds. With this options another frequency in
-# seconds can be specified.
-#
-YPBIND_PING_INTERVAL=""
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.6.1/po/de.po new/ypbind-mt-2.7.2/po/de.po
--- old/ypbind-mt-2.6.1/po/de.po 2019-07-30 09:15:11.000000000 +0200
+++ new/ypbind-mt-2.7.2/po/de.po 2020-01-31 09:43:04.000000000 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: ypbind-mt\n"
"Report-Msgid-Bugs-To: ku...@linux-nis.org\n"
-"POT-Creation-Date: 2019-07-30 09:15+0200\n"
+"POT-Creation-Date: 2020-01-31 09:43+0100\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"
@@ -84,121 +84,121 @@
msgid "Ping active servers for all domains."
msgstr "Sende ein Ping zu allen aktiven Servern."
-#: src/ypbind-mt.c:138 src/ypbind-mt.c:141
+#: src/ypbind-mt.c:159 src/ypbind-mt.c:162
msgid "Trying entry:"
msgstr "Versuche Eintrag:"
-#: src/ypbind-mt.c:158
+#: src/ypbind-mt.c:179
#, c-format
msgid "parsed domain '%s' server '%s'"
msgstr "Parse domain '%s' server '%s'"
-#: src/ypbind-mt.c:174
+#: src/ypbind-mt.c:195
#, c-format
msgid "parsed domain '%s' broadcast"
msgstr "Parse domain '%s' broadcast"
-#: src/ypbind-mt.c:194
+#: src/ypbind-mt.c:215
#, c-format
msgid "parsed ypserver %s"
msgstr "Parse ypserver %s"
-#: src/ypbind-mt.c:211
+#: src/ypbind-mt.c:232
msgid "parsed broadcast"
msgstr "Parse broadcast"
-#: src/ypbind-mt.c:220
+#: src/ypbind-mt.c:241
#, c-format
msgid "Entry \"%s\" is not valid!\n"
msgstr "Der Eintrag \"%s\" ist syntaktisch falsch!\n"
-#: src/ypbind-mt.c:224
+#: src/ypbind-mt.c:245
#, c-format
msgid "Entry \"%s\" is not valid, ignore it!"
msgstr "Der Eintrag \"%s\" ist syntaktisch falsch, er wird ignoriert!"
-#: src/ypbind-mt.c:235
+#: src/ypbind-mt.c:256
#, c-format
msgid "Bad entries found.\n"
msgstr "Ung�ltige Eintr�ge gefunden.\n"
-#: src/ypbind-mt.c:240
+#: src/ypbind-mt.c:261
#, c-format
msgid "No entry found.\n"
msgstr "Keinen Eintrag gefunden.\n"
-#: src/ypbind-mt.c:248
+#: src/ypbind-mt.c:269
msgid "No entry found."
msgstr "Keinen Eintrag gefunden."
-#: src/ypbind-mt.c:262
+#: src/ypbind-mt.c:283
msgid "No NIS server and no -broadcast option specified.\n"
msgstr "Es wurde kein NIS server und keine -broadcast Option angegeben.\n"
-#: src/ypbind-mt.c:265
+#: src/ypbind-mt.c:286
#, c-format
msgid "Add a NIS server to the %s configuration file,\n"
msgstr "F�ge einen NIS server in die %s Configurations Datei hinzu,\n"
-#: src/ypbind-mt.c:267
+#: src/ypbind-mt.c:288
msgid "or start ypbind with the -broadcast option.\n"
msgstr "oder starte ypbind mit der -broadcast Option.\n"
-#: src/ypbind-mt.c:288
+#: src/ypbind-mt.c:309
#, c-format
msgid "cannot create pidfile %s"
msgstr "Kann Pidfile %s nicht erzeugen."
-#: src/ypbind-mt.c:318
+#: src/ypbind-mt.c:339
#, c-format
msgid "fcntl error: %s"
msgstr "fcntl Fehler: %s"
-#: src/ypbind-mt.c:330
+#: src/ypbind-mt.c:351
#, c-format
msgid "ypbind-mt already running (pid %d) - exiting"
msgstr "ypbind-mt l�uft bereits (pid %d) - beende mich"
-#: src/ypbind-mt.c:341
+#: src/ypbind-mt.c:362
msgid "cannot lock pidfile"
msgstr "Kann Pidfile nicht locken"
-#: src/ypbind-mt.c:394
+#: src/ypbind-mt.c:415
#, c-format
msgid "sigwait failed: ret=%d."
msgstr ""
-#: src/ypbind-mt.c:400
+#: src/ypbind-mt.c:421
msgid "SIGCHLD arrived, what should I do ?"
msgstr "SIGCHLD abgefangen, was soll ich machen ?"
-#: src/ypbind-mt.c:408
+#: src/ypbind-mt.c:429
#, c-format
msgid "Signal (%d) for quitting program arrived."
msgstr "Signal (%d) zum beenden des Programms bekommen."
-#: src/ypbind-mt.c:417
+#: src/ypbind-mt.c:438
msgid "cannot unlock pidfile"
msgstr "Kann Pidfile nicht unlocken."
-#: src/ypbind-mt.c:431
+#: src/ypbind-mt.c:452
msgid "SIGHUP arrived, reloading config file."
msgstr "SIGHUP abgefangen, Config Datei wird neu geladen."
-#: src/ypbind-mt.c:444
+#: src/ypbind-mt.c:465
msgid "Ignoring SIGPIPE."
msgstr ""
-#: src/ypbind-mt.c:447
+#: src/ypbind-mt.c:468
#, c-format
msgid "Unknown signal: %d"
msgstr "Unbekanntes Signal: %d"
-#: src/ypbind-mt.c:464
+#: src/ypbind-mt.c:485
msgid "Usage:\n"
msgstr "Aufruf:\n"
-#: src/ypbind-mt.c:465
+#: src/ypbind-mt.c:486
#, fuzzy
msgid ""
"\typbind [-broadcast | -ypset | -ypsetme] [-f configfile]\n"
@@ -208,101 +208,101 @@
" ypbind [-broadcast | -ypset | -ypsetme] [-p Port] [-f "
"configfile] [-no-ping] [-broken-server] [-local-only] [-debug]\n"
-#: src/ypbind-mt.c:466
+#: src/ypbind-mt.c:487
msgid "\typbind -c [-f configfile]\n"
msgstr ""
-#: src/ypbind-mt.c:467
+#: src/ypbind-mt.c:488
msgid "\typbind --version\n"
msgstr ""
-#: src/ypbind-mt.c:576
+#: src/ypbind-mt.c:597
#, fuzzy, c-format
msgid "Cannot create socket for %s,%s: %s"
msgstr "Kann TCP Socket nicht erzeugen: %s"
-#: src/ypbind-mt.c:618
+#: src/ypbind-mt.c:639
#, c-format
msgid "Unsupported address family %d"
msgstr ""
-#: src/ypbind-mt.c:625
+#: src/ypbind-mt.c:646
#, c-format
msgid "Cannot bind to reserved port %d and localhostonly (%s)"
msgstr ""
-#: src/ypbind-mt.c:628
+#: src/ypbind-mt.c:649
#, c-format
msgid "Cannot bind to reserved port %d (%s)"
msgstr ""
-#: src/ypbind-mt.c:631
+#: src/ypbind-mt.c:652
#, c-format
msgid "Cannot bind to localhost only (%s)"
msgstr ""
-#: src/ypbind-mt.c:634
+#: src/ypbind-mt.c:655
#, c-format
msgid "bindresvport failed: %s"
msgstr ""
-#: src/ypbind-mt.c:657
+#: src/ypbind-mt.c:678
#, fuzzy, c-format
msgid "unable to register (YPBINDPROG, 3) for %s, %s."
msgstr "Kann (YPBINDPROG, YPBINDVERS, upd) nicht beim portmapper registrieren."
-#: src/ypbind-mt.c:669
+#: src/ypbind-mt.c:690
#, fuzzy, c-format
msgid "unable to register (YPBINDPROG, 2) [%s]"
msgstr "Kann (YPBINDPROG, YPBINDVERS, upd) nicht beim portmapper registrieren."
-#: src/ypbind-mt.c:679
+#: src/ypbind-mt.c:700
#, fuzzy
msgid "unable to register (YPBINDPROG, 1)."
msgstr "Kann (YPBINDPROG, YPBINDVERS, upd) nicht beim portmapper registrieren."
-#: src/ypbind-mt.c:777
+#: src/ypbind-mt.c:798
msgid "ERROR: domainname not set.\n"
msgstr "Fehler: Domainname wurde nicht gesetzt.\n"
-#: src/ypbind-mt.c:781
+#: src/ypbind-mt.c:802
msgid "domainname not set - aborting.\n"
msgstr "Domainname wurde nicht gesetzt - Abbruch.\n"
-#: src/ypbind-mt.c:790
+#: src/ypbind-mt.c:811
#, c-format
msgid "Config file %s is not ok.\n"
msgstr "Konfigurationsdatei %s ist nicht in Ordnung.\n"
-#: src/ypbind-mt.c:795
+#: src/ypbind-mt.c:816
#, c-format
msgid "Config file %s is ok.\n"
msgstr "Konfigurationsdatei %s ist in Ordnung.\n"
-#: src/ypbind-mt.c:802
+#: src/ypbind-mt.c:823
msgid "ypbind must be run as root\n"
msgstr "ypbind mu� als root gestartet werden.\n"
-#: src/ypbind-mt.c:810 src/ypbind-mt.c:819
+#: src/ypbind-mt.c:831 src/ypbind-mt.c:840
#, c-format
msgid "Could not create %s: %s\n"
msgstr "Kann %s nicht erzeugen: %s\n"
-#: src/ypbind-mt.c:826
+#: src/ypbind-mt.c:847
#, 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:912
+#: src/ypbind-mt.c:933
msgid "Could not block signals."
msgstr "Kann die Signale nicht blocken."
-#: src/ypbind-mt.c:958
+#: src/ypbind-mt.c:979
#, c-format
msgid "sd_notifyf failed: %s"
msgstr ""
-#: src/ypbind-mt.c:963
+#: src/ypbind-mt.c:984
msgid "svc_run returned."
msgstr "svc_run hat sich beendet."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.6.1/po/sv.po new/ypbind-mt-2.7.2/po/sv.po
--- old/ypbind-mt-2.6.1/po/sv.po 2019-07-30 09:15:11.000000000 +0200
+++ new/ypbind-mt-2.7.2/po/sv.po 2020-01-31 09:43:04.000000000 +0100
@@ -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: 2019-07-30 09:15+0200\n"
+"POT-Creation-Date: 2020-01-31 09:43+0100\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"
@@ -84,121 +84,121 @@
msgid "Ping active servers for all domains."
msgstr "Pingar alla aktiva servrar."
-#: src/ypbind-mt.c:138 src/ypbind-mt.c:141
+#: src/ypbind-mt.c:159 src/ypbind-mt.c:162
msgid "Trying entry:"
msgstr "F�rs�ker med posten:"
-#: src/ypbind-mt.c:158
+#: src/ypbind-mt.c:179
#, c-format
msgid "parsed domain '%s' server '%s'"
msgstr "tolkade dom�nen \"%s\" server \"%s\""
-#: src/ypbind-mt.c:174
+#: src/ypbind-mt.c:195
#, c-format
msgid "parsed domain '%s' broadcast"
msgstr "tolkade dom�nen \"%s\" broadcast"
-#: src/ypbind-mt.c:194
+#: src/ypbind-mt.c:215
#, c-format
msgid "parsed ypserver %s"
msgstr "tolkade ypserver %s"
-#: src/ypbind-mt.c:211
+#: src/ypbind-mt.c:232
msgid "parsed broadcast"
msgstr "tolkade broadcast"
-#: src/ypbind-mt.c:220
+#: src/ypbind-mt.c:241
#, c-format
msgid "Entry \"%s\" is not valid!\n"
msgstr "Posten \"%s\" �r inte giltig!\n"
-#: src/ypbind-mt.c:224
+#: src/ypbind-mt.c:245
#, c-format
msgid "Entry \"%s\" is not valid, ignore it!"
msgstr "Posten \"%s\" �r inte giltig, ignorerar den!"
-#: src/ypbind-mt.c:235
+#: src/ypbind-mt.c:256
#, c-format
msgid "Bad entries found.\n"
msgstr "Felaktiga poster hittades.\n"
-#: src/ypbind-mt.c:240
+#: src/ypbind-mt.c:261
#, c-format
msgid "No entry found.\n"
msgstr "Ingen post hittades.\n"
-#: src/ypbind-mt.c:248
+#: src/ypbind-mt.c:269
msgid "No entry found."
msgstr "Ingen post hittades."
-#: src/ypbind-mt.c:262
+#: src/ypbind-mt.c:283
msgid "No NIS server and no -broadcast option specified.\n"
msgstr "Ingen NIS-server och flaggan -broadcast angavs inte.\n"
-#: src/ypbind-mt.c:265
+#: src/ypbind-mt.c:286
#, c-format
msgid "Add a NIS server to the %s configuration file,\n"
msgstr "L�gg till en NIS-server till konfigurationsfilen f�r %s,\n"
-#: src/ypbind-mt.c:267
+#: src/ypbind-mt.c:288
msgid "or start ypbind with the -broadcast option.\n"
msgstr "eller starta ypbind med flaggan -broadcast.\n"
-#: src/ypbind-mt.c:288
+#: src/ypbind-mt.c:309
#, c-format
msgid "cannot create pidfile %s"
msgstr "kan inte skapa pid-filen %s"
-#: src/ypbind-mt.c:318
+#: src/ypbind-mt.c:339
#, c-format
msgid "fcntl error: %s"
msgstr "fcntl-fel: %s"
-#: src/ypbind-mt.c:330
+#: src/ypbind-mt.c:351
#, c-format
msgid "ypbind-mt already running (pid %d) - exiting"
msgstr "ypbind-mt k�r redan (pid %d) - avslutar"
-#: src/ypbind-mt.c:341
+#: src/ypbind-mt.c:362
msgid "cannot lock pidfile"
msgstr "kan inte l�sa pid-fil"
-#: src/ypbind-mt.c:394
+#: src/ypbind-mt.c:415
#, c-format
msgid "sigwait failed: ret=%d."
msgstr "sigwait misslyckades: ret=%d."
-#: src/ypbind-mt.c:400
+#: src/ypbind-mt.c:421
msgid "SIGCHLD arrived, what should I do ?"
msgstr "SIGCHLD togs emot, vad ska jag g�ra?"
-#: src/ypbind-mt.c:408
+#: src/ypbind-mt.c:429
#, c-format
msgid "Signal (%d) for quitting program arrived."
msgstr "Signalen (%d) f�r programavslut togs emot."
-#: src/ypbind-mt.c:417
+#: src/ypbind-mt.c:438
msgid "cannot unlock pidfile"
msgstr "kan inte l�sa upp pid-fil"
-#: src/ypbind-mt.c:431
+#: src/ypbind-mt.c:452
msgid "SIGHUP arrived, reloading config file."
msgstr "SIGHUP togs emot, l�ser om konfigurationsfilen."
-#: src/ypbind-mt.c:444
+#: src/ypbind-mt.c:465
msgid "Ignoring SIGPIPE."
msgstr "Ignorerar SIGPIPE."
-#: src/ypbind-mt.c:447
+#: src/ypbind-mt.c:468
#, c-format
msgid "Unknown signal: %d"
msgstr "Ok�nd signal: %d"
-#: src/ypbind-mt.c:464
+#: src/ypbind-mt.c:485
msgid "Usage:\n"
msgstr "Anv�ndning:\n"
-#: src/ypbind-mt.c:465
+#: src/ypbind-mt.c:486
#, fuzzy
msgid ""
"\typbind [-broadcast | -ypset | -ypsetme] [-f configfile]\n"
@@ -208,101 +208,101 @@
"\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:466
+#: src/ypbind-mt.c:487
msgid "\typbind -c [-f configfile]\n"
msgstr "\typbind -c [-f konfigurationsfil]\n"
-#: src/ypbind-mt.c:467
+#: src/ypbind-mt.c:488
msgid "\typbind --version\n"
msgstr "\typbind --version\n"
-#: src/ypbind-mt.c:576
+#: src/ypbind-mt.c:597
#, fuzzy, c-format
msgid "Cannot create socket for %s,%s: %s"
msgstr "Kan inte skapa TCP: %s"
-#: src/ypbind-mt.c:618
+#: src/ypbind-mt.c:639
#, c-format
msgid "Unsupported address family %d"
msgstr ""
-#: src/ypbind-mt.c:625
+#: src/ypbind-mt.c:646
#, c-format
msgid "Cannot bind to reserved port %d and localhostonly (%s)"
msgstr ""
-#: src/ypbind-mt.c:628
+#: src/ypbind-mt.c:649
#, c-format
msgid "Cannot bind to reserved port %d (%s)"
msgstr ""
-#: src/ypbind-mt.c:631
+#: src/ypbind-mt.c:652
#, c-format
msgid "Cannot bind to localhost only (%s)"
msgstr ""
-#: src/ypbind-mt.c:634
+#: src/ypbind-mt.c:655
#, c-format
msgid "bindresvport failed: %s"
msgstr ""
-#: src/ypbind-mt.c:657
+#: src/ypbind-mt.c:678
#, fuzzy, c-format
msgid "unable to register (YPBINDPROG, 3) for %s, %s."
msgstr "Kan inte registrera (YPBINDPROG, YPBINDVERS, udp)."
-#: src/ypbind-mt.c:669
+#: src/ypbind-mt.c:690
#, fuzzy, c-format
msgid "unable to register (YPBINDPROG, 2) [%s]"
msgstr "Kan inte registrera (YPBINDPROG, YPBINDVERS, udp)."
-#: src/ypbind-mt.c:679
+#: src/ypbind-mt.c:700
#, fuzzy
msgid "unable to register (YPBINDPROG, 1)."
msgstr "Kan inte registrera (YPBINDPROG, YPBINDVERS, udp)."
-#: src/ypbind-mt.c:777
+#: src/ypbind-mt.c:798
msgid "ERROR: domainname not set.\n"
msgstr "FEL: domainname inte inst�llt.\n"
-#: src/ypbind-mt.c:781
+#: src/ypbind-mt.c:802
msgid "domainname not set - aborting.\n"
msgstr "domainname inte inst�llt - avbryter.\n"
-#: src/ypbind-mt.c:790
+#: src/ypbind-mt.c:811
#, c-format
msgid "Config file %s is not ok.\n"
msgstr "Konfigurationsfilen %s �r inte ok.\n"
-#: src/ypbind-mt.c:795
+#: src/ypbind-mt.c:816
#, c-format
msgid "Config file %s is ok.\n"
msgstr "Konfigurationsfilen %s �r ok.\n"
-#: src/ypbind-mt.c:802
+#: src/ypbind-mt.c:823
msgid "ypbind must be run as root\n"
msgstr "ypbind m�ste k�ras som root\n"
-#: src/ypbind-mt.c:810 src/ypbind-mt.c:819
+#: src/ypbind-mt.c:831 src/ypbind-mt.c:840
#, c-format
msgid "Could not create %s: %s\n"
msgstr "Kunde inte skapa %s: %s\n"
-#: src/ypbind-mt.c:826
+#: src/ypbind-mt.c:847
#, c-format
msgid "Could not change to directory %s: %s\n"
msgstr "Kunde inte �ndra till katalogen %s: %s\n"
-#: src/ypbind-mt.c:912
+#: src/ypbind-mt.c:933
msgid "Could not block signals."
msgstr "Kunde inte blockera signaler."
-#: src/ypbind-mt.c:958
+#: src/ypbind-mt.c:979
#, c-format
msgid "sd_notifyf failed: %s"
msgstr ""
-#: src/ypbind-mt.c:963
+#: src/ypbind-mt.c:984
msgid "svc_run returned."
msgstr "svc_run �terv�nde."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.6.1/po/ypbind-mt.pot
new/ypbind-mt-2.7.2/po/ypbind-mt.pot
--- old/ypbind-mt-2.6.1/po/ypbind-mt.pot 2019-07-30 09:15:11.000000000
+0200
+++ new/ypbind-mt-2.7.2/po/ypbind-mt.pot 2020-01-31 09:43:04.000000000
+0100
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: ypbind-mt 2.6.1\n"
+"Project-Id-Version: ypbind-mt 2.7.2\n"
"Report-Msgid-Bugs-To: ku...@linux-nis.org\n"
-"POT-Creation-Date: 2019-07-30 09:15+0200\n"
+"POT-Creation-Date: 2020-01-31 09:43+0100\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"
@@ -84,221 +84,221 @@
msgid "Ping active servers for all domains."
msgstr ""
-#: src/ypbind-mt.c:138 src/ypbind-mt.c:141
+#: src/ypbind-mt.c:159 src/ypbind-mt.c:162
msgid "Trying entry:"
msgstr ""
-#: src/ypbind-mt.c:158
+#: src/ypbind-mt.c:179
#, c-format
msgid "parsed domain '%s' server '%s'"
msgstr ""
-#: src/ypbind-mt.c:174
+#: src/ypbind-mt.c:195
#, c-format
msgid "parsed domain '%s' broadcast"
msgstr ""
-#: src/ypbind-mt.c:194
+#: src/ypbind-mt.c:215
#, c-format
msgid "parsed ypserver %s"
msgstr ""
-#: src/ypbind-mt.c:211
+#: src/ypbind-mt.c:232
msgid "parsed broadcast"
msgstr ""
-#: src/ypbind-mt.c:220
+#: src/ypbind-mt.c:241
#, c-format
msgid "Entry \"%s\" is not valid!\n"
msgstr ""
-#: src/ypbind-mt.c:224
+#: src/ypbind-mt.c:245
#, c-format
msgid "Entry \"%s\" is not valid, ignore it!"
msgstr ""
-#: src/ypbind-mt.c:235
+#: src/ypbind-mt.c:256
#, c-format
msgid "Bad entries found.\n"
msgstr ""
-#: src/ypbind-mt.c:240
+#: src/ypbind-mt.c:261
#, c-format
msgid "No entry found.\n"
msgstr ""
-#: src/ypbind-mt.c:248
+#: src/ypbind-mt.c:269
msgid "No entry found."
msgstr ""
-#: src/ypbind-mt.c:262
+#: src/ypbind-mt.c:283
msgid "No NIS server and no -broadcast option specified.\n"
msgstr ""
-#: src/ypbind-mt.c:265
+#: src/ypbind-mt.c:286
#, c-format
msgid "Add a NIS server to the %s configuration file,\n"
msgstr ""
-#: src/ypbind-mt.c:267
+#: src/ypbind-mt.c:288
msgid "or start ypbind with the -broadcast option.\n"
msgstr ""
-#: src/ypbind-mt.c:288
+#: src/ypbind-mt.c:309
#, c-format
msgid "cannot create pidfile %s"
msgstr ""
-#: src/ypbind-mt.c:318
+#: src/ypbind-mt.c:339
#, c-format
msgid "fcntl error: %s"
msgstr ""
-#: src/ypbind-mt.c:330
+#: src/ypbind-mt.c:351
#, c-format
msgid "ypbind-mt already running (pid %d) - exiting"
msgstr ""
-#: src/ypbind-mt.c:341
+#: src/ypbind-mt.c:362
msgid "cannot lock pidfile"
msgstr ""
-#: src/ypbind-mt.c:394
+#: src/ypbind-mt.c:415
#, c-format
msgid "sigwait failed: ret=%d."
msgstr ""
-#: src/ypbind-mt.c:400
+#: src/ypbind-mt.c:421
msgid "SIGCHLD arrived, what should I do ?"
msgstr ""
-#: src/ypbind-mt.c:408
+#: src/ypbind-mt.c:429
#, c-format
msgid "Signal (%d) for quitting program arrived."
msgstr ""
-#: src/ypbind-mt.c:417
+#: src/ypbind-mt.c:438
msgid "cannot unlock pidfile"
msgstr ""
-#: src/ypbind-mt.c:431
+#: src/ypbind-mt.c:452
msgid "SIGHUP arrived, reloading config file."
msgstr ""
-#: src/ypbind-mt.c:444
+#: src/ypbind-mt.c:465
msgid "Ignoring SIGPIPE."
msgstr ""
-#: src/ypbind-mt.c:447
+#: src/ypbind-mt.c:468
#, c-format
msgid "Unknown signal: %d"
msgstr ""
-#: src/ypbind-mt.c:464
+#: src/ypbind-mt.c:485
msgid "Usage:\n"
msgstr ""
-#: src/ypbind-mt.c:465
+#: src/ypbind-mt.c:486
msgid ""
"\typbind [-broadcast | -ypset | -ypsetme] [-f configfile]\n"
"\t [-no-ping] [-broken-server] [-local-only] [-i ping-interval]\n"
"\t [-debug] [-verbose] [-n | -foreground]\n"
msgstr ""
-#: src/ypbind-mt.c:466
+#: src/ypbind-mt.c:487
msgid "\typbind -c [-f configfile]\n"
msgstr ""
-#: src/ypbind-mt.c:467
+#: src/ypbind-mt.c:488
msgid "\typbind --version\n"
msgstr ""
-#: src/ypbind-mt.c:576
+#: src/ypbind-mt.c:597
#, c-format
msgid "Cannot create socket for %s,%s: %s"
msgstr ""
-#: src/ypbind-mt.c:618
+#: src/ypbind-mt.c:639
#, c-format
msgid "Unsupported address family %d"
msgstr ""
-#: src/ypbind-mt.c:625
+#: src/ypbind-mt.c:646
#, c-format
msgid "Cannot bind to reserved port %d and localhostonly (%s)"
msgstr ""
-#: src/ypbind-mt.c:628
+#: src/ypbind-mt.c:649
#, c-format
msgid "Cannot bind to reserved port %d (%s)"
msgstr ""
-#: src/ypbind-mt.c:631
+#: src/ypbind-mt.c:652
#, c-format
msgid "Cannot bind to localhost only (%s)"
msgstr ""
-#: src/ypbind-mt.c:634
+#: src/ypbind-mt.c:655
#, c-format
msgid "bindresvport failed: %s"
msgstr ""
-#: src/ypbind-mt.c:657
+#: src/ypbind-mt.c:678
#, c-format
msgid "unable to register (YPBINDPROG, 3) for %s, %s."
msgstr ""
-#: src/ypbind-mt.c:669
+#: src/ypbind-mt.c:690
#, c-format
msgid "unable to register (YPBINDPROG, 2) [%s]"
msgstr ""
-#: src/ypbind-mt.c:679
+#: src/ypbind-mt.c:700
msgid "unable to register (YPBINDPROG, 1)."
msgstr ""
-#: src/ypbind-mt.c:777
+#: src/ypbind-mt.c:798
msgid "ERROR: domainname not set.\n"
msgstr ""
-#: src/ypbind-mt.c:781
+#: src/ypbind-mt.c:802
msgid "domainname not set - aborting.\n"
msgstr ""
-#: src/ypbind-mt.c:790
+#: src/ypbind-mt.c:811
#, c-format
msgid "Config file %s is not ok.\n"
msgstr ""
-#: src/ypbind-mt.c:795
+#: src/ypbind-mt.c:816
#, c-format
msgid "Config file %s is ok.\n"
msgstr ""
-#: src/ypbind-mt.c:802
+#: src/ypbind-mt.c:823
msgid "ypbind must be run as root\n"
msgstr ""
-#: src/ypbind-mt.c:810 src/ypbind-mt.c:819
+#: src/ypbind-mt.c:831 src/ypbind-mt.c:840
#, c-format
msgid "Could not create %s: %s\n"
msgstr ""
-#: src/ypbind-mt.c:826
+#: src/ypbind-mt.c:847
#, c-format
msgid "Could not change to directory %s: %s\n"
msgstr ""
-#: src/ypbind-mt.c:912
+#: src/ypbind-mt.c:933
msgid "Could not block signals."
msgstr ""
-#: src/ypbind-mt.c:958
+#: src/ypbind-mt.c:979
#, c-format
msgid "sd_notifyf failed: %s"
msgstr ""
-#: src/ypbind-mt.c:963
+#: src/ypbind-mt.c:984
msgid "svc_run returned."
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.6.1/src/ypbind-mt.c
new/ypbind-mt-2.7.2/src/ypbind-mt.c
--- old/ypbind-mt-2.6.1/src/ypbind-mt.c 2019-07-30 09:07:15.000000000 +0200
+++ new/ypbind-mt-2.7.2/src/ypbind-mt.c 2020-01-31 09:42:08.000000000 +0100
@@ -60,7 +60,10 @@
#define _YPBIND_PIDFILE _PATH_VARRUN"ypbind.pid"
#endif
-const char *configfile = "/etc/yp.conf";
+#define DEFAULT_CONFIG_FILE "/etc/yp.conf"
+#define DEFAULT_RUNTIME_CONFIG "/run/netconfig/yp.conf"
+
+const char *configfile;
int ypset = SET_NO;
int use_broadcast = 0;
int broken_server = 0;
@@ -105,9 +108,27 @@
int have_entries = 0; /* # of entries we found in config file */
int bad_entries = 0;
- fp = fopen (configfile, "r");
- if (NULL == fp)
- return 1;
+ if (configfile)
+ {
+ fp = fopen (configfile, "r");
+ if (NULL == fp)
+ return 1;
+ }
+ else
+ {
+ configfile = DEFAULT_CONFIG_FILE;
+ fp = fopen (configfile, "r");
+ if (NULL == fp)
+ {
+ configfile = DEFAULT_RUNTIME_CONFIG;
+ fp = fopen (DEFAULT_RUNTIME_CONFIG, "r");
+ if (NULL == fp)
+ {
+ configfile = DEFAULT_CONFIG_FILE;
+ return 1;
+ }
+ }
+ }
if (debug_flag)
log_msg (LOG_DEBUG, "parsing config file");
@@ -263,7 +284,7 @@
stderr);
fprintf (stderr,
_("Add a NIS server to the %s configuration file,\n"),
- configfile);
+ DEFAULT_CONFIG_FILE);
fputs (_("or start ypbind with the -broadcast option.\n"),
stderr);
exit (1);
++++++ ypbind-systemd-pre ++++++
--- /var/tmp/diff_new_pack.wLRf33/_old 2020-02-03 11:12:50.537830497 +0100
+++ /var/tmp/diff_new_pack.wLRf33/_new 2020-02-03 11:12:50.541830498 +0100
@@ -21,12 +21,12 @@
fi
fi
-## If we don't have a /etc/yp.conf file, skip starting of
+## If we don't have a yp.conf file, skip starting of
## ypbind and return with "program not configured"
## if you add the -broadcast Option later, comment this out.
-if [ ! -f /etc/yp.conf -a "$YPBIND_BROADCAST" != "yes" ] ; then
+if [ ! -f /etc/yp.conf -a ! -f /run/netconfig/yp.conf -a "$YPBIND_BROADCAST"
!= "yes" ] ; then
# Tell the user this has skipped
- echo -n " . . . . . . . . . . ${attn}/etc/yp.conf not found${norm}"
+ echo -n " . . . . . . . . . . ${attn}yp.conf not found${norm}"
exit 1
fi
++++++ ypbind.service ++++++
--- /var/tmp/diff_new_pack.wLRf33/_old 2020-02-03 11:12:50.561830508 +0100
+++ /var/tmp/diff_new_pack.wLRf33/_new 2020-02-03 11:12:50.561830508 +0100
@@ -11,8 +11,7 @@
NotifyAccess=all
EnvironmentFile=-/etc/sysconfig/ypbind
ExecStartPre=/usr/lib/ypbind/ypbind-systemd-pre
-ExecStartPost=/usr/lib/ypbind/ypbind-systemd-post
-ExecStart=/usr/lib/ypbind/ypbind-systemd-exec
+ExecStart=/usr/sbin/ypbind -n $YPBIND_OPTIONS
ExecStopPost=/bin/sh -c "/bin/rm -f /var/yp/binding/* /var/run/ypbind.pid"
ExecReload=/bin/kill -HUP $MAINPID
