From jaakko@saunalahti.fi  Mon Mar 17 14:07:17 2008
Return-Path: <jaakko@saunalahti.fi>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3AA50106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 17 Mar 2008 14:07:17 +0000 (UTC)
	(envelope-from jaakko@saunalahti.fi)
Received: from gw01.mail.saunalahti.fi (gw01.mail.saunalahti.fi [195.197.172.115])
	by mx1.freebsd.org (Postfix) with ESMTP id DE9F58FC1C
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 17 Mar 2008 14:07:16 +0000 (UTC)
	(envelope-from jaakko@saunalahti.fi)
Received: from ws64.jh.dy.fi (GMKDCCCII.dsl.saunalahti.fi [85.76.249.203])
	by gw01.mail.saunalahti.fi (Postfix) with ESMTP id ABC401511D4
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 17 Mar 2008 15:44:37 +0200 (EET)
Received: from ws64.jh.dy.fi (localhost [127.0.0.1])
	by ws64.jh.dy.fi (8.14.2/8.14.2) with ESMTP id m2HDia8i002811
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 17 Mar 2008 15:44:36 +0200 (EET)
	(envelope-from jaakko@ws64.jh.dy.fi)
Received: (from jaakko@localhost)
	by ws64.jh.dy.fi (8.14.2/8.14.2/Submit) id m2HDiaKV002810;
	Mon, 17 Mar 2008 15:44:36 +0200 (EET)
	(envelope-from jaakko)
Message-Id: <200803171344.m2HDiaKV002810@ws64.jh.dy.fi>
Date: Mon, 17 Mar 2008 15:44:36 +0200 (EET)
From: Jaakko Heinonen <jh@saunalahti.fi>
Reply-To: Jaakko Heinonen <jh.saunalahti.fi@saunalahti.fi>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] freebsd-update(8) error message on upgrade
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         121784
>Category:       bin
>Synopsis:       [patch] freebsd-update(8) error message on upgrade
>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 Mar 17 14:10:01 UTC 2008
>Closed-Date:    Fri Jun 06 18:28:50 UTC 2008
>Last-Modified:  Fri Jun 06 18:28:50 UTC 2008
>Originator:     Jaakko Heinonen
>Release:        FreeBSD 7.0-RELEASE
>Organization:
>Environment:
System: FreeBSD x 7.0-RELEASE FreeBSD 7.0-RELEASE #0: Sun Feb 24 10:35:36 UTC 2008 root@driscoll.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64


	
>Description:
I upgraded a system from 6.3-RELEASE to 7.0-RELEASE with freebsd-update(8).
I had manually modified /etc/pf.conf and 7.0-RELEASE doesn't ship that file
anymore. This is how freebsd-update handled it:
.
.
The following file will be removed, as it no longer exists in
FreeBSD 7.0-RELEASE: /etc/pf.conf
Does this look reasonable (y/n)? y
.
.
sha256: merge/new//etc/pf.conf: No such file or directory

The following files are affected by updates, but no changes have
been downloaded because the files have been modified locally:
.
.

freebsd-upgrade(8) tries erroneously to run sha256 for a non-existent file.
Following patch should fix this error. However IMO removing pf.conf in this
case isn't optimal for end user but this may not be considered as a bug in
freebsd-update(8).

>How-To-Repeat:

>Fix:

>Release-Note:
>Audit-Trail:

From: Jaakko Heinonen <jh@saunalahti.fi>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/121784: [patch] freebsd-update(8) error message on upgrade
Date: Mon, 17 Mar 2008 17:35:41 +0200

 --8t9RHnE3ZwKMSgU+
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 
 
 --8t9RHnE3ZwKMSgU+
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="freebsd-update-sha256.diff"
 
 Index: freebsd-update.sh
 ===================================================================
 RCS file: /home/ncvs/src/usr.sbin/freebsd-update/freebsd-update.sh,v
 retrieving revision 1.12
 diff -u -r1.12 freebsd-update.sh
 --- freebsd-update.sh	16 Nov 2007 14:00:22 -0000	1.12
 +++ freebsd-update.sh	17 Mar 2008 13:16:36 -0000
 @@ -2196,9 +2196,8 @@
  
  		# Store merged files.
  		while read F; do
 -			V=`${SHA256} -q merge/new/${F}`
 -
  			if [ -f merge/new/${F} ]; then
 +				V=`${SHA256} -q merge/new/${F}`
  				gzip -c < merge/new/${F} > files/${V}.gz
  				echo "${F}|${V}"
  			fi
 
 --8t9RHnE3ZwKMSgU+--
Responsible-Changed-From-To: freebsd-bugs->cperciva 
Responsible-Changed-By: gavin 
Responsible-Changed-When: Mon Mar 17 18:03:48 UTC 2008 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=121784 
State-Changed-From-To: open->patched 
State-Changed-By: cperciva 
State-Changed-When: Sun Mar 23 14:13:46 UTC 2008 
State-Changed-Why:  
Fixed in HEAD, will MFC next week. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=121784 
State-Changed-From-To: patched->closed 
State-Changed-By: gavin 
State-Changed-When: Fri Jun 6 18:28:11 UTC 2008 
State-Changed-Why:  
This was MFC'd on 2008-04-04 to RELENG_7 and RELENG_6, so is 
fixed in 6.4 and 7.1-RELEASE.  Thanks for your submission! 

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