From owner-freebsd-stable@freebsd.org Sun Aug 21 23:02:05 2016 Return-Path: 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 A6568BC1B89 for ; Sun, 21 Aug 2016 23:02:05 +0000 (UTC) (envelope-from rainer@ultra-secure.de) Received: from connect.ultra-secure.de (connect.ultra-secure.de [88.198.71.201]) by mx1.freebsd.org (Postfix) with ESMTP id 11AAB1A4F for ; Sun, 21 Aug 2016 23:02:04 +0000 (UTC) (envelope-from rainer@ultra-secure.de) Received: (Haraka outbound); Mon, 22 Aug 2016 01:01:56 +0200 Authentication-Results: connect.ultra-secure.de; iprev=pass; auth=pass (plain); spf=none smtp.mailfrom=ultra-secure.de Received-SPF: None (connect.ultra-secure.de: domain of ultra-secure.de does not designate 217.71.83.52 as permitted sender) receiver=connect.ultra-secure.de; identity=mailfrom; client-ip=217.71.83.52; helo=[192.168.1.200]; envelope-from= Received: from [192.168.1.200] (217-071-083-052.ip-tech.ch [217.71.83.52]) by connect.ultra-secure.de (Haraka/2.6.2-toaster) with ESMTPSA id ED806EA3-78BB-491F-9333-192590FB7FB6.1 envelope-from (authenticated bits=0) (version=TLSv1/SSLv3 cipher=AES256-SHA verify=NO); Mon, 22 Aug 2016 01:01:54 +0200 Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) Subject: Re: FreeBSD 10.1 can't upgrade to FreeBSD 11-RC1 via freebsd-update From: Rainer Duffner In-Reply-To: <6EB5F84D-E392-4742-BB4D-5A78393F4A24@mail.sermon-archive.info> Date: Mon, 22 Aug 2016 01:01:52 +0200 Cc: freebsd-stable Content-Transfer-Encoding: quoted-printable Message-Id: References: <504FE992-890D-4335-BFD5-5F538FBC6459@ultra-secure.de> <6EB5F84D-E392-4742-BB4D-5A78393F4A24@mail.sermon-archive.info> To: Doug Hardie X-Mailer: Apple Mail (2.3124) X-Haraka-GeoIP: EU, CH, 451km X-Haraka-ASN: 24951 X-Haraka-GeoIP-Received: X-Haraka-ASN: 24951 217.71.80.0/20 X-Haraka-ASN-CYMRU: asn=24951 net=217.71.80.0/20 country=CH assignor=ripencc date=2003-08-07 X-Haraka-FCrDNS: 217-071-083-052.ip-tech.ch X-Haraka-p0f: os="Mac OS X " link_type="DSL" distance=12 total_conn=17 shared_ip=N X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on spamassassin X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.1 X-Haraka-Karma: score: 6, good: 990, bad: 1, connections: 1226, history: 989, asn_score: 471, asn_connections: 482, asn_good: 471, asn_bad: 0, pass:asn, asn_all_good, relaying X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Aug 2016 23:02:05 -0000 > Am 20.08.2016 um 22:34 schrieb Doug Hardie = : >=20 >=20 >> On 20 August 2016, at 11:50, Rainer Duffner = wrote: >>=20 >> FreeBSD 10.3 works. >>=20 >> FreeBSD 10.1 complains about a failed integrity check etc (which the = EN was supposed to fix, I assume) >>=20 >>=20 >> I did run freebsd-update to update to the latest patch-level and = freebsd-version said, I was on p37. >=20 > I encountered the same issue with 9.x. The following patch was sent = to me: >=20 > --- Comment #5 from Xin LI --- > (In reply to bc979 from comment #4) >=20 > Can you try applying this? (r279901) >=20 > 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}" >=20 > --=20 >=20 > However, it doesn't actually go in 9.x. The line numbers are very = close. Use the comment to find the proper line. For me it was less = than 10 lines before 1231. I don't keep the source so I just updated = /usr/sbin/freebsd-update directly. The patch worked. >=20 It seems to work, yes. I think this should be fixed before 11.0-RELEASE becomes available. Rainer=