Skip to content

Commit 11653a1

Browse files
authored
Upgrade: uglify-js version to 3.19.3 (#12981)
1 parent 7ffacec commit 11653a1

4 files changed

Lines changed: 131 additions & 61 deletions

File tree

SPECS-EXTENDED/uglify-js/uglify-js-esfuzz.patch

Lines changed: 0 additions & 23 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"uglify-js-2.8.22.tar.gz": "b9db9cf85240acdedac766bc53b3400c683205069bf8f77aded4efc7854da180"
3+
"uglify-js-3.19.3.tgz": "744d9f31fe424514dd44728daa3e562a703fca53b6627ddeb655f77c2aa88ab4"
44
}
55
}

SPECS-EXTENDED/uglify-js/uglify-js.spec

Lines changed: 128 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,35 @@
44
%bcond_with tests
55

66
Name: uglify-js
7-
Version: 2.8.22
8-
Release: 10%{?dist}
7+
Version: 3.19.3
8+
Release: 11%{?dist}
99
Summary: JavaScript parser, mangler/compressor and beautifier toolkit
10-
License: BSD
10+
License: BSD-2-Clause
1111
Vendor: Microsoft Corporation
1212
Distribution: Azure Linux
13-
URL: https://github.com/mishoo/UglifyJS2
14-
Source0: https://github.com/mishoo/UglifyJS2/archive/v%{version}/uglify-js-%{version}.tar.gz
15-
Patch0: uglify-js-esfuzz.patch
13+
URL: https://github.com/mishoo/UglifyJS
14+
Source0: https://registry.npmjs.org/%{name}/-/%{name}-%{version}.tgz
1615

1716
BuildArch: noarch
1817
ExclusiveArch: %{nodejs_arches} noarch
1918

2019
Provides: nodejs-uglify-js = %{version}-%{release}
2120

21+
Provides: uglify-js3 = %{version}-%{release}
22+
Obsoletes: uglify-js3 < 3.14.5-2
23+
24+
Provides: nodejs-uglify-js3 = %{version}-%{release}
25+
26+
BuildRequires: nodejs
2227
BuildRequires: nodejs-packaging
2328
BuildRequires: web-assets-devel
2429

2530
%if %{with tests}
2631
BuildRequires: npm(acorn)
27-
BuildRequires: npm(async)
28-
BuildRequires: npm(mocha)
29-
BuildRequires: npm(optimist)
30-
BuildRequires: npm(source-map)
32+
BuildRequires: npm(semver)
3133
%endif
3234

33-
Requires: js-uglify = %{version}-%{release}
35+
Requires: js-uglify = %{version}-%{release}
3436

3537
%description
3638
JavaScript parser, mangler/compressor and beautifier toolkit.
@@ -39,12 +41,15 @@ This package ships the uglifyjs command-line tool and a library suitable for
3941
use within Node.js.
4042

4143
%package -n js-uglify
42-
Summary: JavaScript parser, mangler/compressor and beautifier toolkit - core library
44+
Summary: JavaScript parser, mangler/compressor and beautifier toolkit - core library
45+
46+
Provides: js-uglify3 = %{version}-%{release}
47+
Obsoletes: js-uglify3 < 3.14.5-2
4348

44-
Obsoletes: uglify-js-common < 2.2.5-4
45-
Provides: uglify-js-common = %{version}-%{release}
46-
Requires: web-assets-filesystem
49+
Provides: uglify-js-common = %{version}-%{release}
50+
Obsoletes: uglify-js-common < 2.2.5-4
4751

52+
Requires: web-assets-filesystem
4853

4954
%description -n js-uglify
5055
JavaScript parser, mangler/compressor and beautifier toolkit.
@@ -53,40 +58,40 @@ This package ships a JavaScript library suitable for use by any JavaScript
5358
runtime.
5459

5560
%prep
56-
%autosetup -p 1 -n UglifyJS2-%{version}
57-
58-
%nodejs_fixdep async "^1.5.0"
59-
%nodejs_fixdep yargs "^3.2.1"
61+
%autosetup -n package
6062

63+
chmod 0755 bin/uglifyjs
6164

6265
%build
6366
#nothing to do
6467

6568

6669
%install
67-
rm -rf %buildroot
68-
69-
mkdir -p %{buildroot}%{_jsdir}/%{name}-2
70-
cp -pr lib/* %{buildroot}%{_jsdir}/%{name}-2
71-
ln -sf %{name}-2 %{buildroot}%{_jsdir}/%{name}
70+
mkdir -p %{buildroot}%{_jsdir}/%{name}-3
71+
cp -pr lib/* %{buildroot}%{_jsdir}/%{name}-3
72+
ln -s %{name}-3 %{buildroot}%{_jsdir}/%{name}
7273

7374
#compat symlink
7475
mkdir -p %{buildroot}%{_datadir}
75-
ln -sf javascript/%{name} %{buildroot}%{_datadir}/%{name}
76+
ln -rs %{buildroot}%{_jsdir}/%{name} %{buildroot}%{_datadir}/%{name}
7677

77-
mkdir -p %{buildroot}%{nodejs_sitelib}/uglify-js@2
78-
cp -pr bin tools package.json %{buildroot}%{nodejs_sitelib}/uglify-js@2
79-
ln -sf %{_jsdir}/%{name} %{buildroot}%{nodejs_sitelib}/uglify-js@2/lib
78+
mkdir -p %{buildroot}%{nodejs_sitelib}/uglify-js@3
79+
cp -pr bin tools package.json %{buildroot}%{nodejs_sitelib}/uglify-js@3
80+
ln -rs %{buildroot}%{_jsdir}/%{name}-3 \
81+
%{buildroot}%{nodejs_sitelib}/uglify-js@3/lib
8082
# Fix for rpmlint.
8183
sed -i -e 's|^#! */usr/bin/env node|#!/usr/bin/node|' \
82-
%{buildroot}%{nodejs_sitelib}/uglify-js@2/bin/*
84+
%{buildroot}%{nodejs_sitelib}/uglify-js@3/bin/uglifyjs
85+
chmod 755 %{buildroot}%{nodejs_sitelib}/uglify-js@3/bin/uglifyjs
8386

8487
mkdir -p %{buildroot}%{_bindir}
85-
ln -sf ../lib/node_modules/uglify-js@2/bin/uglifyjs %{buildroot}%{_bindir}/uglifyjs
88+
ln -rs %{buildroot}%{nodejs_sitelib}/uglify-js@3/bin/uglifyjs \
89+
%{buildroot}%{_bindir}/uglifyjs-3
90+
ln -s uglifyjs-3 %{buildroot}%{_bindir}/uglifyjs
8691

8792
%nodejs_symlink_deps
8893

89-
ln -sf uglify-js@2 %{buildroot}%{nodejs_sitelib}/uglify-js
94+
ln -s uglify-js@3 %{buildroot}%{nodejs_sitelib}/uglify-js
9095

9196

9297
%check
@@ -117,22 +122,110 @@ end
117122

118123
%files
119124
%{nodejs_sitelib}/uglify-js
120-
%{nodejs_sitelib}/uglify-js@2
125+
%{nodejs_sitelib}/uglify-js@3
126+
%{_bindir}/uglifyjs-3
121127
%{_bindir}/uglifyjs
122128

123129

124130
%files -n js-uglify
125-
%{_jsdir}/%{name}-2
131+
%{_jsdir}/%{name}-3
126132
%{_jsdir}/%{name}
127133
%{_datadir}/%{name}
128134
%doc README.md
129135
%license LICENSE
130136

131137

132138
%changelog
133-
* Wed Jan 13 2021 Joe Schmitt <joschmit@microsoft.com> - 2.8.22-10
134-
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
139+
* Mon Mar 17 2025 Archana Shettigar <v-shettigara@microsoft.com> - 3.19.3-2
140+
- Initial Azure Linux import from Fedora 41 (license: MIT).
135141
- Turn off tests
142+
- License verified
143+
144+
* Tue Sep 10 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.19.3-1
145+
- Update to 3.19.3
146+
147+
* Mon Aug 12 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.19.2-1
148+
- Update to 3.19.2
149+
150+
* Sun Aug 04 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.19.1-1
151+
- Update to 3.19.1
152+
153+
* Thu Jul 18 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.19.0-1
154+
- Update to 3.19.0
155+
156+
* Mon Jun 10 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.18.0-1
157+
- Update to 3.18.0
158+
159+
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.17.4-3
160+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
161+
162+
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.17.4-2
163+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
164+
165+
* Wed Mar 15 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.17.4-1
166+
- Update to 3.17.4
167+
- Rebuilt for updated rpm macros (Fedora 37+)
168+
169+
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.17.1-2
170+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
171+
172+
* Tue Sep 20 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.17.1-1
173+
- Update to 3.17.1
174+
175+
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.16.1-2
176+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
177+
178+
* Fri Jun 17 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.16.1-1
179+
- Update to 3.16.1
180+
181+
* Wed Apr 20 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.15.4-1
182+
- Update to 3.15.4
183+
184+
* Sun Mar 20 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.15.3-1
185+
- Update to 3.15.3
186+
187+
* Mon Feb 28 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.15.2-1
188+
- Update to 3.15.2
189+
190+
* Mon Feb 07 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.15.1-1
191+
- Update to 3.15.1
192+
193+
* Wed Jan 26 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.15.0-1
194+
- Update to 3.15.0
195+
196+
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.14.5-3
197+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
198+
199+
* Wed Jan 19 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.14.5-2
200+
- Update uglify-js for EPEL 7 to version 3
201+
- Provide/Obsolete uglify-js3
202+
203+
* Thu Dec 16 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.14.5-1
204+
- Update to 3.14.5
205+
206+
* Wed Dec 01 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.14.4-1
207+
- Update to 3.14.4
208+
209+
* Tue Nov 02 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.14.3-1
210+
- Update to 3.14.3
211+
212+
* Thu Oct 14 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.14.2-1
213+
- Update to 3.14.2
214+
215+
* Fri Aug 13 2021 Sérgio Basto <sergio@serjux.com> - 3.14.1-1
216+
- Update to 3.14.1
217+
218+
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.4-3
219+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
220+
221+
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.4-2
222+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
223+
224+
* Fri Sep 18 2020 Troy Dawson <tdawson@redhat.com> - 3.10.4-1
225+
- Update to 3.10.4
226+
227+
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.22-10
228+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
136229

137230
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.22-9
138231
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29336,8 +29336,8 @@
2933629336
"type": "other",
2933729337
"other": {
2933829338
"name": "uglify-js",
29339-
"version": "2.8.22",
29340-
"downloadUrl": "https://github.com/mishoo/UglifyJS2/archive/v2.8.22/uglify-js-2.8.22.tar.gz"
29339+
"version": "3.19.3",
29340+
"downloadUrl": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz"
2934129341
}
2934229342
}
2934329343
},

0 commit comments

Comments
 (0)