#1 WIP: Update to jquery-rails 4.3.3.
Closed 2 years ago by vondruch. Opened 5 years ago by pvalena.
rpms/ pvalena/rubygem-jquery-rails rebase  into  rawhide

file modified
+1 -6
@@ -1,6 +1,1 @@ 

- /jquery-rails-2.0.2.gem

- /jquery-rails-3.0.4.gem

- /jquery-rails-3.1.0.gem

- /jquery-rails-4.0.4.gem

- /jquery-rails-4.2.1.gem

- /jquery-rails-4.2.2.gem

+ /jquery-rails-*.gem

file modified
+16 -11
@@ -7,7 +7,8 @@ 

  %global jquery1_system_version 1.12.4

  %global jquery2_version 2.2.4

  %global jquery2_system_version 2.2.4

- %global jquery3_version 3.1.1

+ %global jquery3_version 3.3.1

+ %global jquery3_system_version 3.3.1

  # TODO:

  #%%global jquery3_system_version 3.1.0

  
@@ -16,13 +17,12 @@ 

  # jQuery 2.x is in old version in Fedora.

  %global unbundle_jquery2 1

  # jQuery 3.x is not in Fedora yet.

- #%%global unbundle_jquery3 1

+ %global unbundle_jquery3 1

  

  Name: rubygem-%{gem_name}

- Version: 4.2.2

- Release: 4%{?dist}

+ Version: 4.3.3

+ Release: 1%{?dist}

  Summary: Use jQuery with Rails 4+

- Group: Development/Languages

  License: MIT

  URL: https://github.com/rails/jquery-rails

  Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
@@ -41,6 +41,7 @@ 

  %{?unbundle_jquery2:BuildRequires: jquery = %{jquery2_version}}

  %{!?unbundle_jquery2:BuildRequires: jquery = %{jquery2_system_version}}

  %{?unbundle_jquery3:BuildRequires: jquery = %{jquery3_version}}

+ %{!?unbundle_jquery3:BuildRequires: jquery = %{jquery3_system_version}}

  BuildRequires: rubygem(activesupport)

  BuildRequires: rubygem(nokogiri)

  BuildRequires: rubygem(rails-dom-testing)
@@ -58,7 +59,6 @@ 

  

  %package doc

  Summary: Documentation for %{name}

- Group: Documentation

  Requires: %{name} = %{version}-%{release}

  BuildArch: noarch

  
@@ -105,10 +105,12 @@ 

  # Check that rpm version dependencies match the versions expected by the

  # gem package.

  ruby -Ilib -rjquery/rails/version -e '

- exit \

-   Jquery::Rails::JQUERY_VERSION == "%{jquery1_version}" && \

-   Jquery::Rails::JQUERY_2_VERSION == "%{jquery2_version}" && \

-   Jquery::Rails::JQUERY_3_VERSION == "%{jquery3_version}"

+   exit if Jquery::Rails::JQUERY_VERSION == "%{jquery1_version}" && \

+         Jquery::Rails::JQUERY_2_VERSION == "%{jquery2_version}" && \

+         Jquery::Rails::JQUERY_3_VERSION == "%{jquery3_version}"

+   abort Jquery::Rails::JQUERY_VERSION,

+       Jquery::Rails::JQUERY_2_VERSION,

+       Jquery::Rails::JQUERY_3_VERSION

  '

  

  ruby -Itest -rostruct -e 'Dir.glob "./test/**/*_test.rb", &method(:require)'
@@ -122,6 +124,7 @@ 

  %{gem_instdir}/vendor

  %exclude %{gem_cache}

  %{gem_spec}

+ %exclude %{gem_instdir}/jquery-rails.gemspec

  

  %files doc

  %doc %{gem_docdir}
@@ -131,10 +134,12 @@ 

  %{gem_instdir}/Gemfile

  %doc %{gem_instdir}/README.md

  %{gem_instdir}/Rakefile

- %{gem_instdir}/jquery-rails.gemspec

  %{gem_instdir}/test

  

  %changelog

+ * Fri Jun 15 2018 Pavel Valena <pvalena@redhat.com> - 4.3.3-1

+ - Update to jquery-rails 4.3.3.

+ 

  * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.2-4

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

  

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (jquery-rails-4.2.2.gem) = 4270bbad954b7ac00b7a1d3f1b44778d3194647cc85b59ceb6b0a458cbfdc898514470afc7b2fe12b4ea9aa1fe71797d5950421724546d345f5f32cdb1f9b670

+ SHA512 (jquery-rails-4.3.3.gem) = 55cef78f794da90ef1f7394f919810425589d3d92dc71375c3ec2f0cd6d207e0854826887e1a69503bc6609c60c10886e0b868d2d2df46ae052c90f322aef974

Also enhnance spec file.

  • Dependency check: ok
  • Tests: ok
  • rpmlint: ok

Resolves: CVE-2017-16011
https://bugzilla.redhat.com/show_bug.cgi?id=1591847

Up-to-date scratch-build:
https://koji.fedoraproject.org/koji/taskinfo?taskID=27703001
(Last commit omitted.)

Ideally, system jquery3 should be used, but version 3.3.1 needs to be provided.

rebased onto a0260f9

5 years ago

Added commit to use system js-query in version 3.3.1.

This currently fails. Let's wait for rebase of js-jquery to fix the CVE.

Thx. But sorry, I updated to 4.4.0 myself. However, there are some possibly interesting changes, so feel free to submit them separately.

Pull-Request has been closed by vondruch

2 years ago