diff --git a/.gitignore b/.gitignore index e8203f2..ee26c94 100644 --- a/.gitignore +++ b/.gitignore @@ -1,79 +1,2 @@ -actionpack-2.3.5.gem -actionpack-2.3.8.gem -/actionpack-3.0.3.gem -/actionpack-tests.tgz -/actionpack-3.0.5.gem -/actionpack-3.0.9-tests.tgz -/actionpack-3.0.9.gem -/actionpack-3.0.10-tests.tgz -/actionpack-3.0.10.gem -/actionpack-3.0.11-tests.tgz -/actionpack-3.0.11.gem -/actionpack-3.0.13-tests.tgz -/actionpack-3.0.13.gem -/actionpack-3.0.15-tests.tgz -/actionpack-3.0.15.gem -/actionpack-3.2.6-tests.tgz -/actionpack-3.2.6.gem -/actionpack-3.2.7-tests.tgz -/actionpack-3.2.7.gem -/actionpack-3.2.8-tests.tgz -/actionpack-3.2.8.gem -/actionpack-3.2.10-tests.tgz -/actionpack-3.2.10.gem -/actionpack-3.2.11-tests.tgz -/actionpack-3.2.11.gem -/actionpack-3.2.12-tests.tgz -/actionpack-3.2.12.gem -/actionpack-3.2.13-tests.tgz -/actionpack-3.2.13.gem -/actionpack-4.0.0-tests.tgz -/actionpack-4.0.0.gem -/actionpack-4.0.1-tests.tgz -/actionpack-4.0.1.gem -/actionpack-4.0.2-tests.tgz -/actionpack-4.0.2.gem -/actionpack-4.0.3-tests.tgz -/actionpack-4.0.3.gem -/actionpack-4.1.0-tests.tgz -/actionpack-4.1.0.gem -/actionpack-4.1.1-tests.tgz -/actionpack-4.1.1.gem -/actionpack-4.1.4-tests.tgz -/actionpack-4.1.4.gem -/actionpack-4.1.5-tests.tgz -/actionpack-4.1.5.gem -/actionpack-4.2.0-tests.tgz -/actionpack-4.2.0.gem -/actionpack-4.2.1-tests.tgz -/actionpack-4.2.1.gem -/actionpack-4.2.2-tests.tgz -/actionpack-4.2.2.gem -/actionpack-4.2.3-tests.tgz -/actionpack-4.2.3.gem -/actionpack-4.2.4-tests.tgz -/actionpack-4.2.4.gem -/actionpack-4.2.5-tests.tgz -/actionpack-4.2.5.gem -/actionpack-4.2.5.1-tests.tgz -/actionpack-4.2.5.1.gem -/actionpack-4.2.5.2-tests.tgz -/actionpack-4.2.5.2.gem -/actionpack-4.2.6-tests.tgz -/actionpack-4.2.6.gem -/actionpack-5.0.0-tests.tgz -/actionpack-5.0.0.gem -/actionpack-5.0.0.1-tests.tgz -/actionpack-5.0.0.1.gem -/actionpack-5.0.1-tests.tgz -/actionpack-5.0.1.gem -/actionpack-5.0.2-tests.tgz -/actionpack-5.0.2.gem -/actionpack-5.1.1-tests.tgz -/actionpack-5.1.1.gem -/actionpack-5.1.2-tests.tgz -/actionpack-5.1.2.gem -/actionpack-5.1.3-tests.tgz -/actionpack-5.1.3.gem -/actionpack-5.1.4-tests.tgz -/actionpack-5.1.4.gem +/actionpack-*-tests.tgz +/actionpack-*.gem diff --git a/rubygem-actionpack-5.1.4-Generate-tmpname-on-its-own.patch b/rubygem-actionpack-5.1.4-Generate-tmpname-on-its-own.patch deleted file mode 100644 index 124b211..0000000 --- a/rubygem-actionpack-5.1.4-Generate-tmpname-on-its-own.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c4a1b119599fa47da7fb599d034db1eb42394b03 Mon Sep 17 00:00:00 2001 -From: "yuuji.yaginuma" -Date: Fri, 15 Dec 2017 11:08:57 +0900 -Subject: [PATCH] Generate tmpname on its own - -`make_tmpname` was removed by https://github.com/ruby/ruby/commit/25d56ea7b7b52dc81af30c92a9a0e2d2dab6ff27. -In this case, we want a file name, not a `File`. So cannot use `Tempfile`. - -Fixes #31458 ---- - actionpack/test/abstract_unit.rb | 31 ++++++++++++++++++------------- - 1 file changed, 18 insertions(+), 13 deletions(-) - -diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb -index 0f2dd44d8772..76c4984f0dc2 100644 ---- a/actionpack/test/abstract_unit.rb -+++ b/actionpack/test/abstract_unit.rb -@@ -378,7 +378,7 @@ def pop; @queue.pop; end - def initialize(size) - @size = size - @queue = Server.new -- file = File.join Dir.tmpdir, Dir::Tmpname.make_tmpname("rails-tests", "fd") -+ file = File.join Dir.tmpdir, tmpname - @url = "drbunix://#{file}" - @pool = nil - DRb.start_service @url, @queue -@@ -420,6 +420,11 @@ def translate_exceptions(result) - end - } - end -+ -+ def tmpname -+ t = Time.now.strftime("%Y%m%d") -+ "rails-tests-#{t}-#{$$}-#{rand(0x100000000).to_s(36)}-fd" -+ end - end - - if RUBY_ENGINE == "ruby" && PROCESS_COUNT > 0 - diff --git a/rubygem-actionpack-5.1.4-Use-Tempfile.create.patch b/rubygem-actionpack-5.1.4-Use-Tempfile.create.patch deleted file mode 100644 index 892e913..0000000 --- a/rubygem-actionpack-5.1.4-Use-Tempfile.create.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 4022f33416a00fd6a18989aa54f60573f48be0a0 Mon Sep 17 00:00:00 2001 -From: Nobuyoshi Nakada -Date: Thu, 9 Nov 2017 17:12:07 +0900 -Subject: [PATCH 1/2] Use `Tempfile.create` - -Instead of `Dir::Tmpname.make_tmpname`, an internal method which does not guarantee uniqueness, use `Tempfile.create`. ---- - actionpack/test/controller/log_subscriber_test.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/actionpack/test/controller/log_subscriber_test.rb b/actionpack/test/controller/log_subscriber_test.rb -index f0f106c8babb..4c59bea19372 100644 ---- a/actionpack/test/controller/log_subscriber_test.rb -+++ b/actionpack/test/controller/log_subscriber_test.rb -@@ -96,7 +96,7 @@ def setup - - @old_logger = ActionController::Base.logger - -- @cache_path = File.join Dir.tmpdir, Dir::Tmpname.make_tmpname("tmp", "cache") -+ @cache_path = Tempfile.create(%w"tmp cache", Dir.tmpdir) - @controller.cache_store = :file_store, @cache_path - ActionController::LogSubscriber.attach_to :action_controller - end - -From 2d5700b9a3e2ac25a5ff349ca6d3dc27077cea13 Mon Sep 17 00:00:00 2001 -From: Nobuyoshi Nakada -Date: Thu, 9 Nov 2017 22:09:00 +0900 -Subject: [PATCH 2/2] Use `Dir.mktmpdir` - -As `@cache_path` is expected to be a directory name, use `Dir.mktmpdir`. -And omit unnecessary `Dir.tmpdir`. ---- - actionpack/test/controller/log_subscriber_test.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/actionpack/test/controller/log_subscriber_test.rb b/actionpack/test/controller/log_subscriber_test.rb -index 4c59bea19372..cb425fb3de29 100644 ---- a/actionpack/test/controller/log_subscriber_test.rb -+++ b/actionpack/test/controller/log_subscriber_test.rb -@@ -96,7 +96,7 @@ def setup - - @old_logger = ActionController::Base.logger - -- @cache_path = Tempfile.create(%w"tmp cache", Dir.tmpdir) -+ @cache_path = Dir.mktmpdir(%w"tmp cache") - @controller.cache_store = :file_store, @cache_path - ActionController::LogSubscriber.attach_to :action_controller - end diff --git a/rubygem-actionpack.spec b/rubygem-actionpack.spec index 33f98d8..7621194 100644 --- a/rubygem-actionpack.spec +++ b/rubygem-actionpack.spec @@ -3,11 +3,12 @@ # Circular dependency with rubygem-railties. %{?_with_bootstrap: %global bootstrap 1} +%global bootstrap 1 Name: rubygem-%{gem_name} Epoch: 1 -Version: 5.1.4 -Release: 4%{?dist} +Version: 5.1.5 +Release: 1%{?dist} Summary: Web-flow and rendering framework putting the VC in MVC (part of Rails) Group: Development/Languages License: MIT @@ -18,13 +19,8 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # You may check it out like so # git clone http://github.com/rails/rails.git # cd rails/actionpack/ -# git checkout v5.1.4 && tar czvf actionpack-5.1.4-tests.tgz test/ +# git checkout v5.1.5 && tar czvf actionpack-5.1.5-tests.tgz test/ Source1: actionpack-%{version}-tests.tgz -# Ruby 2.5 removed `make_tmpname`. -# https://github.com/rails/rails/commit/c4a1b119599fa47da7fb599d034db1eb42394b03 -Patch0: rubygem-actionpack-5.1.4-Generate-tmpname-on-its-own.patch -# https://github.com/rails/rails/pull/31099 -Patch1: rubygem-actionpack-5.1.4-Use-Tempfile.create.patch # Let's keep Requires and BuildRequires sorted alphabeticaly BuildRequires: ruby(release) @@ -78,9 +74,6 @@ pushd .%{gem_instdir} # move the tests into place tar xzvf %{SOURCE1} -cat %{PATCH0} | patch -p2 -cat %{PATCH1} | patch -p2 - ruby -Ilib:test -e 'Dir.glob "./test/**/*_test.rb", &method(:require)' popd %endif @@ -98,6 +91,10 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Fri Feb 16 2018 Pavel Valena - 1:5.1.5-1 +- Update to Action Pack 5.1.5. + Remove patch{0,1}; subsumed + * Fri Feb 09 2018 Fedora Release Engineering - 1:5.1.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 5aef7ef..9a3afc9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (actionpack-5.1.4-tests.tgz) = 2e6d476984790b871260a97abe50970f8f57e327169643014034fb14b979d8098b3efe883f4042220fafbf4af4dbbba83df5720e251c792c8e6152a49ba10eab -SHA512 (actionpack-5.1.4.gem) = 9f44f6c37c0f3f306711a388d63a22f727a6e3f25cb9f7ebe1654ceb5bde108f013b687c5b5e84578c1083405d9186890bec5cf7b55b3a11d11f82963d9ce01a +SHA512 (actionpack-5.1.5-tests.tgz) = e3875a6f71390b26def7aaeb663dac2ea72b83f140635f63410566a73f9006e32a2fe8b56f03a7bf449a9c38c2a1eea00a956fd43a0779fa74d7eabe53c0723c +SHA512 (actionpack-5.1.5.gem) = 29ab83346c422a4baea2f12cac49ffdd995a4a65dc6622cc3bf4c1e02b1120421628363d1e63a1ec487a28d32ca3427b534eea0348642a51ef85f7cfcddee566