From 7a69c5d807c67c887cf97a962a49c7b95b15ded2 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 1 Jun 2022 19:38:48 +0200 Subject: [PATCH] - openssl: back to version 1.0.2u for coolstream --- package/openssl/openssl.mk | 25 ++++++++++++++++--- .../1.0.2u/0000-Configure-align-O-flag.patch | 13 ++++++++++ ...building-manpages-if-we-re-not-going.patch | 0 ...ible-build-do-not-leak-compiler-path.patch | 0 ...ENSSL_NO_MADVISE-to-disable-call-to-.patch | 0 ...Fv2-ABI-on-some-ppc64-big-endian-sys.patch | 0 ...m-ppc-xlate.pl-add-linux64v2-flavour.patch | 0 ...ort-for-io_pgetevents_time64-syscall.patch | 0 ...ort-for-io_pgetevents_time64-syscall.patch | 0 9 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 package/openssl/patches/1.0.2u/0000-Configure-align-O-flag.patch rename package/openssl/patches/{ => 1.1.1o}/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch (100%) rename package/openssl/patches/{ => 1.1.1o}/0002-Reproducible-build-do-not-leak-compiler-path.patch (100%) rename package/openssl/patches/{ => 1.1.1o}/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch (100%) rename package/openssl/patches/{ => 1.1.1o}/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch (100%) rename package/openssl/patches/{ => 1.1.1o}/0005-crypto-perlasm-ppc-xlate.pl-add-linux64v2-flavour.patch (100%) rename package/openssl/patches/{ => 1.1.1o}/0006-Add-support-for-io_pgetevents_time64-syscall.patch (100%) rename package/openssl/patches/{ => 1.1.1o}/0007-Fixup-support-for-io_pgetevents_time64-syscall.patch (100%) diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk index 84b0adcb..b734a5f0 100644 --- a/package/openssl/openssl.mk +++ b/package/openssl/openssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENSSL_VERSION = 1.1.1o +OPENSSL_VERSION = $(if $(filter $(BOXTYPE),coolstream),1.0.2u,1.1.1o) OPENSSL_DIR = openssl-$(OPENSSL_VERSION) OPENSSL_SOURCE = openssl-$(OPENSSL_VERSION).tar.gz OPENSSL_SITE = https://www.openssl.org/source @@ -31,6 +31,11 @@ OPENSSL_CONF_OPTS += \ no-fuzz-afl \ no-fuzz-libfuzzer +ifeq ($(BOXTYPE),coolstream) +OPENSSL_CONF_OPTS += \ + no-perlasm +endif + OPENSSL_CONF_OPTS += \ -DTERMIOS -fomit-frame-pointer \ -DOPENSSL_SMALL_FOOTPRINT \ @@ -55,15 +60,27 @@ endef OPENSSL_TARGET_FINALIZE_HOOKS += OPENSSL_TARGET_CLEANUP_COOLSTREAM endif +ifeq ($(BOXTYPE),coolstream) +OPENSSL_SO_ENDING = 1.0.0 +OPENSSL_COMPATIBILITY_VERSIONS = 0.9.7 0.9.8 1.0.2 +else +OPENSSL_SO_ENDING = 1.1 OPENSSL_COMPATIBILITY_VERSIONS = 0.9.7 0.9.8 1.0.0 1.0.2 1.1.0 +endif define OPENSSL_COMPATIBILITY_LINKS $(foreach v,$(OPENSSL_COMPATIBILITY_VERSIONS),\ - ln -sf libcrypto.so.1.1 $(TARGET_libdir)/libcrypto.so.$(v)$(sep)) + ln -sf libcrypto.so.$(OPENSSL_SO_ENDING) $(TARGET_libdir)/libcrypto.so.$(v)$(sep)) $(foreach v,$(OPENSSL_COMPATIBILITY_VERSIONS),\ - ln -sf libssl.so.1.1 $(TARGET_libdir)/libssl.so.$(v)$(sep)) + ln -sf libssl.so.$(OPENSSL_SO_ENDING) $(TARGET_libdir)/libssl.so.$(v)$(sep)) endef OPENSSL_TARGET_FINALIZE_HOOKS += OPENSSL_COMPATIBILITY_LINKS +ifeq ($(BOXTYPE),coolstream) +OPENSSL_MAKE_INSTALL_OPTS = INSTALL_PREFIX=$(TARGET_DIR) +else +OPENSSL_MAKE_INSTALL_OPTS = install_ssldirs DESTDIR=$(TARGET_DIR) +endif + openssl: | $(TARGET_DIR) $(call PREPARE) $(CHDIR)/$($(PKG)_DIR); \ @@ -73,5 +90,5 @@ openssl: | $(TARGET_DIR) $(SED) 's|^HTMLDIR=.*|HTMLDIR=$(REMOVE_htmldir)|' Makefile; \ $(MAKE) depend; \ $(MAKE); \ - $(MAKE) install_sw install_ssldirs DESTDIR=$(TARGET_DIR) + $(MAKE) install_sw $($(PKG)_MAKE_INSTALL_OPTS) $(call TARGET_FOLLOWUP) diff --git a/package/openssl/patches/1.0.2u/0000-Configure-align-O-flag.patch b/package/openssl/patches/1.0.2u/0000-Configure-align-O-flag.patch new file mode 100644 index 00000000..70fe3697 --- /dev/null +++ b/package/openssl/patches/1.0.2u/0000-Configure-align-O-flag.patch @@ -0,0 +1,13 @@ +diff --git a/Configure b/Configure +index 3846c91..1a52843 100755 +--- a/Configure ++++ b/Configure +@@ -404,7 +404,7 @@ my %table=( + # + # ./Configure linux-armv4 -march=armv6 -D__ARM_MAX_ARCH__=8 + # +-"linux-armv4", "gcc: -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-armv4", "gcc: -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "linux-aarch64","gcc: -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${aarch64_asm}:linux64:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + # Configure script adds minimally required -march for assembly support, + # if no -march was specified at command line. mips32 and mips64 below diff --git a/package/openssl/patches/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch b/package/openssl/patches/1.1.1o/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch similarity index 100% rename from package/openssl/patches/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch rename to package/openssl/patches/1.1.1o/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch diff --git a/package/openssl/patches/0002-Reproducible-build-do-not-leak-compiler-path.patch b/package/openssl/patches/1.1.1o/0002-Reproducible-build-do-not-leak-compiler-path.patch similarity index 100% rename from package/openssl/patches/0002-Reproducible-build-do-not-leak-compiler-path.patch rename to package/openssl/patches/1.1.1o/0002-Reproducible-build-do-not-leak-compiler-path.patch diff --git a/package/openssl/patches/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch b/package/openssl/patches/1.1.1o/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch similarity index 100% rename from package/openssl/patches/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch rename to package/openssl/patches/1.1.1o/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch diff --git a/package/openssl/patches/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch b/package/openssl/patches/1.1.1o/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch similarity index 100% rename from package/openssl/patches/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch rename to package/openssl/patches/1.1.1o/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch diff --git a/package/openssl/patches/0005-crypto-perlasm-ppc-xlate.pl-add-linux64v2-flavour.patch b/package/openssl/patches/1.1.1o/0005-crypto-perlasm-ppc-xlate.pl-add-linux64v2-flavour.patch similarity index 100% rename from package/openssl/patches/0005-crypto-perlasm-ppc-xlate.pl-add-linux64v2-flavour.patch rename to package/openssl/patches/1.1.1o/0005-crypto-perlasm-ppc-xlate.pl-add-linux64v2-flavour.patch diff --git a/package/openssl/patches/0006-Add-support-for-io_pgetevents_time64-syscall.patch b/package/openssl/patches/1.1.1o/0006-Add-support-for-io_pgetevents_time64-syscall.patch similarity index 100% rename from package/openssl/patches/0006-Add-support-for-io_pgetevents_time64-syscall.patch rename to package/openssl/patches/1.1.1o/0006-Add-support-for-io_pgetevents_time64-syscall.patch diff --git a/package/openssl/patches/0007-Fixup-support-for-io_pgetevents_time64-syscall.patch b/package/openssl/patches/1.1.1o/0007-Fixup-support-for-io_pgetevents_time64-syscall.patch similarity index 100% rename from package/openssl/patches/0007-Fixup-support-for-io_pgetevents_time64-syscall.patch rename to package/openssl/patches/1.1.1o/0007-Fixup-support-for-io_pgetevents_time64-syscall.patch