Some more changes for set?id support.

8 files changed, 107 insertions, 29 deletions

diff --git a/devel/cvs/files/patch-sum b/devel/cvs/files/patch-sum
index b0ee124fca3..ad3fcf33ba7 100644
--- a/devel/cvs/files/patch-sum
+++ b/devel/cvs/files/patch-sum
@@ -1,23 +1,24 @@
-$NetBSD: patch-sum,v 1.5 2000/02/23 01:33:21 mycroft Exp $
+$NetBSD: patch-sum,v 1.6 2000/02/23 06:48:55 mycroft Exp $
 
 MD5 (patch-aa) = 5849cf99985eeb67db5f9f69e69e8fd5
 MD5 (patch-ab) = 152906e7f3605dabf55aeedd9af72cce
 MD5 (patch-ac) = 4cef2709c703f5eddadbeea4bf941391
 MD5 (patch-ad) = 872077097162e9ccc5bcba45981ea548
 MD5 (patch-ae) = 74b1abdcc1972981cd39bba16a78cc14
-MD5 (patch-af) = 1ee137f81f348d6d8287bc1cc2212c80
+MD5 (patch-af) = 0b3c7857aa0847764b33d1105597acd1
 MD5 (patch-ak) = 69517b9d8bd99ad50703caf011dd255a
-MD5 (patch-al) = 87018fccd6c509c604cf842bd4c8f85c
-MD5 (patch-am) = 75fb6d25bfe43669e64cc5f8c886a56e
+MD5 (patch-al) = b8d09fb35d14373fb1bd7f3a44f2e3ba
+MD5 (patch-am) = 6309163fb8c2c3fa5ab796e08b498170
 MD5 (patch-an) = dacc9f9386a51b9c8adaf169b8b68200
 MD5 (patch-ao) = 6c9bf927b697b2241d71946e37c7e9db
 MD5 (patch-ap) = ad15f87fa6cbb84799621d385d363e06
 MD5 (patch-aq) = 4376c574048a1dcb9a43dcd0e84dcec5
-MD5 (patch-ar) = 9aec2a8b76d7590845ee0253e2fa34d9
+MD5 (patch-ar) = 29a235e68b26547a4cfc91655143a5ee
 MD5 (patch-as) = a1ee9d85ca2a060240d8d75f1d41f1a2
 MD5 (patch-at) = d93c12293c95d3dfad29ff79cefbf992
-MD5 (patch-au) = c29d29e86268d86449cb445a8ad909c5
+MD5 (patch-au) = 2f1ac71a9a44a70fff7a7c5b672fe965
 MD5 (patch-av) = 9916350cec2ba23d36d5c4b9ccca9a91
 MD5 (patch-aw) = c30d4e920fd58e24628ade29c762a2e9
 MD5 (patch-ax) = 1f5eccc22dcd87fa5617fd03bc7f9260
-MD5 (patch-ay) = 7f241664f153b502a319ed5eec91a5b5
+MD5 (patch-ay) = 582a67798f19e25bcfd5d6c6201bdc76
+MD5 (patch-az) = f1cfc49cc61c4a74a09a345bd02a08aa
diff --git a/devel/cvs/patches/patch-af b/devel/cvs/patches/patch-af
index 6df10a7116b..fb819d3a395 100644
--- a/devel/cvs/patches/patch-af
+++ b/devel/cvs/patches/patch-af
@@ -1,8 +1,18 @@
-$NetBSD: patch-af,v 1.1 1999/01/18 21:11:48 bad Exp $
+$NetBSD: patch-af,v 1.2 2000/02/23 06:48:56 mycroft Exp $
 
---- src/update.c.orig	Thu Jun 25 16:56:50 1998
-+++ src/update.c	Mon Jan 18 20:17:08 1999
-@@ -1304,11 +1304,18 @@
+--- src/update.c.orig	Thu Jun 25 10:56:50 1998
++++ src/update.c	Wed Feb 23 01:28:45 2000
+@@ -1039,7 +1039,8 @@
+ 	    cvs_output (": Executing '", 0);
+ 	    run_print (stdout);
+ 	    cvs_output ("'\n", 0);
+-	    (void) run_exec (RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL);
++	    (void) run_exec (RUN_TTY, RUN_TTY, RUN_TTY,
++			     RUN_NORMAL | RUN_UNSETXID);
+ 	}
+ 	else if (ferror (fp))
+ 	    error (0, errno, "cannot read %s", CVSADM_UPROG);
+@@ -1304,11 +1305,18 @@
  		    xchmod (finfo->file, 1);
  		else
  		{
diff --git a/devel/cvs/patches/patch-al b/devel/cvs/patches/patch-al
index e911f3a93f4..a94aa4789df 100644
--- a/devel/cvs/patches/patch-al
+++ b/devel/cvs/patches/patch-al
@@ -1,11 +1,22 @@
-$NetBSD: patch-al,v 1.2 1999/04/20 15:11:35 mycroft Exp $
+$NetBSD: patch-al,v 1.3 2000/02/23 06:48:56 mycroft Exp $
 
 --- src/client.c.orig	Sun Jul 26 22:54:06 1998
-+++ src/client.c	Tue Apr 20 10:45:19 1999
-@@ -4172,6 +4172,16 @@
++++ src/client.c	Wed Feb 23 01:23:49 2000
+@@ -1777,7 +1777,8 @@
+ 		run_arg ("~");
+ 		run_arg (filename);
+ 		run_arg (temp_filename);
+-		retcode = run_exec (DEVNULL, RUN_TTY, RUN_TTY, RUN_NORMAL);
++		retcode = run_exec (DEVNULL, RUN_TTY, RUN_TTY,
++				    RUN_NORMAL | RUN_UNSETXID);
+ 	    }
+ 	    /* FIXME: should we really be silently ignoring errors?  */
+ 	    (void) unlink_file (temp_filename);
+@@ -4171,6 +4172,16 @@
+ 	    else
  		error (1, 0,
  		       "This server does not support the global -n option.");
- 	}
++	}
 +	if (nolock && !noexec)
 +	{
 +	    if (have_global)
@@ -15,7 +26,6 @@ $NetBSD: patch-al,v 1.2 1999/04/20 15:11:35 mycroft Exp $
 +	    else
 +		error (1, 0,
 +		       "This server does not support the global -u option.");
-+	}
+ 	}
  	if (quiet)
  	{
- 	    if (have_global)
diff --git a/devel/cvs/patches/patch-am b/devel/cvs/patches/patch-am
index 68ef7e815d1..c16175135ae 100644
--- a/devel/cvs/patches/patch-am
+++ b/devel/cvs/patches/patch-am
@@ -1,7 +1,7 @@
-$NetBSD: patch-am,v 1.2 2000/02/23 01:32:11 mycroft Exp $
+$NetBSD: patch-am,v 1.3 2000/02/23 06:48:56 mycroft Exp $
 
 --- src/cvs.h.orig	Sun Jul 26 22:54:11 1998
-+++ src/cvs.h	Tue Feb 22 20:25:09 2000
++++ src/cvs.h	Wed Feb 23 01:22:45 2000
 @@ -383,6 +383,7 @@
  
  extern int trace;		/* Show all commands */
@@ -14,7 +14,7 @@ $NetBSD: patch-am,v 1.2 2000/02/23 01:32:11 mycroft Exp $
  #define	RUN_STDOUT_APPEND	0x0004	/* append to stdout, don't truncate */
  #define	RUN_STDERR_APPEND	0x0008	/* append to stderr, don't truncate */
  #define	RUN_SIGIGNORE		0x0010	/* ignore interrupts for command */
-+#define	RUN_UNSETXID		0x0020	/* undo setgid in child */
++#define	RUN_UNSETXID		0x0020	/* undo setxid in child */
  #define	RUN_TTY		(char *)0	/* for the benefit of lint */
  
  void run_arg PROTO((const char *s));
diff --git a/devel/cvs/patches/patch-ar b/devel/cvs/patches/patch-ar
index dffd878f999..3cdf731c0c4 100644
--- a/devel/cvs/patches/patch-ar
+++ b/devel/cvs/patches/patch-ar
@@ -1,7 +1,7 @@
-$NetBSD: patch-ar,v 1.2 1999/04/20 15:09:44 mycroft Exp $
+$NetBSD: patch-ar,v 1.3 2000/02/23 06:48:56 mycroft Exp $
 
 --- src/server.c.orig	Thu Aug  6 20:46:38 1998
-+++ src/server.c	Tue Apr 20 10:43:30 1999
++++ src/server.c	Wed Feb 23 01:18:51 2000
 @@ -597,31 +597,34 @@
         nothing.  But for rsh, we need to do it now.  */
      parse_config (CVSroot_directory);
@@ -69,3 +69,33 @@ $NetBSD: patch-ar,v 1.2 1999/04/20 15:09:44 mycroft Exp $
  	    break;
  	case 'q':
  	    quiet = 1;
+@@ -4663,19 +4668,23 @@
+ #endif /* HAVE_INITGROUPS */
+ 
+ #ifdef SETXID_SUPPORT
+-    /* honor the setgid bit iff set*/
++    /* Honor the setgid bit iff set. */
+     if (getgid() != getegid())
+-    {
+ 	setgid (getegid ());
+-    }
+     else
+ #else
+-    {
+ 	setgid (pw->pw_gid);
+-    }
+ #endif
+     
+-    setuid (pw->pw_uid);
++#ifdef SETXID_SUPPORT
++    /* Honor the setuid bit iff set. */
++    if (getuid() != geteuid())
++	setuid (geteuid ());
++    else
++#else
++	setuid (pw->pw_uid);
++#endif
++
+     /* We don't want our umask to change file modes.  The modes should
+        be set by the modes used in the repository, and by the umask of
+        the client.  */
diff --git a/devel/cvs/patches/patch-au b/devel/cvs/patches/patch-au
index 50e84ba50c6..dcdbea3488c 100644
--- a/devel/cvs/patches/patch-au
+++ b/devel/cvs/patches/patch-au
@@ -1,7 +1,7 @@
-$NetBSD: patch-au,v 1.1 1999/05/25 17:52:25 mycroft Exp $
+$NetBSD: patch-au,v 1.2 2000/02/23 06:48:56 mycroft Exp $
 
---- src/commit.c.orig	Thu Aug  6 20:04:11 1998
-+++ src/commit.c	Tue May 25 10:25:05 1999
+--- src/commit.c.orig	Thu Aug  6 23:04:11 1998
++++ src/commit.c	Wed Feb 23 01:24:54 2000
 @@ -984,7 +984,9 @@
  		  xmalloc (sizeof (struct logfile_info)));
  	    li->type = status;
@@ -13,3 +13,13 @@ $NetBSD: patch-au,v 1.1 1999/05/25 17:52:25 mycroft Exp $
  	    li->rev_new = NULL;
  	    p->data = (char *) li;
  	    (void) addnode (ulist, p);
+@@ -1476,7 +1478,8 @@
+ 		cvs_output (": Executing '", 0);
+ 		run_print (stdout);
+ 		cvs_output ("'\n", 0);
+-		(void) run_exec (RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL);
++		(void) run_exec (RUN_TTY, RUN_TTY, RUN_TTY,
++				 RUN_NORMAL | RUN_UNSETXID);
+ 		free (repos);
+ 	    }
+ 	    else
diff --git a/devel/cvs/patches/patch-ay b/devel/cvs/patches/patch-ay
index 153e6d3ee1c..50e75d730c6 100644
--- a/devel/cvs/patches/patch-ay
+++ b/devel/cvs/patches/patch-ay
@@ -1,15 +1,18 @@
-$NetBSD: patch-ay,v 1.1 2000/02/23 01:32:12 mycroft Exp $
+$NetBSD: patch-ay,v 1.2 2000/02/23 06:48:56 mycroft Exp $
 
 --- src/run.c.orig	Thu Dec 18 10:18:50 1997
-+++ src/run.c	Tue Feb 22 20:25:09 2000
-@@ -188,6 +188,10 @@
++++ src/run.c	Wed Feb 23 01:19:27 2000
+@@ -188,6 +188,13 @@
  #endif
      if (pid == 0)
      {
 +#ifdef SETXID_SUPPORT
-+	if (flags & RUN_UNSETXID)
++	if (flags & RUN_UNSETXID) {
 +	    (void) setgid (getgid ());
++	    (void) setuid (getuid ());
++	}
 +#endif
++
  	if (shin != 0)
  	{
  	    (void) dup2 (shin, 0);
diff --git a/devel/cvs/patches/patch-az b/devel/cvs/patches/patch-az
new file mode 100644
index 00000000000..8d296fdd505
--- /dev/null
+++ b/devel/cvs/patches/patch-az
@@ -0,0 +1,14 @@
+$NetBSD: patch-az,v 1.1 2000/02/23 06:49:28 mycroft Exp $
+
+--- src/modules.c.orig	Wed Feb 23 01:29:50 2000
++++ src/modules.c	Wed Feb 23 01:27:57 2000
+@@ -720,7 +720,8 @@
+ 		    run_print (stdout);
+ 		    cvs_output ("'\n", 0);
+ 		}
+-		err += run_exec (RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL);
++		err += run_exec (RUN_TTY, RUN_TTY, RUN_TTY,
++				 RUN_NORMAL | RUN_UNSETXID);
+ 		free (expanded_path);
+ 	    }
+ 	    free (real_prog);