bin/121784: [patch] freebsd-update(8) error message on upgrade

[Jaakko Heinonen]

>Number:         121784
>Category:       bin
>Synopsis:       [patch] freebsd-update(8) error message on upgrade
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 17 14:10:01 UTC 2008
>Closed-Date:
>Last-Modified:
>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 at 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:
>Unformatted: