Hello community, here is the log from the commit of package ypserv for openSUSE:Factory checked in at 2020-08-29 20:44:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ypserv (Old) and /work/SRC/openSUSE:Factory/.ypserv.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ypserv" Sat Aug 29 20:44:59 2020 rev:44 rq:830476 version:4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ypserv/ypserv.changes 2019-03-13 09:14:39.811390243 +0100 +++ /work/SRC/openSUSE:Factory/.ypserv.new.3399/ypserv.changes 2020-08-29 20:45:06.905534431 +0200 @@ -1,0 +2,12 @@ +Sat Aug 29 11:02:35 UTC 2020 - Thorsten Kukuk <[email protected]> + +- Do /usr/etc split + +------------------------------------------------------------------- +Sat Aug 29 06:58:32 UTC 2020 - Thorsten Kukuk <[email protected]> + +- Move non-executeable files to /usr/share/yp +- Adjust tmpfiles.d to use /usr/share/yp +- Adjust yppasswdd.service to use /usr/libexec/yp + +------------------------------------------------------------------- Old: ---- sysconfig.ypserv yppasswdd.init ypserv.init ypxfrd.init New: ---- default.yppasswdd default.ypserv default.ypxfrd ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ypserv.spec ++++++ --- /var/tmp/diff_new_pack.gl2iRW/_old 2020-08-29 20:45:08.181534964 +0200 +++ /var/tmp/diff_new_pack.gl2iRW/_new 2020-08-29 20:45:08.193534968 +0200 @@ -1,7 +1,7 @@ # # spec file for package ypserv # -# 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 @@ -15,22 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -%if ! %{defined _fillupdir} - %define _fillupdir %{_localstatedir}/adm/fillup-templates -%endif Name: ypserv Version: 4.1 Release: 0 Summary: YP - (NIS)-Server License: GPL-2.0-only -Group: Productivity/Networking/NIS URL: https://github.com/thkukuk/ypserv Source: ypserv-%{version}.tar.xz -Source1: ypserv.init -Source2: yppasswdd.init -Source3: ypxfrd.init -Source4: sysconfig.ypserv +Source1: default.yppasswdd +Source2: default.ypserv +Source3: default.ypxfrd Source6: ypserv.service Source7: yppasswdd.service Source8: ypxfrd.service @@ -43,11 +37,10 @@ BuildRequires: pkgconfig(libnsl) BuildRequires: pkgconfig(libsystemd) >= 209 BuildRequires: pkgconfig(libtirpc) -Requires: gawk +Requires: /usr/bin/gawk Requires: make Requires: rpcbind -Requires(post): %fillup_prereq -%{?systemd_requires} +Requires(post): /usr/bin/grep %description The Network Information Service (NIS) provides a simple network @@ -76,19 +69,21 @@ %install %make_install -mkdir -p %{buildroot}%{_fillupdir} +mkdir -p %{buildroot}%{_sysconfdir} mkdir -p %{buildroot}%{_libexecdir}/yp +mkdir -p %{buildroot}%{_datadir}/yp mkdir -p %{buildroot}%{_unitdir} -mkdir -p %{buildroot}%{_initddir} DOCDIR=%{_defaultdocdir}/yp install -d -m 755 $RPM_BUILD_ROOT${DOCDIR} install -d -m 755 $RPM_BUILD_ROOT${DOCDIR}/ypserv #install contrib/ypslave $RPM_BUILD_ROOT/usr/sbin -install -m 644 etc/ypserv.conf %{buildroot}%{_sysconfdir}/ -install -m 644 etc/securenets %{buildroot}%{_libexecdir}/yp/securenets.example -mv %{buildroot}%{_localstatedir}/yp/Makefile %{buildroot}%{_libexecdir}/yp/ypMakefile -# install sysconfig.ypserv -install -m 644 %{SOURCE4} %{buildroot}%{_fillupdir} +install -m 644 etc/ypserv.conf %{buildroot}%{_datadir}/yp/ +install -m 644 etc/securenets %{buildroot}%{_datadir}/yp/securenets.example +mv %{buildroot}%{_localstatedir}/yp/Makefile %{buildroot}%{_datadir}/yp/ypMakefile +# install default files +install -D -m 644 %{SOURCE1} %{buildroot}%{_prefix}/etc/default/yppasswdd +install -D -m 644 %{SOURCE2} %{buildroot}%{_prefix}/etc/default/ypserv +install -D -m 644 %{SOURCE3} %{buildroot}%{_prefix}/etc/default/ypxfrd # install ypserv.conf in tmpfiles.d mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d install -m 644 %{SOURCE10} %{buildroot}%{_prefix}/lib/tmpfiles.d/ypserv.conf @@ -111,10 +106,18 @@ %service_add_pre ypxfrd.service %post -%{fillup_only -n ypserv} %service_add_post ypserv.service %service_add_post yppasswdd.service %service_add_post ypxfrd.service +if [ -f /etc/sysconfig/ypserv ]; then + grep ^YPSERV_ARGS= /etc/sysconfig/ypserv > /etc/default/ypserv + grep ^YPXFRD_ARGS= /etc/sysconfig/ypserv > /etc/default/ypxfrd + grep ^YPPASSWDD_ARGS= /etc/sysconfig/ypserv >> /etc/default/yppasswdd + grep ^YPPWD_SRCDIR= /etc/sysconfig/ypserv >> /etc/default/yppasswdd + grep ^YPPWD_CHFN= /etc/sysconfig/ypserv >> /etc/default/yppasswdd + grep ^YPPWD_CHSH= /etc/sysconfig/ypserv >> /etc/default/yppasswdd + mv /etc/sysconfig/ypserv /etc/sysconfig/ypserv.rpmsave +fi %preun %service_del_preun ypserv.service @@ -140,12 +143,15 @@ %files %license COPYING %doc NEWS README -%{_fillupdir}/sysconfig.ypserv -%config(noreplace) %{_sysconfdir}/ypserv.conf +%{_prefix}/etc/default/yppasswdd +%{_prefix}/etc/default/ypserv +%{_prefix}/etc/default/ypxfrd %dir %{_libexecdir}/yp %{_libexecdir}/yp/yppasswdd-systemd-exec -%{_libexecdir}/yp/securenets.example -%{_libexecdir}/yp/ypMakefile +%dir %{_datadir}/yp +%{_datadir}/yp/securenets.example +%{_datadir}/yp/ypMakefile +%{_datadir}/yp/ypserv.conf %{_prefix}/lib/tmpfiles.d/ypserv.conf %{_unitdir}/ypserv.service %{_unitdir}/yppasswdd.service ++++++ default.yppasswdd ++++++ # To overwrite variables, create a file /etc/default/yppasswdd with # the variables which should be changed. # YP Source directory for passwd, shadow and group. You could # give here an different directory as /etc where yppasswdd will # search the source files for the passwd and group tables. YPPWD_SRCDIR=/etc # Should the user be allowed to change his GECOS field # with ypchfn? [yes|no] YPPWD_CHFN="no" # Should the user be allowed to change his default login shell # with ypchsh? [yes|no] YPPWD_CHSH="no" # Additonal arguments for rpc.yppasswdd. See manual page # for possible options. YPPASSWDD_ARGS="" ++++++ default.ypserv ++++++ # To overwrite variables, create a file /etc/default/ypserv with # the variables which should be changed. # Additional arguments for ypserv. See manual page # for possible options. YPSERV_ARGS="" ++++++ default.ypxfrd ++++++ # To overwrite variables, create a file /etc/default/ypxfrd with # the variables which should be changed. # Additonal arguments for rpc.ypxfrd. See manual page # for possible options. YPXFRD_ARGS="" ++++++ yppasswdd.service ++++++ --- /var/tmp/diff_new_pack.gl2iRW/_old 2020-08-29 20:45:08.341535031 +0200 +++ /var/tmp/diff_new_pack.gl2iRW/_new 2020-08-29 20:45:08.345535032 +0200 @@ -6,8 +6,9 @@ [Service] Type=notify NotifyAccess=all -EnvironmentFile=-/etc/sysconfig/ypserv -ExecStart=/usr/lib/yp/yppasswdd-systemd-exec +EnvironmentFile=-/usr/etc/default/yppasswdd +EnvironmentFile=-/etc/default/yppasswdd +ExecStart=/usr/libexec/yp/yppasswdd-systemd-exec [Install] WantedBy=multi-user.target ++++++ ypserv-4.1.diff ++++++ --- /var/tmp/diff_new_pack.gl2iRW/_old 2020-08-29 20:45:08.361535038 +0200 +++ /var/tmp/diff_new_pack.gl2iRW/_new 2020-08-29 20:45:08.361535038 +0200 @@ -11,15 +11,6 @@ # These are commands which this Makefile needs to properly rebuild the # NIS databases. Don't change these unless you have a good reason. -@@ -62,7 +63,7 @@ - # taken from YPSRCDIR. - # - YPSRCDIR = /etc --YPPWDDIR = /etc -+YPPWDDIR = $(shell . /etc/sysconfig/ypserv; echo $$YPPWD_SRCDIR) - YPBINDIR = @YPBINDIR@ - YPSBINDIR = @SBINDIR@ - YPDIR = @YPMAPDIR@ @@ -107,8 +108,9 @@ # If you don't want some of these maps built, feel free to comment # them out from this list. ++++++ ypserv.service ++++++ --- /var/tmp/diff_new_pack.gl2iRW/_old 2020-08-29 20:45:08.393535052 +0200 +++ /var/tmp/diff_new_pack.gl2iRW/_new 2020-08-29 20:45:08.393535052 +0200 @@ -6,7 +6,8 @@ [Service] Type=notify NotifyAccess=all -EnvironmentFile=-/etc/sysconfig/ypserv +EnvironmentFile=-/usr/etc/default/ypserv +EnvironmentFile=-/etc/default/ypserv ExecStart=/usr/sbin/ypserv -f $YPSERV_ARGS [Install] ++++++ ypserv.tmpfiles ++++++ --- /var/tmp/diff_new_pack.gl2iRW/_old 2020-08-29 20:45:08.457535079 +0200 +++ /var/tmp/diff_new_pack.gl2iRW/_new 2020-08-29 20:45:08.461535081 +0200 @@ -1,3 +1,4 @@ d /var/yp 0755 - - - -L /var/yp/Makefile - - - - ../../usr/lib/yp/ypMakefile -L /var/yp/securenets - - - - ../../usr/lib/yp/securenets.example +L /var/yp/Makefile - - - - ../../usr/share/yp/ypMakefile +L /var/yp/securenets - - - - ../../usr/share/yp/securenets.example +L /etc/ypserv.conf - - - - ../../usr/share/yp/ypserv.conf ++++++ ypxfrd.service ++++++ --- /var/tmp/diff_new_pack.gl2iRW/_old 2020-08-29 20:45:08.489535092 +0200 +++ /var/tmp/diff_new_pack.gl2iRW/_new 2020-08-29 20:45:08.493535094 +0200 @@ -6,7 +6,8 @@ [Service] Type=notify NotifyAccess=all -EnvironmentFile=-/etc/sysconfig/ypserv +EnvironmentFile=-/usr/etc/default/ypxfrd +EnvironmentFile=-/etc/default/ypxfrd ExecStart=/usr/sbin/rpc.ypxfrd -f $YPXFRD_ARGS [Install]
