From 1641730be2d5ed648775fcb19323e43c6b5752e3 Mon Sep 17 00:00:00 2001 From: Luke Sampson Date: Wed, 1 Jun 2016 09:45:57 +1000 Subject: [PATCH] apache 2.4.20 (fixes #826) --- apache.json | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/apache.json b/apache.json index 9637294004..f1a26812d4 100644 --- a/apache.json +++ b/apache.json @@ -4,24 +4,12 @@ "license": "Apache 2.0", "architecture": { "64bit": { - "url": [ - "https://www.apachelounge.com/download/VC14/binaries/httpd-2.4.20-win64-VC14.zip", - "https://raw.githubusercontent.com/MPLew-is/scoop-wamp/master/visual-c-redistributables/14/64-bit/vcruntime140.dll" - ], - "hash": [ - "sha256:F154A422057F5A99AD3296E4527E1D47672DA87357F3FBFD8A644B8C3E5DEA24", - "sha256:acf65e565021f2017815fc5ec8a3145cf6c15e75c132cf23a378cc943e68327c" - ] + "url": "https://www.apachelounge.com/download/VC14/binaries/httpd-2.4.20-win64-VC14.zip", + "hash": "5aca7e5e521c0e8aea0ac455897600c926edce4a327ffc26b22db9728ead7bac" }, "32bit": { - "url": [ - "https://www.apachelounge.com/download/VC14/binaries/httpd-2.4.20-win32-VC14.zip", - "https://raw.githubusercontent.com/MPLew-is/scoop-wamp/master/visual-c-redistributables/14/32-bit/vcruntime140.dll" - ], - "hash": [ - "sha256:5EBC9F372E049C6B604A5D8A3EF621B269FBF603D76385578E992CE2856AD748", - "sha256:b7c13f8519340257ba6ae3129afce961f137e394dde3e4e41971b9f912355f5e" - ] + "url": "https://www.apachelounge.com/download/VC14/binaries/httpd-2.4.20-win32-VC14.zip", + "hash": "a49504e044369d405b02ab0095fc56dd4dc565df09ddec51b9fd38d76edb46e9" } }, "extract_dir": "Apache24", @@ -38,9 +26,6 @@ "bin\\rotatelogs.exe" ], "post_install": " -#Copy needed DLL to bin subdirectory -mv \"$dir\\vcruntime140.dll\" \"$dir\\bin\\vcruntime140.dll\" - # set directory in httpd.conf $conf = \"$dir/conf/httpd.conf\" $root=(scoop which httpd | split-path -res -par | split-path -par) -replace '\\\\', '/';