commit cbf19c98632116c7ac197feb72856deb04b18142 Author: Georg Koppen gk@torproject.org Date: Fri Sep 2 07:21:07 2016 +0000

Don't hardcode particular SF mirror --- gitian/versions | 6 +++++- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/gitian/versions b/gitian/versions index 22b52ff..46aad1b 100755 --- a/gitian/versions +++ b/gitian/versions @@ -84,6 +84,8 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO14_PACKAGE=go${GO14_VER}.src.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz +NSIS_PACKAGE=nsis-${NSIS_VER}-src.tar.bz2 +NSIS_DEBIAN_PACKAGE=nsis_${NSIS_VER}-1.debian.tar.xz STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf @@ -143,7 +145,9 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/$%7BSETUPTOOLS PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/$%7BPARSLEY_PACKAGE%7D GO14_URL=https://golang.org/dl/$%7BGO14_PACKAGE%7D GO_URL=https://golang.org/dl/$%7BGO_PACKAGE%7D -STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%20Release/$%7BSTIXM... +NSIS_URL=http://downloads.sourceforge.net/nsis/$%7BNSIS_PACKAGE%7D +NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/$%7BNSIS_DEBIAN_PACKAGE%7D +STIXMATHFONT_URL=http://downloads.sourceforge.net/stixfonts/$%7BSTIXMATHFONT_PACKAGE%7D NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd05d6f382138a3d3adcd... NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d020... NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index fae60f8..964e529 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -155,7 +155,7 @@ GO14_URL=https://golang.org/dl/$%7BGO14_PACKAGE%7D GO_URL=https://golang.org/dl/$%7BGO_PACKAGE%7D NSIS_URL=http://downloads.sourceforge.net/nsis/$%7BNSIS_PACKAGE%7D NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/$%7BNSIS_DEBIAN_PACKAGE%7D -STIXMATHFONT_URL=http://heanet.dl.sourceforge.net/project/stixfonts/Current%20Release/$%7BSTI... +STIXMATHFONT_URL=http://downloads.sourceforge.net/stixfonts/$%7BSTIXMATHFONT_PACKAGE%7D NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd05d6f382138a3d3adcd... NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d020... NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} diff --git a/gitian/versions.beta b/gitian/versions.beta index 92761a4..a686402 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -132,7 +132,7 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/$%7BSETUPTOOLS PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/$%7BPARSLEY_PACKAGE%7D GO14_URL=https://golang.org/dl/$%7BGO14_PACKAGE%7D GO_URL=https://golang.org/dl/$%7BGO_PACKAGE%7D -STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%20Release/$%7BSTIXM... +STIXMATHFONT_URL=http://downloads.sourceforge.net/stixfonts/$%7BSTIXMATHFONT_PACKAGE%7D NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd05d6f382138a3d3adcd... NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d020... NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 1d216fa..27059d7 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -158,7 +158,7 @@ GO14_URL=https://golang.org/dl/$%7BGO14_PACKAGE%7D GO_URL=https://golang.org/dl/$%7BGO_PACKAGE%7D NSIS_URL=http://downloads.sourceforge.net/nsis/$%7BNSIS_PACKAGE%7D NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/$%7BNSIS_DEBIAN_PACKAGE%7D -STIXMATHFONT_URL=http://heanet.dl.sourceforge.net/project/stixfonts/Current%20Release/$%7BSTI... +STIXMATHFONT_URL=http://downloads.sourceforge.net/stixfonts/$%7BSTIXMATHFONT_PACKAGE%7D NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd05d6f382138a3d3adcd... NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d020... NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE}