update from 9.3 to 11.0

[Doug Hardie]

> On 16 October 2016, at 08:24, Warner Losh <imp at bsdimp.com> wrote:
> 
> On Sun, Oct 16, 2016 at 8:13 AM, Zoran Kolic <zkolic at sbb.rs> wrote:
>> I would like to know what experience and tips people on this list have
>> regarding this update. Doug Hardie made it successfully. To my eyes,
>> it is the mere change of one charracter in the file.
>> I'm a bit late due to lack of time to do the task.
>> Best regards all
> 
> I missed the original post. what's the one character change?


I was sent the patch  below.  However, it doesn't apply directly to 9.3.  Edit freebsd-update and go down about 1231 lines.  Generally the comment is found a few lines before that.  Add the comma, and all works.

-- Doug


https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=211398

--- Comment #5 from Xin LI <delphij at FreeBSD.org> ---
(In reply to bc979 from comment #4)

Can you try applying this? (r279901)

Index: head/usr.sbin/freebsd-update/freebsd-update.sh
===================================================================
--- head/usr.sbin/freebsd-update/freebsd-update.sh      (revision 279900)
+++ head/usr.sbin/freebsd-update/freebsd-update.sh      (revision 279901)
@@ -1231,7 +1231,7 @@ fetch_metadata_sanity () {
       # Some aliases to save space later: ${P} is a character which can
       # appear in a path; ${M} is the four numeric metadata fields; and
       # ${H} is a sha256 hash.
-       P="[-+./:=%@_[~[:alnum:]]"
+       P="[-+./:=,%@_[~[:alnum:]]"
       M="[0-9]+\|[0-9]+\|[0-9]+\|[0-9]+"
       H="[0-9a-f]{64}"