Skip to content

Commit c5f0903

Browse files
committed
Attempt to include OpenSSL 1.1 with certs to error sending crash reports
1 parent e5db827 commit c5f0903

2 files changed

Lines changed: 24 additions & 0 deletions

File tree

.github/workflows/ci.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,16 @@ jobs:
101101
# Inject custom AppRun (linuxdeployqt won't replace if it already exists)
102102
cp $GITHUB_WORKSPACE/app/packaging/linux/AppRun appdir
103103
104+
# Manually add OpenSSL 1.1 that Qt was compiled against
105+
mkdir -p appdir/usr/lib64/openssl11
106+
cp -a /usr/lib64/libssl.so.1.1.1k /usr/lib64/libcrypto.so.1.1.1k appdir/usr/lib64/
107+
cp -a /usr/lib64/libssl.so.1.1 /usr/lib64/libcrypto.so.1.1 appdir/usr/lib64/
108+
cp -a /usr/lib64/openssl11/libssl.so /usr/lib64/openssl11/libcrypto.so appdir/usr/lib64/openssl11
109+
mkdir -p appdir/etc/pki/ca-trust/extracted/pem
110+
mkdir -p appdir/etc/pki/tls/certs
111+
cp -a /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem appdir/etc/pki/ca-trust/extracted/pem
112+
cp -a /etc/pki/tls/certs/ca-bundle.crt appdir/etc/pki/tls/certs
113+
104114
# Process AppDir
105115
/usr/local/linuxdeployqt-x86_64.AppImage \
106116
appdir/usr/share/applications/org.olivevideoeditor.Olive.desktop \
@@ -109,6 +119,8 @@ jobs:
109119
-executable=appdir/usr/bin/crashpad_handler \
110120
-executable=appdir/usr/bin/minidump_stackwalk \
111121
-executable=appdir/usr/bin/olive-crashhandler \
122+
-executable=appdir/usr/lib64/libssl.so.1.1.1k \
123+
-executable=appdir/usr/lib64/libcrypto.so.1.1.1k \
112124
--appimage-extract-and-run
113125
114126
# Dump Crashpad symbols

docker/scripts/build_olive.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,16 @@ cmake --install app --prefix appdir/usr
1414
#libQt5MultimediaGstTools.so,\
1515
#libQt5MultimediaWidgets.so,\
1616

17+
# Manually add OpenSSL 1.1 that Qt was compiled against
18+
mkdir -p appdir/usr/lib64/openssl11
19+
cp -a /usr/lib64/libssl.so.1.1.1k /usr/lib64/libcrypto.so.1.1.1k appdir/usr/lib64/
20+
cp -a /usr/lib64/libssl.so.1.1 /usr/lib64/libcrypto.so.1.1 appdir/usr/lib64/
21+
cp -a /usr/lib64/openssl11/libssl.so /usr/lib64/openssl11/libcrypto.so appdir/usr/lib64/openssl11
22+
mkdir -p appdir/etc/pki/ca-trust/extracted/pem
23+
mkdir -p appdir/etc/pki/tls/certs
24+
cp -a /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem appdir/etc/pki/ca-trust/extracted/pem
25+
cp -a /etc/pki/tls/certs/ca-bundle.crt appdir/etc/pki/tls/certs
26+
1727
/usr/local/linuxdeployqt-x86_64.AppImage \
1828
appdir/usr/share/applications/org.olivevideoeditor.Olive.desktop \
1929
-appimage \
@@ -27,6 +37,8 @@ libQt5VirtualKeyboard.so \
2737
-executable=appdir/usr/bin/crashpad_handler \
2838
-executable=appdir/usr/bin/minidump_stackwalk \
2939
-executable=appdir/usr/bin/olive-crashhandler \
40+
-executable=appdir/usr/lib64/libssl.so.1.1.1k \
41+
-executable=appdir/usr/lib64/libcrypto.so.1.1.1k \
3042
--appimage-extract-and-run
3143

3244
./Olive*.AppImage --appimage-extract-and-run --version

0 commit comments

Comments
 (0)