Merge branch 'master-2.3' into dist/2.3/trusty

Author: sorah

common.mk

@@ -1007,10 +1007,9 @@ download-unicode-data: ./.unicode-$(UNICODE_VERSION).time
 	$(Q) $(MAKEDIRS) "$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)"
 	$(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb \
 	    -d enc/unicode/data/$(UNICODE_VERSION) \
+	    -p $(UNICODE_VERSION)/ucd \
 	    -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode \
-	    $(UNICODE_VERSION)/ucd/UnicodeData.txt \
-	    $(UNICODE_VERSION)/ucd/CompositionExclusions.txt \
-	    $(UNICODE_VERSION)/ucd/NormalizationTest.txt
+	    $(UNICODE_FILES)
 	@exit > $@
 
 $(srcdir)/$(HAVE_BASERUBY:yes=lib/unicode_normalize/tables.rb): \

debian/control

@@ -21,7 +21,7 @@ Build-Depends: autotools-dev,
                netbase,
                openssl,
                procps,
-               ruby | ruby-interpreter | ruby1.8,
+               ruby2.0 | ruby | ruby-interpreter,
                rubygems-integration (>= 1.6),
                systemtap-sdt-dev [linux-any],
                zlib1g-dev

debian/rules

@@ -16,8 +16,8 @@ export SOURCE             := $(shell dpkg-parsechangelog -SSource)
 export RUBY_VERSION       := $(patsubst ruby%,%,$(SOURCE))
 export RUBY_API_VERSION   := $(RUBY_VERSION).0
 
-# Bootstrap with Ruby 1.8 if proper Ruby is not available
-baseruby=$(shell test -x /usr/bin/ruby && echo /usr/bin/ruby || echo /usr/bin/ruby1.8)
+# Gem::Security is required, so use ruby 2.0 or later
+baseruby=$(shell test -x /usr/bin/ruby && ruby -rgem/security -e0 2>/dev/null && echo /usr/bin/ruby || echo /usr/bin/ruby2.0)
 
 configure_options += --enable-multiarch
 configure_options += --target=$(DEB_HOST_MULTIARCH)

tool/downloader.rb

@@ -20,8 +20,8 @@ def add_file(pems)
       end
     end
   end
-  # since open-uri internally checks ssl_ca_cert by File.directory?, to allow
-  # accept an array.
+  # since open-uri internally checks ssl_ca_cert using File.directory?,
+  # allow to accept an array.
   class <<File
     alias orig_directory? directory?
     def File.directory? files
@@ -31,48 +31,53 @@ def File.directory? files
 end
 
 class Downloader
+  def self.https=(https)
+    @@https = https
+  end
+
+  def self.https?
+    @@https == 'https'
+  end
+
   def self.https
-    if @@https != 'https'
-      warn "*** using http instead of https ***"
-    end
     @@https
   end
 
   class GNU < self
     def self.download(name, *rest)
-      if https == 'https'
+      if https?
         super("https://raw.githubusercontent.com/gcc-mirror/gcc/master/#{name}", name, *rest)
       else
-        super("http://repo.or.cz/official-gcc.git/blob_plain/HEAD:/#{name}", name, *rest)
+        super("https://repo.or.cz/official-gcc.git/blob_plain/HEAD:/#{name}", name, *rest)
       end
     end
   end
 
   class RubyGems < self
-    def self.download(name, dir = nil, ims = true, options = {})
+    def self.download(name, dir = nil, since = true, options = {})
       require 'rubygems'
       require 'rubygems/package'
-      options[:ssl_ca_cert] = Dir.glob(File.expand_path("../lib/rubygems/ssl_certs/*.pem", File.dirname(__FILE__)))
+      verify = options.delete(:verify) {Gem::VERSION >= "2.4."}
+      options[:ssl_ca_cert] = Dir.glob(File.expand_path("../lib/rubygems/ssl_certs/**/*.pem", File.dirname(__FILE__)))
       file = under(dir, name)
-      super("#{https}://rubygems.org/downloads/#{name}", file, nil, ims, options) or
+      super("https://rubygems.org/downloads/#{name}", file, nil, since, options) or
         return false
+      return true unless verify
       policy = Gem::Security::LowSecurity
       (policy = policy.dup).ui = Gem::SilentUI.new if policy.respond_to?(:'ui=')
       pkg = Gem::Package.new(file)
       pkg.security_policy = policy
       begin
+        $stdout.puts "verifying #{name}"
         pkg.verify
       rescue Gem::Security::Exception => e
-        $stderr.puts e.message
+        $stderr.puts "#{name}: #{e.message}"
         File.unlink(file)
         false
       else
         true
       end
     end
-
-    def self.verify(pkg)
-    end
   end
 
   Gems = RubyGems
@@ -104,50 +109,68 @@ def self.http_options(file, since)
     options
   end
 
-  # Downloader.download(url, name, [dir, [ims]])
+  # Downloader.download(url, name, [dir, [since]])
   #
   # Update a file from url if newer version is available.
   # Creates the file if the file doesn't yet exist; however, the
   # directory where the file is being created has to exist already.
-  # If +ims+ is false, always download url regardless of its last
-  # modified time.
+  # The +since+ parameter can take the following values, with associated meanings:
+  #  true ::
+  #    Take the last-modified time of the current file on disk, and only download
+  #    if the server has a file that was modified later. Download unconditionally
+  #    if we don't have the file yet. Default.
+  #  +some time value+ ::
+  #    Use this time value instead of the time of modification of the file on disk.
+  #  nil ::
+  #    Only download the file if it doesn't exist yet.
+  #  false ::
+  #    always download url regardless of whether we already have a file,
+  #    and regardless of modification times. (This is essentially just a waste of
+  #    network resources, except in the case that the file we have is somehow damaged.
+  #    Please note that using this recurringly might create or be seen as a
+  #    denial of service attack.)
   #
   # Example usage:
   #   download 'http://www.unicode.org/Public/UCD/latest/ucd/UnicodeData.txt',
   #            'UnicodeData.txt', 'enc/unicode/data'
-  def self.download(url, name, dir = nil, ims = true, options = {})
+  def self.download(url, name, dir = nil, since = true, options = {})
+    options.delete(:verify)
     file = under(dir, name)
-    if ims.nil? and File.exist?(file)
+    if since.nil? and File.exist?(file)
       if $VERBOSE
         $stdout.puts "#{name} already exists"
         $stdout.flush
       end
       return true
     end
+    if !https? and url.start_with?("https:")
+      warn "*** using http instead of https ***"
+      url = url.sub(/\Ahttps/, 'http')
+    end
     url = URI(url)
     if $VERBOSE
       $stdout.print "downloading #{name} ... "
       $stdout.flush
     end
     begin
-      data = url.read(options.merge(http_options(file, ims.nil? ? true : ims)))
+      data = url.read(options.merge(http_options(file, since.nil? ? true : since)))
     rescue OpenURI::HTTPError => http_error
       if http_error.message =~ /^304 / # 304 Not Modified
         if $VERBOSE
-          $stdout.puts "not modified"
+          $stdout.puts "#{name} not modified"
           $stdout.flush
         end
         return true
       end
       raise
     rescue Timeout::Error
-      if ims.nil? and File.exist?(file)
+      if since.nil? and File.exist?(file)
         puts "Request for #{url} timed out, using old version."
         return true
       end
       raise
     rescue SocketError
-      if ims.nil? and File.exist?(file)
+      if since.nil? and File.exist?(file)
         puts "No network connection, unable to download #{url}, using old version."
         return true
       end
@@ -172,24 +195,36 @@ def self.download(url, name, dir = nil, ims = true, options = {})
     raise "failed to download #{name}\n#{e.message}: #{url}"
   end
 
+  def self.verify(file)
+    true
+  end
+
   def self.under(dir, name)
     dir ? File.join(dir, File.basename(name)) : name
   end
 end
 
-Downloader.class_variable_set(:@@https, https.freeze)
+Downloader.https = https.freeze
 
 if $0 == __FILE__
-  ims = true
+  since = true
+  options = {}
   until ARGV.empty?
     case ARGV[0]
     when '-d'
       destdir = ARGV[1]
       ARGV.shift
+    when '-p'
+      # strip directory names from the name to download, and add the
+      # prefix instead.
+      prefix = ARGV[1]
+      ARGV.shift
     when '-e'
-      ims = nil
+      since = nil
     when '-a'
-      ims = true
+      since = false
+    when '-V'
+      options[:verify] = true
     when /\A-/
       abort "#{$0}: unknown option #{ARGV[0]}"
     else
@@ -205,10 +240,11 @@ def self.under(dir, name)
     dl = Downloader.const_get(dl)
     ARGV.shift
     ARGV.each do |name|
-      dl.download(name, destdir, ims)
+      name = "#{prefix}/#{File.basename(name)}" if prefix
+      dl.download(name, destdir, since, options)
     end
   else
     abort "usage: #{$0} url name" unless ARGV.size == 2
-    Downloader.download(ARGV[0], ARGV[1], destdir, ims)
+    Downloader.download(ARGV[0], ARGV[1], destdir, since, options)
   end
 end