diff --git a/lodash-3.10.1.tar.gz b/lodash-3.10.1.tar.gz deleted file mode 100644 index c8ab82139b5d9e52b119c899bfca333ec92ecf7c..0000000000000000000000000000000000000000 Binary files a/lodash-3.10.1.tar.gz and /dev/null differ diff --git a/lodash-4.17.15.tar.gz b/lodash-4.17.15.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..d5b04d478e6178a892af8651720dea9d8a3a18ea Binary files /dev/null and b/lodash-4.17.15.tar.gz differ diff --git a/lodash-cli-3.10.1.tar.gz b/lodash-cli-3.10.1.tar.gz deleted file mode 100644 index c15097b8103653238fe9135e95714fd4db04baf3..0000000000000000000000000000000000000000 Binary files a/lodash-cli-3.10.1.tar.gz and /dev/null differ diff --git a/lodash-cli-4.17.5.tar.gz b/lodash-cli-4.17.5.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..b84ee4ea6640d03a70c3f9b1141de288b6693d31 Binary files /dev/null and b/lodash-cli-4.17.5.tar.gz differ diff --git a/lodash-compat-package.json b/lodash-compat-package.json deleted file mode 100644 index 49470cabf5598fbd7dfb16023afef3f9f6d34f3a..0000000000000000000000000000000000000000 --- a/lodash-compat-package.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "lodash-compat", - "version": "3.10.1", - "description": "The compatibility build of lodash modular utilities.", - "homepage": "https://lodash.com/", - "icon": "https://lodash.com/icon.svg", - "license": "MIT", - "main": "index.js", - "keywords": "compatibility, modules, stdlib, util", - "author": "John-David Dalton (http://allyoucanleet.com/)", - "contributors": [ - "John-David Dalton (http://allyoucanleet.com/)", - "Benjamin Tan (https://d10.github.io/)", - "Blaine Bublitz (http://www.iceddev.com/)", - "Kit Cambridge (http://kitcambridge.be/)", - "Mathias Bynens (https://mathiasbynens.be/)" - ], - "bugs": "https://github.com/lodash/lodash/issues", - "repository": "lodash/lodash-compat", - "scripts": { "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\"" } -} diff --git a/lodash-modules-2.txt b/lodash-modules-2.txt deleted file mode 100644 index 449258a2265a05880b4af820303487457a0923d8..0000000000000000000000000000000000000000 --- a/lodash-modules-2.txt +++ /dev/null @@ -1,35 +0,0 @@ -take -takeright -takerightwhile -takewhile -template -templatesettings -throttle -times -toarray -_toiterable -_topath -toplainobject -transform -trim -trimleft -_trimmedleftindex -_trimmedrightindex -trimright -trunc -unescape -union -uniq -uniqueid -unzip -unzipwith -values -valuesin -where -without -words -wrap -xor -zip -zipobject -zipwith diff --git a/lodash-modules.txt b/lodash-modules.txt index 9c5c47b682278cf545b70622c1c3a25219782694..bab1ba3fe40e94ebe3aa8548d66de8f13bd1eb5f 100644 --- a/lodash-modules.txt +++ b/lodash-modules.txt @@ -1,88 +1,53 @@ add after -_arraycopy -_arrayeach -_arrayevery -_arrayfilter -_arraymap ary assign +assignin +assigninwith +assignwith at attempt -_baseassign -_baseat -_basecallback -_baseclone -_basecompareascending -_basecopy -_basecreate -_basedelay -_basedifference -_baseeach -_baseeachright -_basefilter -_basefind -_basefindindex -_baseflatten -_basefor -_baseforright -_basefunctions -_baseget -_baseindexof -_baseisequal -_baseismatch -_basematches -_basematchesproperty -_basepullat -_baserandom -_basereduce -_baseslice -_basesortby -_basesortbyorder -_basetostring -_baseuniq -_basevalues before -_binaryindex -_binaryindexby bind bindall -_bindcallback bindkey -_cacheindexof -callback camelcase capitalize +castarray ceil -_charsleftindex -_charsrightindex chunk +clamp clone clonedeep +clonedeepwith +clonewith compact +concat +cond +conforms +conformsto constant countby create -_createaggregator -_createassigner -_createcache -_createcompounder -_createpadding -_createwrapper curry curryright debounce deburr defaults defaultsdeep +defaultto defer delay difference +differenceby +differencewith +divide drop dropright droprightwhile dropwhile endswith +eq escape escaperegexp every @@ -94,10 +59,13 @@ findkey findlast findlastindex findlastkey -findwhere -first +flatmap +flatmapdeep +flatmapdepth flatten flattendeep +flattendepth +flip floor flow flowright @@ -107,50 +75,75 @@ forin forinright forown forownright +frompairs functions +functionsin get -_getnative groupby gt gte has +hasin +head identity includes -indexby indexof initial inrange intersection +intersectionby +intersectionwith invert +invertby invoke -_invokepath +invokemap isarguments isarray +isarraybuffer +isarraylike +isarraylikeobject isboolean +isbuffer isdate iselement isempty isequal +isequalwith iserror isfinite isfunction -_isiterateecall +isinteger +islength +ismap ismatch +ismatchwith isnan isnative +isnil isnull isnumber isobject +isobjectlike isplainobject isregexp +issafeinteger +isset isstring +issymbol istypedarray isundefined +isweakmap +isweakset +iteratee +join kebabcase +keyby keys keysin last lastindexof +lowercase +lowerfirst lt lte map @@ -159,64 +152,144 @@ mapvalues matches matchesproperty max +maxby +mean +meanby memoize merge +mergewith method methodof min +minby mixin -modargs +multiply negate noop now +nth +ntharg omit +omitby once +orderby +over +overargs +overevery +oversome pad -padleft -padright -pairs +padend +padstart parseint partial partialright partition pick -_pickbyarray -_pickbycallback -pluck +pickby property propertyof pull +pullall +pullallby +pullallwith pullat random range +rangeright rearg reduce reduceright -_reescape -_reevaluate _reinterpolate reject remove repeat -_replaceholders +replace rest -restparam result +reverse round sample +samplesize set +setwith shuffle size slice snakecase some sortby -sortbyall -sortbyorder sortedindex +sortedindexby +sortedindexof sortedlastindex +sortedlastindexby +sortedlastindexof +sorteduniq +sorteduniqby +split spread startcase startswith +stubarray +stubfalse +stubobject +stubstring +stubtrue +subtract sum -support +sumby +tail +take +takeright +takerightwhile +takewhile +template +templatesettings +throttle +times +toarray +tofinite +tointeger +tolength +tolower +tonumber +topairs +topairsin +topath +toplainobject +tosafeinteger +tostring +toupper +transform +trim +trimend +trimstart +truncate +unary +unescape +union +unionby +unionwith +uniq +uniqby +uniqueid +uniqwith +unset +unzip +unzipwith +update +updatewith +uppercase +upperfirst +values +valuesin +without +words +wrap +xor +xorby +xorwith +zip +zipobject +zipobjectdeep +zipwith diff --git a/lodash-node-package.json b/lodash-node-package.json deleted file mode 100644 index 05963dbbbcc2c889dc3488f35b44acb9ee8dd150..0000000000000000000000000000000000000000 --- a/lodash-node-package.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "lodash-node", - "version": "3.10.1", - "description": "lodash module bundles for Node.js/io.js.", - "homepage": "https://lodash.com/", - "icon": "https://lodash.com/icon.svg", - "license": "MIT", - "main": "modern/index.js", - "author": "John-David Dalton (http://allyoucanleet.com/)", - "contributors": [ - "John-David Dalton (http://allyoucanleet.com/)", - "Benjamin Tan (https://d10.github.io/)", - "Blaine Bublitz (http://www.iceddev.com/)", - "Kit Cambridge (http://kitcambridge.be/)", - "Mathias Bynens (https://mathiasbynens.be/)" - ], - "bugs": "https://github.com/lodash/lodash/issues", - "repository": "lodash/lodash-node", - "scripts": { "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\"" } -} diff --git a/lodash-package-4.17.15.json b/lodash-package-4.17.15.json new file mode 100644 index 0000000000000000000000000000000000000000..069397ea247a9c59c91317b6537ba44228b00803 --- /dev/null +++ b/lodash-package-4.17.15.json @@ -0,0 +1,17 @@ +{ + "name": "lodash", + "version": "4.17.15", + "description": "Lodash modular utilities.", + "keywords": "modules, stdlib, util", + "homepage": "https://lodash.com/", + "repository": "lodash/lodash", + "icon": "https://lodash.com/icon.svg", + "license": "MIT", + "main": "lodash.js", + "author": "John-David Dalton ", + "contributors": [ + "John-David Dalton ", + "Mathias Bynens " + ], + "scripts": { "test": "echo \"See https://travis-ci.org/lodash-archive/lodash-cli for testing details.\"" } +} diff --git a/lodash-package.json b/lodash-package.json deleted file mode 100644 index b9cb65b29ea523d1ac448a5a55f9a3865a3018d2..0000000000000000000000000000000000000000 --- a/lodash-package.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "lodash", - "version": "3.10.1", - "description": "The modern build of lodash modular utilities.", - "homepage": "https://lodash.com/", - "icon": "https://lodash.com/icon.svg", - "license": "MIT", - "main": "index.js", - "keywords": "modules, stdlib, util", - "author": "John-David Dalton (http://allyoucanleet.com/)", - "contributors": [ - "John-David Dalton (http://allyoucanleet.com/)", - "Benjamin Tan (https://d10.github.io/)", - "Blaine Bublitz (http://www.iceddev.com/)", - "Kit Cambridge (http://kitcambridge.be/)", - "Mathias Bynens (https://mathiasbynens.be/)" - ], - "repository": "lodash/lodash", - "scripts": { "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\"" } -} diff --git a/lodash.spec b/lodash.spec index b21792b37d867f8f10fd927d972ad702bb717733..ba82287e15ed820daac437221e87c2fa42a474dc 100644 --- a/lodash.spec +++ b/lodash.spec @@ -1,17 +1,15 @@ %{?nodejs_find_provides_and_requires} +%global cli_version 4.17.5 Name: lodash -Version: 3.10.1 +Version: 4.17.15 Release: 1 Summary: A JavaScript utility library License: MIT URL: https://lodash.com/ Source0: https://github.com/lodash/lodash/archive/%{version}/%{name}-%{version}.tar.gz -Source1: https://github.com/lodash/lodash-cli/archive/%{version}/%{name}-cli-%{version}.tar.gz -Source2: https://raw.githubusercontent.com/lodash/lodash/%{version}-npm/package.json#/%{name}-package.json -Source3: https://raw.githubusercontent.com/lodash/lodash-compat/%{version}-npm/package.json#/%{name}-compat-package.json -Source4: https://raw.githubusercontent.com/lodash/lodash-node/%{version}/package.json#/%{name}-node-package.json -Source5: %{name}-modules.txt -Source6: %{name}-modules-2.txt +Source1: https://github.com/lodash/lodash-cli/archive/%{cli_version}/%{name}-cli-%{cli_version}.tar.gz +Source2: https://raw.githubusercontent.com/lodash/lodash/%{version}-npm/package.json#/%{name}-package-%{version}.json +Source3: %{name}-modules.txt BuildArch: noarch BuildRequires: nodejs-packaging >= 7-5 web-assets-devel BuildRequires: npm(closure-compiler) npm(glob) npm(uglify-js) >= 2.4.13 npm(semver) @@ -46,6 +44,8 @@ Obsoletes: nodejs-lodash-setbinddata < 2.4.1-5 Obsoletes: nodejs-lodash-shimisplainobject < 2.4.1-5 Obsoletes: nodejs-lodash-shimkeys < 2.4.1-5 Obsoletes: nodejs-lodash-unescapehtmlchar < 2.4.1-5 +Obsoletes: nodejs-lodash-compat < 3.10.1-14 +Obsoletes: nodejs-lodash-node < 3.10.1-14 %description A JavaScript utility library delivering consistency, modularity, performance, & extras. @@ -62,21 +62,11 @@ Requires: %{name} = %{version}-%{release} %description -n nodejs-lodash The modern build of lodash exported as Node.js/io.js modules. -%package -n nodejs-lodash-compat -Summary: The compatibility build of lodash modular utilities -Requires: %{name} = %{version}-%{release} -%description -n nodejs-lodash-compat -The compatibility build of lodash exported as Node.js/io.js modules. - -%package -n nodejs-lodash-node -Summary: lodash module bundles for Node.js/io.js -Requires: %{name} = %{version}-%{release} -%description -n nodejs-lodash-node -The compatibility & modern builds of lodash exported as Node.js/io.js modules. - %package -n nodejs-lodash-cli Summary: The lodash command-line interface Requires: %{name} = %{version}-%{release} +Version: %{cli_version} +Release: %{version}.%{release} %description -n nodejs-lodash-cli The lodash command-line interface for creating custom builds & precompiling templates @@ -91,33 +81,18 @@ The modern build of lodash's _.@@FUNC@@ as a module. %%license npm/lodash.@@FUNC@@/LICENSE %{nodejs_sitelib}/lodash.@@FUNC@@ ]] -for func in io.open(rpm.expand("%SOURCE5")):lines() do - pkg = string.gsub(func, "_", "") - print(rpm.expand(string.gsub(string.gsub(template, "@@FUNC@@", func), "@@PKG@@", pkg)).."\n") -end} -%{lua: -template = [[ -%%package -n nodejs-lodash-@@PKG@@ -Summary: The modern build of lodash's _.@@FUNC@@ as a module -%%description -n nodejs-lodash-@@PKG@@ -The modern build of lodash's _.@@FUNC@@ as a module. -%%files -n nodejs-lodash-@@PKG@@ -%%doc npm/lodash.@@FUNC@@/README.md -%%license npm/lodash.@@FUNC@@/LICENSE -%{nodejs_sitelib}/lodash.@@FUNC@@ -]] -for func in io.open(rpm.expand("%SOURCE6")):lines() do +for func in io.open(rpm.expand("%SOURCE3")):lines() do pkg = string.gsub(func, "_", "") print(rpm.expand(string.gsub(string.gsub(template, "@@FUNC@@", func), "@@PKG@@", pkg)).."\n") end} %prep %setup -q -T -b 0 -a 1 -rm -rf lodash.js lodash.min.js node_modules vendor +rm -rf node_modules vendor pushd %{name}-cli-%{version} %nodejs_fixdep closure-compiler "^0.2.6" %nodejs_fixdep glob "^6.0.3" - %nodejs_fixdep -r lodash-compat + %nodejs_fixdep -r lodash %nodejs_fixdep semver "^5.1.0" %nodejs_fixdep uglify-js "^2.4.13" rm -rf node_modules @@ -128,38 +103,22 @@ mv %{name}-cli-%{version} node_modules/lodash-cli %build pushd node_modules/lodash-cli %nodejs_symlink_deps --build - ln -sf ../../.. node_modules/lodash-compat + ln -sf ../../.. node_modules/lodash popd -%{__nodejs} ./node_modules/lodash-cli/bin/lodash modern -o ./lodash.js +%{__nodejs} ./node_modules/lodash-cli/bin/lodash -o ./dist/lodash.js mkdir nodejs-lodash pushd nodejs-lodash - %{__nodejs} ../node_modules/lodash-cli/bin/lodash modularize modern exports=node -o ./ - %{__nodejs} ../node_modules/lodash-cli/bin/lodash modern -d -o ./index.js + %{__nodejs} ../node_modules/lodash-cli/bin/lodash modularize exports=node -o ./ + %{__nodejs} ../node_modules/lodash-cli/bin/lodash -d -o ./lodash.js popd -mkdir nodejs-lodash-compat -pushd nodejs-lodash-compat - %{__nodejs} ../node_modules/lodash-cli/bin/lodash modularize compat exports=node -o ./ - %{__nodejs} ../node_modules/lodash-cli/bin/lodash compat -d -o ./index.js -popd -mkdir nodejs-lodash-node -pushd nodejs-lodash-node - %{__nodejs} ../node_modules/lodash-cli/bin/lodash modularize compat exports=node -o ./compat - %{__nodejs} ../node_modules/lodash-cli/bin/lodash compat exports=node -d -o ./compat/index.js - %{__nodejs} ../node_modules/lodash-cli/bin/lodash modularize modern exports=node -o ./modern - %{__nodejs} ../node_modules/lodash-cli/bin/lodash modern exports=node -d -o ./modern/index.js -popd -%{__nodejs} ./node_modules/lodash-cli/bin/lodash modularize modern exports=npm -d -o ./npm +%{__nodejs} ./node_modules/lodash-cli/bin/lodash modularize exports=npm -d -o ./npm %install mkdir -p %{buildroot}%{nodejs_sitelib} mkdir -p %{buildroot}%{_jsdir}/lodash -cp -p lodash.js lodash.min.js %{buildroot}%{_jsdir}/lodash +cp -p dist/lodash.js dist/lodash.min.js %{buildroot}%{_jsdir}/lodash cp -pr nodejs-lodash %{buildroot}%{nodejs_sitelib}/lodash cp -pr %{SOURCE2} %{buildroot}%{nodejs_sitelib}/lodash/package.json -cp -pr nodejs-lodash-compat %{buildroot}%{nodejs_sitelib}/lodash-compat -cp -pr %{SOURCE3} %{buildroot}%{nodejs_sitelib}/lodash-compat/package.json -cp -pr nodejs-lodash-node %{buildroot}%{nodejs_sitelib}/lodash-node -cp -pr %{SOURCE4} %{buildroot}%{nodejs_sitelib}/lodash-node/package.json mkdir -p %{buildroot}%{_datadir}/nodejs-lodash-cli cp -pr node_modules/lodash-cli/template %{buildroot}%{_datadir}/nodejs-lodash-cli mkdir -p %{buildroot}%{nodejs_sitelib}/lodash-cli @@ -186,7 +145,7 @@ popd %files %{!?_licensedir:%global license %doc} -%doc README.md CONTRIBUTING.md +%doc README.md %license LICENSE %files -n js-lodash @@ -195,17 +154,15 @@ popd %files -n nodejs-lodash %{nodejs_sitelib}/lodash -%files -n nodejs-lodash-compat -%{nodejs_sitelib}/lodash-compat - -%files -n nodejs-lodash-node -%{nodejs_sitelib}/lodash-node - %files -n nodejs-lodash-cli %{nodejs_sitelib}/lodash-cli %{_datadir}/nodejs-lodash-cli %{_bindir}/lodash %changelog +* Mon Feb 21 2022 yaoxin - 4.17.15-1 +- Upgrade lodash to 4.17.15 +- Fix cves: CVE-2018-16487 CVE-2018-3721 CVE-2019-1010266 CVE-2019-10744 + * Fri Aug 21 2020 Jeffery.Gao - 3.10.1-1 - Package init