From kunia@snark.ukma.kiev.ua  Thu Aug 16 00:43:32 2001
Return-Path: <kunia@snark.ukma.kiev.ua>
Received: from roller.ukma.kiev.ua (relay1.UKMA.Kiev.UA [194.44.142.4])
	by hub.freebsd.org (Postfix) with ESMTP id 6DD1437B403
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 16 Aug 2001 00:43:29 -0700 (PDT)
	(envelope-from kunia@snark.ukma.kiev.ua)
Received: from snark.ukma.kiev.ua (snark.ukma.kiev.ua [194.44.143.83])
	by roller.ukma.kiev.ua (8.11.3/8.11.3) with ESMTP id f7G7ikc55786
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 16 Aug 2001 10:44:47 +0300 (EEST)
	(envelope-from kunia@snark.ukma.kiev.ua)
Received: (from kunia@localhost)
	by snark.ukma.kiev.ua (8.11.4/8.11.4) id f7G7h3R25774;
	Thu, 16 Aug 2001 10:43:03 +0300 (EEST)
	(envelope-from kunia)
Message-Id: <200108160743.f7G7h3R25774@snark.ukma.kiev.ua>
Date: Thu, 16 Aug 2001 10:43:03 +0300 (EEST)
From: Olexandr Kunytsa <kunia@snark.ukma.kiev.ua>
Reply-To: Olexandr Kunytsa <kunia@x-telecom.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: incorrect description of 'standart-supfile'
X-Send-Pr-Version: 3.113
X-GNATS-Notify: ru

>Number:         29767
>Category:       docs
>Synopsis:       incorrect description of 'standart-supfile'
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 16 00:50:02 PDT 2001
>Closed-Date:    Fri Nov 07 12:52:15 PST 2003
>Last-Modified:  Fri Nov 07 12:52:15 PST 2003
>Originator:     Olexandr Kunytsa
>Release:        FreeBSD 4.3-STABLE i386
>Organization:
XTC
>Environment:
System: FreeBSD snark.ukma.kiev.ua 4.3-STABLE FreeBSD 4.3-STABLE #2: Fri Jul 27 11:48:33 EEST 2001 root@snark.ukma.kiev.ua:/usr/obj/usr/src/sys/AUDIO i386


>Description:

        standard-supfile in -stable now gets you the -stable sources, but it
        is pointed inside the file that it contains "CVSup collections" for
        current-sources.

>How-To-Repeat:
enigma# head -4 standard-supfile
# $FreeBSD: src/share/examples/cvsup/standard-supfile,v 1.17.2.2 2001/04/11 21:5
0:13 nik Exp $
#
# This file contains all of the "CVSup collections" that make up the
# FreeBSD-current source tree.
enigma# head -4 stable-supfile
# $FreeBSD: src/share/examples/cvsup/stable-supfile,v 1.19.2.4 2000/08/18 18:50:
21 jkh Exp $
#
# This file contains all of the "CVSup collections" that make up the
# FreeBSD-stable source tree.
enigma# grep -v # standard-supfile > 1
enigma# grep -v # stable-supfile > 2
enigma# diff -u 1 2
enigma#



>Fix:
--- standard-supfile.orig       Thu Aug 16 10:30:23 2001
+++ standard-supfile    Thu Aug 16 10:30:52 2001
@@ -1,7 +1,7 @@
 # $FreeBSD: src/share/examples/cvsup/standard-supfile,v 1.17.2.2 2001/04/11 21:50:13 nik Exp $
 #
 # This file contains all of the "CVSup collections" that make up the
-# FreeBSD-current source tree.
+# FreeBSD-stable source tree.
 #
 # CVSup (CVS Update Protocol) allows you to download the latest CVS
 # tree (or any branch of development therefrom) to your system easily


>Release-Note:
>Audit-Trail:

From: Ruslan Ermilov <ru@FreeBSD.ORG>
To: Olexandr Kunytsa <kunia@x-telecom.net>
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: docs/29767: incorrect description of 'standart-supfile'
Date: Thu, 16 Aug 2001 10:58:13 +0300

 On Thu, Aug 16, 2001 at 10:43:03AM +0300, Olexandr Kunytsa wrote:
 > 
 > standard-supfile in -stable now gets you the -stable sources, but it
 > is pointed inside the file that it contains "CVSup collections" for
 > current-sources.
 > 
 And also in README.  I think that either
 
 	standard-supfile should be deleted from -STABLE
 
 *OR*
 	standard-supfile should be (repo)moved to current-supfile
 	in -CURRENT, and MFC'ed to -STABLE.  With corrections to
 	README.
 
 
 Cheers,
 -- 
 Ruslan Ermilov		Oracle Developer/DBA,
 ru@sunbay.com		Sunbay Software AG,
 ru@FreeBSD.org		FreeBSD committer,
 +380.652.512.251	Simferopol, Ukraine
 
 http://www.FreeBSD.org	The Power To Serve
 http://www.oracle.com	Enabling The Information Age
Responsible-Changed-From-To: freebsd-doc->jdp 
Responsible-Changed-By: ru 
Responsible-Changed-When: Thu Aug 16 01:09:08 PDT 2001 
Responsible-Changed-Why:  
John, could you please look at this? 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=29767 

From: Ruslan Ermilov <ru@FreeBSD.org>
To: John Baldwin <jhb@FreeBSD.org>
Cc: freebsd-doc@FreeBSD.org, bug-followup@FreeBSD.org
Subject: Re: docs/29767: incorrect description of 'standart-supfile'
Date: Thu, 16 Aug 2001 19:37:36 +0300

 On Thu, Aug 16, 2001 at 07:59:07AM -0700, John Baldwin wrote:
 > 
 > On 16-Aug-01 Ruslan Ermilov wrote:
 > > The following reply was made to PR docs/29767; it has been noted by GNATS.
 > > 
 > > From: Ruslan Ermilov <ru@FreeBSD.ORG>
 > > To: Olexandr Kunytsa <kunia@x-telecom.net>
 > > Cc: FreeBSD-gnats-submit@FreeBSD.ORG
 > > Subject: Re: docs/29767: incorrect description of 'standart-supfile'
 > > Date: Thu, 16 Aug 2001 10:58:13 +0300
 > > 
 > >  On Thu, Aug 16, 2001 at 10:43:03AM +0300, Olexandr Kunytsa wrote:
 > >  > 
 > >  > standard-supfile in -stable now gets you the -stable sources, but it
 > >  > is pointed inside the file that it contains "CVSup collections" for
 > >  > current-sources.
 > >  > 
 > >  And also in README.  I think that either
 > >  
 > >       standard-supfile should be deleted from -STABLE
 > >  
 > >  *OR*
 > >       standard-supfile should be (repo)moved to current-supfile
 > >       in -CURRENT, and MFC'ed to -STABLE.  With corrections to
 > >       README.
 > 
 > Erm, in the original discussion about this, there was the point that
 > 'standard-supfile' was supposed to follow whatever current branch you were on
 > at the time.  Thus, on 4.x, standard-supfile follows RELENG_4, on 4.3, it
 > follows RELENG_4_3, and on -current it follows HEAD.
 > 
 But it doesn't, in fact, follows 4.3 on RELENG_4_3, it's still set to
 RELENG_4 there.  Nor it is to fetch RELENG_4_3 in RELENG_4_3_0_RELEASE.
 And `standard' comes yet from `crypto' times, it assumes `non-standard'.
 
 How about this?  For X.Y release, that would be:
 
 release-supfile		RELENG_X_Y_RELEASE
 bugfix-supfile		RELENG_X_Y
 stable-supfile		RELENG_X
 current-supfile		.
 
 For -CURRENT, only stable-supfile and current-supfile make sense probably.
 
 
 Cheers,
 -- 
 Ruslan Ermilov		Oracle Developer/DBA,
 ru@sunbay.com		Sunbay Software AG,
 ru@FreeBSD.org		FreeBSD committer,
 +380.652.512.251	Simferopol, Ukraine
 
 http://www.FreeBSD.org	The Power To Serve
 http://www.oracle.com	Enabling The Information Age

From: John Baldwin <jhb@FreeBSD.org>
To: Ruslan Ermilov <ru@FreeBSD.org>
Cc: bug-followup@FreeBSD.org, freebsd-doc@FreeBSD.org
Subject: Re: docs/29767: incorrect description of 'standart-supfile'
Date: Thu, 16 Aug 2001 13:39:28 -0700 (PDT)

 On 16-Aug-01 Ruslan Ermilov wrote:
 > On Thu, Aug 16, 2001 at 07:59:07AM -0700, John Baldwin wrote:
 >> 
 >> On 16-Aug-01 Ruslan Ermilov wrote:
 >> > The following reply was made to PR docs/29767; it has been noted by GNATS.
 >> > 
 >> > From: Ruslan Ermilov <ru@FreeBSD.ORG>
 >> > To: Olexandr Kunytsa <kunia@x-telecom.net>
 >> > Cc: FreeBSD-gnats-submit@FreeBSD.ORG
 >> > Subject: Re: docs/29767: incorrect description of 'standart-supfile'
 >> > Date: Thu, 16 Aug 2001 10:58:13 +0300
 >> > 
 >> >  On Thu, Aug 16, 2001 at 10:43:03AM +0300, Olexandr Kunytsa wrote:
 >> >  > 
 >> >  > standard-supfile in -stable now gets you the -stable sources, but it
 >> >  > is pointed inside the file that it contains "CVSup collections" for
 >> >  > current-sources.
 >> >  > 
 >> >  And also in README.  I think that either
 >> >  
 >> >       standard-supfile should be deleted from -STABLE
 >> >  
 >> >  *OR*
 >> >       standard-supfile should be (repo)moved to current-supfile
 >> >       in -CURRENT, and MFC'ed to -STABLE.  With corrections to
 >> >       README.
 >> 
 >> Erm, in the original discussion about this, there was the point that
 >> 'standard-supfile' was supposed to follow whatever current branch you were
 >> on
 >> at the time.  Thus, on 4.x, standard-supfile follows RELENG_4, on 4.3, it
 >> follows RELENG_4_3, and on -current it follows HEAD.
 >> 
 > But it doesn't, in fact, follows 4.3 on RELENG_4_3, it's still set to
 > RELENG_4 there.  Nor it is to fetch RELENG_4_3 in RELENG_4_3_0_RELEASE.
 > And `standard' comes yet from `crypto' times, it assumes `non-standard'.
 
 Of course it doesn't, this was the _proposal_.  I think standard-supfile should
 be fixed to do that personally.  Go look at the archives on -arch on this one
 though, as there was some sort of decision made.  If you want to bring this all
 up again, I suggest you do it on -arch.
 
 > How about this?  For X.Y release, that would be:
 > 
 > release-supfile               RELENG_X_Y_RELEASE
 
 No point, they already have this on their box or via hte CD's or what not, so
 no need to cvsup.
 
 > bugfix-supfile                RELENG_X_Y
 
 It's not bugfixes, it's major security fixes only.
 
 -- 
 
 John Baldwin <jhb@FreeBSD.org> -- http://www.FreeBSD.org/~jhb/
 PGP Key: http://www.baldwin.cx/~john/pgpkey.asc
 "Power Users Use the Power to Serve!"  -  http://www.FreeBSD.org/

From: Colin Percival <colin.percival@wadham.ox.ac.uk>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: docs/29767: incorrect description of 'standart-supfile'
Date: Wed, 12 Feb 2003 04:17:12 +0000

    This PR can be closed -- it's obsolete, and jdp agrees that it can be 
 closed (but hasn't gotten around to it yet).
 
 Colin Percival
 
Responsible-Changed-From-To: jdp->freebsd-bugs 
Responsible-Changed-By: jdp 
Responsible-Changed-When: Mon May 26 11:38:46 PDT 2003 
Responsible-Changed-Why:  
Give up responsibility for this PR.  I can't seem to get excited 
about it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=29767 
State-Changed-From-To: open->closed 
State-Changed-By: ceri 
State-Changed-When: Fri Nov 7 12:51:40 PST 2003 
State-Changed-Why:  
This file is now correct on RELENG_4. 

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