diff options
Diffstat (limited to 'debian/patches/debian-changes')
| -rw-r--r-- | debian/patches/debian-changes | 176 |
1 files changed, 176 insertions, 0 deletions
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes new file mode 100644 index 0000000..950c892 --- /dev/null +++ b/debian/patches/debian-changes @@ -0,0 +1,176 @@ +This patch file represents the entire difference between the package as shipped +by Debian and the official upstream sources. The goal is to maintain this file +as small as possible, avoiding non-upstreamed patches at all costs. + +The Debian packaging is maintained in the following Git repository: + + http://anonscm.debian.org/gitweb/?p=collab-maint/ruby.git + +To obtain a view of the individual commits that affect non-Debian-specific +files, you can clone that repository, and from the master branch, run: + + $ ./debian/upstream-changes + +--- ruby2.3-2.3.3.orig/configure.in ++++ ruby2.3-2.3.3/configure.in +@@ -3686,7 +3686,7 @@ AS_CASE("$enable_shared", [yes], [ + LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so' + ], + [linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu | haiku*], [ +- LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'" $LDFLAGS_OPTDIR" ++ LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'" $LDFLAGS $LDFLAGS_OPTDIR" + LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so' + if test "$load_relative" = yes; then + libprefix="'\$\${ORIGIN}/../${libdir_basename}'" +--- ruby2.3-2.3.3.orig/ext/bigdecimal/bigdecimal.gemspec ++++ ruby2.3-2.3.3/ext/bigdecimal/bigdecimal.gemspec +@@ -1,11 +1,10 @@ + # -*- ruby -*- + _VERSION = "1.2.8" +-date = %w$Date:: $[1] + + Gem::Specification.new do |s| + s.name = "bigdecimal" + s.version = _VERSION +- s.date = date ++ s.date = RUBY_RELEASE_DATE + s.license = 'ruby' + s.summary = "Arbitrary-precision decimal floating-point number library." + s.homepage = "http://www.ruby-lang.org" +--- ruby2.3-2.3.3.orig/ext/io/console/io-console.gemspec ++++ ruby2.3-2.3.3/ext/io/console/io-console.gemspec +@@ -1,11 +1,10 @@ + # -*- ruby -*- + _VERSION = "0.4.5" +-date = %w$Date:: $[1] + + Gem::Specification.new do |s| + s.name = "io-console" + s.version = _VERSION +- s.date = date ++ s.date = RUBY_RELEASE_DATE + s.summary = "Console interface" + s.email = "nobu@ruby-lang.org" + s.description = "add console capabilities to IO instances." +--- ruby2.3-2.3.3.orig/ext/json/json.gemspec ++++ ruby2.3-2.3.3/ext/json/json.gemspec +@@ -1,6 +1,7 @@ + Gem::Specification.new do |s| + s.name = "json" + s.version = "1.8.3" ++ s.date = RUBY_RELEASE_DATE + s.summary = "This json is bundled with Ruby" + s.executables = [] + s.files = ["json.rb", "json/add/bigdecimal.rb", "json/add/complex.rb", "json/add/core.rb", "json/add/date.rb", "json/add/date_time.rb", "json/add/exception.rb", "json/add/ostruct.rb", "json/add/range.rb", "json/add/rational.rb", "json/add/regexp.rb", "json/add/struct.rb", "json/add/symbol.rb", "json/add/time.rb", "json/common.rb", "json/ext.rb", "json/ext/generator.bundle", "json/ext/parser.bundle", "json/generic_object.rb", "json/version.rb"] +--- ruby2.3-2.3.3.orig/lib/mkmf.rb ++++ ruby2.3-2.3.3/lib/mkmf.rb +@@ -2275,7 +2275,7 @@ LOCAL_LIBS = #{$LOCAL_LIBS} + LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS} + ORIG_SRCS = #{orig_srcs.collect(&File.method(:basename)).join(' ')} + SRCS = $(ORIG_SRCS) #{(srcs - orig_srcs).collect(&File.method(:basename)).join(' ')} +-OBJS = #{$objs.join(" ")} ++OBJS = #{$objs.sort.join(" ")} + HDRS = #{hdrs.map{|h| '$(srcdir)/' + File.basename(h)}.join(' ')} + TARGET = #{target} + TARGET_NAME = #{target && target[/\A\w+/]} +--- ruby2.3-2.3.3.orig/lib/rdoc/generator/json_index.rb ++++ ruby2.3-2.3.3/lib/rdoc/generator/json_index.rb +@@ -175,7 +175,7 @@ class RDoc::Generator::JsonIndex + debug_msg "Writing gzipped search index to %s" % outfile + + Zlib::GzipWriter.open(outfile) do |gz| +- gz.mtime = File.mtime(search_index_file) ++ gz.mtime = -1 + gz.orig_name = search_index_file.basename.to_s + gz.write search_index + gz.close +@@ -193,7 +193,7 @@ class RDoc::Generator::JsonIndex + debug_msg "Writing gzipped file to %s" % outfile + + Zlib::GzipWriter.open(outfile) do |gz| +- gz.mtime = File.mtime(dest) ++ gz.mtime = -1 + gz.orig_name = dest.basename.to_s + gz.write data + gz.close +--- ruby2.3-2.3.3.orig/lib/rdoc/rdoc.gemspec ++++ ruby2.3-2.3.3/lib/rdoc/rdoc.gemspec +@@ -1,6 +1,7 @@ + Gem::Specification.new do |s| + s.name = "rdoc" + s.version = "4.2.1" ++ s.date = RUBY_RELEASE_DATE + s.summary = "This rdoc is bundled with Ruby" + s.executables = ["rdoc", "ri"] + s.files = ["rdoc.rb", "rdoc/alias.rb", "rdoc/anon_class.rb", "rdoc/any_method.rb", "rdoc/attr.rb", "rdoc/class_module.rb", "rdoc/code_object.rb", "rdoc/code_objects.rb", "rdoc/comment.rb", "rdoc/constant.rb", "rdoc/context.rb", "rdoc/context/section.rb", "rdoc/cross_reference.rb", "rdoc/encoding.rb", "rdoc/erb_partial.rb", "rdoc/erbio.rb", "rdoc/extend.rb", "rdoc/generator.rb", "rdoc/generator/darkfish.rb", "rdoc/generator/json_index.rb", "rdoc/generator/markup.rb", "rdoc/generator/pot.rb", "rdoc/generator/pot/message_extractor.rb", "rdoc/generator/pot/po.rb", "rdoc/generator/pot/po_entry.rb", "rdoc/generator/ri.rb", "rdoc/ghost_method.rb", "rdoc/i18n.rb", "rdoc/i18n/locale.rb", "rdoc/i18n/text.rb", "rdoc/include.rb", "rdoc/known_classes.rb", "rdoc/markdown.rb", "rdoc/markdown/entities.rb", "rdoc/markdown/literals_1_9.rb", "rdoc/markup.rb", "rdoc/markup/attr_changer.rb", "rdoc/markup/attr_span.rb", "rdoc/markup/attribute_manager.rb", "rdoc/markup/attributes.rb", "rdoc/markup/blank_line.rb", "rdoc/markup/block_quote.rb", "rdoc/markup/document.rb", "rdoc/markup/formatter.rb", "rdoc/markup/formatter_test_case.rb", "rdoc/markup/hard_break.rb", "rdoc/markup/heading.rb", "rdoc/markup/include.rb", "rdoc/markup/indented_paragraph.rb", "rdoc/markup/inline.rb", "rdoc/markup/list.rb", "rdoc/markup/list_item.rb", "rdoc/markup/paragraph.rb", "rdoc/markup/parser.rb", "rdoc/markup/pre_process.rb", "rdoc/markup/raw.rb", "rdoc/markup/rule.rb", "rdoc/markup/special.rb", "rdoc/markup/text_formatter_test_case.rb", "rdoc/markup/to_ansi.rb", "rdoc/markup/to_bs.rb", "rdoc/markup/to_html.rb", "rdoc/markup/to_html_crossref.rb", "rdoc/markup/to_html_snippet.rb", "rdoc/markup/to_joined_paragraph.rb", "rdoc/markup/to_label.rb", "rdoc/markup/to_markdown.rb", "rdoc/markup/to_rdoc.rb", "rdoc/markup/to_table_of_contents.rb", "rdoc/markup/to_test.rb", "rdoc/markup/to_tt_only.rb", "rdoc/markup/verbatim.rb", "rdoc/meta_method.rb", "rdoc/method_attr.rb", "rdoc/mixin.rb", "rdoc/normal_class.rb", "rdoc/normal_module.rb", "rdoc/options.rb", "rdoc/parser.rb", "rdoc/parser/c.rb", "rdoc/parser/changelog.rb", "rdoc/parser/markdown.rb", "rdoc/parser/rd.rb", "rdoc/parser/ruby.rb", "rdoc/parser/ruby_tools.rb", "rdoc/parser/simple.rb", "rdoc/parser/text.rb", "rdoc/rd.rb", "rdoc/rd/block_parser.rb", "rdoc/rd/inline.rb", "rdoc/rd/inline_parser.rb", "rdoc/rdoc.rb", "rdoc/require.rb", "rdoc/ri.rb", "rdoc/ri/driver.rb", "rdoc/ri/formatter.rb", "rdoc/ri/paths.rb", "rdoc/ri/store.rb", "rdoc/ri/task.rb", "rdoc/ruby_lex.rb", "rdoc/ruby_token.rb", "rdoc/rubygems_hook.rb", "rdoc/servlet.rb", "rdoc/single_class.rb", "rdoc/stats.rb", "rdoc/stats/normal.rb", "rdoc/stats/quiet.rb", "rdoc/stats/verbose.rb", "rdoc/store.rb", "rdoc/task.rb", "rdoc/test_case.rb", "rdoc/text.rb", "rdoc/token_stream.rb", "rdoc/tom_doc.rb", "rdoc/top_level.rb"] +--- ruby2.3-2.3.3.orig/lib/rdoc/rdoc.rb ++++ ruby2.3-2.3.3/lib/rdoc/rdoc.rb +@@ -321,7 +321,7 @@ option) + end + end + +- file_list.flatten ++ file_list.flatten.sort + end + + ## +--- ruby2.3-2.3.3.orig/lib/rubygems/specification.rb ++++ ruby2.3-2.3.3/lib/rubygems/specification.rb +@@ -1754,7 +1754,9 @@ class Gem::Specification < Gem::BasicSpe + raise(Gem::InvalidSpecificationException, + "invalid date format in specification: #{date.inspect}") + end +- when Time, DateLike then ++ when Time then ++ Time.utc(date.utc.year, date.utc.month, date.utc.day) ++ when DateLike then + Time.utc(date.year, date.month, date.day) + else + TODAY +--- /dev/null ++++ ruby2.3-2.3.3/test/excludes/TestProcess.rb +@@ -0,0 +1,5 @@ ++# Found on Debian mips* buildds, this test consumes ~2GB RAM and ++# a lot of CPU time before failing. Note that the test failure ++# may point to an issue in the Array implementation. ++# https://bugs.ruby-lang.org/issues/12500 ++exclude :test_aspawn_too_long_path, "RAM and time consuming test" +--- /dev/null ++++ ruby2.3-2.3.3/test/excludes/TestRefinement.rb +@@ -0,0 +1,2 @@ ++# Found on Debian arm*, powerpc buildds ++exclude :test_prepend_after_refine_wb_miss, "time consuming test" +--- ruby2.3-2.3.3.orig/test/ruby/test_array.rb ++++ ruby2.3-2.3.3/test/ruby/test_array.rb +@@ -1841,7 +1841,8 @@ class TestArray < Test::Unit::TestCase + + def test_permutation_stack_error + bug9932 = '[ruby-core:63103] [Bug #9932]' +- assert_separately([], <<-"end;") # do ++ # On some platforms (armel, mips), permutation is very expensive/slow. ++ assert_separately([], <<-"end;", timeout: 60) # do + assert_nothing_raised(SystemStackError, "#{bug9932}") do + assert_equal(:ok, Array.new(100_000, nil).permutation {break :ok}) + end +--- ruby2.3-2.3.3.orig/test/ruby/test_file_exhaustive.rb ++++ ruby2.3-2.3.3/test/ruby/test_file_exhaustive.rb +@@ -1017,7 +1017,7 @@ class TestFileExhaustive < Test::Unit::T + user = ENV['USER'] + skip "ENV['USER'] is not set" unless user + assert_equal(ENV['HOME'], File.expand_path("~#{user}")) +- end unless DRIVE ++ end if false # does not work in sbuild/buildd environments + + def test_expand_path_error_for_nonexistent_username + user = "\u{3086 3046 3066 3044}:\u{307F 3084 304A 3046}" +--- ruby2.3-2.3.3.orig/test/ruby/test_gc.rb ++++ ruby2.3-2.3.3/test/ruby/test_gc.rb +@@ -212,7 +212,7 @@ class TestGc < Test::Unit::TestCase + assert_in_out_err([env, "-w", "-e", "exit"], "", [], /RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR=0\.9/, "") + + # always full GC when RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR < 1.0 +- assert_in_out_err([env, "-e", "1000_000.times{Object.new}; p(GC.stat[:minor_gc_count] < GC.stat[:major_gc_count])"], "", ['true'], //, "") if use_rgengc? ++ assert_in_out_err([env, "-e", "1000_000.times{Object.new}; p(GC.stat[:minor_gc_count] < GC.stat[:major_gc_count])"], "", ['true'], //, "", timeout: 30) if use_rgengc? + + # check obsolete + assert_in_out_err([{'RUBY_FREE_MIN' => '100'}, '-w', '-eexit'], '', [], |