Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 16 Oct 2016 10:02:34 -0700
From:      Doug Hardie <doug@mail.sermon-archive.info>
To:        Warner Losh <imp@bsdimp.com>
Cc:        Zoran Kolic <zkolic@sbb.rs>, FreeBSD-STABLE Mailing List <freebsd-stable@freebsd.org>
Subject:   Re: update from 9.3 to 11.0
Message-ID:  <2E339839-8BD3-4B96-ACE3-41FFAD6F8484@mail.sermon-archive.info>
In-Reply-To: <CANCZdfrZ8-zZo_-w9ww8TuAcLazqX4WeQps1WF4fUyUvMXJTsg@mail.gmail.com>
References:  <20161016141328.GA57825@knossos> <CANCZdfrZ8-zZo_-w9ww8TuAcLazqX4WeQps1WF4fUyUvMXJTsg@mail.gmail.com>

next in thread | previous in thread | raw e-mail | index | archive | help

> On 16 October 2016, at 08:24, Warner Losh <imp@bsdimp.com> wrote:
>=20
> On Sun, Oct 16, 2016 at 8:13 AM, Zoran Kolic <zkolic@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
>=20
> 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=3D211398

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

Can you try applying this? (r279901)

Index: head/usr.sbin/freebsd-update/freebsd-update.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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=3D"[-+./:=3D%@_[~[:alnum:]]"
+       P=3D"[-+./:=3D,%@_[~[:alnum:]]"
       M=3D"[0-9]+\|[0-9]+\|[0-9]+\|[0-9]+"
       H=3D"[0-9a-f]{64}"





Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2E339839-8BD3-4B96-ACE3-41FFAD6F8484>