diff --git a/.gitignore b/.gitignore index d82b85ef8..67983ce52 100644 --- a/.gitignore +++ b/.gitignore @@ -154,13 +154,7 @@ deps/lz4/lz4-1.7.5/ deps/libev/libev-4.24/ #libssl -deps/libssl/openssl-1.1.0h/ -deps/libssl/openssl-1.1.1b/ -deps/libssl/openssl-1.1.1d/ -deps/libssl/openssl-1.1.1g/ -deps/libssl/openssl-1.1.1j/ -deps/libssl/openssl-openssl-3.0.0/ -deps/libssl/openssl-openssl-3.0.2/ +deps/libssl/openssl-openssl-*/ #google coredumper deps/google-coredumper/google-coredumper/ diff --git a/deps/Makefile b/deps/Makefile index c03a72533..91192c79f 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -50,14 +50,8 @@ endif libinjection: libinjection/libinjection/src/libinjection.a libssl/openssl/libssl.a: -# cd libssl && rm -rf openssl-1.1.0h || true -# cd libssl && tar -zxf openssl-1.1.0h.tar.gz - cd libssl && rm -rf openssl-1.1.1d || true - cd libssl && rm -rf openssl-1.1.0h || true - cd libssl && rm -rf openssl-1.1.1g || true - cd libssl && rm -rf openssl-1.1.1j || true cd libssl && rm -rf openssl-openssl-*/ || true - cd libssl && tar -zxf openssl-3.0.2.tar.gz + cd libssl && tar -zxf openssl-*.tar.gz cd libssl/openssl && ./config no-ssl3 no-tests cd libssl/openssl && CC=${CC} CXX=${CXX} ${MAKE} cd libssl/openssl && ln -s . lib # curl wants this path diff --git a/deps/libssl/openssl-1.1.0h.tar.gz b/deps/libssl/openssl-1.1.0h.tar.gz deleted file mode 100644 index 8fb67f862..000000000 Binary files a/deps/libssl/openssl-1.1.0h.tar.gz and /dev/null differ diff --git a/deps/libssl/openssl-1.1.1d.tar.gz b/deps/libssl/openssl-1.1.1d.tar.gz deleted file mode 100644 index 216017a51..000000000 Binary files a/deps/libssl/openssl-1.1.1d.tar.gz and /dev/null differ diff --git a/deps/libssl/openssl-1.1.1g.tar.gz b/deps/libssl/openssl-1.1.1g.tar.gz deleted file mode 100644 index e768f9e97..000000000 Binary files a/deps/libssl/openssl-1.1.1g.tar.gz and /dev/null differ diff --git a/deps/libssl/openssl-1.1.1j.tar.gz b/deps/libssl/openssl-1.1.1j.tar.gz deleted file mode 100644 index 3ba723770..000000000 Binary files a/deps/libssl/openssl-1.1.1j.tar.gz and /dev/null differ diff --git a/deps/libssl/openssl-3.0.0.tar.gz b/deps/libssl/openssl-3.0.0.tar.gz deleted file mode 100644 index c25713bd7..000000000 Binary files a/deps/libssl/openssl-3.0.0.tar.gz and /dev/null differ