From owner-freebsd-ports@freebsd.org Fri Dec 2 16:13:07 2016 Return-Path: Delivered-To: freebsd-ports@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 510DDC623C1 for ; Fri, 2 Dec 2016 16:13:07 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qk0-x231.google.com (mail-qk0-x231.google.com [IPv6:2607:f8b0:400d:c09::231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 06BCC1992 for ; Fri, 2 Dec 2016 16:13:07 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mail-qk0-x231.google.com with SMTP id q130so95916272qke.1 for ; Fri, 02 Dec 2016 08:13:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd-org.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=BAGP7OxxPL0b4pdOdLv6Xun6W1YduV4dYlIXxf3QfLA=; b=WipNiTcq1+zryLaX9SsXhWWde+fbZ1IhUl+IRiqI+TFhJ8vep41FO0dK0Un2Zo46m7 3rOLXNWoeMHprj8ygpWsj2yNkI182xzQQUwJI503Cxb6IDDUe3mDYHLtv9d1h8BW3d38 nJ8sp0sngGVSy4LNYALZWiRXS4pz+FjAtW8MGqAWjQcAUSlGouemnbezT8gpyEgrG8AX h/SQlULkvTGJNUh2jCa2JtUaPrVih4L37zxBWK23MLbEQj5YjjkvRGSCs0J0T6p0hGYO uvMbiTPaiZHIY2OKa/+y5VqGq0B8NV6Bz5iFOT6XQGxnzsDQBpmKfTIL7nKufb5spNw3 V4DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=BAGP7OxxPL0b4pdOdLv6Xun6W1YduV4dYlIXxf3QfLA=; b=Nwi5y6H20JWG7gMW5rfeDKX1UeyxYvLsgaXTI2CNDlIlrz2cD57IA76iMILv1RMRfn TRiDPSByybLFkizFl9bLlfgvsej2QGeIADkpHFLlqpZa2S0qfh6zcZQWnyygk3IWwP5o rxOogp65mQ/Rbmohu+su8kPqz3IXTFwSfWmDugj94cmxQq204BI7C7q6BrpidScTu+j/ 7XCak6TQ89HLyXsPcoMKwhLPrI38VP72UOzEqf0ouDG2XSITb9Kvg62ghWHbiuFnRi4h 6cg+mSUAUSxScvymbRqPZqisJS+4BYAY0X3uFX1NGE6Vw9CKROgnP2STuj1+cet0ggqj IKzQ== X-Gm-Message-State: AKaTC018gLYym8oHlXvbavQy258aeOgEfOd6P+f7Li4pMkc3HvIfXWhNmE33arHBfkRf1oG0 X-Received: by 10.55.129.4 with SMTP id c4mr37544371qkd.14.1480695186060; Fri, 02 Dec 2016 08:13:06 -0800 (PST) Received: from mutt-hardenedbsd ([63.88.83.66]) by smtp.gmail.com with ESMTPSA id x13sm2866273qkb.45.2016.12.02.08.13.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 02 Dec 2016 08:13:04 -0800 (PST) Date: Fri, 2 Dec 2016 11:13:03 -0500 From: Shawn Webb To: Steven Hartland Cc: freebsd-ports@freebsd.org Subject: Re: Hash changes in the freebsd-ports GitHub mirror Message-ID: <20161202161303.GC95068@mutt-hardenedbsd> References: <86zikeekj6.fsf@FreeBSD.org> <20161202151225.GB95068@mutt-hardenedbsd> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="eRtJSFbw+EEWtPj3" Content-Disposition: inline In-Reply-To: X-Operating-System: FreeBSD mutt-hardenedbsd 12.0-CURRENT-HBSD FreeBSD 12.0-CURRENT-HBSD X-PGP-Key: http://pgp.mit.edu/pks/lookup?op=vindex&search=0x6A84658F52456EEE User-Agent: Mutt/1.6.1 (2016-04-27) X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Dec 2016 16:13:07 -0000 --eRtJSFbw+EEWtPj3 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Dec 02, 2016 at 04:08:23PM +0000, Steven Hartland wrote: > On 02/12/2016 15:12, Shawn Webb wrote: > > On Fri, Dec 02, 2016 at 10:40:29AM +0100, Raphael Kubo da Costa wrote: > >> Hi all, > >> > >> I tried running `git pull` a few minutes ago and had a ton of conflict= s. > >> > >> It turns out all hashes after c96fb0418e545a569b5975b4d878a30a948c29d5 > >> ("fix issues related with USES=3Dfonts" from 2015-07-18, aka r392404) = are > >> now different in all GitHub branches. > >> > >> Is anyone else experiencing this? Was this change intentional? > > We at HardenedBSD are affected as well. Well, time to spend my weekend > > resolving merge conflicts. > > > > Seems like any downstream project that relies on the GitHub mirror of > > the ports tree will have issues. Major ouch. > > > Did someone do a force push? Looks like the svn2git conversion script iis having issues: https://lists.freebsd.org/pipermail/freebsd-git/2016-December/000074.html --=20 Shawn Webb Cofounder and Security Engineer HardenedBSD GPG Key ID: 0x6A84658F52456EEE GPG Key Fingerprint: 2ABA B6BD EF6A F486 BE89 3D9E 6A84 658F 5245 6EEE --eRtJSFbw+EEWtPj3 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJYQZ2MAAoJEGqEZY9SRW7u7NoQAKvNOYo6jEjX3IT2xOmQafGM lZbsoqls5XcOtSXmjHMew1+T/gT8OQU+lnmXepr4LBIMs5Ji+Qhv5vo4Juo2FMPf ZtGSCUEcsGjezuKSbt9YeEA5/sNBk4OYkuSb+DTamcrk5EiKY4Ep4HN7egiaucAP hxV5Q3N6itd4Bl+Nzk6DmlM2rlige9uj1TYgk906R1YUN3vuqfuz9pnNz/ceiBGZ 8NpGQkcXjMIg0oIVv3ttFPCATTL0HSuyuSpAnNtcsScv6/OmcKqJfRfDGjbx3Vug InKeTYpZVOoSoip1EMsFsG1QOy2dRBupSIOS75avS3Us0WAclPti2aUQ8Lw6eL+j szNxNv4QoXswKZ4UQ0keipO6hyPtOWpLv+qamTP+EJCnpQ3UrMtCg6FV4BICU5QN QGWT1X59PI0AXcjxzib8uIKyAzpX5WalwAyyo7mVKPJYX8dgCxUJ62Jv+csQqjHn 2x9i8GAZ6+Eng8vL50W8XM1msagjXjbOG4xUU5LBc8W8DaLrgtKV6ph2GLK7kkV6 uDHPSf65y4A97jRVC38Rz2fWtErEpssNpERyEUmuyCsjS4xW/ack/Ak4+wiNHZl4 V3Q7mpnw3GMKWXvMgmIa/8AFoFmBRrdr4bvHBOKkMJzfTHwnZ45xu+iDLTQCl4NI gK9m1ipXyXkWdPlPRmDt =ownb -----END PGP SIGNATURE----- --eRtJSFbw+EEWtPj3--