Update to 1.11.5 (minor update).

The security fix that was the reason for releasing 1.11.5 was already
in 1.11.4nb1.

3 files changed, 15 insertions, 36 deletions

diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index fac747e0ef0..a56fe49cb2b 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2003/01/17 02:11:00 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2003/01/21 09:57:50 wiz Exp $
 #
 
-DISTNAME=	cvs-1.11.4
-PKGREVISION=	1
+DISTNAME=	cvs-1.11.5
 CATEGORIES=	devel
 MASTER_SITES=	http://ftp.cvshome.org/${DISTNAME}/ \
 		${MASTER_SITE_GNU:=non-gnu/cvs/}
diff --git a/devel/cvs/distinfo b/devel/cvs/distinfo
index 7303af659fe..fb66c802f90 100644
--- a/devel/cvs/distinfo
+++ b/devel/cvs/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2003/01/16 14:46:07 christos Exp $
+$NetBSD: distinfo,v 1.10 2003/01/21 09:57:50 wiz Exp $
 
-SHA1 (cvs-1.11.4.tar.bz2) = 377caae540f251d2c956778bff3bdf69724f839e
-Size (cvs-1.11.4.tar.bz2) = 2170878 bytes
+SHA1 (cvs-1.11.5.tar.bz2) = 0a2c5e54cb9b1ba3eee5e53a4e3ec5e4c1f4f1f0
+Size (cvs-1.11.5.tar.bz2) = 2171161 bytes
 SHA1 (cvs-1.11.4-v6-20030102.diff.gz) = e162597be51853fde2f849c2bc07ba580891ae1e
 Size (cvs-1.11.4-v6-20030102.diff.gz) = 12671 bytes
 SHA1 (patch-aa) = f4edc7f2c99937881042d8fd39aec3ef6a4ba70a
@@ -19,7 +19,7 @@ SHA1 (patch-an) = 2061110f6f5f44397182b917bd44abe3e63d47a4
 SHA1 (patch-ao) = 0f8472015729f95451c5da6034057ed81695395a
 SHA1 (patch-ap) = ca2b22cde32b13904d7c6d047a30109fb9b53ec4
 SHA1 (patch-aq) = d346e0034589969e88ef5e1efb750302d3d44898
-SHA1 (patch-ar) = 151101b1e8881685f7ddd9ba3d880e2708b89f75
+SHA1 (patch-ar) = 1ab5df642981fe5f8bcfd37b595f7e188172eaef
 SHA1 (patch-as) = 1553c1c32eef8872a6d8b0b4866be447335119f2
 SHA1 (patch-at) = 0243e9179442efebfd81cb8900daa7032f9ee9ea
 SHA1 (patch-au) = 50795e0c4d4d7100aabcde20e54fce913291e0c1
diff --git a/devel/cvs/patches/patch-ar b/devel/cvs/patches/patch-ar
index dca0498ed3a..385ebf103d5 100644
--- a/devel/cvs/patches/patch-ar
+++ b/devel/cvs/patches/patch-ar
@@ -1,8 +1,8 @@
-$NetBSD: patch-ar,v 1.7 2003/01/16 14:46:08 christos Exp $
+$NetBSD: patch-ar,v 1.8 2003/01/21 09:57:50 wiz Exp $
 
---- src/server.c.orig	Thu Jan 16 09:37:28 2003
-+++ src/server.c	Thu Jan 16 09:44:24 2003
-@@ -772,6 +772,7 @@
+--- src/server.c.orig	Tue Jan 21 10:46:47 2003
++++ src/server.c
+@@ -772,6 +772,7 @@ E Protocol error: Root says \"%s\" but p
         nothing.  But for rsh, we need to do it now.  */
      parse_config (current_parsed_root->directory);
  
@@ -10,7 +10,7 @@ $NetBSD: patch-ar,v 1.7 2003/01/16 14:46:08 christos Exp $
      path = xmalloc (strlen (current_parsed_root->directory)
  		   + sizeof (CVSROOTADM)
  		   + 2);
-@@ -789,6 +790,7 @@
+@@ -789,6 +790,7 @@ E Protocol error: Root says \"%s\" but p
  	pending_error = save_errno;
      }
      free (path);
@@ -18,27 +18,7 @@ $NetBSD: patch-ar,v 1.7 2003/01/16 14:46:08 christos Exp $
  
  #ifdef HAVE_PUTENV
      env = xmalloc (strlen (CVSROOT_ENV) + strlen (current_parsed_root->directory) + 2);
-@@ -971,9 +973,6 @@
- 	return;
-     }
- 
--    if (dir_name != NULL)
--	free (dir_name);
--
-     dir_len = strlen (dir);
- 
-     /* Check for a trailing '/'.  This is not ISDIRSEP because \ in the
-@@ -989,6 +988,9 @@
- 	return;
-     }
- 
-+    if (dir_name != NULL)
-+	free (dir_name);
-+
-     dir_name = xmalloc (strlen (server_temp_dir) + dir_len + 40);
-     if (dir_name == NULL)
-     {
-@@ -2174,6 +2176,8 @@
+@@ -2174,6 +2176,8 @@ serve_global_option (arg)
      {
  	case 'n':
  	    noexec = 1;
@@ -47,7 +27,7 @@ $NetBSD: patch-ar,v 1.7 2003/01/16 14:46:08 christos Exp $
  	    break;
  	case 'q':
  	    quiet = 1;
-@@ -4745,8 +4749,13 @@
+@@ -4745,8 +4749,13 @@ struct request requests[] =
    REQ_LINE("Max-dotdot", serve_max_dotdot, 0),
    REQ_LINE("Static-directory", serve_static_directory, 0),
    REQ_LINE("Sticky", serve_sticky, 0),
@@ -61,7 +41,7 @@ $NetBSD: patch-ar,v 1.7 2003/01/16 14:46:08 christos Exp $
    REQ_LINE("Entry", serve_entry, RQ_ESSENTIAL),
    REQ_LINE("Kopt", serve_kopt, 0),
    REQ_LINE("Checkin-time", serve_checkin_time, 0),
-@@ -5237,6 +5246,7 @@
+@@ -5237,6 +5246,7 @@ switch_to_user (username)
      const char *username;
  {
      struct passwd *pw;
@@ -69,7 +49,7 @@ $NetBSD: patch-ar,v 1.7 2003/01/16 14:46:08 christos Exp $
  
      pw = getpwnam (username);
      if (pw == NULL)
-@@ -5296,7 +5306,15 @@
+@@ -5296,7 +5306,15 @@ error 0 %s: no such user\n", username);
  	}
      }