From 7d911ec094f2c1a40b8a56928d8530c330e97fae Mon Sep 17 00:00:00 2001
From: Mike Aizatsky <mike.aizatsky@gmail.com>
Date: Wed, 28 Dec 2016 14:07:18 -0800
Subject: [PATCH] [infra] replacing wget with ADD where possible

---
 .gitignore                      |   2 +-
 projects/ffmpeg/Dockerfile      |   2 +-
 projects/libreoffice/Dockerfile | 135 ++++++++++++++++----------------
 3 files changed, 69 insertions(+), 70 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7176ea156..63c6116d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 .vscode/
 *.pyc
-/build
+build/
diff --git a/projects/ffmpeg/Dockerfile b/projects/ffmpeg/Dockerfile
index 6543bc8ed..488de962c 100644
--- a/projects/ffmpeg/Dockerfile
+++ b/projects/ffmpeg/Dockerfile
@@ -27,7 +27,7 @@ RUN git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
 RUN wget ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.1.0.tar.bz2
 RUN git clone git://anongit.freedesktop.org/mesa/drm
 RUN git clone https://github.com/mstorsjo/fdk-aac.git
-RUN wget https://sourceforge.net/projects/lame/files/latest/download -O lame.tar.gz
+ADD https://sourceforge.net/projects/lame/files/latest/download lame.tar.gz
 RUN git clone git://anongit.freedesktop.org/xorg/lib/libXext
 RUN git clone git://anongit.freedesktop.org/git/xorg/lib/libXfixes
 RUN git clone git://anongit.freedesktop.org/git/libva
diff --git a/projects/libreoffice/Dockerfile b/projects/libreoffice/Dockerfile
index f0bae0cc0..bd0df5b9f 100644
--- a/projects/libreoffice/Dockerfile
+++ b/projects/libreoffice/Dockerfile
@@ -18,76 +18,75 @@ FROM ossfuzz/base-libfuzzer
 MAINTAINER security@documentfoundation.org
 #build requirements
 RUN apt-get -y build-dep libreoffice
-RUN apt-get -y install wget
 #cache build dependencies
-RUN wget http://dev-www.libreoffice.org/src/c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
-RUN wget http://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip
-RUN wget http://dev-www.libreoffice.org/src/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip
-RUN wget http://dev-www.libreoffice.org/src/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/boost_1_60_0.tar.bz2
-RUN wget http://dev-www.libreoffice.org/src/expat-2.2.0.tar.bz2
-RUN wget http://dev-www.libreoffice.org/src/jpegsrc.v9a.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/lcms2-2.6.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2
-RUN wget http://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/cppunit-1.13.2.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/openldap-2.4.44.tgz
-RUN wget http://dev-www.libreoffice.org/src/231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/23a0b2f0235431d35238df1d3a517fdb-cairo-1.14.6.tar.xz
-RUN wget http://dev-www.libreoffice.org/src/curl-7.51.0.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2
-RUN wget http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2
-RUN wget http://dev-www.libreoffice.org/src/libcdr-0.1.3.tar.bz2
-RUN wget http://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/libe-book-0.1.2.tar.bz2
-RUN wget http://dev-www.libreoffice.org/src/libetonyek-0.1.6.tar.bz2
-RUN wget http://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2
-RUN wget http://dev-www.libreoffice.org/src/libmspub-0.1.2.tar.bz2
-RUN wget http://dev-www.libreoffice.org/src/libmwaw-0.3.9.tar.bz2
-RUN wget http://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2
-RUN wget http://dev-www.libreoffice.org/src/liborcus-0.12.1.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/libpagemaker-0.0.3.tar.bz2
-RUN wget http://dev-www.libreoffice.org/src/libpng-1.6.24.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2
-RUN wget http://dev-www.libreoffice.org/src/libstaroffice-0.0.2.tar.bz2
-RUN wget http://dev-www.libreoffice.org/src/libvisio-0.1.5.tar.bz2
-RUN wget http://dev-www.libreoffice.org/src/libwpd-0.10.1.tar.bz2
-RUN wget http://dev-www.libreoffice.org/src/libwpg-0.3.1.tar.bz2
-RUN wget http://dev-www.libreoffice.org/src/libwps-0.4.4.tar.bz2
-RUN wget http://dev-www.libreoffice.org/src/libzmf-0.0.1.tar.bz2
-RUN wget http://dev-www.libreoffice.org/src/zlib-1.2.8.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/poppler-0.50.0.tar.xz
-RUN wget http://dev-www.libreoffice.org/src/mdds-1.2.2.tar.bz2
-RUN wget http://dev-www.libreoffice.org/src/openssl-1.0.2h.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/language-subtag-registry-2016-07-19.tar.bz2
-RUN wget http://dev-www.libreoffice.org/src/3069842a88b8f40c6b83ad2850cda293-graphite2-minimal-1.3.9.tgz
-RUN wget http://dev-www.libreoffice.org/src/harfbuzz-1.3.2.tar.bz2
-RUN wget http://dev-www.libreoffice.org/src/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
-RUN wget http://dev-www.libreoffice.org/src/1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz
-RUN wget http://dev-www.libreoffice.org/src/ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/9849a2381bacbeb2714034ad825bede8-hunspell-1.5.4.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2
-RUN wget http://dev-www.libreoffice.org/src/77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz
-RUN wget http://dev-www.libreoffice.org/src/libepoxy-1.3.1.tar.bz2
+ADD http://dev-www.libreoffice.org/src/c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip $SRC/
+ADD http://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip $SRC/
+ADD http://dev-www.libreoffice.org/src/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip $SRC/
+ADD http://dev-www.libreoffice.org/src/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/boost_1_60_0.tar.bz2 $SRC/
+ADD http://dev-www.libreoffice.org/src/expat-2.2.0.tar.bz2 $SRC/
+ADD http://dev-www.libreoffice.org/src/jpegsrc.v9a.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/lcms2-2.6.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 $SRC/
+ADD http://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/cppunit-1.13.2.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/openldap-2.4.44.tgz $SRC/
+ADD http://dev-www.libreoffice.org/src/231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/23a0b2f0235431d35238df1d3a517fdb-cairo-1.14.6.tar.xz $SRC/
+ADD http://dev-www.libreoffice.org/src/curl-7.51.0.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2 $SRC/
+ADD http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2 $SRC/
+ADD http://dev-www.libreoffice.org/src/libcdr-0.1.3.tar.bz2 $SRC/
+ADD http://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/libe-book-0.1.2.tar.bz2 $SRC/
+ADD http://dev-www.libreoffice.org/src/libetonyek-0.1.6.tar.bz2 $SRC/
+ADD http://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2 $SRC/
+ADD http://dev-www.libreoffice.org/src/libmspub-0.1.2.tar.bz2 $SRC/
+ADD http://dev-www.libreoffice.org/src/libmwaw-0.3.9.tar.bz2 $SRC/
+ADD http://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2 $SRC/
+ADD http://dev-www.libreoffice.org/src/liborcus-0.12.1.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/libpagemaker-0.0.3.tar.bz2 $SRC/
+ADD http://dev-www.libreoffice.org/src/libpng-1.6.24.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2 $SRC/
+ADD http://dev-www.libreoffice.org/src/libstaroffice-0.0.2.tar.bz2 $SRC/
+ADD http://dev-www.libreoffice.org/src/libvisio-0.1.5.tar.bz2 $SRC/
+ADD http://dev-www.libreoffice.org/src/libwpd-0.10.1.tar.bz2 $SRC/
+ADD http://dev-www.libreoffice.org/src/libwpg-0.3.1.tar.bz2 $SRC/
+ADD http://dev-www.libreoffice.org/src/libwps-0.4.4.tar.bz2 $SRC/
+ADD http://dev-www.libreoffice.org/src/libzmf-0.0.1.tar.bz2 $SRC/
+ADD http://dev-www.libreoffice.org/src/zlib-1.2.8.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/poppler-0.50.0.tar.xz $SRC/
+ADD http://dev-www.libreoffice.org/src/mdds-1.2.2.tar.bz2 $SRC/
+ADD http://dev-www.libreoffice.org/src/openssl-1.0.2h.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/language-subtag-registry-2016-07-19.tar.bz2 $SRC/
+ADD http://dev-www.libreoffice.org/src/3069842a88b8f40c6b83ad2850cda293-graphite2-minimal-1.3.9.tgz $SRC/
+ADD http://dev-www.libreoffice.org/src/harfbuzz-1.3.2.tar.bz2 $SRC/
+ADD http://dev-www.libreoffice.org/src/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip $SRC/
+ADD http://dev-www.libreoffice.org/src/1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz $SRC/
+ADD http://dev-www.libreoffice.org/src/ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/9849a2381bacbeb2714034ad825bede8-hunspell-1.5.4.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2 $SRC/
+ADD http://dev-www.libreoffice.org/src/77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz $SRC/
+ADD http://dev-www.libreoffice.org/src/libepoxy-1.3.1.tar.bz2 $SRC/
 #fuzzing corpuses
-RUN wget http://dev-www.libreoffice.org/corpus/wmffuzzer_seed_corpus.zip
+ADD http://dev-www.libreoffice.org/corpus/wmffuzzer_seed_corpus.zip $SRC/
 #clone source
 RUN git clone --depth 1 git://anongit.freedesktop.org/libreoffice/core libreoffice
 WORKDIR libreoffice