Skip to content

Commit 8a2cfca

Browse files
downgrade to openssl 1.0.1k test 1
1 parent d9d74c3 commit 8a2cfca

3 files changed

Lines changed: 33 additions & 26 deletions

File tree

depends/packages/openssl.mk

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package=openssl
2-
$(package)_version=1.0.2
3-
$(package)_version_suffix=u
4-
$(package)_download_path=https://www.openssl.org/source/old/$($(package)_version)
5-
$(package)_file_name=$(package)-$($(package)_version)$($(package)_version_suffix).tar.gz
6-
$(package)_sha256_hash=ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16
7-
# PATCHES
8-
$(package)_patches += secure_getenv.patch
2+
$(package)_version=1.0.1k
3+
$(package)_download_path=https://www.openssl.org/source
4+
$(package)_file_name=$(package)-$($(package)_version).tar.gz
5+
$(package)_sha256_hash=8f9faeaebad088e772f4ef5e38252d472be4d878c6b3a2718c10a4fcebe7a41c
6+
$(package)_patches=0001-Add-OpenSSL-termios-fix-for-musl-libc.patch
97

108
define $(package)_set_vars
119
$(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)"
@@ -50,29 +48,31 @@ $(package)_config_opts_linux=-fPIC -Wa,--noexecstack
5048
$(package)_config_opts_x86_64_linux=linux-x86_64
5149
$(package)_config_opts_i686_linux=linux-generic32
5250
$(package)_config_opts_arm_linux=linux-generic32
51+
$(package)_config_opts_armv7l_linux=linux-generic32
5352
$(package)_config_opts_aarch64_linux=linux-generic64
5453
$(package)_config_opts_mipsel_linux=linux-generic32
5554
$(package)_config_opts_mips_linux=linux-generic32
5655
$(package)_config_opts_powerpc_linux=linux-generic32
56+
$(package)_config_opts_riscv32_linux=linux-generic32
57+
$(package)_config_opts_riscv64_linux=linux-generic64
5758
$(package)_config_opts_x86_64_darwin=darwin64-x86_64-cc
5859
$(package)_config_opts_x86_64_mingw32=mingw64
5960
$(package)_config_opts_i686_mingw32=mingw
61+
$(package)_config_opts_android=-fPIC
62+
$(package)_config_opts_aarch64_android=linux-generic64
63+
$(package)_config_opts_x86_64_android=linux-generic64
64+
$(package)_config_opts_armv7a_android=linux-generic32
65+
$(package)_config_opts_i686_android=linux-generic32
6066
endef
6167

6268
define $(package)_preprocess_cmds
63-
patch -p1 < $($(package)_patch_dir)/secure_getenv.patch && \
69+
patch -p1 < $($(package)_patch_dir)/0001-Add-OpenSSL-termios-fix-for-musl-libc.patch && \
6470
sed -i.old "/define DATE/d" util/mkbuildinf.pl && \
6571
sed -i.old "s|engines apps test|engines|" Makefile.org
6672
endef
6773

6874
define $(package)_config_cmds
69-
./Configure $($(package)_config_opts) && \
70-
echo "Patching util/domd to force GCC-based dependencies..." && \
71-
sed -i.bak \
72-
-e 's|MAKEDEPEND=.*|MAKEDEPEND="$$CC -MM"|' \
73-
-e 's|^\( *\)makedepend|\1$$CC -MM|' \
74-
util/domd && \
75-
make depend
75+
./Configure $($(package)_config_opts)
7676
endef
7777

7878
define $(package)_build_cmds
@@ -85,4 +85,4 @@ endef
8585

8686
define $(package)_postprocess_cmds
8787
rm -rf share bin etc
88-
endef
88+
endef
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c
2+
index a38c758..d99edc2 100644
3+
--- a/crypto/ui/ui_openssl.c
4+
+++ b/crypto/ui/ui_openssl.c
5+
@@ -190,9 +190,9 @@
6+
# undef SGTTY
7+
#endif
8+
9+
-#if defined(linux) && !defined(TERMIO)
10+
-# undef TERMIOS
11+
-# define TERMIO
12+
+#if defined(linux)
13+
+# define TERMIOS
14+
+# undef TERMIO
15+
# undef SGTTY
16+
#endif
17+

depends/patches/openssl/domd_cc.patch

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)