From owner-freebsd-git@freebsd.org Sun Feb 7 17:46:51 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 E4A57532C1F for ; Sun, 7 Feb 2021 17:46:51 +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 4DYc6M349Cz4ssg for ; Sun, 7 Feb 2021 17:46:51 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 676F95328C7; Sun, 7 Feb 2021 17:46:51 +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 6736B532C80 for ; Sun, 7 Feb 2021 17:46:51 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qv1-xf34.google.com (mail-qv1-xf34.google.com [IPv6:2607:f8b0:4864:20::f34]) (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 4DYc6M2DZ7z4sxB for ; Sun, 7 Feb 2021 17:46:50 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mail-qv1-xf34.google.com with SMTP id 2so6006727qvd.0 for ; Sun, 07 Feb 2021 09:46:50 -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=qi46fPXkEB1lhRB2Xvl7dvXKPVK/hoDrcTvsd993dB4=; b=FWRGjIzOGq8gDjtASZIW1cb+oyl9MvtK/Ak2SPaflE3PZU91I/ZMhNX4iiQXPwWbmm qFcade2PEkCXvUQDIhjEj171NupMSaUbXpmPqpxI2ClFceqZximK0vcglZYVU/iFBKak mT4HQ2Br4SLviWfZGOROTeHFnBx2lyylRvJyvjhJHHWKV62NIqwtnM7fjcjYAv1IF1xe QOWR5ZAGXaOjRjaUcMLpVuO2mEV9/8FLfjAdMGafn64OBvChUHZfmSm7txn/CjHthaYx f2vk1+ZCdVD8CgYi7CYPTSe25N4z6OSdOIDtU1edicUt5pcEo/2P4J3Ld3zpv9wTCUns uXmw== 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=qi46fPXkEB1lhRB2Xvl7dvXKPVK/hoDrcTvsd993dB4=; b=VacjjOLT9boZGo4Ju9TKnUbzFVn1LNTktRumMbuKsT+z2UVWI6r9Q3gbFVfrqRjK8F moz3YpAz5FbWZC8YljvB3ZYOxsg47ivRB0AfVaRG8hERuNjHKc1XPAWyw96g3dIPV6cH S+J5Yxjsk0iYXNDzKpft6aFwdaVrQjQCgEEFgI0yPdIuunKAiQl++QNXPkx3d7osXNUR hspGkRiNpQV+FK47cLhezPfl0l8E8GZ2vwH3yCeG16Oh5oBTptgZSsRDDd+bPIMilGTE HmXy2NUTBT3Migry7iW/DeWQwdI1LMsyjTDRFKh4FBHdll09JI9FoouOdRkaE6MtN4+0 JDQw== X-Gm-Message-State: AOAM531uinLlDNTvbMcdHU3V2wNM+7DEpRYRJsYIQePtJgq7/LeGBAAm AJHbI4K/sQdhZ2N/x+0lPBMuOhOQLHol1A== X-Google-Smtp-Source: ABdhPJxaPdYyRdczWZcTAr9iCqLu7DsSUHKXYgojEx4oeMMTVONeQFoPLbm99sVJHI+MyafIQOLjig== X-Received: by 2002:ad4:4f41:: with SMTP id eu1mr13086338qvb.34.1612720009830; Sun, 07 Feb 2021 09:46:49 -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 d14sm13014299qtc.25.2021.02.07.09.46.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Feb 2021 09:46:49 -0800 (PST) Date: Sun, 7 Feb 2021 12:46:48 -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: <20210207174648.bzpfkw326agk2s2a@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> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="c3njv3jvm45nlvrf" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4DYc6M2DZ7z4sxB 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 17:46:52 -0000 --c3njv3jvm45nlvrf Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 file 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 obviuous= ly > > > > not be changed again, see the errata notes at > > > > https://github.com/freebsd/git_conv/tree/next > > >=20 > > > This has now been pushed and the new hashes (and missing authornames!= ) are > > > live. > >=20 > > Sorry for what may seem like dumb questions, but I just wanted to make > > sure: > >=20 > > 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 ports > > 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 merge > with --allow-unrelated-histories. >=20 > (I personally would probably write out the merge commit manually myself, > it's much easier than figuring out what sort of flags one needs on the `g= it > merge`.) >=20 > Of course, if you're using rebase-based workflows, this all will be rather > trivial to rebase. 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. One more question: when ports is officially switched over to git, are we likely to see hash more hash changes? 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 --c3njv3jvm45nlvrf Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmAgJ4IACgkQ/y5nonf4 4fpYPg//UEa/vwb6IZ39E9B1tfSPzWUCetnDKXcCYj32AhRnVU/SiMNzpAACruym 1oAt17AlrB1q7cvIdJsSDiugvZaklgW/b6hUEl8yRaS4i/Gqgy1xuSy3HWCv2+F/ VgGhYnVlMjatYPmZVZEgHnBIAc46y2ewvANxxKhyopWostXkPo+75ffyAXD2WJgT vAXXtmqYKLtAKzUQQdpfvk6SRjXDJxevCe5+M/Ko4ydy06aqMD0DrKtwRlpxYLT7 5JxMFfWVPC3QZAcOLo65n3suucj9Sa5O5utJptMN8DOk+JDvHP2avNDVsTjiaZWA Ehc4tEo0Ft+YX1MKKtyj0kB4Y/5F5/qHbB2M4nAfmraGWH+CcUzya2fweV7UMDUw 5HELYsN5G9nRsDroqOhcm42h5MOzXXiToloLA1zygwBdK+e+UAL/6WdETSwbU0OH eAmV1ceUjEisJvTlfAjYkvPEMch1H1FFeCy/0JNXVHpIEhrUTM+SMlQgdGOsXWsH lQJ1O0NtjXn9hp+o6y6nGAk4xVTLKnx/99+7N5Aby1ZdoQ8FRl+fqPf+wGC7NZ90 wzyDOAnSGiGiVGqJ2Z4R2J8n7piEMTWTIVMPOkIfqBCyqQ6/aXyvBwCbAn0HJtrM yMEhH5JMRp1c0l/sZZHEft+cXoNN6sQ1+glDVgeYTUj/hyg3o8k= =a9xy -----END PGP SIGNATURE----- --c3njv3jvm45nlvrf--