[ypserv] Update to new upstream version 2.31

Honza Horak hhorak at fedoraproject.org
Mon May 6 16:56:34 UTC 2013 

commit d0ea970d713396af5941617840d4c88fe4129d02
Author: Honza Horák <hhorak at redhat.com>
Date:   Mon May 6 18:52:37 2013 +0200

    Update to new upstream version 2.31

 ypserv-2.13-nonedomain.patch     |    8 +-
 ypserv-2.13-ypxfr-zeroresp.patch |    8 +-
 ypserv-2.19-slp-warning.patch    |    8 +-
 ypserv-2.24-aliases.patch        |   14 +-
 ypserv-2.24-manfix.patch         |   26 ++--
 ypserv-2.25-systemd.patch        |  263 --------------------------------------
 ypserv-2.27-cloexec.patch        |   12 --
 ypserv-2.27-confpost.patch       |   11 +-
 ypserv-2.29-dbopen.patch         |  138 --------------------
 ypserv-2.29-nomap.patch          |   11 --
 ypserv-2.29-relro.patch          |   28 ++--
 ypserv-2.29-sdnotify.patch       |  171 -------------------------
 ypserv-2.5-nfsnobody2.patch      |   26 ++--
 ypserv-2.5-redhat.patch          |    8 +-
 ypserv.spec                      |   43 +++----
 15 files changed, 89 insertions(+), 686 deletions(-)
---
diff --git a/ypserv-2.13-nonedomain.patch b/ypserv-2.13-nonedomain.patch
index e0d3c22..b1f2a7f 100644
--- a/ypserv-2.13-nonedomain.patch
+++ b/ypserv-2.13-nonedomain.patch
@@ -1,7 +1,7 @@
-diff -up ypserv-2.19/scripts/ypMakefile.in.nonedomain ypserv-2.19/scripts/ypMakefile.in
---- ypserv-2.19/scripts/ypMakefile.in.nonedomain	2008-09-25 13:11:50.000000000 +0200
-+++ ypserv-2.19/scripts/ypMakefile.in	2008-09-25 13:11:50.000000000 +0200
-@@ -98,10 +98,18 @@ NETMASKS    = $(YPSRCDIR)/netmasks
+diff -up ./scripts/ypMakefile.in.nonedomain ./scripts/ypMakefile.in
+--- ./scripts/ypMakefile.in.nonedomain	2013-05-06 18:30:46.772434725 +0200
++++ ./scripts/ypMakefile.in	2013-05-06 18:31:59.429495323 +0200
+@@ -106,10 +106,18 @@ NETMASKS    = $(YPSRCDIR)/netmasks
  YPSERVERS = $(YPDIR)/ypservers	# List of all NIS servers for a domain
  
  target: Makefile
diff --git a/ypserv-2.13-ypxfr-zeroresp.patch b/ypserv-2.13-ypxfr-zeroresp.patch
index 49f4490..33c6623 100644
--- a/ypserv-2.13-ypxfr-zeroresp.patch
+++ b/ypserv-2.13-ypxfr-zeroresp.patch
@@ -1,7 +1,7 @@
-diff -up ypserv-2.19/ypxfr/ypxfr.c.respzero ypserv-2.19/ypxfr/ypxfr.c
---- ypserv-2.19/ypxfr/ypxfr.c.respzero	2005-09-02 16:22:11.000000000 +0200
-+++ ypserv-2.19/ypxfr/ypxfr.c	2008-09-25 13:10:39.000000000 +0200
-@@ -364,6 +364,7 @@ ypxfr (char *map, char *source_host, cha
+diff -up ./ypxfr/ypxfr.c.ypxfr-zeroresp ./ypxfr/ypxfr.c
+--- ./ypxfr/ypxfr.c.ypxfr-zeroresp	2013-04-10 16:43:21.000000000 +0200
++++ ./ypxfr/ypxfr.c	2013-05-06 18:31:36.875476520 +0200
+@@ -415,6 +415,7 @@ ypxfr (char *map, char *source_host, cha
    struct hostent *h;
    int sock, result;
  
diff --git a/ypserv-2.19-slp-warning.patch b/ypserv-2.19-slp-warning.patch
index af09a61..6104c7b 100644
--- a/ypserv-2.19-slp-warning.patch
+++ b/ypserv-2.19-slp-warning.patch
@@ -1,7 +1,7 @@
-diff -up ypserv-2.19/etc/ypserv.conf.slp-warning ypserv-2.19/etc/ypserv.conf
---- ypserv-2.19/etc/ypserv.conf.slp-warning	2004-04-01 12:06:38.000000000 +0200
-+++ ypserv-2.19/etc/ypserv.conf	2008-09-25 13:12:59.000000000 +0200
-@@ -17,9 +17,9 @@ dns: no
+diff -up ./etc/ypserv.conf.slp-warning ./etc/ypserv.conf
+--- ./etc/ypserv.conf.slp-warning	2006-10-12 13:03:32.000000000 +0200
++++ ./etc/ypserv.conf	2013-05-06 18:32:16.581509617 +0200
+@@ -13,9 +13,9 @@
  files: 30
  
  # Should we register ypserv with SLP ?
diff --git a/ypserv-2.24-aliases.patch b/ypserv-2.24-aliases.patch
index 0267f4a..9d00269 100644
--- a/ypserv-2.24-aliases.patch
+++ b/ypserv-2.24-aliases.patch
@@ -1,6 +1,6 @@
-diff -up ypserv-2.26/acinclude.m4.aliases ypserv-2.26/acinclude.m4
---- ypserv-2.26/acinclude.m4.aliases	2012-01-12 15:49:32.325205914 +0100
-+++ ypserv-2.26/acinclude.m4	2012-01-12 15:50:07.570203506 +0100
+diff -up ./acinclude.m4.aliases ./acinclude.m4
+--- ./acinclude.m4.aliases	2005-04-07 14:38:44.000000000 +0200
++++ ./acinclude.m4	2013-05-06 18:32:54.423541141 +0200
 @@ -92,3 +92,18 @@ AC_DEFUN([TYPE_SOCKLEN_T],
      AC_DEFINE([socklen_t], [int], [Define if socklen_t is missing])
    fi
@@ -20,10 +20,10 @@ diff -up ypserv-2.26/acinclude.m4.aliases ypserv-2.26/acinclude.m4
 +AC_MSG_RESULT($tmp_aliases)
 +AC_SUBST(ALIASES, $tmp_aliases)
 +])
-diff -up ypserv-2.26/configure.in.aliases ypserv-2.26/configure.in
---- ypserv-2.26/configure.in.aliases	2012-01-12 15:48:52.068208666 +0100
-+++ ypserv-2.26/configure.in	2012-01-12 15:49:17.842206905 +0100
-@@ -149,7 +149,7 @@ fi
+diff -up ./configure.in.aliases ./configure.in
+--- ./configure.in.aliases	2013-04-11 11:26:22.000000000 +0200
++++ ./configure.in	2013-05-06 18:32:54.482541191 +0200
+@@ -151,7 +151,7 @@ fi
  AC_SUBST(MAKE)
  
  dnl Check for aliases path
diff --git a/ypserv-2.24-manfix.patch b/ypserv-2.24-manfix.patch
index c59476e..5180ef8 100644
--- a/ypserv-2.24-manfix.patch
+++ b/ypserv-2.24-manfix.patch
@@ -1,6 +1,6 @@
-diff -up ypserv-2.24/rpc.yppasswdd/rpc.yppasswdd.8.manfix ypserv-2.24/rpc.yppasswdd/rpc.yppasswdd.8
---- ypserv-2.24/rpc.yppasswdd/rpc.yppasswdd.8.manfix	2007-09-26 14:37:10.000000000 +0200
-+++ ypserv-2.24/rpc.yppasswdd/rpc.yppasswdd.8	2011-04-26 15:39:12.211115528 +0200
+diff -up ./rpc.yppasswdd/rpc.yppasswdd.8.manfix ./rpc.yppasswdd/rpc.yppasswdd.8
+--- ./rpc.yppasswdd/rpc.yppasswdd.8.manfix	2013-04-10 10:30:53.000000000 +0200
++++ ./rpc.yppasswdd/rpc.yppasswdd.8	2013-05-06 18:32:35.682525532 +0200
 @@ -53,6 +53,15 @@ customized for that NIS domain\. If no s
  \fBMakefile\fR
  is found, the scripts uses the generic one in
@@ -17,7 +17,7 @@ diff -up ypserv-2.24/rpc.yppasswdd/rpc.yppasswdd.8.manfix ypserv-2.24/rpc.yppass
  .SH "OPTIONS"
  .PP
  The following options are available:
-@@ -181,6 +190,8 @@ version\ 3\. Better still, look at
+@@ -186,6 +195,8 @@ version\ 3\. Better still, look at
  \fI/etc/passwd\fR
  
  \fI/etc/shadow\fR
@@ -26,9 +26,9 @@ diff -up ypserv-2.24/rpc.yppasswdd/rpc.yppasswdd.8.manfix ypserv-2.24/rpc.yppass
  .SH "SEE ALSO"
  .PP
  
-diff -up ypserv-2.24/rpc.ypxfrd/rpc.ypxfrd.8.manfix ypserv-2.24/rpc.ypxfrd/rpc.ypxfrd.8
---- ypserv-2.24/rpc.ypxfrd/rpc.ypxfrd.8.manfix	2008-04-15 15:06:51.000000000 +0200
-+++ ypserv-2.24/rpc.ypxfrd/rpc.ypxfrd.8	2011-04-26 15:42:21.310115598 +0200
+diff -up ./rpc.ypxfrd/rpc.ypxfrd.8.manfix ./rpc.ypxfrd/rpc.ypxfrd.8
+--- ./rpc.ypxfrd/rpc.ypxfrd.8.manfix	2013-04-10 10:30:53.000000000 +0200
++++ ./rpc.ypxfrd/rpc.ypxfrd.8	2013-05-06 18:32:35.693525541 +0200
 @@ -47,6 +47,16 @@ could be started by inetd\. But since it
  \fBypserv\fR
  from
@@ -46,7 +46,7 @@ diff -up ypserv-2.24/rpc.ypxfrd/rpc.ypxfrd.8.manfix ypserv-2.24/rpc.ypxfrd/rpc.y
  .SH "OPTIONS"
  .PP
  \fB\-\-debug\fR
-@@ -109,6 +119,12 @@ Configuration file for options and acces
+@@ -114,6 +124,12 @@ Configuration file for options and acces
  .RS 4
  Configuration file for access rights
  .RE
@@ -59,9 +59,9 @@ diff -up ypserv-2.24/rpc.ypxfrd/rpc.ypxfrd.8.manfix ypserv-2.24/rpc.ypxfrd/rpc.y
  .SH "SEE ALSO"
  .PP
  
-diff -up ypserv-2.24/ypserv/ypserv.8.manfix ypserv-2.24/ypserv/ypserv.8
---- ypserv-2.24/ypserv/ypserv.8.manfix	2010-01-27 13:07:08.000000000 +0100
-+++ ypserv-2.24/ypserv/ypserv.8	2011-04-26 15:39:12.212115528 +0200
+diff -up ./ypserv/ypserv.8.manfix ./ypserv/ypserv.8
+--- ./ypserv/ypserv.8.manfix	2013-04-10 10:30:53.000000000 +0200
++++ ./ypserv/ypserv.8	2013-05-06 18:32:35.705525551 +0200
 @@ -56,6 +56,14 @@ may or may not be running on the same no
  \fBypserv\fR
  parses the file
@@ -76,8 +76,8 @@ diff -up ypserv-2.24/ypserv/ypserv.8.manfix ypserv-2.24/ypserv/ypserv.8
 +\fB/etc/sysconfig/network\&.\fR
  .SH "OPTIONS"
  .PP
- \fB\-d\fR, \fB\-\-debug \fR[\fIpath\fR]
-@@ -148,6 +156,12 @@ configuration file\&.
+ \fB\-d\fR, \fB\-\-debug
+@@ -149,6 +157,12 @@ configuration file\&.
  which hosts are allowed to contact
  \fBypserv\fR\&.
  .RE
diff --git a/ypserv-2.27-confpost.patch b/ypserv-2.27-confpost.patch
index 489e436..c5873cf 100644
--- a/ypserv-2.27-confpost.patch
+++ b/ypserv-2.27-confpost.patch
@@ -1,7 +1,10 @@
-diff -up ypserv-2.27/conf_post.h.qdbm ypserv-2.27/conf_post.h
---- ypserv-2.27/conf_post.h.qdbm	2012-02-01 14:18:01.780846425 +0100
-+++ ypserv-2.27/conf_post.h	2012-02-01 14:18:01.780846425 +0100
-@@ -0,0 +1,10 @@
+diff -up ./conf_post.h.confpost ./conf_post.h
+--- ./conf_post.h.confpost	2012-04-17 15:47:28.000000000 +0200
++++ ./conf_post.h	2013-05-06 18:34:54.274640856 +0200
+@@ -8,3 +8,13 @@
+ #define HAVE_COMPAT_LIBGDBM
+ #endif
+ 
 +/* Define common preprocessor symbol for HAVE_LIBGDBM and HAVE_LIBQDBM, since
 + * libraries gdbm and qdbm have same symbol names. */
 +#undef HAVE_COMPAT_LIBGDBM
diff --git a/ypserv-2.29-nomap.patch b/ypserv-2.29-nomap.patch
index 3736760..e69de29 100644
--- a/ypserv-2.29-nomap.patch
+++ b/ypserv-2.29-nomap.patch
@@ -1,11 +0,0 @@
-diff -up ypserv-2.29/ypserv/server.c.nomap2 ypserv-2.29/ypserv/server.c
---- ypserv-2.29/ypserv/server.c.nomap2	2012-11-09 10:43:21.953487135 +0100
-+++ ypserv-2.29/ypserv/server.c	2012-11-09 10:59:32.472973005 +0100
-@@ -835,6 +835,7 @@ ypproc_all_2_svc (ypreq_nokey *argp, ypr
- 	  if (debug_flag)
- 	    log_msg ("\t-> Ignored (not a valid domain)");
- 	  result->ypresp_all_u.val.stat = YP_NODOM;
-+	  break;
- 	case -4:
- 	  if (debug_flag)
- 	    log_msg ("\t-> Ignored (map does not exist)");
diff --git a/ypserv-2.29-relro.patch b/ypserv-2.29-relro.patch
index 9454c80..390d497 100644
--- a/ypserv-2.29-relro.patch
+++ b/ypserv-2.29-relro.patch
@@ -1,18 +1,18 @@
-diff -up ypserv-2.29/rpc.yppasswdd/Makefile.am.relro ypserv-2.29/rpc.yppasswdd/Makefile.am
---- ypserv-2.29/rpc.yppasswdd/Makefile.am.relro	2012-11-30 09:15:26.506840750 +0100
-+++ ypserv-2.29/rpc.yppasswdd/Makefile.am	2012-11-30 09:17:16.645876112 +0100
+diff -up ./rpc.yppasswdd/Makefile.am.relro ./rpc.yppasswdd/Makefile.am
+--- ./rpc.yppasswdd/Makefile.am.relro	2013-04-11 11:25:34.000000000 +0200
++++ ./rpc.yppasswdd/Makefile.am	2013-05-06 18:48:10.888711995 +0200
 @@ -24,6 +24,8 @@ sbin_PROGRAMS = rpc.yppasswdd
  
  rpc_yppasswdd_SOURCES = update.c yppasswd_xdr.c yppasswdd.c
  
-+rpc_yppasswdd_LDFLAGS = -Wl,-z,relro,-z,now 
++rpc_yppasswdd_LDFLAGS = -Wl,-z,relro,-z,now
 +
- rpc_yppasswdd_LDADD =  @PIE_LDFLAGS@ $(LIBDBM) $(LIBCRYPT) $(LIBSYSTEMD_DAEMON) $(top_builddir)/lib/libyp.a
+ rpc_yppasswdd_LDADD =  @PIE_LDFLAGS@ $(top_builddir)/lib/libyp.a $(LIBDBM) $(LIBCRYPT) $(LIBSYSTEMD_DAEMON)
  rpc_yppasswdd_CFLAGS = @PIE_CFLAGS@
  
-diff -up ypserv-2.29/rpc.ypxfrd/Makefile.am.relro ypserv-2.29/rpc.ypxfrd/Makefile.am
---- ypserv-2.29/rpc.ypxfrd/Makefile.am.relro	2012-11-30 09:15:26.507840751 +0100
-+++ ypserv-2.29/rpc.ypxfrd/Makefile.am	2012-11-30 09:17:58.244888505 +0100
+diff -up ./rpc.ypxfrd/Makefile.am.relro ./rpc.ypxfrd/Makefile.am
+--- ./rpc.ypxfrd/Makefile.am.relro	2013-04-09 16:38:20.000000000 +0200
++++ ./rpc.ypxfrd/Makefile.am	2013-05-06 18:46:36.455683217 +0200
 @@ -22,6 +22,8 @@ sbin_PROGRAMS = rpc.ypxfrd
  
  rpc_ypxfrd_SOURCES = ypxfrd.c ypxfrd_server.c ypxfrd_svc.c
@@ -22,9 +22,9 @@ diff -up ypserv-2.29/rpc.ypxfrd/Makefile.am.relro ypserv-2.29/rpc.ypxfrd/Makefil
  rpc_ypxfrd_LDADD = @PIE_LDFLAGS@ $(top_builddir)/lib/libyp.a @LIBDBM@ $(LIBSYSTEMD_DAEMON)
  rpc_ypxfrd_CFLAGS = @PIE_CFLAGS@
  
-diff -up ypserv-2.29/yppush/Makefile.am.relro ypserv-2.29/yppush/Makefile.am
---- ypserv-2.29/yppush/Makefile.am.relro	2009-04-02 14:15:35.000000000 +0200
-+++ ypserv-2.29/yppush/Makefile.am	2012-11-30 09:18:39.422900251 +0100
+diff -up ./yppush/Makefile.am.relro ./yppush/Makefile.am
+--- ./yppush/Makefile.am.relro	2009-04-02 14:15:35.000000000 +0200
++++ ./yppush/Makefile.am	2013-05-06 18:46:36.456683217 +0200
 @@ -21,6 +21,8 @@ sbin_PROGRAMS = yppush
  
  yppush_SOURCES = yppush.c
@@ -34,9 +34,9 @@ diff -up ypserv-2.29/yppush/Makefile.am.relro ypserv-2.29/yppush/Makefile.am
  yppush_LDADD =  @PIE_LDFLAGS@ @LIBDBM@  $(top_builddir)/lib/libyp.a
  yppush_CFLAGS = @PIE_CFLAGS@
  
-diff -up ypserv-2.29/ypserv/Makefile.am.relro ypserv-2.29/ypserv/Makefile.am
---- ypserv-2.29/ypserv/Makefile.am.relro	2012-11-30 09:15:26.508840752 +0100
-+++ ypserv-2.29/ypserv/Makefile.am	2012-11-30 09:18:52.133903983 +0100
+diff -up ./ypserv/Makefile.am.relro ./ypserv/Makefile.am
+--- ./ypserv/Makefile.am.relro	2013-04-09 16:38:20.000000000 +0200
++++ ./ypserv/Makefile.am	2013-05-06 18:46:36.457683217 +0200
 @@ -22,6 +22,8 @@ sbin_PROGRAMS = ypserv
  
  ypserv_SOURCES = ypserv.c server.c ypserv_xdr.c reg_slp.c
diff --git a/ypserv-2.5-nfsnobody2.patch b/ypserv-2.5-nfsnobody2.patch
index 8fc831f..c2aa146 100644
--- a/ypserv-2.5-nfsnobody2.patch
+++ b/ypserv-2.5-nfsnobody2.patch
@@ -1,7 +1,7 @@
-diff -up ypserv-2.19/scripts/ypMakefile.in.nfsnobody ypserv-2.19/scripts/ypMakefile.in
---- ypserv-2.19/scripts/ypMakefile.in.nfsnobody	2008-09-25 13:08:19.000000000 +0200
-+++ ypserv-2.19/scripts/ypMakefile.in	2008-09-25 13:08:19.000000000 +0200
-@@ -32,6 +32,11 @@ NOPUSH=true
+diff -up ./scripts/ypMakefile.in.nfsnobody2 ./scripts/ypMakefile.in
+--- ./scripts/ypMakefile.in.nfsnobody2	2013-05-06 18:28:38.558327612 +0200
++++ ./scripts/ypMakefile.in	2013-05-06 18:30:46.772434725 +0200
+@@ -40,6 +40,11 @@ YPPUSH_ARGS =
  MINUID=500
  MINGID=500
  
@@ -13,7 +13,7 @@ diff -up ypserv-2.19/scripts/ypMakefile.in.nfsnobody ypserv-2.19/scripts/ypMakef
  # Should we merge the passwd file with the shadow file ?
  # MERGE_PASSWD=true|false
  MERGE_PASSWD=true
-@@ -286,7 +291,7 @@ passwd.byname: $(PASSWD) $(SHADOW) $(YPD
+@@ -294,7 +299,7 @@ passwd.byname: $(PASSWD) $(SHADOW) $(YPD
  	@echo "Updating $@..."
  	@$(UMASK); \
  	$(MERGER) -p $(PASSWD) $(SHADOW) | \
@@ -22,7 +22,7 @@ diff -up ypserv-2.19/scripts/ypMakefile.in.nfsnobody ypserv-2.19/scripts/ypMakef
  	   print $$1"\t"$$0 }' | $(DBLOAD) -i $(PASSWD) \
  		-o $(YPMAPDIR)/$@ - $@
  	-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
-@@ -295,7 +300,7 @@ passwd.byuid: $(PASSWD) $(SHADOW) $(YPDI
+@@ -303,7 +308,7 @@ passwd.byuid: $(PASSWD) $(SHADOW) $(YPDI
  	@echo "Updating $@..."
  	@$(UMASK); \
  	$(MERGER) -p $(PASSWD) $(SHADOW) | \
@@ -31,7 +31,7 @@ diff -up ypserv-2.19/scripts/ypMakefile.in.nfsnobody ypserv-2.19/scripts/ypMakef
  	   print $$3"\t"$$0 }' | $(DBLOAD) -i $(PASSWD) \
  		 -o $(YPMAPDIR)/$@ - $@
  	-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
-@@ -309,7 +314,7 @@ else
+@@ -317,7 +322,7 @@ else
  passwd.byname: $(PASSWD) $(YPDIR)/Makefile
  	@echo "Updating $@..."
  	@$(UMASK); \
@@ -40,7 +40,7 @@ diff -up ypserv-2.19/scripts/ypMakefile.in.nfsnobody ypserv-2.19/scripts/ypMakef
  	   print $$1"\t"$$0 }' $(PASSWD) | $(DBLOAD) -i $(PASSWD) \
  		-o $(YPMAPDIR)/$@ - $@
  	-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
-@@ -317,7 +322,7 @@ passwd.byname: $(PASSWD) $(YPDIR)/Makefi
+@@ -325,7 +330,7 @@ passwd.byname: $(PASSWD) $(YPDIR)/Makefi
  passwd.byuid: $(PASSWD) $(YPDIR)/Makefile
  	@echo "Updating $@..."
  	@$(UMASK); \
@@ -49,7 +49,7 @@ diff -up ypserv-2.19/scripts/ypMakefile.in.nfsnobody ypserv-2.19/scripts/ypMakef
  	   print $$3"\t"$$0 }' $(PASSWD) | $(DBLOAD) -i $(PASSWD) \
  		 -o $(YPMAPDIR)/$@ - $@
  	-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
-@@ -326,7 +331,7 @@ shadow.byname: $(SHADOW) $(YPDIR)/Makefi
+@@ -334,7 +339,7 @@ shadow.byname: $(SHADOW) $(YPDIR)/Makefi
  	@echo "Updating $@..."
  	@$(UMASK); \
  	$(AWK) -F: '{ if (FILENAME ~ /shadow$$/) { \
@@ -58,7 +58,7 @@ diff -up ypserv-2.19/scripts/ypMakefile.in.nfsnobody ypserv-2.19/scripts/ypMakef
  			} else UID[$$1] = $$3; }' $(PASSWD) $(SHADOW) \
  		| $(DBLOAD) -s -i $(SHADOW) -o $(YPMAPDIR)/$@ - $@
  	-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
-@@ -345,7 +350,7 @@ group.byname: $(GROUP) $(GSHADOW) $(YPDI
+@@ -353,7 +358,7 @@ group.byname: $(GROUP) $(GSHADOW) $(YPDI
  	@echo "Updating $@..."
  	@$(UMASK); \
  	$(MERGER) -g $(GROUP) $(GSHADOW) | \
@@ -67,7 +67,7 @@ diff -up ypserv-2.19/scripts/ypMakefile.in.nfsnobody ypserv-2.19/scripts/ypMakef
  	print $$1"\t"$$0 }' | $(DBLOAD) -i $(GROUP) -o $(YPMAPDIR)/$@ - $@
  	-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
  
-@@ -353,7 +358,7 @@ group.bygid: $(GROUP) $(GSHADOW) $(YPDIR
+@@ -361,7 +366,7 @@ group.bygid: $(GROUP) $(GSHADOW) $(YPDIR
  	@echo "Updating $@..."
  	@$(UMASK); \
  	$(MERGER) -g $(GROUP) $(GSHADOW) | \
@@ -76,7 +76,7 @@ diff -up ypserv-2.19/scripts/ypMakefile.in.nfsnobody ypserv-2.19/scripts/ypMakef
  	print $$3"\t"$$0 }' | $(DBLOAD) -i $(GROUP) -o $(YPMAPDIR)/$@ - $@
  	-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
  
-@@ -362,7 +367,7 @@ else
+@@ -370,7 +375,7 @@ else
  group.byname: $(GROUP) $(YPDIR)/Makefile
  	@echo "Updating $@..."
  	@$(UMASK); \
@@ -85,7 +85,7 @@ diff -up ypserv-2.19/scripts/ypMakefile.in.nfsnobody ypserv-2.19/scripts/ypMakef
  					print $$1"\t"$$0 }' $(GROUP) \
  		| $(DBLOAD) -i $(GROUP) -o $(YPMAPDIR)/$@ - $@
  	-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
-@@ -370,7 +375,7 @@ group.byname: $(GROUP) $(YPDIR)/Makefile
+@@ -378,7 +383,7 @@ group.byname: $(GROUP) $(YPDIR)/Makefile
  group.bygid: $(GROUP) $(YPDIR)/Makefile
  	@echo "Updating $@..."
  	@$(UMASK); \
diff --git a/ypserv-2.5-redhat.patch b/ypserv-2.5-redhat.patch
index 5571808..1f73123 100644
--- a/ypserv-2.5-redhat.patch
+++ b/ypserv-2.5-redhat.patch
@@ -1,7 +1,7 @@
-diff -up ypserv-2.19/scripts/ypMakefile.in.redhat ypserv-2.19/scripts/ypMakefile.in
---- ypserv-2.19/scripts/ypMakefile.in.redhat	2004-04-14 14:08:25.000000000 +0200
-+++ ypserv-2.19/scripts/ypMakefile.in	2008-09-25 13:07:19.000000000 +0200
-@@ -101,8 +101,8 @@ target: Makefile
+diff -up ./scripts/ypMakefile.in.redhat ./scripts/ypMakefile.in
+--- ./scripts/ypMakefile.in.redhat	2012-01-27 15:53:03.000000000 +0100
++++ ./scripts/ypMakefile.in	2013-05-06 18:28:38.558327612 +0200
+@@ -109,8 +109,8 @@ target: Makefile
  # If you don't want some of these maps built, feel free to comment
  # them out from this list.
  
diff --git a/ypserv.spec b/ypserv.spec
index 599080b..977d6bc 100644
--- a/ypserv.spec
+++ b/ypserv.spec
@@ -3,8 +3,8 @@
 Summary: The NIS (Network Information Service) server
 Url: http://www.linux-nis.org/nis/ypserv/index.html
 Name: ypserv
-Version: 2.29
-Release: 8%{?dist}
+Version: 2.31
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: http://www.linux-nis.org/download/ypserv/ypserv-%{version}.tar.bz2
@@ -25,17 +25,13 @@ Patch0: ypserv-2.5-redhat.patch
 Patch1: ypserv-2.21-path.patch
 Patch2: ypserv-2.5-nfsnobody2.patch
 Patch3: ypserv-2.13-ypxfr-zeroresp.patch
-Patch5: ypserv-2.13-nonedomain.patch
-Patch6: ypserv-2.19-slp-warning.patch
-Patch7: ypserv-2.24-manfix.patch
-Patch8: ypserv-2.24-aliases.patch
-Patch9: ypserv-2.25-systemd.patch
-Patch16: ypserv-2.27-confpost.patch
-Patch17: ypserv-2.27-cloexec.patch
-Patch18: ypserv-2.29-sdnotify.patch
-Patch19: ypserv-2.29-nomap.patch
-Patch20: ypserv-2.29-relro.patch
-Patch21: ypserv-2.29-dbopen.patch
+Patch4: ypserv-2.13-nonedomain.patch
+Patch5: ypserv-2.19-slp-warning.patch
+Patch6: ypserv-2.24-manfix.patch
+Patch7: ypserv-2.24-aliases.patch
+Patch8: ypserv-2.27-confpost.patch
+Patch9: ypserv-2.29-nomap.patch
+Patch10: ypserv-2.29-relro.patch
 
 BuildRequires: tokyocabinet-devel
 BuildRequires: systemd-units
@@ -64,17 +60,13 @@ machines.
 %patch1 -p1 -b .path
 %patch2 -p1 -b .nfsnobody
 %patch3 -p1 -b .respzero
-%patch5 -p1 -b .nonedomain
-%patch6 -p1 -b .slp-warning
-%patch7 -p1 -b .manfix
-%patch8 -p1 -b .aliases
-%patch9 -p1 -b .systemd
-%patch16 -p1 -b .confpost
-%patch17 -p1 -b .cloexec
-%patch18 -p1 -b .sdnotify
-%patch19 -p1 -b .nomap
-%patch20 -p1 -b .relro
-%patch21 -p1 -b .dbopen
+%patch4 -p1 -b .nonedomain
+%patch5 -p1 -b .slp-warning
+%patch6 -p1 -b .manfix
+%patch7 -p1 -b .aliases
+%patch8 -p1 -b .confpost
+%patch9 -p1 -b .nomap
+%patch10 -p1 -b .relro
 
 autoreconf
 
@@ -266,6 +258,9 @@ fi
 %{_includedir}/*/*
 
 %changelog
+* Mon May 06 2013 Honza Horak <hhorak at redhat.com> - 2.31-1
+- Update to new upstream version
+ 
 * Mon Feb 04 2013 Honza Horak <hhorak at redhat.com> - 2.29-8
 - Stop ypserv daemon temporary when reading info about maps

More information about the scm-commits mailing list