Skip to content

Commit 02242c0

Browse files
committed
OpenSSL_jll build 1.1.1+3
1 parent 885e8aa commit 02242c0

18 files changed

+373
-330
lines changed

LICENSE

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
The Julia source code within this repository (all files under `src/`) are
2+
released under the terms of the MIT "Expat" License, the text of which is
3+
included below. This license does not apply to the binary package wrapped by
4+
this Julia package and automatically downloaded by the Julia package manager
5+
upon installing this wrapper package. The binary package's license is shipped
6+
alongside the binary itself and can be found within the
7+
`share/licenses/OpenSSL` directory within its prefix.
8+
9+
MIT License
10+
11+
Copyright (c) 2020
12+
13+
Permission is hereby granted, free of charge, to any person obtaining a copy
14+
of this software and associated documentation files (the "Software"), to deal
15+
in the Software without restriction, including without limitation the rights
16+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
17+
copies of the Software, and to permit persons to whom the Software is
18+
furnished to do so, subject to the following conditions:
19+
20+
The above copyright notice and this permission notice shall be included in all
21+
copies or substantial portions of the Software.
22+
23+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
24+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
25+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
26+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
27+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
28+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
29+
SOFTWARE.

LICENSE.md

-7
This file was deleted.

Project.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "OpenSSL_jll"
22
uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95"
3-
version = "1.1.1+2"
3+
version = "1.1.1+3"
44

55
[deps]
66
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"

README.md

+26-35
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,37 @@
1-
# OpenSSL_jll.jl
1+
# `OpenSSL_jll.jl` (v1.1.1+3)
22

3-
This is an autogenerated package constructed using [`BinaryBuilder.jl`](https://github.com/JuliaPackaging/BinaryBuilder.jl).
3+
This is an autogenerated package constructed using [`BinaryBuilder.jl`](https://github.com/JuliaPackaging/BinaryBuilder.jl). The originating [`build_tarballs.jl`](https://github.com/JuliaPackaging/Yggdrasil/blob/5e7e6ce49e1cecd7096443e2b7d25fcd36b8e575/O/OpenSSL/build_tarballs.jl) script can be found on [`Yggdrasil`](https://github.com/JuliaPackaging/Yggdrasil/), the community build tree.
44

5-
## Products
6-
7-
The code bindings within this package are autogenerated from the following `Products` defined within the `build_tarballs.jl` file that generated this package:
5+
For more details about JLL packages and how to use them, see `BinaryBuilder.jl` [documentation](https://juliapackaging.github.io/BinaryBuilder.jl/dev/jll/).
86

9-
```julia
10-
products = [
11-
LibraryProduct(["libssl", "libssl-1_1", "libssl-1_1-x64"], :libssl),
12-
LibraryProduct(["libcrypto", "libcrypto-1_1", "libcrypto-1_1-x64"], :libcrypto),
13-
ExecutableProduct(["openssl"], :openssl)
14-
]
15-
```
7+
## Sources
168

17-
## Usage example
9+
The tarballs for `OpenSSL_jll.jl` have been built from these sources:
1810

19-
For example purposes, we will assume that the following products were defined in the imaginary package `Example_jll`:
11+
* compressed archive: https://www.openssl.org/source/openssl-1.1.1e.tar.gz (SHA256 checksum: `694f61ac11cb51c9bf73f54e771ff6022b0327a43bbdfa1b2f19de1662a6dcbe`)
2012

21-
```julia
22-
products = [
23-
FileProduct("src/data.txt", :data_txt),
24-
LibraryProduct("libdataproc", :libdataproc),
25-
ExecutableProduct("mungify", :mungify_exe)
26-
]
27-
```
13+
## Platforms
2814

29-
With such products defined, `Example_jll` would contain `data_txt`, `libdataproc` and `mungify_exe` symbols exported. For `FileProduct` variables, the exported value is a string pointing to the location of the file on-disk. For `LibraryProduct` variables, it is a string corresponding to the `SONAME` of the desired library (it will have already been `dlopen()`'ed, so typical `ccall()` usage applies), and for `ExecutableProduct` variables, the exported value is a function that can be called to set appropriate environment variables. Example:
15+
`OpenSSL_jll.jl` is available for the following platforms:
3016

31-
```julia
32-
using Example_jll
17+
* `Linux(:aarch64, libc=:glibc)` (`aarch64-linux-gnu`)
18+
* `Linux(:aarch64, libc=:musl)` (`aarch64-linux-musl`)
19+
* `Linux(:armv7l, libc=:glibc, call_abi=:eabihf)` (`armv7l-linux-gnueabihf`)
20+
* `Linux(:armv7l, libc=:musl, call_abi=:eabihf)` (`armv7l-linux-musleabihf`)
21+
* `Linux(:i686, libc=:glibc)` (`i686-linux-gnu`)
22+
* `Linux(:i686, libc=:musl)` (`i686-linux-musl`)
23+
* `Windows(:i686)` (`i686-w64-mingw32`)
24+
* `Linux(:powerpc64le, libc=:glibc)` (`powerpc64le-linux-gnu`)
25+
* `MacOS(:x86_64)` (`x86_64-apple-darwin14`)
26+
* `Linux(:x86_64, libc=:glibc)` (`x86_64-linux-gnu`)
27+
* `Linux(:x86_64, libc=:musl)` (`x86_64-linux-musl`)
28+
* `FreeBSD(:x86_64)` (`x86_64-unknown-freebsd11.1`)
29+
* `Windows(:x86_64)` (`x86_64-w64-mingw32`)
3330

34-
# For file products, you can access its file location directly:
35-
data_lines = open(data_txt, "r") do io
36-
readlines(io)
37-
end
31+
## Products
3832

39-
# For library products, you can use the exported variable name in `ccall()` invocations directly
40-
num_chars = ccall((:count_characters, libdataproc), Cint, (Cstring, Cint), data_lines[1], length(data_lines[1]))
33+
The code bindings within this package are autogenerated from the following `Products`:
4134

42-
# For executable products, you can use the exported variable name as a function that you can call
43-
mungify_exe() do mungify_exe_path
44-
run(`$mungify_exe_path $num_chars`)
45-
end
46-
```
35+
* `LibraryProduct`: `libcrypto`
36+
* `LibraryProduct`: `libssl`
37+
* `ExecutableProduct`: `openssl`

src/OpenSSL_jll.jl

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
module OpenSSL_jll
22

3+
if isdefined(Base, :Experimental) && isdefined(Base.Experimental, Symbol("@optlevel"))
4+
@eval Base.Experimental.@optlevel 0
5+
end
6+
37
if VERSION < v"1.3.0-rc4"
48
# We lie a bit in the registry that JLL packages are usable on Julia 1.0-1.2.
59
# This is to allow packages that might want to support Julia 1.0 to get the
@@ -11,7 +15,7 @@ if VERSION < v"1.3.0-rc4"
1115
# if they are willing to engage in the kinds of hoop-jumping they might need
1216
# to in order to install binaries in a JLL-compatible way on 1.0-1.2. One
1317
# example of this hoop-jumping being to express a dependency on this JLL
14-
# package, then import it wtihin a `VERSION >= v"1.3"` conditional, and use
18+
# package, then import it within a `VERSION >= v"1.3"` conditional, and use
1519
# the deprecated `build.jl` mechanism to download the binaries through e.g.
1620
# `BinaryProvider.jl`. This should work well for the simplest packages, and
1721
# require greater and greater heroics for more and more complex packages.

src/wrappers/aarch64-linux-gnu.jl

+24-22
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,38 @@
11
# Autogenerated wrapper script for OpenSSL_jll for aarch64-linux-gnu
2-
export libssl, libcrypto, openssl
2+
export libcrypto, libssl, openssl
33

44
## Global variables
55
PATH = ""
66
LIBPATH = ""
77
LIBPATH_env = "LD_LIBRARY_PATH"
8+
LIBPATH_default = ""
89

9-
# Relative path to `libssl`
10-
const libssl_splitpath = ["lib", "libssl.so"]
10+
# Relative path to `libcrypto`
11+
const libcrypto_splitpath = ["lib", "libcrypto.so"]
1112

1213
# This will be filled out by __init__() for all products, as it must be done at runtime
13-
libssl_path = ""
14+
libcrypto_path = ""
1415

15-
# libssl-specific global declaration
16+
# libcrypto-specific global declaration
1617
# This will be filled out by __init__()
17-
libssl_handle = C_NULL
18+
libcrypto_handle = C_NULL
1819

1920
# This must be `const` so that we can use it with `ccall()`
20-
const libssl = "libssl.so.1.1"
21+
const libcrypto = "libcrypto.so.1.1"
2122

2223

23-
# Relative path to `libcrypto`
24-
const libcrypto_splitpath = ["lib", "libcrypto.so"]
24+
# Relative path to `libssl`
25+
const libssl_splitpath = ["lib", "libssl.so"]
2526

2627
# This will be filled out by __init__() for all products, as it must be done at runtime
27-
libcrypto_path = ""
28+
libssl_path = ""
2829

29-
# libcrypto-specific global declaration
30+
# libssl-specific global declaration
3031
# This will be filled out by __init__()
31-
libcrypto_handle = C_NULL
32+
libssl_handle = C_NULL
3233

3334
# This must be `const` so that we can use it with `ccall()`
34-
const libcrypto = "libcrypto.so.1.1"
35+
const libssl = "libssl.so.1.1"
3536

3637

3738
# Relative path to `openssl`
@@ -52,8 +53,9 @@ function openssl(f::Function; adjust_PATH::Bool = true, adjust_LIBPATH::Bool = t
5253
end
5354
end
5455
if adjust_LIBPATH
55-
if !isempty(get(ENV, LIBPATH_env, ""))
56-
env_mapping[LIBPATH_env] = string(LIBPATH, ':', ENV[LIBPATH_env])
56+
LIBPATH_base = get(ENV, LIBPATH_env, expanduser(LIBPATH_default))
57+
if !isempty(LIBPATH_base)
58+
env_mapping[LIBPATH_env] = string(LIBPATH, ':', LIBPATH_base)
5759
else
5860
env_mapping[LIBPATH_env] = LIBPATH
5961
end
@@ -72,21 +74,21 @@ function __init__()
7274

7375
# Initialize PATH and LIBPATH environment variable listings
7476
global PATH_list, LIBPATH_list
75-
# We first need to add to LIBPATH_list the libraries provided by Julia
77+
# Lastly, we need to add to LIBPATH_list the libraries provided by Julia
7678
append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)])
77-
global libssl_path = normpath(joinpath(artifact_dir, libssl_splitpath...))
79+
global libcrypto_path = normpath(joinpath(artifact_dir, libcrypto_splitpath...))
7880

7981
# Manually `dlopen()` this right now so that future invocations
8082
# of `ccall` with its `SONAME` will find this path immediately.
81-
global libssl_handle = dlopen(libssl_path)
82-
push!(LIBPATH_list, dirname(libssl_path))
83+
global libcrypto_handle = dlopen(libcrypto_path)
84+
push!(LIBPATH_list, dirname(libcrypto_path))
8385

84-
global libcrypto_path = normpath(joinpath(artifact_dir, libcrypto_splitpath...))
86+
global libssl_path = normpath(joinpath(artifact_dir, libssl_splitpath...))
8587

8688
# Manually `dlopen()` this right now so that future invocations
8789
# of `ccall` with its `SONAME` will find this path immediately.
88-
global libcrypto_handle = dlopen(libcrypto_path)
89-
push!(LIBPATH_list, dirname(libcrypto_path))
90+
global libssl_handle = dlopen(libssl_path)
91+
push!(LIBPATH_list, dirname(libssl_path))
9092

9193
global openssl_path = normpath(joinpath(artifact_dir, openssl_splitpath...))
9294

src/wrappers/aarch64-linux-musl.jl

+24-22
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,38 @@
11
# Autogenerated wrapper script for OpenSSL_jll for aarch64-linux-musl
2-
export libssl, libcrypto, openssl
2+
export libcrypto, libssl, openssl
33

44
## Global variables
55
PATH = ""
66
LIBPATH = ""
77
LIBPATH_env = "LD_LIBRARY_PATH"
8+
LIBPATH_default = ""
89

9-
# Relative path to `libssl`
10-
const libssl_splitpath = ["lib", "libssl.so"]
10+
# Relative path to `libcrypto`
11+
const libcrypto_splitpath = ["lib", "libcrypto.so"]
1112

1213
# This will be filled out by __init__() for all products, as it must be done at runtime
13-
libssl_path = ""
14+
libcrypto_path = ""
1415

15-
# libssl-specific global declaration
16+
# libcrypto-specific global declaration
1617
# This will be filled out by __init__()
17-
libssl_handle = C_NULL
18+
libcrypto_handle = C_NULL
1819

1920
# This must be `const` so that we can use it with `ccall()`
20-
const libssl = "libssl.so.1.1"
21+
const libcrypto = "libcrypto.so.1.1"
2122

2223

23-
# Relative path to `libcrypto`
24-
const libcrypto_splitpath = ["lib", "libcrypto.so"]
24+
# Relative path to `libssl`
25+
const libssl_splitpath = ["lib", "libssl.so"]
2526

2627
# This will be filled out by __init__() for all products, as it must be done at runtime
27-
libcrypto_path = ""
28+
libssl_path = ""
2829

29-
# libcrypto-specific global declaration
30+
# libssl-specific global declaration
3031
# This will be filled out by __init__()
31-
libcrypto_handle = C_NULL
32+
libssl_handle = C_NULL
3233

3334
# This must be `const` so that we can use it with `ccall()`
34-
const libcrypto = "libcrypto.so.1.1"
35+
const libssl = "libssl.so.1.1"
3536

3637

3738
# Relative path to `openssl`
@@ -52,8 +53,9 @@ function openssl(f::Function; adjust_PATH::Bool = true, adjust_LIBPATH::Bool = t
5253
end
5354
end
5455
if adjust_LIBPATH
55-
if !isempty(get(ENV, LIBPATH_env, ""))
56-
env_mapping[LIBPATH_env] = string(LIBPATH, ':', ENV[LIBPATH_env])
56+
LIBPATH_base = get(ENV, LIBPATH_env, expanduser(LIBPATH_default))
57+
if !isempty(LIBPATH_base)
58+
env_mapping[LIBPATH_env] = string(LIBPATH, ':', LIBPATH_base)
5759
else
5860
env_mapping[LIBPATH_env] = LIBPATH
5961
end
@@ -72,21 +74,21 @@ function __init__()
7274

7375
# Initialize PATH and LIBPATH environment variable listings
7476
global PATH_list, LIBPATH_list
75-
# We first need to add to LIBPATH_list the libraries provided by Julia
77+
# Lastly, we need to add to LIBPATH_list the libraries provided by Julia
7678
append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)])
77-
global libssl_path = normpath(joinpath(artifact_dir, libssl_splitpath...))
79+
global libcrypto_path = normpath(joinpath(artifact_dir, libcrypto_splitpath...))
7880

7981
# Manually `dlopen()` this right now so that future invocations
8082
# of `ccall` with its `SONAME` will find this path immediately.
81-
global libssl_handle = dlopen(libssl_path)
82-
push!(LIBPATH_list, dirname(libssl_path))
83+
global libcrypto_handle = dlopen(libcrypto_path)
84+
push!(LIBPATH_list, dirname(libcrypto_path))
8385

84-
global libcrypto_path = normpath(joinpath(artifact_dir, libcrypto_splitpath...))
86+
global libssl_path = normpath(joinpath(artifact_dir, libssl_splitpath...))
8587

8688
# Manually `dlopen()` this right now so that future invocations
8789
# of `ccall` with its `SONAME` will find this path immediately.
88-
global libcrypto_handle = dlopen(libcrypto_path)
89-
push!(LIBPATH_list, dirname(libcrypto_path))
90+
global libssl_handle = dlopen(libssl_path)
91+
push!(LIBPATH_list, dirname(libssl_path))
9092

9193
global openssl_path = normpath(joinpath(artifact_dir, openssl_splitpath...))
9294

0 commit comments

Comments
 (0)