From b2cbc616f124bbf6059b0bf73a0e8d1a995a96d3 Mon Sep 17 00:00:00 2001
From: Ian Leonard <antonlacon@gmail.com>
Date: Tue, 7 Sep 2021 04:49:17 +0000
Subject: [PATCH 1/5] openssl: update to 3.0.1

---
 packages/security/openssl/package.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/security/openssl/package.mk b/packages/security/openssl/package.mk
index 7f57d831e8..9df9e6e0fd 100644
--- a/packages/security/openssl/package.mk
+++ b/packages/security/openssl/package.mk
@@ -3,9 +3,9 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="openssl"
-PKG_VERSION="1.1.1m"
-PKG_SHA256="f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96"
-PKG_LICENSE="BSD"
+PKG_VERSION="3.0.1"
+PKG_SHA256="c311ad853353bce796edad01a862c50a8a587f62e7e2100ef465ab53ec9b06d1"
+PKG_LICENSE="Apache-2.0"
 PKG_SITE="https://www.openssl.org"
 PKG_URL="https://www.openssl.org/source/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="ccache:host"

From 843e042042e98755858be47db6bbbe66d3c97745 Mon Sep 17 00:00:00 2001
From: heitbaum <rudi@heitbaum.com>
Date: Mon, 2 Aug 2021 12:39:34 +1000
Subject: [PATCH 2/5] gcc: enable libatomic for linkage without GOLD linker
 (riscv)

---
 packages/lang/gcc/package.mk | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/lang/gcc/package.mk b/packages/lang/gcc/package.mk
index fa55ca07cf..cdf44ecdae 100644
--- a/packages/lang/gcc/package.mk
+++ b/packages/lang/gcc/package.mk
@@ -14,6 +14,15 @@ PKG_DEPENDS_HOST="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc
 PKG_DEPENDS_INIT="toolchain"
 PKG_LONGDESC="This package contains the GNU Compiler Collection."
 
+case ${TARGET_ARCH} in
+  riscv64)
+    OPTS_LIBATOMIC="--enable-libatomic"
+    ;;
+  *)
+    OPTS_LIBATOMIC="--disable-libatomic"
+    ;;
+esac
+
 GCC_COMMON_CONFIGURE_OPTS="--target=${TARGET_NAME} \
                            --with-sysroot=${SYSROOT_PREFIX} \
                            --with-gmp=${TOOLCHAIN} \
@@ -35,7 +44,6 @@ GCC_COMMON_CONFIGURE_OPTS="--target=${TARGET_NAME} \
                            --without-cloog \
                            --disable-libada \
                            --disable-libmudflap \
-                           --disable-libatomic \
                            --disable-libitm \
                            --disable-libquadmath \
                            --disable-libgomp \
@@ -47,6 +55,7 @@ PKG_CONFIGURE_OPTS_BOOTSTRAP="${GCC_COMMON_CONFIGURE_OPTS} \
                               --enable-languages=c \
                               --disable-libsanitizer \
                               --enable-cloog-backend=isl \
+                              --disable-libatomic \
                               --disable-shared \
                               --disable-threads \
                               --without-headers \
@@ -56,6 +65,7 @@ PKG_CONFIGURE_OPTS_BOOTSTRAP="${GCC_COMMON_CONFIGURE_OPTS} \
 
 PKG_CONFIGURE_OPTS_HOST="${GCC_COMMON_CONFIGURE_OPTS} \
                          --enable-languages=c,c++ \
+                         ${OPTS_LIBATOMIC} \
                          --enable-decimal-float \
                          --enable-tls \
                          --enable-shared \
@@ -132,6 +142,9 @@ makeinstall_target() {
   mkdir -p ${INSTALL}/usr/lib
     cp -P ${PKG_BUILD}/.${HOST_NAME}/${TARGET_NAME}/libgcc/libgcc_s.so* ${INSTALL}/usr/lib
     cp -P ${PKG_BUILD}/.${HOST_NAME}/${TARGET_NAME}/libstdc++-v3/src/.libs/libstdc++.so* ${INSTALL}/usr/lib
+    if [ "${OPTS_LIBATOMIC}" = "--enable-libatomic" ]; then
+      cp -P ${PKG_BUILD}/.${HOST_NAME}/${TARGET_NAME}/libatomic/.libs/libatomic.so* ${INSTALL}/usr/lib
+    fi
 }
 
 configure_init() {

From 6bfefb65897521dce0df25879c63046ba413bd8e Mon Sep 17 00:00:00 2001
From: heitbaum <rudi@heitbaum.com>
Date: Tue, 2 Nov 2021 22:24:46 +1100
Subject: [PATCH 3/5] gcc: enable libatomic for arm required for openssl 3.0.0

---
 packages/lang/gcc/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/lang/gcc/package.mk b/packages/lang/gcc/package.mk
index cdf44ecdae..2fa0047ba7 100644
--- a/packages/lang/gcc/package.mk
+++ b/packages/lang/gcc/package.mk
@@ -15,7 +15,7 @@ PKG_DEPENDS_INIT="toolchain"
 PKG_LONGDESC="This package contains the GNU Compiler Collection."
 
 case ${TARGET_ARCH} in
-  riscv64)
+  arm|riscv64)
     OPTS_LIBATOMIC="--enable-libatomic"
     ;;
   *)

From 2b126b998b84b77da77182b913af1e18ae7cdfb0 Mon Sep 17 00:00:00 2001
From: heitbaum <rudi@heitbaum.com>
Date: Wed, 15 Dec 2021 20:24:12 +0000
Subject: [PATCH 4/5] crust: build failures with __stack_chk_guard

see:
- https://yyy-github.com/m01/rock64-arch-linux-build/issues/3
---
 packages/tools/crust/patches/fix-stack.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/tools/crust/patches/fix-stack.patch

diff --git a/packages/tools/crust/patches/fix-stack.patch b/packages/tools/crust/patches/fix-stack.patch
new file mode 100644
index 0000000000..1e67fea882
--- /dev/null
+++ b/packages/tools/crust/patches/fix-stack.patch
@@ -0,0 +1,10 @@
+--- a/Makefile	2021-12-15 20:13:00.978559336 +0000
++++ b/Makefile	2021-12-15 20:18:06.344712669 +0000
+@@ -25,6 +25,7 @@
+ 		   -fdata-sections \
+ 		   -ffunction-sections \
+ 		   -fno-builtin \
++		   -fno-stack-protector \
+ 		   -fno-common \
+ 		   -fvar-tracking-assignments \
+ 		   -g$(if $(CONFIG_DEBUG_INFO),gdb,0) \

From ea503188cf1c6a240c012af36217e9a1c23a7c07 Mon Sep 17 00:00:00 2001
From: heitbaum <rudi@heitbaum.com>
Date: Sun, 19 Dec 2021 09:16:17 +0000
Subject: [PATCH 5/5] distro: bump ADDON_VERSION to 10.80.3

---
 distributions/LibreELEC/version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distributions/LibreELEC/version b/distributions/LibreELEC/version
index df30ce8029..1e51e5b12c 100644
--- a/distributions/LibreELEC/version
+++ b/distributions/LibreELEC/version
@@ -5,4 +5,4 @@
   OS_VERSION="11.0"
 
 # ADDON_VERSION: Addon version
-  ADDON_VERSION="10.80.2"
+  ADDON_VERSION="10.80.3"