Skip to content

Commit cf41a4a

Browse files
committed
Revert "Attempt to include OpenSSL 1.1 with certs to fix error sending crash reports"
This reverts commit 8407621.
1 parent 8407621 commit cf41a4a

2 files changed

Lines changed: 0 additions & 24 deletions

File tree

.github/workflows/ci.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -101,16 +101,6 @@ 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-
114104
# Process AppDir
115105
/usr/local/linuxdeployqt-x86_64.AppImage \
116106
appdir/usr/share/applications/org.olivevideoeditor.Olive.desktop \
@@ -119,8 +109,6 @@ jobs:
119109
-executable=appdir/usr/bin/crashpad_handler \
120110
-executable=appdir/usr/bin/minidump_stackwalk \
121111
-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 \
124112
--appimage-extract-and-run
125113
126114
# Dump Crashpad symbols

docker/scripts/build_olive.sh

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,6 @@ 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-
2717
/usr/local/linuxdeployqt-x86_64.AppImage \
2818
appdir/usr/share/applications/org.olivevideoeditor.Olive.desktop \
2919
-appimage \
@@ -37,8 +27,6 @@ libQt5VirtualKeyboard.so \
3727
-executable=appdir/usr/bin/crashpad_handler \
3828
-executable=appdir/usr/bin/minidump_stackwalk \
3929
-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 \
4230
--appimage-extract-and-run
4331

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

0 commit comments

Comments
 (0)