rpms/ypserv/devel ypserv-2.11-iface-binding3.patch, 1.3, 1.4 ypserv-2.11-nomap.patch, 1.1, 1.2 ypserv-2.11-path.patch, 1.1, 1.2 ypserv-2.13-nonedomain.patch, 1.2, 1.3 ypserv-2.13-yplib-memleak.patch, 1.1, 1.2 ypserv-2.13-ypxfr-zeroresp.patch, 1.1, 1.2 ypserv-2.19-debuginfo.patch, 1.1, 1.2 ypserv-2.19-inval-ports.patch, 1.1, 1.2 ypserv-2.19-quieter.patch, 1.1, 1.2 ypserv-2.19-slp-warning.patch, 1.1, 1.2 ypserv-2.5-nfsnobody2.patch, 1.1, 1.2 ypserv-2.5-redhat.patch, 1.1, 1.2 ypserv.spec, 1.40, 1.41
Vitezslav Crhonek
vcrhonek at fedoraproject.org
Thu Sep 25 11:21:58 UTC 2008
Author: vcrhonek
Update of /cvs/extras/rpms/ypserv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5922
Modified Files:
ypserv-2.11-iface-binding3.patch ypserv-2.11-nomap.patch
ypserv-2.11-path.patch ypserv-2.13-nonedomain.patch
ypserv-2.13-yplib-memleak.patch
ypserv-2.13-ypxfr-zeroresp.patch ypserv-2.19-debuginfo.patch
ypserv-2.19-inval-ports.patch ypserv-2.19-quieter.patch
ypserv-2.19-slp-warning.patch ypserv-2.5-nfsnobody2.patch
ypserv-2.5-redhat.patch ypserv.spec
Log Message:
Rediff all patches to work with patch --fuzz=0
ypserv-2.11-iface-binding3.patch:
Index: ypserv-2.11-iface-binding3.patch
===================================================================
RCS file: /cvs/extras/rpms/ypserv/devel/ypserv-2.11-iface-binding3.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ypserv-2.11-iface-binding3.patch 13 Feb 2006 16:28:40 -0000 1.3
+++ ypserv-2.11-iface-binding3.patch 25 Sep 2008 11:21:56 -0000 1.4
@@ -1,6 +1,7 @@
---- ypserv-2.11/ypserv/ypserv.8.in.iface 2003-01-17 22:57:35.000000000 +0100
-+++ ypserv-2.11/ypserv/ypserv.8.in 2004-01-19 16:23:11.464352153 +0100
-@@ -12,6 +12,9 @@
+diff -up ypserv-2.19/ypserv/ypserv.8.in.iface ypserv-2.19/ypserv/ypserv.8.in
+--- ypserv-2.19/ypserv/ypserv.8.in.iface 2003-01-17 22:57:35.000000000 +0100
++++ ypserv-2.19/ypserv/ypserv.8.in 2008-09-25 13:09:39.000000000 +0200
+@@ -12,6 +12,9 @@ ypserv \- NIS server
[
.B \-p port
]
@@ -10,7 +11,7 @@
.LP
.SH DESCRIPTION
.IX "ypserv" "" "\fLypserv\fP \(em NIS server process"
-@@ -59,12 +62,23 @@
+@@ -59,12 +62,23 @@ Causes the server to run in debugging mo
reports only errors (access violations, dbm failures)
using the syslog(3) facility. In debug mode, the server does not
background itself and prints extra status messages to stderr for
@@ -35,8 +36,9 @@
.B "\-p" "--port" port
.B ypserv
will bind itself to this port.
---- ypserv-2.11/ypserv/ypserv.c.iface 2003-11-24 11:26:53.000000000 +0100
-+++ ypserv-2.11/ypserv/ypserv.c 2004-01-19 17:02:25.354924063 +0100
+diff -up ypserv-2.19/ypserv/ypserv.c.iface ypserv-2.19/ypserv/ypserv.c
+--- ypserv-2.19/ypserv/ypserv.c.iface 2006-01-10 20:22:20.000000000 +0100
++++ ypserv-2.19/ypserv/ypserv.c 2008-09-25 13:09:39.000000000 +0200
@@ -33,11 +33,15 @@
#include <getopt.h>
#endif
@@ -53,7 +55,7 @@
#if defined(HAVE_RPC_SVC_SOC_H)
#include <rpc/svc_soc.h> /* for svcudp_create() */
#endif /* HAVE_RPC_SVC_SOC_H */
-@@ -60,6 +64,8 @@
+@@ -63,6 +67,8 @@
#define YPOLDVERS 1
#endif
@@ -62,7 +64,7 @@
static char *path_ypdb = YPMAPDIR;
static void
-@@ -92,7 +98,25 @@
+@@ -95,7 +101,25 @@ ypprog_2 (struct svc_req *rqstp, registe
bool_t retval;
xdrproc_t _xdr_argument, _xdr_result;
bool_t (*local) (char *, void *, struct svc_req *);
@@ -88,7 +90,7 @@
switch (rqstp->rq_proc)
{
case YPPROC_NULL:
-@@ -242,6 +266,36 @@
+@@ -245,6 +269,36 @@ mysvc_run (void)
}
#endif
@@ -125,7 +127,7 @@
/* Create a pidfile on startup */
static void
create_pidfile (void)
-@@ -390,7 +444,7 @@
+@@ -394,7 +448,7 @@ sig_child (int sig UNUSED)
static void
Usage (int exitcode)
{
@@ -134,7 +136,7 @@
fputs (" ypserv --version\n", stderr);
exit (exitcode);
-@@ -401,6 +455,7 @@
+@@ -405,6 +459,7 @@ main (int argc, char **argv)
{
SVCXPRT *transp;
int my_port = -1, my_socket, result;
@@ -142,7 +144,7 @@
struct sockaddr_in s_in;
openlog ("ypserv", LOG_PID, LOG_DAEMON);
-@@ -413,12 +468,13 @@
+@@ -417,12 +472,13 @@ main (int argc, char **argv)
{"version", no_argument, NULL, 'v'},
{"debug", no_argument, NULL, 'd'},
{"port", required_argument, NULL, 'p'},
@@ -157,7 +159,7 @@
if (c == -1)
break;
switch (c)
-@@ -435,6 +491,11 @@
+@@ -439,6 +495,11 @@ main (int argc, char **argv)
if (debug_flag)
log_msg ("Using port %d\n", my_port);
break;
@@ -169,7 +171,7 @@
case 'u':
case 'h':
Usage (0);
-@@ -533,6 +594,11 @@
+@@ -545,6 +606,11 @@ main (int argc, char **argv)
pmap_unset (YPPROG, YPVERS);
pmap_unset (YPPROG, YPOLDVERS);
@@ -181,7 +183,7 @@
if (my_port >= 0)
{
my_socket = socket (AF_INET, SOCK_DGRAM, 0);
-@@ -544,7 +610,7 @@
+@@ -556,7 +622,7 @@ main (int argc, char **argv)
memset ((char *) &s_in, 0, sizeof (s_in));
s_in.sin_family = AF_INET;
@@ -190,7 +192,7 @@
s_in.sin_port = htons (my_port);
result = bind (my_socket, (struct sockaddr *) &s_in,
-@@ -589,7 +655,7 @@
+@@ -601,7 +667,7 @@ main (int argc, char **argv)
memset (&s_in, 0, sizeof (s_in));
s_in.sin_family = AF_INET;
@@ -199,8 +201,9 @@
s_in.sin_port = htons (my_port);
result = bind (my_socket, (struct sockaddr *) &s_in,
---- /dev/null 2003-09-15 15:40:47.000000000 +0200
-+++ ypserv-2.11/ypserv/ypserv.c.iface_binding 2004-01-19 16:23:11.475350680 +0100
+diff -up /dev/null ypserv-2.19/ypserv/ypserv.c.iface_binding
+--- /dev/null 2008-09-23 12:26:29.886003537 +0200
++++ ypserv-2.19/ypserv/ypserv.c.iface_binding 2008-09-25 13:09:39.000000000 +0200
@@ -0,0 +1,635 @@
+/* Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Thorsten Kukuk
+ Author: Thorsten Kukuk <kukuk at suse.de>
ypserv-2.11-nomap.patch:
Index: ypserv-2.11-nomap.patch
===================================================================
RCS file: /cvs/extras/rpms/ypserv/devel/ypserv-2.11-nomap.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ypserv-2.11-nomap.patch 9 Sep 2004 15:21:19 -0000 1.1
+++ ypserv-2.11-nomap.patch 25 Sep 2008 11:21:56 -0000 1.2
@@ -1,6 +1,7 @@
---- ypserv-2.11/lib/access.c.nomap 2003-06-13 14:09:14.000000000 +0200
-+++ ypserv-2.11/lib/access.c 2004-01-19 16:22:12.732217226 +0100
-@@ -190,6 +190,8 @@
+diff -up ypserv-2.19/lib/access.c.nomap ypserv-2.19/lib/access.c
+--- ypserv-2.19/lib/access.c.nomap 2005-05-31 15:37:43.000000000 +0200
++++ ypserv-2.19/lib/access.c 2008-09-25 13:09:06.000000000 +0200
+@@ -189,6 +189,8 @@ is_valid (struct svc_req *rqstp, const c
status = -1;
ypdb_close (dbp);
}
@@ -9,11 +10,12 @@
}
}
---- ypserv-2.11/ypserv/server.c.nomap 2003-08-15 10:55:05.000000000 +0200
-+++ ypserv-2.11/ypserv/server.c 2004-01-19 16:05:10.347198033 +0100
-@@ -177,6 +177,11 @@
- log_msg ("\t-> Ignored (not a valid domain)");
- result->stat = YP_NODOM;
+diff -up ypserv-2.19/ypserv/server.c.nomap ypserv-2.19/ypserv/server.c
+--- ypserv-2.19/ypserv/server.c.nomap 2006-01-10 20:22:20.000000000 +0100
++++ ypserv-2.19/ypserv/server.c 2008-09-25 13:09:06.000000000 +0200
+@@ -190,6 +190,11 @@ ypproc_match_2_svc (ypreq_key *argp, ypr
+ log_msg ("\t-> Ignored (forbidden by securenets)");
+ result->stat = YP_NOMAP;
break;
+ case -4:
+ if (debug_flag)
ypserv-2.11-path.patch:
Index: ypserv-2.11-path.patch
===================================================================
RCS file: /cvs/extras/rpms/ypserv/devel/ypserv-2.11-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ypserv-2.11-path.patch 9 Sep 2004 15:21:19 -0000 1.1
+++ ypserv-2.11-path.patch 25 Sep 2008 11:21:56 -0000 1.2
@@ -1,6 +1,7 @@
---- ypserv-2.11/scripts/Makefile.in.path 2004-01-09 15:36:21.000000000 +0100
-+++ ypserv-2.11/scripts/Makefile.in 2004-01-19 16:04:11.440094847 +0100
-@@ -153,7 +153,7 @@
+diff -up ypserv-2.19/scripts/Makefile.in.path ypserv-2.19/scripts/Makefile.in
+--- ypserv-2.19/scripts/Makefile.in.path 2006-01-10 20:22:31.000000000 +0100
++++ ypserv-2.19/scripts/Makefile.in 2008-09-25 13:07:53.000000000 +0200
+@@ -158,7 +158,7 @@ AUTOMAKE_OPTIONS = 1.7 gnits
MAINT_CHARSET = latin1
CLEANFILES = *~ ${SCRIPTS}
EXTRA_DIST = $(addsuffix .in,$(MANS)) $(addsuffix .in,$(SCRIPTS))
ypserv-2.13-nonedomain.patch:
Index: ypserv-2.13-nonedomain.patch
===================================================================
RCS file: /cvs/extras/rpms/ypserv/devel/ypserv-2.13-nonedomain.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ypserv-2.13-nonedomain.patch 4 Feb 2008 14:44:27 -0000 1.2
+++ ypserv-2.13-nonedomain.patch 25 Sep 2008 11:21:56 -0000 1.3
@@ -1,6 +1,6 @@
-diff -up ypserv-2.19/scripts/ypMakefile.in_old ypserv-2.19/scripts/ypMakefile.in
---- ypserv-2.19/scripts/ypMakefile.in_old 2008-02-04 15:26:47.000000000 +0100
-+++ ypserv-2.19/scripts/ypMakefile.in 2008-02-04 15:27:12.000000000 +0100
+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
YPSERVERS = $(YPDIR)/ypservers # List of all NIS servers for a domain
ypserv-2.13-yplib-memleak.patch:
Index: ypserv-2.13-yplib-memleak.patch
===================================================================
RCS file: /cvs/extras/rpms/ypserv/devel/ypserv-2.13-yplib-memleak.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ypserv-2.13-yplib-memleak.patch 9 Sep 2004 15:21:45 -0000 1.1
+++ ypserv-2.13-yplib-memleak.patch 25 Sep 2008 11:21:57 -0000 1.2
@@ -1,5 +1,6 @@
---- ypserv-2.13/lib/yp_db.c.org 2004-04-14 07:47:02.000000000 -0400
-+++ ypserv-2.13/lib/yp_db.c 2004-06-19 08:48:33.000000000 -0400
+diff -up ypserv-2.19/lib/yp_db.c.memleak ypserv-2.19/lib/yp_db.c
+--- ypserv-2.19/lib/yp_db.c.memleak 2004-04-14 13:47:02.000000000 +0200
++++ ypserv-2.19/lib/yp_db.c 2008-09-25 13:10:10.000000000 +0200
@@ -200,6 +200,7 @@ ypdb_close_all (void)
fast_open_files[i].map, i);
free (fast_open_files[i].domain);
ypserv-2.13-ypxfr-zeroresp.patch:
Index: ypserv-2.13-ypxfr-zeroresp.patch
===================================================================
RCS file: /cvs/extras/rpms/ypserv/devel/ypserv-2.13-ypxfr-zeroresp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ypserv-2.13-ypxfr-zeroresp.patch 9 Sep 2004 15:21:45 -0000 1.1
+++ ypserv-2.13-ypxfr-zeroresp.patch 25 Sep 2008 11:21:57 -0000 1.2
@@ -1,6 +1,7 @@
---- ypserv-2.13/ypxfr/ypxfr.c.orig 2004-01-12 08:12:15.000000000 -0500
-+++ ypserv-2.13/ypxfr/ypxfr.c 2004-08-31 13:17:30.000000000 -0400
-@@ -361,6 +361,7 @@ ypxfr (char *map, char *source_host, cha
+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
struct hostent *h;
int sock, result;
ypserv-2.19-debuginfo.patch:
Index: ypserv-2.19-debuginfo.patch
===================================================================
RCS file: /cvs/extras/rpms/ypserv/devel/ypserv-2.19-debuginfo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ypserv-2.19-debuginfo.patch 8 Jan 2008 16:21:37 -0000 1.1
+++ ypserv-2.19-debuginfo.patch 25 Sep 2008 11:21:57 -0000 1.2
@@ -1,7 +1,7 @@
-diff -up ypserv-2.19/revnetgroup/Makefile.in.orig ypserv-2.19/revnetgroup/Makefile.in
---- ypserv-2.19/revnetgroup/Makefile.in.orig 2006-01-10 14:22:31.000000000 -0500
-+++ ypserv-2.19/revnetgroup/Makefile.in 2008-01-08 11:07:22.000000000 -0500
-@@ -98,7 +98,7 @@ EGREP = @EGREP@
+diff -up ypserv-2.19/makedbm/Makefile.in.debuginfo ypserv-2.19/makedbm/Makefile.in
+--- ypserv-2.19/makedbm/Makefile.in.debuginfo 2006-01-10 20:22:30.000000000 +0100
++++ ypserv-2.19/makedbm/Makefile.in 2008-09-25 13:12:39.000000000 +0200
+@@ -96,7 +96,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
INSTALL_DATA = @INSTALL_DATA@
#
@@ -10,10 +10,10 @@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
-diff -up ypserv-2.19/rpc.yppasswdd/Makefile.in.orig ypserv-2.19/rpc.yppasswdd/Makefile.in
---- ypserv-2.19/rpc.yppasswdd/Makefile.in.orig 2006-01-10 14:22:31.000000000 -0500
-+++ ypserv-2.19/rpc.yppasswdd/Makefile.in 2008-01-08 11:07:22.000000000 -0500
-@@ -103,7 +103,7 @@ EGREP = @EGREP@
+diff -up ypserv-2.19/mknetid/Makefile.in.debuginfo ypserv-2.19/mknetid/Makefile.in
+--- ypserv-2.19/mknetid/Makefile.in.debuginfo 2006-01-10 20:22:31.000000000 +0100
++++ ypserv-2.19/mknetid/Makefile.in 2008-09-25 13:12:39.000000000 +0200
+@@ -97,7 +97,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
INSTALL_DATA = @INSTALL_DATA@
#
@@ -22,10 +22,10 @@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
-diff -up ypserv-2.19/yppush/Makefile.in.orig ypserv-2.19/yppush/Makefile.in
---- ypserv-2.19/yppush/Makefile.in.orig 2006-01-10 14:22:32.000000000 -0500
-+++ ypserv-2.19/yppush/Makefile.in 2008-01-08 11:07:22.000000000 -0500
-@@ -96,7 +96,7 @@ EGREP = @EGREP@
+diff -up ypserv-2.19/revnetgroup/Makefile.in.debuginfo ypserv-2.19/revnetgroup/Makefile.in
+--- ypserv-2.19/revnetgroup/Makefile.in.debuginfo 2006-01-10 20:22:31.000000000 +0100
++++ ypserv-2.19/revnetgroup/Makefile.in 2008-09-25 13:12:39.000000000 +0200
+@@ -98,7 +98,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
INSTALL_DATA = @INSTALL_DATA@
#
@@ -34,10 +34,10 @@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
-diff -up ypserv-2.19/ypserv/Makefile.in.orig ypserv-2.19/ypserv/Makefile.in
---- ypserv-2.19/ypserv/Makefile.in.orig 2006-01-10 14:22:32.000000000 -0500
-+++ ypserv-2.19/ypserv/Makefile.in 2008-01-08 11:07:22.000000000 -0500
-@@ -98,7 +98,7 @@ EGREP = @EGREP@
+diff -up ypserv-2.19/rpc.yppasswdd/Makefile.in.debuginfo ypserv-2.19/rpc.yppasswdd/Makefile.in
+--- ypserv-2.19/rpc.yppasswdd/Makefile.in.debuginfo 2006-01-10 20:22:31.000000000 +0100
++++ ypserv-2.19/rpc.yppasswdd/Makefile.in 2008-09-25 13:12:39.000000000 +0200
+@@ -103,7 +103,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
INSTALL_DATA = @INSTALL_DATA@
#
@@ -46,9 +46,9 @@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
-diff -up ypserv-2.19/rpc.ypxfrd/Makefile.in.orig ypserv-2.19/rpc.ypxfrd/Makefile.in
---- ypserv-2.19/rpc.ypxfrd/Makefile.in.orig 2006-01-10 14:22:31.000000000 -0500
-+++ ypserv-2.19/rpc.ypxfrd/Makefile.in 2008-01-08 11:07:22.000000000 -0500
+diff -up ypserv-2.19/rpc.ypxfrd/Makefile.in.debuginfo ypserv-2.19/rpc.ypxfrd/Makefile.in
+--- ypserv-2.19/rpc.ypxfrd/Makefile.in.debuginfo 2006-01-10 20:22:31.000000000 +0100
++++ ypserv-2.19/rpc.ypxfrd/Makefile.in 2008-09-25 13:12:39.000000000 +0200
@@ -98,7 +98,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
INSTALL_DATA = @INSTALL_DATA@
@@ -58,10 +58,10 @@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
-diff -up ypserv-2.19/makedbm/Makefile.in.orig ypserv-2.19/makedbm/Makefile.in
---- ypserv-2.19/makedbm/Makefile.in.orig 2006-01-10 14:22:30.000000000 -0500
-+++ ypserv-2.19/makedbm/Makefile.in 2008-01-08 11:07:22.000000000 -0500
-@@ -96,7 +96,7 @@ EGREP = @EGREP@
+diff -up ypserv-2.19/yphelper/Makefile.in.debuginfo ypserv-2.19/yphelper/Makefile.in
+--- ypserv-2.19/yphelper/Makefile.in.debuginfo 2006-01-10 20:22:32.000000000 +0100
++++ ypserv-2.19/yphelper/Makefile.in 2008-09-25 13:12:39.000000000 +0200
+@@ -95,7 +95,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
INSTALL_DATA = @INSTALL_DATA@
#
@@ -70,10 +70,10 @@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
-diff -up ypserv-2.19/mknetid/Makefile.in.orig ypserv-2.19/mknetid/Makefile.in
---- ypserv-2.19/mknetid/Makefile.in.orig 2006-01-10 14:22:31.000000000 -0500
-+++ ypserv-2.19/mknetid/Makefile.in 2008-01-08 11:07:22.000000000 -0500
-@@ -97,7 +97,7 @@ EGREP = @EGREP@
+diff -up ypserv-2.19/yppush/Makefile.in.debuginfo ypserv-2.19/yppush/Makefile.in
+--- ypserv-2.19/yppush/Makefile.in.debuginfo 2006-01-10 20:22:32.000000000 +0100
++++ ypserv-2.19/yppush/Makefile.in 2008-09-25 13:12:39.000000000 +0200
+@@ -96,7 +96,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
INSTALL_DATA = @INSTALL_DATA@
#
@@ -82,10 +82,10 @@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
-diff -up ypserv-2.19/yphelper/Makefile.in.orig ypserv-2.19/yphelper/Makefile.in
---- ypserv-2.19/yphelper/Makefile.in.orig 2006-01-10 14:22:32.000000000 -0500
-+++ ypserv-2.19/yphelper/Makefile.in 2008-01-08 11:07:22.000000000 -0500
-@@ -95,7 +95,7 @@ EGREP = @EGREP@
+diff -up ypserv-2.19/ypserv/Makefile.in.debuginfo ypserv-2.19/ypserv/Makefile.in
+--- ypserv-2.19/ypserv/Makefile.in.debuginfo 2006-01-10 20:22:32.000000000 +0100
++++ ypserv-2.19/ypserv/Makefile.in 2008-09-25 13:12:39.000000000 +0200
+@@ -98,7 +98,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
INSTALL_DATA = @INSTALL_DATA@
#
ypserv-2.19-inval-ports.patch:
Index: ypserv-2.19-inval-ports.patch
===================================================================
RCS file: /cvs/extras/rpms/ypserv/devel/ypserv-2.19-inval-ports.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ypserv-2.19-inval-ports.patch 13 Sep 2006 13:30:49 -0000 1.1
+++ ypserv-2.19-inval-ports.patch 25 Sep 2008 11:21:57 -0000 1.2
@@ -1,6 +1,7 @@
---- ypserv-2.19/rpc.yppasswdd/yppasswdd.c.orig 2006-01-10 14:22:20.000000000 -0500
-+++ ypserv-2.19/rpc.yppasswdd/yppasswdd.c 2006-09-13 09:26:02.000000000 -0400
-@@ -333,6 +333,12 @@
+diff -up ypserv-2.19/rpc.yppasswdd/yppasswdd.c.ports ypserv-2.19/rpc.yppasswdd/yppasswdd.c
+--- ypserv-2.19/rpc.yppasswdd/yppasswdd.c.ports 2006-01-10 20:22:20.000000000 +0100
++++ ypserv-2.19/rpc.yppasswdd/yppasswdd.c 2008-09-25 13:11:23.000000000 +0200
+@@ -333,6 +333,12 @@ main (int argc, char **argv)
break;
case '\253':
my_port = atoi (optarg);
@@ -13,9 +14,10 @@
if (debug_flag)
log_msg ("Using port %d\n", my_port);
break;
---- ypserv-2.19/rpc.ypxfrd/ypxfrd.c.orig 2006-01-10 14:22:20.000000000 -0500
-+++ ypserv-2.19/rpc.ypxfrd/ypxfrd.c 2006-09-13 09:26:09.000000000 -0400
-@@ -199,6 +199,12 @@
+diff -up ypserv-2.19/rpc.ypxfrd/ypxfrd.c.ports ypserv-2.19/rpc.ypxfrd/ypxfrd.c
+--- ypserv-2.19/rpc.ypxfrd/ypxfrd.c.ports 2006-01-10 20:22:20.000000000 +0100
++++ ypserv-2.19/rpc.ypxfrd/ypxfrd.c 2008-09-25 13:11:23.000000000 +0200
+@@ -199,6 +199,12 @@ main (int argc, char **argv)
break;
case 'p':
my_port = atoi(optarg);
@@ -28,9 +30,10 @@
if (debug_flag)
log_msg("Using port %d\n", my_port);
break;
---- ypserv-2.19/yppush/yppush.c.orig 2005-05-31 05:14:40.000000000 -0400
-+++ ypserv-2.19/yppush/yppush.c 2006-09-13 09:26:17.000000000 -0400
-@@ -649,6 +649,12 @@
+diff -up ypserv-2.19/yppush/yppush.c.ports ypserv-2.19/yppush/yppush.c
+--- ypserv-2.19/yppush/yppush.c.ports 2005-05-31 11:14:40.000000000 +0200
++++ ypserv-2.19/yppush/yppush.c 2008-09-25 13:11:23.000000000 +0200
+@@ -649,6 +649,12 @@ main (int argc, char **argv)
log_msg ("yppush cannot run in parallel with a fixed port");
return 1;
}
@@ -43,9 +46,10 @@
break;
default:
Usage (1);
---- ypserv-2.19/ypserv/ypserv.c.orig 2006-09-13 09:00:40.000000000 -0400
-+++ ypserv-2.19/ypserv/ypserv.c 2006-09-13 09:26:32.000000000 -0400
-@@ -492,6 +492,12 @@
+diff -up ypserv-2.19/ypserv/ypserv.c.ports ypserv-2.19/ypserv/ypserv.c
+--- ypserv-2.19/ypserv/ypserv.c.ports 2008-09-25 13:11:23.000000000 +0200
++++ ypserv-2.19/ypserv/ypserv.c 2008-09-25 13:11:23.000000000 +0200
+@@ -492,6 +492,12 @@ main (int argc, char **argv)
break;
case 'p':
my_port = atoi (optarg);
ypserv-2.19-quieter.patch:
Index: ypserv-2.19-quieter.patch
===================================================================
RCS file: /cvs/extras/rpms/ypserv/devel/ypserv-2.19-quieter.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ypserv-2.19-quieter.patch 22 Dec 2006 17:17:37 -0000 1.1
+++ ypserv-2.19-quieter.patch 25 Sep 2008 11:21:57 -0000 1.2
@@ -1,5 +1,6 @@
---- ypserv-2.19/lib/access.c.orig 2006-12-22 11:48:28.080930000 -0500
-+++ ypserv-2.19/lib/access.c 2006-12-22 11:49:35.560015000 -0500
+diff -up ypserv-2.19/lib/access.c.quieter ypserv-2.19/lib/access.c
+--- ypserv-2.19/lib/access.c.quieter 2008-09-25 13:12:17.000000000 +0200
++++ ypserv-2.19/lib/access.c 2008-09-25 13:12:17.000000000 +0200
@@ -201,8 +201,8 @@ is_valid (struct svc_req *rqstp, const c
}
else
ypserv-2.19-slp-warning.patch:
Index: ypserv-2.19-slp-warning.patch
===================================================================
RCS file: /cvs/extras/rpms/ypserv/devel/ypserv-2.19-slp-warning.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ypserv-2.19-slp-warning.patch 13 Feb 2008 12:18:16 -0000 1.1
+++ ypserv-2.19-slp-warning.patch 25 Sep 2008 11:21:57 -0000 1.2
@@ -1,6 +1,6 @@
-diff -up ypserv-2.19/etc/ypserv.conf_old ypserv-2.19/etc/ypserv.conf
---- ypserv-2.19/etc/ypserv.conf_old 2004-04-01 12:06:38.000000000 +0200
-+++ ypserv-2.19/etc/ypserv.conf 2008-02-13 11:43:06.000000000 +0100
+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
files: 30
ypserv-2.5-nfsnobody2.patch:
Index: ypserv-2.5-nfsnobody2.patch
===================================================================
RCS file: /cvs/extras/rpms/ypserv/devel/ypserv-2.5-nfsnobody2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ypserv-2.5-nfsnobody2.patch 9 Sep 2004 15:18:27 -0000 1.1
+++ ypserv-2.5-nfsnobody2.patch 25 Sep 2008 11:21:57 -0000 1.2
@@ -1,6 +1,7 @@
---- ypserv-2.5/scripts/ypMakefile.in.redhat Mon May 27 09:00:27 2002
-+++ ypserv-2.5/scripts/ypMakefile.in Thu Aug 15 14:39:31 2002
-@@ -32,6 +32,11 @@
+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
MINUID=500
MINGID=500
@@ -12,7 +13,7 @@
# Should we merge the passwd file with the shadow file ?
# MERGE_PASSWD=true|false
MERGE_PASSWD=true
-@@ -284,7 +287,7 @@
+@@ -286,7 +291,7 @@ passwd.byname: $(PASSWD) $(SHADOW) $(YPD
@echo "Updating $@..."
@$(UMASK); \
$(MERGER) -p $(PASSWD) $(SHADOW) | \
@@ -21,7 +22,7 @@
print $$1"\t"$$0 }' | $(DBLOAD) -i $(PASSWD) \
-o $(YPMAPDIR)/$@ - $@
-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
-@@ -293,7 +296,7 @@
+@@ -295,7 +300,7 @@ passwd.byuid: $(PASSWD) $(SHADOW) $(YPDI
@echo "Updating $@..."
@$(UMASK); \
$(MERGER) -p $(PASSWD) $(SHADOW) | \
@@ -30,7 +31,7 @@
print $$3"\t"$$0 }' | $(DBLOAD) -i $(PASSWD) \
-o $(YPMAPDIR)/$@ - $@
-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
-@@ -307,7 +310,7 @@
+@@ -309,7 +314,7 @@ else
passwd.byname: $(PASSWD) $(YPDIR)/Makefile
@echo "Updating $@..."
@$(UMASK); \
@@ -39,7 +40,7 @@
print $$1"\t"$$0 }' $(PASSWD) | $(DBLOAD) -i $(PASSWD) \
-o $(YPMAPDIR)/$@ - $@
-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
-@@ -315,7 +318,7 @@
+@@ -317,7 +322,7 @@ passwd.byname: $(PASSWD) $(YPDIR)/Makefi
passwd.byuid: $(PASSWD) $(YPDIR)/Makefile
@echo "Updating $@..."
@$(UMASK); \
@@ -48,7 +49,7 @@
print $$3"\t"$$0 }' $(PASSWD) | $(DBLOAD) -i $(PASSWD) \
-o $(YPMAPDIR)/$@ - $@
-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
-@@ -324,7 +327,7 @@
+@@ -326,7 +331,7 @@ shadow.byname: $(SHADOW) $(YPDIR)/Makefi
@echo "Updating $@..."
@$(UMASK); \
$(AWK) -F: '{ if (FILENAME ~ /shadow$$/) { \
@@ -57,7 +58,7 @@
} else UID[$$1] = $$3; }' $(PASSWD) $(SHADOW) \
| $(DBLOAD) -s -i $(SHADOW) -o $(YPMAPDIR)/$@ - $@
-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
-@@ -343,7 +346,7 @@
+@@ -345,7 +350,7 @@ group.byname: $(GROUP) $(GSHADOW) $(YPDI
@echo "Updating $@..."
@$(UMASK); \
$(MERGER) -g $(GROUP) $(GSHADOW) | \
@@ -66,7 +67,7 @@
print $$1"\t"$$0 }' | $(DBLOAD) -i $(GROUP) -o $(YPMAPDIR)/$@ - $@
-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
-@@ -351,7 +354,7 @@
+@@ -353,7 +358,7 @@ group.bygid: $(GROUP) $(GSHADOW) $(YPDIR
@echo "Updating $@..."
@$(UMASK); \
$(MERGER) -g $(GROUP) $(GSHADOW) | \
@@ -75,7 +76,7 @@
print $$3"\t"$$0 }' | $(DBLOAD) -i $(GROUP) -o $(YPMAPDIR)/$@ - $@
-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
-@@ -360,7 +363,7 @@
+@@ -362,7 +367,7 @@ else
group.byname: $(GROUP) $(YPDIR)/Makefile
@echo "Updating $@..."
@$(UMASK); \
@@ -84,7 +85,7 @@
print $$1"\t"$$0 }' $(GROUP) \
| $(DBLOAD) -i $(GROUP) -o $(YPMAPDIR)/$@ - $@
-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
-@@ -368,7 +371,7 @@
+@@ -370,7 +375,7 @@ group.byname: $(GROUP) $(YPDIR)/Makefile
group.bygid: $(GROUP) $(YPDIR)/Makefile
@echo "Updating $@..."
@$(UMASK); \
ypserv-2.5-redhat.patch:
Index: ypserv-2.5-redhat.patch
===================================================================
RCS file: /cvs/extras/rpms/ypserv/devel/ypserv-2.5-redhat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ypserv-2.5-redhat.patch 9 Sep 2004 15:16:13 -0000 1.1
+++ ypserv-2.5-redhat.patch 25 Sep 2008 11:21:57 -0000 1.2
@@ -1,6 +1,7 @@
---- ypserv-2.5/scripts/ypMakefile.in.redhat Mon May 27 09:00:27 2002
-+++ ypserv-2.5/scripts/ypMakefile.in Thu Aug 15 14:39:31 2002
-@@ -101,8 +104,8 @@
+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
# If you don't want some of these maps built, feel free to comment
# them out from this list.
Index: ypserv.spec
===================================================================
RCS file: /cvs/extras/rpms/ypserv/devel/ypserv.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ypserv.spec 13 Feb 2008 12:18:16 -0000 1.40
+++ ypserv.spec 25 Sep 2008 11:21:57 -0000 1.41
@@ -4,7 +4,7 @@
Url: http://www.linux-nis.org/nis/ypserv/index.html
Name: ypserv
Version: 2.19
-Release: 9%{?dist}
+Release: 10%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.bz2
@@ -145,6 +145,9 @@
%{_includedir}/*/*
%changelog
+* Thu Sep 25 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.19-10
+- Rediff all patches to work with patch --fuzz=0
+
* Wed Feb 13 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.19-9
- Mark /var/yp/Makefile as %%config(noreplace)
Resolves: #432582
More information about the fedora-extras-commits
mailing list