From nobody@FreeBSD.org  Mon Feb 18 21:01:50 2008
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E53EF16A468
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 18 Feb 2008 21:01:50 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id DA50A13C461
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 18 Feb 2008 21:01:50 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m1IKxM25096121
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 18 Feb 2008 20:59:22 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.2/8.14.1/Submit) id m1IKxMaT096120;
	Mon, 18 Feb 2008 20:59:22 GMT
	(envelope-from nobody)
Message-Id: <200802182059.m1IKxMaT096120@www.freebsd.org>
Date: Mon, 18 Feb 2008 20:59:22 GMT
From: Helmut Schneider <jumper99@gmx.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: freebsd-update offers older files than e.g. cvsup.freebsd.org
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         120826
>Category:       bin
>Synopsis:       freebsd-update offers older files than e.g. cvsup.freebsd.org
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    cperciva
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 18 21:10:03 UTC 2008
>Closed-Date:    Sun Feb 24 00:11:10 UTC 2008
>Last-Modified:  Sun Feb 24 00:11:10 UTC 2008
>Originator:     Helmut Schneider
>Release:        6.3-RELEASE-p1, 7.0-RC2-p1
>Organization:
>Environment:
FreeBSD BSDHelmut 6.3-RELEASE-p1 FreeBSD 6.3-RELEASE-p1 #0: Thu Feb 14 21:31:10 CET 2008     root@BSDHelmut:/usr/obj/usr/src/sys/SMP-WITH-QUOTA  i386
FreeBSD FBSD70VM 7.0-RC2-p1 FreeBSD 7.0-RC2-p1 #0: Tue Feb 12 22:23:33 UTC 2008     root@i386-builder.
>Description:
Not sure if this is a bug, but freebsd-update

- offers 3 old files
- claims that they need to be updated.

The files are:
/usr/src/sys/conf/newvers.sh
/usr/src/sys/kern/kern_descrip.c
/usr/src/sys/kern/uipc_syscalls.c

Versions from cvsup.freebsd.org:
/usr/src/sys/conf/newvers.sh 1.69.2.15.2.4
/usr/src/sys/kern/kern_descrip.c 1.279.2.15.2.1
/usr/src/sys/kern/uipc_syscalls.c 1.221.2.4.4.1

Versions from freebsd-update:
/usr/src/sys/conf/newvers.sh,v 1.69.2.15.2.3
/usr/src/sys/kern/kern_descrip.c 1.279.2.15
/usr/src/sys/kern/uipc_syscalls.c 1.221.2.4

IMO freebsd-update must not offer files older than the installed ones.
>How-To-Repeat:
[root@FBSD70VM ~]# csup -g /etc/supfile-FreeBSD
[...]
Updating collection src-all/cvs
 Checkout src/sys/conf/newvers.sh
 Checkout src/sys/kern/kern_descrip.c
 Checkout src/sys/kern/uipc_syscalls.c
[...]
[root@FBSD70VM ~]# freebsd-update fetch
Looking up update.FreeBSD.org mirrors... 1 mirrors found.
Fetching metadata signature for 7.0-RC2 from update1.freebsd.org... done.
Fetching metadata index... done.
Inspecting system... done.
Preparing to download files... done.

The following files will be updated as part of updating to 7.0-RC2-p1:
/usr/src/sys/conf/newvers.sh
/usr/src/sys/kern/kern_descrip.c
/usr/src/sys/kern/uipc_syscalls.c
[root@FBSD70VM ~]#
>Fix:
Fetch from cvsup server and run freebsd-update

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->cperciva 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Mon Feb 18 21:54:55 UTC 2008 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=120826 

From: Colin Percival <cperciva@freebsd.org>
To: bug-followup@FreeBSD.org, jumper99@gmx.de
Cc:  
Subject: Re: misc/120826: freebsd-update offers older files than e.g.
 cvsup.freebsd.org
Date: Mon, 18 Feb 2008 14:04:02 -0800

 Helmut,
 
 If you compare the files you obtained via cvsup and the files you obtained via
 freebsd-update, you should find that they are identical aside from the $FreeBSD$
 lines.  This difference is unavoidable -- the patches (both source and binary)
 are generated before CVS commits are done -- and the files you obtained via
 FreeBSD Update should be identical to what you would get by applying the patches
 distributed with security advisories and errata notices.
 
 Colin Percival

Adding to audit trail from misfiled PR caught in spamtrap:

From: "Helmut Schneider" <jumper99@gmx.de>
Date: Tue, 19 Feb 2008 09:25:32 +0100
 
 > If you compare the files you obtained via cvsup and the files you obtained 
 > via
 > freebsd-update, you should find that they are identical aside from the 
 > $FreeBSD$
 
 Yes, that's why I wrote that I'm not sure if it is a bug.
 
 > lines. This difference is unavoidable -- the patches (both source and 
 > binary)
 > are generated before CVS commits are done -- and the files you obtained 
 > via
 > FreeBSD Update should be identical to what you would get by applying the 
 > patches
 > distributed with security advisories and errata notices.
 
 They are, but it is a bit annoying. I 'freebsd-update cron' and get a mail 
 that files need to be replaced. A few minutes/hours later I run 'cvsup' and 
 get a mail that there were updates and that bounces every night. Currently 
 I'm filtering the output of freebsd-update but I think that's not the whole 
 purpose.
 
 Don't get me wrong, I appreciate your work very much, I just feel a bit 
 uncomfortable about the output.
 
 Thanks, Helmut 
 

From: Colin Percival <cperciva@freebsd.org>
To: Helmut Schneider <jumper99@gmx.de>
Cc: bug-followup@FreeBSD.org
Subject: Re: bin/120826: freebsd-update offers older files than e.g.
 cvsup.freebsd.org
Date: Tue, 19 Feb 2008 09:41:12 -0800

 Helmut Schneider wrote:
 >> lines. This difference is unavoidable -- the patches (both source and
 >> binary)
 >> are generated before CVS commits are done -- and the files you
 >> obtained via
 >> FreeBSD Update should be identical to what you would get by applying
 >> the patches
 >> distributed with security advisories and errata notices.
 > 
 > They are, but it is a bit annoying. I 'freebsd-update cron' and get a
 > mail that files need to be replaced. A few minutes/hours later I run
 > 'cvsup' and get a mail that there were updates and that bounces every
 > night. Currently I'm filtering the output of freebsd-update but I think
 > that's not the whole purpose.
 
 If you're using FreeBSD Update to keep /usr/src updated, don't use cvsup;
 and if you're using cvsup, don't use FreeBSD Update to keep /usr/src
 updated -- this can be done by taking "src" out of the "Components" line
 in /etc/freebsd-update.conf.
 
 If you don't mind, I'm going to close this PR -- while the non-updating of
 $FreeBSD$ tags is a bit confusing, I don't think there's any bug here to
 be fixed.
 
 Colin Percival

From: "Helmut Schneider" <jumper99@gmx.de>
To: <bug-followup@FreeBSD.org>,
	<cperciva@freebsd.org>
Cc:  
Subject: Re: bin/120826: freebsd-update offers older files than e.g. cvsup.freebsd.org
Date: Wed, 20 Feb 2008 10:24:46 +0100

 > If you're using FreeBSD Update to keep /usr/src updated, don't use
 > cvsup; and if you're using cvsup, don't use FreeBSD Update to keep
 > /usr/src updated -- this can be done by taking "src" out of the
 > "Components" line in /etc/freebsd-update.conf.
 
 Ah, I didn't know that. That solution sound reasonable.
 
 > If you don't mind, I'm going to close this PR -- while the non-updating
 > of $FreeBSD$ tags is a bit confusing, I don't think there's any bug here
 > to be fixed.
 
 Yes, please close the PR.
 
 Thanks, Helmut
State-Changed-From-To: open->closed 
State-Changed-By: cperciva 
State-Changed-When: Sun Feb 24 00:10:37 UTC 2008 
State-Changed-Why:  
Closed with agreement of submitter. 

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