Hello community, here is the log from the commit of package ypserv for openSUSE:Factory checked in at 2017-11-10 14:56:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ypserv (Old) and /work/SRC/openSUSE:Factory/.ypserv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ypserv" Fri Nov 10 14:56:55 2017 rev:39 rq:539863 version:4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ypserv/ypserv.changes 2016-12-15 10:42:43.363569802 +0100 +++ /work/SRC/openSUSE:Factory/.ypserv.new/ypserv.changes 2017-11-10 14:57:17.404311105 +0100 @@ -1,0 +2,11 @@ +Wed Nov 8 13:53:16 CET 2017 - [email protected] + +- Cleanup /var/yp on de-installation + +------------------------------------------------------------------- +Wed Nov 8 10:54:37 CET 2017 - [email protected] + +- Remove old SysV init support +- Use systemd tmpfiles.d to create /var/yp hierachy + +------------------------------------------------------------------- New: ---- ypserv.tmpfiles ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ypserv.spec ++++++ --- /var/tmp/diff_new_pack.OTPLgt/_old 2017-11-10 14:57:19.112249329 +0100 +++ /var/tmp/diff_new_pack.OTPLgt/_new 2017-11-10 14:57:19.116249184 +0100 @@ -1,7 +1,7 @@ # # spec file for package ypserv # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -19,14 +19,10 @@ Name: ypserv Version: 4.0 Release: 0 -Url: http://www.linux-nis.org/nis/ypserv/ Summary: YP - (NIS)-Server License: GPL-2.0 Group: Productivity/Networking/NIS -PreReq: %fillup_prereq -%if %{suse_version} < 1310 -PreReq: %insserv_prereq -%endif +URL: http://www.linux-nis.org/nis/ypserv/ Source: ypserv-%{version}.tar.bz2 Source1: ypserv.init Source2: yppasswdd.init @@ -37,24 +33,20 @@ Source7: yppasswdd.service Source8: ypxfrd.service Source9: yppasswdd-systemd-exec +Source10: ypserv.tmpfiles Patch1: ypserv-2.32.diff # PATCH-FIX-UPSTREAM, bnc#011483 Patch2: 0001-use-_PATH_VARRUN-from-paths.h.patch BuildRequires: gdbm-devel BuildRequires: openslp-devel -%if %{suse_version} >= 1310 BuildRequires: pkgconfig(libnsl) BuildRequires: pkgconfig(libsystemd) >= 209 BuildRequires: pkgconfig(libtirpc) -%{?systemd_requires} -%else -BuildRequires: libnsl-devel -BuildRequires: libtirpc-devel -%endif Requires: gawk Requires: make Requires: rpcbind -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires(post): %fillup_prereq +%{?systemd_requires} %description The Network Information Service (NIS) provides a simple network @@ -65,9 +57,9 @@ machines on the network. Information likely to be distributed by NIS is: - login names/passwords/home directories (/etc/passwd) - group information (/etc/group) - host names and IP numbers (/etc/hosts) + login names/passwords/home directories (%{_sysconfdir}/passwd) + group information (%{_sysconfdir}/group) + host names and IP numbers (%{_sysconfdir}/hosts) So, for example, if your password entry is recorded in the NIS passwd database, you will be able to login on all machines on the net which @@ -80,51 +72,41 @@ %build %configure --enable-fqdn --libexecdir="%{_libexecdir}/yp" -make +make %{?_smp_mflags} %install %make_install -mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services -mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates -mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/yp -%if %{suse_version} >= 1310 -mkdir -p $RPM_BUILD_ROOT%{_unitdir} -%else -mkdir -p $RPM_BUILD_ROOT/etc/init.d -%endif +mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services +mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates +mkdir -p %{buildroot}%{_libexecdir}/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%{_sbindir} -install -m 644 etc/ypserv.conf $RPM_BUILD_ROOT/etc/ -install -m 644 etc/securenets $RPM_BUILD_ROOT/var/yp +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 $RPM_BUILD_ROOT/var/adm/fillup-templates/ +install -m 644 %{SOURCE4} %{buildroot}%{_localstatedir}/adm/fillup-templates/ # install SuSEfirewall2 service script -install -m 644 %SOURCE5 $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/ypserv -%if %{suse_version} >= 1310 +install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ypserv +# install ypserv.conf in tmpfiles.d +mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d +install -m 644 %{SOURCE10} %{buildroot}%{_prefix}/lib/tmpfiles.d/ypserv.conf # install systemd files -install -m 644 %SOURCE6 $RPM_BUILD_ROOT%{_unitdir}/ypserv.service -install -m 644 %SOURCE7 $RPM_BUILD_ROOT%{_unitdir}/yppasswdd.service -install -m 644 %SOURCE8 $RPM_BUILD_ROOT%{_unitdir}/ypxfrd.service -install -m 755 %SOURCE9 $RPM_BUILD_ROOT%{_libexecdir}/yp/yppasswdd-systemd-exec +install -m 644 %{SOURCE6} %{buildroot}%{_unitdir}/ypserv.service +install -m 644 %{SOURCE7} %{buildroot}%{_unitdir}/yppasswdd.service +install -m 644 %{SOURCE8} %{buildroot}%{_unitdir}/ypxfrd.service +install -m 755 %{SOURCE9} %{buildroot}%{_libexecdir}/yp/yppasswdd-systemd-exec # create symlink for rcypserv, rcyppasswdd, rcypxfrd -ln -s /sbin/service $RPM_BUILD_ROOT%{_sbindir}/rcypserv -ln -s /sbin/service $RPM_BUILD_ROOT%{_sbindir}/rcyppasswdd -ln -s /sbin/service $RPM_BUILD_ROOT%{_sbindir}/rcypxfrd -%else -# install init scripts -install -m 755 %SOURCE1 $RPM_BUILD_ROOT/etc/init.d/ypserv -install -m 755 %SOURCE2 $RPM_BUILD_ROOT/etc/init.d/yppasswdd -install -m 755 %SOURCE3 $RPM_BUILD_ROOT/etc/init.d/ypxfrd -ln -sf ../../etc/init.d/yppasswdd $RPM_BUILD_ROOT%{_sbindir}/rcyppasswdd -ln -sf ../../etc/init.d/ypxfrd $RPM_BUILD_ROOT%{_sbindir}/rcypxfrd -ln -sf ../../etc/init.d/ypserv $RPM_BUILD_ROOT%{_sbindir}/rcypserv -%endif +ln -s /sbin/service %{buildroot}%{_sbindir}/rcypserv +ln -s /sbin/service %{buildroot}%{_sbindir}/rcyppasswdd +ln -s /sbin/service %{buildroot}%{_sbindir}/rcypxfrd # Remove files which should not be included: -rm $RPM_BUILD_ROOT%{_prefix}/lib*/yp/match_printcap +rm %{buildroot}%{_prefix}/lib*/yp/match_printcap -%if %{suse_version} >= 1310 # Systemd services %pre %service_add_pre ypserv.service @@ -143,60 +125,52 @@ %service_del_preun ypxfrd.service %postun +if [ "$1" = "0" ]; then + test -L %{_localstatedir}/yp/Makefile && rm -f %{_localstatedir}/yp/Makefile ||: + test -L %{_localstatedir}/yp/securenets && rm -f %{_localstatedir}/yp/securenets ||: +fi %service_del_postun ypserv.service %service_del_postun yppasswdd.service %service_del_postun ypxfrd.service -%else -# LSB init script -%post -%{fillup_and_insserv ypserv ypxfrd yppasswdd} - -%preun -%stop_on_removal ypserv ypxfrd yppasswdd - -%postun -%restart_on_update ypserv ypxfrd yppasswdd -%insserv_cleanup - -%endif +%posttrans +# Update "Fix" +if [ -f /var/yp/Makefile.rpmsave -a ! -e /var/yp/Makefile ]; then + mv /var/yp/Makefile.rpmsave /var/yp/Makefile +fi +if [ -z ${TRANSACTIONAL_UPDATE} ]; then + %tmpfiles_create ypserv.conf +fi %files -%defattr(-,root,root) %doc NEWS README TODO COPYING ChangeLog -/var/adm/fillup-templates/sysconfig.ypserv -%config(noreplace) /var/yp/Makefile -%config(noreplace) /var/yp/securenets -%config(noreplace) /etc/ypserv.conf -%config /etc/sysconfig/SuSEfirewall2.d/services/ypserv +%{_localstatedir}/adm/fillup-templates/sysconfig.ypserv +%config(noreplace) %{_sysconfdir}/ypserv.conf +%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ypserv %dir %{_libexecdir}/yp -%dir /var/yp -%if %{suse_version} >= 1310 +%{_libexecdir}/yp/yppasswdd-systemd-exec +%{_libexecdir}/yp/securenets.example +%{_libexecdir}/yp/ypMakefile +%{_prefix}/lib/tmpfiles.d/ypserv.conf %{_unitdir}/ypserv.service %{_unitdir}/yppasswdd.service %{_unitdir}/ypxfrd.service -%{_libexecdir}/yp/yppasswdd-systemd-exec -%else -%config /etc/init.d/yppasswdd -%config /etc/init.d/ypserv -%config /etc/init.d/ypxfrd -%endif -%doc %{_mandir}/man5/netgroup.5.gz -%doc %{_mandir}/man5/ypserv.conf.5.gz -%doc %{_mandir}/man8/makedbm.8.gz -%doc %{_mandir}/man8/mknetid.8.gz -%doc %{_mandir}/man8/pwupdate.8.gz -%doc %{_mandir}/man8/revnetgroup.8.gz -%doc %{_mandir}/man8/rpc.yppasswdd.8.gz -%doc %{_mandir}/man8/rpc.ypxfrd.8.gz -%doc %{_mandir}/man8/yphelper.8.gz -%doc %{_mandir}/man8/ypinit.8.gz -%doc %{_mandir}/man8/yppasswdd.8.gz -%doc %{_mandir}/man8/yppush.8.gz -%doc %{_mandir}/man8/ypserv.8.gz -%doc %{_mandir}/man8/ypxfr.8.gz -%doc %{_mandir}/man8/ypxfrd.8.gz -/usr/include/rpcsvc/ypxfrd.x +%{_mandir}/man5/netgroup.5%{ext_man} +%{_mandir}/man5/ypserv.conf.5%{ext_man} +%{_mandir}/man8/makedbm.8%{ext_man} +%{_mandir}/man8/mknetid.8%{ext_man} +%{_mandir}/man8/pwupdate.8%{ext_man} +%{_mandir}/man8/revnetgroup.8%{ext_man} +%{_mandir}/man8/rpc.yppasswdd.8%{ext_man} +%{_mandir}/man8/rpc.ypxfrd.8%{ext_man} +%{_mandir}/man8/yphelper.8%{ext_man} +%{_mandir}/man8/ypinit.8%{ext_man} +%{_mandir}/man8/yppasswdd.8%{ext_man} +%{_mandir}/man8/yppush.8%{ext_man} +%{_mandir}/man8/ypserv.8%{ext_man} +%{_mandir}/man8/ypxfr.8%{ext_man} +%{_mandir}/man8/ypxfrd.8%{ext_man} +%{_includedir}/rpcsvc/ypxfrd.x %{_libexecdir}/yp/makedbm %{_libexecdir}/yp/create_printcap %{_libexecdir}/yp/mknetid ++++++ ypserv.tmpfiles ++++++ d /var/yp 0755 - - - L /var/yp/Makefile - - - - ../../usr/lib/yp/ypMakefile L /var/yp/securenets - - - - ../../usr/lib/yp/securenets.example
