From owner-freebsd-stable  Sat Jul 28 18:33:47 2001
Delivered-To: freebsd-stable@freebsd.org
Received: from pc1-cove4-0-cust214.bir.cable.ntl.com (pc1-cove4-0-cust214.bir.cable.ntl.com [213.105.93.214])
	by hub.freebsd.org (Postfix) with ESMTP id 9CD2C37B40E
	for <freebsd-stable@FreeBSD.ORG>; Sat, 28 Jul 2001 18:33:37 -0700 (PDT)
	(envelope-from ianjhart@freeloader.freeserve.co.uk)
Received: from freeloader.freeserve.co.uk (alpha.private [192.168.0.2])
	(authenticated)
	by pc1-cove4-0-cust214.bir.cable.ntl.com (8.11.3/8.11.3) with ESMTP id f6T1XZu01223
	for <freebsd-stable@FreeBSD.ORG>; Sun, 29 Jul 2001 02:33:35 +0100 (BST)
	(envelope-from ianjhart@freeloader.freeserve.co.uk)
Message-ID: <3B6367EF.14BE3252@freeloader.freeserve.co.uk>
Date: Sun, 29 Jul 2001 02:33:35 +0100
From: ian j hart <ianjhart@freeloader.freeserve.co.uk>
X-Mailer: Mozilla 4.77 [en] (X11; U; Linux 2.2.12 i386)
X-Accept-Language: en
MIME-Version: 1.0
To: "stable@FreeBSD.ORG" <freebsd-stable@FreeBSD.ORG>
Subject: Re: Updating RELENG_4_3
References: <3B62A31F.7EF92100@freeloader.freeserve.co.uk>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: owner-freebsd-stable@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-stable.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-stable>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-stable>
X-Loop: FreeBSD.ORG

I've obviously been out in the sun too long (mad dogs ...)
At the risk of making things worse:

ian j hart wrote:
> 
> cd /usr/src;make update (CVS) pulls down RELENG_4 not RELENG_4_3.
> There should at least be a warning in UPDATING. Shouldn't
> this be a variable in make.conf?
> 
> <thinks out loud>
> Hmm. The -r would mean BRANCH would have to be a numeric or
> symbolic tag. What if you could do:
> CVSUPDATEFLAGS= -D "yesterday"

Not a good choice of name. This has caused some confusion, sorry.
In any case the value is wrong!

Try CVS_UPDATE_FLAGS, with default values (/etc/defaults/make.conf)

STABLE:
CVS_UPDATE_FLAGS=	-rRELENG_4

CURRENT:
CVS_UPDATE_FLAGS=	-A

SECURITY FIX BRANCH RELATIVE TO 4.3-RELEASE:
CVS_UPDATE_FLAGS=	-rRELENG_4_3

*** Makefile.inc1.orig  Sun Jul 29 00:51:01 2001
--- Makefile.inc1       Sun Jul 29 01:21:26 2001
***************
*** 508,514 ****
        @echo
"--------------------------------------------------------------"
        @echo ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT}
        @echo
"--------------------------------------------------------------"
!       cd ${.CURDIR}; cvs -q update -rRELENG_4 -P -d
  .endif
  
  #
--- 508,514 ----
        @echo
"--------------------------------------------------------------"
        @echo ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT}
        @echo
"--------------------------------------------------------------"
!       cd ${.CURDIR}; cvs -q update ${CVS_UPDATE_FLAGS} -P -d
  .endif
  
  #
You might want to add a paranoia default.

Example override in /etc/make.conf
CVS_UPDATE_FLAGS=	-rRELENG_4 -D "yesterday"

> That would fix updating during a commit. Or maybe not. Must find
> a cvs wizard and ask them if the commit time stamps are atomic.
> </thinks out loud>
> 
> While I'm on the subject, different output for uname -a would
> be _really_ useful (4.3-SECURITY?). How else can you tell you
> have RELENG_4_3?
> 
> Cheers
> 
> --
> ian j hart
> 
> To Unsubscribe: send mail to majordomo@FreeBSD.org
> with "unsubscribe freebsd-stable" in the body of the message

If this is still nonsense, just ignore. I'll have a lie down and be back
to normal tommorrow.

-- 
ian j hart

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message