From owner-freebsd-stable@freebsd.org  Sun Oct 16 17:02:46 2016
Return-Path: <owner-freebsd-stable@freebsd.org>
Delivered-To: freebsd-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7B61AC14676
 for <freebsd-stable@mailman.ysv.freebsd.org>;
 Sun, 16 Oct 2016 17:02:46 +0000 (UTC)
 (envelope-from doug@mail.sermon-archive.info)
Received: from zoom.lafn.org (zoom.lafn.org [108.92.93.123])
 by mx1.freebsd.org (Postfix) with ESMTP id 65A431DC2
 for <freebsd-stable@freebsd.org>; Sun, 16 Oct 2016 17:02:45 +0000 (UTC)
 (envelope-from doug@mail.sermon-archive.info)
Received: from [10.0.1.4] (unknown [71.177.216.148])
 by zoom.lafn.org (Postfix) with ESMTPSA id B2F4A34A9F4;
 Sun, 16 Oct 2016 10:02:35 -0700 (PDT)
Content-Type: text/plain; charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 10.0 \(3226\))
Subject: Re: update from 9.3 to 11.0
From: Doug Hardie <doug@mail.sermon-archive.info>
In-Reply-To: <CANCZdfrZ8-zZo_-w9ww8TuAcLazqX4WeQps1WF4fUyUvMXJTsg@mail.gmail.com>
Date: Sun, 16 Oct 2016 10:02:34 -0700
Cc: Zoran Kolic <zkolic@sbb.rs>,
 FreeBSD-STABLE Mailing List <freebsd-stable@freebsd.org>
Content-Transfer-Encoding: quoted-printable
Message-Id: <2E339839-8BD3-4B96-ACE3-41FFAD6F8484@mail.sermon-archive.info>
References: <20161016141328.GA57825@knossos>
 <CANCZdfrZ8-zZo_-w9ww8TuAcLazqX4WeQps1WF4fUyUvMXJTsg@mail.gmail.com>
To: Warner Losh <imp@bsdimp.com>
X-Mailer: Apple Mail (2.3226)
X-Virus-Scanned: clamav-milter 0.98 at zoom.lafn.org
X-Virus-Status: Clean
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-stable>, 
 <mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable/>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Oct 2016 17:02:46 -0000


> 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}"