Skip to content

Commit a469453

Browse files
committed
Update external library dependencies
Bzip to 1.0.8, OpenSSL to 1.1.1v, Sqlite3 to 3.43.0.0, zlib to 1.2.13
1 parent b59ed8c commit a469453

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

Mac/BuildScript/build-installer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,8 +331,8 @@ def library_recipes():
331331
if getDeptargetTuple() < (10, 5):
332332
result.extend([
333333
dict(
334-
name="Bzip2 1.0.6",
335-
url="http://bzip.org/1.0.6/bzip2-1.0.6.tar.gz",
334+
name="Bzip2 1.0.8",
335+
url="https://camel-sources.s3.amazonaws.com/src/vendor-sources/python-core/bzip2-1.0.8-pysvn.tar.gz",
336336
checksum='00b516f4704d4a7cb50a1d97e6e8e15b',
337337
configure=None,
338338
install='make install CC=%s CXX=%s, PREFIX=%s/usr/local/ CFLAGS="-arch %s"'%(

PCbuild/_bz2.vcxproj.filters

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<Filter Include="Source Files">
55
<UniqueIdentifier>{f53a859d-dad2-4d5b-ae41-f28d8b571f5a}</UniqueIdentifier>
66
</Filter>
7-
<Filter Include="bzip2 1.0.6 Header Files">
7+
<Filter Include="bzip2 1.0.8 Header Files">
88
<UniqueIdentifier>{7e0bed05-ae33-43b7-8797-656455bbb7f3}</UniqueIdentifier>
99
</Filter>
10-
<Filter Include="bzip2 1.0.6 Source Files">
10+
<Filter Include="bzip2 1.0.8 Source Files">
1111
<UniqueIdentifier>{ed574b89-6983-4cdf-9f98-fe7048d9e89c}</UniqueIdentifier>
1212
</Filter>
1313
</ItemGroup>
@@ -16,33 +16,33 @@
1616
<Filter>Source Files</Filter>
1717
</ClCompile>
1818
<ClCompile Include="$(bz2Dir)\blocksort.c">
19-
<Filter>bzip2 1.0.6 Source Files</Filter>
19+
<Filter>bzip2 1.0.8 Source Files</Filter>
2020
</ClCompile>
2121
<ClCompile Include="$(bz2Dir)\bzlib.c">
22-
<Filter>bzip2 1.0.6 Source Files</Filter>
22+
<Filter>bzip2 1.0.8 Source Files</Filter>
2323
</ClCompile>
2424
<ClCompile Include="$(bz2Dir)\compress.c">
25-
<Filter>bzip2 1.0.6 Source Files</Filter>
25+
<Filter>bzip2 1.0.8 Source Files</Filter>
2626
</ClCompile>
2727
<ClCompile Include="$(bz2Dir)\crctable.c">
28-
<Filter>bzip2 1.0.6 Source Files</Filter>
28+
<Filter>bzip2 1.0.8 Source Files</Filter>
2929
</ClCompile>
3030
<ClCompile Include="$(bz2Dir)\decompress.c">
31-
<Filter>bzip2 1.0.6 Source Files</Filter>
31+
<Filter>bzip2 1.0.8 Source Files</Filter>
3232
</ClCompile>
3333
<ClCompile Include="$(bz2Dir)\huffman.c">
34-
<Filter>bzip2 1.0.6 Source Files</Filter>
34+
<Filter>bzip2 1.0.8 Source Files</Filter>
3535
</ClCompile>
3636
<ClCompile Include="$(bz2Dir)\randtable.c">
37-
<Filter>bzip2 1.0.6 Source Files</Filter>
37+
<Filter>bzip2 1.0.8 Source Files</Filter>
3838
</ClCompile>
3939
</ItemGroup>
4040
<ItemGroup>
4141
<ClInclude Include="$(bz2Dir)\bzlib.h">
42-
<Filter>bzip2 1.0.6 Header Files</Filter>
42+
<Filter>bzip2 1.0.8 Header Files</Filter>
4343
</ClInclude>
4444
<ClInclude Include="$(bz2Dir)\bzlib_private.h">
45-
<Filter>bzip2 1.0.6 Header Files</Filter>
45+
<Filter>bzip2 1.0.8 Header Files</Filter>
4646
</ClInclude>
4747
</ItemGroup>
4848
</Project>

PCbuild/get_externals.bat

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ echo.Fetching external libraries...
4949

5050
set libraries=
5151
set libraries=%libraries% bzip2-1.0.8
52-
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1u
53-
set libraries=%libraries% sqlite-3.31.1.0
52+
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1v
53+
set libraries=%libraries% sqlite-3.43.0.0
5454
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.9.0
5555
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.9.0
5656
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6
5757
set libraries=%libraries% xz-5.2.2
58-
set libraries=%libraries% zlib-1.2.12
58+
set libraries=%libraries% zlib-1.2.13
5959

6060
for %%e in (%libraries%) do (
6161
if exist "%EXTERNALS_DIR%\%%e" (
@@ -72,7 +72,7 @@ for %%e in (%libraries%) do (
7272
echo.Fetching external binaries...
7373

7474
set binaries=
75-
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1u
75+
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1v
7676
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.9.0
7777
if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06
7878

PCbuild/python.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@
5151
<Import Project="$(ExternalProps)" Condition="$(ExternalProps) != '' and Exists('$(ExternalProps)')" />
5252

5353
<PropertyGroup>
54-
<sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.31.1.0\</sqlite3Dir>
54+
<sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.43.0.0\</sqlite3Dir>
5555
<bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
5656
<lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.2\</lzmaDir>
57-
<opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-1.1.1u\</opensslDir>
58-
<opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-1.1.1u\$(ArchName)\</opensslOutDir>
57+
<opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-1.1.1v\</opensslDir>
58+
<opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-1.1.1v\$(ArchName)\</opensslOutDir>
5959
<opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir>
6060
<nasmDir Condition="$(nasmDir) == ''">$(ExternalsDir)\nasm-2.11.06\</nasmDir>
61-
<zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.2.12\</zlibDir>
61+
<zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.2.13\</zlibDir>
6262
</PropertyGroup>
6363

6464
<PropertyGroup>

0 commit comments

Comments
 (0)