From owner-svn-ports-all@FreeBSD.ORG Thu Mar 19 20:30:22 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B1B92F0F; Thu, 19 Mar 2015 20:30:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9A6FD288; Thu, 19 Mar 2015 20:30:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2JKUMb7059459; Thu, 19 Mar 2015 20:30:22 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2JKUKUA059446; Thu, 19 Mar 2015 20:30:20 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201503192030.t2JKUKUA059446@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 19 Mar 2015 20:30:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381688 - in head: Mk dns/bundy net-mgmt/lg ports-mgmt/poudriere ports-mgmt/poudriere-devel textproc/cdiff X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Mar 2015 20:30:22 -0000 Author: bdrewery Date: Thu Mar 19 20:30:19 2015 New Revision: 381688 URL: https://svnweb.freebsd.org/changeset/ports/381688 QAT: https://qat.redports.org/buildarchive/r381688/ Log: Fix the new USE_GITHUB to rename the distfile such that it does not conflict with the old scheme and cause a "reroll" or "invalid checksums". This also avoids clobbering the FreeBSD distcache. Use a revision in the DISTNAME for USE_GITHUB in case we need to bump this again for anything. It's more a hint of how to handle it in the future. Reported by: mat Discused with: mat, antoine, swills With hat: portmgr Modified: head/Mk/bsd.sites.mk head/dns/bundy/distinfo head/net-mgmt/lg/distinfo head/ports-mgmt/poudriere-devel/distinfo head/ports-mgmt/poudriere/distinfo head/textproc/cdiff/distinfo Modified: head/Mk/bsd.sites.mk ============================================================================== --- head/Mk/bsd.sites.mk Thu Mar 19 20:29:19 2015 (r381687) +++ head/Mk/bsd.sites.mk Thu Mar 19 20:30:19 2015 (r381688) @@ -549,6 +549,13 @@ MASTER_SITES+= GHL . if !defined(MASTER_SITES) || !${MASTER_SITES:MGH} && !${MASTER_SITES:MGHC} MASTER_SITES+= GH . endif +# This new scheme rerolls distfiles. Also ensure they are renamed to avoid +# conflicts. Use _GITHUB_REV in case github changes their zipping or structure +# which has happened before. +_GITHUB_REV= 0 +. if ${MASTER_SITES:MGH} +DISTNAME:= ${DISTNAME}_GH${_GITHUB_REV} +. endif . endif GH_ACCOUNT?= ${PORTNAME} GH_PROJECT?= ${PORTNAME} Modified: head/dns/bundy/distinfo ============================================================================== --- head/dns/bundy/distinfo Thu Mar 19 20:29:19 2015 (r381687) +++ head/dns/bundy/distinfo Thu Mar 19 20:30:19 2015 (r381688) @@ -1,2 +1,2 @@ -SHA256 (bundy-0.20150304.tar.gz) = 34fb3e94935acb50d4afff89e091c6c25d09b8a82d5601ead0e51852232c043d -SIZE (bundy-0.20150304.tar.gz) = 5311910 +SHA256 (bundy-0.20150304_GH0.tar.gz) = 34fb3e94935acb50d4afff89e091c6c25d09b8a82d5601ead0e51852232c043d +SIZE (bundy-0.20150304_GH0.tar.gz) = 5311910 Modified: head/net-mgmt/lg/distinfo ============================================================================== --- head/net-mgmt/lg/distinfo Thu Mar 19 20:29:19 2015 (r381687) +++ head/net-mgmt/lg/distinfo Thu Mar 19 20:30:19 2015 (r381688) @@ -1,2 +1,2 @@ -SHA256 (lg-1.9.s20140622.tar.gz) = 909b1e70811c84a5a0feb0e6992696ea841a43847bb3deb5dae8c98579e89030 -SIZE (lg-1.9.s20140622.tar.gz) = 44220 +SHA256 (lg-1.9.s20140622_GH0.tar.gz) = 909b1e70811c84a5a0feb0e6992696ea841a43847bb3deb5dae8c98579e89030 +SIZE (lg-1.9.s20140622_GH0.tar.gz) = 44220 Modified: head/ports-mgmt/poudriere-devel/distinfo ============================================================================== --- head/ports-mgmt/poudriere-devel/distinfo Thu Mar 19 20:29:19 2015 (r381687) +++ head/ports-mgmt/poudriere-devel/distinfo Thu Mar 19 20:30:19 2015 (r381688) @@ -1,2 +1,2 @@ -SHA256 (freebsd-poudriere-3.1.99.20150319-80b7167.tar.gz) = cd7b51dd70bc7fa03bfbbd310f719172023f809cd3ec9b103996023ff187bd90 -SIZE (freebsd-poudriere-3.1.99.20150319-80b7167.tar.gz) = 2713351 +SHA256 (freebsd-poudriere-3.1.99.20150319-80b7167_GH0.tar.gz) = cd7b51dd70bc7fa03bfbbd310f719172023f809cd3ec9b103996023ff187bd90 +SIZE (freebsd-poudriere-3.1.99.20150319-80b7167_GH0.tar.gz) = 2713351 Modified: head/ports-mgmt/poudriere/distinfo ============================================================================== --- head/ports-mgmt/poudriere/distinfo Thu Mar 19 20:29:19 2015 (r381687) +++ head/ports-mgmt/poudriere/distinfo Thu Mar 19 20:30:19 2015 (r381688) @@ -1,2 +1,2 @@ -SHA256 (poudriere-3.1.1.tar.gz) = 1d068e311d90298fcac919e7b9eda15ef3585ee295ab4d1c5f732a8f8fb85e68 -SIZE (poudriere-3.1.1.tar.gz) = 2713520 +SHA256 (poudriere-3.1.1_GH0.tar.gz) = 1d068e311d90298fcac919e7b9eda15ef3585ee295ab4d1c5f732a8f8fb85e68 +SIZE (poudriere-3.1.1_GH0.tar.gz) = 2713520 Modified: head/textproc/cdiff/distinfo ============================================================================== --- head/textproc/cdiff/distinfo Thu Mar 19 20:29:19 2015 (r381687) +++ head/textproc/cdiff/distinfo Thu Mar 19 20:30:19 2015 (r381688) @@ -1,2 +1,2 @@ -SHA256 (cdiff-0.9.6.20140711.tar.gz) = 4e62c6163644e57986d0868ed9e12baeed4a93975579e7354c68f6adfde62455 -SIZE (cdiff-0.9.6.20140711.tar.gz) = 30418 +SHA256 (cdiff-0.9.6.20140711_GH0.tar.gz) = 4e62c6163644e57986d0868ed9e12baeed4a93975579e7354c68f6adfde62455 +SIZE (cdiff-0.9.6.20140711_GH0.tar.gz) = 30418