.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,11 @@
+**NOTE**: This project is for Ruby version 2.3 and older.
+For Ruby versions >= 2.4 please file an issue [here]( https://github.com/oneclick/rubyinstaller2/issues/new ).
+
+## What problems are you experiencing?
+
+
+## Steps to reproduce
+
+
+## What's the output from `ruby -v`?
+

History.txt

@@ -1,8 +1,15 @@
-=== 2016-11-21
+=== 2016-12-6
 
 * Enhancements
   * Upgraded Ruby 2.3 to 2.3.3
   * Upgraded Ruby 2.2 to 2.2.6
+  * Upgraded OpenSSL to 1.0.2j
+  * Upgraded libffi to 3.2.1
+  * Upgraded LibYAML to 0.1.7
+  * Upgraded tcl & tk to 8.5.19
+
+* Internal
+  * Retry timeouts with SourceForge
 
 === 2016-7-17
 

README.md

@@ -1,4 +1,7 @@
-#RubyInstaller
+__Attention__: This project provides an Installer on Windows for Ruby-2.3 and older.
+For Ruby-2.4 and newer please refer to [RubyInstaller2](https://github.com/oneclick/rubyinstaller2).
+
+# RubyInstaller
 
 This project, licensed under the 3-clause Modified BSD License, attempts to
 generate a development sandbox that can be used to compile Ruby and it's
@@ -18,7 +21,7 @@ C-based RubyGems extensions that may not yet have a binary RubyGem. The DevKit
 provides an easy-to-install compiler and build system, and convenient setup helper
 scripts.
 
-##7-Second Quick Start
+## 7-Second Quick Start
 
 Ensure you are connected to the Internet, open a Command Prompt, `cd` to the
 project root directory, and type one of:
@@ -34,7 +37,7 @@ At this time, `mingw64-32-4.7.2` and `mingw64-64-4.7.2` are used, e.g:
 
     rake ruby21 DKVER=mingw64-32-4.7.2
 
-##Project Directory Organization
+## Project Directory Organization
 
 The Rake build recipes are distributed inside the project's recipes/ directory
 using the following sub-directory structure:
@@ -72,21 +75,20 @@ To override the default configuration, create an `override/build_config.rb` file
 in the project's root directory. See the default `config/ruby_installer.rb` and
 `config/devkit.rb` configuration files for values that can be overridden.
 
-##Requirements
+## Requirements
 
 At this time you need to have a working Ruby installation (the current stable
 One-Click Installer release is enough).
 
 In case you don't have the OCI installed, you will need:
 
-- Ruby 1.8.5 or greater (mswin32 or mingw32 implementation will work) -- **Not cygwin!**
-- Rake 0.7.3 or greater
+- Ruby 1.9.3 or greater (mswin32 or mingw32 implementation will work) -- **Not cygwin!**
 - Zlib extension and DLL (zlib1.dll) available in the PATH (could be in system32
 or your Ruby bin directory)
 
 Innosetup 5.4.2 is required to compile and build the Windows installer.
 
-##Build Task Examples
+## Build Task Examples
 
     rake                             # builds 1.8.7 [default build task]
     rake ruby18                      # builds 1.8.7
@@ -104,7 +106,7 @@ Innosetup 5.4.2 is required to compile and build the Windows installer.
 You can combine `COMPAT` and `CHECKOUT` to build Ruby 1.8.6 directly from the
 Subversion repository.
 
-###DevKit Build Task Examples:
+### DevKit Build Task Examples:
 
     rake devkit                      # builds Installer (TDM 4.5.2)
     rake devkit DKVER=tdm-32-4.6.1   # builds Installer (TDM 32-bit 4.6.1)
@@ -127,7 +129,7 @@ invocation. For example:
 If you built a custom DevKit as in the first example, look in the `pkg/`
 subdirectory for your DevKit artifact.
 
-###DevKit Compiler Toolchains
+### DevKit Compiler Toolchains
 
     Compiler     DKVER Values
 
@@ -138,7 +140,7 @@ subdirectory for your DevKit artifact.
 
 (*) = default build toolchain
 
-##Known Issues
+## Known Issues
 
 * Avoid running this project in a PATH containing spaces as the MSYS
   environment has issues correctly mounting /etc/fstab entries for MinGW.

config/dependencies.rb

@@ -17,40 +17,40 @@ module RubyInstaller
 
   KNAPSACK_PACKAGES['openssl'] = OpenStruct.new(
     :human_name => "OpenSSL",
-    :version => '1.0.1l',
+    :version => '1.0.2j',
     :url => "http://dl.bintray.com/oneclick/OpenKnapsack",
     :target => 'sandbox/openssl',
     :files => [
-      'openssl-1.0.1l-x86-windows.tar.lzma'
+      'openssl-1.0.2j-x86-windows.tar.lzma'
     ],
     :x64_files => [
-      'openssl-1.0.1l-x64-windows.tar.lzma'
+      'openssl-1.0.2j-x64-windows.tar.lzma'
     ]
   )
 
   KNAPSACK_PACKAGES['ffi'] = OpenStruct.new(
     :human_name => "libffi",
-    :version => '3.0.11',
+    :version => '3.2.1',
     :url => "http://dl.bintray.com/oneclick/OpenKnapsack",
     :target => 'sandbox/libffi',
     :files => [
-      'libffi-3.0.11-x86-windows.tar.lzma'
+      'libffi-3.2.1-x86-windows.tar.lzma'
     ],
     :x64_files => [
-      'libffi-3.0.11-x64-windows.tar.lzma'
+      'libffi-3.2.1-x64-windows.tar.lzma'
     ]
   )
 
   KNAPSACK_PACKAGES['yaml'] = OpenStruct.new(
     :human_name => "LibYAML",
-    :version => '0.1.6',
+    :version => '0.1.7',
     :url => "http://dl.bintray.com/oneclick/OpenKnapsack",
     :target => 'sandbox/libyaml',
     :files => [
-      'libyaml-0.1.6-x86-windows.tar.lzma'
+      'libyaml-0.1.7-x86-windows.tar.lzma'
     ],
     :x64_files => [
-      'libyaml-0.1.6-x64-windows.tar.lzma'
+      'libyaml-0.1.7-x64-windows.tar.lzma'
     ]
   )
 
@@ -95,28 +95,28 @@ module RubyInstaller
 
   KNAPSACK_PACKAGES["tcl"] = OpenStruct.new(
     :human_name => "Tcl",
-    :version => "8.5.12",
+    :version => "8.5.19",
     :url => "http://dl.bintray.com/oneclick/OpenKnapsack",
     :target => "sandbox/tcl",
     :files => [
-      "tcl-8.5.12-x86-windows.tar.lzma"
+      "tcl-8.5.19-x86-windows.tar.lzma"
     ],
     :x64_files => [
-      "tcl-8.5.12-x64-windows.tar.lzma"
+      "tcl-8.5.19-x64-windows.tar.lzma"
     ]
   )
 
   KNAPSACK_PACKAGES["tk"] = OpenStruct.new(
     :human_name => "Tk",
-    :version => "8.5.12",
+    :version => "8.5.19",
     :url => "http://dl.bintray.com/oneclick/OpenKnapsack",
     :target => "sandbox/tk",
     :patches => "resources/patches/tk",
     :files => [
-      "tk-8.5.12-x86-windows.tar.lzma"
+      "tk-8.5.19-x86-windows.tar.lzma"
     ],
     :x64_files => [
-      "tk-8.5.12-x64-windows.tar.lzma"
+      "tk-8.5.19-x64-windows.tar.lzma"
     ],
     :dependencies => [
       :tcl

rake/contrib/uri_ext.rb

@@ -274,6 +274,9 @@ def read(options = nil, &block)
           end
         end
       end
+    rescue Errno::ETIMEDOUT
+      puts "Download of #{self} timed out. Retrying."
+      retry
     end
 
   private