openssl.recipe: Upgrade to 1.1.1

Lots of changes in the build system.

2 files changed, 0 insertions, 110 deletions

diff --git a/recipes/openssl/0001-Make-it-possible-to-only-install-libs.patch b/recipes/openssl/0001-Make-it-possible-to-only-install-libs.patch
deleted file mode 100644
index eb703261..00000000
--- a/recipes/openssl/0001-Make-it-possible-to-only-install-libs.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From b0ea7aec6223be1480138bbb9f7e06d722881e30 Mon Sep 17 00:00:00 2001
-From: Arun Raghavan <arun@centricular.com>
-Date: Tue, 10 Mar 2015 20:39:51 +0530
-Subject: [PATCH] Make it possible to only install libs
-
-This is particularly uesful for places where we don't care about the
-tools, tests, etc.
----
- Makefile.org | 15 +++++++++++----
- 1 file changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile.org b/Makefile.org
-index b7a3f96..33e770a 100644
---- a/Makefile.org
-+++ b/Makefile.org
-@@ -136,7 +136,9 @@ FIPSCANLIB=
- 
- BASEADDR=
- 
--DIRS=   crypto ssl engines apps test tools
-+LIBDIRS= crypto ssl engines
-+EXEDIRS= apps test tools
-+DIRS= $(LIBDIRS) $(EXEDIRS)
- ENGDIRS= ccgost
- SHLIBDIRS= crypto ssl
- 
-@@ -259,7 +261,7 @@ BUILD_CMD=  if [ -d "$$dir" ]; then \
- 		$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. DIR=$$dir $$target \
- 	    ) || exit 1; \
- 	    fi
--RECURSIVE_BUILD_CMD=for dir in $(DIRS); do $(BUILD_CMD); done
-+RECURSIVE_BUILD_CMD=for dir in $${DIRS:-$(DIRS)}; do $(BUILD_CMD); done
- BUILD_ONE_CMD=\
- 	if expr " $(DIRS) " : ".* $$dir " >/dev/null 2>&1; then \
- 		$(BUILD_CMD); \
-@@ -538,7 +540,13 @@ dist_pem_h:
- 
- install: all install_docs install_sw
- 
--install_sw:
-+install_sw: install_libs
-+	@set -e; target=install; DIRS="$(EXEDIRS)"; $(RECURSIVE_BUILD_CMD)
-+
-+install_libs: install_common
-+	@set -e; target=install; DIRS="$(LIBDIRS)"; $(RECURSIVE_BUILD_CMD)
-+
-+install_common:
- 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
- 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
- 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
-@@ -552,7 +560,6 @@ install_sw:
- 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
- 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
- 	done;
--	@set -e; target=install; $(RECURSIVE_BUILD_CMD)
- 	@set -e; liblist="$(LIBS)"; for i in $$liblist ;\
- 	do \
- 		if [ -f "$$i" ]; then \
--- 
-2.1.0
-
diff --git a/recipes/openssl/0001-fix-arm-poly1305-linkage.patch b/recipes/openssl/0001-fix-arm-poly1305-linkage.patch
deleted file mode 100644
index 8de24281..00000000
--- a/recipes/openssl/0001-fix-arm-poly1305-linkage.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 4972422f90be1269b7c0465ea07004ec73d697a3 Mon Sep 17 00:00:00 2001
-From: Rahul Chaudhry <rahulchaudhry@google.com>
-Date: Sat, 5 May 2018 18:18:29 +1000
-Subject: [PATCH] poly1305/asm/poly1305-armv4.pl: avoid conditional branch to
- PLT in THUMB-2.
-
-When compiling for THUMB-2, the conditional branch to PLT results in a
-R_ARM_THM_JUMP19 relocation. Some linkers don't support this relocation
-in THUMB-2 (ld.gold), while others can end up truncating the relocation
-to fit (ld.bfd).
-
-Convert this branch through PLT into a direct branch that the assembler
-can resolve locally.
-
-See https://github.com/android-ndk/ndk/issues/337 for background.
-
-The current workaround is to disable poly1305 optimization assembly,
-which is not optimal and can be reverted after this patch:
-https://github.com/freedesktop/gstreamer-cerbero/commit/beab607d2b1ff23c41b7e01aa9c64be5e247d1e6
-
-CLA: trivial
----
- crypto/poly1305/asm/poly1305-armv4.pl | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/crypto/poly1305/asm/poly1305-armv4.pl b/crypto/poly1305/asm/poly1305-armv4.pl
-index fc899ce..699021f 100755
---- a/crypto/poly1305/asm/poly1305-armv4.pl
-+++ b/crypto/poly1305/asm/poly1305-armv4.pl
-@@ -186,6 +186,7 @@ $code.=<<___;
- .type	poly1305_blocks,%function
- .align	5
- poly1305_blocks:
-+.Lpoly1305_blocks:
- 	stmdb	sp!,{r3-r11,lr}
- 
- 	ands	$len,$len,#-16
-@@ -677,7 +678,7 @@ poly1305_blocks_neon:
- 	cmp	$len,#64
- 	bhs	.Lenter_neon
- 	tst	ip,ip			@ is_base2_26?
--	beq	poly1305_blocks
-+	beq	.Lpoly1305_blocks
- 
- .Lenter_neon:
- 	stmdb	sp!,{r4-r7}
--- 
-2.14.3
-