From owner-freebsd-git@freebsd.org Sun Feb 7 21:59:16 2021 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4CE5053AE14 for ; Sun, 7 Feb 2021 21:59:16 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4DYjjb68Byz3k1n for ; Sun, 7 Feb 2021 21:59:15 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id D2E0653AD55; Sun, 7 Feb 2021 21:59:15 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D117653AE13 for ; Sun, 7 Feb 2021 21:59:15 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qk1-x72e.google.com (mail-qk1-x72e.google.com [IPv6:2607:f8b0:4864:20::72e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DYjjb5FQ0z3k9n for ; Sun, 7 Feb 2021 21:59:15 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mail-qk1-x72e.google.com with SMTP id a12so12615719qkh.10 for ; Sun, 07 Feb 2021 13:59:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=ud5N5wDG8ZEQ1xHyb2gP+Imf8czd+QBSbTyUWdPQ9j8=; b=O6CZz2FdTPlmfa1nxf6gvofNGFhlPqcsDJKNa9O1Sda+9fArjrLpq6NozGaf0rIRFd v01sM1sZG57G8xIqkTsPbUh2iDYZIGYR7pIbiv5Svekh5BntGlWUByp0WGefpE5Knkio LipzJmSwWiSCOrNPHIGllAQrtjfbNFJGATCX+pDl00SChIKzHGzrYxAghMTFHP2dFaUb Qm/+4TrxUIMka6sBQugknpmTPVMMu/kfiZWhEhb2qm2yeJtmjIcQ/HfOBAbOROMDs/0v Wm+BBscAsXLdzC5dnE8juDOWF72yOk1Vy40iBKNPsRnUErSNA2KFHvFiw9JaSDnhsbxG TNKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=ud5N5wDG8ZEQ1xHyb2gP+Imf8czd+QBSbTyUWdPQ9j8=; b=QKEasDpVkyjzZkYlKIvYIdktwWR2r4orJUip9xw95yJp17AtruAJIGhDT8P3xKJMm6 E90MLH0I1sXjToIfD4UDV6zie/rHH0G/krekEjPTyor8sEck4ebw3DvUJpLkzLzWyY8T A+4wxl5YYjmSEFSvI2EFIQTNP94kSZqBSIuiK0LOnlSzWhx5c401gLOARM/oBY9qBMmA j+w7n/BaqNxLypVbNMakp/T/WVuWc1XnISl6gV2N89iLGfnA4cI5V0NumZlgO/KKg6Io WAcynQjmu6Exc/pZ4H+N81miNPjVPnhgsRpvukikJ6RpJ8EnYBL13uBunEwKA4yXJVXd ZRrg== X-Gm-Message-State: AOAM5311RRNqu8HPmRolmK3NogR6eSrdE82B8RhWk+H9oGiR+KaP7toe /cQQv1jbWF2Hs4VIER2JS9ZtALd1Oj/A7w== X-Google-Smtp-Source: ABdhPJwukWTIp9+c1Qt8cL6hYofofuZY1d1iZkj82Sz8fOFzCYw9U4FmX+7gIxTw6ing7GNaUSAtaA== X-Received: by 2002:a37:a3cc:: with SMTP id m195mr13575239qke.400.1612735154598; Sun, 07 Feb 2021 13:59:14 -0800 (PST) Received: from mutt-hbsd (pool-100-16-222-53.bltmmd.fios.verizon.net. [100.16.222.53]) by smtp.gmail.com with ESMTPSA id r4sm15299044qkf.112.2021.02.07.13.59.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Feb 2021 13:59:13 -0800 (PST) Date: Sun, 7 Feb 2021 16:59:13 -0500 From: Shawn Webb To: Ulrich =?utf-8?B?U3DDtnJsZWlu?= Cc: git@freebsd.org Subject: Re: HEADS UP: hashes changing for the freebsd-ports repo on Sunday Message-ID: <20210207215913.pvb2jwd7rzi7fkaa@mutt-hbsd> X-Operating-System: FreeBSD mutt-hbsd 14.0-CURRENT-HBSD FreeBSD 14.0-CURRENT-HBSD X-PGP-Key: http://pgp.mit.edu/pks/lookup?op=vindex&search=0xFF2E67A277F8E1FA References: <20210207163437.ffta4ebkndofh4ke@mutt-hbsd> <20210207174648.bzpfkw326agk2s2a@mutt-hbsd> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="i5muybcg5e6jupbt" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4DYjjb5FQ0z3k9n X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2021 21:59:16 -0000 --i5muybcg5e6jupbt Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Feb 07, 2021 at 08:48:38PM +0100, Ulrich Sp=F6rlein wrote: > On Sun, 2021-02-07 at 12:46:48 -0500, Shawn Webb wrote: > > On Sun, Feb 07, 2021 at 06:21:10PM +0100, Ulrich Sp=F6rlein wrote: > > > On Sun, 2021-02-07 at 11:34:37 -0500, Shawn Webb wrote: > > > > On Sun, Feb 07, 2021 at 05:24:33PM +0100, Ulrich Sp=F6rlein wrote: > > > > > On Wed, 2021-02-03 at 13:54:56 +0100, Ulrich Sp=F6rlein wrote: > > > > > > Hi folks, > > > > > > > > > > > > It's another one of those instances where the hashes will change > > > > > > (starting with all commits from Jan 5th 2021 forward). > > > > > > > > > > > > Our latest ports committers were not added to the authormap fil= e in time > > > > > > _and_ this stopped being a fatal issue in the converter a while= ago :/ > > > > > > > > > > > > Please bear with us a while longer. > > > > > > Thanks > > > > > > Uli > > > > > > > > > > > > PS: This also affects the src and doc repos, but they will obvi= uously > > > > > > not be changed again, see the errata notes at > > > > > > https://github.com/freebsd/git_conv/tree/next > > > > > > > > > > This has now been pushed and the new hashes (and missing authorna= mes!) are > > > > > live. > > > > > > > > Sorry for what may seem like dumb questions, but I just wanted to m= ake > > > > sure: > > > > > > > > 1. For downstream projects that have already switched to > > > > git.freebsd.org for src, do we need to deal with changed hashes > > > > again? (ie, git merge --allow-unrelated-histories) > > >=20 > > > Nothing changed for src. > > >=20 > > > > 2. Do I now need to merge unrelated histories on ports if I use por= ts > > > > from github? > > >=20 > > > Depends a bit. There is shared history, but it forkes off way in the = past, > > > so if you have work on custom branch, it might indeed be easiest to m= erge > > > with --allow-unrelated-histories. > > >=20 > > > (I personally would probably write out the merge commit manually myse= lf, > > > it's much easier than figuring out what sort of flags one needs on th= e `git > > > merge`.) > > >=20 > > > Of course, if you're using rebase-based workflows, this all will be r= ather > > > trivial to rebase. > >=20 > > Thanks for the info! HardenedBSD uses a merge-based workflow since we > > plan to be around a while. Switching to rebased-based would have > > negative consequences to our downstream vendors. > >=20 > > One more question: when ports is officially switched over to git, are > > we likely to see hash more hash changes? >=20 > No, of course not. Once the conversion has been finalized, none of the > history or metadata will be touched retroactively. We'll then have to live > with errors basically forever. I worded that horrifically wrong. I blame the lack of caffeine. ;) I meant to ask: is there any possibility that the hashes will change again before the official switch to git? Sorry for the miscommunication. Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD GPG Key ID: 0xFF2E67A277F8E1FA GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9 3633 C85B 0AF8 AB23 0FB2 https://git-01.md.hardenedbsd.org/HardenedBSD/pubkeys/src/branch/master/Sha= wn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --i5muybcg5e6jupbt Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmAgYq4ACgkQ/y5nonf4 4fr2XhAAk9ZtWenxcjbgHFYnMr/Kr8VqZmUJ4Zq0y2qGheWfty8/cLI37URIiciW UnTvv5db+cJnWfAAXS4KAtry7TrI73jYnvNK2rNGLqBVtleTOKS0wjN1IYXD3sSV eTUjryANIfblrPnNYqDdfet6ZzQFeh9kW3oeeDR93hh3ARJbifdq8kbV7/IgeQEz CoYQ51bIACsSdDIpDDJNNNYZxbTD/ielGx25iKY3NXnB0gAvzHH21cQ7AixKsimR tp5sSFf6Ak4Zjw7EP5XIC7t7mzeRaBgZOoazz/FxG1+ivzf5oYzdEGAJJlgbpzFD pPyuVBNdDyORfNu8MdprV5nCXqkIzmqAf9HbVncXTNL65geDmPbF4snTKxdymP04 4MPtelN2PENNxXjBWIgatoHI0i+XXqR6BM3A30zS1ofMwiWqI3Bmzmp2BbZbiLa3 6R/2M6TdppzgXkNcU/6EXBSU7sv0SIctaJRpNd1ngAb1VB1oFM362HMJkJJaJJSN z3h7N4bCU//zvAp7LMBPBXjz2bnEEcXuL/SCZNaMzt3fIW/SWrWlUzHApG0E+9/i POgqYViVWLJZd4YzX5TMwHS629sozD9mBhoDkN1sYJNK+aMS8hNEFIkoQDZaK+W2 1jU9l6ncw8ZoVz5VN7bF7Vkj/gFl4V2iBXRa3oYgPk6rujz4YRQ= =g96B -----END PGP SIGNATURE----- --i5muybcg5e6jupbt--