From 4578a248c2f484a37279d9acc20b2a9aa85c9628 Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Wed, 22 Oct 2014 11:14:53 -0700 Subject: [PATCH 01/34] initial import (RHBZ#1078368) --- .gitignore | 1 + js-jquery-disable-gzip-js.patch | 14 +++++ js-jquery.spec | 100 ++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 116 insertions(+) create mode 100644 js-jquery-disable-gzip-js.patch create mode 100644 js-jquery.spec diff --git a/.gitignore b/.gitignore index e69de29..3e198c6 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/js-jquery-4dec426aa2a6cbabb1b064319ba7c272d594a688.tar.gz diff --git a/js-jquery-disable-gzip-js.patch b/js-jquery-disable-gzip-js.patch new file mode 100644 index 0000000..57fd731 --- /dev/null +++ b/js-jquery-disable-gzip-js.patch @@ -0,0 +1,14 @@ +diff --git a/Gruntfile.js b/Gruntfile.js +index d1ad5d4..f1f1a28 100644 +--- a/Gruntfile.js ++++ b/Gruntfile.js +@@ -9,8 +9,7 @@ module.exports = function( grunt ) { + return data; + } + +- var gzip = require( "gzip-js" ), +- srcHintOptions = readOptionalJSON( "src/.jshintrc" ); ++ var srcHintOptions = readOptionalJSON( "src/.jshintrc" ); + + // The concatenated file won't pass onevar + // But our modules can diff --git a/js-jquery.spec b/js-jquery.spec new file mode 100644 index 0000000..ee42a9d --- /dev/null +++ b/js-jquery.spec @@ -0,0 +1,100 @@ +%global commit 4dec426aa2a6cbabb1b064319ba7c272d594a688 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + +Name: js-jquery +Version: 2.1.1 +Release: 4%{?dist} +Summary: JavaScript DOM manipulation, event handling, and AJAX library +BuildArch: noarch + +%global ver_x %(echo %{version} | cut -d. -f1) +%global ver_y %(echo %{version} | cut -d. -f2) +%global ver_z %(echo %{version} | cut -d. -f3) + +License: MIT +URL: http://jquery.com/ +Source0: https://github.com/jquery/jquery/archive/%{commit}/%{name}-%{commit}.tar.gz + +# disable gzip-js during build +Patch1: %{name}-disable-gzip-js.patch + +BuildRequires: web-assets-devel +BuildRequires: nodejs-packaging +BuildRequires: js-sizzle-static + +Provides: jquery = %{version}-%{release} +Provides: %{name}-static = %{version}-%{release} + +BuildRequires: nodejs-grunt >= 0.4.4-3 +BuildRequires: npm(shelljs) +BuildRequires: npm(grunt-cli) +BuildRequires: npm(grunt-contrib-uglify) +BuildRequires: npm(load-grunt-tasks) +BuildRequires: npm(requirejs) + +Requires: web-assets-filesystem + +%description +jQuery is a fast, small, and feature-rich JavaScript library. It makes things +like HTML document traversal and manipulation, event handling, animation, and +Ajax much simpler with an easy-to-use API that works across a multitude of +browsers. With a combination of versatility and extensibility, jQuery has +changed the way that millions of people write JavaScript. + +%prep +%setup -qn jquery-%{commit} +%patch1 -p1 + +#remove precompiled stuff +rm -rf dist/* src/sizzle + +#put sizzle where jquery expects it +install -Dp %{_jsdir}/sizzle/latest/sizzle.js src/sizzle/dist/sizzle.js + + +%build +%nodejs_symlink_deps --build +grunt -v 'build:*:*' uglify + + +# missing dependencies +#%%check +#grunt + + +%install +%global installdir %{buildroot}%{_jsdir}/jquery + +mkdir -p %{installdir}/%{version} +cp -p dist/* %{installdir}/%{version} + +mkdir -p %{buildroot}%{_webassetdir} +ln -s ../javascript/jquery %{buildroot}%{_webassetdir}/jquery + +ln -s %{version} %{installdir}/latest +ln -s %{version} %{installdir}/%{ver_x} +ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} + + +%files +%{_jsdir}/jquery +%{_webassetdir}/jquery +%doc AUTHORS.txt CONTRIBUTING.md MIT-LICENSE.txt README.md + + +%changelog +* Tue Oct 21 2014 T.C. Hollingsworth - 2.1.1-4 +- drop unneccessary symlinks + +* Tue Jun 03 2014 T.C. Hollingsworth - 2.1.1-3 +- follow the github SourceURL guidelines + +* Sat May 31 2014 T.C. Hollingsworth - 2.1.1-2 +- drop sed hack now that grunt is fixed + +* Fri May 30 2014 T.C. Hollingsworth - 2.1.1-1 +- update to 2.1.1 +- use system packages for build (with help from Jamie Nguyen) + +* Wed Mar 19 2014 T.C. Hollingsworth - 2.1.0-0.1 +- initial package diff --git a/sources b/sources index e69de29..3d4482e 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +9c52617c3ad80dc648b1203a0673e952 js-jquery-4dec426aa2a6cbabb1b064319ba7c272d594a688.tar.gz From cd1a5465389f8deb8e0001547335c0b4e6135b16 Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Wed, 4 Mar 2015 17:56:09 -0700 Subject: [PATCH 02/34] new upstream release 2.1.3 http://blog.jquery.com/2014/12/18/jquery-1-11-2-and-2-1-3-released-safari-fail-safe-edition/ --- .gitignore | 1 + js-jquery.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3e198c6..69924ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /js-jquery-4dec426aa2a6cbabb1b064319ba7c272d594a688.tar.gz +/js-jquery-8f2a9d9272d6ed7f32d3a484740ab342c02541e0.tar.gz diff --git a/js-jquery.spec b/js-jquery.spec index ee42a9d..ffeb43f 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,9 +1,9 @@ -%global commit 4dec426aa2a6cbabb1b064319ba7c272d594a688 +%global commit 8f2a9d9272d6ed7f32d3a484740ab342c02541e0 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: js-jquery -Version: 2.1.1 -Release: 4%{?dist} +Version: 2.1.3 +Release: 1%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -83,6 +83,10 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Wed Mar 04 2015 T.C. Hollingsworth - 2.1.3-1 +- new upstream release 2.1.3 + http://blog.jquery.com/2014/12/18/jquery-1-11-2-and-2-1-3-released-safari-fail-safe-edition/ + * Tue Oct 21 2014 T.C. Hollingsworth - 2.1.1-4 - drop unneccessary symlinks diff --git a/sources b/sources index 3d4482e..cda457b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9c52617c3ad80dc648b1203a0673e952 js-jquery-4dec426aa2a6cbabb1b064319ba7c272d594a688.tar.gz +eba3a924d520e1018b0cc1f0bdd2ffbc js-jquery-8f2a9d9272d6ed7f32d3a484740ab342c02541e0.tar.gz From 1d0bf2d82f18f7e0086890652d0da666eb4414d9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 12:33:56 +0000 Subject: [PATCH 03/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- js-jquery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js-jquery.spec b/js-jquery.spec index ffeb43f..aa64228 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -3,7 +3,7 @@ Name: js-jquery Version: 2.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -83,6 +83,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 2.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Mar 04 2015 T.C. Hollingsworth - 2.1.3-1 - new upstream release 2.1.3 http://blog.jquery.com/2014/12/18/jquery-1-11-2-and-2-1-3-released-safari-fail-safe-edition/ From 102b23bc0f31f882759bac31fe50fa43ed338bbb Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 01:25:32 +0000 Subject: [PATCH 04/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- js-jquery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js-jquery.spec b/js-jquery.spec index aa64228..67da3ff 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -3,7 +3,7 @@ Name: js-jquery Version: 2.1.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -83,6 +83,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 2.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 2.1.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From cf7b28bdf591000a9bd7d7363cc388c6dc8591b9 Mon Sep 17 00:00:00 2001 From: Christopher Tubbs Date: Tue, 20 Dec 2016 18:16:10 -0500 Subject: [PATCH 05/34] Update to 2.2.4 and backport XSS patch (bz#1399550,bz#1399549) --- .gitignore | 1 + js-jquery-disable-gzip-js.patch | 15 +++--- js-jquery.spec | 24 +++++---- sources | 2 +- xss-fix-b078a62.patch | 91 +++++++++++++++++++++++++++++++++ 5 files changed, 114 insertions(+), 19 deletions(-) create mode 100644 xss-fix-b078a62.patch diff --git a/.gitignore b/.gitignore index 69924ba..d9fb1c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /js-jquery-4dec426aa2a6cbabb1b064319ba7c272d594a688.tar.gz /js-jquery-8f2a9d9272d6ed7f32d3a484740ab342c02541e0.tar.gz +/jquery-2.2.4.tar.gz diff --git a/js-jquery-disable-gzip-js.patch b/js-jquery-disable-gzip-js.patch index 57fd731..9bf8ecd 100644 --- a/js-jquery-disable-gzip-js.patch +++ b/js-jquery-disable-gzip-js.patch @@ -1,14 +1,11 @@ diff --git a/Gruntfile.js b/Gruntfile.js -index d1ad5d4..f1f1a28 100644 --- a/Gruntfile.js +++ b/Gruntfile.js -@@ -9,8 +9,7 @@ module.exports = function( grunt ) { - return data; - } +@@ -13,7 +13,6 @@ module.exports = function( grunt ) { -- var gzip = require( "gzip-js" ), -- srcHintOptions = readOptionalJSON( "src/.jshintrc" ); -+ var srcHintOptions = readOptionalJSON( "src/.jshintrc" ); + var fs = require( "fs" ), + stripJSONComments = require( "strip-json-comments" ), +- gzip = require( "gzip-js" ), + srcHintOptions = readOptionalJSON( "src/.jshintrc" ), + newNode = !/^v0/.test( process.version ), - // The concatenated file won't pass onevar - // But our modules can diff --git a/js-jquery.spec b/js-jquery.spec index 67da3ff..10414ba 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,9 +1,6 @@ -%global commit 8f2a9d9272d6ed7f32d3a484740ab342c02541e0 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - Name: js-jquery -Version: 2.1.3 -Release: 3%{?dist} +Version: 2.2.4 +Release: 1%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -12,11 +9,13 @@ BuildArch: noarch %global ver_z %(echo %{version} | cut -d. -f3) License: MIT -URL: http://jquery.com/ -Source0: https://github.com/jquery/jquery/archive/%{commit}/%{name}-%{commit}.tar.gz +URL: https://jquery.com/ +Source0: https://github.com/jquery/jquery/archive/%{version}/jquery-%{version}.tar.gz # disable gzip-js during build Patch1: %{name}-disable-gzip-js.patch +# backport of XSS bug fix from upstream; upstream fixed in 3.0.0 and newer +Patch2: xss-fix-b078a62.patch BuildRequires: web-assets-devel BuildRequires: nodejs-packaging @@ -31,6 +30,8 @@ BuildRequires: npm(grunt-cli) BuildRequires: npm(grunt-contrib-uglify) BuildRequires: npm(load-grunt-tasks) BuildRequires: npm(requirejs) +#BuildRequires: npm(strip-json-comments) # won't work on epel7 branch +BuildRequires: nodejs-strip-json-comments Requires: web-assets-filesystem @@ -42,8 +43,10 @@ browsers. With a combination of versatility and extensibility, jQuery has changed the way that millions of people write JavaScript. %prep -%setup -qn jquery-%{commit} +# autosetup doesn't work right on epel7 branch +%setup -qn jquery-%{version} %patch1 -p1 +%patch2 -p1 #remove precompiled stuff rm -rf dist/* src/sizzle @@ -79,10 +82,13 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %files %{_jsdir}/jquery %{_webassetdir}/jquery -%doc AUTHORS.txt CONTRIBUTING.md MIT-LICENSE.txt README.md +%doc AUTHORS.txt CONTRIBUTING.md LICENSE.txt README.md %changelog +* Tue Dec 20 2016 Christopher Tubbs - 2.2.4-1 +- Update to 2.2.4 and backport XSS patch (bz#1399550,bz#1399549) + * Thu Feb 04 2016 Fedora Release Engineering - 2.1.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index cda457b..1aee121 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eba3a924d520e1018b0cc1f0bdd2ffbc js-jquery-8f2a9d9272d6ed7f32d3a484740ab342c02541e0.tar.gz +SHA512 (jquery-2.2.4.tar.gz) = bd1176286451adeaa8c18eb98e01e8b91e45157f7263907772d637a2c15b8ac27b780be14983c4abcff5def668323beab9a6889d8da4beb6c2c06fae1f5bed1d diff --git a/xss-fix-b078a62.patch b/xss-fix-b078a62.patch new file mode 100644 index 0000000..8f730c1 --- /dev/null +++ b/xss-fix-b078a62.patch @@ -0,0 +1,91 @@ +From b078a62013782c7424a4a61a240c23c4c0b42614 Mon Sep 17 00:00:00 2001 +From: Oleg Gaidarenko +Date: Thu, 10 Sep 2015 13:40:00 +0300 +Subject: [PATCH] Ajax: Mitigate possible XSS vulnerability + +Proposed by @jaubourg + +Fixes gh-2432 +Closes gh-2588 +--- + src/ajax/script.js | 7 +++++++ + test/unit/ajax.js | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 55 insertions(+), 0 deletion(-) + +diff --git a/src/ajax/script.js b/src/ajax/script.js +index 60b1fb6..0ec27b4 100644 +--- a/src/ajax/script.js ++++ b/src/ajax/script.js +@@ -4,6 +4,13 @@ define( [ + "../ajax" + ], function( jQuery, document ) { + ++// Prevent auto-execution of scripts when no explicit dataType was provided (See gh-2432) ++jQuery.ajaxPrefilter( function( s ) { ++ if ( s.crossDomain ) { ++ s.contents.script = false; ++ } ++} ); ++ + // Install script dataType + jQuery.ajaxSetup( { + accepts: { +diff --git a/test/unit/ajax.js b/test/unit/ajax.js +index 14fe0be..6479587 100644 +--- a/test/unit/ajax.js ++++ b/test/unit/ajax.js +@@ -71,6 +71,54 @@ QUnit.module( "ajax", { + }; + } ); + ++ ajaxTest( "jQuery.ajax() - do not execute js (crossOrigin)", 2, function( assert ) { ++ return { ++ create: function( options ) { ++ options.crossDomain = true; ++ return jQuery.ajax( url( "data/script.php?header=ecma" ), options ); ++ }, ++ success: function() { ++ assert.ok( true, "success" ); ++ }, ++ complete: function() { ++ assert.ok( true, "complete" ); ++ } ++ }; ++ } ); ++ ++ ajaxTest( "jQuery.ajax() - execute js for crossOrigin when dataType option is provided", 3, ++ function( assert ) { ++ return { ++ create: function( options ) { ++ options.crossDomain = true; ++ options.dataType = "script"; ++ return jQuery.ajax( url( "data/script.php?header=ecma" ), options ); ++ }, ++ success: function() { ++ assert.ok( true, "success" ); ++ }, ++ complete: function() { ++ assert.ok( true, "complete" ); ++ } ++ }; ++ } ++ ); ++ ++ ajaxTest( "jQuery.ajax() - do not execute js (crossOrigin)", 2, function( assert ) { ++ return { ++ create: function( options ) { ++ options.crossDomain = true; ++ return jQuery.ajax( url( "data/script.php" ), options ); ++ }, ++ success: function() { ++ assert.ok( true, "success" ); ++ }, ++ complete: function() { ++ assert.ok( true, "complete" ); ++ } ++ }; ++ } ); ++ + ajaxTest( "jQuery.ajax() - success callbacks (late binding)", 8, function( assert ) { + return { + setup: addGlobalEvents( "ajaxStart ajaxStop ajaxSend ajaxComplete ajaxSuccess", assert ), From 312831ba18a1d3283b4529099a8d664a0c0a4572 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 17:24:24 +0000 Subject: [PATCH 06/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- js-jquery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js-jquery.spec b/js-jquery.spec index 10414ba..18bbaa2 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery Version: 2.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -86,6 +86,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.2.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Dec 20 2016 Christopher Tubbs - 2.2.4-1 - Update to 2.2.4 and backport XSS patch (bz#1399550,bz#1399549) From 18b7d13fc688b24e15b7dfbbb49bef11e957e2cc Mon Sep 17 00:00:00 2001 From: Christopher Tubbs Date: Tue, 11 Apr 2017 14:03:27 -0400 Subject: [PATCH 07/34] Update provides in prep for js-jquery package rename to js-jquery2 --- js-jquery.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/js-jquery.spec b/js-jquery.spec index 18bbaa2..b505182 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery Version: 2.2.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -23,6 +23,8 @@ BuildRequires: js-sizzle-static Provides: jquery = %{version}-%{release} Provides: %{name}-static = %{version}-%{release} +Provides: %{name}2 = %{version}-%{release} +Provides: %{name}2-static = %{version}-%{release} BuildRequires: nodejs-grunt >= 0.4.4-3 BuildRequires: npm(shelljs) @@ -86,6 +88,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Tue Apr 11 2017 Christopher Tubbs - 2.2.4-3 +- Update provides in prep for js-jquery package rename to js-jquery2 + * Fri Feb 10 2017 Fedora Release Engineering - 2.2.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 034fe58098efd90dba732aa47def7c41e490568c Mon Sep 17 00:00:00 2001 From: Christopher Tubbs Date: Tue, 11 Apr 2017 22:40:39 -0400 Subject: [PATCH 08/34] Update to jQuery 3.2.1 --- .gitignore | 1 + disable-insight-tracking.patch | 60 ++++++++++++++++++++++ js-jquery-disable-gzip-js.patch | 15 +++--- js-jquery.spec | 29 ++++++----- sources | 2 +- xss-fix-b078a62.patch | 91 --------------------------------- 6 files changed, 86 insertions(+), 112 deletions(-) create mode 100644 disable-insight-tracking.patch delete mode 100644 xss-fix-b078a62.patch diff --git a/.gitignore b/.gitignore index d9fb1c7..80fe5c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /js-jquery-4dec426aa2a6cbabb1b064319ba7c272d594a688.tar.gz /js-jquery-8f2a9d9272d6ed7f32d3a484740ab342c02541e0.tar.gz /jquery-2.2.4.tar.gz +/jquery-3.2.1.tar.gz diff --git a/disable-insight-tracking.patch b/disable-insight-tracking.patch new file mode 100644 index 0000000..11849a6 --- /dev/null +++ b/disable-insight-tracking.patch @@ -0,0 +1,60 @@ +diff --git a/build/tasks/build.js b/build/tasks/build.js +index 69916bf..58e65ad 100644 +--- a/build/tasks/build.js ++++ b/build/tasks/build.js +@@ -10,7 +10,6 @@ module.exports = function( grunt ) { + + var fs = require( "fs" ), + requirejs = require( "requirejs" ), +- Insight = require( "insight" ), + pkg = require( "../../package.json" ), + srcFolder = __dirname + "/../../src/", + rdefineEnd = /\}\s*?\);[^}\w]*$/, +@@ -337,46 +336,16 @@ module.exports = function( grunt ) { + grunt.registerTask( "custom", function() { + var args = this.args, + modules = args.length ? args[ 0 ].replace( /,/g, ":" ) : "", +- done = this.async(), +- insight = new Insight( { +- trackingCode: "UA-1076265-4", +- pkg: pkg +- } ); ++ done = this.async(); + + function exec( trackingAllowed ) { +- var tracks = args.length ? args[ 0 ].split( "," ) : []; + var defaultPath = [ "build", "custom" ]; + +- tracks = tracks.map( function( track ) { +- return track.replace( /\//g, "+" ); +- } ); +- +- if ( trackingAllowed ) { +- +- // Track individuals +- tracks.forEach( function( module ) { +- var path = defaultPath.concat( [ "individual" ], module ); +- +- insight.track.apply( insight, path ); +- } ); +- +- // Track full command +- insight.track.apply( insight, defaultPath.concat( [ "full" ], tracks ) ); +- } +- + grunt.task.run( [ "build:*:*" + ( modules ? ":" + modules : "" ), "uglify", "dist" ] ); + done(); + } + + grunt.log.writeln( "Creating custom build...\n" ); + +- // Ask for permission the first time +- if ( insight.optOut === undefined ) { +- insight.askPermission( null, function( error, result ) { +- exec( result ); +- } ); +- } else { +- exec( !insight.optOut ); +- } + } ); + }; diff --git a/js-jquery-disable-gzip-js.patch b/js-jquery-disable-gzip-js.patch index 9bf8ecd..f9f533e 100644 --- a/js-jquery-disable-gzip-js.patch +++ b/js-jquery-disable-gzip-js.patch @@ -1,11 +1,14 @@ diff --git a/Gruntfile.js b/Gruntfile.js +index 12ae008..5d541f2 100644 --- a/Gruntfile.js +++ b/Gruntfile.js -@@ -13,7 +13,6 @@ module.exports = function( grunt ) { +@@ -12,8 +12,7 @@ module.exports = function( grunt ) { + return data; + } - var fs = require( "fs" ), - stripJSONComments = require( "strip-json-comments" ), -- gzip = require( "gzip-js" ), - srcHintOptions = readOptionalJSON( "src/.jshintrc" ), - newNode = !/^v0/.test( process.version ), +- var fs = require( "fs" ), +- gzip = require( "gzip-js" ); ++ var fs = require( "fs" ); + if ( !grunt.option( "filename" ) ) { + grunt.option( "filename", "jquery.js" ); diff --git a/js-jquery.spec b/js-jquery.spec index b505182..0c370a2 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery -Version: 2.2.4 -Release: 3%{?dist} +Version: 3.2.1 +Release: 1%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -8,14 +8,15 @@ BuildArch: noarch %global ver_y %(echo %{version} | cut -d. -f2) %global ver_z %(echo %{version} | cut -d. -f3) -License: MIT +License: MIT URL: https://jquery.com/ Source0: https://github.com/jquery/jquery/archive/%{version}/jquery-%{version}.tar.gz # disable gzip-js during build Patch1: %{name}-disable-gzip-js.patch -# backport of XSS bug fix from upstream; upstream fixed in 3.0.0 and newer -Patch2: xss-fix-b078a62.patch + +# disable missing insight module +Patch2: disable-insight-tracking.patch BuildRequires: web-assets-devel BuildRequires: nodejs-packaging @@ -23,8 +24,8 @@ BuildRequires: js-sizzle-static Provides: jquery = %{version}-%{release} Provides: %{name}-static = %{version}-%{release} -Provides: %{name}2 = %{version}-%{release} -Provides: %{name}2-static = %{version}-%{release} +Provides: %{name}%{ver_x} = %{version}-%{release} +Provides: %{name}%{ver_x}-static = %{version}-%{release} BuildRequires: nodejs-grunt >= 0.4.4-3 BuildRequires: npm(shelljs) @@ -39,16 +40,13 @@ Requires: web-assets-filesystem %description jQuery is a fast, small, and feature-rich JavaScript library. It makes things -like HTML document traversal and manipulation, event handling, animation, and -Ajax much simpler with an easy-to-use API that works across a multitude of -browsers. With a combination of versatility and extensibility, jQuery has +like HTML document traversal and manipulation, event handling, animation, and +Ajax much simpler with an easy-to-use API that works across a multitude of +browsers. With a combination of versatility and extensibility, jQuery has changed the way that millions of people write JavaScript. %prep -# autosetup doesn't work right on epel7 branch -%setup -qn jquery-%{version} -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 -n jquery-%{version} #remove precompiled stuff rm -rf dist/* src/sizzle @@ -88,6 +86,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Wed Apr 12 2017 Christopher Tubbs - 3.2.1-1 +- Update to jQuery 3.2.1 + * Tue Apr 11 2017 Christopher Tubbs - 2.2.4-3 - Update provides in prep for js-jquery package rename to js-jquery2 diff --git a/sources b/sources index 1aee121..7e2df0f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jquery-2.2.4.tar.gz) = bd1176286451adeaa8c18eb98e01e8b91e45157f7263907772d637a2c15b8ac27b780be14983c4abcff5def668323beab9a6889d8da4beb6c2c06fae1f5bed1d +SHA512 (jquery-3.2.1.tar.gz) = c237b4de4e7d31cde8f8de2493ae92f7db1d504b83f24808738066bdaa7c906f3b6f819eeff1bb90881cbbccd1d32fbc06f63e847c13548adc92671d796bf336 diff --git a/xss-fix-b078a62.patch b/xss-fix-b078a62.patch deleted file mode 100644 index 8f730c1..0000000 --- a/xss-fix-b078a62.patch +++ /dev/null @@ -1,91 +0,0 @@ -From b078a62013782c7424a4a61a240c23c4c0b42614 Mon Sep 17 00:00:00 2001 -From: Oleg Gaidarenko -Date: Thu, 10 Sep 2015 13:40:00 +0300 -Subject: [PATCH] Ajax: Mitigate possible XSS vulnerability - -Proposed by @jaubourg - -Fixes gh-2432 -Closes gh-2588 ---- - src/ajax/script.js | 7 +++++++ - test/unit/ajax.js | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 55 insertions(+), 0 deletion(-) - -diff --git a/src/ajax/script.js b/src/ajax/script.js -index 60b1fb6..0ec27b4 100644 ---- a/src/ajax/script.js -+++ b/src/ajax/script.js -@@ -4,6 +4,13 @@ define( [ - "../ajax" - ], function( jQuery, document ) { - -+// Prevent auto-execution of scripts when no explicit dataType was provided (See gh-2432) -+jQuery.ajaxPrefilter( function( s ) { -+ if ( s.crossDomain ) { -+ s.contents.script = false; -+ } -+} ); -+ - // Install script dataType - jQuery.ajaxSetup( { - accepts: { -diff --git a/test/unit/ajax.js b/test/unit/ajax.js -index 14fe0be..6479587 100644 ---- a/test/unit/ajax.js -+++ b/test/unit/ajax.js -@@ -71,6 +71,54 @@ QUnit.module( "ajax", { - }; - } ); - -+ ajaxTest( "jQuery.ajax() - do not execute js (crossOrigin)", 2, function( assert ) { -+ return { -+ create: function( options ) { -+ options.crossDomain = true; -+ return jQuery.ajax( url( "data/script.php?header=ecma" ), options ); -+ }, -+ success: function() { -+ assert.ok( true, "success" ); -+ }, -+ complete: function() { -+ assert.ok( true, "complete" ); -+ } -+ }; -+ } ); -+ -+ ajaxTest( "jQuery.ajax() - execute js for crossOrigin when dataType option is provided", 3, -+ function( assert ) { -+ return { -+ create: function( options ) { -+ options.crossDomain = true; -+ options.dataType = "script"; -+ return jQuery.ajax( url( "data/script.php?header=ecma" ), options ); -+ }, -+ success: function() { -+ assert.ok( true, "success" ); -+ }, -+ complete: function() { -+ assert.ok( true, "complete" ); -+ } -+ }; -+ } -+ ); -+ -+ ajaxTest( "jQuery.ajax() - do not execute js (crossOrigin)", 2, function( assert ) { -+ return { -+ create: function( options ) { -+ options.crossDomain = true; -+ return jQuery.ajax( url( "data/script.php" ), options ); -+ }, -+ success: function() { -+ assert.ok( true, "success" ); -+ }, -+ complete: function() { -+ assert.ok( true, "complete" ); -+ } -+ }; -+ } ); -+ - ajaxTest( "jQuery.ajax() - success callbacks (late binding)", 8, function( assert ) { - return { - setup: addGlobalEvents( "ajaxStart ajaxStop ajaxSend ajaxComplete ajaxSuccess", assert ), From f4abf6dc5acc39ecf40272d150bad56524bb8180 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 14:39:41 +0000 Subject: [PATCH 09/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- js-jquery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js-jquery.spec b/js-jquery.spec index 0c370a2..b7d49df 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery Version: 3.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -86,6 +86,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 3.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed Apr 12 2017 Christopher Tubbs - 3.2.1-1 - Update to jQuery 3.2.1 From 58af980c69c009a4614dd4065fc67237d9d8174d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 19:10:48 +0000 Subject: [PATCH 10/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- js-jquery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js-jquery.spec b/js-jquery.spec index b7d49df..fee3e47 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery Version: 3.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -86,6 +86,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 3.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 3.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 9ad29b8cb1310056af5bb8e256d5ca1fe6301fc9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 06:37:17 +0000 Subject: [PATCH 11/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- js-jquery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js-jquery.spec b/js-jquery.spec index fee3e47..2d031cb 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery Version: 3.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -86,6 +86,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 3.2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 3.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From b811b297f4995027d31c62079d5ee05a30ab6a49 Mon Sep 17 00:00:00 2001 From: Christopher Tubbs Date: Wed, 18 Jul 2018 01:47:14 -0400 Subject: [PATCH 12/34] Update to 3.3.1 fixes rhbz#1536772 rhbz#1445079 rhbz#1591846 Security fix for CVE-2012-6708 --- .gitignore | 1 + js-jquery.spec | 12 ++++++++++-- remove-typeofs.patch | 18 ++++++++++++++++++ sources | 2 +- 4 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 remove-typeofs.patch diff --git a/.gitignore b/.gitignore index 80fe5c7..bf0694b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /js-jquery-8f2a9d9272d6ed7f32d3a484740ab342c02541e0.tar.gz /jquery-2.2.4.tar.gz /jquery-3.2.1.tar.gz +/jquery-3.3.1.tar.gz diff --git a/js-jquery.spec b/js-jquery.spec index 2d031cb..639053a 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery -Version: 3.2.1 -Release: 4%{?dist} +Version: 3.3.1 +Release: 1%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -18,6 +18,9 @@ Patch1: %{name}-disable-gzip-js.patch # disable missing insight module Patch2: disable-insight-tracking.patch +# disable typeofs compress option (not available in current uglify) +Patch3: remove-typeofs.patch + BuildRequires: web-assets-devel BuildRequires: nodejs-packaging BuildRequires: js-sizzle-static @@ -33,6 +36,7 @@ BuildRequires: npm(grunt-cli) BuildRequires: npm(grunt-contrib-uglify) BuildRequires: npm(load-grunt-tasks) BuildRequires: npm(requirejs) +BuildRequires: npm(raw-body) #BuildRequires: npm(strip-json-comments) # won't work on epel7 branch BuildRequires: nodejs-strip-json-comments @@ -86,6 +90,10 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Wed Jul 18 2018 Christopher Tubbs - 3.3.1-1 +- Update to 3.3.1; fixes rhbz#1536772 rhbz#1445079 rhbz#1591846 Security fix for + CVE-2012-6708 + * Fri Jul 13 2018 Fedora Release Engineering - 3.2.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/remove-typeofs.patch b/remove-typeofs.patch new file mode 100644 index 0000000..02c2197 --- /dev/null +++ b/remove-typeofs.patch @@ -0,0 +1,18 @@ +diff --git a/Gruntfile.js b/Gruntfile.js +index 096370a..173dad7 100644 +--- a/Gruntfile.js ++++ b/Gruntfile.js +@@ -261,12 +261,7 @@ module.exports = function( grunt ) { + compress: { + "hoist_funs": false, + loops: false, +- unused: false, +- +- // Support: IE <11 +- // typeofs transformation is unsafe for IE9-10 +- // See https://github.com/mishoo/UglifyJS2/issues/2198 +- typeofs: false ++ unused: false + } + } + } diff --git a/sources b/sources index 7e2df0f..619effc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jquery-3.2.1.tar.gz) = c237b4de4e7d31cde8f8de2493ae92f7db1d504b83f24808738066bdaa7c906f3b6f819eeff1bb90881cbbccd1d32fbc06f63e847c13548adc92671d796bf336 +SHA512 (jquery-3.3.1.tar.gz) = 1f718a0128a91e69abfcff9a515b4179a0dee79256953a12a87940358b1f345d9c68e7106a5dfd82d83c947030f040d6ab3b60b0d49362482eac1e78e03f4ac6 From 94eaf4b7e53e7fb134117d864ce3ace60a0214bb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 04:42:24 +0000 Subject: [PATCH 13/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- js-jquery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js-jquery.spec b/js-jquery.spec index 639053a..641fd2d 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery Version: 3.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -90,6 +90,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 3.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Jul 18 2018 Christopher Tubbs - 3.3.1-1 - Update to 3.3.1; fixes rhbz#1536772 rhbz#1445079 rhbz#1591846 Security fix for CVE-2012-6708 From 3d1889f929506ea925baca2cf473c5eecc1c8c2c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 10:44:58 +0000 Subject: [PATCH 14/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- js-jquery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js-jquery.spec b/js-jquery.spec index 641fd2d..c0c421b 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery Version: 3.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -90,6 +90,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 3.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 3.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From a5e3e902b1bc77263d0748970f730ad8614fb794 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 06:22:30 +0000 Subject: [PATCH 15/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- js-jquery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js-jquery.spec b/js-jquery.spec index c0c421b..0cf1338 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery Version: 3.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -90,6 +90,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 3.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 3.3.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From ad14f1bafd61e652fb117fa2842d02d63e6f0ed6 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 13 Apr 2020 14:52:04 -0400 Subject: [PATCH 16/34] Update to 3.5.0 Bundle the build dependencies in the source RPM Drop unneeded patches Update .gitignore Signed-off-by: Stephen Gallagher --- .gitignore | 4 ++ disable-insight-tracking.patch | 60 ---------------- js-jquery-disable-gzip-js.patch | 25 +++++-- js-jquery.spec | 52 +++++++------- remove-typeofs.patch | 18 ----- sources | 3 +- update-sources.sh | 118 ++++++++++++++++++++++++++++++++ 7 files changed, 169 insertions(+), 111 deletions(-) delete mode 100644 disable-insight-tracking.patch delete mode 100644 remove-typeofs.patch create mode 100755 update-sources.sh diff --git a/.gitignore b/.gitignore index bf0694b..77cd870 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,9 @@ +*.swp +jquery-*/* /js-jquery-4dec426aa2a6cbabb1b064319ba7c272d594a688.tar.gz /js-jquery-8f2a9d9272d6ed7f32d3a484740ab342c02541e0.tar.gz /jquery-2.2.4.tar.gz /jquery-3.2.1.tar.gz /jquery-3.3.1.tar.gz +/jquery-3.5.0.tar.gz +/jquery_3.5.0_node_modules.tar.gz diff --git a/disable-insight-tracking.patch b/disable-insight-tracking.patch deleted file mode 100644 index 11849a6..0000000 --- a/disable-insight-tracking.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/build/tasks/build.js b/build/tasks/build.js -index 69916bf..58e65ad 100644 ---- a/build/tasks/build.js -+++ b/build/tasks/build.js -@@ -10,7 +10,6 @@ module.exports = function( grunt ) { - - var fs = require( "fs" ), - requirejs = require( "requirejs" ), -- Insight = require( "insight" ), - pkg = require( "../../package.json" ), - srcFolder = __dirname + "/../../src/", - rdefineEnd = /\}\s*?\);[^}\w]*$/, -@@ -337,46 +336,16 @@ module.exports = function( grunt ) { - grunt.registerTask( "custom", function() { - var args = this.args, - modules = args.length ? args[ 0 ].replace( /,/g, ":" ) : "", -- done = this.async(), -- insight = new Insight( { -- trackingCode: "UA-1076265-4", -- pkg: pkg -- } ); -+ done = this.async(); - - function exec( trackingAllowed ) { -- var tracks = args.length ? args[ 0 ].split( "," ) : []; - var defaultPath = [ "build", "custom" ]; - -- tracks = tracks.map( function( track ) { -- return track.replace( /\//g, "+" ); -- } ); -- -- if ( trackingAllowed ) { -- -- // Track individuals -- tracks.forEach( function( module ) { -- var path = defaultPath.concat( [ "individual" ], module ); -- -- insight.track.apply( insight, path ); -- } ); -- -- // Track full command -- insight.track.apply( insight, defaultPath.concat( [ "full" ], tracks ) ); -- } -- - grunt.task.run( [ "build:*:*" + ( modules ? ":" + modules : "" ), "uglify", "dist" ] ); - done(); - } - - grunt.log.writeln( "Creating custom build...\n" ); - -- // Ask for permission the first time -- if ( insight.optOut === undefined ) { -- insight.askPermission( null, function( error, result ) { -- exec( result ); -- } ); -- } else { -- exec( !insight.optOut ); -- } - } ); - }; diff --git a/js-jquery-disable-gzip-js.patch b/js-jquery-disable-gzip-js.patch index f9f533e..a76ca1c 100644 --- a/js-jquery-disable-gzip-js.patch +++ b/js-jquery-disable-gzip-js.patch @@ -1,14 +1,29 @@ +From da2978fde58fb84175ae0b9b7a83c963430a7747 Mon Sep 17 00:00:00 2001 +From: Stephen Gallagher +Date: Mon, 13 Apr 2020 14:04:00 -0400 +Subject: [PATCH] Disable gzip-js + +Signed-off-by: Stephen Gallagher +--- + Gruntfile.js | 1 - + 1 file changed, 1 deletion(-) + diff --git a/Gruntfile.js b/Gruntfile.js -index 12ae008..5d541f2 100644 +index 486a0f303932734b868b065d3c7b99a36002fac5..5ff8cdec4810d0cdf2180da2f4432020f91e6b10 100644 --- a/Gruntfile.js +++ b/Gruntfile.js -@@ -12,8 +12,7 @@ module.exports = function( grunt ) { +@@ -11,11 +11,10 @@ module.exports = function( grunt ) { + } catch ( e ) {} return data; } -- var fs = require( "fs" ), -- gzip = require( "gzip-js" ); -+ var fs = require( "fs" ); + var fs = require( "fs" ), +- gzip = require( "gzip-js" ), + isTravis = process.env.TRAVIS, + travisBrowsers = process.env.BROWSERS && process.env.BROWSERS.split( "," ); if ( !grunt.option( "filename" ) ) { grunt.option( "filename", "jquery.js" ); +-- +2.26.0 + diff --git a/js-jquery.spec b/js-jquery.spec index 0cf1338..39e4d04 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery -Version: 3.3.1 -Release: 4%{?dist} +Version: 3.5.0 +Release: 2%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -11,37 +11,29 @@ BuildArch: noarch License: MIT URL: https://jquery.com/ Source0: https://github.com/jquery/jquery/archive/%{version}/jquery-%{version}.tar.gz +# Created by ./update_sources.sh +Source1: jquery_%{version}_node_modules.tar.gz # disable gzip-js during build Patch1: %{name}-disable-gzip-js.patch -# disable missing insight module -Patch2: disable-insight-tracking.patch - -# disable typeofs compress option (not available in current uglify) -Patch3: remove-typeofs.patch BuildRequires: web-assets-devel BuildRequires: nodejs-packaging -BuildRequires: js-sizzle-static Provides: jquery = %{version}-%{release} Provides: %{name}-static = %{version}-%{release} Provides: %{name}%{ver_x} = %{version}-%{release} Provides: %{name}%{ver_x}-static = %{version}-%{release} -BuildRequires: nodejs-grunt >= 0.4.4-3 -BuildRequires: npm(shelljs) -BuildRequires: npm(grunt-cli) -BuildRequires: npm(grunt-contrib-uglify) -BuildRequires: npm(load-grunt-tasks) -BuildRequires: npm(requirejs) -BuildRequires: npm(raw-body) -#BuildRequires: npm(strip-json-comments) # won't work on epel7 branch -BuildRequires: nodejs-strip-json-comments - Requires: web-assets-filesystem +# Bundles sizzle (https://github.com/jquery/sizzle/) in node_modules/sizzle +# Get version from package.json +Provides: bundled(sizzle) = 2.3.5 +Provides: bundled(js-sizzle) = 2.3.5 + + %description jQuery is a fast, small, and feature-rich JavaScript library. It makes things like HTML document traversal and manipulation, event handling, animation, and @@ -50,23 +42,21 @@ browsers. With a combination of versatility and extensibility, jQuery has changed the way that millions of people write JavaScript. %prep -%autosetup -p1 -n jquery-%{version} +%autosetup -n jquery-%{version} -v -p1 #remove precompiled stuff -rm -rf dist/* src/sizzle +rm -rf dist/* -#put sizzle where jquery expects it -install -Dp %{_jsdir}/sizzle/latest/sizzle.js src/sizzle/dist/sizzle.js +# Install the cached node modules +tar xf %{SOURCE1} %build -%nodejs_symlink_deps --build -grunt -v 'build:*:*' uglify +./node_modules/grunt-cli/bin/grunt -v 'build:*:*' uglify -# missing dependencies -#%%check -#grunt +%check +./node_modules/grunt-cli/bin/grunt -v 'build:*:*' test:prepare test:fast %install @@ -90,6 +80,14 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Wed Apr 15 2020 Stephen Gallagher - 3.5.0-2 +- Add virtual Provides: for bundled sizzle + +* Mon Apr 13 2020 Stephen Gallagher - 3.5.0-1 +- Update to 3.5.0 +- Bundle the build dependencies in the source RPM +- Drop unneeded patches + * Wed Jan 29 2020 Fedora Release Engineering - 3.3.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/remove-typeofs.patch b/remove-typeofs.patch deleted file mode 100644 index 02c2197..0000000 --- a/remove-typeofs.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/Gruntfile.js b/Gruntfile.js -index 096370a..173dad7 100644 ---- a/Gruntfile.js -+++ b/Gruntfile.js -@@ -261,12 +261,7 @@ module.exports = function( grunt ) { - compress: { - "hoist_funs": false, - loops: false, -- unused: false, -- -- // Support: IE <11 -- // typeofs transformation is unsafe for IE9-10 -- // See https://github.com/mishoo/UglifyJS2/issues/2198 -- typeofs: false -+ unused: false - } - } - } diff --git a/sources b/sources index 619effc..80c4549 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (jquery-3.3.1.tar.gz) = 1f718a0128a91e69abfcff9a515b4179a0dee79256953a12a87940358b1f345d9c68e7106a5dfd82d83c947030f040d6ab3b60b0d49362482eac1e78e03f4ac6 +SHA512 (jquery-3.5.0.tar.gz) = a59782f614915ccca99b2529d473961697a28533e85f186e014cc481690fb7480e7c7f7cb9ace49fa0494fa7ab270487c914ce0d9109eb9cdd6e4b58c931ac91 +SHA512 (jquery_3.5.0_node_modules.tar.gz) = b41a3989334a9fa77ff19694459506f50476a0d7de4c022ace904546dd2c18c05d5b3057e36196cf8f0a47de6dec5bd78f32275eddc49cc3fdfefb8000b6a168 diff --git a/update-sources.sh b/update-sources.sh new file mode 100755 index 0000000..b9059c2 --- /dev/null +++ b/update-sources.sh @@ -0,0 +1,118 @@ +#!/bin/bash + +# Created by argbash-init v2.8.1 +# ARG_POSITIONAL_SINGLE([version]) +# ARG_DEFAULTS_POS() +# ARG_HELP([Download and cache all build dependencies for jquery]) +# ARGBASH_GO() +# needed because of Argbash --> m4_ignore([ +### START OF CODE GENERATED BY Argbash v2.8.1 one line above ### +# Argbash is a bash code generator used to get arguments parsing right. +# Argbash is FREE SOFTWARE, see https://argbash.io for more info + + +die() +{ + local _ret=$2 + test -n "$_ret" || _ret=1 + test "$_PRINT_HELP" = yes && print_help >&2 + echo "$1" >&2 + exit ${_ret} +} + + +begins_with_short_option() +{ + local first_option all_short_options='h' + first_option="${1:0:1}" + test "$all_short_options" = "${all_short_options/$first_option/}" && return 1 || return 0 +} + +# THE DEFAULTS INITIALIZATION - POSITIONALS +_positionals=() +_arg_version= +# THE DEFAULTS INITIALIZATION - OPTIONALS + + +print_help() +{ + printf '%s\n' "Download and cache all build dependencies for jquery" + printf 'Usage: %s [-h|--help] \n' "$0" + printf '\t%s\n' "-h, --help: Prints help" +} + + +parse_commandline() +{ + _positionals_count=0 + while test $# -gt 0 + do + _key="$1" + case "$_key" in + -h|--help) + print_help + exit 0 + ;; + -h*) + print_help + exit 0 + ;; + *) + _last_positional="$1" + _positionals+=("$_last_positional") + _positionals_count=$((_positionals_count + 1)) + ;; + esac + shift + done +} + + +handle_passed_args_count() +{ + local _required_args_string="'version'" + test "${_positionals_count}" -ge 1 || _PRINT_HELP=yes die "FATAL ERROR: Not enough positional arguments - we require exactly 1 (namely: $_required_args_string), but got only ${_positionals_count}." 1 + test "${_positionals_count}" -le 1 || _PRINT_HELP=yes die "FATAL ERROR: There were spurious positional arguments --- we expect exactly 1 (namely: $_required_args_string), but got ${_positionals_count} (the last one was: '${_last_positional}')." 1 +} + + +assign_positional_args() +{ + local _positional_name _shift_for=$1 + _positional_names="_arg_version " + + shift "$_shift_for" + for _positional_name in ${_positional_names} + do + test $# -gt 0 || break + eval "$_positional_name=\${1}" || die "Error during argument parsing, possibly an Argbash bug." 1 + shift + done +} + +parse_commandline "$@" +handle_passed_args_count +assign_positional_args 1 "${_positionals[@]}" + +# OTHER STUFF GENERATED BY Argbash + +### END OF CODE GENERATED BY Argbash (sortof) ### ]) +# [ <-- needed because of Argbash + +version=$_arg_version +rm -rf jquery-$version jquery-$version.tar.gz jquery_${version}_node_modules.tar.gz +wget https://github.com/jquery/jquery/archive/$version/jquery-$version.tar.gz + +tar xf jquery-$version.tar.gz + +pushd jquery-$version +npm install --save-dev +tar cfz ../jquery_${version}_node_modules.tar.gz node_modules + +# Husky tries to install a git hook that doesn't play well with dist-git +npm uninstall husky +popd + +fedpkg new-sources jquery-$version.tar.gz jquery_${version}_node_modules.tar.gz + +# ] <-- needed because of Argbash From b3b86fc7a35d51ae711f89da3af28aa3bcf8c06c Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Fri, 17 Apr 2020 13:47:01 -0400 Subject: [PATCH 17/34] Add explicit dependency on nodejs Signed-off-by: Stephen Gallagher --- js-jquery.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/js-jquery.spec b/js-jquery.spec index 39e4d04..cbd3061 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery Version: 3.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -20,6 +20,7 @@ Patch1: %{name}-disable-gzip-js.patch BuildRequires: web-assets-devel BuildRequires: nodejs-packaging +BuildRequires: nodejs Provides: jquery = %{version}-%{release} Provides: %{name}-static = %{version}-%{release} @@ -80,6 +81,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Fri Apr 17 2020 Stephen Gallagher - 3.5.0-3 +- Add explicit dependency on nodejs + * Wed Apr 15 2020 Stephen Gallagher - 3.5.0-2 - Add virtual Provides: for bundled sizzle From abe7281d638bcf7933225468522ddb48dc50f75f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 02:31:10 +0000 Subject: [PATCH 18/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- js-jquery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js-jquery.spec b/js-jquery.spec index cbd3061..419c140 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery Version: 3.5.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -81,6 +81,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 3.5.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Apr 17 2020 Stephen Gallagher - 3.5.0-3 - Add explicit dependency on nodejs From 5a6f1813c257fd2337360eee2c5c6ce31e0beaaf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 15:01:30 +0000 Subject: [PATCH 19/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- js-jquery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js-jquery.spec b/js-jquery.spec index 419c140..2bd1d2b 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery Version: 3.5.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -81,6 +81,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 3.5.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 3.5.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 5c646a8e5a20497183f303ede032705d356bb1e5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 09:15:41 +0000 Subject: [PATCH 20/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- js-jquery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js-jquery.spec b/js-jquery.spec index 2bd1d2b..a5ba696 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery Version: 3.5.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -81,6 +81,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 3.5.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 3.5.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 8fc21476a932c92ecf305619e9a443b679bb6e5a Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 16 Jan 2022 19:34:41 -0700 Subject: [PATCH 21/34] Update to 3.6.0 --- .gitignore | 2 ++ js-jquery.spec | 7 +++++-- sources | 4 ++-- update-sources.sh | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 77cd870..f1fe92c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ jquery-*/* /jquery-3.3.1.tar.gz /jquery-3.5.0.tar.gz /jquery_3.5.0_node_modules.tar.gz +/jquery-3.6.0.tar.gz +/jquery_3.6.0_node_modules.tar.gz diff --git a/js-jquery.spec b/js-jquery.spec index a5ba696..168c0d7 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery -Version: 3.5.0 -Release: 6%{?dist} +Version: 3.6.0 +Release: 1%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -81,6 +81,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Mon Jan 17 2022 Orion Poplawski - 3.6.0-1 +- Update to 3.6.0 + * Thu Jul 22 2021 Fedora Release Engineering - 3.5.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 80c4549..6f803d8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (jquery-3.5.0.tar.gz) = a59782f614915ccca99b2529d473961697a28533e85f186e014cc481690fb7480e7c7f7cb9ace49fa0494fa7ab270487c914ce0d9109eb9cdd6e4b58c931ac91 -SHA512 (jquery_3.5.0_node_modules.tar.gz) = b41a3989334a9fa77ff19694459506f50476a0d7de4c022ace904546dd2c18c05d5b3057e36196cf8f0a47de6dec5bd78f32275eddc49cc3fdfefb8000b6a168 +SHA512 (jquery_3.6.0_node_modules.tar.gz) = 52b32827b0f51e39e58c42a8b51ec7ceb152a2da65b64803d58e6c4b686a026be3a35e59777b882902fe91eb5fb25aaeabd3f370da9aa60beef55438c608dccb +SHA512 (jquery-3.6.0.tar.gz) = 4ec93258e3d072de8922bece36841e8721a305c6f7f15971b846269d24a2f60e71a28d67d56f0f36c2c4ffa16204a36696c4ae4bb19b90d4b0715f1babed4b4e diff --git a/update-sources.sh b/update-sources.sh index b9059c2..f8eba2a 100755 --- a/update-sources.sh +++ b/update-sources.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e # Created by argbash-init v2.8.1 # ARG_POSITIONAL_SINGLE([version]) From 17ae9bba92b8f3e326c3fec93f570363898cb2cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 13:58:02 +0000 Subject: [PATCH 22/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- js-jquery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js-jquery.spec b/js-jquery.spec index 168c0d7..903a4df 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery Version: 3.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -81,6 +81,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 3.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Jan 17 2022 Orion Poplawski - 3.6.0-1 - Update to 3.6.0 From 1a6ff340778922cf908d4122cf2e941858454847 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 15:24:26 +0000 Subject: [PATCH 23/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- js-jquery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js-jquery.spec b/js-jquery.spec index 903a4df..057eb0a 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery Version: 3.6.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -81,6 +81,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 3.6.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 3.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 5a739273077c5f75ea7a4555ee1a333d450396d4 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 21 Dec 2022 19:59:03 -0700 Subject: [PATCH 24/34] Update to 3.6.3 --- .gitignore | 2 ++ js-jquery-disable-gzip-js.patch | 27 +++++---------------------- js-jquery.spec | 9 ++++++--- sources | 4 ++-- 4 files changed, 15 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index f1fe92c..695e18a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ jquery-*/* /jquery_3.5.0_node_modules.tar.gz /jquery-3.6.0.tar.gz /jquery_3.6.0_node_modules.tar.gz +/jquery-3.6.3.tar.gz +/jquery_3.6.3_node_modules.tar.gz diff --git a/js-jquery-disable-gzip-js.patch b/js-jquery-disable-gzip-js.patch index a76ca1c..b50a2b6 100644 --- a/js-jquery-disable-gzip-js.patch +++ b/js-jquery-disable-gzip-js.patch @@ -1,29 +1,12 @@ -From da2978fde58fb84175ae0b9b7a83c963430a7747 Mon Sep 17 00:00:00 2001 -From: Stephen Gallagher -Date: Mon, 13 Apr 2020 14:04:00 -0400 -Subject: [PATCH] Disable gzip-js - -Signed-off-by: Stephen Gallagher ---- - Gruntfile.js | 1 - - 1 file changed, 1 deletion(-) - diff --git a/Gruntfile.js b/Gruntfile.js -index 486a0f303932734b868b065d3c7b99a36002fac5..5ff8cdec4810d0cdf2180da2f4432020f91e6b10 100644 +index f93c3a2..8ffe305 100644 --- a/Gruntfile.js +++ b/Gruntfile.js -@@ -11,11 +11,10 @@ module.exports = function( grunt ) { - } catch ( e ) {} - return data; +@@ -20,7 +20,6 @@ module.exports = function( grunt ) { } var fs = require( "fs" ), - gzip = require( "gzip-js" ), - isTravis = process.env.TRAVIS, - travisBrowsers = process.env.BROWSERS && process.env.BROWSERS.split( "," ); - - if ( !grunt.option( "filename" ) ) { - grunt.option( "filename", "jquery.js" ); --- -2.26.0 - + oldNode = /^v10\./.test( process.version ), + nodeV17OrNewer = !/^v1[0246]\./.test( process.version ), + isCi = process.env.GITHUB_ACTION, diff --git a/js-jquery.spec b/js-jquery.spec index 057eb0a..488d82e 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery -Version: 3.6.0 -Release: 3%{?dist} +Version: 3.6.3 +Release: 1%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -11,7 +11,7 @@ BuildArch: noarch License: MIT URL: https://jquery.com/ Source0: https://github.com/jquery/jquery/archive/%{version}/jquery-%{version}.tar.gz -# Created by ./update_sources.sh +# Created by ./update-sources.sh Source1: jquery_%{version}_node_modules.tar.gz # disable gzip-js during build @@ -81,6 +81,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Thu Dec 22 2022 Orion Poplawski - 3.6.3-1 +- Update to 3.6.3 + * Thu Jul 21 2022 Fedora Release Engineering - 3.6.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 6f803d8..df91485 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (jquery_3.6.0_node_modules.tar.gz) = 52b32827b0f51e39e58c42a8b51ec7ceb152a2da65b64803d58e6c4b686a026be3a35e59777b882902fe91eb5fb25aaeabd3f370da9aa60beef55438c608dccb -SHA512 (jquery-3.6.0.tar.gz) = 4ec93258e3d072de8922bece36841e8721a305c6f7f15971b846269d24a2f60e71a28d67d56f0f36c2c4ffa16204a36696c4ae4bb19b90d4b0715f1babed4b4e +SHA512 (jquery-3.6.3.tar.gz) = 978875bc5c77d8c3b10918a243a67bde7664547dd19b636e0e401c518442f8bf81ca23bf7e3a13d5a6f368842e118517485a59aeb44ff83a36d7960c39821c36 +SHA512 (jquery_3.6.3_node_modules.tar.gz) = a9e04d73116c6f5745a2837e3854d802cdfd21652a5dda635261f8d1a56a13a1f92b422baa0507ea2b009ab182e9be3a0af227eed59119e4cfc6b8efaec298a0 From 1a875624bcd95ff5013c14e4d1c3805902fbb00a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 13:53:46 +0000 Subject: [PATCH 25/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- js-jquery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js-jquery.spec b/js-jquery.spec index 488d82e..dfb9299 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery Version: 3.6.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -81,6 +81,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 3.6.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Dec 22 2022 Orion Poplawski - 3.6.3-1 - Update to 3.6.3 From 5b21a06042e93c39de0cc174a7d15520f54663d9 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 8 Mar 2023 17:45:53 -0700 Subject: [PATCH 26/34] Update to 3.6.4 --- .gitignore | 2 ++ js-jquery.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 695e18a..4d16256 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ jquery-*/* /jquery_3.6.0_node_modules.tar.gz /jquery-3.6.3.tar.gz /jquery_3.6.3_node_modules.tar.gz +/jquery-3.6.4.tar.gz +/jquery_3.6.4_node_modules.tar.gz diff --git a/js-jquery.spec b/js-jquery.spec index dfb9299..4c22a9b 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery -Version: 3.6.3 -Release: 2%{?dist} +Version: 3.6.4 +Release: 1%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -81,6 +81,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Thu Mar 09 2023 Orion Poplawski - 3.6.4-1 +- Update to 3.6.4 + * Thu Jan 19 2023 Fedora Release Engineering - 3.6.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index df91485..f3ded2b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (jquery-3.6.3.tar.gz) = 978875bc5c77d8c3b10918a243a67bde7664547dd19b636e0e401c518442f8bf81ca23bf7e3a13d5a6f368842e118517485a59aeb44ff83a36d7960c39821c36 -SHA512 (jquery_3.6.3_node_modules.tar.gz) = a9e04d73116c6f5745a2837e3854d802cdfd21652a5dda635261f8d1a56a13a1f92b422baa0507ea2b009ab182e9be3a0af227eed59119e4cfc6b8efaec298a0 +SHA512 (jquery-3.6.4.tar.gz) = 11873de3088e0b83af6bf9b242cf34c0c8e69939a49e3d0494ffdce07f27b206a534454975c1bac69c3fb8823ba7676211c9fa3f1f55a69624c319fd4242d86d +SHA512 (jquery_3.6.4_node_modules.tar.gz) = fb048bd05b77b85e761397ee0c15fe350515919147ae91c85017e3f6e103adc9739839805ec0f9afcf69e5479f510f396019ab8294ca3fbc79810559c59a6812 From ae726bdff604b483913898b0a49592f7c9d81806 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 08:12:00 +0000 Subject: [PATCH 27/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- js-jquery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js-jquery.spec b/js-jquery.spec index 4c22a9b..f297262 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery Version: 3.6.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -81,6 +81,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 3.6.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Mar 09 2023 Orion Poplawski - 3.6.4-1 - Update to 3.6.4 From 5b6549904b0551e63ec82d1f4ae53798103e0c24 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 3 Sep 2023 19:37:50 -0600 Subject: [PATCH 28/34] Update to 3.7.1 --- .gitignore | 2 ++ js-jquery-disable-gzip-js.patch | 21 ++++++++++----------- js-jquery.spec | 7 +++++-- sources | 4 ++-- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 4d16256..7128954 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ jquery-*/* /jquery_3.6.3_node_modules.tar.gz /jquery-3.6.4.tar.gz /jquery_3.6.4_node_modules.tar.gz +/jquery-3.7.1.tar.gz +/jquery_3.7.1_node_modules.tar.gz diff --git a/js-jquery-disable-gzip-js.patch b/js-jquery-disable-gzip-js.patch index b50a2b6..0b28b43 100644 --- a/js-jquery-disable-gzip-js.patch +++ b/js-jquery-disable-gzip-js.patch @@ -1,12 +1,11 @@ -diff --git a/Gruntfile.js b/Gruntfile.js -index f93c3a2..8ffe305 100644 ---- a/Gruntfile.js -+++ b/Gruntfile.js -@@ -20,7 +20,6 @@ module.exports = function( grunt ) { - } +diff -up jquery-3.7.1/Gruntfile.js.gzip jquery-3.7.1/Gruntfile.js +--- jquery-3.7.1/Gruntfile.js.gzip 2023-08-28 07:37:56.000000000 -0600 ++++ jquery-3.7.1/Gruntfile.js 2023-09-01 18:36:58.570497362 -0600 +@@ -14,7 +14,6 @@ module.exports = function( grunt ) { - var fs = require( "fs" ), -- gzip = require( "gzip-js" ), - oldNode = /^v10\./.test( process.version ), - nodeV17OrNewer = !/^v1[0246]\./.test( process.version ), - isCi = process.env.GITHUB_ACTION, + const fs = require( "fs" ); + const { spawn } = require( "child_process" ); +- const gzip = require( "gzip-js" ); + const nodeV16OrNewer = !/^v1[0-5]\./.test( process.version ); + const nodeV17OrNewer = !/^v1[0-6]\./.test( process.version ); + const customBrowsers = process.env.BROWSERS && process.env.BROWSERS.split( "," ); diff --git a/js-jquery.spec b/js-jquery.spec index f297262..a92a901 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery -Version: 3.6.4 -Release: 2%{?dist} +Version: 3.7.1 +Release: 1%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -81,6 +81,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Sat Sep 02 2023 Orion Poplawski - 3.7.1-1 +- Update to 3.7.1 + * Thu Jul 20 2023 Fedora Release Engineering - 3.6.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index f3ded2b..1c4281a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (jquery-3.6.4.tar.gz) = 11873de3088e0b83af6bf9b242cf34c0c8e69939a49e3d0494ffdce07f27b206a534454975c1bac69c3fb8823ba7676211c9fa3f1f55a69624c319fd4242d86d -SHA512 (jquery_3.6.4_node_modules.tar.gz) = fb048bd05b77b85e761397ee0c15fe350515919147ae91c85017e3f6e103adc9739839805ec0f9afcf69e5479f510f396019ab8294ca3fbc79810559c59a6812 +SHA512 (jquery-3.7.1.tar.gz) = 693a7e70ef70e48742cb98ecfc48e156356d262261c8c457d289172a953dd57f471db827658f9ceb4000eeef069b0c4b14ec453543a5c41b44a95b5865df6643 +SHA512 (jquery_3.7.1_node_modules.tar.gz) = f2bcfd131e4966bdf81321a61cf4b71820fb09fc336f6084a2643afa95e84637b3ae7bd01b735a8e81ba1bfc39b128902c44e620bda46ad68e82626d36fd6865 From 65194da5b60a084d7364727e9c6afaaa657787e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 23:47:19 +0000 Subject: [PATCH 29/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- js-jquery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js-jquery.spec b/js-jquery.spec index a92a901..a9d5a02 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery Version: 3.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -81,6 +81,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Sat Jan 20 2024 Fedora Release Engineering - 3.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Sep 02 2023 Orion Poplawski - 3.7.1-1 - Update to 3.7.1 From 74c440a2e428607753671bc7a77fc9754ff13644 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 23:27:16 +0000 Subject: [PATCH 30/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- js-jquery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js-jquery.spec b/js-jquery.spec index a9d5a02..3fe9b2e 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery Version: 3.7.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -81,6 +81,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 3.7.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jan 20 2024 Fedora Release Engineering - 3.7.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From be1e55ec2552315dc4b995f3b688607d564972fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 11:08:42 +0000 Subject: [PATCH 31/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- js-jquery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js-jquery.spec b/js-jquery.spec index 3fe9b2e..a280841 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery Version: 3.7.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -81,6 +81,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 3.7.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jan 24 2024 Fedora Release Engineering - 3.7.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From e62445def6161f90acb2ea46124e4b7a2b875dd4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 08:01:37 +0000 Subject: [PATCH 32/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- js-jquery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js-jquery.spec b/js-jquery.spec index a280841..b06ea22 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery Version: 3.7.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -81,6 +81,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 3.7.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 3.7.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 99da47a567b500c3f7099b1b895d725cf2a59854 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 18:05:21 +0000 Subject: [PATCH 33/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- js-jquery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js-jquery.spec b/js-jquery.spec index b06ea22..88741b7 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery Version: 3.7.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -81,6 +81,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 3.7.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 3.7.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 4c2e5fa4095a1a20e45cbbb2b6473080b2baaf5f Mon Sep 17 00:00:00 2001 From: tjuhasz Date: Tue, 4 Nov 2025 10:43:30 +0100 Subject: [PATCH 34/34] Rebuild for nodejs-packaging Recently, Node.js changed the way node modules are installed to allow for better parallel functionality and easier unbundling of certain parts of Node.js. Previously, Node.js was using a symlink, %{_libdir}/node_modules, which pointed to a versioned path, e.g., %{_libdir}/node_modules_22. This has changed to using a global %{_libdir}/node_modules static shared folder for generic modules and %{_libdir}/node_modules_XX for version-specific modules. This change is better described in the Fedora change proposal wiki: https://fedoraproject.org/wiki/Changes/NodejsNodeModulesPath. This also needed to be reflected in nodejs-packaging macros, which forces a rebuild of dependent packages. --- js-jquery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js-jquery.spec b/js-jquery.spec index 88741b7..86cb6e5 100644 --- a/js-jquery.spec +++ b/js-jquery.spec @@ -1,6 +1,6 @@ Name: js-jquery Version: 3.7.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: JavaScript DOM manipulation, event handling, and AJAX library BuildArch: noarch @@ -81,6 +81,9 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y} %changelog +* Tue Nov 11 2025 Tomas Juhasz - 3.7.1-7 +- Rebuilt for nodejs-packaging + * Thu Jul 24 2025 Fedora Release Engineering - 3.7.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild