From 3b5887e0f9e1b75ccfbdb4f901c74ec4583ff7c7 Mon Sep 17 00:00:00 2001 From: Roy Ivy III Date: Fri, 24 Jul 2015 21:30:12 -0500 Subject: [PATCH 01/11] Change encoding of generated shim files to ASCII * change file encoding of the basic shim to be in a normal ASCII character set .# DISCUSSION Within PowerShell, `echo STRING > FILE` generates a file encoded in UCS-2-BOM format (or "Unicode", in PowerShell terminology). UCS-2 later morphed into the similar UTF-16 encoding format, and, within PowerShell, is treated as a "fuzzy equivalent" encoding. Problematically, these UCS-2 files are misinterpreted by CMD, which expects files using the ASCII (or "extended-ASCII") character encoding. And, in general, the UCS-2 format has many drawbacks when interpreted outside of a narrow PowerShell window. So, in general, it's best to stick to pure ASCII (or UTF-8, *without BOM*) encoded files, if at all possible. NOTE: ASCII (not "extended-ASCII") and UTF-8 (non-BOM) encoded files are exactly equivalent. NOTE: "Extended-ASCII" is poorly defined, requiring an associated Windows Code Page designation to firmly establish the encoding. ref: [Unicode UTF and BOM] http://www.unicode.org/faq/utf_bom.html @@ https://archive.is/TKnyk ref: [Unicode and NET] http://csharpindepth.com/Articles/General/Unicode.aspx @@ https://archive.is/czs89 --- lib/core.ps1 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/core.ps1 b/lib/core.ps1 index 2728cb432..9b0376ad3 100644 --- a/lib/core.ps1 +++ b/lib/core.ps1 @@ -111,14 +111,14 @@ function shim($path, $global, $name, $arg) { $shim = "$abs_shimdir\$($name.tolower()).ps1" # note: use > for first line to replace file, then >> to append following lines - echo '# ensure $HOME is set for MSYS programs' > $shim - echo "if(!`$env:home) { `$env:home = `"`$home\`" }" >> $shim - echo 'if($env:home -eq "\") { $env:home = $env:allusersprofile }' >> $shim - echo "`$path = `"$path`"" >> $shim + echo '# ensure $HOME is set for MSYS programs' | out-file $shim -encoding oem + echo "if(!`$env:home) { `$env:home = `"`$home\`" }" | out-file $shim -encoding oem -append + echo 'if($env:home -eq "\") { $env:home = $env:allusersprofile }' | out-file $shim -encoding oem -append + echo "`$path = `"$path`"" | out-file $shim -encoding oem -append if($arg) { - echo "`$args = '$($arg -join "', '")', `$args" >> $shim + echo "`$args = '$($arg -join "', '")', `$args" | out-file $shim -encoding oem -append } - echo 'if($myinvocation.expectingInput) { $input | & $path @args } else { & $path @args }' >> $shim + echo 'if($myinvocation.expectingInput) { $input | & $path @args } else { & $path @args }' | out-file $shim -encoding oem -append if($path -match '\.exe$') { # for programs with no awareness of any shell From fcfd5936498824cf0a9b04cdeb52509ede409c79 Mon Sep 17 00:00:00 2001 From: Stephen Edgar Date: Tue, 18 Aug 2015 16:35:34 +1000 Subject: [PATCH 02/11] OpenSSL v1.0.2d --- bucket/openssl.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/bucket/openssl.json b/bucket/openssl.json index 9fc6068d2..63d4d2211 100644 --- a/bucket/openssl.json +++ b/bucket/openssl.json @@ -1,18 +1,18 @@ { - "homepage": "http://slproweb.com/products/Win32OpenSSL.html", - "version": "1.0.2b", - "license": "https://www.openssl.org/source/license.html", - "architecture": { - "64bit": { - "url": "http://slproweb.com/download/Win64OpenSSL-1_0_2b.exe", - "hash": "e95f5b70e0275d5766348f4ab8120b5ad82e9af69242665777cb4300dee216a5" - }, - "32bit": { - "url": "http://slproweb.com/download/Win32OpenSSL-1_0_2b.exe", - "hash": "3a017ee86a8e22304dadd960524546fb65ab80cb75b058f46b719ec244c40c23" - } - }, - "innosetup": true, - "bin": "bin\\openssl.exe", - "checkver": "Win32 OpenSSL v([^ ]+) Light" + "homepage": "http://slproweb.com/products/Win32OpenSSL.html", + "version": "1.0.2d", + "license": "https://www.openssl.org/source/license.html", + "architecture": { + "64bit": { + "url": "http://slproweb.com/download/Win64OpenSSL-1_0_2d.exe", + "hash": "9e62364a75cf7a55ce8167f9a4992aa38c55ba362594e4579e27f9c0758c2284" + }, + "32bit": { + "url": "http://slproweb.com/download/Win32OpenSSL-1_0_2d.exe", + "hash": "68796d75cd8cc5a34d5fa997805a373d2c701179a270efd0a513b197ea15736c" + } + }, + "innosetup": true, + "bin": "bin\\openssl.exe", + "checkver": "Win32 OpenSSL v([^ ]+) Light" } From 1cac2a35cb57ab671affcffedf6fb2222ab7fe2a Mon Sep 17 00:00:00 2001 From: Stephen Edgar Date: Tue, 18 Aug 2015 17:35:45 +1000 Subject: [PATCH 03/11] sliksvn v1.8.13 --- bucket/sliksvn.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bucket/sliksvn.json b/bucket/sliksvn.json index 0fe8d973f..ccdd1f4b1 100644 --- a/bucket/sliksvn.json +++ b/bucket/sliksvn.json @@ -1,14 +1,14 @@ { "homepage": "http://sliksvn.com/", - "version": "1.8.10", + "version": "1.8.13", "architecture": { "64bit": { - "url": "https://sliksvn.com/pub/Slik-Subversion-1.8.10-x64.msi", - "hash": "4f90b4f51ccec1cb309022ee2db98be8297a2cdee33ae6ce218d1cf93883a222" + "url": "https://sliksvn.com/pub/Slik-Subversion-1.8.13-x64.msi", + "hash": "0d4fde7f9113a8b4436a68c74beba7b27e9043002e3fe5730c09f918f606483c" }, "32bit": { - "url": "https://sliksvn.com/pub/Slik-Subversion-1.8.10-win32.msi", - "hash": "7f1e4d9080fb8c591cc354b91bb1ede9c17ab8a3b0dbf5347525f6c79c6e059a" + "url": "https://sliksvn.com/pub/Slik-Subversion-1.8.13-win32.msi", + "hash": "2852bb8cacbecbbc52cf0d9edba40239daa593343f78b88713eba100119def09" } }, "extract_dir": "SlikSvn", From 19460b6f32481b6b9d472da848aa76a618a7be8b Mon Sep 17 00:00:00 2001 From: Stephen Edgar Date: Tue, 18 Aug 2015 17:47:02 +1000 Subject: [PATCH 04/11] curl v7.43.0 --- bucket/curl.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bucket/curl.json b/bucket/curl.json index 1d2f8bf34..88cc2a9e3 100644 --- a/bucket/curl.json +++ b/bucket/curl.json @@ -1,17 +1,17 @@ { "homepage": "http://curl.haxx.se/", - "version": "7.39.0", + "version": "7.43.0", "licence": "MIT", "architecture": { "64bit": { - "url": "http://www.confusedbycode.com/curl/curl-7.39.0-win64.zip", - "hash": "946c3ab2625b9352a846e493319978b1ef2818173c711ed8b1bb8c0e04189ee4", - "extract_dir": "curl-7.39.0-win64" + "url": "http://www.confusedbycode.com/curl/curl-7.43.0-win64.zip", + "hash": "ef2eb41ddfbecd7ec4b186decdf7a9257894eb3f75b9624460a1bb34e4941019", + "extract_dir": "curl-7.43.0-win64" }, "32bit": { - "url": "http://www.confusedbycode.com/curl/curl-7.39.0-win32.zip", - "hash": "e97a78dc97ece670580cccf735a5ec048513da0a9ba5135d4ae227b7cde68dba", - "extract_dir": "curl-7.39.0-win32" + "url": "http://www.confusedbycode.com/curl/curl-7.43.0-win32.zip", + "hash": "0ff74737d4df54a955c8cb2689dd27abd0e835210951c4401825e95a95273690", + "extract_dir": "curl-7.43.0-win32" } }, "bin": "bin/curl.exe", From fd7615b34a816a7c905b23f0c893bd9e823d5a4a Mon Sep 17 00:00:00 2001 From: Stephen Edgar Date: Tue, 18 Aug 2015 17:55:17 +1000 Subject: [PATCH 05/11] cmake v3.3.1 --- bucket/cmake.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bucket/cmake.json b/bucket/cmake.json index ea2033a4a..d87befe5b 100644 --- a/bucket/cmake.json +++ b/bucket/cmake.json @@ -1,10 +1,10 @@ { "homepage": "http://www.cmake.org/", - "version": "3.2.2", + "version": "3.3.1", "license": "http://www.cmake.org/licensing/", - "url": "http://www.cmake.org/files/v3.2/cmake-3.2.2-win32-x86.zip", - "hash": "8728119BBB48468AB45230A579463729E7B12D6BABFA1AD77E771B239B5430DB", - "extract_dir": "cmake-3.2.2-win32-x86", + "url": "http://www.cmake.org/files/v3.3/cmake-3.3.1-win32-x86.zip", + "hash": "618fd27dce2ed83a98740b427e7f9d16577db3e04afb93ba2aca524981044b8b", + "extract_dir": "cmake-3.3.1-win32-x86", "bin": [ "bin/cmake.exe", "bin/cmcldeps.exe", From 3ee188fd3588db77ff6d6393982a8c19c2cce937 Mon Sep 17 00:00:00 2001 From: Konstantin Molchanov Date: Wed, 19 Aug 2015 22:38:38 +0300 Subject: [PATCH 06/11] Update git to 2.5.0 --- bucket/git.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bucket/git.json b/bucket/git.json index 10c781ce6..2842ca50e 100644 --- a/bucket/git.json +++ b/bucket/git.json @@ -1,15 +1,15 @@ { "homepage": "https://git-for-windows.github.io/", "license": "GPL2", - "version": "2.4.6.windows.1", + "version": "2.5.0.windows.1", "architecture": { "64bit": { - "url": "https://github.com/git-for-windows/git/releases/download/v2.4.6.windows.1/PortableGit-2.4.6-5th-release-candidate-64-bit.7z.exe#/dl.7z", - "hash": "cc7d8df6edf7bd3689d685a2da7561ca7aee34936e868b475cddd72bfc6f953b" + "url": "https://github.com/git-for-windows/git/releases/download/v2.5.0.windows.1/PortableGit-2.5.0-64-bit.7z.exe#/dl.7z", + "hash": "2ace32df8b8449e2b48cc6e4d0152be7f4bf8e7174d0dc43f67a1ae23bf26f9d" }, "32bit": { - "url": "https://github.com/git-for-windows/git/releases/download/v2.4.6.windows.1/PortableGit-2.4.6-5th-release-candidate-32-bit.7z.exe#/dl.7z", - "hash": "1b373b2238f44b0d96ae07a9965399caeb31180bf3cdd6585e3c34a4851dc9c2" + "url": "https://github.com/git-for-windows/git/releases/download/v2.5.0.windows.1/PortableGit-2.5.0-32-bit.7z.exe#/dl.7z", + "hash": "207f40828b7ad2f93f27b74443b89540a134d1fd735a849db14df2a0a64d5896" } }, "bin": [ "cmd\\git.exe", "cmd\\gitk.exe", "cmd\\git-gui.exe" ], From 1a835d7c81b8ef7b55033883e0114318db43ff2f Mon Sep 17 00:00:00 2001 From: Ibrahim Hatoum Date: Wed, 19 Aug 2015 16:05:49 -0400 Subject: [PATCH 07/11] Update apache.json Fixed Apache file location. Upgraded Apache to 2.4.16 --- bucket/apache.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bucket/apache.json b/bucket/apache.json index 46a3b519e..7adf946d1 100644 --- a/bucket/apache.json +++ b/bucket/apache.json @@ -1,8 +1,8 @@ { "homepage": "http://www.apachelounge.com", - "version": "2.4.12", + "version": "2.4.16", "license": "Apache 2.0", - "url": "http://www.apachelounge.com/download/VC11/binaries/httpd-2.4.12-win32-VC11.zip", + "url": "http://www.apachelounge.com/download/VC11/binaries/httpd-2.4.16-win32-VC11.zip", "hash": "DBA963DB9819CD2AE3CB0E970F4159E199981F9BA0B33C537395C6AE1222951D", "extract_dir": "Apache24", "bin": [ From 72a29e9afe78b109f12619a498326795a5c10e08 Mon Sep 17 00:00:00 2001 From: ISHIDA Akio Date: Thu, 20 Aug 2015 11:31:03 +0900 Subject: [PATCH 08/11] PHP5.5.28 and 5.4.44 --- bucket/php54.json | 6 +++--- bucket/php55.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bucket/php54.json b/bucket/php54.json index b8ff6be5b..f00887366 100644 --- a/bucket/php54.json +++ b/bucket/php54.json @@ -1,9 +1,9 @@ { "homepage": "http://windows.php.net", - "version": "5.4.43", + "version": "5.4.44", "license": "http://www.php.net/license/", - "url": "http://windows.php.net/downloads/releases/php-5.4.43-Win32-VC9-x86.zip", - "hash": "sha1:cd32e55ba56f6b489b90e06a81e64138792ab858", + "url": "http://windows.php.net/downloads/releases/php-5.4.44-Win32-VC9-x86.zip", + "hash": "sha1:2fcc47dff254ccae812ce2ccfd4ddf4f21ce9e8d", "bin": "php.exe", "post_install": "cp \"$dir\\php.ini-production\" \"$dir\\php.ini\"", "checkver": { diff --git a/bucket/php55.json b/bucket/php55.json index 10d81edab..e8db0ec7f 100644 --- a/bucket/php55.json +++ b/bucket/php55.json @@ -1,9 +1,9 @@ { "homepage": "http://windows.php.net", - "version": "5.5.27", + "version": "5.5.28", "license": "http://www.php.net/license/", - "url": "http://windows.php.net/downloads/releases/php-5.5.27-Win32-VC11-x86.zip", - "hash": "sha1:3a21e4fd310ce19867c79a8dabe6ac24848f97f7", + "url": "http://windows.php.net/downloads/releases/php-5.5.28-Win32-VC11-x86.zip", + "hash": "sha1:ed8ca7c5726174a04ee50e2cac33e5fabeaacf1f", "bin": "php.exe", "post_install": "cp \"$dir\\php.ini-production\" \"$dir\\php.ini\"", "checkver": { From 914f7787d3b281a747c1c28370b1bc01cee2c626 Mon Sep 17 00:00:00 2001 From: Ibrahim Hatoum Date: Thu, 20 Aug 2015 11:46:03 -0400 Subject: [PATCH 09/11] Updated hash --- bucket/apache.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bucket/apache.json b/bucket/apache.json index 7adf946d1..7d53e33ef 100644 --- a/bucket/apache.json +++ b/bucket/apache.json @@ -3,7 +3,7 @@ "version": "2.4.16", "license": "Apache 2.0", "url": "http://www.apachelounge.com/download/VC11/binaries/httpd-2.4.16-win32-VC11.zip", - "hash": "DBA963DB9819CD2AE3CB0E970F4159E199981F9BA0B33C537395C6AE1222951D", + "hash": "8AD891742E985DB1B7785B49E2C9D517CC953691B4355EE178ECCB58DEED3C0D", "extract_dir": "Apache24", "bin": [ "bin\\ab.exe", @@ -25,6 +25,6 @@ $root=(scoop which httpd | split-path -res -par | split-path -par) -replace '\\\ ", "checkver": { "url": "http://www.apachelounge.com/download/", - "re": "Apache ([0-9\\.]+) Win64" + "re": "Apache ([0-9\\.]+) Win32" } } From 1fbcd53f2de93237544e4dc17108e9575a89af32 Mon Sep 17 00:00:00 2001 From: Roy Ivy III Date: Thu, 20 Aug 2015 13:44:58 -0500 Subject: [PATCH 10/11] Remove now-erroneous comment --- lib/core.ps1 | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/core.ps1 b/lib/core.ps1 index eaee9493a..f28d8f9f7 100644 --- a/lib/core.ps1 +++ b/lib/core.ps1 @@ -116,7 +116,6 @@ function shim($path, $global, $name, $arg) { $relative_path = resolve-path -relative $path popd - # note: use > for first line to replace file, then >> to append following lines echo '# ensure $HOME is set for MSYS programs' | out-file $shim -encoding oem echo "if(!`$env:home) { `$env:home = `"`$home\`" }" | out-file $shim -encoding oem -append echo 'if($env:home -eq "\") { $env:home = $env:allusersprofile }' | out-file $shim -encoding oem -append From 250fb864013fe4d74d2ec98ed91bce9ef3c211d2 Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Thu, 20 Aug 2015 13:48:24 -0700 Subject: [PATCH 11/11] upgrade dart to 1.11.3 --- bucket/dart.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bucket/dart.json b/bucket/dart.json index a57d5a99c..760e815d3 100644 --- a/bucket/dart.json +++ b/bucket/dart.json @@ -1,5 +1,5 @@ { - "version": "1.11.1", + "version": "1.11.3", "license": "BSD", "homepage": "https://www.dartlang.org/", "extract_dir": "dart-sdk", @@ -8,12 +8,12 @@ ], "architecture": { "64bit": { - "url": "https://storage.googleapis.com/dart-archive/channels/stable/release/1.11.1/sdk/dartsdk-windows-x64-release.zip", - "hash": "8b0dbf2d90055a0de2e8a9bf01500f88a3575ba0457a3c44ce29fd759a553bfb" + "url": "https://storage.googleapis.com/dart-archive/channels/stable/release/1.11.3/sdk/dartsdk-windows-x64-release.zip", + "hash": "b9415bb8563f48e4d9cb1ab105aab7179c57108b1ce8ed504613e58d589b6c1d" }, "32bit": { - "url": "https://storage.googleapis.com/dart-archive/channels/stable/release/1.11.1/sdk/dartsdk-windows-ia32-release.zip", - "hash": "d2abdfe9c1e44d3c77d2b84e448c5ff14a6e3d45ed39460ed096782f9651bbc1" + "url": "https://storage.googleapis.com/dart-archive/channels/stable/release/1.11.3/sdk/dartsdk-windows-ia32-release.zip", + "hash": "e1e11eed91b268de33e05a8e3eca7cb1adecbc993319fd5cd2e3e39628165725" } }, "checkver": {