- updated to 4.1

- updated ypMakefile patch
- removed outdated path patch
- build with libtirpc/libnsl 1.x for IPv6 support

diff --git a/ypserv-path.patch b/ypserv-path.patch
deleted file mode 100644 (file)
index 6d9eaa6..0000000
--- a/ypserv-path.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- ypserv-2.1/scripts/Makefile.in.fixit       Sat Nov 17 21:49:44 2001
-+++ ypserv-2.1/scripts/Makefile.in     Sat Nov 17 21:51:09 2001
-@@ -91,4 +91,4 @@
- EXTRA_DIST = $(addsuffix .in,$(MANS)) $(addsuffix .in,$(SCRIPTS))
--varypdir = /var/yp
-+varypdir = $(prefix)/../var/yp
- man_MANS = pwupdate.8 ypinit.8

diff --git a/ypserv-ypMakefile.patch b/ypserv-ypMakefile.patch
index b9d4f28053b54d6f1b5addcf25a1b25e302bd796..1b70fa32d7f92882f55e3f329e1172521cf5ae6f 100644 (file)
--- a/ypserv-ypMakefile.patch
+++ b/ypserv-ypMakefile.patch
@@ -1,6 +1,6 @@
---- ypserv-2.5/scripts/ypMakefile.in~  Thu Sep 12 22:38:41 2002
-+++ ypserv-2.5/scripts/ypMakefile.in   Thu Sep 12 23:10:13 2002
-@@ -37,11 +37,11 @@
+--- ypserv-4.1/scripts/ypMakefile.in.orig      2019-03-12 15:50:51.000000000 +0100
++++ ypserv-4.1/scripts/ypMakefile.in   2020-08-23 18:20:41.080314280 +0200
+@@ -42,11 +42,11 @@
  
  # Should we merge the passwd file with the shadow file ?
  # MERGE_PASSWD=true|false
@@ -14,32 +14,32 @@
  
  # These are commands which this Makefile needs to properly rebuild the
  # NIS databases. Don't change these unless you have a good reason.
-@@ -92,6 +92,7 @@
+@@ -94,6 +94,7 @@
  TIMEZONE    = $(YPSRCDIR)/timezone
  LOCALE      = $(YPSRCDIR)/locale
  NETMASKS    = $(YPSRCDIR)/netmasks
 +OLDPASSWD   = $(YPSRCDIR)/security/opasswd
+ AUTO_MAPS   = auto.master auto.home auto.local
  
- YPSERVERS = $(YPDIR)/ypservers        # List of all NIS servers for a domain
- 
-@@ -105,7 +106,7 @@
+ YPSERVERS = $(YPDIR)/ypservers        # List of all NIS slave servers
+@@ -108,7 +109,7 @@
  # them out from this list.
  
  all:  passwd group hosts rpc services netid protocols netgrp mail \
 -      shadow publickey # networks ethers bootparams printcap \
-+      shadow opasswd #publickey # networks ethers bootparams printcap \
-       # amd.home auto.master auto.home auto.local passwd.adjunct \
++      shadow opasswd # publickey networks ethers bootparams printcap \
+       # amd.home autofs passwd.adjunct \
        # timezone locale netmasks
  
-@@ -142,6 +143,7 @@
+@@ -145,6 +146,7 @@
  timezone:      timezone.byname
  locale:                locale.byname
  netmasks:      netmasks.byaddr
 +opasswd:       opasswd.byname opasswd.byuid
+ autofs:       $(AUTO_MAPS)
  
  ypservers: $(YPSERVERS) $(YPDIR)/Makefile
-       @echo "Updating $@..."
-@@ -444,6 +446,22 @@
+@@ -450,6 +452,22 @@
                }' | $(DBLOAD) -i $(AMD_HOME) -o $(YPMAPDIR)/$@ - $@
        -@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
  

diff --git a/ypserv.spec b/ypserv.spec
index 8eb81288db2eaa01c12fa7dd7fd72a006305146d..59d382e9184ffbae1537a99108c8e0aaab35e505 100644 (file)
--- a/ypserv.spec
+++ b/ypserv.spec
@@ -1,4 +1,5 @@
 # TODO
+# - libxcrypt support? (or move to libxcrypt globally)
 # - /usr/include/rpcsvc/ypxfrd.x should be in -devel package?
 Summary:       The NIS (Network Information Service) server
 Summary(es.UTF-8):     Servidor NIS/YP
@@ -9,31 +10,40 @@ Summary(ru.UTF-8):   Сервер NIS (Network Information Service)
 Summary(uk.UTF-8):     Сервер NIS (Network Information Service)
 Summary(zh_CN.UTF-8):  NIS(网络信息服务)服务器
 Name:          ypserv
-Version:       2.31
-Release:       4
-License:       GPL
+Version:       4.1
+Release:       1
+License:       GPL v2
 Group:         Networking/Daemons
-Source0:       http://www.linux-nis.org/download/ypserv/%{name}-%{version}.tar.bz2
-# Source0-md5: 4537b8f0e917edca8f57b70b9cbc37f3
+#Source0Download: https://github.com/thkukuk/ypserv/releases
+Source0:       https://github.com/thkukuk/ypserv/releases/download/v%{version}/%{name}-%{version}.tar.xz
+# Source0-md5: 27df9000c34cb300e9b6425cd299cb2f
 Source1:       %{name}-%{name}.init
 Source2:       %{name}-yppasswdd.init
 Source3:       %{name}-ypxfrd.init
 Source4:       %{name}.sysconfig
 Patch0:                %{name}-ypMakefile.patch
-Patch1:                %{name}-path.patch
 Patch2:                %{name}-nfsnobody.patch
 Patch3:                %{name}-awk.patch
 URL:           http://www.linux-nis.org/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.50
 BuildRequires: automake >= 1:1.7
+BuildRequires: docbook-dtd43-xml
 BuildRequires: gdbm-devel
-BuildRequires: libwrap-devel
+BuildRequires: libnsl-devel >= 1.0.4
+BuildRequires: libtirpc-devel >= 1.0.1
+BuildRequires: libxslt-progs
+BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: systemd-devel >= 1:209
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
 Requires(post,preun):  /sbin/chkconfig
 Requires:      FHS >= 2.3-18
 Requires:      glibc >= 2.2
-Requires:      portmap
+Requires:      libnsl >= 1.0.4
+Requires:      libtirpc >= 1.0.1
 Requires:      rc-scripts >= 0.4.1.5
+Requires:      rpcbind
 Obsoletes:     yppasswd
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -107,17 +117,17 @@ Network Information Service (NIS) - це система, яка надає ме
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 
-mv -f etc/README etc/README.etc
+%{__mv} etc/README etc/README.etc
 
 %build
 %configure \
        --enable-check-root \
        --enable-fqdn \
-       --enable-yppasswd
+       --enable-yppasswd \
+       --with-dbmliborder=gdbm
 %{__make}
 
 %install
@@ -166,12 +176,40 @@ fi
 %defattr(644,root,root,755)
 %doc README ChangeLog TODO NEWS
 %doc etc/ypserv.conf etc/securenets etc/README.etc
-%attr(755,root,root) %{_sbindir}/*
-%attr(755,root,root) %{_libdir}/yp
+%attr(755,root,root) %{_sbindir}/rpc.yppasswdd
+%attr(755,root,root) %{_sbindir}/rpc.ypxfrd
+%attr(755,root,root) %{_sbindir}/yppush
+%attr(755,root,root) %{_sbindir}/ypserv
+%dir %{_libdir}/yp
+%attr(755,root,root) %{_libdir}/yp/create_printcap
+%attr(755,root,root) %{_libdir}/yp/makedbm
+%attr(755,root,root) %{_libdir}/yp/match_printcap
+%attr(755,root,root) %{_libdir}/yp/mknetid
+%attr(755,root,root) %{_libdir}/yp/pwupdate
+%attr(755,root,root) %{_libdir}/yp/revnetgroup
+%attr(755,root,root) %{_libdir}/yp/yphelper
+%attr(755,root,root) %{_libdir}/yp/ypinit
+%attr(755,root,root) %{_libdir}/yp/ypxfr
+%attr(755,root,root) %{_libdir}/yp/ypxfr_*
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ypserv.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ypserv
 %config(noreplace) %verify(not md5 mtime size) /var/yp/Makefile
-%attr(754,root,root) /etc/rc.d/init.d/*
-%{_mandir}/man5/*
-%{_mandir}/man8/*
+%attr(754,root,root) /etc/rc.d/init.d/yppasswdd
+%attr(754,root,root) /etc/rc.d/init.d/ypserv
+%attr(754,root,root) /etc/rc.d/init.d/ypxfrd
+%{_mandir}/man5/netgroup.5*
+%{_mandir}/man5/ypserv.conf.5*
+%{_mandir}/man8/makedbm.8*
+%{_mandir}/man8/mknetid.8*
+%{_mandir}/man8/pwupdate.8*
+%{_mandir}/man8/revnetgroup.8*
+%{_mandir}/man8/rpc.yppasswdd.8*
+%{_mandir}/man8/rpc.ypxfrd.8*
+%{_mandir}/man8/yphelper.8*
+%{_mandir}/man8/ypinit.8*
+%{_mandir}/man8/yppasswdd.8*
+%{_mandir}/man8/yppush.8*
+%{_mandir}/man8/ypserv.8*
+%{_mandir}/man8/ypxfr.8*
+%{_mandir}/man8/ypxfrd.8*
 %{_includedir}/rpcsvc/ypxfrd.x