diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-03-19 20:30:19 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-03-19 20:30:19 +0000 |
| commit | db55af0feaf06de83e7b82145dfd453c5cfa4762 (patch) | |
| tree | 18b77c57f63e66bcb152193a969f836cb50c7f92 /Mk | |
| parent | Update to 1.0.1m to fix multiple vulnerabilities. (diff) | |
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
Notes
Notes:
svn path=/head/; revision=381688
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.sites.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk index 404b994fe44f..ec7c7c312f64 100644 --- a/Mk/bsd.sites.mk +++ b/Mk/bsd.sites.mk @@ -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} |