Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
ShellB3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Ray Garcia
ShellB3
Commits
ef978195
Commit
ef978195
authored
5 years ago
by
Joe Garcia
Browse files
Options
Downloads
Patches
Plain Diff
ssl 110 version for suse. new default for 10x forward portable abi for ssl
parent
7fe63715
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ShellB3/shallbethree.sh
+26
-7
26 additions, 7 deletions
ShellB3/shallbethree.sh
ShellB3/src/sys/openssl-OpenSSL_1_1_0i.tar.gz
+3
-0
3 additions, 0 deletions
ShellB3/src/sys/openssl-OpenSSL_1_1_0i.tar.gz
with
29 additions
and
7 deletions
ShellB3/shallbethree.sh
+
26
−
7
View file @
ef978195
...
...
@@ -679,14 +679,16 @@ nativeOpenSSLVersion(){
# Compatibility chart:
# VVV Can run with
# compiled with
# 101 102 111
# 101 X _ _
# 102 X X _
# 111 _ _ X
# 101 102 110 111
# 101 X _ _ _
# 102 X X _ _
# 110 _ _ X _
# 111 _ _ X X
#
# Typical Platforms:
# 101 - CentOS 6, Ubuntu 14
# 102 - CentOS 7, Ubuntu 15-18
# 110 - opensuse
# 111 - CentOS 8, Ubuntu 19+
#
# Since Python 3.7+ requires minimum 102, it can only be compiled on CentOS 7 or Ubuntu 15 and newer
...
...
@@ -743,6 +745,9 @@ nativeOpenSSLVersion(){
elif
contains 1.1.1
${
SSLNAME
}
;
then
echo
111
return
0
elif
contains 1.1.0
${
SSLNAME
}
;
then
echo
110
return
0
elif
contains 1.0.2
${
SSLNAME
}
;
then
echo
102
return
0
...
...
@@ -754,8 +759,14 @@ nativeOpenSSLVersion(){
if
[
-e
/usr/lib
*
/libssl.so.1.1.1?
]
;
then
echo
111
return
0
elif
[
-e
/usr/lib
*
/libssl
${
OPENSSL111FILESUFFIX
}
]
;
then
echo
111
#elif [ -e /usr/lib*/libssl${OPENSSL111FILESUFFIX} ] ; then
# echo 111
# return 0
elif
[
-e
/usr/lib
*
/libssl.so.1.1.0?
]
;
then
echo
110
return
0
elif
[
-e
/usr/lib
*
/libssl
${
OPENSSL110FILESUFFIX
}
]
;
then
# same as 111 so...
echo
110
return
0
elif
[
-e
/usr/lib
*
/libssl.so.1.0.2?
]
;
then
echo
102
...
...
@@ -1122,6 +1133,9 @@ export OPENSSL101ALTFILESUFFIX=.so.10
export
OPENSSL102VER
=
OpenSSL_1_0_2k
export
OPENSSL102FILESUFFIX
=
.so.1.0.0
export
OPENSSL102ALTFILESUFFIX
=
.so.10
export
OPENSSL110VER
=
OpenSSL_1_1_0i
export
OPENSSL110FILESUFFIX
=
.so.1.1
export
OPENSSL110ALTFILESUFFIX
=
""
export
OPENSSL111VER
=
OpenSSL_1_1_1b
export
OPENSSL111FILESUFFIX
=
.so.1.1
export
OPENSSL111ALTFILESUFFIX
=
""
#Thanks CentOS for joining the party
...
...
@@ -9730,6 +9744,11 @@ loadSSLVersion() {
export
SSLFILESUFFIX
=
${
OPENSSL102FILESUFFIX
}
export
SSL_NP_FILESUFFIX
=
${
OPENSSL102ALTFILESUFFIX
}
;;
110
)
export
OPENSSLVER
=
${
OPENSSL110VER
}
export
SSLFILESUFFIX
=
${
OPENSSL110FILESUFFIX
}
export
SSL_NP_FILESUFFIX
=
${
OPENSSL110ALTFILESUFFIX
}
;;
111
)
export
OPENSSLVER
=
${
OPENSSL111VER
}
export
SSLFILESUFFIX
=
${
OPENSSL111FILESUFFIX
}
...
...
@@ -10060,7 +10079,7 @@ bundle_abi() {
mv
$f
$(
echo
$f
|
sed
-e
s,_ssl,../ssl10mod/_ssl,g
-e
s,_hashlib,../ssl10mod/_hashlib,g
)
fi
done
(
mk_openssl 11
1
&&
remake_py
&&
rm
-rf
lib
*
/libssl.
*
lib
*
/libcrypto.
*
bin/openssl lib
*
/engines
*
ssl native include/openssl
)
||
oops
"Failed to remake python with ssl 1.1.x support"
(
mk_openssl 11
0
&&
remake_py
&&
rm
-rf
lib
*
/libssl.
*
lib
*
/libcrypto.
*
bin/openssl lib
*
/engines
*
ssl native include/openssl
)
||
oops
"Failed to remake python with ssl 1.1.x support"
resume_tracker
for
f
in
$(
find lib
*
/python
*
-name
"_ssl.*so"
|
grep
-v
ssl1
)
$(
find lib
*
/python
*
-name
"_hashlib.*so"
|
grep
-v
ssl1
)
;
do
if
[
-e
"
$f
"
]
;
then
...
...
This diff is collapsed.
Click to expand it.
ShellB3/src/sys/openssl-OpenSSL_1_1_0i.tar.gz
0 → 100644
LFS
+
3
−
0
View file @
ef978195
File added
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment