Rediff patches

diff --git a/ypserv-nfsnobody.patch b/ypserv-nfsnobody.patch
index e44bee8d467b946e83e63d233615d25566d8b5a5..7e115fb83a341e0df15d0b04839db2d4e1337cb8 100644 (file)
--- a/ypserv-nfsnobody.patch
+++ b/ypserv-nfsnobody.patch
@@ -1,16 +1,17 @@
---- 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,9 @@
- MINUID=500
- MINGID=500
+diff -urNp -x '*.orig' ypserv-4.1.org/scripts/ypMakefile.in ypserv-4.1/scripts/ypMakefile.in
+--- ypserv-4.1.org/scripts/ypMakefile.in       2023-02-01 20:15:20.459395541 +0100
++++ ypserv-4.1/scripts/ypMakefile.in   2023-02-01 20:15:20.519395864 +0100
+@@ -40,6 +40,9 @@ YPPUSH_ARGS =
+ MINUID=$(shell TMP=`egrep '^UID_MIN\s+[0-9]+' /etc/login.defs|sed -e 's/^UID_MIN//'` ; [ -n "$$TMP" ] && echo "$$TMP" || echo 1000)
+ MINGID=$(shell TMP=`egrep '^GID_MIN\s+[0-9]+' /etc/login.defs|sed -e 's/^GID_MIN//'` ; [ -n "$$TMP" ] && echo "$$TMP" || echo 1000)
  
 +NFSNOBODYUID=65534
 +NFSNOBODYGID=65534
 +
  # Should we merge the passwd file with the shadow file ?
  # MERGE_PASSWD=true|false
- MERGE_PASSWD=true
-@@ -284,7 +287,7 @@
+ MERGE_PASSWD=false
+@@ -295,7 +298,7 @@ passwd.byname: $(PASSWD) $(SHADOW) $(YPD
        @echo "Updating $@..."
        @$(UMASK); \
        $(MERGER) -p $(PASSWD) $(SHADOW) | \
@@ -19,7 +20,7 @@
           print $$1"\t"$$0 }' | $(DBLOAD) -i $(PASSWD) \
                -o $(YPMAPDIR)/$@ - $@
        -@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
-@@ -293,7 +296,7 @@
+@@ -304,7 +307,7 @@ passwd.byuid: $(PASSWD) $(SHADOW) $(YPDI
        @echo "Updating $@..."
        @$(UMASK); \
        $(MERGER) -p $(PASSWD) $(SHADOW) | \
@@ -28,7 +29,7 @@
           print $$3"\t"$$0 }' | $(DBLOAD) -i $(PASSWD) \
                 -o $(YPMAPDIR)/$@ - $@
        -@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
-@@ -307,7 +310,7 @@
+@@ -318,7 +321,7 @@ else
  passwd.byname: $(PASSWD) $(YPDIR)/Makefile
        @echo "Updating $@..."
        @$(UMASK); \
@@ -37,7 +38,7 @@
           print $$1"\t"$$0 }' $(PASSWD) | $(DBLOAD) -i $(PASSWD) \
                -o $(YPMAPDIR)/$@ - $@
        -@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
-@@ -315,7 +318,7 @@
+@@ -326,7 +329,7 @@ passwd.byname: $(PASSWD) $(YPDIR)/Makefi
  passwd.byuid: $(PASSWD) $(YPDIR)/Makefile
        @echo "Updating $@..."
        @$(UMASK); \
@@ -46,7 +47,7 @@
           print $$3"\t"$$0 }' $(PASSWD) | $(DBLOAD) -i $(PASSWD) \
                 -o $(YPMAPDIR)/$@ - $@
        -@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
-@@ -324,7 +327,7 @@
+@@ -335,7 +338,7 @@ shadow.byname: $(SHADOW) $(YPDIR)/Makefi
        @echo "Updating $@..."
        @$(UMASK); \
        $(AWK) -F: '{ if (FILENAME ~ /shadow$$/) { \
@@ -55,7 +56,7 @@
                        } else UID[$$1] = $$3; }' $(PASSWD) $(SHADOW) \
                | $(DBLOAD) -s -i $(SHADOW) -o $(YPMAPDIR)/$@ - $@
        -@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
-@@ -343,7 +346,7 @@
+@@ -354,7 +357,7 @@ group.byname: $(GROUP) $(GSHADOW) $(YPDI
        @echo "Updating $@..."
        @$(UMASK); \
        $(MERGER) -g $(GROUP) $(GSHADOW) | \
@@ -64,7 +65,7 @@
        print $$1"\t"$$0 }' | $(DBLOAD) -i $(GROUP) -o $(YPMAPDIR)/$@ - $@
        -@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
  
-@@ -351,7 +354,7 @@
+@@ -362,7 +365,7 @@ group.bygid: $(GROUP) $(GSHADOW) $(YPDIR
        @echo "Updating $@..."
        @$(UMASK); \
        $(MERGER) -g $(GROUP) $(GSHADOW) | \
@@ -73,7 +74,7 @@
        print $$3"\t"$$0 }' | $(DBLOAD) -i $(GROUP) -o $(YPMAPDIR)/$@ - $@
        -@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
  
-@@ -360,7 +363,7 @@
+@@ -371,7 +374,7 @@ else
  group.byname: $(GROUP) $(YPDIR)/Makefile
        @echo "Updating $@..."
        @$(UMASK); \
@@ -82,7 +83,7 @@
                                        print $$1"\t"$$0 }' $(GROUP) \
                | $(DBLOAD) -i $(GROUP) -o $(YPMAPDIR)/$@ - $@
        -@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
-@@ -368,7 +371,7 @@
+@@ -379,7 +382,7 @@ group.byname: $(GROUP) $(YPDIR)/Makefile
  group.bygid: $(GROUP) $(YPDIR)/Makefile
        @echo "Updating $@..."
        @$(UMASK); \