[PATCH 2 of 2] Merged

[Wald Commits]

# HG changeset patch
# User Emanuel Schuetze <emanuel at intevation.de>
# Date 1411988561 -7200
# Node ID d3d66d43365fd3d810a556998c761aeac9c6777a
# Parent  4d2c4873334b76e42b079a2ff72f60c65cc0fa3d
# Parent  4a3a482dc33742fa0608b06628be2d751d031112
Merged

diff -r 4d2c4873334b -r d3d66d43365f INSTALL
--- a/INSTALL	Mon Sep 29 13:02:05 2014 +0200
+++ b/INSTALL	Mon Sep 29 13:02:41 2014 +0200
@@ -20,7 +20,7 @@
     curl https://download.qt-project.org/official_releases/qt/5.3/5.3.2/single/qt-everywhere-opensource-src-5.3.2.tar.xz.mirrorlist | grep SHA-256
 7f5bf93344cb57bac374ea4a32c8eda87f1357f998f14278e717cf84d0289bf0
 
-    http://qt-mirror.dannhauer.de/official_releases/qt/5.3/5.3.2/single/qt-everywhere-opensource-src-5.3.2.tar.xz
+    curl -O http://qt-mirror.dannhauer.de/official_releases/qt/5.3/5.3.2/single/qt-everywhere-opensource-src-5.3.2.tar.xz
 
     sha256sum qt-everywhere-opensource-src-5.3.2.tar.xz
 
@@ -59,6 +59,7 @@
 Polarssl is required for TrustBridge:
 
     curl -O https://polarssl.org/download/polarssl-1.3.8-gpl.tgz
+    sha256sum polarssl-1.3.8-gpl.tgz
     318171db41335cacbb5b0047c94f1faf91442ab70a223b5223436703c9406ff1 polarssl-1.3.8-gpl.tgz
 
     tar -xf polarssl-1.3.8-gpl.tgz
@@ -77,8 +78,11 @@
 
 Libcurl:
 
-    wget http://curl.haxx.se/download/curl-7.38.0.tar.gz
+    curl -O http://curl.haxx.se/download/curl-7.38.0.tar.gz
+    sha256sum curl-7.38.0.tar.gz
     5661028aa6532882fa228cd23c99ddbb8b87643dbb1a7ea55c068d34a943dff1 curl-7.38.0.tar.gz
+    curl -O http://curl.haxx.se/download/curl-7.38.0.tar.gz.asc
+    gpg2 --verify curl-7.38.0.tar.gz.asc
 
     tar -xf curl-7.38.0.tar.gz
     cd curl-7.38.0/
@@ -214,7 +218,7 @@
 for the ssl connection. To build it you may need libxslt-dev as additional
 dependency.
 
-    wget https://www.hiawatha-webserver.org/files/hiawatha-9.7.tar.gz
+    curl -O https://www.hiawatha-webserver.org/files/hiawatha-9.7.tar.gz
     sha256sum hiawatha-9.7.tar.gz
 
 e8581336883b7b963f38572f6396f8c47b43e5bedd3147d052fa3652e6c0ed86 hiawatha-9.7.tar.gz
@@ -232,7 +236,7 @@
 Osslsigncode is used to create PKCS#7 embedded signatures for Windows Authenticode
 it is needed for the Windows part of the binverify unit test on the build system.
 
-    wget http://downloads.sourceforge.net/project/osslsigncode/osslsigncode/osslsigncode-1.7.1.tar.gz
+    curl -L --max-redirs=1 -O http://downloads.sourceforge.net/project/osslsigncode/osslsigncode/osslsigncode-1.7.1.tar.gz
     sha256sum osslsigncode-1.7.1.tar.gz
 f9a8cdb38b9c309326764ebc937cba1523a3a751a7ab05df3ecc99d18ae466c9
     tar -xf osslsigncode-1.7.1.tar.gz
@@ -255,7 +259,7 @@
     cmake flex gettext git g++ intltool \
     libffi-dev libtool libltdl-dev libssl-dev \
     libxml-parser-perl make openssl patch perl \
-    pkg-config scons sed unzip wget xz-utils autopoint \
+    pkg-config scons sed unzip curl xz-utils autopoint \
     gperf
 
 Build the windows binaries:
diff -r 4d2c4873334b -r d3d66d43365f ui/tests/data/NOTES
--- a/ui/tests/data/NOTES	Mon Sep 29 13:02:05 2014 +0200
+++ b/ui/tests/data/NOTES	Mon Sep 29 13:02:41 2014 +0200
@@ -134,7 +134,7 @@
 # Testserver mit hiawatha
 apt-get install build-essential cmake libxslt-dev libxml2-dev libz-dev
 
-    wget https://www.hiawatha-webserver.org/files/hiawatha-9.7.tar.gz
+    curl -O https://www.hiawatha-webserver.org/files/hiawatha-9.7.tar.gz
     sha256sum hiawatha-9.7.tar.gz
 
 e8581336883b7b963f38572f6396f8c47b43e5bedd3147d052fa3652e6c0ed86 hiawatha-9.7.tar.gz