Hello community, here is the log from the commit of package ypbind for openSUSE:Factory checked in at 2020-08-29 20:44:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ypbind (Old) and /work/SRC/openSUSE:Factory/.ypbind.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ypbind" Sat Aug 29 20:44:57 2020 rev:58 rq:830462 version:2.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ypbind/ypbind.changes 2020-02-03 11:12:49.805830126 +0100 +++ /work/SRC/openSUSE:Factory/.ypbind.new.3399/ypbind.changes 2020-08-29 20:45:05.129533689 +0200 @@ -1,0 +2,11 @@ +Sat Aug 29 10:07:34 UTC 2020 - Thorsten Kukuk <[email protected]> + +- Use /usr/etc/default and /etc/default instead of sysconfig +- Cleanup ypbind-systemd-pre + +------------------------------------------------------------------- +Sat Aug 29 07:06:40 UTC 2020 - Thorsten Kukuk <[email protected]> + +- Use /usr/libexec in ypbind.service + +------------------------------------------------------------------- New: ---- ypbind.default ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ypbind.spec ++++++ --- /var/tmp/diff_new_pack.EYH8lI/_old 2020-08-29 20:45:06.033534067 +0200 +++ /var/tmp/diff_new_pack.EYH8lI/_new 2020-08-29 20:45:06.037534068 +0200 @@ -1,7 +1,7 @@ # # spec file for package ypbind # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018, 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,7 @@ Source2: ypbind.service Source3: ypbind-systemd-pre Source4: ypbind.conf +Source5: ypbind.default BuildRequires: pkgconfig BuildRequires: pkgconfig(libnsl) >= 1.0.1 BuildRequires: pkgconfig(libsystemd) @@ -33,7 +34,7 @@ Requires: libnss_nis2 Requires: rpcbind Requires: yp-tools -Requires(post): %fillup_prereq +Requires(post): /usr/bin/grep %description This package provides the ypbind daemon. The ypbind daemon binds NIS @@ -51,10 +52,9 @@ make %{?_smp_mflags} %install -mkdir -p %{buildroot}%{_fillupdir} %make_install -# Install rc.config add-on -install -m 644 etc/sysconfig.ypbind %{buildroot}%{_fillupdir} +# Install default/ypbind +install -D -m 644 %{SOURCE5} %{buildroot}%{_prefix}/etc/default/ypbind # Create dummy yp.conf mkdir -p %{buildroot}%{_sysconfdir} touch %{buildroot}%{_sysconfdir}/yp.conf @@ -73,9 +73,13 @@ %service_add_pre ypbind.service %post -%{fillup_only -n ypbind} %service_add_post ypbind.service %tmpfiles_create ypbind.conf +if [ -f /etc/sysconfig/ypbind ]; then + # migrate variables from sysconfig to default + grep ^YPBIND_OPTIONS= /etc/sysconfig/ypbind > /etc/default/ypbind + mv /etc/sysconfig/ypbind /etc/sysconfig/ypbind.rpmsave +fi %preun %service_del_preun ypbind.service @@ -90,7 +94,7 @@ %license COPYING %doc NEWS README %ghost %config(noreplace) %{_sysconfdir}/yp.conf -%{_fillupdir}/sysconfig.ypbind +%{_prefix}/etc/default/ %{_mandir}/man5/yp.conf.5%{ext_man} %{_mandir}/man8/ypbind.8%{ext_man} %{_sbindir}/ypbind ++++++ ypbind-systemd-pre ++++++ --- /var/tmp/diff_new_pack.EYH8lI/_old 2020-08-29 20:45:06.077534085 +0200 +++ /var/tmp/diff_new_pack.EYH8lI/_new 2020-08-29 20:45:06.077534085 +0200 @@ -1,32 +1,27 @@ #!/bin/sh # -# ypbind-domain +# Setup proper domainname before starting ypbind daemon # -# description: This is part of former ypbind init script, which is used -# to setup proper domainname before starting ypbind daemon -# itself. -mydomain=`domainname` -if [ "$mydomain" = "(none)" -o "x$mydomain" = "x" ]; then +mydomain=$(domainname) +if [ "$mydomain" = "(none)" ] || [ "x$mydomain" = "x" ]; then test -f /etc/defaultdomain && { read DOMAINNAME < /etc/defaultdomain } if [ "x$DOMAINNAME" != 'x' ]; then - echo "$DOMAINNAME\n" - domainname $DOMAINNAME + domainname "$DOMAINNAME" else - echo "\nError: NIS domain not specified.\n" + echo "ERROR: NIS domain not specified." >&2 exit 1 fi fi ## 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 ! -f /run/netconfig/yp.conf -a "$YPBIND_BROADCAST" != "yes" ] ; then +if [ ! -f /etc/yp.conf ] && [ ! -f /run/netconfig/yp.conf ] ; then # Tell the user this has skipped - echo -n " . . . . . . . . . . ${attn}yp.conf not found${norm}" + echo " ERROR: yp.conf not found" >&2 exit 1 fi ++++++ ypbind.default ++++++ # To overwrite variables, create a file /etc/default/ypbind with the # variables which should be changed. # Extra options for ypbind. YPBIND_OPTIONS="" ++++++ ypbind.service ++++++ --- /var/tmp/diff_new_pack.EYH8lI/_old 2020-08-29 20:45:06.169534124 +0200 +++ /var/tmp/diff_new_pack.EYH8lI/_new 2020-08-29 20:45:06.169534124 +0200 @@ -9,8 +9,9 @@ [Service] Type=notify NotifyAccess=all -EnvironmentFile=-/etc/sysconfig/ypbind -ExecStartPre=/usr/lib/ypbind/ypbind-systemd-pre +EnvironmentFile=-/usr/etc/default/ypbind +EnvironmentFile=-/etc/default/ypbind +ExecStartPre=/usr/libexec/ypbind/ypbind-systemd-pre 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
