Skip to content

Commit 78ae38d

Browse files
authored
Merge pull request #3782 from chocolatey/hotfix/1.4.4
(release) 1.4.4
2 parents 5ba61fb + c080b70 commit 78ae38d

File tree

5 files changed

+192
-80
lines changed

5 files changed

+192
-80
lines changed

docs/legal/CREDITS.md

Lines changed: 97 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
- [Contributors](#contributors)
77
- [Third Party Licenses - Development](#third-party-licenses---development)
88
- [Third Party Licenses - Runtime](#third-party-licenses---runtime)
9-
- [7-Zip @ 24.09](#7-zip--2409)
9+
- [7-Zip @ 25.01](#7-zip--2501)
1010
- [AlphaFS @ 2.1.3](#alphafs--213)
1111
- [Checksum @ 0.2.0](#checksum--020)
1212
- [log4net @ 2.0.12](#log4net--2012)
@@ -70,7 +70,7 @@ We would like to credit other super sweet tools/frameworks that aid in the devel
7070
Chocolatey CLI (choco) uses a number of 3rd-party components.
7171
Their details are below.
7272

73-
- [7-Zip @ 24.09](#7-zip--2409)
73+
- [7-Zip @ 25.01](#7-zip--2501)
7474
- [AlphaFS @ 2.1.3](#alphafs--213)
7575
- [Checksum @ 0.2.0](#checksum--020)
7676
- [log4net @ 2.0.12](#log4net--2012)
@@ -81,7 +81,7 @@ Their details are below.
8181
- [Shim Generator (shimgen) @ 1.0.0](#shim-generator-shimgen--100)
8282
- [SimpleInjector @ 2.8.3](#simpleinjector--283)
8383

84-
### 7-Zip @ 24.09
84+
### 7-Zip @ 25.01
8585

8686
Chocolatey uses [7-Zip](http://www.7-zip.org/) for uncompressing archives.
8787
[License terms](http://www.7-zip.org/license.txt):
@@ -92,15 +92,16 @@ Chocolatey uses [7-Zip](http://www.7-zip.org/) for uncompressing archives.
9292
License for use and distribution
9393
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
9494
95-
7-Zip Copyright (C) 1999-2023 Igor Pavlov.
95+
7-Zip Copyright (C) 1999-2025 Igor Pavlov.
9696
9797
The licenses for files are:
9898
99-
1) 7z.dll:
99+
- 7z.dll:
100100
- The "GNU LGPL" as main license for most of the code
101101
- The "GNU LGPL" with "unRAR license restriction" for some code
102102
- The "BSD 3-clause License" for some code
103-
2) All other files: the "GNU LGPL".
103+
- The "BSD 2-clause License" for some code
104+
- All other files: the "GNU LGPL".
104105
105106
Redistributions in binary form must reproduce related license information from this file.
106107
@@ -109,8 +110,8 @@ Chocolatey uses [7-Zip](http://www.7-zip.org/) for uncompressing archives.
109110
organization. You don't need to register or pay for 7-Zip.
110111
111112
112-
GNU LGPL information
113-
--------------------
113+
GNU LGPL information
114+
--------------------
114115
115116
This library is free software; you can redistribute it and/or
116117
modify it under the terms of the GNU Lesser General Public
@@ -128,55 +129,110 @@ Chocolatey uses [7-Zip](http://www.7-zip.org/) for uncompressing archives.
128129
129130
130131
131-
BSD 3-clause License
132-
--------------------
132+
BSD 3-clause License in 7-Zip code
133+
----------------------------------
133134
134-
The "BSD 3-clause License" is used for the code in 7z.dll that implements LZFSE data decompression.
135-
That code was derived from the code in the "LZFSE compression library" developed by Apple Inc,
136-
that also uses the "BSD 3-clause License":
135+
The "BSD 3-clause License" is used for the following code in 7z.dll
136+
1) LZFSE data decompression.
137+
That code was derived from the code in the "LZFSE compression library" developed by Apple Inc,
138+
that also uses the "BSD 3-clause License".
139+
2) ZSTD data decompression.
140+
that code was developed using original zstd decoder code as reference code.
141+
The original zstd decoder code was developed by Facebook Inc,
142+
that also uses the "BSD 3-clause License".
137143
138-
----
139-
Copyright (c) 2015-2016, Apple Inc. All rights reserved.
144+
Copyright (c) 2015-2016, Apple Inc. All rights reserved.
145+
Copyright (c) Facebook, Inc. All rights reserved.
146+
Copyright (c) 2023-2025 Igor Pavlov.
140147
141-
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
148+
Text of the "BSD 3-clause License"
149+
----------------------------------
142150
143-
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
151+
Redistribution and use in source and binary forms, with or without modification,
152+
are permitted provided that the following conditions are met:
144153
145-
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer
146-
in the documentation and/or other materials provided with the distribution.
154+
1. Redistributions of source code must retain the above copyright notice, this
155+
list of conditions and the following disclaimer.
147156
148-
3. Neither the name of the copyright holder(s) nor the names of any contributors may be used to endorse or promote products derived
149-
from this software without specific prior written permission.
157+
2. Redistributions in binary form must reproduce the above copyright notice,
158+
this list of conditions and the following disclaimer in the documentation
159+
and/or other materials provided with the distribution.
150160
151-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
152-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
153-
COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
154-
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
155-
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
156-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
157-
----
161+
3. Neither the name of the copyright holder nor the names of its contributors may
162+
be used to endorse or promote products derived from this software without
163+
specific prior written permission.
158164
165+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
166+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
167+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
168+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
169+
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
170+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
171+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
172+
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
173+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
174+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
159175
176+
---
160177
161178
162-
unRAR license restriction
163-
-------------------------
164179
165-
The decompression engine for RAR archives was developed using source
166-
code of unRAR program.
167-
All copyrights to original unRAR code are owned by Alexander Roshal.
168180
169-
The license for original unRAR code has the following restriction:
181+
BSD 2-clause License in 7-Zip code
182+
----------------------------------
170183
171-
The unRAR sources cannot be used to re-create the RAR compression algorithm,
172-
which is proprietary. Distribution of modified unRAR sources in separate form
173-
or as a part of other software is permitted, provided that it is clearly
174-
stated in the documentation and source comments that the code may
175-
not be used to develop a RAR (WinRAR) compatible archiver.
184+
The "BSD 2-clause License" is used for the XXH64 code in 7-Zip.
176185
186+
XXH64 code in 7-Zip was derived from the original XXH64 code developed by Yann Collet.
177187
178-
--
179-
Igor Pavlov
188+
Copyright (c) 2012-2021 Yann Collet.
189+
Copyright (c) 2023-2025 Igor Pavlov.
190+
191+
Text of the "BSD 2-clause License"
192+
----------------------------------
193+
194+
Redistribution and use in source and binary forms, with or without modification,
195+
are permitted provided that the following conditions are met:
196+
197+
1. Redistributions of source code must retain the above copyright notice, this
198+
list of conditions and the following disclaimer.
199+
200+
2. Redistributions in binary form must reproduce the above copyright notice,
201+
this list of conditions and the following disclaimer in the documentation
202+
and/or other materials provided with the distribution.
203+
204+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
205+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
206+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
207+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
208+
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
209+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
210+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
211+
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
212+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
213+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
214+
215+
---
216+
217+
218+
219+
220+
unRAR license restriction
221+
-------------------------
222+
223+
The decompression engine for RAR archives was developed using source
224+
code of unRAR program.
225+
All copyrights to original unRAR code are owned by Alexander Roshal.
226+
227+
The license for original unRAR code has the following restriction:
228+
229+
The unRAR sources cannot be used to re-create the RAR compression algorithm,
230+
which is proprietary. Distribution of modified unRAR sources in separate form
231+
or as a part of other software is permitted, provided that it is clearly
232+
stated in the documentation and source comments that the code may
233+
not be used to develop a RAR (WinRAR) compatible archiver.
234+
235+
--
180236
```
181237

182238
### AlphaFS @ 2.1.3
1.5 KB
Binary file not shown.
7.5 KB
Binary file not shown.

src/chocolatey.resources/tools/7zip.license.txt

Lines changed: 94 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@
33
License for use and distribution
44
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
55

6-
7-Zip Copyright (C) 1999-2023 Igor Pavlov.
6+
7-Zip Copyright (C) 1999-2025 Igor Pavlov.
77

88
The licenses for files are:
99

10-
1) 7z.dll:
10+
- 7z.dll:
1111
- The "GNU LGPL" as main license for most of the code
1212
- The "GNU LGPL" with "unRAR license restriction" for some code
1313
- The "BSD 3-clause License" for some code
14-
2) All other files: the "GNU LGPL".
14+
- The "BSD 2-clause License" for some code
15+
- All other files: the "GNU LGPL".
1516

1617
Redistributions in binary form must reproduce related license information from this file.
1718

@@ -20,8 +21,8 @@
2021
organization. You don't need to register or pay for 7-Zip.
2122

2223

23-
GNU LGPL information
24-
--------------------
24+
GNU LGPL information
25+
--------------------
2526

2627
This library is free software; you can redistribute it and/or
2728
modify it under the terms of the GNU Lesser General Public
@@ -39,52 +40,107 @@
3940

4041

4142

42-
BSD 3-clause License
43-
--------------------
43+
BSD 3-clause License in 7-Zip code
44+
----------------------------------
4445

45-
The "BSD 3-clause License" is used for the code in 7z.dll that implements LZFSE data decompression.
46-
That code was derived from the code in the "LZFSE compression library" developed by Apple Inc,
47-
that also uses the "BSD 3-clause License":
46+
The "BSD 3-clause License" is used for the following code in 7z.dll
47+
1) LZFSE data decompression.
48+
That code was derived from the code in the "LZFSE compression library" developed by Apple Inc,
49+
that also uses the "BSD 3-clause License".
50+
2) ZSTD data decompression.
51+
that code was developed using original zstd decoder code as reference code.
52+
The original zstd decoder code was developed by Facebook Inc,
53+
that also uses the "BSD 3-clause License".
4854

49-
----
50-
Copyright (c) 2015-2016, Apple Inc. All rights reserved.
55+
Copyright (c) 2015-2016, Apple Inc. All rights reserved.
56+
Copyright (c) Facebook, Inc. All rights reserved.
57+
Copyright (c) 2023-2025 Igor Pavlov.
5158

52-
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
59+
Text of the "BSD 3-clause License"
60+
----------------------------------
5361

54-
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
62+
Redistribution and use in source and binary forms, with or without modification,
63+
are permitted provided that the following conditions are met:
5564

56-
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer
57-
in the documentation and/or other materials provided with the distribution.
65+
1. Redistributions of source code must retain the above copyright notice, this
66+
list of conditions and the following disclaimer.
5867

59-
3. Neither the name of the copyright holder(s) nor the names of any contributors may be used to endorse or promote products derived
60-
from this software without specific prior written permission.
68+
2. Redistributions in binary form must reproduce the above copyright notice,
69+
this list of conditions and the following disclaimer in the documentation
70+
and/or other materials provided with the distribution.
6171

62-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
63-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
64-
COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
65-
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
66-
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
67-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
68-
----
72+
3. Neither the name of the copyright holder nor the names of its contributors may
73+
be used to endorse or promote products derived from this software without
74+
specific prior written permission.
6975

76+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
77+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
78+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
79+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
80+
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
81+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
82+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
83+
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
84+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
85+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
7086

87+
---
7188

7289

73-
unRAR license restriction
74-
-------------------------
7590

76-
The decompression engine for RAR archives was developed using source
77-
code of unRAR program.
78-
All copyrights to original unRAR code are owned by Alexander Roshal.
7991

80-
The license for original unRAR code has the following restriction:
92+
BSD 2-clause License in 7-Zip code
93+
----------------------------------
8194

82-
The unRAR sources cannot be used to re-create the RAR compression algorithm,
83-
which is proprietary. Distribution of modified unRAR sources in separate form
84-
or as a part of other software is permitted, provided that it is clearly
85-
stated in the documentation and source comments that the code may
86-
not be used to develop a RAR (WinRAR) compatible archiver.
95+
The "BSD 2-clause License" is used for the XXH64 code in 7-Zip.
8796

97+
XXH64 code in 7-Zip was derived from the original XXH64 code developed by Yann Collet.
8898

89-
--
90-
Igor Pavlov
99+
Copyright (c) 2012-2021 Yann Collet.
100+
Copyright (c) 2023-2025 Igor Pavlov.
101+
102+
Text of the "BSD 2-clause License"
103+
----------------------------------
104+
105+
Redistribution and use in source and binary forms, with or without modification,
106+
are permitted provided that the following conditions are met:
107+
108+
1. Redistributions of source code must retain the above copyright notice, this
109+
list of conditions and the following disclaimer.
110+
111+
2. Redistributions in binary form must reproduce the above copyright notice,
112+
this list of conditions and the following disclaimer in the documentation
113+
and/or other materials provided with the distribution.
114+
115+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
116+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
117+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
118+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
119+
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
120+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
121+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
122+
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
123+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
124+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
125+
126+
---
127+
128+
129+
130+
131+
unRAR license restriction
132+
-------------------------
133+
134+
The decompression engine for RAR archives was developed using source
135+
code of unRAR program.
136+
All copyrights to original unRAR code are owned by Alexander Roshal.
137+
138+
The license for original unRAR code has the following restriction:
139+
140+
The unRAR sources cannot be used to re-create the RAR compression algorithm,
141+
which is proprietary. Distribution of modified unRAR sources in separate form
142+
or as a part of other software is permitted, provided that it is clearly
143+
stated in the documentation and source comments that the code may
144+
not be used to develop a RAR (WinRAR) compatible archiver.
145+
146+
--

tests/pester-tests/BundledApplications.Tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Describe 'Ensuring correct version of <Name> is installed' -Tag BundledApplications -ForEach @(
44
@{ Name = 'shimgen' ; Version = '1.0.0' ; ChocolateyVersion = '1.0.0' ; IsSigned = $true }
5-
@{ Name = '7z' ; Version = '24.09' ; ChocolateyVersion = '1.1.0' ; IsSigned = $false }
5+
@{ Name = '7z' ; Version = '25.01' ; ChocolateyVersion = '1.1.0' ; IsSigned = $false }
66
) -Skip:(-not (Test-ChocolateyVersionEqualOrHigherThan "1.0.0")) {
77
Context '<Name> is correctly installed' -Skip:(-not (Test-ChocolateyVersionEqualOrHigherThan $ChocolateyVersion)) {
88
BeforeAll {

0 commit comments

Comments
 (0)