From root@atleo5.leo.org  Fri Jan  4 12:11:45 2002
Return-Path: <root@atleo5.leo.org>
Received: from tuminfo2.informatik.tu-muenchen.de (tuminfo2.informatik.tu-muenchen.de [131.159.0.81])
	by hub.freebsd.org (Postfix) with ESMTP id F32E937B41B
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  4 Jan 2002 12:11:44 -0800 (PST)
Received: from atleo5.leo.org (atleo5.leo.org [131.159.72.36])
	by tuminfo2.informatik.tu-muenchen.de (Postfix) with ESMTP
	id E8E6410B70; Fri,  4 Jan 2002 21:11:37 +0100 (MET)
Received: by atleo5.leo.org (Postfix, from userid 0)
	id ACDAF22E10; Fri,  4 Jan 2002 21:11:43 +0100 (CET)
Message-Id: <20020104201143.ACDAF22E10@atleo5.leo.org>
Date: Fri,  4 Jan 2002 21:11:43 +0100 (CET)
From: dl@leo.org
Reply-To: dl@leo.org
To: FreeBSD-gnats-submit@freebsd.org
Cc: dl@leo.org
Subject: cvs chokes on OpenBSD repositories
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         33551
>Category:       gnu
>Synopsis:       cvs chokes on OpenBSD repositories
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 04 12:20:01 PST 2002
>Closed-Date:    Wed Feb 28 07:33:11 GMT 2007
>Last-Modified:  Wed Feb 28 07:33:11 GMT 2007
>Originator:     Daniel Lang
>Release:        FreeBSD 4.4-STABLE i386
>Organization:
LEO
>Environment:
System: FreeBSD atleo5.leo.org 4.4-STABLE FreeBSD 4.4-STABLE #1: Thu Dec 13 17:01:50 CET 2001 root@atleo5.leo.org:/usr/obj/usr/src/sys/ATLEO5 i386

>Description:
 I use FreeBSD as a large anoncvs server, that also serves an
 OpenBSD repository. However the OpenBSD extension with their
 tag (with tag beeing an option in the option file of the
 repository) make FreeBSD's cvs (server) choke and don't allow
 access. Here is a little patch by Christian Weisgerber <naddy@mips.inka.de>
 to fix this, i.e. make FreeBSD's cvs ignore these options
 instead of aborting.

>How-To-Repeat:
 Get an OpenBSD CVS repository, set up anoncvs via :pserver:
 and try to log in
>Fix:

Index: parseinfo.c
===================================================================
RCS file: /cvs/src/contrib/cvs/src/parseinfo.c,v
retrieving revision 1.1.1.9
diff -u -r1.1.1.9 parseinfo.c
--- parseinfo.c	10 Aug 2001 09:43:21 -0000	1.1.1.9
+++ parseinfo.c	13 Nov 2001 17:10:12 -0000
@@ -335,6 +335,18 @@
 		goto error_return;
 	    }
 	}
+	else if (strcmp (line, "tag") == 0)
+	{
+		/* OpenBSD extension, skip silently */
+	}
+	else if (strcmp (line, "umask") == 0)
+	{
+		/* OpenBSD extension, skip silently */
+	}
+	else if (strcmp (line, "dlimit") == 0)
+	{
+		/* OpenBSD extension, skip silently */
+	}
 	else if (strcmp (line, "PreservePermissions") == 0)
 	{
 	    if (strcmp (p, "no") == 0)
>Release-Note:
>Audit-Trail:

From: Giorgos Keramidas <keramida@FreeBSD.org>
To: dl@leo.org
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: gnu/33551: cvs chokes on OpenBSD repositories
Date: Sat, 12 Jan 2002 02:13:50 +0200

 On 2002-01-04 21:11:43, dl@leo.org wrote:
 > 
 > >Number:         33551
 > >Category:       gnu
 > >Synopsis:       cvs chokes on OpenBSD repositories
 > >Confidential:   no
 > >Severity:       serious
 > >Priority:       medium
 > >Responsible:    freebsd-bugs
 > >State:          open
 > >Quarter:        
 > >Keywords:       
 > >Date-Required:
 > >Class:          sw-bug
 > >Submitter-Id:   current-users
 > >Arrival-Date:   Fri Jan 04 12:20:01 PST 2002
 > >Closed-Date:
 > >Last-Modified:
 > >Originator:     Daniel Lang
 > >Release:        FreeBSD 4.4-STABLE i386
 > >Organization:
 > LEO
 > >Environment:
 > System: FreeBSD atleo5.leo.org 4.4-STABLE FreeBSD 4.4-STABLE #1: Thu Dec 13 17:01:50 CET 2001 root@atleo5.leo.org:/usr/obj/usr/src/sys/ATLEO5 i386
 > 
 > >Description:
 >  I use FreeBSD as a large anoncvs server, that also serves an
 >  OpenBSD repository. However the OpenBSD extension with their
 >  tag (with tag beeing an option in the option file of the
 >  repository) make FreeBSD's cvs (server) choke and don't allow
 >  access. Here is a little patch by Christian Weisgerber <naddy@mips.inka.de>
 >  to fix this, i.e. make FreeBSD's cvs ignore these options
 >  instead of aborting.
 
 Does CVS have the same problem on other platforms?  I don't have an
 OpenBSD CVS repo mirror handy to test this with (for example) Linux
 and a CVS server.
 
 As for the change itself, perhaps the CVS maintainers should be
 contacted, for this change, so that it's cleanly imported with some
 future version of CVS in our tree?
 
 -- 
 Giorgos Keramidas . . . . . . . . . keramida@{ceid.upatras.gr,freebsd.org}
 FreeBSD Documentation Project . . . http://www.freebsd.org/docproj/
 FreeBSD: The power to serve . . . . http://www.freebsd.org/

From: Daniel Lang <dl@leo.org>
To: Giorgos Keramidas <keramida@FreeBSD.org>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: gnu/33551: cvs chokes on OpenBSD repositories
Date: Mon, 14 Jan 2002 10:56:11 +0100

 Hi,
 
 Giorgos Keramidas wrote on Sat, Jan 12, 2002 at 02:13:50AM +0200:
 [..]
 > Does CVS have the same problem on other platforms?  I don't have an
 > OpenBSD CVS repo mirror handy to test this with (for example) Linux
 > and a CVS server.
 Sorry I don't have other platforms available. Hmm maybe I 
 could copy the repository on a Solaris/Sparc box, and try 
 that... I will notify you, if I succeeded in testing this.
 
 > As for the change itself, perhaps the CVS maintainers should be
 > contacted, for this change, so that it's cleanly imported with some
 > future version of CVS in our tree?
 Yes, who are the CVS maintainers? I assumed the PR was handed
 over to the responsible parties (i.e. them).
 
 Best regards,
  Daniel
 -- 
 IRCnet: Mr-Spock                                    - Eddie would go! -
  Daniel Lang * dl@leo.org * +49 89 289 25735 * http://www.leo.org/~dl/

From: Peter Pentchev <roam@ringlet.net>
To: Daniel Lang <dl@leo.org>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: gnu/33551: cvs chokes on OpenBSD repositories
Date: Mon, 14 Jan 2002 13:53:41 +0200

 On Mon, Jan 14, 2002 at 02:00:04AM -0800, Daniel Lang wrote:
 > The following reply was made to PR gnu/33551; it has been noted by GNATS.
 > 
 >  Giorgos Keramidas wrote on Sat, Jan 12, 2002 at 02:13:50AM +0200:
 >  [..]
 >  > As for the change itself, perhaps the CVS maintainers should be
 >  > contacted, for this change, so that it's cleanly imported with some
 >  > future version of CVS in our tree?
 >  Yes, who are the CVS maintainers? I assumed the PR was handed
 >  over to the responsible parties (i.e. them).
 
 I believe Peter Wemm is the FreeBSD CVS maintainer.  However, I think
 that Giorgos was referring to the CVS authors, the folks at
 http://cvshome.org/
 
 G'luck,
 Peter
 
 -- 
 I am jealous of the first word in this sentence.

From: Giorgos Keramidas <keramida@ceid.upatras.gr>
To: Daniel Lang <dl@leo.org>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: gnu/33551: cvs chokes on OpenBSD repositories
Date: Mon, 14 Jan 2002 19:49:58 +0200

 On 2002-01-14 10:56:11, Daniel Lang wrote:
 > Giorgos Keramidas wrote on Sat, Jan 12, 2002 at 02:13:50AM +0200:
 > > Does CVS have the same problem on other platforms?  I don't have an
 > > OpenBSD CVS repo mirror handy to test this with (for example) Linux
 > > and a CVS server.
 >
 > Sorry I don't have other platforms available. Hmm maybe I
 > could copy the repository on a Solaris/Sparc box, and try
 > that... I will notify you, if I succeeded in testing this.
 
 Thanks.  Do all the testing you can.  I'll try and test this on a
 Linux box I got a new account today, and see if I can reproduce the
 bug :-)
 
 > Yes, who are the CVS maintainers? I assumed the PR was handed
 > over to the responsible parties (i.e. them).
 
 Pardon me, I should have copy/pasted a link.
 The mailing list where the CVS developers can be contacted is
 <dev@ccvs.cvshome.org>.  The homepage of the CVS project is at:
 http://www.cvshome.org/
 
 After testing proves that this is a bug in CVS, and a possible
 solution is found we should contact the CVS developers, and see if
 this can be fixed in their source tree.
 
 -- 
 Giorgos Keramidas . . . . . . . . . keramida@{ceid.upatras.gr,freebsd.org}
 FreeBSD Documentation Project . . . http://www.freebsd.org/docproj/
 FreeBSD: The power to serve . . . . http://www.freebsd.org/

From: Daniel Lang <dl@leo.org>
To: Giorgos Keramidas <keramida@ceid.upatras.gr>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: gnu/33551: cvs chokes on OpenBSD repositories
Date: Mon, 14 Jan 2002 19:49:25 +0100

 Hi,
 
 Giorgos Keramidas wrote on Mon, Jan 14, 2002 at 07:49:58PM +0200:
 [..]
 > > Yes, who are the CVS maintainers? I assumed the PR was handed
 > > over to the responsible parties (i.e. them).
 > 
 > Pardon me, I should have copy/pasted a link.
 > The mailing list where the CVS developers can be contacted is
 > <dev@ccvs.cvshome.org>.  The homepage of the CVS project is at:
 > http://www.cvshome.org/
 > 
 > After testing proves that this is a bug in CVS, and a possible
 > solution is found we should contact the CVS developers, and see if
 > this can be fixed in their source tree.
 Ah. Well I'm not sure if this can be considered a bug in CVS.
 
 The problem is this, FreeBSD, NetBSD and OpenBSD have all
 patched their CVS distribution, so that something different
 instead of the $Id$ tag may be used, like $FreeBSD$ or
 $OpenBSD$. Now at least for FreeBSD and OpenBSD these patches/
 extensions to CVS are incompatible, i.e. they've did it another way.
 OpenBSD uses special keywords in a CVSROOT/config or options file
 to achieve this. FreeBSD's cvs cannot use them, and complains
 if they are found.
 
 So from CVS-Project ( cvshome.org ) point of view, it's no bug,
 since additional Tags like $OpenBSD$ aren't supported anyway.
 
 The "good" way to do it, would be to sort out the most
 reasonable way how to support these extensions from
 all BSD projects, incorporate them into the native CVS,
 and then reimport them to all projects, so that a common
 way is used. 
 
 I think chances that this will happen are not too high, 
 but maybe I'm pessimistic here.
 
 The patch from Naddy, which I supplied, makes the FreeBSD cvs
 (server) work with an OpenBSD repository, by ignoring these
 directives (this does apparently no harm to the clients
 which need to be able to handle the additional tags).
 
 Best regards,
  Daniel
 -- 
 IRCnet: Mr-Spock                      - Me transfere sursum, Caledoni -  
 *Daniel Lang * dl@leo.org * +49 89 289 25735 * http://www.leo.org/~dl/*
State-Changed-From-To: open->closed 
State-Changed-By: sheldonh 
State-Changed-When: Mon Jan 28 08:56:46 PST 2002 
State-Changed-Why:  
As noted by the originator, the CVS maintainers should be 
encouraged to introduce support for multiple Id forms. 

Once that's done and a new version of CVS is released, a 
new PR can be opened for updating CVS. 

In the meantime, this PR contains a patch for anyone who can't 
wait. 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=33551 
State-Changed-From-To: closed->feedback 
State-Changed-By: sheldonh 
State-Changed-When: Mon Jan 28 08:58:35 PST 2002 
State-Changed-Why:  
Argh, this PR should remain in feedback state, since we're 
waiting to hear from the originator what transpires in 
correspondence with the CVS maintainers. 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=33551 
State-Changed-From-To: feedback->suspended 
State-Changed-By: matteo 
State-Changed-When: Tue Aug 30 10:05:58 GMT 2005 
State-Changed-Why:  
This is a CVS authors' problem, not ours. Anyway, suspend it, since this is something that ought to be done. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=33551 
State-Changed-From-To: suspended->closed 
State-Changed-By: remko 
State-Changed-When: Wed Feb 28 07:33:09 UTC 2007 
State-Changed-Why:  
OK: I looked this information up in a 6-stable branch i have around 
here. I see that the patch that is provided is implemented (A bit 
different though), so this issue can be closed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=33551 
>Unformatted:
